diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 755ffe182e..00d95c3a1d 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -17,6 +17,10 @@ pr: include: - '*' +variables: +- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE + value: true + jobs: - template: jobs/default-build.yml parameters: @@ -46,14 +50,14 @@ jobs: # if they have already been signed. This results in slower builds due to re-submitting the same .nupkg many times for signing. # The sign settings have been configured to - - script: ./eng/scripts/cibuild.cmd -arch x64 /p:DisableCodeSigning=true /bl:artifacts/log/build.x64.binlog + - script: ./eng/scripts/cibuild.cmd -BuildNative -arch x64 /p:DisableCodeSigning=true /bl:artifacts/log/build.x64.binlog displayName: Build x64 # TODO: make it possible to build for one Windows architecture at a time # This is going to actually build x86 native assets. See https://github.com/aspnet/AspNetCore/issues/7196 # Build the x86 shared framework # Set DisableSignCheck because we'll run sign check in an explicit step after installers build - - script: ./eng/scripts/cibuild.cmd -arch x86 -NoRestore /t:BuildSharedFx /p:DisableCodeSigning=true /bl:artifacts/log/build.x86.binlog + - script: ./eng/scripts/cibuild.cmd -arch x86 -NoRestore -BuildNative /t:BuildSharedFx /p:DisableCodeSigning=true /bl:artifacts/log/build.x86.binlog displayName: Build x86 # This is in a separate build step with -forceCoreMsbuild to workaround MAX_PATH limitations - https://github.com/Microsoft/msbuild/issues/53 @@ -324,7 +328,7 @@ jobs: agentOs: Windows isTestingJob: true buildScript: ./eng/scripts/cibuild.cmd - buildArgs: -test "/p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=true /p:RunTemplateTests=false /p:BuildSiteExtensions=false" + buildArgs: -test -BuildNative "/p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=true /p:RunTemplateTests=false /p:BuildSiteExtensions=false" beforeBuild: - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1" displayName: Setup IISExpress test certificates and schema diff --git a/.azure/pipelines/helix-test.yml b/.azure/pipelines/helix-test.yml index 1740ceb6cb..1b512109b1 100644 --- a/.azure/pipelines/helix-test.yml +++ b/.azure/pipelines/helix-test.yml @@ -15,7 +15,7 @@ jobs: agentOs: Windows timeoutInMinutes: 240 steps: - - script: .\build.cmd -all -ci /t:Helix /p:IsHelixJob=true /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\SendToHelix.binlog + - script: .\build.cmd -all -ci /p:BuildNative=true /t:Helix /p:IsHelixJob=true /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\SendToHelix.binlog displayName: Run build.cmd helix target env: SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index efbfe08ee4..222522b092 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,6 +28,12 @@ Our team members also monitor several other discussion forums: ## Contributing code and content +We accept fixes and features! Here are some resources to help you get started on how to contribute code or new content. + +* Look at the [Contributor documentation](/docs/) to get started on building the source code on your own. +* ["Help wanted" issues](https://github.com/aspnet/AspNetCore/labels/help%20wanted) - these issues are up for grabs. Comment on an issue if you want to create a fix. +* ["Good first issue" issues](https://github.com/aspnet/AspNetCore/labels/good%20first%20issue) - we think these are a good for newcomers. + ### Identifying the scale If you would like to contribute to one of our repositories, first identify the scale of what you would like to contribute. If it is small (grammar/spelling or a bug fix) feel free to start working on a fix. If you are submitting a feature or substantial code contribution, please discuss it with the team and ensure it follows the product roadmap. You might also read these two blogs posts on contributing code: [Open Source Contribution Etiquette](http://tirania.org/blog/archive/2010/Dec-31.html) by Miguel de Icaza and [Don't "Push" Your Pull Requests](https://www.igvita.com/2011/12/19/dont-push-your-pull-requests/) by Ilya Grigorik. All code submissions will be rigorously reviewed and tested by the ASP.NET and Entity Framework teams, and only those that meet an extremely high bar for both quality and design/roadmap appropriateness will be merged into the source. diff --git a/Directory.Build.props b/Directory.Build.props index 8b002c635e..3331e894f6 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,15 @@  + + + + + Microsoft ASP.NET Core @@ -121,7 +130,6 @@ $(MSBuildProjectName)-ref - @@ -190,7 +198,7 @@ $(MSBuildThisFileDirectory)src\Mvc\Mvc.Testing\src\Microsoft.AspNetCore.Mvc.Testing.targets - true + true $(ArtifactsObjDir)TargetingPack.Layout\$(Configuration)\ diff --git a/Directory.Build.targets b/Directory.Build.targets index 212c9878c2..2486a20a85 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -81,9 +81,12 @@ - $(MicrosoftNETCoreAppPackageVersion) - $(MicrosoftNETCoreAppPackageVersion) - $(MicrosoftNETCoreAppPackageVersion) + + $(MicrosoftNETCoreAppPackageVersion) + + $(MicrosoftNETCoreAppPackageVersion) + + $(MicrosoftNETCoreAppPackageVersion) @@ -95,6 +98,10 @@ $(SharedFxVersion) + + $(NETStandardLibraryRefPackageVersion) + + diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000000..92d052767f --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,15 @@ +# Security Policy + +## Supported Versions + +The .NET Core and ASP.NET Core support policy, including supported versions can be found at the [.NET Core Support Policy Page](https://dotnet.microsoft.com/platform/support/policy/dotnet-core). + +## Reporting a Vulnerability + +Security issues and bugs should be reported privately, via email, to the Microsoft Security Response Center (MSRC) secure@microsoft.com. +You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your +original message. Further information, including the MSRC PGP key, can be found in the [Security TechCenter](https://technet.microsoft.com/en-us/security/ff852094.aspx). + +Reports via MSRC may qualify for the .NET Core Bug Bounty. Details of the .NET Core Bug Bounty including terms and conditions are at [https://aka.ms/corebounty](https://aka.ms/corebounty). + +Please do not open issues for anything you think might have a security implication. diff --git a/build.ps1 b/build.ps1 index b382ae3867..726946a89b 100644 --- a/build.ps1 +++ b/build.ps1 @@ -258,13 +258,12 @@ elseif ($Projects) { } # When adding new sub-group build flags, add them to this check. elseif((-not $BuildNative) -and (-not $BuildManaged) -and (-not $BuildNodeJS) -and (-not $BuildInstallers) -and (-not $BuildJava)) { - Write-Warning "No default group of projects was specified, so building the 'managed' and 'native' subsets of projects. Run ``build.cmd -help`` for more details." + Write-Warning "No default group of projects was specified, so building the 'managed' subsets of projects. Run ``build.cmd -help`` for more details." # This goal of this is to pick a sensible default for `build.cmd` with zero arguments. # Now that we support subfolder invokations of build.cmd, we will be pushing to have build.cmd build everything (-all) by default $BuildManaged = $true - $BuildNative = $true } if ($BuildInstallers) { $MSBuildArguments += "/p:BuildInstallers=true" } diff --git a/build/repo.props b/build/repo.props index 4282500c14..681ba52b0a 100644 --- a/build/repo.props +++ b/build/repo.props @@ -3,6 +3,13 @@ $(TargetOsName)-$(TargetArchitecture) + + true + true + true + true + + true @@ -27,13 +34,7 @@ true $(RepoRoot)src\Shared\ - - - - true - true - true - true + true diff --git a/build/sources.props b/build/sources.props index 26d8be6677..decee683d3 100644 --- a/build/sources.props +++ b/build/sources.props @@ -10,10 +10,12 @@ $(RestoreSources); + https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json; https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json; https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json; https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json; https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; + https://dotnet.myget.org/F/roslyn/api/v3/index.json; https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev; https://api.nuget.org/v3/index.json; @@ -27,11 +29,6 @@ $(RestoreSources); https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - - - $(RestoreSources); - https://dotnet.myget.org/F/blazor-dev/api/v3/index.json; - https://dotnetcli.blob.core.windows.net/dotnet/ diff --git a/docs/DailyBuilds.md b/docs/DailyBuilds.md index 08ff052f20..9438aba917 100644 --- a/docs/DailyBuilds.md +++ b/docs/DailyBuilds.md @@ -33,4 +33,4 @@ These are available in the [Visual Studio Preview](https://www.visualstudio.com/ * *Enable Source Link support* in Visual Studio should be enabled. * *Enable source server support* in Visual should be enabled. * *Enable Just My Code* should be disabled -* Add https://dotnet.myget.org/F/aspnetcore-dev/symbols to the list of symbol servers in the Visual Studio Debugging options +* Under Symbols enable the *Microsoft Symbol Servers* setting. diff --git a/eng/GenAPI.exclusions.txt b/eng/GenAPI.exclusions.txt index 4595fc772a..3053eb79e1 100644 --- a/eng/GenAPI.exclusions.txt +++ b/eng/GenAPI.exclusions.txt @@ -5,6 +5,7 @@ T:Microsoft.AspNetCore.Mvc.ApplicationModels.PageParameterModel T:Microsoft.AspNetCore.Mvc.ApplicationModels.PagePropertyModel # Manually implemented - https://github.com/aspnet/AspNetCore/issues/8825 T:Microsoft.AspNetCore.Components.AuthorizeView +T:Microsoft.AspNetCore.Components.AuthorizeViewCore T:Microsoft.AspNetCore.Components.CascadingAuthenticationState T:Microsoft.AspNetCore.Components.CascadingValue`1 T:Microsoft.AspNetCore.Components.Forms.DataAnnotationsValidator @@ -18,6 +19,6 @@ T:Microsoft.AspNetCore.Components.Forms.InputText T:Microsoft.AspNetCore.Components.Forms.InputTextArea T:Microsoft.AspNetCore.Components.Forms.ValidationMessage`1 T:Microsoft.AspNetCore.Components.Forms.ValidationSummary -T:Microsoft.AspNetCore.Components.Layouts.LayoutDisplay +T:Microsoft.AspNetCore.Components.PageDisplay T:Microsoft.AspNetCore.Components.Routing.NavLink T:Microsoft.AspNetCore.Components.Routing.Router \ No newline at end of file diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index fa3ee5688b..d7b785a06f 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -8,7 +8,7 @@ - + @@ -54,9 +54,9 @@ - + diff --git a/eng/PublishSymbols.proj b/eng/PublishSymbols.proj new file mode 100644 index 0000000000..dd2c968566 --- /dev/null +++ b/eng/PublishSymbols.proj @@ -0,0 +1,62 @@ + + + + netcoreapp3.0 + true + artifacts\manifests\ + true + + + 3650 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/SharedFramework.External.props b/eng/SharedFramework.External.props index d735b0764f..e894b2f988 100644 --- a/eng/SharedFramework.External.props +++ b/eng/SharedFramework.External.props @@ -83,7 +83,7 @@ These compilation references are necessary to compile netstandard2.0 assemblies which are in the shared framework. This references are part of Microsoft.NETCore.App, so are listed here as references to be used during compilation only. --> - + <_CompilationOnlyReference Include="System.Buffers" /> <_CompilationOnlyReference Include="System.ComponentModel.Annotations" /> <_CompilationOnlyReference Include="System.Runtime.CompilerServices.Unsafe" /> diff --git a/eng/SharedFramework.Local.props b/eng/SharedFramework.Local.props index 2c605f63cd..065172aad2 100644 --- a/eng/SharedFramework.Local.props +++ b/eng/SharedFramework.Local.props @@ -9,7 +9,9 @@ + + @@ -33,7 +35,6 @@ - @@ -46,12 +47,10 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc32cbe01a..5dc1c2282c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,392 +9,404 @@ --> - + + https://github.com/aspnet/Blazor + 9bc8036bf68fd159fffa56f93f8b2471bf96efd4 + + https://github.com/aspnet/AspNetCore-Tooling - 62e33dac1d5ec88ab15d7af694c1adf29ffc4c59 + 0156446a321deedadd175bdb32c8d1526be5f28d - + https://github.com/aspnet/AspNetCore-Tooling - 62e33dac1d5ec88ab15d7af694c1adf29ffc4c59 + 0156446a321deedadd175bdb32c8d1526be5f28d - + https://github.com/aspnet/AspNetCore-Tooling - 62e33dac1d5ec88ab15d7af694c1adf29ffc4c59 + 0156446a321deedadd175bdb32c8d1526be5f28d - + https://github.com/aspnet/AspNetCore-Tooling - 62e33dac1d5ec88ab15d7af694c1adf29ffc4c59 + 0156446a321deedadd175bdb32c8d1526be5f28d - + https://github.com/aspnet/EntityFrameworkCore - 08edd86216be4857b45b47bf0a9b29e98e525c05 + fd63251e1941070438c27577ed6b0068e33a139a - + https://github.com/aspnet/EntityFrameworkCore - 08edd86216be4857b45b47bf0a9b29e98e525c05 + fd63251e1941070438c27577ed6b0068e33a139a - + https://github.com/aspnet/EntityFrameworkCore - 08edd86216be4857b45b47bf0a9b29e98e525c05 + fd63251e1941070438c27577ed6b0068e33a139a - + https://github.com/aspnet/EntityFrameworkCore - 08edd86216be4857b45b47bf0a9b29e98e525c05 + fd63251e1941070438c27577ed6b0068e33a139a - + https://github.com/aspnet/EntityFrameworkCore - 08edd86216be4857b45b47bf0a9b29e98e525c05 + fd63251e1941070438c27577ed6b0068e33a139a - + https://github.com/aspnet/EntityFrameworkCore - 08edd86216be4857b45b47bf0a9b29e98e525c05 + fd63251e1941070438c27577ed6b0068e33a139a - + https://github.com/aspnet/EntityFrameworkCore - 08edd86216be4857b45b47bf0a9b29e98e525c05 + fd63251e1941070438c27577ed6b0068e33a139a - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + + https://github.com/dotnet/corefx + e23119d577e644d2c2a25419c88c1181681358e0 + + + https://github.com/dotnet/corefx + e23119d577e644d2c2a25419c88c1181681358e0 + + + https://github.com/dotnet/corefx + e23119d577e644d2c2a25419c88c1181681358e0 + + https://github.com/dotnet/corefx a28176b5ec68b6da1472934fe9493790d1665cae - + https://github.com/dotnet/corefx - a28176b5ec68b6da1472934fe9493790d1665cae + e23119d577e644d2c2a25419c88c1181681358e0 - + https://github.com/dotnet/corefx - a28176b5ec68b6da1472934fe9493790d1665cae + e23119d577e644d2c2a25419c88c1181681358e0 - + https://github.com/dotnet/corefx - a28176b5ec68b6da1472934fe9493790d1665cae + e23119d577e644d2c2a25419c88c1181681358e0 - + https://github.com/dotnet/corefx - a28176b5ec68b6da1472934fe9493790d1665cae + e23119d577e644d2c2a25419c88c1181681358e0 - + https://github.com/dotnet/corefx - a28176b5ec68b6da1472934fe9493790d1665cae + e23119d577e644d2c2a25419c88c1181681358e0 - + https://github.com/dotnet/corefx - a28176b5ec68b6da1472934fe9493790d1665cae + e23119d577e644d2c2a25419c88c1181681358e0 - + https://github.com/dotnet/corefx - a28176b5ec68b6da1472934fe9493790d1665cae + e23119d577e644d2c2a25419c88c1181681358e0 - + https://github.com/dotnet/corefx - a28176b5ec68b6da1472934fe9493790d1665cae + e23119d577e644d2c2a25419c88c1181681358e0 - + https://github.com/dotnet/corefx - a28176b5ec68b6da1472934fe9493790d1665cae + e23119d577e644d2c2a25419c88c1181681358e0 - + https://github.com/dotnet/corefx - a28176b5ec68b6da1472934fe9493790d1665cae + e23119d577e644d2c2a25419c88c1181681358e0 - + https://github.com/dotnet/corefx - a28176b5ec68b6da1472934fe9493790d1665cae + e23119d577e644d2c2a25419c88c1181681358e0 - + https://github.com/dotnet/corefx - a28176b5ec68b6da1472934fe9493790d1665cae + e23119d577e644d2c2a25419c88c1181681358e0 - + https://github.com/dotnet/corefx - a28176b5ec68b6da1472934fe9493790d1665cae + e23119d577e644d2c2a25419c88c1181681358e0 - + https://github.com/dotnet/corefx - a28176b5ec68b6da1472934fe9493790d1665cae + e23119d577e644d2c2a25419c88c1181681358e0 - + https://github.com/dotnet/corefx - a28176b5ec68b6da1472934fe9493790d1665cae + e23119d577e644d2c2a25419c88c1181681358e0 - - https://github.com/dotnet/corefx - a28176b5ec68b6da1472934fe9493790d1665cae - - - https://github.com/dotnet/corefx - a28176b5ec68b6da1472934fe9493790d1665cae - - - https://github.com/dotnet/corefx - a28176b5ec68b6da1472934fe9493790d1665cae - - + https://github.com/dotnet/core-setup - 73226d6f119c757813f47b0dc021e8700d525f71 + 63abc77da6d99470caa5bfa0465afe244105e595 - + https://github.com/dotnet/core-setup - 73226d6f119c757813f47b0dc021e8700d525f71 + 63abc77da6d99470caa5bfa0465afe244105e595 + + + https://github.com/dotnet/core-setup + 63abc77da6d99470caa5bfa0465afe244105e595 - + https://github.com/dotnet/corefx - a28176b5ec68b6da1472934fe9493790d1665cae + e23119d577e644d2c2a25419c88c1181681358e0 - + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 - + https://github.com/dotnet/arcade - e913fb3b02d4089a91ff91c041c5f6e7c29038b0 + e6a5d5f970bb872451c6310ae34eda31041fb552 - + https://github.com/dotnet/arcade - e913fb3b02d4089a91ff91c041c5f6e7c29038b0 + e6a5d5f970bb872451c6310ae34eda31041fb552 - + + https://github.com/dotnet/arcade + e6a5d5f970bb872451c6310ae34eda31041fb552 + + https://github.com/aspnet/Extensions - 8dfb4ece7ca9a6dea14264dafc38a0c953874559 + bfea1edf9e2e9a5465f331517149c4f543ac2ba6 diff --git a/eng/Versions.props b/eng/Versions.props index 10a317d441..d222619545 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,6 +5,10 @@ --> + + + true + - 1.0.0-beta.19270.1 + 1.0.0-beta.19302.2 - 3.0.0-preview6-27714-15 - 3.0.0-preview6-27714-15 + 3.0.0-preview6-27730-01 + 3.0.0-preview6-27730-01 + 2.1.0-preview6-27730-01 - 4.6.0-preview6.19264.9 - 4.6.0-preview6.19264.9 - 4.6.0-preview6.19264.9 + 4.6.0-preview6.19279.8 + 4.6.0-preview6.19279.8 + 4.6.0-preview6.19279.8 4.7.0-preview6.19264.9 - 4.6.0-preview6.19264.9 - 4.6.0-preview6.19264.9 - 4.6.0-preview6.19264.9 - 4.6.0-preview6.19264.9 - 1.7.0-preview6.19264.9 - 4.6.0-preview6.19264.9 - 4.6.0-preview6.19264.9 - 4.6.0-preview6.19264.9 - 4.6.0-preview6.19264.9 - 4.6.0-preview6.19264.9 - 4.6.0-preview6.19264.9 - 4.6.0-preview6.19264.9 - 4.6.0-preview6.19264.9 - 4.6.0-preview6.19264.9 - 4.6.0-preview6.19264.9 + 4.6.0-preview6.19279.8 + 4.6.0-preview6.19279.8 + 4.6.0-preview6.19279.8 + 4.6.0-preview6.19279.8 + 1.7.0-preview6.19279.8 + 4.6.0-preview6.19279.8 + 4.6.0-preview6.19279.8 + 4.6.0-preview6.19279.8 + 4.6.0-preview6.19279.8 + 4.6.0-preview6.19279.8 + 4.6.0-preview6.19279.8 + 4.6.0-preview6.19279.8 + 4.6.0-preview6.19279.8 + 4.6.0-preview6.19279.8 + 4.6.0-preview6.19279.8 - 3.0.0-preview6.19264.9 + 3.0.0-preview6.19279.8 + + 0.10.0-preview7.19303.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 - 3.0.0-preview6.19265.2 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 + 3.0.0-preview6.19280.1 - 3.0.0-preview6.19252.4 - 3.0.0-preview6.19252.4 - 3.0.0-preview6.19252.4 - 3.0.0-preview6.19252.4 - 3.0.0-preview6.19252.4 - 3.0.0-preview6.19252.4 - 3.0.0-preview6.19252.4 + 3.0.0-preview6.19303.2 + 3.0.0-preview6.19303.2 + 3.0.0-preview6.19303.2 + 3.0.0-preview6.19303.2 + 3.0.0-preview6.19303.2 + 3.0.0-preview6.19303.2 + 3.0.0-preview6.19303.2 - 3.0.0-preview6.19270.2 - 3.0.0-preview6.19270.2 - 3.0.0-preview6.19270.2 - 3.0.0-preview6.19270.2 + 3.0.0-preview6.19303.1 + 3.0.0-preview6.19303.1 + 3.0.0-preview6.19303.1 + 3.0.0-preview6.19303.1 4.5.0 4.4.0 @@ -164,8 +172,6 @@ 11.1.0 1.4.0 5.3.0 - - 0.10.0-preview-20190523.1 2.1.1 2.2.0 diff --git a/eng/common/LoggingCommandFunctions.ps1 b/eng/common/LoggingCommandFunctions.ps1 new file mode 100644 index 0000000000..c225eaecbf --- /dev/null +++ b/eng/common/LoggingCommandFunctions.ps1 @@ -0,0 +1,146 @@ +# Source for this file was taken from https://github.com/microsoft/azure-pipelines-task-lib/blob/11c9439d4af17e6475d9fe058e6b2e03914d17e6/powershell/VstsTaskSdk/LoggingCommandFunctions.ps1 + +# NOTE: You should not be calling these method directly as they are likely to change. Instead you should be calling the Write-Pipeline* functions defined in tools.ps1 + +$script:loggingCommandPrefix = '##vso[' +$script:loggingCommandEscapeMappings = @( # TODO: WHAT ABOUT "="? WHAT ABOUT "%"? + New-Object psobject -Property @{ Token = ';' ; Replacement = '%3B' } + New-Object psobject -Property @{ Token = "`r" ; Replacement = '%0D' } + New-Object psobject -Property @{ Token = "`n" ; Replacement = '%0A' } + New-Object psobject -Property @{ Token = "]" ; Replacement = '%5D' } +) +# TODO: BUG: Escape % ??? +# TODO: Add test to verify don't need to escape "=". + +<######################################## +# Private functions. +########################################> +function Format-LoggingCommandData { + [CmdletBinding()] + param([string]$Value, [switch]$Reverse) + + if (!$Value) { + return '' + } + + if (!$Reverse) { + foreach ($mapping in $script:loggingCommandEscapeMappings) { + $Value = $Value.Replace($mapping.Token, $mapping.Replacement) + } + } else { + for ($i = $script:loggingCommandEscapeMappings.Length - 1 ; $i -ge 0 ; $i--) { + $mapping = $script:loggingCommandEscapeMappings[$i] + $Value = $Value.Replace($mapping.Replacement, $mapping.Token) + } + } + + return $Value +} + +function Format-LoggingCommand { + [CmdletBinding()] + param( + [Parameter(Mandatory = $true)] + [string]$Area, + [Parameter(Mandatory = $true)] + [string]$Event, + [string]$Data, + [hashtable]$Properties) + + # Append the preamble. + [System.Text.StringBuilder]$sb = New-Object -TypeName System.Text.StringBuilder + $null = $sb.Append($script:loggingCommandPrefix).Append($Area).Append('.').Append($Event) + + # Append the properties. + if ($Properties) { + $first = $true + foreach ($key in $Properties.Keys) { + [string]$value = Format-LoggingCommandData $Properties[$key] + if ($value) { + if ($first) { + $null = $sb.Append(' ') + $first = $false + } else { + $null = $sb.Append(';') + } + + $null = $sb.Append("$key=$value") + } + } + } + + # Append the tail and output the value. + $Data = Format-LoggingCommandData $Data + $sb.Append(']').Append($Data).ToString() +} + +function Write-LoggingCommand { + [CmdletBinding(DefaultParameterSetName = 'Parameters')] + param( + [Parameter(Mandatory = $true, ParameterSetName = 'Parameters')] + [string]$Area, + [Parameter(Mandatory = $true, ParameterSetName = 'Parameters')] + [string]$Event, + [Parameter(ParameterSetName = 'Parameters')] + [string]$Data, + [Parameter(ParameterSetName = 'Parameters')] + [hashtable]$Properties, + [Parameter(Mandatory = $true, ParameterSetName = 'Object')] + $Command, + [switch]$AsOutput) + + if ($PSCmdlet.ParameterSetName -eq 'Object') { + Write-LoggingCommand -Area $Command.Area -Event $Command.Event -Data $Command.Data -Properties $Command.Properties -AsOutput:$AsOutput + return + } + + $command = Format-LoggingCommand -Area $Area -Event $Event -Data $Data -Properties $Properties + if ($AsOutput) { + $command + } else { + Write-Host $command + } +} + +function Write-LogIssue { + [CmdletBinding()] + param( + [ValidateSet('warning', 'error')] + [Parameter(Mandatory = $true)] + [string]$Type, + [string]$Message, + [string]$ErrCode, + [string]$SourcePath, + [string]$LineNumber, + [string]$ColumnNumber, + [switch]$AsOutput) + + $command = Format-LoggingCommand -Area 'task' -Event 'logissue' -Data $Message -Properties @{ + 'type' = $Type + 'code' = $ErrCode + 'sourcepath' = $SourcePath + 'linenumber' = $LineNumber + 'columnnumber' = $ColumnNumber + } + if ($AsOutput) { + return $command + } + + if ($Type -eq 'error') { + $foregroundColor = $host.PrivateData.ErrorForegroundColor + $backgroundColor = $host.PrivateData.ErrorBackgroundColor + if ($foregroundColor -isnot [System.ConsoleColor] -or $backgroundColor -isnot [System.ConsoleColor]) { + $foregroundColor = [System.ConsoleColor]::Red + $backgroundColor = [System.ConsoleColor]::Black + } + } else { + $foregroundColor = $host.PrivateData.WarningForegroundColor + $backgroundColor = $host.PrivateData.WarningBackgroundColor + if ($foregroundColor -isnot [System.ConsoleColor] -or $backgroundColor -isnot [System.ConsoleColor]) { + $foregroundColor = [System.ConsoleColor]::Yellow + $backgroundColor = [System.ConsoleColor]::Black + } + } + + Write-Host $command -ForegroundColor $foregroundColor -BackgroundColor $backgroundColor +} \ No newline at end of file diff --git a/eng/common/PublishToPackageFeed.proj b/eng/common/PublishToPackageFeed.proj index e17f72644e..a1b1333723 100644 --- a/eng/common/PublishToPackageFeed.proj +++ b/eng/common/PublishToPackageFeed.proj @@ -53,6 +53,8 @@ https://dotnetfeed.blob.core.windows.net/dotnet-toolset/index.json https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json https://dotnetfeed.blob.core.windows.net/nuget-nugetclient/index.json + https://dotnetfeed.blob.core.windows.net/aspnet-entityframework6/index.json + https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json Build configuration: 'Debug' or 'Release' (short: -c)" + Write-Host " -platform Platform configuration: 'x86', 'x64' or any valid Platform value to pass to msbuild" Write-Host " -verbosity Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)" Write-Host " -binaryLog Output binary log (short: -bl)" Write-Host " -help Print help and exit" @@ -77,6 +79,7 @@ function Build { InitializeCustomToolset $bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "Build.binlog") } else { "" } + $platformArg = if ($platform) { "/p:Platform=$platform" } else { "" } if ($projects) { # Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons. @@ -88,6 +91,7 @@ function Build { MSBuild $toolsetBuildProj ` $bl ` + $platformArg ` /p:Configuration=$configuration ` /p:RepoRoot=$RepoRoot ` /p:Restore=$restore ` @@ -129,9 +133,8 @@ try { Build } catch { - Write-Host $_ - Write-Host $_.Exception Write-Host $_.ScriptStackTrace + Write-PipelineTaskError -Message $_ ExitWithExitCode 1 } diff --git a/eng/common/build.sh b/eng/common/build.sh index ce846d888d..6236fc4d38 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -66,6 +66,7 @@ ci=false warn_as_error=true node_reuse=true binary_log=false +pipelines_log=false projects='' configuration='Debug' @@ -92,6 +93,9 @@ while [[ $# > 0 ]]; do -binarylog|-bl) binary_log=true ;; + -pipelineslog|-pl) + pipelines_log=true + ;; -restore|-r) restore=true ;; @@ -146,6 +150,7 @@ while [[ $# > 0 ]]; do done if [[ "$ci" == true ]]; then + pipelines_log=true binary_log=true node_reuse=false fi diff --git a/eng/common/cross/arm64/sources.list.buster b/eng/common/cross/arm64/sources.list.buster new file mode 100644 index 0000000000..7194ac64a9 --- /dev/null +++ b/eng/common/cross/arm64/sources.list.buster @@ -0,0 +1,11 @@ +deb http://deb.debian.org/debian buster main +deb-src http://deb.debian.org/debian buster main + +deb http://deb.debian.org/debian-security/ buster/updates main +deb-src http://deb.debian.org/debian-security/ buster/updates main + +deb http://deb.debian.org/debian buster-updates main +deb-src http://deb.debian.org/debian buster-updates main + +deb http://deb.debian.org/debian buster-backports main contrib non-free +deb-src http://deb.debian.org/debian buster-backports main contrib non-free diff --git a/eng/common/cross/arm64/sources.list.stretch b/eng/common/cross/arm64/sources.list.stretch new file mode 100644 index 0000000000..0e12157743 --- /dev/null +++ b/eng/common/cross/arm64/sources.list.stretch @@ -0,0 +1,12 @@ +deb http://deb.debian.org/debian stretch main +deb-src http://deb.debian.org/debian stretch main + +deb http://deb.debian.org/debian-security/ stretch/updates main +deb-src http://deb.debian.org/debian-security/ stretch/updates main + +deb http://deb.debian.org/debian stretch-updates main +deb-src http://deb.debian.org/debian stretch-updates main + +deb http://deb.debian.org/debian stretch-backports main contrib non-free +deb-src http://deb.debian.org/debian stretch-backports main contrib non-free + diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 83ec39195c..34d3d2ba1f 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -2,7 +2,7 @@ usage() { - echo "Usage: $0 [BuildArch] [LinuxCodeName] [lldbx.y] [--skipunmount] --rootfs ]" + echo "Usage: $0 [BuildArch] [LinuxCodeName] [lldbx.y] [--skipunmount] --rootfsdir ]" echo "BuildArch can be: arm(default), armel, arm64, x86" echo "LinuxCodeName - optional, Code name for Linux, can be: trusty, xenial(default), zesty, bionic, alpine. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine" @@ -113,12 +113,12 @@ while :; do __LinuxCodeName=trusty fi ;; - xenial) # Ubunry 16.04 + xenial) # Ubuntu 16.04 if [ "$__LinuxCodeName" != "jessie" ]; then __LinuxCodeName=xenial fi ;; - zesty) # Ununtu 17.04 + zesty) # Ubuntu 17.04 if [ "$__LinuxCodeName" != "jessie" ]; then __LinuxCodeName=zesty fi @@ -132,7 +132,16 @@ while :; do __LinuxCodeName=jessie __UbuntuRepo="http://ftp.debian.org/debian/" ;; - # TBD Stretch -> Debian 9, Buster -> Debian 10 + stretch) # Debian 9 + __LinuxCodeName=stretch + __UbuntuRepo="http://ftp.debian.org/debian/" + __LLDB_Package="liblldb-6.0-dev" + ;; + buster) # Debian 10 + __LinuxCodeName=buster + __UbuntuRepo="http://ftp.debian.org/debian/" + __LLDB_Package="liblldb-6.0-dev" + ;; tizen) if [ "$__BuildArch" != "armel" ]; then echo "Tizen is available only for armel." diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 81ffd16779..dea7cdd903 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,5 +1,6 @@ param ( - $darcVersion = $null + $darcVersion = $null, + $versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16" ) $verbosity = "m" @@ -16,13 +17,13 @@ function InstallDarcCli ($darcVersion) { Invoke-Expression "& `"$dotnet`" tool uninstall $darcCliPackageName -g" } - # Until we can anonymously query the BAR API for the latest arcade-services - # build applied to the PROD channel, this is hardcoded. + # If the user didn't explicitly specify the darc version, + # query the Maestro API for the correct version of darc to install. if (-not $darcVersion) { - $darcVersion = '1.1.0-beta.19205.4' + $darcVersion = $(Invoke-WebRequest -Uri $versionEndpoint -UseBasicParsing).Content } - $arcadeServicesSource = 'https://dotnetfeed.blob.core.windows.net/dotnet-arcade/index.json' + $arcadeServicesSource = 'https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json' Write-Host "Installing Darc CLI version $darcVersion..." Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index bd7eb46398..abdd0bc05a 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -1,7 +1,8 @@ #!/usr/bin/env bash source="${BASH_SOURCE[0]}" -darcVersion="1.1.0-beta.19205.4" +darcVersion='' +versionEndpoint="https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16" while [[ $# > 0 ]]; do opt="$(echo "$1" | awk '{print tolower($0)}')" @@ -10,6 +11,10 @@ while [[ $# > 0 ]]; do darcVersion=$2 shift ;; + --versionendpoint) + versionEndpoint=$2 + shift + ;; *) echo "Invalid argument: $1" usage @@ -33,6 +38,10 @@ verbosity=m . "$scriptroot/tools.sh" +if [ -z "$darcVersion" ]; then + darcVersion=$(curl -X GET "$versionEndpoint" -H "accept: text/plain") +fi + function InstallDarcCli { local darc_cli_package_name="microsoft.dotnet.darc" @@ -45,9 +54,9 @@ function InstallDarcCli { echo $($dotnet_root/dotnet tool uninstall $darc_cli_package_name -g) fi - local arcadeServicesSource="https://dotnetfeed.blob.core.windows.net/dotnet-arcade/index.json" + local arcadeServicesSource="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" - echo "Installing Darc CLI version $toolset_version..." + echo "Installing Darc CLI version $darcVersion..." echo "You may need to restart your command shell if this is the first dotnet tool you have installed." echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g) } diff --git a/eng/common/dotnet-install.ps1 b/eng/common/dotnet-install.ps1 index 5987943fd6..0b629b8301 100644 --- a/eng/common/dotnet-install.ps1 +++ b/eng/common/dotnet-install.ps1 @@ -8,9 +8,14 @@ Param( . $PSScriptRoot\tools.ps1 +$dotnetRoot = Join-Path $RepoRoot ".dotnet" + +$installdir = $dotnetRoot try { - $dotnetRoot = Join-Path $RepoRoot ".dotnet" - InstallDotNet $dotnetRoot $version $architecture $runtime $true + if ($architecture -and $architecture.Trim() -eq "x86") { + $installdir = Join-Path $installdir "x86" + } + InstallDotNet $installdir $version $architecture $runtime $true } catch { Write-Host $_ @@ -19,4 +24,4 @@ catch { ExitWithExitCode 1 } -ExitWithExitCode 0 \ No newline at end of file +ExitWithExitCode 0 diff --git a/eng/common/templates/steps/send-to-helix.yml b/eng/common/templates/steps/send-to-helix.yml index d1ce577db5..05df886f55 100644 --- a/eng/common/templates/steps/send-to-helix.yml +++ b/eng/common/templates/steps/send-to-helix.yml @@ -5,6 +5,7 @@ parameters: HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number HelixTargetQueues: '' # required -- semicolon delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group + HelixConfiguration: '' # optional -- additional property attached to a job HelixPreCommands: '' # optional -- commands to run before Helix work item execution HelixPostCommands: '' # optional -- commands to run after Helix work item execution WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects @@ -35,6 +36,7 @@ steps: HelixSource: ${{ parameters.HelixSource }} HelixType: ${{ parameters.HelixType }} HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} HelixTargetQueues: ${{ parameters.HelixTargetQueues }} HelixAccessToken: ${{ parameters.HelixAccessToken }} HelixPreCommands: ${{ parameters.HelixPreCommands }} @@ -64,6 +66,7 @@ steps: HelixSource: ${{ parameters.HelixSource }} HelixType: ${{ parameters.HelixType }} HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} HelixTargetQueues: ${{ parameters.HelixTargetQueues }} HelixAccessToken: ${{ parameters.HelixAccessToken }} HelixPreCommands: ${{ parameters.HelixPreCommands }} diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9ca177b82a..3983d719be 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -92,6 +92,68 @@ function Exec-Process([string]$command, [string]$commandArgs) { } } +function Write-PipelineTaskError { + [CmdletBinding()] + param( + [Parameter(Mandatory = $true)] + [string]$Message, + [Parameter(Mandatory = $false)] + [string]$Type = 'error', + [string]$ErrCode, + [string]$SourcePath, + [string]$LineNumber, + [string]$ColumnNumber, + [switch]$AsOutput) + + if(!$ci) { + if($Type -eq 'error') { + Write-Error $Message + return + } + elseif ($Type -eq 'warning') { + Write-Warning $Message + return + } + } + + if(($Type -ne 'error') -and ($Type -ne 'warning')) { + Write-Host $Message + return + } + if(-not $PSBoundParameters.ContainsKey('Type')) { + $PSBoundParameters.Add('Type', 'error') + } + Write-LogIssue @PSBoundParameters +} + +function Write-PipelineSetVariable { + [CmdletBinding()] + param( + [Parameter(Mandatory = $true)] + [string]$Name, + [string]$Value, + [switch]$Secret, + [switch]$AsOutput) + + if($ci) { + Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data $Value -Properties @{ + 'variable' = $Name + 'issecret' = $Secret + } -AsOutput:$AsOutput + } +} + +function Write-PipelinePrependPath { + [CmdletBinding()] + param( + [Parameter(Mandatory=$true)] + [string]$Path, + [switch]$AsOutput) + if($ci) { + Write-LoggingCommand -Area 'task' -Event 'prependpath' -Data $Path -AsOutput:$AsOutput + } +} + function InitializeDotNetCli([bool]$install) { if (Test-Path variable:global:_DotNetInstallDir) { return $global:_DotNetInstallDir @@ -134,7 +196,7 @@ function InitializeDotNetCli([bool]$install) { if ($install) { InstallDotNetSdk $dotnetRoot $dotnetSdkVersion } else { - Write-Host "Unable to find dotnet with SDK version '$dotnetSdkVersion'" -ForegroundColor Red + Write-PipelineTaskError "Unable to find dotnet with SDK version '$dotnetSdkVersion'" ExitWithExitCode 1 } } @@ -147,12 +209,10 @@ function InitializeDotNetCli([bool]$install) { # It also ensures that VS msbuild will use the downloaded sdk targets. $env:PATH = "$dotnetRoot;$env:PATH" - if ($ci) { - # Make Sure that our bootstrapped dotnet cli is avaliable in future steps of the Azure Pipelines build - Write-Host "##vso[task.prependpath]$dotnetRoot" - Write-Host "##vso[task.setvariable variable=DOTNET_MULTILEVEL_LOOKUP]0" - Write-Host "##vso[task.setvariable variable=DOTNET_SKIP_FIRST_TIME_EXPERIENCE]1" - } + # Make Sure that our bootstrapped dotnet cli is avaliable in future steps of the Azure Pipelines build + Write-PipelinePrependPath -Path $dotnetRoot + Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0' + Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1' return $global:_DotNetInstallDir = $dotnetRoot } @@ -184,7 +244,7 @@ function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $archit & $installScript @installParameters if ($lastExitCode -ne 0) { - Write-Host "Failed to install dotnet cli (exit code '$lastExitCode')." -ForegroundColor Red + Write-PipelineTaskError -Message "Failed to install dotnet cli (exit code '$lastExitCode')." ExitWithExitCode $lastExitCode } } @@ -213,7 +273,11 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = if ($env:VSINSTALLDIR -ne $null) { $msbuildCmd = Get-Command "msbuild.exe" -ErrorAction SilentlyContinue if ($msbuildCmd -ne $null) { - if ($msbuildCmd.Version -ge $vsMinVersion) { + # Workaround for https://github.com/dotnet/roslyn/issues/35793 + # Due to this issue $msbuildCmd.Version returns 0.0.0.0 for msbuild.exe 16.2+ + $msbuildVersion = [Version]::new((Get-Item $msbuildCmd.Path).VersionInfo.ProductVersion.Split(@('-', '+'))[0]) + + if ($msbuildVersion -ge $vsMinVersion) { return $global:_MSBuildExe = $msbuildCmd.Path } @@ -354,7 +418,7 @@ function InitializeBuildTool() { if ($msbuildEngine -eq "dotnet") { if (!$dotnetRoot) { - Write-Host "/global.json must specify 'tools.dotnet'." -ForegroundColor Red + Write-PipelineTaskError "/global.json must specify 'tools.dotnet'." ExitWithExitCode 1 } @@ -363,13 +427,13 @@ function InitializeBuildTool() { try { $msbuildPath = InitializeVisualStudioMSBuild -install:$restore } catch { - Write-Host $_ -ForegroundColor Red + Write-PipelineTaskError $_ ExitWithExitCode 1 } $buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "net472" } } else { - Write-Host "Unexpected value of -msbuildEngine: '$msbuildEngine'." -ForegroundColor Red + Write-PipelineTaskError "Unexpected value of -msbuildEngine: '$msbuildEngine'." ExitWithExitCode 1 } @@ -386,7 +450,7 @@ function GetDefaultMSBuildEngine() { return "dotnet" } - Write-Host "-msbuildEngine must be specified, or /global.json must specify 'tools.dotnet' or 'tools.vs'." -ForegroundColor Red + Write-PipelineTaskError "-msbuildEngine must be specified, or /global.json must specify 'tools.dotnet' or 'tools.vs'." ExitWithExitCode 1 } @@ -437,7 +501,7 @@ function InitializeToolset() { } if (-not $restore) { - Write-Host "Toolset version $toolsetVersion has not been restored." -ForegroundColor Red + Write-PipelineTaskError "Toolset version $toolsetVersion has not been restored." ExitWithExitCode 1 } @@ -522,7 +586,7 @@ function MSBuild-Core() { $exitCode = Exec-Process $buildTool.Path $cmdArgs if ($exitCode -ne 0) { - Write-Host "Build failed." -ForegroundColor Red + Write-PipelineTaskError "Build failed." $buildLog = GetMSBuildBinaryLogCommandLineArgument $args if ($buildLog -ne $null) { @@ -550,6 +614,8 @@ function GetMSBuildBinaryLogCommandLineArgument($arguments) { return $null } +. $PSScriptRoot\LoggingCommandFunctions.ps1 + $RepoRoot = Resolve-Path (Join-Path $PSScriptRoot "..\..") $EngRoot = Resolve-Path (Join-Path $PSScriptRoot "..") $ArtifactsDir = Join-Path $RepoRoot "artifacts" @@ -565,11 +631,8 @@ Create-Directory $ToolsetDir Create-Directory $TempDir Create-Directory $LogDir -if ($ci) { - Write-Host "##vso[task.setvariable variable=Artifacts]$ArtifactsDir" - Write-Host "##vso[task.setvariable variable=Artifacts.Toolset]$ToolsetDir" - Write-Host "##vso[task.setvariable variable=Artifacts.Log]$LogDir" - - $env:TEMP = $TempDir - $env:TMP = $TempDir -} +Write-PipelineSetVariable -Name 'Artifacts' -Value $ArtifactsDir +Write-PipelineSetVariable -Name 'Artifacts.Toolset' -Value $ToolsetDir +Write-PipelineSetVariable -Name 'Artifacts.Log' -Value $LogDir +Write-PipelineSetVariable -Name 'TEMP' -Value $TempDir +Write-PipelineSetVariable -Name 'TMP' -Value $TempDir diff --git a/eng/common/tools.sh b/eng/common/tools.sh index df3eb8bce0..fd26f6fbb2 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -1,8 +1,20 @@ +#!/usr/bin/env bash + # Initialize variables if they aren't already defined. # CI mode - set to true on CI server for PR validation build or official build. ci=${ci:-false} +# Set to true to use the pipelines logger which will enable Azure logging output. +# https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md +# This flag is meant as a temporary opt-opt for the feature while validate it across +# our consumers. It will be deleted in the future. +if [[ "$ci" == true ]]; then + pipelines_log=${pipelines_log:-true} +else + pipelines_log=${pipelines_log:-false} +fi + # Build configuration. Common values include 'Debug' and 'Release', but the repository may use other names. configuration=${configuration:-'Debug'} @@ -40,6 +52,78 @@ else use_global_nuget_cache=${use_global_nuget_cache:-true} fi +function EmitError { + if [[ "$ci" != true ]]; then + echo "$@" >&2 + return + fi + + message_type="error" + sourcepath='' + linenumber='' + columnnumber='' + error_code='' + + while [[ $# -gt 0 ]]; do + opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')" + case "$opt" in + -type|-t) + message_type=$2 + shift + ;; + -sourcepath|-s) + sourcepath=$2 + shift + ;; + -linenumber|-l) + linenumber=$2 + shift + ;; + -columnnumber|-col) + columnnumber=$2 + shift + ;; + -code|-c) + error_code=$2 + shift + ;; + *) + break + ;; + esac + + shift + done + + message='##vso[task.logissue' + + message="$message type=$message_type" + + if [ -n "$sourcepath" ]; then + message="$message;sourcepath=$sourcepath" + else + message="$message;sourcepath=${BASH_SOURCE[1]}" + fi + + if [ -n "$linenumber" ]; then + message="$message;linenumber=$linenumber" + else + message="$message;linenumber=${BASH_LINENO[0]}" + fi + + if [ -n "$columnnumber" ]; then + message="$message;columnnumber=$columnnumber" + fi + + if [ -n "$error_code" ]; then + message="$message;code=$error_code" + fi + + message="$message]$*" + + echo "$message" +} + # Resolve any symlinks in the given path. function ResolvePath { local path=$1 @@ -65,7 +149,7 @@ function ReadGlobalVersion { local pattern="\"$key\" *: *\"(.*)\"" if [[ ! $line =~ $pattern ]]; then - echo "Error: Cannot find \"$key\" in $global_json_file" >&2 + EmitError "Error: Cannot find \"$key\" in $global_json_file" ExitWithExitCode 1 fi @@ -126,7 +210,7 @@ function InitializeDotNetCli { if [[ "$install" == true ]]; then InstallDotNetSdk "$dotnet_root" "$dotnet_sdk_version" else - echo "Unable to find dotnet with SDK version '$dotnet_sdk_version'" >&2 + EmitError "Unable to find dotnet with SDK version '$dotnet_sdk_version'" ExitWithExitCode 1 fi fi @@ -179,7 +263,7 @@ function InstallDotNet { fi bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || { local exit_code=$? - echo "Failed to install dotnet SDK (exit code '$exit_code')." >&2 + EmitError "Failed to install dotnet SDK (exit code '$exit_code')." ExitWithExitCode $exit_code } } @@ -216,6 +300,7 @@ function InitializeBuildTool { # return values _InitializeBuildTool="$_InitializeDotNetCli/dotnet" _InitializeBuildToolCommand="msbuild" + _InitializeBuildToolFramework="netcoreapp2.1" } function GetNuGetPackageCachePath { @@ -264,7 +349,7 @@ function InitializeToolset { fi if [[ "$restore" != true ]]; then - echo "Toolset version $toolsetVersion has not been restored." >&2 + EmitError "Toolset version $toolsetVersion has not been restored." ExitWithExitCode 2 fi @@ -276,12 +361,12 @@ function InitializeToolset { fi echo '' > "$proj" - MSBuild "$proj" $bl /t:__WriteToolsetLocation /clp:ErrorsOnly\;NoSummary /p:__ToolsetLocationOutputFile="$toolset_location_file" + MSBuild-Core "$proj" $bl /t:__WriteToolsetLocation /clp:ErrorsOnly\;NoSummary /p:__ToolsetLocationOutputFile="$toolset_location_file" local toolset_build_proj=`cat "$toolset_location_file"` if [[ ! -a "$toolset_build_proj" ]]; then - echo "Invalid toolset path: $toolset_build_proj" >&2 + EmitError "Invalid toolset path: $toolset_build_proj" ExitWithExitCode 3 fi @@ -304,14 +389,27 @@ function StopProcesses { } function MSBuild { + local args=$@ + if [[ "$pipelines_log" == true ]]; then + InitializeBuildTool + InitializeToolset + local toolset_dir="${_InitializeToolset%/*}" + local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" + args=( "${args[@]}" "-logger:$logger_path" ) + fi + + MSBuild-Core ${args[@]} +} + +function MSBuild-Core { if [[ "$ci" == true ]]; then if [[ "$binary_log" != true ]]; then - echo "Binary log must be enabled in CI build." >&2 + EmitError "Binary log must be enabled in CI build." ExitWithExitCode 1 fi if [[ "$node_reuse" == true ]]; then - echo "Node reuse must be disabled in CI build." >&2 + EmitError "Node reuse must be disabled in CI build." ExitWithExitCode 1 fi fi @@ -325,7 +423,7 @@ function MSBuild { "$_InitializeBuildTool" "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" || { local exit_code=$? - echo "Build failed (exit code '$exit_code')." >&2 + EmitError "Build failed (exit code '$exit_code')." ExitWithExitCode $exit_code } } diff --git a/eng/helix/content/InstallNode.ps1 b/eng/helix/content/InstallNode.ps1 new file mode 100644 index 0000000000..862e612582 --- /dev/null +++ b/eng/helix/content/InstallNode.ps1 @@ -0,0 +1,71 @@ + <# + .SYNOPSIS + Installs NodeJs from http://nodejs.org/dist on a machine + .DESCRIPTION + This script installs NodeJs from http://nodejs.org/dist on a machine. + .PARAMETER Version + The version of NodeJS to install. + .PARAMETER InstallDir + The directory to install NodeJS to. + .LINK + https://nodejs.org/en/ + #> +param( + [Parameter(Mandatory = $true)] + $Version, + + [Parameter(Mandatory = $true)] + $InstallDir +) + +$ErrorActionPreference = 'Stop' +$ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138 + +Set-StrictMode -Version 1 + +if (Get-Command "node.exe" -ErrorAction SilentlyContinue) +{ + Write-Host "Found node.exe in PATH" + exit +} + +if (Test-Path "$output_dir\node.exe") +{ + Write-Host "Node.exe found at $output_dir" + exit +} + +$nodeFile="node-v$Version-win-x64" +$url="http://nodejs.org/dist/v$Version/$nodeFile.zip" +Write-Host "Starting download of NodeJs ${Version} from $url" +Invoke-WebRequest -UseBasicParsing -Uri "$url" -OutFile "nodejs.zip" +Write-Host "Done downloading NodeJS ${Version}" + +$tempPath = [System.IO.Path]::GetTempPath() +$tempDir = Join-Path $tempPath nodejs +New-Item -Path "$tempDir" -ItemType "directory" -Force +Write-Host "Extracting to $tempDir" + +if (Get-Command -Name 'Microsoft.PowerShell.Archive\Expand-Archive' -ErrorAction Ignore) { + # Use built-in commands where possible as they are cross-plat compatible + Microsoft.PowerShell.Archive\Expand-Archive -Path "nodejs.zip" -DestinationPath $tempDir +} +else { + # Fallback to old approach for old installations of PowerShell + Add-Type -AssemblyName System.IO.Compression.FileSystem + [System.IO.Compression.ZipFile]::ExtractToDirectory("nodejs.zip", $tempDir) +} + +Write-Host "Expanded NodeJs" +New-Item -Path "$InstallDir" -ItemType "directory" -Force +Write-Host "Copying $tempDir\$nodeFile\node.exe to $InstallDir" +Copy-Item "$tempDir\$nodeFile\node.exe" "$InstallDir\node.exe" + +if (Test-Path "$InstallDir\node.exe") +{ + Write-Host "Node.exe copied to $InstallDir" +} +else +{ + Write-Host "Node.exe not copied to $InstallDir" +} diff --git a/eng/helix/content/installnode.sh b/eng/helix/content/installnode.sh new file mode 100644 index 0000000000..5a72cca423 --- /dev/null +++ b/eng/helix/content/installnode.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +# Cause the script to fail if any subcommand fails +set -e + +if type -P "node" &>/dev/null; then + echo "node is in \$PATH" + exit +fi + +node_version=$1 +osname=`uname -s` +echo $osname +if [ "$osname" = "Darwin" ]; then + platformarch='darwin-x64' +else + platformarch='linux-x64' +fi +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +output_dir="$DIR/node" +url="http://nodejs.org/dist/v$node_version/node-v$node_version-$platformarch.tar.gz" +tmp="$(mktemp -d -t install-node.XXXXXX)" +trap "rm -rf $tmp" EXIT +cd "$tmp" +curl -Lsfo $(basename $url) "$url" +echo "Installing node from $(basename $url) $url" +mkdir $output_dir +echo "Unpacking to $output_dir" +tar --strip-components 1 -xzf "node-v$node_version-$platformarch.tar.gz" --no-same-owner --directory "$output_dir" diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index 8657c61ec1..8344fe5a66 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -14,7 +14,7 @@ set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 set DOTNET_MULTILEVEL_LOOKUP=0 set DOTNET_CLI_HOME=%HELIX_CORRELATION_PAYLOAD%\home -set PATH=%DOTNET_ROOT%;%PATH% +set PATH=%DOTNET_ROOT%;%PATH%;%HELIX_CORRELATION_PAYLOAD%\node\bin powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1'))) -Architecture x64 -Version %sdkVersion% -InstallDir %DOTNET_ROOT%" powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1'))) -Architecture x64 -Runtime dotnet -Version %runtimeVersion% -InstallDir %DOTNET_ROOT%" diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh index b3a786ee05..e864f097de 100644 --- a/eng/helix/content/runtests.sh +++ b/eng/helix/content/runtests.sh @@ -16,7 +16,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export DOTNET_ROOT="$DIR/.dotnet$RANDOM" # Ensure dotnet comes first on PATH -export PATH="$DOTNET_ROOT:$PATH" +export PATH="$DOTNET_ROOT:$PATH:$DIR/node/bin" # Prevent fallback to global .NET locations. This ensures our tests use the shared frameworks we specify and don't rollforward to something else that might be installed on the machine export DOTNET_MULTILEVEL_LOOKUP=0 diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index b2f297fe63..c6b1b68cd2 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -17,6 +17,7 @@ $(MSBuildProjectName)/$(TargetFramework) false true + 10.15.3 @@ -35,4 +36,12 @@ + + + + + + + + diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets index b8dadce6c5..a0eb3e3fa5 100644 --- a/eng/targets/Npm.Common.targets +++ b/eng/targets/Npm.Common.targets @@ -53,6 +53,21 @@ + + + + + + <_PackageJsonContent>@(PackageJsonContent->'%(Identity)', '%0a') + <_PackageJsonContent>$(_PackageJsonContent.Replace('%(ReplacePackageContent.Identity)', '%(ReplacePackageContent.ReplaceWith)')) + + + + diff --git a/eng/targets/ReferenceAssembly.targets b/eng/targets/ReferenceAssembly.targets index cbe21a8976..605c715eb7 100644 --- a/eng/targets/ReferenceAssembly.targets +++ b/eng/targets/ReferenceAssembly.targets @@ -55,7 +55,7 @@ - <_GenAPICommand Condition="'$(MSBuildRuntimeType)' == 'core'">$(ToolHostCmd) --roll-forward-on-no-candidate-fx 2 "$(_GenAPIPath)" + <_GenAPICommand Condition="'$(MSBuildRuntimeType)' == 'core'">"$(DotNetTool)" --roll-forward-on-no-candidate-fx 2 "$(_GenAPIPath)" <_GenAPICmd>$(_GenAPICommand) <_GenAPICmd>$(_GenAPICmd) "$(TargetPath)" <_GenAPICmd>$(_GenAPICmd) --lib-path "@(_ReferencePathDirectories)" diff --git a/global.json b/global.json index 30db777b99..97f7c9313f 100644 --- a/global.json +++ b/global.json @@ -3,10 +3,12 @@ "version": "3.0.100-preview5-011568" }, "tools": { + "dotnet": "3.0.100-preview5-011568", "jdk": "11.0.3" }, "msbuild-sdks": { "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19270.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19302.2", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19302.2" } } diff --git a/src/Analyzers/Analyzers/test/TestFiles/CompilationFeatureDetectorTest/StartupWithUseSignalR.cs b/src/Analyzers/Analyzers/test/TestFiles/CompilationFeatureDetectorTest/StartupWithUseSignalR.cs index 17159a411c..aa65f83258 100644 --- a/src/Analyzers/Analyzers/test/TestFiles/CompilationFeatureDetectorTest/StartupWithUseSignalR.cs +++ b/src/Analyzers/Analyzers/test/TestFiles/CompilationFeatureDetectorTest/StartupWithUseSignalR.cs @@ -9,10 +9,12 @@ namespace Microsoft.AspNetCore.Analyzers.TestFiles.CompilationFeatureDetectorTes { public void Configure(IApplicationBuilder app) { +#pragma warning disable CS0618 // Type or member is obsolete app.UseSignalR(routes => { }); +#pragma warning restore CS0618 // Type or member is obsolete } } } diff --git a/src/Components/Analyzers/src/ComponentFacts.cs b/src/Components/Analyzers/src/ComponentFacts.cs new file mode 100644 index 0000000000..031df5586f --- /dev/null +++ b/src/Components/Analyzers/src/ComponentFacts.cs @@ -0,0 +1,89 @@ +// 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.Linq; +using Microsoft.CodeAnalysis; + +namespace Microsoft.AspNetCore.Components.Analyzers +{ + internal static class ComponentFacts + { + public static bool IsAnyParameter(ComponentSymbols symbols, IPropertySymbol property) + { + if (symbols == null) + { + throw new ArgumentNullException(nameof(symbols)); + } + + if (property == null) + { + throw new ArgumentNullException(nameof(property)); + } + + return property.GetAttributes().Any(a => + { + return a.AttributeClass == symbols.ParameterAttribute || a.AttributeClass == symbols.CascadingParameterAttribute; + }); + } + + public static bool IsParameter(ComponentSymbols symbols, IPropertySymbol property) + { + if (symbols == null) + { + throw new ArgumentNullException(nameof(symbols)); + } + + if (property == null) + { + throw new ArgumentNullException(nameof(property)); + } + + return property.GetAttributes().Any(a => a.AttributeClass == symbols.ParameterAttribute); + } + + public static bool IsParameterWithCaptureUnmatchedValues(ComponentSymbols symbols, IPropertySymbol property) + { + if (symbols == null) + { + throw new ArgumentNullException(nameof(symbols)); + } + + if (property == null) + { + throw new ArgumentNullException(nameof(property)); + } + + var attribute = property.GetAttributes().FirstOrDefault(a => a.AttributeClass == symbols.ParameterAttribute); + if (attribute == null) + { + return false; + } + + foreach (var kvp in attribute.NamedArguments) + { + if (string.Equals(kvp.Key, ComponentsApi.ParameterAttribute.CaptureUnmatchedValues, StringComparison.Ordinal)) + { + return kvp.Value.Value as bool? ?? false; + } + } + + return false; + } + + public static bool IsCascadingParameter(ComponentSymbols symbols, IPropertySymbol property) + { + if (symbols == null) + { + throw new ArgumentNullException(nameof(symbols)); + } + + if (property == null) + { + throw new ArgumentNullException(nameof(property)); + } + + return property.GetAttributes().Any(a => a.AttributeClass == symbols.CascadingParameterAttribute); + } + } +} diff --git a/src/Components/Analyzers/src/ComponentParameterAnalyzer.cs b/src/Components/Analyzers/src/ComponentParameterAnalyzer.cs new file mode 100644 index 0000000000..20ad4ab6bd --- /dev/null +++ b/src/Components/Analyzers/src/ComponentParameterAnalyzer.cs @@ -0,0 +1,111 @@ +// 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.Collections.Immutable; +using System.Linq; +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.Diagnostics; + +namespace Microsoft.AspNetCore.Components.Analyzers +{ + [DiagnosticAnalyzer(LanguageNames.CSharp)] + public class ComponentParameterAnalyzer : DiagnosticAnalyzer + { + public ComponentParameterAnalyzer() + { + SupportedDiagnostics = ImmutableArray.Create(new[] + { + DiagnosticDescriptors.ComponentParametersShouldNotBePublic, + DiagnosticDescriptors.ComponentParameterCaptureUnmatchedValuesMustBeUnique, + DiagnosticDescriptors.ComponentParameterCaptureUnmatchedValuesHasWrongType, + }); + } + + public override ImmutableArray SupportedDiagnostics { get; } + + public override void Initialize(AnalysisContext context) + { + context.RegisterCompilationStartAction(context => + { + if (!ComponentSymbols.TryCreate(context.Compilation, out var symbols)) + { + // Types we need are not defined. + return; + } + + // This operates per-type because one of the validations we need has to look for duplicates + // defined on the same type. + context.RegisterSymbolStartAction(context => + { + var properties = new List(); + + var type = (INamedTypeSymbol)context.Symbol; + foreach (var member in type.GetMembers()) + { + if (member is IPropertySymbol property && ComponentFacts.IsAnyParameter(symbols, property)) + { + // Annotated with [Parameter] or [CascadingParameter] + properties.Add(property); + } + } + + if (properties.Count == 0) + { + return; + } + + context.RegisterSymbolEndAction(context => + { + var captureUnmatchedValuesParameters = new List(); + + // Per-property validations + foreach (var property in properties) + { + if (property.SetMethod?.DeclaredAccessibility == Accessibility.Public) + { + context.ReportDiagnostic(Diagnostic.Create( + DiagnosticDescriptors.ComponentParametersShouldNotBePublic, + property.Locations[0], + property.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat))); + } + + if (ComponentFacts.IsParameterWithCaptureUnmatchedValues(symbols, property)) + { + captureUnmatchedValuesParameters.Add(property); + + // Check the type, we need to be able to assign a Dictionary + var conversion = context.Compilation.ClassifyConversion(symbols.ParameterCaptureUnmatchedValuesRuntimeType, property.Type); + if (!conversion.Exists || conversion.IsExplicit) + { + context.ReportDiagnostic(Diagnostic.Create( + DiagnosticDescriptors.ComponentParameterCaptureUnmatchedValuesHasWrongType, + property.Locations[0], + property.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat), + property.Type.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat), + symbols.ParameterCaptureUnmatchedValuesRuntimeType.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat))); + } + } + } + + // Check if the type defines multiple CaptureUnmatchedValues parameters. Doing this outside the loop means we place the + // errors on the type. + if (captureUnmatchedValuesParameters.Count > 1) + { + context.ReportDiagnostic(Diagnostic.Create( + DiagnosticDescriptors.ComponentParameterCaptureUnmatchedValuesMustBeUnique, + context.Symbol.Locations[0], + type.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat), + Environment.NewLine, + string.Join( + Environment.NewLine, + captureUnmatchedValuesParameters.Select(p => p.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat)).OrderBy(n => n)))); + } + }); + }, SymbolKind.NamedType); + }); + } + } +} diff --git a/src/Components/Analyzers/src/ComponentParametersShouldNotBePublicAnalyzer.cs b/src/Components/Analyzers/src/ComponentParametersShouldNotBePublicAnalyzer.cs deleted file mode 100644 index a9ef40f12c..0000000000 --- a/src/Components/Analyzers/src/ComponentParametersShouldNotBePublicAnalyzer.cs +++ /dev/null @@ -1,76 +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 Microsoft.AspNetCore.Components.Shared; -using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.CSharp; -using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.Diagnostics; -using System.Collections.Immutable; -using System.Linq; - -namespace Microsoft.AspNetCore.Components.Analyzers -{ - [DiagnosticAnalyzer(LanguageNames.CSharp)] - public class ComponentParametersShouldNotBePublicAnalyzer : DiagnosticAnalyzer - { - public const string DiagnosticId = "BL9993"; - private const string Category = "Encapsulation"; - - private static readonly LocalizableString Title = new LocalizableResourceString(nameof(Resources.ComponentParametersShouldNotBePublic_Title), Resources.ResourceManager, typeof(Resources)); - private static readonly LocalizableString MessageFormat = new LocalizableResourceString(nameof(Resources.ComponentParametersShouldNotBePublic_Format), Resources.ResourceManager, typeof(Resources)); - private static readonly LocalizableString Description = new LocalizableResourceString(nameof(Resources.ComponentParametersShouldNotBePublic_Description), Resources.ResourceManager, typeof(Resources)); - private static DiagnosticDescriptor Rule = new DiagnosticDescriptor( - DiagnosticId, - Title, - MessageFormat, - Category, - DiagnosticSeverity.Warning, - isEnabledByDefault: true, - description: Description); - - public override ImmutableArray SupportedDiagnostics - => ImmutableArray.Create(Rule); - - public override void Initialize(AnalysisContext context) - { - context.RegisterSyntaxNodeAction(AnalyzeSyntax, SyntaxKind.PropertyDeclaration); - } - - private void AnalyzeSyntax(SyntaxNodeAnalysisContext context) - { - var semanticModel = context.SemanticModel; - var declaration = (PropertyDeclarationSyntax)context.Node; - - var parameterAttribute = declaration.AttributeLists - .SelectMany(list => list.Attributes) - .Where(attr => semanticModel.GetTypeInfo(attr).Type?.ToDisplayString() == ComponentsApi.ParameterAttribute.FullTypeName) - .FirstOrDefault(); - - if (parameterAttribute != null && IsPubliclySettable(declaration)) - { - var identifierText = declaration.Identifier.Text; - if (!string.IsNullOrEmpty(identifierText)) - { - context.ReportDiagnostic(Diagnostic.Create( - Rule, - declaration.GetLocation(), - identifierText)); - } - } - } - - private static bool IsPubliclySettable(PropertyDeclarationSyntax declaration) - { - // If the property has a setter explicitly marked private/protected/internal, then it's not public - var setter = declaration.AccessorList?.Accessors.SingleOrDefault(x => x.Keyword.IsKind(SyntaxKind.SetKeyword)); - if (setter != null && setter.Modifiers.Any(x => x.IsKind(SyntaxKind.PrivateKeyword) || x.IsKind(SyntaxKind.ProtectedKeyword) || x.IsKind(SyntaxKind.InternalKeyword))) - { - return false; - } - - // Otherwise fallback to the property declaration modifiers - return declaration.Modifiers.Any(x => x.IsKind(SyntaxKind.PublicKeyword)); - } - } -} diff --git a/src/Components/Analyzers/src/ComponentParametersShouldNotBePublicCodeFixProvider.cs b/src/Components/Analyzers/src/ComponentParametersShouldNotBePublicCodeFixProvider.cs index 001e761571..84555969b9 100644 --- a/src/Components/Analyzers/src/ComponentParametersShouldNotBePublicCodeFixProvider.cs +++ b/src/Components/Analyzers/src/ComponentParametersShouldNotBePublicCodeFixProvider.cs @@ -1,15 +1,15 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Collections.Immutable; +using System.Composition; +using System.Linq; +using System.Threading.Tasks; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CodeActions; using Microsoft.CodeAnalysis.CodeFixes; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; -using System.Collections.Immutable; -using System.Composition; -using System.Linq; -using System.Threading.Tasks; namespace Microsoft.AspNetCore.Components.Analyzers { @@ -19,7 +19,7 @@ namespace Microsoft.AspNetCore.Components.Analyzers private static readonly LocalizableString Title = new LocalizableResourceString(nameof(Resources.ComponentParametersShouldNotBePublic_FixTitle), Resources.ResourceManager, typeof(Resources)); public override ImmutableArray FixableDiagnosticIds - => ImmutableArray.Create(ComponentParametersShouldNotBePublicAnalyzer.DiagnosticId); + => ImmutableArray.Create(DiagnosticDescriptors.ComponentParametersShouldNotBePublic.Id); public sealed override FixAllProvider GetFixAllProvider() { diff --git a/src/Components/Analyzers/src/ComponentSymbols.cs b/src/Components/Analyzers/src/ComponentSymbols.cs new file mode 100644 index 0000000000..ba1bfc4869 --- /dev/null +++ b/src/Components/Analyzers/src/ComponentSymbols.cs @@ -0,0 +1,65 @@ +// 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 Microsoft.CodeAnalysis; + +namespace Microsoft.AspNetCore.Components.Analyzers +{ + internal class ComponentSymbols + { + public static bool TryCreate(Compilation compilation, out ComponentSymbols symbols) + { + if (compilation == null) + { + throw new ArgumentNullException(nameof(compilation)); + } + + var parameterAttribute = compilation.GetTypeByMetadataName(ComponentsApi.ParameterAttribute.MetadataName); + if (parameterAttribute == null) + { + symbols = null; + return false; + } + + var cascadingParameterAttribute = compilation.GetTypeByMetadataName(ComponentsApi.CascadingParameterAttribute.MetadataName); + if (cascadingParameterAttribute == null) + { + symbols = null; + return false; + } + + var dictionary = compilation.GetTypeByMetadataName("System.Collections.Generic.Dictionary`2"); + var @string = compilation.GetSpecialType(SpecialType.System_String); + var @object = compilation.GetSpecialType(SpecialType.System_Object); + if (dictionary == null || @string == null || @object == null) + { + symbols = null; + return false; + } + + var parameterCaptureUnmatchedValuesRuntimeType = dictionary.Construct(@string, @object); + + symbols = new ComponentSymbols(parameterAttribute, cascadingParameterAttribute, parameterCaptureUnmatchedValuesRuntimeType); + return true; + } + + private ComponentSymbols( + INamedTypeSymbol parameterAttribute, + INamedTypeSymbol cascadingParameterAttribute, + INamedTypeSymbol parameterCaptureUnmatchedValuesRuntimeType) + { + ParameterAttribute = parameterAttribute; + CascadingParameterAttribute = cascadingParameterAttribute; + ParameterCaptureUnmatchedValuesRuntimeType = parameterCaptureUnmatchedValuesRuntimeType; + } + + public INamedTypeSymbol ParameterAttribute { get; } + + // Dictionary + public INamedTypeSymbol ParameterCaptureUnmatchedValuesRuntimeType { get; } + + public INamedTypeSymbol CascadingParameterAttribute { get; } + } +} diff --git a/src/Components/Analyzers/src/ComponentsApi.cs b/src/Components/Analyzers/src/ComponentsApi.cs index fdb83c6f05..83eb39cc2c 100644 --- a/src/Components/Analyzers/src/ComponentsApi.cs +++ b/src/Components/Analyzers/src/ComponentsApi.cs @@ -1,7 +1,7 @@ // 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 Microsoft.AspNetCore.Components.Shared +namespace Microsoft.AspNetCore.Components.Analyzers { // Constants for type and method names used in code-generation // Keep these in sync with the actual definitions @@ -13,6 +13,14 @@ namespace Microsoft.AspNetCore.Components.Shared { public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.ParameterAttribute"; public static readonly string MetadataName = FullTypeName; + + public static readonly string CaptureUnmatchedValues = "CaptureUnmatchedValues"; + } + + public static class CascadingParameterAttribute + { + public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.CascadingParameterAttribute"; + public static readonly string MetadataName = FullTypeName; } } } diff --git a/src/Components/Analyzers/src/DiagnosticDescriptors.cs b/src/Components/Analyzers/src/DiagnosticDescriptors.cs new file mode 100644 index 0000000000..cb380e5646 --- /dev/null +++ b/src/Components/Analyzers/src/DiagnosticDescriptors.cs @@ -0,0 +1,41 @@ +// 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 Microsoft.CodeAnalysis; + +namespace Microsoft.AspNetCore.Components.Analyzers +{ + internal static class DiagnosticDescriptors + { + // Note: The Razor Compiler (including Components features) use the RZ prefix for diagnostics, so there's currently + // no change of clashing between that and the BL prefix used here. + // + // Tracking https://github.com/aspnet/AspNetCore/issues/10382 to rationalize this + public static readonly DiagnosticDescriptor ComponentParametersShouldNotBePublic = new DiagnosticDescriptor( + "BL0001", + new LocalizableResourceString(nameof(Resources.ComponentParametersShouldNotBePublic_Title), Resources.ResourceManager, typeof(Resources)), + new LocalizableResourceString(nameof(Resources.ComponentParametersShouldNotBePublic_Format), Resources.ResourceManager, typeof(Resources)), + "Encapsulation", + DiagnosticSeverity.Warning, + isEnabledByDefault: true, + description: new LocalizableResourceString(nameof(Resources.ComponentParametersShouldNotBePublic_Description), Resources.ResourceManager, typeof(Resources))); + + public static readonly DiagnosticDescriptor ComponentParameterCaptureUnmatchedValuesMustBeUnique = new DiagnosticDescriptor( + "BL0002", + new LocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesMustBeUnique_Title), Resources.ResourceManager, typeof(Resources)), + new LocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesMustBeUnique_Format), Resources.ResourceManager, typeof(Resources)), + "Usage", + DiagnosticSeverity.Warning, + isEnabledByDefault: true, + description: new LocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesMustBeUnique_Description), Resources.ResourceManager, typeof(Resources))); + + public static readonly DiagnosticDescriptor ComponentParameterCaptureUnmatchedValuesHasWrongType = new DiagnosticDescriptor( + "BL0003", + new LocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesHasWrongType_Title), Resources.ResourceManager, typeof(Resources)), + new LocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesHasWrongType_Format), Resources.ResourceManager, typeof(Resources)), + "Usage", + DiagnosticSeverity.Warning, + isEnabledByDefault: true, + description: new LocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesHasWrongType_Description), Resources.ResourceManager, typeof(Resources))); + } +} diff --git a/src/Components/Analyzers/src/Properties/AssemblyInfo.cs b/src/Components/Analyzers/src/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..6e6689b592 --- /dev/null +++ b/src/Components/Analyzers/src/Properties/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Analyzers.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/Components/Analyzers/src/Resources.Designer.cs b/src/Components/Analyzers/src/Resources.Designer.cs index df4ae809b0..e7f866fe08 100644 --- a/src/Components/Analyzers/src/Resources.Designer.cs +++ b/src/Components/Analyzers/src/Resources.Designer.cs @@ -10,7 +10,6 @@ namespace Microsoft.AspNetCore.Components.Analyzers { using System; - using System.Reflection; /// @@ -20,7 +19,7 @@ namespace Microsoft.AspNetCore.Components.Analyzers { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -40,7 +39,7 @@ namespace Microsoft.AspNetCore.Components.Analyzers { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.AspNetCore.Components.Analyzers.Resources", typeof(Resources).GetTypeInfo().Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.AspNetCore.Components.Analyzers.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; @@ -61,6 +60,60 @@ namespace Microsoft.AspNetCore.Components.Analyzers { } } + /// + /// Looks up a localized string similar to Component parameters with CaptureUnmatchedValuess must be a correct type.. + /// + internal static string ComponentParameterCaptureUnmatchedValuesHasWrongType_Description { + get { + return ResourceManager.GetString("ComponentParameterCaptureUnmatchedValuesHasWrongType_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Component parameter '{0}' defines CaptureUnmatchedValuess but has an unsupported type '{1}'. Use a type assignable from '{2}'.. + /// + internal static string ComponentParameterCaptureUnmatchedValuesHasWrongType_Format { + get { + return ResourceManager.GetString("ComponentParameterCaptureUnmatchedValuesHasWrongType_Format", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Component parameter with CaptureUnmatchedValues has the wrong type. + /// + internal static string ComponentParameterCaptureUnmatchedValuesHasWrongType_Title { + get { + return ResourceManager.GetString("ComponentParameterCaptureUnmatchedValuesHasWrongType_Title", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Components may only define a single parameter with CaptureUnmatchedValues.. + /// + internal static string ComponentParameterCaptureUnmatchedValuesMustBeUnique_Description { + get { + return ResourceManager.GetString("ComponentParameterCaptureUnmatchedValuesMustBeUnique_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Component type '{0}' defines properties multiple parameters with CaptureUnmatchedValues. Properties: {1}{2}. + /// + internal static string ComponentParameterCaptureUnmatchedValuesMustBeUnique_Format { + get { + return ResourceManager.GetString("ComponentParameterCaptureUnmatchedValuesMustBeUnique_Format", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Component has multiple CaptureUnmatchedValues parameters. + /// + internal static string ComponentParameterCaptureUnmatchedValuesMustBeUnique_Title { + get { + return ResourceManager.GetString("ComponentParameterCaptureUnmatchedValuesMustBeUnique_Title", resourceCulture); + } + } + /// /// Looks up a localized string similar to Component parameters should not have public setters.. /// diff --git a/src/Components/Analyzers/src/Resources.resx b/src/Components/Analyzers/src/Resources.resx index ec781527eb..2996ec3082 100644 --- a/src/Components/Analyzers/src/Resources.resx +++ b/src/Components/Analyzers/src/Resources.resx @@ -1,17 +1,17 @@ - @@ -129,4 +129,22 @@ Component parameter has public setter - \ No newline at end of file + + Components may only define a single parameter with CaptureUnmatchedValues. + + + Component type '{0}' defines properties multiple parameters with CaptureUnmatchedValues. Properties: {1}{2} + + + Component has multiple CaptureUnmatchedValues parameters + + + Component parameters with CaptureUnmatchedValues must be a correct type. + + + Component parameter '{0}' defines CaptureUnmatchedValues but has an unsupported type '{1}'. Use a type assignable from '{2}'. + + + Component parameter with CaptureUnmatchedValues has the wrong type + + diff --git a/src/Components/Analyzers/test/ComponentParameterCaptureUnmatchedValuesHasWrongTypeTest.cs b/src/Components/Analyzers/test/ComponentParameterCaptureUnmatchedValuesHasWrongTypeTest.cs new file mode 100644 index 0000000000..ba547ff85b --- /dev/null +++ b/src/Components/Analyzers/test/ComponentParameterCaptureUnmatchedValuesHasWrongTypeTest.cs @@ -0,0 +1,80 @@ +// 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 Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.Diagnostics; +using TestHelper; +using Xunit; + +namespace Microsoft.AspNetCore.Components.Analyzers.Test +{ + public class ComponentParameterCaptureUnmatchedValuesHasWrongTypeTest : DiagnosticVerifier + { + [Theory] + [InlineData("System.Collections.Generic.IEnumerable>")] + [InlineData("System.Collections.Generic.Dictionary")] + [InlineData("System.Collections.Generic.IDictionary")] + [InlineData("System.Collections.Generic.IReadOnlyDictionary")] + public void IgnoresPropertiesWithSupportedType(string propertyType) + { + var test = $@" + namespace ConsoleApplication1 + {{ + using {typeof(ParameterAttribute).Namespace}; + class TypeName + {{ + [Parameter(CaptureUnmatchedValues = true)] {propertyType} MyProperty {{ get; set; }} + }} + }}" + ComponentsTestDeclarations.Source; + + VerifyCSharpDiagnostic(test); + } + + [Fact] + public void IgnoresPropertiesWithCaptureUnmatchedValuesFalse() + { + var test = $@" + namespace ConsoleApplication1 + {{ + using {typeof(ParameterAttribute).Namespace}; + class TypeName + {{ + [Parameter(CaptureUnmatchedValues = false)] string MyProperty {{ get; set; }} + }} + }}" + ComponentsTestDeclarations.Source; + + VerifyCSharpDiagnostic(test); + } + + [Fact] + public void AddsDiagnosticForInvalidType() + { + var test = $@" + namespace ConsoleApplication1 + {{ + using {typeof(ParameterAttribute).Namespace}; + class TypeName + {{ + [Parameter(CaptureUnmatchedValues = true)] string MyProperty {{ get; set; }} + }} + }}" + ComponentsTestDeclarations.Source; + + VerifyCSharpDiagnostic(test, + new DiagnosticResult + { + Id = DiagnosticDescriptors.ComponentParameterCaptureUnmatchedValuesHasWrongType.Id, + Message = "Component parameter 'ConsoleApplication1.TypeName.MyProperty' defines CaptureUnmatchedValues but has an unsupported type 'string'. Use a type assignable from 'System.Collections.Generic.Dictionary'.", + Severity = DiagnosticSeverity.Warning, + Locations = new[] + { + new DiagnosticResultLocation("Test0.cs", 7, 63) + } + }); + } + + protected override DiagnosticAnalyzer GetCSharpDiagnosticAnalyzer() + { + return new ComponentParameterAnalyzer(); + } + } +} diff --git a/src/Components/Analyzers/test/ComponentParameterCaptureUnmatchedValuesMustBeUniqueTest.cs b/src/Components/Analyzers/test/ComponentParameterCaptureUnmatchedValuesMustBeUniqueTest.cs new file mode 100644 index 0000000000..7e2c919287 --- /dev/null +++ b/src/Components/Analyzers/test/ComponentParameterCaptureUnmatchedValuesMustBeUniqueTest.cs @@ -0,0 +1,69 @@ +// 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 Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.Diagnostics; +using TestHelper; +using Xunit; + +namespace Microsoft.AspNetCore.Components.Analyzers.Test +{ + public class ComponentParameterCaptureUnmatchedValuesMustBeUniqueTest : DiagnosticVerifier + { + [Fact] + public void IgnoresPropertiesWithCaptureUnmatchedValuesFalse() + { + var test = $@" + namespace ConsoleApplication1 + {{ + using System.Collections.Generic; + using {typeof(ParameterAttribute).Namespace}; + class TypeName + {{ + [Parameter(CaptureUnmatchedValues = false)] string MyProperty {{ get; set; }} + [Parameter(CaptureUnmatchedValues = true)] Dictionary MyOtherProperty {{ get; set; }} + }} + }}" + ComponentsTestDeclarations.Source; + + VerifyCSharpDiagnostic(test); + } + + [Fact] + public void AddsDiagnosticForMultipleCaptureUnmatchedValuesProperties() + { + var test = $@" + namespace ConsoleApplication1 + {{ + using System.Collections.Generic; + using {typeof(ParameterAttribute).Namespace}; + class TypeName + {{ + [Parameter(CaptureUnmatchedValues = true)] Dictionary MyProperty {{ get; set; }} + [Parameter(CaptureUnmatchedValues = true)] Dictionary MyOtherProperty {{ get; set; }} + }} + }}" + ComponentsTestDeclarations.Source; + + var message = @"Component type 'ConsoleApplication1.TypeName' defines properties multiple parameters with CaptureUnmatchedValues. Properties: " + Environment.NewLine + +"ConsoleApplication1.TypeName.MyOtherProperty" + Environment.NewLine + +"ConsoleApplication1.TypeName.MyProperty"; + + VerifyCSharpDiagnostic(test, + new DiagnosticResult + { + Id = DiagnosticDescriptors.ComponentParameterCaptureUnmatchedValuesMustBeUnique.Id, + Message = message, + Severity = DiagnosticSeverity.Warning, + Locations = new[] + { + new DiagnosticResultLocation("Test0.cs", 6, 15) + } + }); + } + + protected override DiagnosticAnalyzer GetCSharpDiagnosticAnalyzer() + { + return new ComponentParameterAnalyzer(); + } + } +} diff --git a/src/Components/Analyzers/test/ComponentParametersShouldNotBePublicTest.cs b/src/Components/Analyzers/test/ComponentParametersShouldNotBePublicTest.cs index 1a4f93a5a6..8d5df9053f 100644 --- a/src/Components/Analyzers/test/ComponentParametersShouldNotBePublicTest.cs +++ b/src/Components/Analyzers/test/ComponentParametersShouldNotBePublicTest.cs @@ -1,7 +1,6 @@ // 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 Microsoft.AspNetCore.Components; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CodeFixes; using Microsoft.CodeAnalysis.Diagnostics; @@ -12,15 +11,6 @@ namespace Microsoft.AspNetCore.Components.Analyzers.Test { public class ComponentParametersShouldNotBePublic : CodeFixVerifier { - static string ParameterSource = $@" - namespace {typeof(ParameterAttribute).Namespace} - {{ - public class {typeof(ParameterAttribute).Name} : System.Attribute - {{ - }} - }} -"; - [Fact] public void IgnoresPublicPropertiesWithoutParameterAttribute() { @@ -31,7 +21,7 @@ namespace Microsoft.AspNetCore.Components.Analyzers.Test { public string MyProperty { get; set; } } - }" + ParameterSource; + }" + ComponentsTestDeclarations.Source; VerifyCSharpDiagnostic(test); } @@ -48,10 +38,10 @@ namespace Microsoft.AspNetCore.Components.Analyzers.Test { [Parameter] string MyPropertyNoModifer { get; set; } [Parameter] private string MyPropertyPrivate { get; set; } - [Parameter] protected string MyPropertyProtected { get; set; } - [Parameter] internal string MyPropertyInternal { get; set; } + [CascadingParameter] protected string MyPropertyProtected { get; set; } + [CascadingParameter] internal string MyPropertyInternal { get; set; } } - }" + ParameterSource; + }" + ComponentsTestDeclarations.Source; VerifyCSharpDiagnostic(test); } @@ -67,29 +57,29 @@ namespace Microsoft.AspNetCore.Components.Analyzers.Test class TypeName { [Parameter] public string BadProperty1 { get; set; } - [Parameter] public object BadProperty2 { get; set; } + [CascadingParameter] public object BadProperty2 { get; set; } } - }" + ParameterSource; + }" + ComponentsTestDeclarations.Source; VerifyCSharpDiagnostic(test, new DiagnosticResult { - Id = "BL9993", - Message = "Component parameter 'BadProperty1' has a public setter, but component parameters should not be publicly settable.", + Id = DiagnosticDescriptors.ComponentParametersShouldNotBePublic.Id, + Message = "Component parameter 'ConsoleApplication1.TypeName.BadProperty1' has a public setter, but component parameters should not be publicly settable.", Severity = DiagnosticSeverity.Warning, Locations = new[] { - new DiagnosticResultLocation("Test0.cs", 8, 13) + new DiagnosticResultLocation("Test0.cs", 8, 39) } }, new DiagnosticResult { - Id = "BL9993", - Message = "Component parameter 'BadProperty2' has a public setter, but component parameters should not be publicly settable.", + Id = DiagnosticDescriptors.ComponentParametersShouldNotBePublic.Id, + Message = "Component parameter 'ConsoleApplication1.TypeName.BadProperty2' has a public setter, but component parameters should not be publicly settable.", Severity = DiagnosticSeverity.Warning, Locations = new[] { - new DiagnosticResultLocation("Test0.cs", 9, 13) + new DiagnosticResultLocation("Test0.cs", 9, 48) } }); @@ -101,9 +91,9 @@ namespace Microsoft.AspNetCore.Components.Analyzers.Test class TypeName { [Parameter] string BadProperty1 { get; set; } - [Parameter] object BadProperty2 { get; set; } + [CascadingParameter] object BadProperty2 { get; set; } } - }" + ParameterSource); + }" + ComponentsTestDeclarations.Source); } [Fact] @@ -120,7 +110,7 @@ namespace Microsoft.AspNetCore.Components.Analyzers.Test [Parameter] public object MyProperty2 { get; protected set; } [Parameter] public object MyProperty2 { get; internal set; } } - }" + ParameterSource; + }" + ComponentsTestDeclarations.Source; VerifyCSharpDiagnostic(test); } @@ -132,7 +122,7 @@ namespace Microsoft.AspNetCore.Components.Analyzers.Test protected override DiagnosticAnalyzer GetCSharpDiagnosticAnalyzer() { - return new ComponentParametersShouldNotBePublicAnalyzer(); + return new ComponentParameterAnalyzer(); } } } diff --git a/src/Components/Analyzers/test/ComponentsTestDeclarations.cs b/src/Components/Analyzers/test/ComponentsTestDeclarations.cs new file mode 100644 index 0000000000..e09f156ff4 --- /dev/null +++ b/src/Components/Analyzers/test/ComponentsTestDeclarations.cs @@ -0,0 +1,22 @@ +// 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 Microsoft.AspNetCore.Components.Analyzers +{ + public static class ComponentsTestDeclarations + { + public static readonly string Source = $@" + namespace {typeof(ParameterAttribute).Namespace} + {{ + public class {typeof(ParameterAttribute).Name} : System.Attribute + {{ + public bool CaptureUnmatchedValues {{ get; set; }} + }} + + public class {typeof(CascadingParameterAttribute).Name} : System.Attribute + {{ + }} + }} +"; + } +} diff --git a/src/Components/Blazor/Blazor/src/Hosting/WebAssemblyHostBuilder.cs b/src/Components/Blazor/Blazor/src/Hosting/WebAssemblyHostBuilder.cs index 8cf720e1ca..0b741cbd22 100644 --- a/src/Components/Blazor/Blazor/src/Hosting/WebAssemblyHostBuilder.cs +++ b/src/Components/Blazor/Blazor/src/Hosting/WebAssemblyHostBuilder.cs @@ -8,6 +8,8 @@ using Microsoft.AspNetCore.Blazor.Services; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Routing; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; +using Microsoft.Extensions.Logging; using Microsoft.JSInterop; namespace Microsoft.AspNetCore.Blazor.Hosting @@ -92,6 +94,7 @@ namespace Microsoft.AspNetCore.Blazor.Hosting services.AddSingleton(); services.AddSingleton(WebAssemblyUriHelper.Instance); services.AddSingleton(WebAssemblyNavigationInterception.Instance); + services.AddSingleton(); services.AddSingleton(s => { // Creating the URI helper needs to wait until the JS Runtime is initialized, so defer it. @@ -102,6 +105,10 @@ namespace Microsoft.AspNetCore.Blazor.Hosting }; }); + // Needed for authorization + services.AddOptions(); + services.TryAdd(ServiceDescriptor.Singleton(typeof(ILogger<>), typeof(WebAssemblyConsoleLogger<>))); + foreach (var configureServicesAction in _configureServicesActions) { configureServicesAction(_BrowserHostBuilderContext, services); diff --git a/src/Components/Blazor/Blazor/src/Http/WebAssemblyHttpMessageHandler.cs b/src/Components/Blazor/Blazor/src/Http/WebAssemblyHttpMessageHandler.cs index a7dbb6b9eb..955d5ee664 100644 --- a/src/Components/Blazor/Blazor/src/Http/WebAssemblyHttpMessageHandler.cs +++ b/src/Components/Blazor/Blazor/src/Http/WebAssemblyHttpMessageHandler.cs @@ -6,10 +6,11 @@ using System.Collections.Generic; using System.Linq; using System.Net; using System.Net.Http; +using System.Text.Json.Serialization; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Blazor.Services; -using Microsoft.JSInterop; +using Microsoft.AspNetCore.Components; namespace Microsoft.AspNetCore.Blazor.Http { @@ -59,7 +60,7 @@ namespace Microsoft.AspNetCore.Blazor.Http options.RequestInit = new RequestInit { Credentials = GetDefaultCredentialsString(), - Headers = GetHeadersAsStringArray(request), + Headers = GetHeaders(request), Method = request.Method.Method }; @@ -68,7 +69,7 @@ namespace Microsoft.AspNetCore.Blazor.Http "Blazor._internal.http.sendAsync", id, request.Content == null ? null : await request.Content.ReadAsByteArrayAsync(), - Json.Serialize(options)); + JsonSerializer.ToString(options, JsonSerializerOptionsProvider.Options)); return await tcs.Task; } @@ -99,7 +100,7 @@ namespace Microsoft.AspNetCore.Blazor.Http } else { - var responseDescriptor = Json.Deserialize(responseDescriptorJson); + var responseDescriptor = JsonSerializer.Parse(responseDescriptorJson, JsonSerializerOptionsProvider.Options); var responseContent = responseBodyData == null ? null : new ByteArrayContent(responseBodyData); var responseMessage = responseDescriptor.ToResponseMessage(responseContent); tcs.SetResult(responseMessage); @@ -114,10 +115,25 @@ namespace Microsoft.AspNetCore.Blazor.Http private static byte[] AllocateArray(string length) => new byte[int.Parse(length)]; #pragma warning restore IDE0051 // Remove unused private members - private string[][] GetHeadersAsStringArray(HttpRequestMessage request) - => (from header in request.Headers.Concat(request.Content?.Headers ?? Enumerable.Empty>>()) - from headerValue in header.Value // There can be more than one value for each name - select new[] { header.Key, headerValue }).ToArray(); + private static IReadOnlyList
GetHeaders(HttpRequestMessage request) + { + var requestHeaders = request.Headers.AsEnumerable(); + if (request.Content?.Headers != null) + { + requestHeaders = requestHeaders.Concat(request.Content.Headers); + } + + var headers = new List
(); + foreach (var item in requestHeaders) + { + foreach (var headerValue in item.Value) + { + headers.Add(new Header { Name = item.Key, Value = headerValue }); + } + } + + return headers; + } private static string GetDefaultCredentialsString() { @@ -147,7 +163,7 @@ namespace Microsoft.AspNetCore.Blazor.Http private class RequestInit { public string Credentials { get; set; } - public string[][] Headers { get; set; } + public IReadOnlyList
Headers { get; set; } public string Method { get; set; } } @@ -156,7 +172,7 @@ namespace Microsoft.AspNetCore.Blazor.Http #pragma warning disable 0649 public int StatusCode { get; set; } public string StatusText { get; set; } - public string[][] Headers { get; set; } + public IReadOnlyList
Headers { get; set; } #pragma warning restore 0649 public HttpResponseMessage ToResponseMessage(HttpContent content) @@ -168,14 +184,21 @@ namespace Microsoft.AspNetCore.Blazor.Http var contentHeaders = result.Content?.Headers; foreach (var pair in Headers) { - if (!headers.TryAddWithoutValidation(pair[0], pair[1])) + if (!headers.TryAddWithoutValidation(pair.Name, pair.Value)) { - contentHeaders?.TryAddWithoutValidation(pair[0], pair[1]); + contentHeaders?.TryAddWithoutValidation(pair.Name, pair.Value); } } return result; } } + + private class Header + { + public string Name { get; set; } + + public string Value { get; set; } + } } } diff --git a/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj b/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj index fe6a77482a..9dc8358ff5 100644 --- a/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj +++ b/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 diff --git a/src/Components/Blazor/Blazor/src/Services/WebAssemblyConsoleLogger.cs b/src/Components/Blazor/Blazor/src/Services/WebAssemblyConsoleLogger.cs new file mode 100644 index 0000000000..c86c1cf30b --- /dev/null +++ b/src/Components/Blazor/Blazor/src/Services/WebAssemblyConsoleLogger.cs @@ -0,0 +1,34 @@ +// 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 Microsoft.Extensions.Logging; + +namespace Microsoft.AspNetCore.Blazor.Services +{ + internal class WebAssemblyConsoleLogger : ILogger, ILogger + { + public IDisposable BeginScope(TState state) + { + return NoOpDisposable.Instance; + } + + public bool IsEnabled(LogLevel logLevel) + { + return logLevel >= LogLevel.Warning; + } + + public void Log(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func formatter) + { + var formattedMessage = formatter(state, exception); + Console.WriteLine($"[{logLevel}] {formattedMessage}"); + } + + private class NoOpDisposable : IDisposable + { + public static NoOpDisposable Instance = new NoOpDisposable(); + + public void Dispose() { } + } + } +} diff --git a/src/Components/Blazor/Blazor/src/Services/WebAssemblyLoggerFactory.cs b/src/Components/Blazor/Blazor/src/Services/WebAssemblyLoggerFactory.cs new file mode 100644 index 0000000000..73458387e7 --- /dev/null +++ b/src/Components/Blazor/Blazor/src/Services/WebAssemblyLoggerFactory.cs @@ -0,0 +1,23 @@ +// 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 Microsoft.Extensions.Logging; + +namespace Microsoft.AspNetCore.Blazor.Services +{ + internal class WebAssemblyLoggerFactory : ILoggerFactory + { + public void AddProvider(ILoggerProvider provider) + { + // No-op + } + + public ILogger CreateLogger(string categoryName) + => new WebAssemblyConsoleLogger(); + + public void Dispose() + { + // No-op + } + } +} diff --git a/src/Components/Blazor/BlazorExtension/src/source.extension.vsixmanifest b/src/Components/Blazor/BlazorExtension/src/source.extension.vsixmanifest index 85c5c76f40..64d36b9b99 100644 --- a/src/Components/Blazor/BlazorExtension/src/source.extension.vsixmanifest +++ b/src/Components/Blazor/BlazorExtension/src/source.extension.vsixmanifest @@ -12,7 +12,7 @@ Content\WebConfiguration.png - + diff --git a/src/Components/Blazor/Build/src/Core/BootJsonWriter.cs b/src/Components/Blazor/Build/src/Core/BootJsonWriter.cs index 50a09fa8b2..aeadd79018 100644 --- a/src/Components/Blazor/Build/src/Core/BootJsonWriter.cs +++ b/src/Components/Blazor/Build/src/Core/BootJsonWriter.cs @@ -1,12 +1,13 @@ // 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 Microsoft.JSInterop; -using Mono.Cecil; using System; using System.Collections.Generic; using System.IO; using System.Linq; +using System.Text.Json.Serialization; +using Microsoft.AspNetCore.Components; +using Mono.Cecil; namespace Microsoft.AspNetCore.Blazor.Build { @@ -40,7 +41,7 @@ namespace Microsoft.AspNetCore.Blazor.Build assemblyReferences, embeddedContent, linkerEnabled); - return Json.Serialize(data); + return JsonSerializer.ToString(data, JsonSerializerOptionsProvider.Options); } private static string GetAssemblyEntryPoint(string assemblyPath) diff --git a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj index 91715412db..4d5d245f45 100644 --- a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj +++ b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.0 @@ -47,4 +47,8 @@ + + + + diff --git a/src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs b/src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs index 864d78e4e9..44541b8909 100644 --- a/src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs +++ b/src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs @@ -39,8 +39,8 @@ namespace Test }")); var component = CompileToComponent(@" - -@functions { + +@code { public int ParentValue { get; set; } = 42; }"); @@ -76,8 +76,8 @@ namespace Test }")); var component = CompileToComponent(@" - -@functions { + +@code { public int ParentValue { get; set; } = 42; }"); @@ -113,8 +113,8 @@ namespace Test }")); var component = CompileToComponent(@" - -@functions { + +@code { public int ParentValue { get; set; } = 42; }"); @@ -150,8 +150,8 @@ namespace Test }")); var component = CompileToComponent(@" - -@functions { + +@code { public int ParentValue { get; set; } = 42; }"); @@ -183,8 +183,8 @@ namespace Test }")); var component = CompileToComponent(@" -
-@functions { +
+@code { public string ParentValue { get; set; } = ""hi""; }"); @@ -216,8 +216,8 @@ namespace Test }")); var component = CompileToComponent(@" -
-@functions { +
+@code { public string ParentValue { get; set; } = ""hi""; }"); @@ -251,8 +251,8 @@ namespace Test // Act var result = CompileToCSharp(@" -
-@functions { +
+@code { public string ParentValue { get; set; } = ""hi""; }"); @@ -260,7 +260,7 @@ namespace Test var diagnostic = Assert.Single(result.Diagnostics); Assert.Equal("RZ9989", diagnostic.Id); Assert.Equal( - "The attribute 'bind-value' was matched by multiple bind attributes. Duplicates:" + Environment.NewLine + + "The attribute '@bind-value' was matched by multiple bind attributes. Duplicates:" + Environment.NewLine + "Test.BindAttributes" + Environment.NewLine + "Test.BindAttributes", diagnostic.GetMessage()); @@ -271,8 +271,8 @@ namespace Test { // Arrange var component = CompileToComponent(@" - -@functions { + +@code { public int ParentValue { get; set; } = 42; }"); @@ -292,8 +292,8 @@ namespace Test { // Arrange var component = CompileToComponent(@" - -@functions { + +@code { public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); }"); @@ -314,8 +314,8 @@ namespace Test { // Arrange var component = CompileToComponent(@" - -@functions { + +@code { public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); public string Format { get; set; } = ""MM/dd/yyyy""; @@ -338,8 +338,8 @@ namespace Test { // Arrange var component = CompileToComponent(@" - -@functions { + +@code { public int ParentValue { get; set; } = 42; }"); @@ -360,8 +360,8 @@ namespace Test { // Arrange var component = CompileToComponent(@" - -@functions { + +@code { public bool Enabled { get; set; } }"); @@ -381,8 +381,8 @@ namespace Test { // Arrange var component = CompileToComponent(@" - -@functions { + +@code { public int ParentValue { get; set; } = 42; }"); @@ -403,8 +403,8 @@ namespace Test { // Arrange var component = CompileToComponent(@" - -@functions { + +@code { public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); }"); @@ -425,8 +425,8 @@ namespace Test { // Arrange var component = CompileToComponent(@" - -@functions { + +@code { public int ParentValue { get; set; } = 42; }"); @@ -448,8 +448,8 @@ namespace Test { // Arrange var component = CompileToComponent(@" - -@functions { + +@code { public int ParentValue { get; set; } = 42; }"); @@ -474,10 +474,10 @@ namespace Test { // Arrange var component = CompileToComponent(@" -
+
@(42.ToString())
-@functions { +@code { public int ParentValue { get; set; } = 42; }"); @@ -501,8 +501,8 @@ namespace Test { // Arrange & Act var generated = CompileToCSharp(@" - -@functions { + +@code { public string Text { get; set; } = ""text""; }"); @@ -516,8 +516,8 @@ namespace Test { // Arrange & Act var generated = CompileToCSharp(@" - -@functions { + +@code { public string Text { get; set; } = ""text""; }"); diff --git a/src/Components/Blazor/Build/test/ComponentRenderingRazorIntegrationTest.cs b/src/Components/Blazor/Build/test/ComponentRenderingRazorIntegrationTest.cs index ae8bb7b26d..0d69f27e1d 100644 --- a/src/Components/Blazor/Build/test/ComponentRenderingRazorIntegrationTest.cs +++ b/src/Components/Blazor/Build/test/ComponentRenderingRazorIntegrationTest.cs @@ -216,7 +216,7 @@ namespace Test var component = CompileToComponent($@" -@functions {{ +@code {{ private int counter; private void Increment(UIMouseEventArgs e) {{ counter++; @@ -261,7 +261,7 @@ namespace Test var component = CompileToComponent(@" -@functions { +@code { private int counter; private void Increment(UIEventArgs e) { counter++; @@ -445,8 +445,8 @@ namespace Test // Act var component = CompileToComponent(@" -

-@functions { +

+@code { public string ParentBgColor { get; set; } = ""#FFFFFF""; public void OnComponentHover(UIMouseEventArgs e) diff --git a/src/Components/Blazor/Build/test/GenericComponentRazorIntegrationTest.cs b/src/Components/Blazor/Build/test/GenericComponentRazorIntegrationTest.cs index 66073c06d7..b780161b0c 100644 --- a/src/Components/Blazor/Build/test/GenericComponentRazorIntegrationTest.cs +++ b/src/Components/Blazor/Build/test/GenericComponentRazorIntegrationTest.cs @@ -121,9 +121,9 @@ namespace Test AdditionalSyntaxTrees.Add(GenericContextComponent); var component = CompileToComponent(@" -() { 1, 2, })"" ref=""_my"" /> +() { 1, 2, })"" @ref=""_my"" /> -@functions { +@code { GenericContext _my; void Foo() { GC.KeepAlive(_my); } }"); @@ -188,9 +188,9 @@ namespace Test AdditionalSyntaxTrees.Add(GenericContextComponent); var component = CompileToComponent(@" -() { 1, 2, })"" ref=""_my"" /> +() { 1, 2, })"" @ref=""_my"" /> -@functions { +@code { GenericContext _my; void Foo() { GC.KeepAlive(_my); } }"); @@ -221,9 +221,9 @@ namespace Test var assembly = CompileToAssembly("Test.cshtml", @" @typeparam TItem - + -@functions { +@code { [Parameter] List MyItems { get; set; } GenericContext _my; void Foo() { GC.KeepAlive(_my); } diff --git a/src/Components/Blazor/Build/test/RenderingRazorIntegrationTest.cs b/src/Components/Blazor/Build/test/RenderingRazorIntegrationTest.cs index 4aea4cf230..815c5f16fe 100644 --- a/src/Components/Blazor/Build/test/RenderingRazorIntegrationTest.cs +++ b/src/Components/Blazor/Build/test/RenderingRazorIntegrationTest.cs @@ -64,7 +64,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test @foreach(var item in items) { @item } - @functions { + @code { string[] items = new[] { ""First"", ""Second"", ""Third"" }; } "); @@ -296,7 +296,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test // Arrange/Act var component = CompileToComponent( @" - @functions { + @code { public bool HandlerWasCalled { get; set; } = false; void MyHandleEvent(Microsoft.AspNetCore.Components.UIEventArgs eventArgs) @@ -340,8 +340,8 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test { // Arrange/Act var component = CompileToComponent( - @" - @functions { + @" + @code { public string MyValue { get; set; } = ""Initial value""; }"); var myValueProperty = component.GetType().GetProperty("MyValue"); @@ -375,8 +375,8 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test { // Arrange/Act var component = CompileToComponent( - @" - @functions { + @" + @code { public string MyValue { get; set; } = ""Initial value""; }"); var myValueProperty = component.GetType().GetProperty("MyValue"); @@ -410,8 +410,8 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test { // Arrange/Act var component = CompileToComponent( - @" - @functions { + @" + @code { public DateTime MyDate { get; set; } = new DateTime(2018, 3, 4, 1, 2, 3); }"); var myDateProperty = component.GetType().GetProperty("MyDate"); @@ -448,8 +448,8 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test // Arrange/Act var testDateFormat = "ddd yyyy-MM-dd"; var component = CompileToComponent( - $@" - @functions {{ + $@" + @code {{ public DateTime MyDate {{ get; set; }} = new DateTime(2018, 3, 4); }}"); var myDateProperty = component.GetType().GetProperty("MyDate"); @@ -483,7 +483,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test { // Arrange var component = CompileToComponent(@" - + -@functions { +@code { int currentCount = 0; void IncrementCount() diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/FetchData.razor b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/FetchData.razor index 2f8e580529..553979536a 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/FetchData.razor +++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/FetchData.razor @@ -35,7 +35,7 @@ else } -@functions { +@code { WeatherForecast[] forecasts; protected override async Task OnInitAsync() diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/NavMenu.razor b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/NavMenu.razor index 6fd8763b01..c8d815e926 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/NavMenu.razor +++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/NavMenu.razor @@ -1,11 +1,11 @@ 

BlazorHosted-CSharp -
-
+
  • @@ -25,7 +25,7 @@
-@functions { +@code { bool collapseNavMenu = true; string NavMenuCssClass => collapseNavMenu ? "collapse" : null; diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/SurveyPrompt.razor b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/SurveyPrompt.razor index 1db3c13c90..a126a15773 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/SurveyPrompt.razor +++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/SurveyPrompt.razor @@ -4,12 +4,12 @@ Please take our - brief survey + brief survey and tell us what you think.
-@functions { +@code { // Demonstrates how a parent component can supply parameters [Parameter] string Title { get; set; } } diff --git a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/Counter.razor b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/Counter.razor index 973af92354..1360f9eb12 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/Counter.razor +++ b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/Counter.razor @@ -4,9 +4,9 @@

Current count: @currentCount

- + -@functions { +@code { int currentCount = 0; void IncrementCount() diff --git a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/FetchData.razor b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/FetchData.razor index 3f5b9a9e49..a7dc14ae5c 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/FetchData.razor +++ b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/FetchData.razor @@ -34,7 +34,7 @@ else } -@functions { +@code { WeatherForecast[] forecasts; protected override async Task OnInitAsync() diff --git a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/NavMenu.razor b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/NavMenu.razor index c5904d3bd6..4e287bb4f8 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/NavMenu.razor +++ b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/NavMenu.razor @@ -1,11 +1,11 @@ 
BlazorStandalone-CSharp -
-
+
  • @@ -25,7 +25,7 @@
-@functions { +@code { bool collapseNavMenu = true; string NavMenuCssClass => collapseNavMenu ? "collapse" : null; diff --git a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/SurveyPrompt.razor b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/SurveyPrompt.razor index 1db3c13c90..a126a15773 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/SurveyPrompt.razor +++ b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/SurveyPrompt.razor @@ -4,12 +4,12 @@ Please take our - brief survey + brief survey and tell us what you think.
-@functions { +@code { // Demonstrates how a parent component can supply parameters [Parameter] string Title { get; set; } } diff --git a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Index.razor b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Index.razor index 870c79b1a4..7509137e37 100644 --- a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Index.razor +++ b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Index.razor @@ -3,7 +3,7 @@ Hello, world! -@functions { +@code { protected override void OnAfterRender() { BenchmarkEvent.Send(JSRuntime, "Rendered index.cshtml"); diff --git a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Json.razor b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Json.razor index 9deb601126..81282c22e1 100644 --- a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Json.razor +++ b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Json.razor @@ -1,12 +1,13 @@ @page "/json" +@using System.Text.Json.Serialization @inject IJSRuntime JSRuntime

JSON performance

-

+

- - + + 

@serializedValue

@if (serializedValue != null) @@ -14,15 +15,15 @@

Serialized length: @serializedValue.Length chars

} - - + + @if (numPeopleDeserialized > 0) {

Deserialized @numPeopleDeserialized people

} -@functions { +@code { static string[] Clearances = new[] { "Alpha", "Beta", "Gamma", "Delta", "Epsilon" }; Person smallOrgChart = GenerateOrgChart(1, 4); Person largeOrgChart = GenerateOrgChart(5, 4); @@ -32,8 +33,8 @@ protected override void OnInit() { - smallOrgChartJson = Microsoft.JSInterop.Json.Serialize(smallOrgChart); - largeOrgChartJson = Microsoft.JSInterop.Json.Serialize(largeOrgChart); + smallOrgChartJson = JsonSerializer.ToString(smallOrgChart); + largeOrgChartJson = JsonSerializer.ToString(largeOrgChart); } protected override void OnAfterRender() @@ -50,10 +51,10 @@ } void SerializeSmall() - => serializedValue = Microsoft.JSInterop.Json.Serialize(smallOrgChart); + => serializedValue = JsonSerializer.ToString(smallOrgChart); void SerializeLarge() - => serializedValue = Microsoft.JSInterop.Json.Serialize(largeOrgChart); + => serializedValue = JsonSerializer.ToString(largeOrgChart); void DeserializeSmall() => numPeopleDeserialized = Deserialize(smallOrgChartJson); @@ -80,7 +81,7 @@ static int Deserialize(string json) { - var ceo = Microsoft.JSInterop.Json.Deserialize(json); + var ceo = JsonSerializer.Parse(json); return CountPeople(ceo); } diff --git a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/RenderList.razor b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/RenderList.razor index 0a9ad97997..49d3b9898e 100644 --- a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/RenderList.razor +++ b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/RenderList.razor @@ -3,9 +3,9 @@

Render List

-Number of items: - - +Number of items: + + @if (show) { @@ -32,7 +32,7 @@ Number of items: } -@functions { +@code { int numItems = 10; bool show = false; diff --git a/src/Components/Blazor/testassets/StandaloneApp/Pages/Counter.razor b/src/Components/Blazor/testassets/StandaloneApp/Pages/Counter.razor index 973af92354..ea87f6be2d 100644 --- a/src/Components/Blazor/testassets/StandaloneApp/Pages/Counter.razor +++ b/src/Components/Blazor/testassets/StandaloneApp/Pages/Counter.razor @@ -1,12 +1,12 @@ -@page "/counter" +@page "/counter"

Counter

Current count: @currentCount

- + -@functions { +@code { int currentCount = 0; void IncrementCount() diff --git a/src/Components/Blazor/testassets/StandaloneApp/Pages/FetchData.razor b/src/Components/Blazor/testassets/StandaloneApp/Pages/FetchData.razor index 0ecea85876..9024a800a7 100644 --- a/src/Components/Blazor/testassets/StandaloneApp/Pages/FetchData.razor +++ b/src/Components/Blazor/testassets/StandaloneApp/Pages/FetchData.razor @@ -43,7 +43,7 @@ else

} -@functions { +@code { [Parameter] DateTime StartDate { get; set; } WeatherForecast[] forecasts; diff --git a/src/Components/Blazor/testassets/StandaloneApp/Shared/NavMenu.razor b/src/Components/Blazor/testassets/StandaloneApp/Shared/NavMenu.razor index c2824be334..880f7be389 100644 --- a/src/Components/Blazor/testassets/StandaloneApp/Shared/NavMenu.razor +++ b/src/Components/Blazor/testassets/StandaloneApp/Shared/NavMenu.razor @@ -1,11 +1,11 @@ -
+
Blazor app -
-
+
  • @@ -25,7 +25,7 @@
-@functions { +@code { bool collapseNavMenu = true; void ToggleNavMenu() diff --git a/src/Components/Browser.JS/.npmrc b/src/Components/Browser.JS/.npmrc new file mode 100644 index 0000000000..97ee76c3db Binary files /dev/null and b/src/Components/Browser.JS/.npmrc differ diff --git a/src/Components/Browser.JS/Microsoft.AspNetCore.Components.Browser.JS.npmproj b/src/Components/Browser.JS/Microsoft.AspNetCore.Components.Browser.JS.npmproj index a2b3a46cbe..e201a0d04b 100644 --- a/src/Components/Browser.JS/Microsoft.AspNetCore.Components.Browser.JS.npmproj +++ b/src/Components/Browser.JS/Microsoft.AspNetCore.Components.Browser.JS.npmproj @@ -7,23 +7,11 @@ - - - - - + - - - - - - - + diff --git a/src/Components/Browser.JS/dist/.gitattributes b/src/Components/Browser.JS/dist/.gitattributes new file mode 100644 index 0000000000..f88096f735 --- /dev/null +++ b/src/Components/Browser.JS/dist/.gitattributes @@ -0,0 +1,2 @@ +*.js -diff -merge +*.js linguist-generated=true diff --git a/src/Components/Browser.JS/dist/Debug/blazor.server.js b/src/Components/Browser.JS/dist/Debug/blazor.server.js index ff1007d3f7..199f92764c 100644 --- a/src/Components/Browser.JS/dist/Debug/blazor.server.js +++ b/src/Components/Browser.JS/dist/Debug/blazor.server.js @@ -177,9 +177,9 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MessagePackHubProtocol", function() { return MessagePackHubProtocol; }); /* harmony import */ var buffer__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! buffer */ "../node_modules/buffer/index.js"); /* harmony import */ var buffer__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(buffer__WEBPACK_IMPORTED_MODULE_0__); -/* harmony import */ var msgpack5__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! msgpack5 */ "../node_modules/msgpack5/index.js"); +/* harmony import */ var msgpack5__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! msgpack5 */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/msgpack5/index.js"); /* harmony import */ var msgpack5__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(msgpack5__WEBPACK_IMPORTED_MODULE_1__); -/* harmony import */ var _aspnet_signalr__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @aspnet/signalr */ "../node_modules/@aspnet/signalr/dist/esm/index.js"); +/* harmony import */ var _aspnet_signalr__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @aspnet/signalr */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/index.js"); /* harmony import */ var _BinaryMessageFormat__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./BinaryMessageFormat */ "../node_modules/@aspnet/signalr-protocol-msgpack/dist/esm/BinaryMessageFormat.js"); /* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./Utils */ "../node_modules/@aspnet/signalr-protocol-msgpack/dist/esm/Utils.js"); // Copyright (c) .NET Foundation. All rights reserved. @@ -203,10 +203,13 @@ var MessagePackHubProtocol = /** @class */ (function () { this.version = 1; /** The TransferFormat of the protocol. */ this.transferFormat = _aspnet_signalr__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"].Binary; + this.errorResult = 1; + this.voidResult = 2; + this.nonVoidResult = 3; } /** Creates an array of HubMessage objects from the specified serialized representation. * - * @param {ArrayBuffer | Buffer} input An ArrayBuffer containing the serialized representation. + * @param {ArrayBuffer | Buffer} input An ArrayBuffer or Buffer containing the serialized representation. * @param {ILogger} logger A logger that will be used to log messages that occur during parsing. */ MessagePackHubProtocol.prototype.parseMessages = function (input, logger) { @@ -241,10 +244,13 @@ var MessagePackHubProtocol = /** @class */ (function () { case _aspnet_signalr__WEBPACK_IMPORTED_MODULE_2__["MessageType"].StreamInvocation: return this.writeStreamInvocation(message); case _aspnet_signalr__WEBPACK_IMPORTED_MODULE_2__["MessageType"].StreamItem: + return this.writeStreamItem(message); case _aspnet_signalr__WEBPACK_IMPORTED_MODULE_2__["MessageType"].Completion: - throw new Error("Writing messages of type '" + message.type + "' is not supported."); + return this.writeCompletion(message); case _aspnet_signalr__WEBPACK_IMPORTED_MODULE_2__["MessageType"].Ping: return _BinaryMessageFormat__WEBPACK_IMPORTED_MODULE_3__["BinaryMessageFormat"].write(SERIALIZED_PING_MESSAGE); + case _aspnet_signalr__WEBPACK_IMPORTED_MODULE_2__["MessageType"].CancelInvocation: + return this.writeCancelInvocation(message); default: throw new Error("Invalid message type."); } @@ -308,6 +314,7 @@ var MessagePackHubProtocol = /** @class */ (function () { arguments: properties[4], headers: headers, invocationId: invocationId, + streamIds: [], target: properties[3], type: _aspnet_signalr__WEBPACK_IMPORTED_MODULE_2__["MessageType"].Invocation, }; @@ -316,6 +323,7 @@ var MessagePackHubProtocol = /** @class */ (function () { return { arguments: properties[4], headers: headers, + streamIds: [], target: properties[3], type: _aspnet_signalr__WEBPACK_IMPORTED_MODULE_2__["MessageType"].Invocation, }; @@ -338,20 +346,17 @@ var MessagePackHubProtocol = /** @class */ (function () { if (properties.length < 4) { throw new Error("Invalid payload for Completion message."); } - var errorResult = 1; - var voidResult = 2; - var nonVoidResult = 3; var resultKind = properties[3]; - if (resultKind !== voidResult && properties.length < 5) { + if (resultKind !== this.voidResult && properties.length < 5) { throw new Error("Invalid payload for Completion message."); } var error; var result; switch (resultKind) { - case errorResult: + case this.errorResult: error = properties[4]; break; - case nonVoidResult: + case this.nonVoidResult: result = properties[4]; break; } @@ -367,13 +372,41 @@ var MessagePackHubProtocol = /** @class */ (function () { MessagePackHubProtocol.prototype.writeInvocation = function (invocationMessage) { var msgpack = msgpack5__WEBPACK_IMPORTED_MODULE_1__(); var payload = msgpack.encode([_aspnet_signalr__WEBPACK_IMPORTED_MODULE_2__["MessageType"].Invocation, invocationMessage.headers || {}, invocationMessage.invocationId || null, - invocationMessage.target, invocationMessage.arguments]); + invocationMessage.target, invocationMessage.arguments, invocationMessage.streamIds]); return _BinaryMessageFormat__WEBPACK_IMPORTED_MODULE_3__["BinaryMessageFormat"].write(payload.slice()); }; MessagePackHubProtocol.prototype.writeStreamInvocation = function (streamInvocationMessage) { var msgpack = msgpack5__WEBPACK_IMPORTED_MODULE_1__(); var payload = msgpack.encode([_aspnet_signalr__WEBPACK_IMPORTED_MODULE_2__["MessageType"].StreamInvocation, streamInvocationMessage.headers || {}, streamInvocationMessage.invocationId, - streamInvocationMessage.target, streamInvocationMessage.arguments]); + streamInvocationMessage.target, streamInvocationMessage.arguments, streamInvocationMessage.streamIds]); + return _BinaryMessageFormat__WEBPACK_IMPORTED_MODULE_3__["BinaryMessageFormat"].write(payload.slice()); + }; + MessagePackHubProtocol.prototype.writeStreamItem = function (streamItemMessage) { + var msgpack = msgpack5__WEBPACK_IMPORTED_MODULE_1__(); + var payload = msgpack.encode([_aspnet_signalr__WEBPACK_IMPORTED_MODULE_2__["MessageType"].StreamItem, streamItemMessage.headers || {}, streamItemMessage.invocationId, + streamItemMessage.item]); + return _BinaryMessageFormat__WEBPACK_IMPORTED_MODULE_3__["BinaryMessageFormat"].write(payload.slice()); + }; + MessagePackHubProtocol.prototype.writeCompletion = function (completionMessage) { + var msgpack = msgpack5__WEBPACK_IMPORTED_MODULE_1__(); + var resultKind = completionMessage.error ? this.errorResult : completionMessage.result ? this.nonVoidResult : this.voidResult; + var payload; + switch (resultKind) { + case this.errorResult: + payload = msgpack.encode([_aspnet_signalr__WEBPACK_IMPORTED_MODULE_2__["MessageType"].Completion, completionMessage.headers || {}, completionMessage.invocationId, resultKind, completionMessage.error]); + break; + case this.voidResult: + payload = msgpack.encode([_aspnet_signalr__WEBPACK_IMPORTED_MODULE_2__["MessageType"].Completion, completionMessage.headers || {}, completionMessage.invocationId, resultKind]); + break; + case this.nonVoidResult: + payload = msgpack.encode([_aspnet_signalr__WEBPACK_IMPORTED_MODULE_2__["MessageType"].Completion, completionMessage.headers || {}, completionMessage.invocationId, resultKind, completionMessage.result]); + break; + } + return _BinaryMessageFormat__WEBPACK_IMPORTED_MODULE_3__["BinaryMessageFormat"].write(payload.slice()); + }; + MessagePackHubProtocol.prototype.writeCancelInvocation = function (cancelInvocationMessage) { + var msgpack = msgpack5__WEBPACK_IMPORTED_MODULE_1__(); + var payload = msgpack.encode([_aspnet_signalr__WEBPACK_IMPORTED_MODULE_2__["MessageType"].CancelInvocation, cancelInvocationMessage.headers || {}, cancelInvocationMessage.invocationId]); return _BinaryMessageFormat__WEBPACK_IMPORTED_MODULE_3__["BinaryMessageFormat"].write(payload.slice()); }; MessagePackHubProtocol.prototype.readHeaders = function (properties) { @@ -431,12 +464,7627 @@ __webpack_require__.r(__webpack_exports__); // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Version token that will be replaced by the prepack command /** The version of the SignalR Message Pack protocol library. */ -var VERSION = "1.1.0"; +var VERSION = "0.0.0-DEV_BUILD"; //# sourceMappingURL=index.js.map /***/ }), +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/AbortController.js": +/*!*****************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/AbortController.js ***! + \*****************************************************************************************************************/ +/*! exports provided: AbortController */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AbortController", function() { return AbortController; }); +// 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. +// Rough polyfill of https://developer.mozilla.org/en-US/docs/Web/API/AbortController +// We don't actually ever use the API being polyfilled, we always use the polyfill because +// it's a very new API right now. +// Not exported from index. +/** @private */ +var AbortController = /** @class */ (function () { + function AbortController() { + this.isAborted = false; + this.onabort = null; + } + AbortController.prototype.abort = function () { + if (!this.isAborted) { + this.isAborted = true; + if (this.onabort) { + this.onabort(); + } + } + }; + Object.defineProperty(AbortController.prototype, "signal", { + get: function () { + return this; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(AbortController.prototype, "aborted", { + get: function () { + return this.isAborted; + }, + enumerable: true, + configurable: true + }); + return AbortController; +}()); + +//# sourceMappingURL=AbortController.js.map + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/DefaultHttpClient.js": +/*!*******************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/DefaultHttpClient.js ***! + \*******************************************************************************************************************/ +/*! exports provided: DefaultHttpClient */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DefaultHttpClient", function() { return DefaultHttpClient; }); +/* harmony import */ var _Errors__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Errors */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Errors.js"); +/* harmony import */ var _HttpClient__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./HttpClient */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/HttpClient.js"); +/* harmony import */ var _NodeHttpClient__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./NodeHttpClient */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/NodeHttpClient.js"); +/* harmony import */ var _XhrHttpClient__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./XhrHttpClient */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/XhrHttpClient.js"); +// 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. +var __extends = (undefined && undefined.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); + + + + +/** Default implementation of {@link @aspnet/signalr.HttpClient}. */ +var DefaultHttpClient = /** @class */ (function (_super) { + __extends(DefaultHttpClient, _super); + /** Creates a new instance of the {@link @aspnet/signalr.DefaultHttpClient}, using the provided {@link @aspnet/signalr.ILogger} to log messages. */ + function DefaultHttpClient(logger) { + var _this = _super.call(this) || this; + if (typeof XMLHttpRequest !== "undefined") { + _this.httpClient = new _XhrHttpClient__WEBPACK_IMPORTED_MODULE_3__["XhrHttpClient"](logger); + } + else { + _this.httpClient = new _NodeHttpClient__WEBPACK_IMPORTED_MODULE_2__["NodeHttpClient"](logger); + } + return _this; + } + /** @inheritDoc */ + DefaultHttpClient.prototype.send = function (request) { + // Check that abort was not signaled before calling send + if (request.abortSignal && request.abortSignal.aborted) { + return Promise.reject(new _Errors__WEBPACK_IMPORTED_MODULE_0__["AbortError"]()); + } + if (!request.method) { + return Promise.reject(new Error("No method defined.")); + } + if (!request.url) { + return Promise.reject(new Error("No url defined.")); + } + return this.httpClient.send(request); + }; + DefaultHttpClient.prototype.getCookieString = function (url) { + return this.httpClient.getCookieString(url); + }; + return DefaultHttpClient; +}(_HttpClient__WEBPACK_IMPORTED_MODULE_1__["HttpClient"])); + +//# sourceMappingURL=DefaultHttpClient.js.map + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/DefaultReconnectPolicy.js": +/*!************************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/DefaultReconnectPolicy.js ***! + \************************************************************************************************************************/ +/*! exports provided: DefaultReconnectPolicy */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DefaultReconnectPolicy", function() { return DefaultReconnectPolicy; }); +// 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. +// 0, 2, 10, 30 second delays before reconnect attempts. +var DEFAULT_RETRY_DELAYS_IN_MILLISECONDS = [0, 2000, 10000, 30000, null]; +/** @private */ +var DefaultReconnectPolicy = /** @class */ (function () { + function DefaultReconnectPolicy(retryDelays) { + this.retryDelays = retryDelays !== undefined ? retryDelays.concat([null]) : DEFAULT_RETRY_DELAYS_IN_MILLISECONDS; + } + DefaultReconnectPolicy.prototype.nextRetryDelayInMilliseconds = function (previousRetryCount) { + return this.retryDelays[previousRetryCount]; + }; + return DefaultReconnectPolicy; +}()); + +//# sourceMappingURL=DefaultReconnectPolicy.js.map + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Errors.js": +/*!********************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Errors.js ***! + \********************************************************************************************************/ +/*! exports provided: HttpError, TimeoutError, AbortError */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HttpError", function() { return HttpError; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return TimeoutError; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AbortError", function() { return AbortError; }); +// 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. +var __extends = (undefined && undefined.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +/** Error thrown when an HTTP request fails. */ +var HttpError = /** @class */ (function (_super) { + __extends(HttpError, _super); + /** Constructs a new instance of {@link @aspnet/signalr.HttpError}. + * + * @param {string} errorMessage A descriptive error message. + * @param {number} statusCode The HTTP status code represented by this error. + */ + function HttpError(errorMessage, statusCode) { + var _newTarget = this.constructor; + var _this = this; + var trueProto = _newTarget.prototype; + _this = _super.call(this, errorMessage) || this; + _this.statusCode = statusCode; + // Workaround issue in Typescript compiler + // https://github.com/Microsoft/TypeScript/issues/13965#issuecomment-278570200 + _this.__proto__ = trueProto; + return _this; + } + return HttpError; +}(Error)); + +/** Error thrown when a timeout elapses. */ +var TimeoutError = /** @class */ (function (_super) { + __extends(TimeoutError, _super); + /** Constructs a new instance of {@link @aspnet/signalr.TimeoutError}. + * + * @param {string} errorMessage A descriptive error message. + */ + function TimeoutError(errorMessage) { + var _newTarget = this.constructor; + if (errorMessage === void 0) { errorMessage = "A timeout occurred."; } + var _this = this; + var trueProto = _newTarget.prototype; + _this = _super.call(this, errorMessage) || this; + // Workaround issue in Typescript compiler + // https://github.com/Microsoft/TypeScript/issues/13965#issuecomment-278570200 + _this.__proto__ = trueProto; + return _this; + } + return TimeoutError; +}(Error)); + +/** Error thrown when an action is aborted. */ +var AbortError = /** @class */ (function (_super) { + __extends(AbortError, _super); + /** Constructs a new instance of {@link AbortError}. + * + * @param {string} errorMessage A descriptive error message. + */ + function AbortError(errorMessage) { + var _newTarget = this.constructor; + if (errorMessage === void 0) { errorMessage = "An abort occurred."; } + var _this = this; + var trueProto = _newTarget.prototype; + _this = _super.call(this, errorMessage) || this; + // Workaround issue in Typescript compiler + // https://github.com/Microsoft/TypeScript/issues/13965#issuecomment-278570200 + _this.__proto__ = trueProto; + return _this; + } + return AbortError; +}(Error)); + +//# sourceMappingURL=Errors.js.map + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/HandshakeProtocol.js": +/*!*******************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/HandshakeProtocol.js ***! + \*******************************************************************************************************************/ +/*! exports provided: HandshakeProtocol */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* WEBPACK VAR INJECTION */(function(Buffer) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HandshakeProtocol", function() { return HandshakeProtocol; }); +/* harmony import */ var _TextMessageFormat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./TextMessageFormat */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/TextMessageFormat.js"); +/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Utils */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Utils.js"); +// 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. + + +/** @private */ +var HandshakeProtocol = /** @class */ (function () { + function HandshakeProtocol() { + } + // Handshake request is always JSON + HandshakeProtocol.prototype.writeHandshakeRequest = function (handshakeRequest) { + return _TextMessageFormat__WEBPACK_IMPORTED_MODULE_0__["TextMessageFormat"].write(JSON.stringify(handshakeRequest)); + }; + HandshakeProtocol.prototype.parseHandshakeResponse = function (data) { + var responseMessage; + var messageData; + var remainingData; + if (Object(_Utils__WEBPACK_IMPORTED_MODULE_1__["isArrayBuffer"])(data) || (typeof Buffer !== "undefined" && data instanceof Buffer)) { + // Format is binary but still need to read JSON text from handshake response + var binaryData = new Uint8Array(data); + var separatorIndex = binaryData.indexOf(_TextMessageFormat__WEBPACK_IMPORTED_MODULE_0__["TextMessageFormat"].RecordSeparatorCode); + if (separatorIndex === -1) { + throw new Error("Message is incomplete."); + } + // content before separator is handshake response + // optional content after is additional messages + var responseLength = separatorIndex + 1; + messageData = String.fromCharCode.apply(null, binaryData.slice(0, responseLength)); + remainingData = (binaryData.byteLength > responseLength) ? binaryData.slice(responseLength).buffer : null; + } + else { + var textData = data; + var separatorIndex = textData.indexOf(_TextMessageFormat__WEBPACK_IMPORTED_MODULE_0__["TextMessageFormat"].RecordSeparator); + if (separatorIndex === -1) { + throw new Error("Message is incomplete."); + } + // content before separator is handshake response + // optional content after is additional messages + var responseLength = separatorIndex + 1; + messageData = textData.substring(0, responseLength); + remainingData = (textData.length > responseLength) ? textData.substring(responseLength) : null; + } + // At this point we should have just the single handshake message + var messages = _TextMessageFormat__WEBPACK_IMPORTED_MODULE_0__["TextMessageFormat"].parse(messageData); + var response = JSON.parse(messages[0]); + if (response.type) { + throw new Error("Expected a handshake response from the server."); + } + responseMessage = response; + // multiple messages could have arrived with handshake + // return additional data to be parsed as usual, or null if all parsed + return [remainingData, responseMessage]; + }; + return HandshakeProtocol; +}()); + +//# sourceMappingURL=HandshakeProtocol.js.map +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../../../../../../buffer/index.js */ "../node_modules/buffer/index.js").Buffer)) + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/HttpClient.js": +/*!************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/HttpClient.js ***! + \************************************************************************************************************/ +/*! exports provided: HttpResponse, HttpClient */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HttpResponse", function() { return HttpResponse; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HttpClient", function() { return HttpClient; }); +// 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. +var __assign = (undefined && undefined.__assign) || Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; +}; +/** Represents an HTTP response. */ +var HttpResponse = /** @class */ (function () { + function HttpResponse(statusCode, statusText, content) { + this.statusCode = statusCode; + this.statusText = statusText; + this.content = content; + } + return HttpResponse; +}()); + +/** Abstraction over an HTTP client. + * + * This class provides an abstraction over an HTTP client so that a different implementation can be provided on different platforms. + */ +var HttpClient = /** @class */ (function () { + function HttpClient() { + } + HttpClient.prototype.get = function (url, options) { + return this.send(__assign({}, options, { method: "GET", url: url })); + }; + HttpClient.prototype.post = function (url, options) { + return this.send(__assign({}, options, { method: "POST", url: url })); + }; + HttpClient.prototype.delete = function (url, options) { + return this.send(__assign({}, options, { method: "DELETE", url: url })); + }; + /** Gets all cookies that apply to the specified URL. + * + * @param url The URL that the cookies are valid for. + * @returns {string} A string containing all the key-value cookie pairs for the specified URL. + */ + // @ts-ignore + HttpClient.prototype.getCookieString = function (url) { + return ""; + }; + return HttpClient; +}()); + +//# sourceMappingURL=HttpClient.js.map + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/HttpConnection.js": +/*!****************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/HttpConnection.js ***! + \****************************************************************************************************************/ +/*! exports provided: HttpConnection, TransportSendQueue */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HttpConnection", function() { return HttpConnection; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TransportSendQueue", function() { return TransportSendQueue; }); +/* harmony import */ var _DefaultHttpClient__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./DefaultHttpClient */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/DefaultHttpClient.js"); +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./ILogger */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ILogger.js"); +/* harmony import */ var _ITransport__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./ITransport */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ITransport.js"); +/* harmony import */ var _LongPollingTransport__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./LongPollingTransport */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/LongPollingTransport.js"); +/* harmony import */ var _ServerSentEventsTransport__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./ServerSentEventsTransport */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ServerSentEventsTransport.js"); +/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./Utils */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Utils.js"); +/* harmony import */ var _WebSocketTransport__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./WebSocketTransport */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/WebSocketTransport.js"); +// 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. +var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) { + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (undefined && undefined.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; + + + + + + + +var MAX_REDIRECTS = 100; +var WebSocketModule = null; +var EventSourceModule = null; +if (_Utils__WEBPACK_IMPORTED_MODULE_5__["Platform"].isNode && "function" !== "undefined") { + // In order to ignore the dynamic require in webpack builds we need to do this magic + // @ts-ignore: TS doesn't know about these names + var requireFunc = true ? require : undefined; + WebSocketModule = requireFunc("ws"); + EventSourceModule = requireFunc("eventsource"); +} +/** @private */ +var HttpConnection = /** @class */ (function () { + function HttpConnection(url, options) { + if (options === void 0) { options = {}; } + this.features = {}; + _Utils__WEBPACK_IMPORTED_MODULE_5__["Arg"].isRequired(url, "url"); + this.logger = Object(_Utils__WEBPACK_IMPORTED_MODULE_5__["createLogger"])(options.logger); + this.baseUrl = this.resolveUrl(url); + options = options || {}; + options.logMessageContent = options.logMessageContent || false; + if (!_Utils__WEBPACK_IMPORTED_MODULE_5__["Platform"].isNode && typeof WebSocket !== "undefined" && !options.WebSocket) { + options.WebSocket = WebSocket; + } + else if (_Utils__WEBPACK_IMPORTED_MODULE_5__["Platform"].isNode && !options.WebSocket) { + if (WebSocketModule) { + options.WebSocket = WebSocketModule; + } + } + if (!_Utils__WEBPACK_IMPORTED_MODULE_5__["Platform"].isNode && typeof EventSource !== "undefined" && !options.EventSource) { + options.EventSource = EventSource; + } + else if (_Utils__WEBPACK_IMPORTED_MODULE_5__["Platform"].isNode && !options.EventSource) { + if (typeof EventSourceModule !== "undefined") { + options.EventSource = EventSourceModule; + } + } + this.httpClient = options.httpClient || new _DefaultHttpClient__WEBPACK_IMPORTED_MODULE_0__["DefaultHttpClient"](this.logger); + this.connectionState = "Disconnected" /* Disconnected */; + this.connectionStarted = false; + this.options = options; + this.onreceive = null; + this.onclose = null; + } + HttpConnection.prototype.start = function (transferFormat) { + return __awaiter(this, void 0, void 0, function () { + var message, message; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + transferFormat = transferFormat || _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"].Binary; + _Utils__WEBPACK_IMPORTED_MODULE_5__["Arg"].isIn(transferFormat, _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"], "transferFormat"); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Starting connection with transfer format '" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"][transferFormat] + "'."); + if (this.connectionState !== "Disconnected" /* Disconnected */) { + return [2 /*return*/, Promise.reject(new Error("Cannot start an HttpConnection that is not in the 'Disconnected' state."))]; + } + this.connectionState = "Connecting " /* Connecting */; + this.startInternalPromise = this.startInternal(transferFormat); + return [4 /*yield*/, this.startInternalPromise]; + case 1: + _a.sent(); + if (!(this.connectionState === "Disconnecting" /* Disconnecting */)) return [3 /*break*/, 3]; + message = "Failed to start the HttpConnection before stop() was called."; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, message); + // We cannot await stopPromise inside startInternal since stopInternal awaits the startInternalPromise. + return [4 /*yield*/, this.stopPromise]; + case 2: + // We cannot await stopPromise inside startInternal since stopInternal awaits the startInternalPromise. + _a.sent(); + return [2 /*return*/, Promise.reject(new Error(message))]; + case 3: + if (this.connectionState !== "Connected" /* Connected */) { + message = "HttpConnection.startInternal completed gracefully but didn't enter the connection into the connected state!"; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, message); + return [2 /*return*/, Promise.reject(new Error(message))]; + } + _a.label = 4; + case 4: + this.connectionStarted = true; + return [2 /*return*/]; + } + }); + }); + }; + HttpConnection.prototype.send = function (data) { + if (this.connectionState !== "Connected" /* Connected */) { + return Promise.reject(new Error("Cannot send data if the connection is not in the 'Connected' State.")); + } + if (!this.sendQueue) { + this.sendQueue = new TransportSendQueue(this.transport); + } + // Transport will not be null if state is connected + return this.sendQueue.send(data); + }; + HttpConnection.prototype.stop = function (error) { + return __awaiter(this, void 0, void 0, function () { + var _this = this; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + if (this.connectionState === "Disconnected" /* Disconnected */) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Call to HttpConnection.stop(" + error + ") ignored because the connection is already in the disconnected state."); + return [2 /*return*/, Promise.resolve()]; + } + if (this.connectionState === "Disconnecting" /* Disconnecting */) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Call to HttpConnection.stop(" + error + ") ignored because the connection is already in the disconnecting state."); + return [2 /*return*/, this.stopPromise]; + } + this.connectionState = "Disconnecting" /* Disconnecting */; + this.stopPromise = new Promise(function (resolve) { + // Don't complete stop() until stopConnection() completes. + _this.stopPromiseResolver = resolve; + }); + // stopInternal should never throw so just observe it. + return [4 /*yield*/, this.stopInternal(error)]; + case 1: + // stopInternal should never throw so just observe it. + _a.sent(); + return [4 /*yield*/, this.stopPromise]; + case 2: + _a.sent(); + return [2 /*return*/]; + } + }); + }); + }; + HttpConnection.prototype.stopInternal = function (error) { + return __awaiter(this, void 0, void 0, function () { + var e_1, e_2; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + // Set error as soon as possible otherwise there is a race between + // the transport closing and providing an error and the error from a close message + // We would prefer the close message error. + this.stopError = error; + _a.label = 1; + case 1: + _a.trys.push([1, 3, , 4]); + return [4 /*yield*/, this.startInternalPromise]; + case 2: + _a.sent(); + return [3 /*break*/, 4]; + case 3: + e_1 = _a.sent(); + return [3 /*break*/, 4]; + case 4: + if (!this.transport) return [3 /*break*/, 9]; + if (this.sendQueue) { + this.sendQueue.stop(); + this.sendQueue = undefined; + } + _a.label = 5; + case 5: + _a.trys.push([5, 7, , 8]); + return [4 /*yield*/, this.transport.stop()]; + case 6: + _a.sent(); + return [3 /*break*/, 8]; + case 7: + e_2 = _a.sent(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, "HttpConnection.transport.stop() threw error '" + e_2 + "'."); + this.stopConnection(); + return [3 /*break*/, 8]; + case 8: + this.transport = undefined; + return [3 /*break*/, 10]; + case 9: + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "HttpConnection.transport is undefined in HttpConnection.stop() because start() failed."); + this.stopConnection(); + _a.label = 10; + case 10: return [2 /*return*/]; + } + }); + }); + }; + HttpConnection.prototype.startInternal = function (transferFormat) { + return __awaiter(this, void 0, void 0, function () { + var url, negotiateResponse, redirects, _loop_1, this_1, e_3; + var _this = this; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + url = this.baseUrl; + this.accessTokenFactory = this.options.accessTokenFactory; + _a.label = 1; + case 1: + _a.trys.push([1, 12, , 13]); + if (!this.options.skipNegotiation) return [3 /*break*/, 5]; + if (!(this.options.transport === _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"].WebSockets)) return [3 /*break*/, 3]; + // No need to add a connection ID in this case + this.transport = this.constructTransport(_ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"].WebSockets); + // We should just call connect directly in this case. + // No fallback or negotiate in this case. + return [4 /*yield*/, this.transport.connect(url, transferFormat)]; + case 2: + // We should just call connect directly in this case. + // No fallback or negotiate in this case. + _a.sent(); + return [3 /*break*/, 4]; + case 3: throw new Error("Negotiation can only be skipped when using the WebSocket transport directly."); + case 4: return [3 /*break*/, 11]; + case 5: + negotiateResponse = null; + redirects = 0; + _loop_1 = function () { + var accessToken_1; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: return [4 /*yield*/, this_1.getNegotiationResponse(url)]; + case 1: + negotiateResponse = _a.sent(); + // the user tries to stop the connection when it is being started + if (this_1.connectionState === "Disconnecting" /* Disconnecting */ || this_1.connectionState === "Disconnected" /* Disconnected */) { + throw new Error("The connection was stopped during negotiation."); + } + if (negotiateResponse.error) { + throw new Error(negotiateResponse.error); + } + if (negotiateResponse.ProtocolVersion) { + throw new Error("Detected a connection attempt to an ASP.NET SignalR Server. This client only supports connecting to an ASP.NET Core SignalR Server. See https://aka.ms/signalr-core-differences for details."); + } + if (negotiateResponse.url) { + url = negotiateResponse.url; + } + if (negotiateResponse.accessToken) { + accessToken_1 = negotiateResponse.accessToken; + this_1.accessTokenFactory = function () { return accessToken_1; }; + } + redirects++; + return [2 /*return*/]; + } + }); + }; + this_1 = this; + _a.label = 6; + case 6: return [5 /*yield**/, _loop_1()]; + case 7: + _a.sent(); + _a.label = 8; + case 8: + if (negotiateResponse.url && redirects < MAX_REDIRECTS) return [3 /*break*/, 6]; + _a.label = 9; + case 9: + if (redirects === MAX_REDIRECTS && negotiateResponse.url) { + throw new Error("Negotiate redirection limit exceeded."); + } + this.connectionId = negotiateResponse.connectionId; + return [4 /*yield*/, this.createTransport(url, this.options.transport, negotiateResponse, transferFormat)]; + case 10: + _a.sent(); + _a.label = 11; + case 11: + if (this.transport instanceof _LongPollingTransport__WEBPACK_IMPORTED_MODULE_3__["LongPollingTransport"]) { + this.features.inherentKeepAlive = true; + } + this.transport.onreceive = this.onreceive; + this.transport.onclose = function (e) { return _this.stopConnection(e); }; + if (this.connectionState === "Connecting " /* Connecting */) { + // Ensure the connection transitions to the connected state prior to completing this.startInternalPromise. + // start() will handle the case when stop was called and startInternal exits still in the disconnecting state. + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "The HttpConnection connected successfully."); + this.connectionState = "Connected" /* Connected */; + } + return [3 /*break*/, 13]; + case 12: + e_3 = _a.sent(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, "Failed to start the connection: " + e_3); + this.connectionState = "Disconnected" /* Disconnected */; + this.transport = undefined; + return [2 /*return*/, Promise.reject(e_3)]; + case 13: return [2 /*return*/]; + } + }); + }); + }; + HttpConnection.prototype.getNegotiationResponse = function (url) { + return __awaiter(this, void 0, void 0, function () { + var _a, headers, token, negotiateUrl, response, e_4; + return __generator(this, function (_b) { + switch (_b.label) { + case 0: + if (!this.accessTokenFactory) return [3 /*break*/, 2]; + return [4 /*yield*/, this.accessTokenFactory()]; + case 1: + token = _b.sent(); + if (token) { + headers = (_a = {}, + _a["Authorization"] = "Bearer " + token, + _a); + } + _b.label = 2; + case 2: + negotiateUrl = this.resolveNegotiateUrl(url); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Sending negotiation request: " + negotiateUrl + "."); + _b.label = 3; + case 3: + _b.trys.push([3, 5, , 6]); + return [4 /*yield*/, this.httpClient.post(negotiateUrl, { + content: "", + headers: headers, + })]; + case 4: + response = _b.sent(); + if (response.statusCode !== 200) { + return [2 /*return*/, Promise.reject(new Error("Unexpected status code returned from negotiate " + response.statusCode))]; + } + return [2 /*return*/, JSON.parse(response.content)]; + case 5: + e_4 = _b.sent(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, "Failed to complete negotiation with the server: " + e_4); + return [2 /*return*/, Promise.reject(e_4)]; + case 6: return [2 /*return*/]; + } + }); + }); + }; + HttpConnection.prototype.createConnectUrl = function (url, connectionId) { + if (!connectionId) { + return url; + } + return url + (url.indexOf("?") === -1 ? "?" : "&") + ("id=" + connectionId); + }; + HttpConnection.prototype.createTransport = function (url, requestedTransport, negotiateResponse, requestedTransferFormat) { + return __awaiter(this, void 0, void 0, function () { + var connectUrl, transportExceptions, transports, _i, transports_1, endpoint, transport, ex_1, message; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + connectUrl = this.createConnectUrl(url, negotiateResponse.connectionId); + if (!this.isITransport(requestedTransport)) return [3 /*break*/, 2]; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Connection was provided an instance of ITransport, using that directly."); + this.transport = requestedTransport; + return [4 /*yield*/, this.transport.connect(connectUrl, requestedTransferFormat)]; + case 1: + _a.sent(); + return [2 /*return*/]; + case 2: + transportExceptions = []; + transports = negotiateResponse.availableTransports || []; + _i = 0, transports_1 = transports; + _a.label = 3; + case 3: + if (!(_i < transports_1.length)) return [3 /*break*/, 11]; + endpoint = transports_1[_i]; + _a.label = 4; + case 4: + _a.trys.push([4, 9, , 10]); + transport = this.resolveTransport(endpoint, requestedTransport, requestedTransferFormat); + if (!(typeof transport === "number")) return [3 /*break*/, 8]; + this.transport = this.constructTransport(transport); + if (!!negotiateResponse.connectionId) return [3 /*break*/, 6]; + return [4 /*yield*/, this.getNegotiationResponse(url)]; + case 5: + negotiateResponse = _a.sent(); + connectUrl = this.createConnectUrl(url, negotiateResponse.connectionId); + _a.label = 6; + case 6: return [4 /*yield*/, this.transport.connect(connectUrl, requestedTransferFormat)]; + case 7: + _a.sent(); + return [2 /*return*/]; + case 8: return [3 /*break*/, 10]; + case 9: + ex_1 = _a.sent(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, "Failed to start the transport '" + endpoint.transport + "': " + ex_1); + negotiateResponse.connectionId = undefined; + transportExceptions.push(endpoint.transport + " failed: " + ex_1); + if (this.connectionState !== "Connecting " /* Connecting */) { + message = "Failed to select transport before stop() was called."; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, message); + return [2 /*return*/, Promise.reject(new Error(message))]; + } + return [3 /*break*/, 10]; + case 10: + _i++; + return [3 /*break*/, 3]; + case 11: + if (transportExceptions.length > 0) { + return [2 /*return*/, Promise.reject(new Error("Unable to connect to the server with any of the available transports. " + transportExceptions.join(" ")))]; + } + return [2 /*return*/, Promise.reject(new Error("None of the transports supported by the client are supported by the server."))]; + } + }); + }); + }; + HttpConnection.prototype.constructTransport = function (transport) { + switch (transport) { + case _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"].WebSockets: + if (!this.options.WebSocket) { + throw new Error("'WebSocket' is not supported in your environment."); + } + return new _WebSocketTransport__WEBPACK_IMPORTED_MODULE_6__["WebSocketTransport"](this.httpClient, this.accessTokenFactory, this.logger, this.options.logMessageContent || false, this.options.WebSocket); + case _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"].ServerSentEvents: + if (!this.options.EventSource) { + throw new Error("'EventSource' is not supported in your environment."); + } + return new _ServerSentEventsTransport__WEBPACK_IMPORTED_MODULE_4__["ServerSentEventsTransport"](this.httpClient, this.accessTokenFactory, this.logger, this.options.logMessageContent || false, this.options.EventSource); + case _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"].LongPolling: + return new _LongPollingTransport__WEBPACK_IMPORTED_MODULE_3__["LongPollingTransport"](this.httpClient, this.accessTokenFactory, this.logger, this.options.logMessageContent || false); + default: + throw new Error("Unknown transport: " + transport + "."); + } + }; + HttpConnection.prototype.resolveTransport = function (endpoint, requestedTransport, requestedTransferFormat) { + var transport = _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][endpoint.transport]; + if (transport === null || transport === undefined) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Skipping transport '" + endpoint.transport + "' because it is not supported by this client."); + } + else { + var transferFormats = endpoint.transferFormats.map(function (s) { return _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"][s]; }); + if (transportMatches(requestedTransport, transport)) { + if (transferFormats.indexOf(requestedTransferFormat) >= 0) { + if ((transport === _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"].WebSockets && !this.options.WebSocket) || + (transport === _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"].ServerSentEvents && !this.options.EventSource)) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Skipping transport '" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport] + "' because it is not supported in your environment.'"); + throw new Error("'" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport] + "' is not supported in your environment."); + } + else { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Selecting transport '" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport] + "'."); + return transport; + } + } + else { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Skipping transport '" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport] + "' because it does not support the requested transfer format '" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"][requestedTransferFormat] + "'."); + throw new Error("'" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport] + "' does not support " + _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"][requestedTransferFormat] + "."); + } + } + else { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Skipping transport '" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport] + "' because it was disabled by the client."); + throw new Error("'" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport] + "' is disabled by the client."); + } + } + return null; + }; + HttpConnection.prototype.isITransport = function (transport) { + return transport && typeof (transport) === "object" && "connect" in transport; + }; + HttpConnection.prototype.stopConnection = function (error) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "HttpConnection.stopConnection(" + error + ") called while in state " + this.connectionState + "."); + this.transport = undefined; + // If we have a stopError, it takes precedence over the error from the transport + error = this.stopError || error; + this.stopError = undefined; + if (this.connectionState === "Disconnected" /* Disconnected */) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Call to HttpConnection.stopConnection(" + error + ") was ignored because the connection is already in the disconnected state."); + return; + } + if (this.connectionState === "Connecting " /* Connecting */) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Warning, "Call to HttpConnection.stopConnection(" + error + ") was ignored because the connection hasn't yet left the in the connecting state."); + return; + } + if (this.connectionState === "Disconnecting" /* Disconnecting */) { + // A call to stop() induced this call to stopConnection and needs to be completed. + // Any stop() awaiters will be scheduled to continue after the onclose callback fires. + this.stopPromiseResolver(); + } + if (error) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, "Connection disconnected with error '" + error + "'."); + } + else { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Information, "Connection disconnected."); + } + this.connectionId = undefined; + this.connectionState = "Disconnected" /* Disconnected */; + if (this.onclose && this.connectionStarted) { + this.connectionStarted = false; + try { + this.onclose(error); + } + catch (e) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, "HttpConnection.onclose(" + error + ") threw error '" + e + "'."); + } + } + }; + HttpConnection.prototype.resolveUrl = function (url) { + // startsWith is not supported in IE + if (url.lastIndexOf("https://", 0) === 0 || url.lastIndexOf("http://", 0) === 0) { + return url; + } + if (!_Utils__WEBPACK_IMPORTED_MODULE_5__["Platform"].isBrowser || !window.document) { + throw new Error("Cannot resolve '" + url + "'."); + } + // Setting the url to the href propery of an anchor tag handles normalization + // for us. There are 3 main cases. + // 1. Relative path normalization e.g "b" -> "http://localhost:5000/a/b" + // 2. Absolute path normalization e.g "/a/b" -> "http://localhost:5000/a/b" + // 3. Networkpath reference normalization e.g "//localhost:5000/a/b" -> "http://localhost:5000/a/b" + var aTag = window.document.createElement("a"); + aTag.href = url; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Information, "Normalizing '" + url + "' to '" + aTag.href + "'."); + return aTag.href; + }; + HttpConnection.prototype.resolveNegotiateUrl = function (url) { + var index = url.indexOf("?"); + var negotiateUrl = url.substring(0, index === -1 ? url.length : index); + if (negotiateUrl[negotiateUrl.length - 1] !== "/") { + negotiateUrl += "/"; + } + negotiateUrl += "negotiate"; + negotiateUrl += index === -1 ? "" : url.substring(index); + return negotiateUrl; + }; + return HttpConnection; +}()); + +function transportMatches(requestedTransport, actualTransport) { + return !requestedTransport || ((actualTransport & requestedTransport) !== 0); +} +var TransportSendQueue = /** @class */ (function () { + function TransportSendQueue(transport) { + this.transport = transport; + this.buffer = []; + this.executing = true; + this.sendBufferedData = new PromiseSource(); + this.transportResult = new PromiseSource(); + // Suppress typescript error about handling Promises. The sendLoop doesn't need to be observed + this.sendLoop().then(function () { }, function (_) { }); + } + TransportSendQueue.prototype.send = function (data) { + this.bufferData(data); + return this.transportResult.promise; + }; + TransportSendQueue.prototype.stop = function () { + this.executing = false; + this.sendBufferedData.resolve(); + }; + TransportSendQueue.prototype.bufferData = function (data) { + if (this.buffer.length && typeof (this.buffer[0]) !== typeof (data)) { + throw new Error("Expected data to be of type " + typeof (this.buffer) + " but was of type " + typeof (data)); + } + this.buffer.push(data); + this.sendBufferedData.resolve(); + }; + TransportSendQueue.prototype.sendLoop = function () { + return __awaiter(this, void 0, void 0, function () { + var transportResult, data, error_1; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + if (false) {} + return [4 /*yield*/, this.sendBufferedData.promise]; + case 1: + _a.sent(); + if (!this.executing) { + // Did we stop? + return [3 /*break*/, 6]; + } + this.sendBufferedData = new PromiseSource(); + transportResult = this.transportResult; + this.transportResult = new PromiseSource(); + data = typeof (this.buffer[0]) === "string" ? + this.buffer.join("") : + TransportSendQueue.concatBuffers(this.buffer); + this.buffer.length = 0; + _a.label = 2; + case 2: + _a.trys.push([2, 4, , 5]); + return [4 /*yield*/, this.transport.send(data)]; + case 3: + _a.sent(); + transportResult.resolve(); + return [3 /*break*/, 5]; + case 4: + error_1 = _a.sent(); + transportResult.reject(error_1); + return [3 /*break*/, 5]; + case 5: return [3 /*break*/, 0]; + case 6: return [2 /*return*/]; + } + }); + }); + }; + TransportSendQueue.concatBuffers = function (arrayBuffers) { + var totalLength = arrayBuffers.map(function (b) { return b.byteLength; }).reduce(function (a, b) { return a + b; }); + var result = new Uint8Array(totalLength); + var offset = 0; + for (var _i = 0, arrayBuffers_1 = arrayBuffers; _i < arrayBuffers_1.length; _i++) { + var item = arrayBuffers_1[_i]; + result.set(new Uint8Array(item), offset); + offset += item.byteLength; + } + return result; + }; + return TransportSendQueue; +}()); + +var PromiseSource = /** @class */ (function () { + function PromiseSource() { + var _this = this; + this.promise = new Promise(function (resolve, reject) { + var _a; + return _a = [resolve, reject], _this.resolver = _a[0], _this.rejecter = _a[1], _a; + }); + } + PromiseSource.prototype.resolve = function () { + this.resolver(); + }; + PromiseSource.prototype.reject = function (reason) { + this.rejecter(reason); + }; + return PromiseSource; +}()); +//# sourceMappingURL=HttpConnection.js.map + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/HubConnection.js": +/*!***************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/HubConnection.js ***! + \***************************************************************************************************************/ +/*! exports provided: HubConnectionState, HubConnection */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HubConnectionState", function() { return HubConnectionState; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HubConnection", function() { return HubConnection; }); +/* harmony import */ var _HandshakeProtocol__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./HandshakeProtocol */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/HandshakeProtocol.js"); +/* harmony import */ var _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./IHubProtocol */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/IHubProtocol.js"); +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./ILogger */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ILogger.js"); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./Subject */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Subject.js"); +/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./Utils */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Utils.js"); +// 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. +var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) { + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (undefined && undefined.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; + + + + + +var DEFAULT_TIMEOUT_IN_MS = 30 * 1000; +var DEFAULT_PING_INTERVAL_IN_MS = 15 * 1000; +/** Describes the current state of the {@link HubConnection} to the server. */ +var HubConnectionState; +(function (HubConnectionState) { + /** The hub connection is disconnected. */ + HubConnectionState["Disconnected"] = "Disconnected"; + /** The hub connection is connecting. */ + HubConnectionState["Connecting"] = "Connecting"; + /** The hub connection is connected. */ + HubConnectionState["Connected"] = "Connected"; + /** The hub connection is disconnecting. */ + HubConnectionState["Disconnecting"] = "Disconnecting"; + /** The hub connection is reconnecting. */ + HubConnectionState["Reconnecting"] = "Reconnecting"; +})(HubConnectionState || (HubConnectionState = {})); +/** Represents a connection to a SignalR Hub. */ +var HubConnection = /** @class */ (function () { + function HubConnection(connection, logger, protocol, reconnectPolicy) { + var _this = this; + _Utils__WEBPACK_IMPORTED_MODULE_4__["Arg"].isRequired(connection, "connection"); + _Utils__WEBPACK_IMPORTED_MODULE_4__["Arg"].isRequired(logger, "logger"); + _Utils__WEBPACK_IMPORTED_MODULE_4__["Arg"].isRequired(protocol, "protocol"); + this.serverTimeoutInMilliseconds = DEFAULT_TIMEOUT_IN_MS; + this.keepAliveIntervalInMilliseconds = DEFAULT_PING_INTERVAL_IN_MS; + this.logger = logger; + this.protocol = protocol; + this.connection = connection; + this.reconnectPolicy = reconnectPolicy; + this.handshakeProtocol = new _HandshakeProtocol__WEBPACK_IMPORTED_MODULE_0__["HandshakeProtocol"](); + this.connection.onreceive = function (data) { return _this.processIncomingData(data); }; + this.connection.onclose = function (error) { return _this.connectionClosed(error); }; + this.callbacks = {}; + this.methods = {}; + this.closedCallbacks = []; + this.reconnectingCallbacks = []; + this.reconnectedCallbacks = []; + this.invocationId = 0; + this.receivedHandshakeResponse = false; + this.connectionState = HubConnectionState.Disconnected; + this.connectionStarted = false; + this.cachedPingMessage = this.protocol.writeMessage({ type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Ping }); + } + /** @internal */ + // Using a public static factory method means we can have a private constructor and an _internal_ + // create method that can be used by HubConnectionBuilder. An "internal" constructor would just + // be stripped away and the '.d.ts' file would have no constructor, which is interpreted as a + // public parameter-less constructor. + HubConnection.create = function (connection, logger, protocol, reconnectPolicy) { + return new HubConnection(connection, logger, protocol, reconnectPolicy); + }; + Object.defineProperty(HubConnection.prototype, "state", { + /** Indicates the state of the {@link HubConnection} to the server. */ + get: function () { + return this.connectionState; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(HubConnection.prototype, "connectionId", { + /** Represents the connection id of the {@link HubConnection} on the server. The connection id will be null when the connection is either + * in the disconnected state or if the negotiation step was skipped. + */ + get: function () { + return this.connection ? (this.connection.connectionId || null) : null; + }, + enumerable: true, + configurable: true + }); + /** Starts the connection. + * + * @returns {Promise} A Promise that resolves when the connection has been successfully established, or rejects with an error. + */ + HubConnection.prototype.start = function () { + this.startPromise = this.startWithStateTransitions(); + return this.startPromise; + }; + HubConnection.prototype.startWithStateTransitions = function () { + return __awaiter(this, void 0, void 0, function () { + var e_1; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + if (this.connectionState !== HubConnectionState.Disconnected) { + return [2 /*return*/, Promise.reject(new Error("Cannot start a HubConnection that is not in the 'Disconnected' state."))]; + } + this.connectionState = HubConnectionState.Connecting; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Starting HubConnection."); + _a.label = 1; + case 1: + _a.trys.push([1, 3, , 4]); + return [4 /*yield*/, this.startInternal()]; + case 2: + _a.sent(); + this.connectionState = HubConnectionState.Connected; + this.connectionStarted = true; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "HubConnection connected successfully."); + return [3 /*break*/, 4]; + case 3: + e_1 = _a.sent(); + this.connectionState = HubConnectionState.Disconnected; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "HubConnection failed to start successfully because of error '" + e_1 + "'."); + return [2 /*return*/, Promise.reject(e_1)]; + case 4: return [2 /*return*/]; + } + }); + }); + }; + HubConnection.prototype.startInternal = function () { + return __awaiter(this, void 0, void 0, function () { + var handshakePromise, handshakeRequest, e_2; + var _this = this; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + this.stopDuringStartError = undefined; + this.receivedHandshakeResponse = false; + handshakePromise = new Promise(function (resolve, reject) { + _this.handshakeResolver = resolve; + _this.handshakeRejecter = reject; + }); + return [4 /*yield*/, this.connection.start(this.protocol.transferFormat)]; + case 1: + _a.sent(); + _a.label = 2; + case 2: + _a.trys.push([2, 5, , 7]); + handshakeRequest = { + protocol: this.protocol.name, + version: this.protocol.version, + }; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Sending handshake request."); + return [4 /*yield*/, this.sendMessage(this.handshakeProtocol.writeHandshakeRequest(handshakeRequest))]; + case 3: + _a.sent(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "Using HubProtocol '" + this.protocol.name + "'."); + // defensively cleanup timeout in case we receive a message from the server before we finish start + this.cleanupTimeout(); + this.resetTimeoutPeriod(); + this.resetKeepAliveInterval(); + return [4 /*yield*/, handshakePromise]; + case 4: + _a.sent(); + // It's important to check the stopDuringStartError instead of just relying on the handshakePromise + // being rejected on close, because this continuation can run after both the handshake completed successfully + // and the connection was closed. + if (this.stopDuringStartError) { + // It's important to throw instead of returning a rejected promise, because we don't want to allow any state + // transitions to occur between now and the calling code observing the exceptions. Returning a rejected promise + // will cause the calling continuation to get scheduled to run later. + throw this.stopDuringStartError; + } + return [3 /*break*/, 7]; + case 5: + e_2 = _a.sent(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Hub handshake failed with error '" + e_2 + "' during start(). Stopping HubConnection."); + this.cleanupTimeout(); + this.cleanupPingTimer(); + // HttpConnection.stop() should not complete until after the onclose callback is invoked. + // This will transition the HubConnection to the disconnected state before HttpConnection.stop() completes. + return [4 /*yield*/, this.connection.stop(e_2)]; + case 6: + // HttpConnection.stop() should not complete until after the onclose callback is invoked. + // This will transition the HubConnection to the disconnected state before HttpConnection.stop() completes. + _a.sent(); + throw e_2; + case 7: return [2 /*return*/]; + } + }); + }); + }; + /** Stops the connection. + * + * @returns {Promise} A Promise that resolves when the connection has been successfully terminated, or rejects with an error. + */ + HubConnection.prototype.stop = function () { + return __awaiter(this, void 0, void 0, function () { + var startPromise, e_3; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + startPromise = this.startPromise; + this.stopPromise = this.stopInternal(); + return [4 /*yield*/, this.stopPromise]; + case 1: + _a.sent(); + _a.label = 2; + case 2: + _a.trys.push([2, 4, , 5]); + // Awaiting undefined continues immediately + return [4 /*yield*/, startPromise]; + case 3: + // Awaiting undefined continues immediately + _a.sent(); + return [3 /*break*/, 5]; + case 4: + e_3 = _a.sent(); + return [3 /*break*/, 5]; + case 5: return [2 /*return*/]; + } + }); + }); + }; + HubConnection.prototype.stopInternal = function (error) { + if (this.connectionState === HubConnectionState.Disconnected) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Call to HubConnection.stop(" + error + ") ignored because it is already in the disconnected state."); + return Promise.resolve(); + } + if (this.connectionState === HubConnectionState.Disconnecting) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Call to HttpConnection.stop(" + error + ") ignored because the connection is already in the disconnecting state."); + return this.stopPromise; + } + this.connectionState = HubConnectionState.Disconnecting; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Stopping HubConnection."); + if (this.reconnectDelayHandle) { + // We're in a reconnect delay which means the underlying connection is currently already stopped. + // Just clear the handle to stop the reconnect loop (which no one is waiting on thankfully) and + // fire the onclose callbacks. + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Connection stopped during reconnect delay. Done reconnecting."); + clearTimeout(this.reconnectDelayHandle); + this.reconnectDelayHandle = undefined; + this.completeClose(); + return Promise.resolve(); + } + this.cleanupTimeout(); + this.cleanupPingTimer(); + this.stopDuringStartError = error || new Error("The connection was stopped before the hub handshake could complete."); + // HttpConnection.stop() should not complete until after either HttpConnection.start() fails + // or the onclose callback is invoked. The onclose callback will transition the HubConnection + // to the disconnected state if need be before HttpConnection.stop() completes. + return this.connection.stop(error); + }; + /** Invokes a streaming hub method on the server using the specified name and arguments. + * + * @typeparam T The type of the items returned by the server. + * @param {string} methodName The name of the server method to invoke. + * @param {any[]} args The arguments used to invoke the server method. + * @returns {IStreamResult} An object that yields results from the server as they are received. + */ + HubConnection.prototype.stream = function (methodName) { + var _this = this; + var args = []; + for (var _i = 1; _i < arguments.length; _i++) { + args[_i - 1] = arguments[_i]; + } + var _a = this.replaceStreamingParams(args), streams = _a[0], streamIds = _a[1]; + var invocationDescriptor = this.createStreamInvocation(methodName, args, streamIds); + var promiseQueue; + var subject = new _Subject__WEBPACK_IMPORTED_MODULE_3__["Subject"](); + subject.cancelCallback = function () { + var cancelInvocation = _this.createCancelInvocation(invocationDescriptor.invocationId); + delete _this.callbacks[invocationDescriptor.invocationId]; + return promiseQueue.then(function () { + return _this.sendWithProtocol(cancelInvocation); + }); + }; + this.callbacks[invocationDescriptor.invocationId] = function (invocationEvent, error) { + if (error) { + subject.error(error); + return; + } + else if (invocationEvent) { + // invocationEvent will not be null when an error is not passed to the callback + if (invocationEvent.type === _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Completion) { + if (invocationEvent.error) { + subject.error(new Error(invocationEvent.error)); + } + else { + subject.complete(); + } + } + else { + subject.next((invocationEvent.item)); + } + } + }; + promiseQueue = this.sendWithProtocol(invocationDescriptor) + .catch(function (e) { + subject.error(e); + delete _this.callbacks[invocationDescriptor.invocationId]; + }); + this.launchStreams(streams, promiseQueue); + return subject; + }; + HubConnection.prototype.sendMessage = function (message) { + this.resetKeepAliveInterval(); + return this.connection.send(message); + }; + /** + * Sends a js object to the server. + * @param message The js object to serialize and send. + */ + HubConnection.prototype.sendWithProtocol = function (message) { + return this.sendMessage(this.protocol.writeMessage(message)); + }; + /** Invokes a hub method on the server using the specified name and arguments. Does not wait for a response from the receiver. + * + * The Promise returned by this method resolves when the client has sent the invocation to the server. The server may still + * be processing the invocation. + * + * @param {string} methodName The name of the server method to invoke. + * @param {any[]} args The arguments used to invoke the server method. + * @returns {Promise} A Promise that resolves when the invocation has been successfully sent, or rejects with an error. + */ + HubConnection.prototype.send = function (methodName) { + var args = []; + for (var _i = 1; _i < arguments.length; _i++) { + args[_i - 1] = arguments[_i]; + } + var _a = this.replaceStreamingParams(args), streams = _a[0], streamIds = _a[1]; + var sendPromise = this.sendWithProtocol(this.createInvocation(methodName, args, true, streamIds)); + this.launchStreams(streams, sendPromise); + return sendPromise; + }; + /** Invokes a hub method on the server using the specified name and arguments. + * + * The Promise returned by this method resolves when the server indicates it has finished invoking the method. When the promise + * resolves, the server has finished invoking the method. If the server method returns a result, it is produced as the result of + * resolving the Promise. + * + * @typeparam T The expected return type. + * @param {string} methodName The name of the server method to invoke. + * @param {any[]} args The arguments used to invoke the server method. + * @returns {Promise} A Promise that resolves with the result of the server method (if any), or rejects with an error. + */ + HubConnection.prototype.invoke = function (methodName) { + var _this = this; + var args = []; + for (var _i = 1; _i < arguments.length; _i++) { + args[_i - 1] = arguments[_i]; + } + var _a = this.replaceStreamingParams(args), streams = _a[0], streamIds = _a[1]; + var invocationDescriptor = this.createInvocation(methodName, args, false, streamIds); + var p = new Promise(function (resolve, reject) { + // invocationId will always have a value for a non-blocking invocation + _this.callbacks[invocationDescriptor.invocationId] = function (invocationEvent, error) { + if (error) { + reject(error); + return; + } + else if (invocationEvent) { + // invocationEvent will not be null when an error is not passed to the callback + if (invocationEvent.type === _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Completion) { + if (invocationEvent.error) { + reject(new Error(invocationEvent.error)); + } + else { + resolve(invocationEvent.result); + } + } + else { + reject(new Error("Unexpected message type: " + invocationEvent.type)); + } + } + }; + var promiseQueue = _this.sendWithProtocol(invocationDescriptor) + .catch(function (e) { + reject(e); + // invocationId will always have a value for a non-blocking invocation + delete _this.callbacks[invocationDescriptor.invocationId]; + }); + _this.launchStreams(streams, promiseQueue); + }); + return p; + }; + /** Registers a handler that will be invoked when the hub method with the specified method name is invoked. + * + * @param {string} methodName The name of the hub method to define. + * @param {Function} newMethod The handler that will be raised when the hub method is invoked. + */ + HubConnection.prototype.on = function (methodName, newMethod) { + if (!methodName || !newMethod) { + return; + } + methodName = methodName.toLowerCase(); + if (!this.methods[methodName]) { + this.methods[methodName] = []; + } + // Preventing adding the same handler multiple times. + if (this.methods[methodName].indexOf(newMethod) !== -1) { + return; + } + this.methods[methodName].push(newMethod); + }; + HubConnection.prototype.off = function (methodName, method) { + if (!methodName) { + return; + } + methodName = methodName.toLowerCase(); + var handlers = this.methods[methodName]; + if (!handlers) { + return; + } + if (method) { + var removeIdx = handlers.indexOf(method); + if (removeIdx !== -1) { + handlers.splice(removeIdx, 1); + if (handlers.length === 0) { + delete this.methods[methodName]; + } + } + } + else { + delete this.methods[methodName]; + } + }; + /** Registers a handler that will be invoked when the connection is closed. + * + * @param {Function} callback The handler that will be invoked when the connection is closed. Optionally receives a single argument containing the error that caused the connection to close (if any). + */ + HubConnection.prototype.onclose = function (callback) { + if (callback) { + this.closedCallbacks.push(callback); + } + }; + /** Registers a handler that will be invoked when the connection starts reconnecting. + * + * @param {Function} callback The handler that will be invoked when the connection starts reconnecting. Optionally receives a single argument containing the error that caused the connection to start reconnecting (if any). + */ + HubConnection.prototype.onreconnecting = function (callback) { + if (callback) { + this.reconnectingCallbacks.push(callback); + } + }; + /** Registers a handler that will be invoked when the connection successfully reconnects. + * + * @param {Function} callback The handler that will be invoked when the connection successfully reconnects. + */ + HubConnection.prototype.onreconnected = function (callback) { + if (callback) { + this.reconnectedCallbacks.push(callback); + } + }; + HubConnection.prototype.processIncomingData = function (data) { + this.cleanupTimeout(); + if (!this.receivedHandshakeResponse) { + data = this.processHandshakeResponse(data); + this.receivedHandshakeResponse = true; + } + // Data may have all been read when processing handshake response + if (data) { + // Parse the messages + var messages = this.protocol.parseMessages(data, this.logger); + for (var _i = 0, messages_1 = messages; _i < messages_1.length; _i++) { + var message = messages_1[_i]; + switch (message.type) { + case _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Invocation: + this.invokeClientMethod(message); + break; + case _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].StreamItem: + case _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Completion: + var callback = this.callbacks[message.invocationId]; + if (callback) { + if (message.type === _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Completion) { + delete this.callbacks[message.invocationId]; + } + callback(message); + } + break; + case _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Ping: + // Don't care about pings + break; + case _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Close: + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "Close message received from server."); + // We don't want to wait on the stop itself. + this.stopPromise = this.stopInternal(message.error ? new Error("Server returned an error on close: " + message.error) : undefined); + break; + default: + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Warning, "Invalid message type: " + message.type + "."); + break; + } + } + } + this.resetTimeoutPeriod(); + }; + HubConnection.prototype.processHandshakeResponse = function (data) { + var _a; + var responseMessage; + var remainingData; + try { + _a = this.handshakeProtocol.parseHandshakeResponse(data), remainingData = _a[0], responseMessage = _a[1]; + } + catch (e) { + var message = "Error parsing handshake response: " + e; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, message); + var error = new Error(message); + this.handshakeRejecter(error); + throw error; + } + if (responseMessage.error) { + var message = "Server returned handshake error: " + responseMessage.error; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, message); + var error = new Error(message); + this.handshakeRejecter(error); + throw error; + } + else { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Server handshake complete."); + } + this.handshakeResolver(); + return remainingData; + }; + HubConnection.prototype.resetKeepAliveInterval = function () { + var _this = this; + this.cleanupPingTimer(); + this.pingServerHandle = setTimeout(function () { return __awaiter(_this, void 0, void 0, function () { + var _a; + return __generator(this, function (_b) { + switch (_b.label) { + case 0: + if (!(this.connectionState === HubConnectionState.Connected)) return [3 /*break*/, 4]; + _b.label = 1; + case 1: + _b.trys.push([1, 3, , 4]); + return [4 /*yield*/, this.sendMessage(this.cachedPingMessage)]; + case 2: + _b.sent(); + return [3 /*break*/, 4]; + case 3: + _a = _b.sent(); + // We don't care about the error. It should be seen elsewhere in the client. + // The connection is probably in a bad or closed state now, cleanup the timer so it stops triggering + this.cleanupPingTimer(); + return [3 /*break*/, 4]; + case 4: return [2 /*return*/]; + } + }); + }); }, this.keepAliveIntervalInMilliseconds); + }; + HubConnection.prototype.resetTimeoutPeriod = function () { + var _this = this; + if (!this.connection.features || !this.connection.features.inherentKeepAlive) { + // Set the timeout timer + this.timeoutHandle = setTimeout(function () { return _this.serverTimeout(); }, this.serverTimeoutInMilliseconds); + } + }; + HubConnection.prototype.serverTimeout = function () { + // The server hasn't talked to us in a while. It doesn't like us anymore ... :( + // Terminate the connection, but we don't need to wait on the promise. This could trigger reconnecting. + // tslint:disable-next-line:no-floating-promises + this.connection.stop(new Error("Server timeout elapsed without receiving a message from the server.")); + }; + HubConnection.prototype.invokeClientMethod = function (invocationMessage) { + var _this = this; + var methods = this.methods[invocationMessage.target.toLowerCase()]; + if (methods) { + try { + methods.forEach(function (m) { return m.apply(_this, invocationMessage.arguments); }); + } + catch (e) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, "A callback for the method " + invocationMessage.target.toLowerCase() + " threw error '" + e + "'."); + } + if (invocationMessage.invocationId) { + // This is not supported in v1. So we return an error to avoid blocking the server waiting for the response. + var message = "Server requested a response, which is not supported in this version of the client."; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, message); + // We don't want to wait on the stop itself. + this.stopPromise = this.stopInternal(new Error(message)); + } + } + else { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Warning, "No client method with the name '" + invocationMessage.target + "' found."); + } + }; + HubConnection.prototype.connectionClosed = function (error) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "HubConnection.connectionClosed(" + error + ") called while in state " + this.connectionState + "."); + // Triggering this.handshakeRejecter is insufficient because it could already be resolved without the continuation having run yet. + this.stopDuringStartError = this.stopDuringStartError || error || new Error("The underlying connection was closed before the hub handshake could complete."); + // If the handshake is in progress, start will be waiting for the handshake promise, so we complete it. + // If it has already completed, this should just noop. + if (this.handshakeResolver) { + this.handshakeResolver(); + } + this.cancelCallbacksWithError(error || new Error("Invocation canceled due to the underlying connection being closed.")); + this.cleanupTimeout(); + this.cleanupPingTimer(); + if (this.connectionState === HubConnectionState.Disconnecting) { + this.completeClose(error); + } + else if (this.connectionState === HubConnectionState.Connected && this.reconnectPolicy) { + // tslint:disable-next-line:no-floating-promises + this.reconnect(error); + } + else if (this.connectionState === HubConnectionState.Connected) { + this.completeClose(error); + } + // If none of the above if conditions were true were called the HubConnection must be in either: + // 1. The Connecting state in which case the handshakeResolver will complete it and stopDuringStartError will fail it. + // 2. The Reconnecting state in which case the handshakeResolver will complete it and stopDuringStartError will fail the current reconnect attempt + // and potentially continue the reconnect() loop. + // 3. The Disconnected state in which case we're already done. + }; + HubConnection.prototype.completeClose = function (error) { + var _this = this; + if (this.connectionStarted) { + this.connectionState = HubConnectionState.Disconnected; + this.connectionStarted = false; + try { + this.closedCallbacks.forEach(function (c) { return c.apply(_this, [error]); }); + } + catch (e) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, "An onclose callback called with error '" + error + "' threw error '" + e + "'."); + } + } + }; + HubConnection.prototype.reconnect = function (error) { + return __awaiter(this, void 0, void 0, function () { + var reconnectStartTime, previousReconnectAttempts, nextRetryDelay, e_4; + var _this = this; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + reconnectStartTime = Date.now(); + previousReconnectAttempts = 0; + nextRetryDelay = this.getNextRetryDelay(previousReconnectAttempts++, 0); + if (nextRetryDelay === null) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Connection not reconnecting because the IReconnectPolicy returned null on the first reconnect attempt."); + this.completeClose(error); + return [2 /*return*/]; + } + this.connectionState = HubConnectionState.Reconnecting; + if (error) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "Connection reconnecting because of error '" + error + "'."); + } + else { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "Connection reconnecting."); + } + if (this.onreconnecting) { + try { + this.reconnectingCallbacks.forEach(function (c) { return c.apply(_this, [error]); }); + } + catch (e) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, "An onreconnecting callback called with error '" + error + "' threw error '" + e + "'."); + } + // Exit early if an onreconnecting callback called connection.stop(). + if (this.connectionState !== HubConnectionState.Reconnecting) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Connection left the reconnecting state in onreconnecting callback. Done reconnecting."); + return [2 /*return*/]; + } + } + _a.label = 1; + case 1: + if (!(nextRetryDelay !== null)) return [3 /*break*/, 7]; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "Reconnect attempt number " + previousReconnectAttempts + " will start in " + nextRetryDelay + " ms."); + return [4 /*yield*/, new Promise(function (resolve) { + _this.reconnectDelayHandle = setTimeout(resolve, nextRetryDelay); + })]; + case 2: + _a.sent(); + this.reconnectDelayHandle = undefined; + if (this.connectionState !== HubConnectionState.Reconnecting) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Connection left the reconnecting state during reconnect delay. Done reconnecting."); + return [2 /*return*/]; + } + _a.label = 3; + case 3: + _a.trys.push([3, 5, , 6]); + return [4 /*yield*/, this.startInternal()]; + case 4: + _a.sent(); + this.connectionState = HubConnectionState.Connected; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "HubConnection reconnected successfully."); + if (this.onreconnected) { + try { + this.reconnectedCallbacks.forEach(function (c) { return c.apply(_this, [_this.connection.connectionId]); }); + } + catch (e) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, "An onreconnected callback called with connectionId '" + this.connection.connectionId + "; threw error '" + e + "'."); + } + } + return [2 /*return*/]; + case 5: + e_4 = _a.sent(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "Reconnect attempt failed because of error '" + e_4 + "'."); + if (this.connectionState !== HubConnectionState.Reconnecting) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Connection left the reconnecting state during reconnect attempt. Done reconnecting."); + return [2 /*return*/]; + } + return [3 /*break*/, 6]; + case 6: + nextRetryDelay = this.getNextRetryDelay(previousReconnectAttempts++, Date.now() - reconnectStartTime); + return [3 /*break*/, 1]; + case 7: + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "Reconnect retries have been exhausted after " + (Date.now() - reconnectStartTime) + " ms and " + previousReconnectAttempts + " failed attempts. Connection disconnecting."); + this.completeClose(); + return [2 /*return*/]; + } + }); + }); + }; + HubConnection.prototype.getNextRetryDelay = function (previousRetryCount, elapsedMilliseconds) { + try { + return this.reconnectPolicy.nextRetryDelayInMilliseconds(previousRetryCount, elapsedMilliseconds); + } + catch (e) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, "IReconnectPolicy.nextRetryDelayInMilliseconds(" + previousRetryCount + ", " + elapsedMilliseconds + ") threw error '" + e + "'."); + return null; + } + }; + HubConnection.prototype.cancelCallbacksWithError = function (error) { + var callbacks = this.callbacks; + this.callbacks = {}; + Object.keys(callbacks) + .forEach(function (key) { + var callback = callbacks[key]; + callback(null, error); + }); + }; + HubConnection.prototype.cleanupPingTimer = function () { + if (this.pingServerHandle) { + clearTimeout(this.pingServerHandle); + } + }; + HubConnection.prototype.cleanupTimeout = function () { + if (this.timeoutHandle) { + clearTimeout(this.timeoutHandle); + } + }; + HubConnection.prototype.createInvocation = function (methodName, args, nonblocking, streamIds) { + if (nonblocking) { + return { + arguments: args, + streamIds: streamIds, + target: methodName, + type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Invocation, + }; + } + else { + var invocationId = this.invocationId; + this.invocationId++; + return { + arguments: args, + invocationId: invocationId.toString(), + streamIds: streamIds, + target: methodName, + type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Invocation, + }; + } + }; + HubConnection.prototype.launchStreams = function (streams, promiseQueue) { + var _this = this; + if (streams.length === 0) { + return; + } + // Synchronize stream data so they arrive in-order on the server + if (!promiseQueue) { + promiseQueue = Promise.resolve(); + } + var _loop_1 = function (streamId) { + streams[streamId].subscribe({ + complete: function () { + promiseQueue = promiseQueue.then(function () { return _this.sendWithProtocol(_this.createCompletionMessage(streamId)); }); + }, + error: function (err) { + var message; + if (err instanceof Error) { + message = err.message; + } + else if (err && err.toString) { + message = err.toString(); + } + else { + message = "Unknown error"; + } + promiseQueue = promiseQueue.then(function () { return _this.sendWithProtocol(_this.createCompletionMessage(streamId, message)); }); + }, + next: function (item) { + promiseQueue = promiseQueue.then(function () { return _this.sendWithProtocol(_this.createStreamItemMessage(streamId, item)); }); + }, + }); + }; + // We want to iterate over the keys, since the keys are the stream ids + // tslint:disable-next-line:forin + for (var streamId in streams) { + _loop_1(streamId); + } + }; + HubConnection.prototype.replaceStreamingParams = function (args) { + var streams = []; + var streamIds = []; + for (var i = 0; i < args.length; i++) { + var argument = args[i]; + if (this.isObservable(argument)) { + var streamId = this.invocationId; + this.invocationId++; + // Store the stream for later use + streams[streamId] = argument; + streamIds.push(streamId.toString()); + // remove stream from args + args.splice(i, 1); + } + } + return [streams, streamIds]; + }; + HubConnection.prototype.isObservable = function (arg) { + // This allows other stream implementations to just work (like rxjs) + return arg && arg.subscribe && typeof arg.subscribe === "function"; + }; + HubConnection.prototype.createStreamInvocation = function (methodName, args, streamIds) { + var invocationId = this.invocationId; + this.invocationId++; + return { + arguments: args, + invocationId: invocationId.toString(), + streamIds: streamIds, + target: methodName, + type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].StreamInvocation, + }; + }; + HubConnection.prototype.createCancelInvocation = function (id) { + return { + invocationId: id, + type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].CancelInvocation, + }; + }; + HubConnection.prototype.createStreamItemMessage = function (id, item) { + return { + invocationId: id, + item: item, + type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].StreamItem, + }; + }; + HubConnection.prototype.createCompletionMessage = function (id, error, result) { + if (error) { + return { + error: error, + invocationId: id, + type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Completion, + }; + } + return { + invocationId: id, + result: result, + type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Completion, + }; + }; + return HubConnection; +}()); + +//# sourceMappingURL=HubConnection.js.map + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/HubConnectionBuilder.js": +/*!**********************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/HubConnectionBuilder.js ***! + \**********************************************************************************************************************/ +/*! exports provided: HubConnectionBuilder */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HubConnectionBuilder", function() { return HubConnectionBuilder; }); +/* harmony import */ var _DefaultReconnectPolicy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./DefaultReconnectPolicy */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/DefaultReconnectPolicy.js"); +/* harmony import */ var _HttpConnection__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./HttpConnection */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/HttpConnection.js"); +/* harmony import */ var _HubConnection__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./HubConnection */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/HubConnection.js"); +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./ILogger */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ILogger.js"); +/* harmony import */ var _JsonHubProtocol__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./JsonHubProtocol */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/JsonHubProtocol.js"); +/* harmony import */ var _Loggers__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./Loggers */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Loggers.js"); +/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./Utils */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Utils.js"); +// 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. +var __assign = (undefined && undefined.__assign) || Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; +}; + + + + + + + +// tslint:disable:object-literal-sort-keys +var LogLevelNameMapping = { + trace: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Trace, + debug: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Debug, + info: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Information, + information: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Information, + warn: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Warning, + warning: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Warning, + error: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Error, + critical: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Critical, + none: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].None, +}; +function parseLogLevel(name) { + // Case-insensitive matching via lower-casing + // Yes, I know case-folding is a complicated problem in Unicode, but we only support + // the ASCII strings defined in LogLevelNameMapping anyway, so it's fine -anurse. + var mapping = LogLevelNameMapping[name.toLowerCase()]; + if (typeof mapping !== "undefined") { + return mapping; + } + else { + throw new Error("Unknown log level: " + name); + } +} +/** A builder for configuring {@link @aspnet/signalr.HubConnection} instances. */ +var HubConnectionBuilder = /** @class */ (function () { + function HubConnectionBuilder() { + } + HubConnectionBuilder.prototype.configureLogging = function (logging) { + _Utils__WEBPACK_IMPORTED_MODULE_6__["Arg"].isRequired(logging, "logging"); + if (isLogger(logging)) { + this.logger = logging; + } + else if (typeof logging === "string") { + var logLevel = parseLogLevel(logging); + this.logger = new _Utils__WEBPACK_IMPORTED_MODULE_6__["ConsoleLogger"](logLevel); + } + else { + this.logger = new _Utils__WEBPACK_IMPORTED_MODULE_6__["ConsoleLogger"](logging); + } + return this; + }; + HubConnectionBuilder.prototype.withUrl = function (url, transportTypeOrOptions) { + _Utils__WEBPACK_IMPORTED_MODULE_6__["Arg"].isRequired(url, "url"); + this.url = url; + // Flow-typing knows where it's at. Since HttpTransportType is a number and IHttpConnectionOptions is guaranteed + // to be an object, we know (as does TypeScript) this comparison is all we need to figure out which overload was called. + if (typeof transportTypeOrOptions === "object") { + this.httpConnectionOptions = __assign({}, this.httpConnectionOptions, transportTypeOrOptions); + } + else { + this.httpConnectionOptions = __assign({}, this.httpConnectionOptions, { transport: transportTypeOrOptions }); + } + return this; + }; + /** Configures the {@link @aspnet/signalr.HubConnection} to use the specified Hub Protocol. + * + * @param {IHubProtocol} protocol The {@link @aspnet/signalr.IHubProtocol} implementation to use. + */ + HubConnectionBuilder.prototype.withHubProtocol = function (protocol) { + _Utils__WEBPACK_IMPORTED_MODULE_6__["Arg"].isRequired(protocol, "protocol"); + this.protocol = protocol; + return this; + }; + HubConnectionBuilder.prototype.withAutomaticReconnect = function (retryDelaysOrReconnectPolicy) { + if (this.reconnectPolicy) { + throw new Error("A reconnectPolicy has already been set."); + } + if (!retryDelaysOrReconnectPolicy) { + this.reconnectPolicy = new _DefaultReconnectPolicy__WEBPACK_IMPORTED_MODULE_0__["DefaultReconnectPolicy"](); + } + else if (Array.isArray(retryDelaysOrReconnectPolicy)) { + this.reconnectPolicy = new _DefaultReconnectPolicy__WEBPACK_IMPORTED_MODULE_0__["DefaultReconnectPolicy"](retryDelaysOrReconnectPolicy); + } + else { + this.reconnectPolicy = retryDelaysOrReconnectPolicy; + } + return this; + }; + /** Creates a {@link @aspnet/signalr.HubConnection} from the configuration options specified in this builder. + * + * @returns {HubConnection} The configured {@link @aspnet/signalr.HubConnection}. + */ + HubConnectionBuilder.prototype.build = function () { + // If httpConnectionOptions has a logger, use it. Otherwise, override it with the one + // provided to configureLogger + var httpConnectionOptions = this.httpConnectionOptions || {}; + // If it's 'null', the user **explicitly** asked for null, don't mess with it. + if (httpConnectionOptions.logger === undefined) { + // If our logger is undefined or null, that's OK, the HttpConnection constructor will handle it. + httpConnectionOptions.logger = this.logger; + } + // Now create the connection + if (!this.url) { + throw new Error("The 'HubConnectionBuilder.withUrl' method must be called before building the connection."); + } + var connection = new _HttpConnection__WEBPACK_IMPORTED_MODULE_1__["HttpConnection"](this.url, httpConnectionOptions); + return _HubConnection__WEBPACK_IMPORTED_MODULE_2__["HubConnection"].create(connection, this.logger || _Loggers__WEBPACK_IMPORTED_MODULE_5__["NullLogger"].instance, this.protocol || new _JsonHubProtocol__WEBPACK_IMPORTED_MODULE_4__["JsonHubProtocol"](), this.reconnectPolicy); + }; + return HubConnectionBuilder; +}()); + +function isLogger(logger) { + return logger.log !== undefined; +} +//# sourceMappingURL=HubConnectionBuilder.js.map + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/IHubProtocol.js": +/*!**************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/IHubProtocol.js ***! + \**************************************************************************************************************/ +/*! exports provided: MessageType */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MessageType", function() { return MessageType; }); +// 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. +/** Defines the type of a Hub Message. */ +var MessageType; +(function (MessageType) { + /** Indicates the message is an Invocation message and implements the {@link @aspnet/signalr.InvocationMessage} interface. */ + MessageType[MessageType["Invocation"] = 1] = "Invocation"; + /** Indicates the message is a StreamItem message and implements the {@link @aspnet/signalr.StreamItemMessage} interface. */ + MessageType[MessageType["StreamItem"] = 2] = "StreamItem"; + /** Indicates the message is a Completion message and implements the {@link @aspnet/signalr.CompletionMessage} interface. */ + MessageType[MessageType["Completion"] = 3] = "Completion"; + /** Indicates the message is a Stream Invocation message and implements the {@link @aspnet/signalr.StreamInvocationMessage} interface. */ + MessageType[MessageType["StreamInvocation"] = 4] = "StreamInvocation"; + /** Indicates the message is a Cancel Invocation message and implements the {@link @aspnet/signalr.CancelInvocationMessage} interface. */ + MessageType[MessageType["CancelInvocation"] = 5] = "CancelInvocation"; + /** Indicates the message is a Ping message and implements the {@link @aspnet/signalr.PingMessage} interface. */ + MessageType[MessageType["Ping"] = 6] = "Ping"; + /** Indicates the message is a Close message and implements the {@link @aspnet/signalr.CloseMessage} interface. */ + MessageType[MessageType["Close"] = 7] = "Close"; +})(MessageType || (MessageType = {})); +//# sourceMappingURL=IHubProtocol.js.map + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ILogger.js": +/*!*********************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ILogger.js ***! + \*********************************************************************************************************/ +/*! exports provided: LogLevel */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "LogLevel", function() { return LogLevel; }); +// 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. +// These values are designed to match the ASP.NET Log Levels since that's the pattern we're emulating here. +/** Indicates the severity of a log message. + * + * Log Levels are ordered in increasing severity. So `Debug` is more severe than `Trace`, etc. + */ +var LogLevel; +(function (LogLevel) { + /** Log level for very low severity diagnostic messages. */ + LogLevel[LogLevel["Trace"] = 0] = "Trace"; + /** Log level for low severity diagnostic messages. */ + LogLevel[LogLevel["Debug"] = 1] = "Debug"; + /** Log level for informational diagnostic messages. */ + LogLevel[LogLevel["Information"] = 2] = "Information"; + /** Log level for diagnostic messages that indicate a non-fatal problem. */ + LogLevel[LogLevel["Warning"] = 3] = "Warning"; + /** Log level for diagnostic messages that indicate a failure in the current operation. */ + LogLevel[LogLevel["Error"] = 4] = "Error"; + /** Log level for diagnostic messages that indicate a failure that will terminate the entire application. */ + LogLevel[LogLevel["Critical"] = 5] = "Critical"; + /** The highest possible log level. Used when configuring logging to indicate that no log messages should be emitted. */ + LogLevel[LogLevel["None"] = 6] = "None"; +})(LogLevel || (LogLevel = {})); +//# sourceMappingURL=ILogger.js.map + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ITransport.js": +/*!************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ITransport.js ***! + \************************************************************************************************************/ +/*! exports provided: HttpTransportType, TransferFormat */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HttpTransportType", function() { return HttpTransportType; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TransferFormat", function() { return TransferFormat; }); +// 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. +// This will be treated as a bit flag in the future, so we keep it using power-of-two values. +/** Specifies a specific HTTP transport type. */ +var HttpTransportType; +(function (HttpTransportType) { + /** Specifies no transport preference. */ + HttpTransportType[HttpTransportType["None"] = 0] = "None"; + /** Specifies the WebSockets transport. */ + HttpTransportType[HttpTransportType["WebSockets"] = 1] = "WebSockets"; + /** Specifies the Server-Sent Events transport. */ + HttpTransportType[HttpTransportType["ServerSentEvents"] = 2] = "ServerSentEvents"; + /** Specifies the Long Polling transport. */ + HttpTransportType[HttpTransportType["LongPolling"] = 4] = "LongPolling"; +})(HttpTransportType || (HttpTransportType = {})); +/** Specifies the transfer format for a connection. */ +var TransferFormat; +(function (TransferFormat) { + /** Specifies that only text data will be transmitted over the connection. */ + TransferFormat[TransferFormat["Text"] = 1] = "Text"; + /** Specifies that binary data will be transmitted over the connection. */ + TransferFormat[TransferFormat["Binary"] = 2] = "Binary"; +})(TransferFormat || (TransferFormat = {})); +//# sourceMappingURL=ITransport.js.map + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/JsonHubProtocol.js": +/*!*****************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/JsonHubProtocol.js ***! + \*****************************************************************************************************************/ +/*! exports provided: JsonHubProtocol */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "JsonHubProtocol", function() { return JsonHubProtocol; }); +/* harmony import */ var _IHubProtocol__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./IHubProtocol */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/IHubProtocol.js"); +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./ILogger */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ILogger.js"); +/* harmony import */ var _ITransport__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./ITransport */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ITransport.js"); +/* harmony import */ var _Loggers__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./Loggers */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Loggers.js"); +/* harmony import */ var _TextMessageFormat__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./TextMessageFormat */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/TextMessageFormat.js"); +// 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. + + + + + +var JSON_HUB_PROTOCOL_NAME = "json"; +/** Implements the JSON Hub Protocol. */ +var JsonHubProtocol = /** @class */ (function () { + function JsonHubProtocol() { + /** @inheritDoc */ + this.name = JSON_HUB_PROTOCOL_NAME; + /** @inheritDoc */ + this.version = 1; + /** @inheritDoc */ + this.transferFormat = _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"].Text; + } + /** Creates an array of {@link @aspnet/signalr.HubMessage} objects from the specified serialized representation. + * + * @param {string} input A string containing the serialized representation. + * @param {ILogger} logger A logger that will be used to log messages that occur during parsing. + */ + JsonHubProtocol.prototype.parseMessages = function (input, logger) { + // The interface does allow "ArrayBuffer" to be passed in, but this implementation does not. So let's throw a useful error. + if (typeof input !== "string") { + throw new Error("Invalid input for JSON hub protocol. Expected a string."); + } + if (!input) { + return []; + } + if (logger === null) { + logger = _Loggers__WEBPACK_IMPORTED_MODULE_3__["NullLogger"].instance; + } + // Parse the messages + var messages = _TextMessageFormat__WEBPACK_IMPORTED_MODULE_4__["TextMessageFormat"].parse(input); + var hubMessages = []; + for (var _i = 0, messages_1 = messages; _i < messages_1.length; _i++) { + var message = messages_1[_i]; + var parsedMessage = JSON.parse(message); + if (typeof parsedMessage.type !== "number") { + throw new Error("Invalid payload."); + } + switch (parsedMessage.type) { + case _IHubProtocol__WEBPACK_IMPORTED_MODULE_0__["MessageType"].Invocation: + this.isInvocationMessage(parsedMessage); + break; + case _IHubProtocol__WEBPACK_IMPORTED_MODULE_0__["MessageType"].StreamItem: + this.isStreamItemMessage(parsedMessage); + break; + case _IHubProtocol__WEBPACK_IMPORTED_MODULE_0__["MessageType"].Completion: + this.isCompletionMessage(parsedMessage); + break; + case _IHubProtocol__WEBPACK_IMPORTED_MODULE_0__["MessageType"].Ping: + // Single value, no need to validate + break; + case _IHubProtocol__WEBPACK_IMPORTED_MODULE_0__["MessageType"].Close: + // All optional values, no need to validate + break; + default: + // Future protocol changes can add message types, old clients can ignore them + logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Information, "Unknown message type '" + parsedMessage.type + "' ignored."); + continue; + } + hubMessages.push(parsedMessage); + } + return hubMessages; + }; + /** Writes the specified {@link @aspnet/signalr.HubMessage} to a string and returns it. + * + * @param {HubMessage} message The message to write. + * @returns {string} A string containing the serialized representation of the message. + */ + JsonHubProtocol.prototype.writeMessage = function (message) { + return _TextMessageFormat__WEBPACK_IMPORTED_MODULE_4__["TextMessageFormat"].write(JSON.stringify(message)); + }; + JsonHubProtocol.prototype.isInvocationMessage = function (message) { + this.assertNotEmptyString(message.target, "Invalid payload for Invocation message."); + if (message.invocationId !== undefined) { + this.assertNotEmptyString(message.invocationId, "Invalid payload for Invocation message."); + } + }; + JsonHubProtocol.prototype.isStreamItemMessage = function (message) { + this.assertNotEmptyString(message.invocationId, "Invalid payload for StreamItem message."); + if (message.item === undefined) { + throw new Error("Invalid payload for StreamItem message."); + } + }; + JsonHubProtocol.prototype.isCompletionMessage = function (message) { + if (message.result && message.error) { + throw new Error("Invalid payload for Completion message."); + } + if (!message.result && message.error) { + this.assertNotEmptyString(message.error, "Invalid payload for Completion message."); + } + this.assertNotEmptyString(message.invocationId, "Invalid payload for Completion message."); + }; + JsonHubProtocol.prototype.assertNotEmptyString = function (value, errorMessage) { + if (typeof value !== "string" || value === "") { + throw new Error(errorMessage); + } + }; + return JsonHubProtocol; +}()); + +//# sourceMappingURL=JsonHubProtocol.js.map + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Loggers.js": +/*!*********************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Loggers.js ***! + \*********************************************************************************************************/ +/*! exports provided: NullLogger */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NullLogger", function() { return NullLogger; }); +// 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. +/** A logger that does nothing when log messages are sent to it. */ +var NullLogger = /** @class */ (function () { + function NullLogger() { + } + /** @inheritDoc */ + // tslint:disable-next-line + NullLogger.prototype.log = function (_logLevel, _message) { + }; + /** The singleton instance of the {@link @aspnet/signalr.NullLogger}. */ + NullLogger.instance = new NullLogger(); + return NullLogger; +}()); + +//# sourceMappingURL=Loggers.js.map + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/LongPollingTransport.js": +/*!**********************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/LongPollingTransport.js ***! + \**********************************************************************************************************************/ +/*! exports provided: LongPollingTransport */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "LongPollingTransport", function() { return LongPollingTransport; }); +/* harmony import */ var _AbortController__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./AbortController */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/AbortController.js"); +/* harmony import */ var _Errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Errors */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Errors.js"); +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./ILogger */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ILogger.js"); +/* harmony import */ var _ITransport__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./ITransport */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ITransport.js"); +/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./Utils */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Utils.js"); +// 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. +var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) { + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (undefined && undefined.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; + + + + + +// Not exported from 'index', this type is internal. +/** @private */ +var LongPollingTransport = /** @class */ (function () { + function LongPollingTransport(httpClient, accessTokenFactory, logger, logMessageContent) { + this.httpClient = httpClient; + this.accessTokenFactory = accessTokenFactory; + this.logger = logger; + this.pollAbort = new _AbortController__WEBPACK_IMPORTED_MODULE_0__["AbortController"](); + this.logMessageContent = logMessageContent; + this.running = false; + this.onreceive = null; + this.onclose = null; + } + Object.defineProperty(LongPollingTransport.prototype, "pollAborted", { + // This is an internal type, not exported from 'index' so this is really just internal. + get: function () { + return this.pollAbort.aborted; + }, + enumerable: true, + configurable: true + }); + LongPollingTransport.prototype.connect = function (url, transferFormat) { + return __awaiter(this, void 0, void 0, function () { + var pollOptions, token, pollUrl, response; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + _Utils__WEBPACK_IMPORTED_MODULE_4__["Arg"].isRequired(url, "url"); + _Utils__WEBPACK_IMPORTED_MODULE_4__["Arg"].isRequired(transferFormat, "transferFormat"); + _Utils__WEBPACK_IMPORTED_MODULE_4__["Arg"].isIn(transferFormat, _ITransport__WEBPACK_IMPORTED_MODULE_3__["TransferFormat"], "transferFormat"); + this.url = url; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) Connecting."); + // Allow binary format on Node and Browsers that support binary content (indicated by the presence of responseType property) + if (transferFormat === _ITransport__WEBPACK_IMPORTED_MODULE_3__["TransferFormat"].Binary && + (typeof XMLHttpRequest !== "undefined" && typeof new XMLHttpRequest().responseType !== "string")) { + throw new Error("Binary protocols over XmlHttpRequest not implementing advanced features are not supported."); + } + pollOptions = { + abortSignal: this.pollAbort.signal, + headers: {}, + timeout: 100000, + }; + if (transferFormat === _ITransport__WEBPACK_IMPORTED_MODULE_3__["TransferFormat"].Binary) { + pollOptions.responseType = "arraybuffer"; + } + return [4 /*yield*/, this.getAccessToken()]; + case 1: + token = _a.sent(); + this.updateHeaderToken(pollOptions, token); + pollUrl = url + "&_=" + Date.now(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) polling: " + pollUrl + "."); + return [4 /*yield*/, this.httpClient.get(pollUrl, pollOptions)]; + case 2: + response = _a.sent(); + if (response.statusCode !== 200) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, "(LongPolling transport) Unexpected response code: " + response.statusCode + "."); + // Mark running as false so that the poll immediately ends and runs the close logic + this.closeError = new _Errors__WEBPACK_IMPORTED_MODULE_1__["HttpError"](response.statusText || "", response.statusCode); + this.running = false; + } + else { + this.running = true; + } + this.receiving = this.poll(this.url, pollOptions); + return [2 /*return*/]; + } + }); + }); + }; + LongPollingTransport.prototype.getAccessToken = function () { + return __awaiter(this, void 0, void 0, function () { + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + if (!this.accessTokenFactory) return [3 /*break*/, 2]; + return [4 /*yield*/, this.accessTokenFactory()]; + case 1: return [2 /*return*/, _a.sent()]; + case 2: return [2 /*return*/, null]; + } + }); + }); + }; + LongPollingTransport.prototype.updateHeaderToken = function (request, token) { + if (!request.headers) { + request.headers = {}; + } + if (token) { + // tslint:disable-next-line:no-string-literal + request.headers["Authorization"] = "Bearer " + token; + return; + } + // tslint:disable-next-line:no-string-literal + if (request.headers["Authorization"]) { + // tslint:disable-next-line:no-string-literal + delete request.headers["Authorization"]; + } + }; + LongPollingTransport.prototype.poll = function (url, pollOptions) { + return __awaiter(this, void 0, void 0, function () { + var token, pollUrl, response, e_1; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + _a.trys.push([0, , 8, 9]); + _a.label = 1; + case 1: + if (!this.running) return [3 /*break*/, 7]; + return [4 /*yield*/, this.getAccessToken()]; + case 2: + token = _a.sent(); + this.updateHeaderToken(pollOptions, token); + _a.label = 3; + case 3: + _a.trys.push([3, 5, , 6]); + pollUrl = url + "&_=" + Date.now(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) polling: " + pollUrl + "."); + return [4 /*yield*/, this.httpClient.get(pollUrl, pollOptions)]; + case 4: + response = _a.sent(); + if (response.statusCode === 204) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "(LongPolling transport) Poll terminated by server."); + this.running = false; + } + else if (response.statusCode !== 200) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, "(LongPolling transport) Unexpected response code: " + response.statusCode + "."); + // Unexpected status code + this.closeError = new _Errors__WEBPACK_IMPORTED_MODULE_1__["HttpError"](response.statusText || "", response.statusCode); + this.running = false; + } + else { + // Process the response + if (response.content) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) data received. " + Object(_Utils__WEBPACK_IMPORTED_MODULE_4__["getDataDetail"])(response.content, this.logMessageContent) + "."); + if (this.onreceive) { + this.onreceive(response.content); + } + } + else { + // This is another way timeout manifest. + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) Poll timed out, reissuing."); + } + } + return [3 /*break*/, 6]; + case 5: + e_1 = _a.sent(); + if (!this.running) { + // Log but disregard errors that occur after stopping + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) Poll errored after shutdown: " + e_1.message); + } + else { + if (e_1 instanceof _Errors__WEBPACK_IMPORTED_MODULE_1__["TimeoutError"]) { + // Ignore timeouts and reissue the poll. + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) Poll timed out, reissuing."); + } + else { + // Close the connection with the error as the result. + this.closeError = e_1; + this.running = false; + } + } + return [3 /*break*/, 6]; + case 6: return [3 /*break*/, 1]; + case 7: return [3 /*break*/, 9]; + case 8: + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) Polling complete."); + // We will reach here with pollAborted==false when the server returned a response causing the transport to stop. + // If pollAborted==true then client initiated the stop and the stop method will raise the close event after DELETE is sent. + if (!this.pollAborted) { + this.raiseOnClose(); + } + return [7 /*endfinally*/]; + case 9: return [2 /*return*/]; + } + }); + }); + }; + LongPollingTransport.prototype.send = function (data) { + return __awaiter(this, void 0, void 0, function () { + return __generator(this, function (_a) { + if (!this.running) { + return [2 /*return*/, Promise.reject(new Error("Cannot send until the transport is connected"))]; + } + return [2 /*return*/, Object(_Utils__WEBPACK_IMPORTED_MODULE_4__["sendMessage"])(this.logger, "LongPolling", this.httpClient, this.url, this.accessTokenFactory, data, this.logMessageContent)]; + }); + }); + }; + LongPollingTransport.prototype.stop = function () { + return __awaiter(this, void 0, void 0, function () { + var deleteOptions, token; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) Stopping polling."); + // Tell receiving loop to stop, abort any current request, and then wait for it to finish + this.running = false; + this.pollAbort.abort(); + _a.label = 1; + case 1: + _a.trys.push([1, , 5, 6]); + return [4 /*yield*/, this.receiving]; + case 2: + _a.sent(); + // Send DELETE to clean up long polling on the server + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) sending DELETE request to " + this.url + "."); + deleteOptions = { + headers: {}, + }; + return [4 /*yield*/, this.getAccessToken()]; + case 3: + token = _a.sent(); + this.updateHeaderToken(deleteOptions, token); + return [4 /*yield*/, this.httpClient.delete(this.url, deleteOptions)]; + case 4: + _a.sent(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) DELETE request sent."); + return [3 /*break*/, 6]; + case 5: + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, "(LongPolling transport) Stop finished."); + // Raise close event here instead of in polling + // It needs to happen after the DELETE request is sent + this.raiseOnClose(); + return [7 /*endfinally*/]; + case 6: return [2 /*return*/]; + } + }); + }); + }; + LongPollingTransport.prototype.raiseOnClose = function () { + if (this.onclose) { + var logMessage = "(LongPolling transport) Firing onclose event."; + if (this.closeError) { + logMessage += " Error: " + this.closeError; + } + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Trace, logMessage); + this.onclose(this.closeError); + } + }; + return LongPollingTransport; +}()); + +//# sourceMappingURL=LongPollingTransport.js.map + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/NodeHttpClient.js": +/*!****************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/NodeHttpClient.js ***! + \****************************************************************************************************************/ +/*! exports provided: NodeHttpClient */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* WEBPACK VAR INJECTION */(function(Buffer) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NodeHttpClient", function() { return NodeHttpClient; }); +/* harmony import */ var _Errors__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Errors */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Errors.js"); +/* harmony import */ var _HttpClient__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./HttpClient */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/HttpClient.js"); +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./ILogger */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ILogger.js"); +/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./Utils */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Utils.js"); +// 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. +var __extends = (undefined && undefined.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +var __assign = (undefined && undefined.__assign) || Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; +}; + + + + +var requestModule; +if (typeof XMLHttpRequest === "undefined") { + // In order to ignore the dynamic require in webpack builds we need to do this magic + // @ts-ignore: TS doesn't know about these names + var requireFunc = true ? require : undefined; + requestModule = requireFunc("request"); +} +var NodeHttpClient = /** @class */ (function (_super) { + __extends(NodeHttpClient, _super); + function NodeHttpClient(logger) { + var _this = _super.call(this) || this; + if (typeof requestModule === "undefined") { + throw new Error("The 'request' module could not be loaded."); + } + _this.logger = logger; + _this.cookieJar = requestModule.jar(); + _this.request = requestModule.defaults({ jar: _this.cookieJar }); + return _this; + } + NodeHttpClient.prototype.send = function (httpRequest) { + var _this = this; + return new Promise(function (resolve, reject) { + var requestBody; + if (Object(_Utils__WEBPACK_IMPORTED_MODULE_3__["isArrayBuffer"])(httpRequest.content)) { + requestBody = Buffer.from(httpRequest.content); + } + else { + requestBody = httpRequest.content || ""; + } + var currentRequest = _this.request(httpRequest.url, { + body: requestBody, + // If binary is expected 'null' should be used, otherwise for text 'utf8' + encoding: httpRequest.responseType === "arraybuffer" ? null : "utf8", + headers: __assign({ + // Tell auth middleware to 401 instead of redirecting + "X-Requested-With": "XMLHttpRequest" }, httpRequest.headers), + method: httpRequest.method, + timeout: httpRequest.timeout, + }, function (error, response, body) { + if (httpRequest.abortSignal) { + httpRequest.abortSignal.onabort = null; + } + if (error) { + if (error.code === "ETIMEDOUT") { + _this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Warning, "Timeout from HTTP request."); + reject(new _Errors__WEBPACK_IMPORTED_MODULE_0__["TimeoutError"]()); + } + _this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Warning, "Error from HTTP request. " + error); + reject(error); + return; + } + if (response.statusCode >= 200 && response.statusCode < 300) { + resolve(new _HttpClient__WEBPACK_IMPORTED_MODULE_1__["HttpResponse"](response.statusCode, response.statusMessage || "", body)); + } + else { + reject(new _Errors__WEBPACK_IMPORTED_MODULE_0__["HttpError"](response.statusMessage || "", response.statusCode || 0)); + } + }); + if (httpRequest.abortSignal) { + httpRequest.abortSignal.onabort = function () { + currentRequest.abort(); + reject(new _Errors__WEBPACK_IMPORTED_MODULE_0__["AbortError"]()); + }; + } + }); + }; + NodeHttpClient.prototype.getCookieString = function (url) { + return this.cookieJar.getCookieString(url); + }; + return NodeHttpClient; +}(_HttpClient__WEBPACK_IMPORTED_MODULE_1__["HttpClient"])); + +//# sourceMappingURL=NodeHttpClient.js.map +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../../../../../../buffer/index.js */ "../node_modules/buffer/index.js").Buffer)) + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ServerSentEventsTransport.js": +/*!***************************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ServerSentEventsTransport.js ***! + \***************************************************************************************************************************/ +/*! exports provided: ServerSentEventsTransport */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ServerSentEventsTransport", function() { return ServerSentEventsTransport; }); +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./ILogger */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ILogger.js"); +/* harmony import */ var _ITransport__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./ITransport */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ITransport.js"); +/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./Utils */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Utils.js"); +// 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. +var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) { + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (undefined && undefined.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; + + + +/** @private */ +var ServerSentEventsTransport = /** @class */ (function () { + function ServerSentEventsTransport(httpClient, accessTokenFactory, logger, logMessageContent, eventSourceConstructor) { + this.httpClient = httpClient; + this.accessTokenFactory = accessTokenFactory; + this.logger = logger; + this.logMessageContent = logMessageContent; + this.eventSourceConstructor = eventSourceConstructor; + this.onreceive = null; + this.onclose = null; + } + ServerSentEventsTransport.prototype.connect = function (url, transferFormat) { + return __awaiter(this, void 0, void 0, function () { + var token; + var _this = this; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + _Utils__WEBPACK_IMPORTED_MODULE_2__["Arg"].isRequired(url, "url"); + _Utils__WEBPACK_IMPORTED_MODULE_2__["Arg"].isRequired(transferFormat, "transferFormat"); + _Utils__WEBPACK_IMPORTED_MODULE_2__["Arg"].isIn(transferFormat, _ITransport__WEBPACK_IMPORTED_MODULE_1__["TransferFormat"], "transferFormat"); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Trace, "(SSE transport) Connecting."); + // set url before accessTokenFactory because this.url is only for send and we set the auth header instead of the query string for send + this.url = url; + if (!this.accessTokenFactory) return [3 /*break*/, 2]; + return [4 /*yield*/, this.accessTokenFactory()]; + case 1: + token = _a.sent(); + if (token) { + url += (url.indexOf("?") < 0 ? "?" : "&") + ("access_token=" + encodeURIComponent(token)); + } + _a.label = 2; + case 2: return [2 /*return*/, new Promise(function (resolve, reject) { + var opened = false; + if (transferFormat !== _ITransport__WEBPACK_IMPORTED_MODULE_1__["TransferFormat"].Text) { + reject(new Error("The Server-Sent Events transport only supports the 'Text' transfer format")); + return; + } + var eventSource; + if (_Utils__WEBPACK_IMPORTED_MODULE_2__["Platform"].isBrowser || _Utils__WEBPACK_IMPORTED_MODULE_2__["Platform"].isWebWorker) { + eventSource = new _this.eventSourceConstructor(url, { withCredentials: true }); + } + else { + // Non-browser passes cookies via the dictionary + var cookies = _this.httpClient.getCookieString(url); + eventSource = new _this.eventSourceConstructor(url, { withCredentials: true, headers: { Cookie: cookies } }); + } + try { + eventSource.onmessage = function (e) { + if (_this.onreceive) { + try { + _this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Trace, "(SSE transport) data received. " + Object(_Utils__WEBPACK_IMPORTED_MODULE_2__["getDataDetail"])(e.data, _this.logMessageContent) + "."); + _this.onreceive(e.data); + } + catch (error) { + _this.close(error); + return; + } + } + }; + eventSource.onerror = function (e) { + var error = new Error(e.data || "Error occurred"); + if (opened) { + _this.close(error); + } + else { + reject(error); + } + }; + eventSource.onopen = function () { + _this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Information, "SSE connected to " + _this.url); + _this.eventSource = eventSource; + opened = true; + resolve(); + }; + } + catch (e) { + reject(e); + return; + } + })]; + } + }); + }); + }; + ServerSentEventsTransport.prototype.send = function (data) { + return __awaiter(this, void 0, void 0, function () { + return __generator(this, function (_a) { + if (!this.eventSource) { + return [2 /*return*/, Promise.reject(new Error("Cannot send until the transport is connected"))]; + } + return [2 /*return*/, Object(_Utils__WEBPACK_IMPORTED_MODULE_2__["sendMessage"])(this.logger, "SSE", this.httpClient, this.url, this.accessTokenFactory, data, this.logMessageContent)]; + }); + }); + }; + ServerSentEventsTransport.prototype.stop = function () { + this.close(); + return Promise.resolve(); + }; + ServerSentEventsTransport.prototype.close = function (e) { + if (this.eventSource) { + this.eventSource.close(); + this.eventSource = undefined; + if (this.onclose) { + this.onclose(e); + } + } + }; + return ServerSentEventsTransport; +}()); + +//# sourceMappingURL=ServerSentEventsTransport.js.map + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Subject.js": +/*!*********************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Subject.js ***! + \*********************************************************************************************************/ +/*! exports provided: Subject */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return Subject; }); +/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Utils */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Utils.js"); +// 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. + +/** Stream implementation to stream items to the server. */ +var Subject = /** @class */ (function () { + function Subject() { + this.observers = []; + } + Subject.prototype.next = function (item) { + for (var _i = 0, _a = this.observers; _i < _a.length; _i++) { + var observer = _a[_i]; + observer.next(item); + } + }; + Subject.prototype.error = function (err) { + for (var _i = 0, _a = this.observers; _i < _a.length; _i++) { + var observer = _a[_i]; + if (observer.error) { + observer.error(err); + } + } + }; + Subject.prototype.complete = function () { + for (var _i = 0, _a = this.observers; _i < _a.length; _i++) { + var observer = _a[_i]; + if (observer.complete) { + observer.complete(); + } + } + }; + Subject.prototype.subscribe = function (observer) { + this.observers.push(observer); + return new _Utils__WEBPACK_IMPORTED_MODULE_0__["SubjectSubscription"](this, observer); + }; + return Subject; +}()); + +//# sourceMappingURL=Subject.js.map + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/TextMessageFormat.js": +/*!*******************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/TextMessageFormat.js ***! + \*******************************************************************************************************************/ +/*! exports provided: TextMessageFormat */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TextMessageFormat", function() { return TextMessageFormat; }); +// 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. +// Not exported from index +/** @private */ +var TextMessageFormat = /** @class */ (function () { + function TextMessageFormat() { + } + TextMessageFormat.write = function (output) { + return "" + output + TextMessageFormat.RecordSeparator; + }; + TextMessageFormat.parse = function (input) { + if (input[input.length - 1] !== TextMessageFormat.RecordSeparator) { + throw new Error("Message is incomplete."); + } + var messages = input.split(TextMessageFormat.RecordSeparator); + messages.pop(); + return messages; + }; + TextMessageFormat.RecordSeparatorCode = 0x1e; + TextMessageFormat.RecordSeparator = String.fromCharCode(TextMessageFormat.RecordSeparatorCode); + return TextMessageFormat; +}()); + +//# sourceMappingURL=TextMessageFormat.js.map + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Utils.js": +/*!*******************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Utils.js ***! + \*******************************************************************************************************/ +/*! exports provided: Arg, Platform, getDataDetail, formatArrayBuffer, isArrayBuffer, sendMessage, createLogger, SubjectSubscription, ConsoleLogger */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Arg", function() { return Arg; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Platform", function() { return Platform; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getDataDetail", function() { return getDataDetail; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "formatArrayBuffer", function() { return formatArrayBuffer; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isArrayBuffer", function() { return isArrayBuffer; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sendMessage", function() { return sendMessage; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "createLogger", function() { return createLogger; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SubjectSubscription", function() { return SubjectSubscription; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ConsoleLogger", function() { return ConsoleLogger; }); +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./ILogger */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ILogger.js"); +/* harmony import */ var _Loggers__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Loggers */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Loggers.js"); +// 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. +var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) { + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (undefined && undefined.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; + + +/** @private */ +var Arg = /** @class */ (function () { + function Arg() { + } + Arg.isRequired = function (val, name) { + if (val === null || val === undefined) { + throw new Error("The '" + name + "' argument is required."); + } + }; + Arg.isIn = function (val, values, name) { + // TypeScript enums have keys for **both** the name and the value of each enum member on the type itself. + if (!(val in values)) { + throw new Error("Unknown " + name + " value: " + val + "."); + } + }; + return Arg; +}()); + +/** @private */ +var Platform = /** @class */ (function () { + function Platform() { + } + Object.defineProperty(Platform, "isBrowser", { + get: function () { + return typeof window === "object"; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Platform, "isWebWorker", { + get: function () { + return typeof self === "object" && "importScripts" in self; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Platform, "isNode", { + get: function () { + return !this.isBrowser && !this.isWebWorker; + }, + enumerable: true, + configurable: true + }); + return Platform; +}()); + +/** @private */ +function getDataDetail(data, includeContent) { + var detail = ""; + if (isArrayBuffer(data)) { + detail = "Binary data of length " + data.byteLength; + if (includeContent) { + detail += ". Content: '" + formatArrayBuffer(data) + "'"; + } + } + else if (typeof data === "string") { + detail = "String data of length " + data.length; + if (includeContent) { + detail += ". Content: '" + data + "'"; + } + } + return detail; +} +/** @private */ +function formatArrayBuffer(data) { + var view = new Uint8Array(data); + // Uint8Array.map only supports returning another Uint8Array? + var str = ""; + view.forEach(function (num) { + var pad = num < 16 ? "0" : ""; + str += "0x" + pad + num.toString(16) + " "; + }); + // Trim of trailing space. + return str.substr(0, str.length - 1); +} +// Also in signalr-protocol-msgpack/Utils.ts +/** @private */ +function isArrayBuffer(val) { + return val && typeof ArrayBuffer !== "undefined" && + (val instanceof ArrayBuffer || + // Sometimes we get an ArrayBuffer that doesn't satisfy instanceof + (val.constructor && val.constructor.name === "ArrayBuffer")); +} +/** @private */ +function sendMessage(logger, transportName, httpClient, url, accessTokenFactory, content, logMessageContent) { + return __awaiter(this, void 0, void 0, function () { + var _a, headers, token, responseType, response; + return __generator(this, function (_b) { + switch (_b.label) { + case 0: + if (!accessTokenFactory) return [3 /*break*/, 2]; + return [4 /*yield*/, accessTokenFactory()]; + case 1: + token = _b.sent(); + if (token) { + headers = (_a = {}, + _a["Authorization"] = "Bearer " + token, + _a); + } + _b.label = 2; + case 2: + logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Trace, "(" + transportName + " transport) sending data. " + getDataDetail(content, logMessageContent) + "."); + responseType = isArrayBuffer(content) ? "arraybuffer" : "text"; + return [4 /*yield*/, httpClient.post(url, { + content: content, + headers: headers, + responseType: responseType, + })]; + case 3: + response = _b.sent(); + logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Trace, "(" + transportName + " transport) request complete. Response status: " + response.statusCode + "."); + return [2 /*return*/]; + } + }); + }); +} +/** @private */ +function createLogger(logger) { + if (logger === undefined) { + return new ConsoleLogger(_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Information); + } + if (logger === null) { + return _Loggers__WEBPACK_IMPORTED_MODULE_1__["NullLogger"].instance; + } + if (logger.log) { + return logger; + } + return new ConsoleLogger(logger); +} +/** @private */ +var SubjectSubscription = /** @class */ (function () { + function SubjectSubscription(subject, observer) { + this.subject = subject; + this.observer = observer; + } + SubjectSubscription.prototype.dispose = function () { + var index = this.subject.observers.indexOf(this.observer); + if (index > -1) { + this.subject.observers.splice(index, 1); + } + if (this.subject.observers.length === 0 && this.subject.cancelCallback) { + this.subject.cancelCallback().catch(function (_) { }); + } + }; + return SubjectSubscription; +}()); + +/** @private */ +var ConsoleLogger = /** @class */ (function () { + function ConsoleLogger(minimumLogLevel) { + this.minimumLogLevel = minimumLogLevel; + this.outputConsole = console; + } + ConsoleLogger.prototype.log = function (logLevel, message) { + if (logLevel >= this.minimumLogLevel) { + switch (logLevel) { + case _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Critical: + case _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Error: + this.outputConsole.error("[" + new Date().toISOString() + "] " + _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"][logLevel] + ": " + message); + break; + case _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Warning: + this.outputConsole.warn("[" + new Date().toISOString() + "] " + _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"][logLevel] + ": " + message); + break; + case _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Information: + this.outputConsole.info("[" + new Date().toISOString() + "] " + _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"][logLevel] + ": " + message); + break; + default: + // console.debug only goes to attached debuggers in Node, so we use console.log for Trace and Debug + this.outputConsole.log("[" + new Date().toISOString() + "] " + _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"][logLevel] + ": " + message); + break; + } + } + }; + return ConsoleLogger; +}()); + +//# sourceMappingURL=Utils.js.map + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/WebSocketTransport.js": +/*!********************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/WebSocketTransport.js ***! + \********************************************************************************************************************/ +/*! exports provided: WebSocketTransport */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "WebSocketTransport", function() { return WebSocketTransport; }); +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./ILogger */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ILogger.js"); +/* harmony import */ var _ITransport__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./ITransport */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ITransport.js"); +/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./Utils */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Utils.js"); +// 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. +var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) { + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (undefined && undefined.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; + + + +/** @private */ +var WebSocketTransport = /** @class */ (function () { + function WebSocketTransport(httpClient, accessTokenFactory, logger, logMessageContent, webSocketConstructor) { + this.logger = logger; + this.accessTokenFactory = accessTokenFactory; + this.logMessageContent = logMessageContent; + this.webSocketConstructor = webSocketConstructor; + this.httpClient = httpClient; + this.onreceive = null; + this.onclose = null; + } + WebSocketTransport.prototype.connect = function (url, transferFormat) { + return __awaiter(this, void 0, void 0, function () { + var token; + var _this = this; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + _Utils__WEBPACK_IMPORTED_MODULE_2__["Arg"].isRequired(url, "url"); + _Utils__WEBPACK_IMPORTED_MODULE_2__["Arg"].isRequired(transferFormat, "transferFormat"); + _Utils__WEBPACK_IMPORTED_MODULE_2__["Arg"].isIn(transferFormat, _ITransport__WEBPACK_IMPORTED_MODULE_1__["TransferFormat"], "transferFormat"); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Trace, "(WebSockets transport) Connecting."); + if (!this.accessTokenFactory) return [3 /*break*/, 2]; + return [4 /*yield*/, this.accessTokenFactory()]; + case 1: + token = _a.sent(); + if (token) { + url += (url.indexOf("?") < 0 ? "?" : "&") + ("access_token=" + encodeURIComponent(token)); + } + _a.label = 2; + case 2: return [2 /*return*/, new Promise(function (resolve, reject) { + url = url.replace(/^http/, "ws"); + var webSocket; + var cookies = _this.httpClient.getCookieString(url); + if (_Utils__WEBPACK_IMPORTED_MODULE_2__["Platform"].isNode && cookies) { + // Only pass cookies when in non-browser environments + webSocket = new _this.webSocketConstructor(url, undefined, { + headers: { + Cookie: "" + cookies, + }, + }); + } + if (!webSocket) { + // Chrome is not happy with passing 'undefined' as protocol + webSocket = new _this.webSocketConstructor(url); + } + if (transferFormat === _ITransport__WEBPACK_IMPORTED_MODULE_1__["TransferFormat"].Binary) { + webSocket.binaryType = "arraybuffer"; + } + // tslint:disable-next-line:variable-name + webSocket.onopen = function (_event) { + _this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Information, "WebSocket connected to " + url + "."); + _this.webSocket = webSocket; + resolve(); + }; + webSocket.onerror = function (event) { + var error = null; + // ErrorEvent is a browser only type we need to check if the type exists before using it + if (typeof ErrorEvent !== "undefined" && event instanceof ErrorEvent) { + error = event.error; + } + reject(error); + }; + webSocket.onmessage = function (message) { + _this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Trace, "(WebSockets transport) data received. " + Object(_Utils__WEBPACK_IMPORTED_MODULE_2__["getDataDetail"])(message.data, _this.logMessageContent) + "."); + if (_this.onreceive) { + _this.onreceive(message.data); + } + }; + webSocket.onclose = function (event) { return _this.close(event); }; + })]; + } + }); + }); + }; + WebSocketTransport.prototype.send = function (data) { + if (this.webSocket && this.webSocket.readyState === this.webSocketConstructor.OPEN) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Trace, "(WebSockets transport) sending data. " + Object(_Utils__WEBPACK_IMPORTED_MODULE_2__["getDataDetail"])(data, this.logMessageContent) + "."); + this.webSocket.send(data); + return Promise.resolve(); + } + return Promise.reject("WebSocket is not in the OPEN state"); + }; + WebSocketTransport.prototype.stop = function () { + if (this.webSocket) { + // Clear websocket handlers because we are considering the socket closed now + this.webSocket.onclose = function () { }; + this.webSocket.onmessage = function () { }; + this.webSocket.onerror = function () { }; + this.webSocket.close(); + this.webSocket = undefined; + // Manually invoke onclose callback inline so we know the HttpConnection was closed properly before returning + // This also solves an issue where websocket.onclose could take 18+ seconds to trigger during network disconnects + this.close(undefined); + } + return Promise.resolve(); + }; + WebSocketTransport.prototype.close = function (event) { + // webSocket will be null if the transport did not start successfully + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Trace, "(WebSockets transport) socket closed."); + if (this.onclose) { + if (event && (event.wasClean === false || event.code !== 1000)) { + this.onclose(new Error("WebSocket closed with status code: " + event.code + " (" + event.reason + ").")); + } + else { + this.onclose(); + } + } + }; + return WebSocketTransport; +}()); + +//# sourceMappingURL=WebSocketTransport.js.map + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/XhrHttpClient.js": +/*!***************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/XhrHttpClient.js ***! + \***************************************************************************************************************/ +/*! exports provided: XhrHttpClient */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "XhrHttpClient", function() { return XhrHttpClient; }); +/* harmony import */ var _Errors__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Errors */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Errors.js"); +/* harmony import */ var _HttpClient__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./HttpClient */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/HttpClient.js"); +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./ILogger */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ILogger.js"); +// 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. +var __extends = (undefined && undefined.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); + + + +var XhrHttpClient = /** @class */ (function (_super) { + __extends(XhrHttpClient, _super); + function XhrHttpClient(logger) { + var _this = _super.call(this) || this; + _this.logger = logger; + return _this; + } + /** @inheritDoc */ + XhrHttpClient.prototype.send = function (request) { + var _this = this; + // Check that abort was not signaled before calling send + if (request.abortSignal && request.abortSignal.aborted) { + return Promise.reject(new _Errors__WEBPACK_IMPORTED_MODULE_0__["AbortError"]()); + } + if (!request.method) { + return Promise.reject(new Error("No method defined.")); + } + if (!request.url) { + return Promise.reject(new Error("No url defined.")); + } + return new Promise(function (resolve, reject) { + var xhr = new XMLHttpRequest(); + xhr.open(request.method, request.url, true); + xhr.withCredentials = true; + xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest"); + // Explicitly setting the Content-Type header for React Native on Android platform. + xhr.setRequestHeader("Content-Type", "text/plain;charset=UTF-8"); + var headers = request.headers; + if (headers) { + Object.keys(headers) + .forEach(function (header) { + xhr.setRequestHeader(header, headers[header]); + }); + } + if (request.responseType) { + xhr.responseType = request.responseType; + } + if (request.abortSignal) { + request.abortSignal.onabort = function () { + xhr.abort(); + reject(new _Errors__WEBPACK_IMPORTED_MODULE_0__["AbortError"]()); + }; + } + if (request.timeout) { + xhr.timeout = request.timeout; + } + xhr.onload = function () { + if (request.abortSignal) { + request.abortSignal.onabort = null; + } + if (xhr.status >= 200 && xhr.status < 300) { + resolve(new _HttpClient__WEBPACK_IMPORTED_MODULE_1__["HttpResponse"](xhr.status, xhr.statusText, xhr.response || xhr.responseText)); + } + else { + reject(new _Errors__WEBPACK_IMPORTED_MODULE_0__["HttpError"](xhr.statusText, xhr.status)); + } + }; + xhr.onerror = function () { + _this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Warning, "Error from HTTP request. " + xhr.status + ": " + xhr.statusText + "."); + reject(new _Errors__WEBPACK_IMPORTED_MODULE_0__["HttpError"](xhr.statusText, xhr.status)); + }; + xhr.ontimeout = function () { + _this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Warning, "Timeout from HTTP request."); + reject(new _Errors__WEBPACK_IMPORTED_MODULE_0__["TimeoutError"]()); + }; + xhr.send(request.content || ""); + }); + }; + return XhrHttpClient; +}(_HttpClient__WEBPACK_IMPORTED_MODULE_1__["HttpClient"])); + +//# sourceMappingURL=XhrHttpClient.js.map + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/index.js": +/*!*******************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/index.js ***! + \*******************************************************************************************************/ +/*! exports provided: VERSION, AbortError, HttpError, TimeoutError, HttpClient, HttpResponse, DefaultHttpClient, HubConnection, HubConnectionState, HubConnectionBuilder, MessageType, LogLevel, HttpTransportType, TransferFormat, NullLogger, JsonHubProtocol, Subject */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "VERSION", function() { return VERSION; }); +/* harmony import */ var _Errors__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Errors */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Errors.js"); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "AbortError", function() { return _Errors__WEBPACK_IMPORTED_MODULE_0__["AbortError"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "HttpError", function() { return _Errors__WEBPACK_IMPORTED_MODULE_0__["HttpError"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return _Errors__WEBPACK_IMPORTED_MODULE_0__["TimeoutError"]; }); + +/* harmony import */ var _HttpClient__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./HttpClient */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/HttpClient.js"); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "HttpClient", function() { return _HttpClient__WEBPACK_IMPORTED_MODULE_1__["HttpClient"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "HttpResponse", function() { return _HttpClient__WEBPACK_IMPORTED_MODULE_1__["HttpResponse"]; }); + +/* harmony import */ var _DefaultHttpClient__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./DefaultHttpClient */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/DefaultHttpClient.js"); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "DefaultHttpClient", function() { return _DefaultHttpClient__WEBPACK_IMPORTED_MODULE_2__["DefaultHttpClient"]; }); + +/* harmony import */ var _HubConnection__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./HubConnection */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/HubConnection.js"); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "HubConnection", function() { return _HubConnection__WEBPACK_IMPORTED_MODULE_3__["HubConnection"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "HubConnectionState", function() { return _HubConnection__WEBPACK_IMPORTED_MODULE_3__["HubConnectionState"]; }); + +/* harmony import */ var _HubConnectionBuilder__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./HubConnectionBuilder */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/HubConnectionBuilder.js"); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "HubConnectionBuilder", function() { return _HubConnectionBuilder__WEBPACK_IMPORTED_MODULE_4__["HubConnectionBuilder"]; }); + +/* harmony import */ var _IHubProtocol__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./IHubProtocol */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/IHubProtocol.js"); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "MessageType", function() { return _IHubProtocol__WEBPACK_IMPORTED_MODULE_5__["MessageType"]; }); + +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./ILogger */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ILogger.js"); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "LogLevel", function() { return _ILogger__WEBPACK_IMPORTED_MODULE_6__["LogLevel"]; }); + +/* harmony import */ var _ITransport__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./ITransport */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/ITransport.js"); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "HttpTransportType", function() { return _ITransport__WEBPACK_IMPORTED_MODULE_7__["HttpTransportType"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "TransferFormat", function() { return _ITransport__WEBPACK_IMPORTED_MODULE_7__["TransferFormat"]; }); + +/* harmony import */ var _Loggers__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./Loggers */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Loggers.js"); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NullLogger", function() { return _Loggers__WEBPACK_IMPORTED_MODULE_8__["NullLogger"]; }); + +/* harmony import */ var _JsonHubProtocol__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./JsonHubProtocol */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/JsonHubProtocol.js"); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "JsonHubProtocol", function() { return _JsonHubProtocol__WEBPACK_IMPORTED_MODULE_9__["JsonHubProtocol"]; }); + +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./Subject */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/@aspnet/signalr/dist/esm/Subject.js"); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return _Subject__WEBPACK_IMPORTED_MODULE_10__["Subject"]; }); + +// 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. +// Version token that will be replaced by the prepack command +/** The version of the SignalR client. */ +var VERSION = "0.0.0-DEV_BUILD"; + + + + + + + + + + + +//# sourceMappingURL=index.js.map + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/bl/bl.js": +/*!******************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/bl/bl.js ***! + \******************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var DuplexStream = __webpack_require__(/*! readable-stream/duplex */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/duplex-browser.js") + , util = __webpack_require__(/*! util */ "../node_modules/util/util.js") + , Buffer = __webpack_require__(/*! safe-buffer */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/safe-buffer/index.js").Buffer + + +function BufferList (callback) { + if (!(this instanceof BufferList)) + return new BufferList(callback) + + this._bufs = [] + this.length = 0 + + if (typeof callback == 'function') { + this._callback = callback + + var piper = function piper (err) { + if (this._callback) { + this._callback(err) + this._callback = null + } + }.bind(this) + + this.on('pipe', function onPipe (src) { + src.on('error', piper) + }) + this.on('unpipe', function onUnpipe (src) { + src.removeListener('error', piper) + }) + } else { + this.append(callback) + } + + DuplexStream.call(this) +} + + +util.inherits(BufferList, DuplexStream) + + +BufferList.prototype._offset = function _offset (offset) { + var tot = 0, i = 0, _t + if (offset === 0) return [ 0, 0 ] + for (; i < this._bufs.length; i++) { + _t = tot + this._bufs[i].length + if (offset < _t || i == this._bufs.length - 1) + return [ i, offset - tot ] + tot = _t + } +} + + +BufferList.prototype.append = function append (buf) { + var i = 0 + + if (Buffer.isBuffer(buf)) { + this._appendBuffer(buf); + } else if (Array.isArray(buf)) { + for (; i < buf.length; i++) + this.append(buf[i]) + } else if (buf instanceof BufferList) { + // unwrap argument into individual BufferLists + for (; i < buf._bufs.length; i++) + this.append(buf._bufs[i]) + } else if (buf != null) { + // coerce number arguments to strings, since Buffer(number) does + // uninitialized memory allocation + if (typeof buf == 'number') + buf = buf.toString() + + this._appendBuffer(Buffer.from(buf)); + } + + return this +} + + +BufferList.prototype._appendBuffer = function appendBuffer (buf) { + this._bufs.push(buf) + this.length += buf.length +} + + +BufferList.prototype._write = function _write (buf, encoding, callback) { + this._appendBuffer(buf) + + if (typeof callback == 'function') + callback() +} + + +BufferList.prototype._read = function _read (size) { + if (!this.length) + return this.push(null) + + size = Math.min(size, this.length) + this.push(this.slice(0, size)) + this.consume(size) +} + + +BufferList.prototype.end = function end (chunk) { + DuplexStream.prototype.end.call(this, chunk) + + if (this._callback) { + this._callback(null, this.slice()) + this._callback = null + } +} + + +BufferList.prototype.get = function get (index) { + return this.slice(index, index + 1)[0] +} + + +BufferList.prototype.slice = function slice (start, end) { + if (typeof start == 'number' && start < 0) + start += this.length + if (typeof end == 'number' && end < 0) + end += this.length + return this.copy(null, 0, start, end) +} + + +BufferList.prototype.copy = function copy (dst, dstStart, srcStart, srcEnd) { + if (typeof srcStart != 'number' || srcStart < 0) + srcStart = 0 + if (typeof srcEnd != 'number' || srcEnd > this.length) + srcEnd = this.length + if (srcStart >= this.length) + return dst || Buffer.alloc(0) + if (srcEnd <= 0) + return dst || Buffer.alloc(0) + + var copy = !!dst + , off = this._offset(srcStart) + , len = srcEnd - srcStart + , bytes = len + , bufoff = (copy && dstStart) || 0 + , start = off[1] + , l + , i + + // copy/slice everything + if (srcStart === 0 && srcEnd == this.length) { + if (!copy) { // slice, but full concat if multiple buffers + return this._bufs.length === 1 + ? this._bufs[0] + : Buffer.concat(this._bufs, this.length) + } + + // copy, need to copy individual buffers + for (i = 0; i < this._bufs.length; i++) { + this._bufs[i].copy(dst, bufoff) + bufoff += this._bufs[i].length + } + + return dst + } + + // easy, cheap case where it's a subset of one of the buffers + if (bytes <= this._bufs[off[0]].length - start) { + return copy + ? this._bufs[off[0]].copy(dst, dstStart, start, start + bytes) + : this._bufs[off[0]].slice(start, start + bytes) + } + + if (!copy) // a slice, we need something to copy in to + dst = Buffer.allocUnsafe(len) + + for (i = off[0]; i < this._bufs.length; i++) { + l = this._bufs[i].length - start + + if (bytes > l) { + this._bufs[i].copy(dst, bufoff, start) + } else { + this._bufs[i].copy(dst, bufoff, start, start + bytes) + break + } + + bufoff += l + bytes -= l + + if (start) + start = 0 + } + + return dst +} + +BufferList.prototype.shallowSlice = function shallowSlice (start, end) { + start = start || 0 + end = end || this.length + + if (start < 0) + start += this.length + if (end < 0) + end += this.length + + var startOffset = this._offset(start) + , endOffset = this._offset(end) + , buffers = this._bufs.slice(startOffset[0], endOffset[0] + 1) + + if (endOffset[1] == 0) + buffers.pop() + else + buffers[buffers.length-1] = buffers[buffers.length-1].slice(0, endOffset[1]) + + if (startOffset[1] != 0) + buffers[0] = buffers[0].slice(startOffset[1]) + + return new BufferList(buffers) +} + +BufferList.prototype.toString = function toString (encoding, start, end) { + return this.slice(start, end).toString(encoding) +} + +BufferList.prototype.consume = function consume (bytes) { + while (this._bufs.length) { + if (bytes >= this._bufs[0].length) { + bytes -= this._bufs[0].length + this.length -= this._bufs[0].length + this._bufs.shift() + } else { + this._bufs[0] = this._bufs[0].slice(bytes) + this.length -= bytes + break + } + } + return this +} + + +BufferList.prototype.duplicate = function duplicate () { + var i = 0 + , copy = new BufferList() + + for (; i < this._bufs.length; i++) + copy.append(this._bufs[i]) + + return copy +} + + +BufferList.prototype.destroy = function destroy () { + this._bufs.length = 0 + this.length = 0 + this.push(null) +} + + +;(function () { + var methods = { + 'readDoubleBE' : 8 + , 'readDoubleLE' : 8 + , 'readFloatBE' : 4 + , 'readFloatLE' : 4 + , 'readInt32BE' : 4 + , 'readInt32LE' : 4 + , 'readUInt32BE' : 4 + , 'readUInt32LE' : 4 + , 'readInt16BE' : 2 + , 'readInt16LE' : 2 + , 'readUInt16BE' : 2 + , 'readUInt16LE' : 2 + , 'readInt8' : 1 + , 'readUInt8' : 1 + } + + for (var m in methods) { + (function (m) { + BufferList.prototype[m] = function (offset) { + return this.slice(offset, offset + methods[m])[m](0) + } + }(m)) + } +}()) + + +module.exports = BufferList + + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/core-util-is/lib/util.js": +/*!**********************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/core-util-is/lib/util.js ***! + \**********************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +/* WEBPACK VAR INJECTION */(function(Buffer) {// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +// NOTE: These type checking functions intentionally don't use `instanceof` +// because it is fragile and can be easily faked with `Object.create()`. + +function isArray(arg) { + if (Array.isArray) { + return Array.isArray(arg); + } + return objectToString(arg) === '[object Array]'; +} +exports.isArray = isArray; + +function isBoolean(arg) { + return typeof arg === 'boolean'; +} +exports.isBoolean = isBoolean; + +function isNull(arg) { + return arg === null; +} +exports.isNull = isNull; + +function isNullOrUndefined(arg) { + return arg == null; +} +exports.isNullOrUndefined = isNullOrUndefined; + +function isNumber(arg) { + return typeof arg === 'number'; +} +exports.isNumber = isNumber; + +function isString(arg) { + return typeof arg === 'string'; +} +exports.isString = isString; + +function isSymbol(arg) { + return typeof arg === 'symbol'; +} +exports.isSymbol = isSymbol; + +function isUndefined(arg) { + return arg === void 0; +} +exports.isUndefined = isUndefined; + +function isRegExp(re) { + return objectToString(re) === '[object RegExp]'; +} +exports.isRegExp = isRegExp; + +function isObject(arg) { + return typeof arg === 'object' && arg !== null; +} +exports.isObject = isObject; + +function isDate(d) { + return objectToString(d) === '[object Date]'; +} +exports.isDate = isDate; + +function isError(e) { + return (objectToString(e) === '[object Error]' || e instanceof Error); +} +exports.isError = isError; + +function isFunction(arg) { + return typeof arg === 'function'; +} +exports.isFunction = isFunction; + +function isPrimitive(arg) { + return arg === null || + typeof arg === 'boolean' || + typeof arg === 'number' || + typeof arg === 'string' || + typeof arg === 'symbol' || // ES6 symbol + typeof arg === 'undefined'; +} +exports.isPrimitive = isPrimitive; + +exports.isBuffer = Buffer.isBuffer; + +function objectToString(o) { + return Object.prototype.toString.call(o); +} + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../../../../buffer/index.js */ "../node_modules/buffer/index.js").Buffer)) + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/inherits/inherits_browser.js": +/*!**************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/inherits/inherits_browser.js ***! + \**************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +if (typeof Object.create === 'function') { + // implementation from standard node.js 'util' module + module.exports = function inherits(ctor, superCtor) { + ctor.super_ = superCtor + ctor.prototype = Object.create(superCtor.prototype, { + constructor: { + value: ctor, + enumerable: false, + writable: true, + configurable: true + } + }); + }; +} else { + // old school shim for old browsers + module.exports = function inherits(ctor, superCtor) { + ctor.super_ = superCtor + var TempCtor = function () {} + TempCtor.prototype = superCtor.prototype + ctor.prototype = new TempCtor() + ctor.prototype.constructor = ctor + } +} + + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/isarray/index.js": +/*!**************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/isarray/index.js ***! + \**************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +var toString = {}.toString; + +module.exports = Array.isArray || function (arr) { + return toString.call(arr) == '[object Array]'; +}; + + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/msgpack5/index.js": +/*!***************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/msgpack5/index.js ***! + \***************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +var Buffer = __webpack_require__(/*! safe-buffer */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/safe-buffer/index.js").Buffer +var assert = __webpack_require__(/*! assert */ "../node_modules/assert/assert.js") +var bl = __webpack_require__(/*! bl */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/bl/bl.js") +var streams = __webpack_require__(/*! ./lib/streams */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/msgpack5/lib/streams.js") +var buildDecode = __webpack_require__(/*! ./lib/decoder */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/msgpack5/lib/decoder.js") +var buildEncode = __webpack_require__(/*! ./lib/encoder */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/msgpack5/lib/encoder.js") + +function msgpack (options) { + var encodingTypes = [] + var decodingTypes = [] + + options = options || { + forceFloat64: false, + compatibilityMode: false, + disableTimestampEncoding: false // if true, skips encoding Dates using the msgpack timestamp ext format (-1) + } + + function registerEncoder (check, encode) { + assert(check, 'must have an encode function') + assert(encode, 'must have an encode function') + + encodingTypes.push({ + check: check, encode: encode + }) + + return this + } + + function registerDecoder (type, decode) { + assert(type >= 0, 'must have a non-negative type') + assert(decode, 'must have a decode function') + + decodingTypes.push({ + type: type, decode: decode + }) + + return this + } + + function register (type, constructor, encode, decode) { + assert(constructor, 'must have a constructor') + assert(encode, 'must have an encode function') + assert(type >= 0, 'must have a non-negative type') + assert(decode, 'must have a decode function') + + function check (obj) { + return (obj instanceof constructor) + } + + function reEncode (obj) { + var buf = bl() + var header = Buffer.allocUnsafe(1) + + header.writeInt8(type, 0) + + buf.append(header) + buf.append(encode(obj)) + + return buf + } + + this.registerEncoder(check, reEncode) + this.registerDecoder(type, decode) + + return this + } + + return { + encode: buildEncode(encodingTypes, options.forceFloat64, options.compatibilityMode, options.disableTimestampEncoding), + decode: buildDecode(decodingTypes), + register: register, + registerEncoder: registerEncoder, + registerDecoder: registerDecoder, + encoder: streams.encoder, + decoder: streams.decoder, + // needed for levelup support + buffer: true, + type: 'msgpack5', + IncompleteBufferError: buildDecode.IncompleteBufferError + } +} + +module.exports = msgpack + + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/msgpack5/lib/decoder.js": +/*!*********************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/msgpack5/lib/decoder.js ***! + \*********************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var bl = __webpack_require__(/*! bl */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/bl/bl.js") +var util = __webpack_require__(/*! util */ "../node_modules/util/util.js") + +function IncompleteBufferError (message) { + Error.call(this) // super constructor + if (Error.captureStackTrace) { + Error.captureStackTrace(this, this.constructor) // super helper method to include stack trace in error object + } + this.name = this.constructor.name + this.message = message || 'unable to decode' +} + +util.inherits(IncompleteBufferError, Error) + +module.exports = function buildDecode (decodingTypes) { + return decode + + function getSize (first) { + switch (first) { + case 0xc4: + return 2 + case 0xc5: + return 3 + case 0xc6: + return 5 + case 0xc7: + return 3 + case 0xc8: + return 4 + case 0xc9: + return 6 + case 0xca: + return 5 + case 0xcb: + return 9 + case 0xcc: + return 2 + case 0xcd: + return 3 + case 0xce: + return 5 + case 0xcf: + return 9 + case 0xd0: + return 2 + case 0xd1: + return 3 + case 0xd2: + return 5 + case 0xd3: + return 9 + case 0xd4: + return 3 + case 0xd5: + return 4 + case 0xd6: + return 6 + case 0xd7: + return 10 + case 0xd8: + return 18 + case 0xd9: + return 2 + case 0xda: + return 3 + case 0xdb: + return 5 + case 0xde: + return 3 + default: + return -1 + } + } + + function hasMinBufferSize (first, length) { + var size = getSize(first) + + if (size !== -1 && length < size) { + return false + } else { + return true + } + } + + function isValidDataSize (dataLength, bufLength, headerLength) { + return bufLength >= headerLength + dataLength + } + + function buildDecodeResult (value, bytesConsumed) { + return { + value: value, + bytesConsumed: bytesConsumed + } + } + + function decode (buf) { + if (!(buf instanceof bl)) { + buf = bl().append(buf) + } + + var result = tryDecode(buf) + if (result) { + buf.consume(result.bytesConsumed) + return result.value + } else { + throw new IncompleteBufferError() + } + } + + function tryDecode (buf, offset) { + offset = offset === undefined ? 0 : offset + var bufLength = buf.length - offset + if (bufLength <= 0) { + return null + } + + var first = buf.readUInt8(offset) + var length + var result = 0 + var type + var bytePos + + if (!hasMinBufferSize(first, bufLength)) { + return null + } + + switch (first) { + case 0xc0: + return buildDecodeResult(null, 1) + case 0xc2: + return buildDecodeResult(false, 1) + case 0xc3: + return buildDecodeResult(true, 1) + case 0xcc: + // 1-byte unsigned int + result = buf.readUInt8(offset + 1) + return buildDecodeResult(result, 2) + case 0xcd: + // 2-bytes BE unsigned int + result = buf.readUInt16BE(offset + 1) + return buildDecodeResult(result, 3) + case 0xce: + // 4-bytes BE unsigned int + result = buf.readUInt32BE(offset + 1) + return buildDecodeResult(result, 5) + case 0xcf: + // 8-bytes BE unsigned int + // Read long byte by byte, big-endian + for (bytePos = 7; bytePos >= 0; bytePos--) { + result += (buf.readUInt8(offset + bytePos + 1) * Math.pow(2, (8 * (7 - bytePos)))) + } + return buildDecodeResult(result, 9) + case 0xd0: + // 1-byte signed int + result = buf.readInt8(offset + 1) + return buildDecodeResult(result, 2) + case 0xd1: + // 2-bytes signed int + result = buf.readInt16BE(offset + 1) + return buildDecodeResult(result, 3) + case 0xd2: + // 4-bytes signed int + result = buf.readInt32BE(offset + 1) + return buildDecodeResult(result, 5) + case 0xd3: + result = readInt64BE(buf.slice(offset + 1, offset + 9), 0) + return buildDecodeResult(result, 9) + case 0xca: + // 4-bytes float + result = buf.readFloatBE(offset + 1) + return buildDecodeResult(result, 5) + case 0xcb: + // 8-bytes double + result = buf.readDoubleBE(offset + 1) + return buildDecodeResult(result, 9) + case 0xd9: + // strings up to 2^8 - 1 bytes + length = buf.readUInt8(offset + 1) + if (!isValidDataSize(length, bufLength, 2)) { + return null + } + result = buf.toString('utf8', offset + 2, offset + 2 + length) + return buildDecodeResult(result, 2 + length) + case 0xda: + // strings up to 2^16 - 2 bytes + length = buf.readUInt16BE(offset + 1) + if (!isValidDataSize(length, bufLength, 3)) { + return null + } + result = buf.toString('utf8', offset + 3, offset + 3 + length) + return buildDecodeResult(result, 3 + length) + case 0xdb: + // strings up to 2^32 - 4 bytes + length = buf.readUInt32BE(offset + 1) + if (!isValidDataSize(length, bufLength, 5)) { + return null + } + result = buf.toString('utf8', offset + 5, offset + 5 + length) + return buildDecodeResult(result, 5 + length) + case 0xc4: + // buffers up to 2^8 - 1 bytes + length = buf.readUInt8(offset + 1) + if (!isValidDataSize(length, bufLength, 2)) { + return null + } + result = buf.slice(offset + 2, offset + 2 + length) + return buildDecodeResult(result, 2 + length) + case 0xc5: + // buffers up to 2^16 - 1 bytes + length = buf.readUInt16BE(offset + 1) + if (!isValidDataSize(length, bufLength, 3)) { + return null + } + result = buf.slice(offset + 3, offset + 3 + length) + return buildDecodeResult(result, 3 + length) + case 0xc6: + // buffers up to 2^32 - 1 bytes + length = buf.readUInt32BE(offset + 1) + if (!isValidDataSize(length, bufLength, 5)) { + return null + } + result = buf.slice(offset + 5, offset + 5 + length) + return buildDecodeResult(result, 5 + length) + case 0xdc: + // array up to 2^16 elements - 2 bytes + if (bufLength < 3) { + return null + } + + length = buf.readUInt16BE(offset + 1) + return decodeArray(buf, offset, length, 3) + case 0xdd: + // array up to 2^32 elements - 4 bytes + if (bufLength < 5) { + return null + } + + length = buf.readUInt32BE(offset + 1) + return decodeArray(buf, offset, length, 5) + case 0xde: + // maps up to 2^16 elements - 2 bytes + length = buf.readUInt16BE(offset + 1) + return decodeMap(buf, offset, length, 3) + case 0xdf: + throw new Error('map too big to decode in JS') + case 0xd4: + return decodeFixExt(buf, offset, 1) + case 0xd5: + return decodeFixExt(buf, offset, 2) + case 0xd6: + return decodeFixExt(buf, offset, 4) + case 0xd7: + return decodeFixExt(buf, offset, 8) + case 0xd8: + return decodeFixExt(buf, offset, 16) + case 0xc7: + // ext up to 2^8 - 1 bytes + length = buf.readUInt8(offset + 1) + type = buf.readUInt8(offset + 2) + if (!isValidDataSize(length, bufLength, 3)) { + return null + } + return decodeExt(buf, offset, type, length, 3) + case 0xc8: + // ext up to 2^16 - 1 bytes + length = buf.readUInt16BE(offset + 1) + type = buf.readUInt8(offset + 3) + if (!isValidDataSize(length, bufLength, 4)) { + return null + } + return decodeExt(buf, offset, type, length, 4) + case 0xc9: + // ext up to 2^32 - 1 bytes + length = buf.readUInt32BE(offset + 1) + type = buf.readUInt8(offset + 5) + if (!isValidDataSize(length, bufLength, 6)) { + return null + } + return decodeExt(buf, offset, type, length, 6) + } + + if ((first & 0xf0) === 0x90) { + // we have an array with less than 15 elements + length = first & 0x0f + return decodeArray(buf, offset, length, 1) + } else if ((first & 0xf0) === 0x80) { + // we have a map with less than 15 elements + length = first & 0x0f + return decodeMap(buf, offset, length, 1) + } else if ((first & 0xe0) === 0xa0) { + // fixstr up to 31 bytes + length = first & 0x1f + if (isValidDataSize(length, bufLength, 1)) { + result = buf.toString('utf8', offset + 1, offset + length + 1) + return buildDecodeResult(result, length + 1) + } else { + return null + } + } else if (first >= 0xe0) { + // 5 bits negative ints + result = first - 0x100 + return buildDecodeResult(result, 1) + } else if (first < 0x80) { + // 7-bits positive ints + return buildDecodeResult(first, 1) + } else { + throw new Error('not implemented yet') + } + } + + function readInt64BE (buf, offset) { + var negate = (buf[offset] & 0x80) == 0x80 // eslint-disable-line + + if (negate) { + var carry = 1 + for (var i = offset + 7; i >= offset; i--) { + var v = (buf[i] ^ 0xff) + carry + buf[i] = v & 0xff + carry = v >> 8 + } + } + + var hi = buf.readUInt32BE(offset + 0) + var lo = buf.readUInt32BE(offset + 4) + return (hi * 4294967296 + lo) * (negate ? -1 : +1) + } + + function decodeArray (buf, offset, length, headerLength) { + var result = [] + var i + var totalBytesConsumed = 0 + + offset += headerLength + for (i = 0; i < length; i++) { + var decodeResult = tryDecode(buf, offset) + if (decodeResult) { + result.push(decodeResult.value) + offset += decodeResult.bytesConsumed + totalBytesConsumed += decodeResult.bytesConsumed + } else { + return null + } + } + return buildDecodeResult(result, headerLength + totalBytesConsumed) + } + + function decodeMap (buf, offset, length, headerLength) { + var result = {} + var key + var i + var totalBytesConsumed = 0 + + offset += headerLength + for (i = 0; i < length; i++) { + var keyResult = tryDecode(buf, offset) + if (keyResult) { + offset += keyResult.bytesConsumed + var valueResult = tryDecode(buf, offset) + if (valueResult) { + key = keyResult.value + result[key] = valueResult.value + offset += valueResult.bytesConsumed + totalBytesConsumed += (keyResult.bytesConsumed + valueResult.bytesConsumed) + } else { + return null + } + } else { + return null + } + } + return buildDecodeResult(result, headerLength + totalBytesConsumed) + } + + function decodeFixExt (buf, offset, size) { + var type = buf.readInt8(offset + 1) // Signed + return decodeExt(buf, offset, type, size, 2) + } + function decodeTimestamp (buf, size, headerSize) { + var seconds, nanoseconds + nanoseconds = 0 + + switch (size) { + case 4: + // timestamp 32 stores the number of seconds that have elapsed since 1970-01-01 00:00:00 UTC in an 32-bit unsigned integer + seconds = buf.readUInt32BE(0) + break + + case 8: // Timestamp 64 stores the number of seconds and nanoseconds that have elapsed + // since 1970-01-01 00:00:00 UTC in 32-bit unsigned integers, split 30/34 bits + var upper = buf.readUInt32BE(0) + var lower = buf.readUInt32BE(4) + nanoseconds = upper / 4 + seconds = ((upper & 0x03) * Math.pow(2, 32)) + lower // If we use bitwise operators, we get truncated to 32bits + break + + case 12: + throw new Error('timestamp 96 is not yet implemented') + } + + var millis = (seconds * 1000) + Math.round(nanoseconds / 1E6) + return buildDecodeResult(new Date(millis), size + headerSize) + } + + function decodeExt (buf, offset, type, size, headerSize) { + var i, + toDecode + + offset += headerSize + + // Pre-defined + if (type < 0) { // Reserved for future extensions + switch (type) { + case -1: // Tiemstamp https://github.com/msgpack/msgpack/blob/master/spec.md#timestamp-extension-type + toDecode = buf.slice(offset, offset + size) + return decodeTimestamp(toDecode, size, headerSize) + } + } + + for (i = 0; i < decodingTypes.length; i++) { + if (type === decodingTypes[i].type) { + toDecode = buf.slice(offset, offset + size) + var value = decodingTypes[i].decode(toDecode) + return buildDecodeResult(value, headerSize + size) + } + } + + throw new Error('unable to find ext type ' + type) + } +} + +module.exports.IncompleteBufferError = IncompleteBufferError + + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/msgpack5/lib/encoder.js": +/*!*********************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/msgpack5/lib/encoder.js ***! + \*********************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +var Buffer = __webpack_require__(/*! safe-buffer */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/safe-buffer/index.js").Buffer +var bl = __webpack_require__(/*! bl */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/bl/bl.js") +var TOLERANCE = 0.1 + +module.exports = function buildEncode (encodingTypes, forceFloat64, compatibilityMode, disableTimestampEncoding) { + function encode (obj, avoidSlice) { + var buf, + len + + if (obj === undefined) { + throw new Error('undefined is not encodable in msgpack!') + } else if (obj === null) { + buf = Buffer.allocUnsafe(1) + buf[0] = 0xc0 + } else if (obj === true) { + buf = Buffer.allocUnsafe(1) + buf[0] = 0xc3 + } else if (obj === false) { + buf = Buffer.allocUnsafe(1) + buf[0] = 0xc2 + } else if (typeof obj === 'string') { + len = Buffer.byteLength(obj) + if (len < 32) { + buf = Buffer.allocUnsafe(1 + len) + buf[0] = 0xa0 | len + if (len > 0) { + buf.write(obj, 1) + } + } else if (len <= 0xff && !compatibilityMode) { + // str8, but only when not in compatibility mode + buf = Buffer.allocUnsafe(2 + len) + buf[0] = 0xd9 + buf[1] = len + buf.write(obj, 2) + } else if (len <= 0xffff) { + buf = Buffer.allocUnsafe(3 + len) + buf[0] = 0xda + buf.writeUInt16BE(len, 1) + buf.write(obj, 3) + } else { + buf = Buffer.allocUnsafe(5 + len) + buf[0] = 0xdb + buf.writeUInt32BE(len, 1) + buf.write(obj, 5) + } + } else if (obj && (obj.readUInt32LE || obj instanceof Uint8Array)) { + if (obj instanceof Uint8Array) { + obj = Buffer.from(obj) + } + // weird hack to support Buffer + // and Buffer-like objects + if (obj.length <= 0xff) { + buf = Buffer.allocUnsafe(2) + buf[0] = 0xc4 + buf[1] = obj.length + } else if (obj.length <= 0xffff) { + buf = Buffer.allocUnsafe(3) + buf[0] = 0xc5 + buf.writeUInt16BE(obj.length, 1) + } else { + buf = Buffer.allocUnsafe(5) + buf[0] = 0xc6 + buf.writeUInt32BE(obj.length, 1) + } + + buf = bl([buf, obj]) + } else if (Array.isArray(obj)) { + if (obj.length < 16) { + buf = Buffer.allocUnsafe(1) + buf[0] = 0x90 | obj.length + } else if (obj.length < 65536) { + buf = Buffer.allocUnsafe(3) + buf[0] = 0xdc + buf.writeUInt16BE(obj.length, 1) + } else { + buf = Buffer.allocUnsafe(5) + buf[0] = 0xdd + buf.writeUInt32BE(obj.length, 1) + } + + buf = obj.reduce(function (acc, obj) { + acc.append(encode(obj, true)) + return acc + }, bl().append(buf)) + } else if (!disableTimestampEncoding && typeof obj.getDate === 'function') { + return encodeDate(obj) + } else if (typeof obj === 'object') { + buf = encodeExt(obj) || encodeObject(obj) + } else if (typeof obj === 'number') { + if (isFloat(obj)) { + return encodeFloat(obj, forceFloat64) + } else if (obj >= 0) { + if (obj < 128) { + buf = Buffer.allocUnsafe(1) + buf[0] = obj + } else if (obj < 256) { + buf = Buffer.allocUnsafe(2) + buf[0] = 0xcc + buf[1] = obj + } else if (obj < 65536) { + buf = Buffer.allocUnsafe(3) + buf[0] = 0xcd + buf.writeUInt16BE(obj, 1) + } else if (obj <= 0xffffffff) { + buf = Buffer.allocUnsafe(5) + buf[0] = 0xce + buf.writeUInt32BE(obj, 1) + } else if (obj <= 9007199254740991) { + buf = Buffer.allocUnsafe(9) + buf[0] = 0xcf + write64BitUint(buf, obj) + } else { + return encodeFloat(obj, true) + } + } else { + if (obj >= -32) { + buf = Buffer.allocUnsafe(1) + buf[0] = 0x100 + obj + } else if (obj >= -128) { + buf = Buffer.allocUnsafe(2) + buf[0] = 0xd0 + buf.writeInt8(obj, 1) + } else if (obj >= -32768) { + buf = Buffer.allocUnsafe(3) + buf[0] = 0xd1 + buf.writeInt16BE(obj, 1) + } else if (obj > -214748365) { + buf = Buffer.allocUnsafe(5) + buf[0] = 0xd2 + buf.writeInt32BE(obj, 1) + } else if (obj >= -9007199254740991) { + buf = Buffer.allocUnsafe(9) + buf[0] = 0xd3 + write64BitInt(buf, 1, obj) + } else { + return encodeFloat(obj, true) + } + } + } + + if (!buf) { + throw new Error('not implemented yet') + } + + if (avoidSlice) { + return buf + } else { + return buf.slice() + } + } + + function encodeDate (dt) { + var encoded + var millis = dt * 1 + var seconds = Math.floor(millis / 1000) + var nanos = (millis - (seconds * 1000)) * 1E6 + + if (nanos || seconds > 0xFFFFFFFF) { + // Timestamp64 + encoded = new Buffer(10) + encoded[0] = 0xd7 + encoded[1] = -1 + + var upperNanos = ((nanos * 4)) + var upperSeconds = seconds / Math.pow(2, 32) + var upper = (upperNanos + upperSeconds) & 0xFFFFFFFF + var lower = seconds & 0xFFFFFFFF + + encoded.writeInt32BE(upper, 2) + encoded.writeInt32BE(lower, 6) + } else { + // Timestamp32 + encoded = new Buffer(6) + encoded[0] = 0xd6 + encoded[1] = -1 + encoded.writeUInt32BE(Math.floor(millis / 1000), 2) + } + return bl().append(encoded) + } + + function encodeExt (obj) { + var i + var encoded + var length = -1 + var headers = [] + + for (i = 0; i < encodingTypes.length; i++) { + if (encodingTypes[i].check(obj)) { + encoded = encodingTypes[i].encode(obj) + break + } + } + + if (!encoded) { + return null + } + + // we subtract 1 because the length does not + // include the type + length = encoded.length - 1 + + if (length === 1) { + headers.push(0xd4) + } else if (length === 2) { + headers.push(0xd5) + } else if (length === 4) { + headers.push(0xd6) + } else if (length === 8) { + headers.push(0xd7) + } else if (length === 16) { + headers.push(0xd8) + } else if (length < 256) { + headers.push(0xc7) + headers.push(length) + } else if (length < 0x10000) { + headers.push(0xc8) + headers.push(length >> 8) + headers.push(length & 0x00ff) + } else { + headers.push(0xc9) + headers.push(length >> 24) + headers.push((length >> 16) & 0x000000ff) + headers.push((length >> 8) & 0x000000ff) + headers.push(length & 0x000000ff) + } + + return bl().append(Buffer.from(headers)).append(encoded) + } + + function encodeObject (obj) { + var acc = [] + var length = 0 + var key + var header + + for (key in obj) { + if (obj.hasOwnProperty(key) && + obj[key] !== undefined && + typeof obj[key] !== 'function') { + ++length + acc.push(encode(key, true)) + acc.push(encode(obj[key], true)) + } + } + + if (length < 16) { + header = Buffer.allocUnsafe(1) + header[0] = 0x80 | length + } else { + header = Buffer.allocUnsafe(3) + header[0] = 0xde + header.writeUInt16BE(length, 1) + } + + acc.unshift(header) + + var result = acc.reduce(function (list, buf) { + return list.append(buf) + }, bl()) + + return result + } + + return encode +} + +function write64BitUint (buf, obj) { + // Write long byte by byte, in big-endian order + for (var currByte = 7; currByte >= 0; currByte--) { + buf[currByte + 1] = (obj & 0xff) + obj = obj / 256 + } +} + +function write64BitInt (buf, offset, num) { + var negate = num < 0 + + if (negate) { + num = Math.abs(num) + } + + var lo = num % 4294967296 + var hi = num / 4294967296 + buf.writeUInt32BE(Math.floor(hi), offset + 0) + buf.writeUInt32BE(lo, offset + 4) + + if (negate) { + var carry = 1 + for (var i = offset + 7; i >= offset; i--) { + var v = (buf[i] ^ 0xff) + carry + buf[i] = v & 0xff + carry = v >> 8 + } + } +} + +function isFloat (n) { + return n !== Math.floor(n) +} + +function encodeFloat (obj, forceFloat64) { + var buf + + buf = Buffer.allocUnsafe(5) + buf[0] = 0xca + buf.writeFloatBE(obj, 1) + + // FIXME is there a way to check if a + // value fits in a float? + if (forceFloat64 || Math.abs(obj - buf.readFloatBE(1)) > TOLERANCE) { + buf = Buffer.allocUnsafe(9) + buf[0] = 0xcb + buf.writeDoubleBE(obj, 1) + } + + return buf +} + + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/msgpack5/lib/streams.js": +/*!*********************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/msgpack5/lib/streams.js ***! + \*********************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +var Transform = __webpack_require__(/*! readable-stream */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/readable-browser.js").Transform +var inherits = __webpack_require__(/*! inherits */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/inherits/inherits_browser.js") +var bl = __webpack_require__(/*! bl */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/bl/bl.js") + +function Base (opts) { + opts = opts || {} + + opts.objectMode = true + opts.highWaterMark = 16 + + Transform.call(this, opts) + + this._msgpack = opts.msgpack +} + +inherits(Base, Transform) + +function Encoder (opts) { + if (!(this instanceof Encoder)) { + opts = opts || {} + opts.msgpack = this + return new Encoder(opts) + } + + Base.call(this, opts) +} + +inherits(Encoder, Base) + +Encoder.prototype._transform = function (obj, enc, done) { + var buf = null + + try { + buf = this._msgpack.encode(obj).slice(0) + } catch (err) { + this.emit('error', err) + return done() + } + + this.push(buf) + done() +} + +function Decoder (opts) { + if (!(this instanceof Decoder)) { + opts = opts || {} + opts.msgpack = this + return new Decoder(opts) + } + + Base.call(this, opts) + + this._chunks = bl() +} + +inherits(Decoder, Base) + +Decoder.prototype._transform = function (buf, enc, done) { + if (buf) { + this._chunks.append(buf) + } + + try { + var result = this._msgpack.decode(this._chunks) + this.push(result) + } catch (err) { + if (err instanceof this._msgpack.IncompleteBufferError) { + done() + } else { + this.emit('error', err) + } + return + } + + if (this._chunks.length > 0) { + this._transform(null, enc, done) + } else { + done() + } +} + +module.exports.decoder = Decoder +module.exports.encoder = Encoder + + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/process-nextick-args/index.js": +/*!***************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/process-nextick-args/index.js ***! + \***************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(process) { + +if (!process.version || + process.version.indexOf('v0.') === 0 || + process.version.indexOf('v1.') === 0 && process.version.indexOf('v1.8.') !== 0) { + module.exports = { nextTick: nextTick }; +} else { + module.exports = process +} + +function nextTick(fn, arg1, arg2, arg3) { + if (typeof fn !== 'function') { + throw new TypeError('"callback" argument must be a function'); + } + var len = arguments.length; + var args, i; + switch (len) { + case 0: + case 1: + return process.nextTick(fn); + case 2: + return process.nextTick(function afterTickOne() { + fn.call(null, arg1); + }); + case 3: + return process.nextTick(function afterTickTwo() { + fn.call(null, arg1, arg2); + }); + case 4: + return process.nextTick(function afterTickThree() { + fn.call(null, arg1, arg2, arg3); + }); + default: + args = new Array(len - 1); + i = 0; + while (i < args.length) { + args[i++] = arguments[i]; + } + return process.nextTick(function afterTick() { + fn.apply(null, args); + }); + } +} + + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../../../process/browser.js */ "../node_modules/process/browser.js"))) + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/duplex-browser.js": +/*!*******************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/duplex-browser.js ***! + \*******************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = __webpack_require__(/*! ./lib/_stream_duplex.js */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_duplex.js"); + + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_duplex.js": +/*!***********************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_duplex.js ***! + \***********************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +// a duplex stream is just a stream that is both readable and writable. +// Since JS doesn't have multiple prototypal inheritance, this class +// prototypally inherits from Readable, and then parasitically from +// Writable. + + + +/**/ + +var pna = __webpack_require__(/*! process-nextick-args */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/process-nextick-args/index.js"); +/**/ + +/**/ +var objectKeys = Object.keys || function (obj) { + var keys = []; + for (var key in obj) { + keys.push(key); + }return keys; +}; +/**/ + +module.exports = Duplex; + +/**/ +var util = __webpack_require__(/*! core-util-is */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/core-util-is/lib/util.js"); +util.inherits = __webpack_require__(/*! inherits */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/inherits/inherits_browser.js"); +/**/ + +var Readable = __webpack_require__(/*! ./_stream_readable */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_readable.js"); +var Writable = __webpack_require__(/*! ./_stream_writable */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_writable.js"); + +util.inherits(Duplex, Readable); + +{ + // avoid scope creep, the keys array can then be collected + var keys = objectKeys(Writable.prototype); + for (var v = 0; v < keys.length; v++) { + var method = keys[v]; + if (!Duplex.prototype[method]) Duplex.prototype[method] = Writable.prototype[method]; + } +} + +function Duplex(options) { + if (!(this instanceof Duplex)) return new Duplex(options); + + Readable.call(this, options); + Writable.call(this, options); + + if (options && options.readable === false) this.readable = false; + + if (options && options.writable === false) this.writable = false; + + this.allowHalfOpen = true; + if (options && options.allowHalfOpen === false) this.allowHalfOpen = false; + + this.once('end', onend); +} + +Object.defineProperty(Duplex.prototype, 'writableHighWaterMark', { + // making it explicit this property is not enumerable + // because otherwise some prototype manipulation in + // userland will fail + enumerable: false, + get: function () { + return this._writableState.highWaterMark; + } +}); + +// the no-half-open enforcer +function onend() { + // if we allow half-open state, or if the writable side ended, + // then we're ok. + if (this.allowHalfOpen || this._writableState.ended) return; + + // no more data can be written. + // But allow more writes to happen in this tick. + pna.nextTick(onEndNT, this); +} + +function onEndNT(self) { + self.end(); +} + +Object.defineProperty(Duplex.prototype, 'destroyed', { + get: function () { + if (this._readableState === undefined || this._writableState === undefined) { + return false; + } + return this._readableState.destroyed && this._writableState.destroyed; + }, + set: function (value) { + // we ignore the value if the stream + // has not been initialized yet + if (this._readableState === undefined || this._writableState === undefined) { + return; + } + + // backward compatibility, the user is explicitly + // managing destroyed + this._readableState.destroyed = value; + this._writableState.destroyed = value; + } +}); + +Duplex.prototype._destroy = function (err, cb) { + this.push(null); + this.end(); + + pna.nextTick(cb, err); +}; + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_passthrough.js": +/*!****************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_passthrough.js ***! + \****************************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +// a passthrough stream. +// basically just the most minimal sort of Transform stream. +// Every written chunk gets output as-is. + + + +module.exports = PassThrough; + +var Transform = __webpack_require__(/*! ./_stream_transform */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_transform.js"); + +/**/ +var util = __webpack_require__(/*! core-util-is */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/core-util-is/lib/util.js"); +util.inherits = __webpack_require__(/*! inherits */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/inherits/inherits_browser.js"); +/**/ + +util.inherits(PassThrough, Transform); + +function PassThrough(options) { + if (!(this instanceof PassThrough)) return new PassThrough(options); + + Transform.call(this, options); +} + +PassThrough.prototype._transform = function (chunk, encoding, cb) { + cb(null, chunk); +}; + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_readable.js": +/*!*************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_readable.js ***! + \*************************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(global, process) {// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + + + +/**/ + +var pna = __webpack_require__(/*! process-nextick-args */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/process-nextick-args/index.js"); +/**/ + +module.exports = Readable; + +/**/ +var isArray = __webpack_require__(/*! isarray */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/isarray/index.js"); +/**/ + +/**/ +var Duplex; +/**/ + +Readable.ReadableState = ReadableState; + +/**/ +var EE = __webpack_require__(/*! events */ "../node_modules/events/events.js").EventEmitter; + +var EElistenerCount = function (emitter, type) { + return emitter.listeners(type).length; +}; +/**/ + +/**/ +var Stream = __webpack_require__(/*! ./internal/streams/stream */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/internal/streams/stream-browser.js"); +/**/ + +/**/ + +var Buffer = __webpack_require__(/*! safe-buffer */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/safe-buffer/index.js").Buffer; +var OurUint8Array = global.Uint8Array || function () {}; +function _uint8ArrayToBuffer(chunk) { + return Buffer.from(chunk); +} +function _isUint8Array(obj) { + return Buffer.isBuffer(obj) || obj instanceof OurUint8Array; +} + +/**/ + +/**/ +var util = __webpack_require__(/*! core-util-is */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/core-util-is/lib/util.js"); +util.inherits = __webpack_require__(/*! inherits */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/inherits/inherits_browser.js"); +/**/ + +/**/ +var debugUtil = __webpack_require__(/*! util */ 0); +var debug = void 0; +if (debugUtil && debugUtil.debuglog) { + debug = debugUtil.debuglog('stream'); +} else { + debug = function () {}; +} +/**/ + +var BufferList = __webpack_require__(/*! ./internal/streams/BufferList */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/internal/streams/BufferList.js"); +var destroyImpl = __webpack_require__(/*! ./internal/streams/destroy */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/internal/streams/destroy.js"); +var StringDecoder; + +util.inherits(Readable, Stream); + +var kProxyEvents = ['error', 'close', 'destroy', 'pause', 'resume']; + +function prependListener(emitter, event, fn) { + // Sadly this is not cacheable as some libraries bundle their own + // event emitter implementation with them. + if (typeof emitter.prependListener === 'function') return emitter.prependListener(event, fn); + + // This is a hack to make sure that our error handler is attached before any + // userland ones. NEVER DO THIS. This is here only because this code needs + // to continue to work with older versions of Node.js that do not include + // the prependListener() method. The goal is to eventually remove this hack. + if (!emitter._events || !emitter._events[event]) emitter.on(event, fn);else if (isArray(emitter._events[event])) emitter._events[event].unshift(fn);else emitter._events[event] = [fn, emitter._events[event]]; +} + +function ReadableState(options, stream) { + Duplex = Duplex || __webpack_require__(/*! ./_stream_duplex */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_duplex.js"); + + options = options || {}; + + // Duplex streams are both readable and writable, but share + // the same options object. + // However, some cases require setting options to different + // values for the readable and the writable sides of the duplex stream. + // These options can be provided separately as readableXXX and writableXXX. + var isDuplex = stream instanceof Duplex; + + // object stream flag. Used to make read(n) ignore n and to + // make all the buffer merging and length checks go away + this.objectMode = !!options.objectMode; + + if (isDuplex) this.objectMode = this.objectMode || !!options.readableObjectMode; + + // the point at which it stops calling _read() to fill the buffer + // Note: 0 is a valid value, means "don't call _read preemptively ever" + var hwm = options.highWaterMark; + var readableHwm = options.readableHighWaterMark; + var defaultHwm = this.objectMode ? 16 : 16 * 1024; + + if (hwm || hwm === 0) this.highWaterMark = hwm;else if (isDuplex && (readableHwm || readableHwm === 0)) this.highWaterMark = readableHwm;else this.highWaterMark = defaultHwm; + + // cast to ints. + this.highWaterMark = Math.floor(this.highWaterMark); + + // A linked list is used to store data chunks instead of an array because the + // linked list can remove elements from the beginning faster than + // array.shift() + this.buffer = new BufferList(); + this.length = 0; + this.pipes = null; + this.pipesCount = 0; + this.flowing = null; + this.ended = false; + this.endEmitted = false; + this.reading = false; + + // a flag to be able to tell if the event 'readable'/'data' is emitted + // immediately, or on a later tick. We set this to true at first, because + // any actions that shouldn't happen until "later" should generally also + // not happen before the first read call. + this.sync = true; + + // whenever we return null, then we set a flag to say + // that we're awaiting a 'readable' event emission. + this.needReadable = false; + this.emittedReadable = false; + this.readableListening = false; + this.resumeScheduled = false; + + // has it been destroyed + this.destroyed = false; + + // Crypto is kind of old and crusty. Historically, its default string + // encoding is 'binary' so we have to make this configurable. + // Everything else in the universe uses 'utf8', though. + this.defaultEncoding = options.defaultEncoding || 'utf8'; + + // the number of writers that are awaiting a drain event in .pipe()s + this.awaitDrain = 0; + + // if true, a maybeReadMore has been scheduled + this.readingMore = false; + + this.decoder = null; + this.encoding = null; + if (options.encoding) { + if (!StringDecoder) StringDecoder = __webpack_require__(/*! string_decoder/ */ "../node_modules/string_decoder/lib/string_decoder.js").StringDecoder; + this.decoder = new StringDecoder(options.encoding); + this.encoding = options.encoding; + } +} + +function Readable(options) { + Duplex = Duplex || __webpack_require__(/*! ./_stream_duplex */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_duplex.js"); + + if (!(this instanceof Readable)) return new Readable(options); + + this._readableState = new ReadableState(options, this); + + // legacy + this.readable = true; + + if (options) { + if (typeof options.read === 'function') this._read = options.read; + + if (typeof options.destroy === 'function') this._destroy = options.destroy; + } + + Stream.call(this); +} + +Object.defineProperty(Readable.prototype, 'destroyed', { + get: function () { + if (this._readableState === undefined) { + return false; + } + return this._readableState.destroyed; + }, + set: function (value) { + // we ignore the value if the stream + // has not been initialized yet + if (!this._readableState) { + return; + } + + // backward compatibility, the user is explicitly + // managing destroyed + this._readableState.destroyed = value; + } +}); + +Readable.prototype.destroy = destroyImpl.destroy; +Readable.prototype._undestroy = destroyImpl.undestroy; +Readable.prototype._destroy = function (err, cb) { + this.push(null); + cb(err); +}; + +// Manually shove something into the read() buffer. +// This returns true if the highWaterMark has not been hit yet, +// similar to how Writable.write() returns true if you should +// write() some more. +Readable.prototype.push = function (chunk, encoding) { + var state = this._readableState; + var skipChunkCheck; + + if (!state.objectMode) { + if (typeof chunk === 'string') { + encoding = encoding || state.defaultEncoding; + if (encoding !== state.encoding) { + chunk = Buffer.from(chunk, encoding); + encoding = ''; + } + skipChunkCheck = true; + } + } else { + skipChunkCheck = true; + } + + return readableAddChunk(this, chunk, encoding, false, skipChunkCheck); +}; + +// Unshift should *always* be something directly out of read() +Readable.prototype.unshift = function (chunk) { + return readableAddChunk(this, chunk, null, true, false); +}; + +function readableAddChunk(stream, chunk, encoding, addToFront, skipChunkCheck) { + var state = stream._readableState; + if (chunk === null) { + state.reading = false; + onEofChunk(stream, state); + } else { + var er; + if (!skipChunkCheck) er = chunkInvalid(state, chunk); + if (er) { + stream.emit('error', er); + } else if (state.objectMode || chunk && chunk.length > 0) { + if (typeof chunk !== 'string' && !state.objectMode && Object.getPrototypeOf(chunk) !== Buffer.prototype) { + chunk = _uint8ArrayToBuffer(chunk); + } + + if (addToFront) { + if (state.endEmitted) stream.emit('error', new Error('stream.unshift() after end event'));else addChunk(stream, state, chunk, true); + } else if (state.ended) { + stream.emit('error', new Error('stream.push() after EOF')); + } else { + state.reading = false; + if (state.decoder && !encoding) { + chunk = state.decoder.write(chunk); + if (state.objectMode || chunk.length !== 0) addChunk(stream, state, chunk, false);else maybeReadMore(stream, state); + } else { + addChunk(stream, state, chunk, false); + } + } + } else if (!addToFront) { + state.reading = false; + } + } + + return needMoreData(state); +} + +function addChunk(stream, state, chunk, addToFront) { + if (state.flowing && state.length === 0 && !state.sync) { + stream.emit('data', chunk); + stream.read(0); + } else { + // update the buffer info. + state.length += state.objectMode ? 1 : chunk.length; + if (addToFront) state.buffer.unshift(chunk);else state.buffer.push(chunk); + + if (state.needReadable) emitReadable(stream); + } + maybeReadMore(stream, state); +} + +function chunkInvalid(state, chunk) { + var er; + if (!_isUint8Array(chunk) && typeof chunk !== 'string' && chunk !== undefined && !state.objectMode) { + er = new TypeError('Invalid non-string/buffer chunk'); + } + return er; +} + +// if it's past the high water mark, we can push in some more. +// Also, if we have no data yet, we can stand some +// more bytes. This is to work around cases where hwm=0, +// such as the repl. Also, if the push() triggered a +// readable event, and the user called read(largeNumber) such that +// needReadable was set, then we ought to push more, so that another +// 'readable' event will be triggered. +function needMoreData(state) { + return !state.ended && (state.needReadable || state.length < state.highWaterMark || state.length === 0); +} + +Readable.prototype.isPaused = function () { + return this._readableState.flowing === false; +}; + +// backwards compatibility. +Readable.prototype.setEncoding = function (enc) { + if (!StringDecoder) StringDecoder = __webpack_require__(/*! string_decoder/ */ "../node_modules/string_decoder/lib/string_decoder.js").StringDecoder; + this._readableState.decoder = new StringDecoder(enc); + this._readableState.encoding = enc; + return this; +}; + +// Don't raise the hwm > 8MB +var MAX_HWM = 0x800000; +function computeNewHighWaterMark(n) { + if (n >= MAX_HWM) { + n = MAX_HWM; + } else { + // Get the next highest power of 2 to prevent increasing hwm excessively in + // tiny amounts + n--; + n |= n >>> 1; + n |= n >>> 2; + n |= n >>> 4; + n |= n >>> 8; + n |= n >>> 16; + n++; + } + return n; +} + +// This function is designed to be inlinable, so please take care when making +// changes to the function body. +function howMuchToRead(n, state) { + if (n <= 0 || state.length === 0 && state.ended) return 0; + if (state.objectMode) return 1; + if (n !== n) { + // Only flow one buffer at a time + if (state.flowing && state.length) return state.buffer.head.data.length;else return state.length; + } + // If we're asking for more than the current hwm, then raise the hwm. + if (n > state.highWaterMark) state.highWaterMark = computeNewHighWaterMark(n); + if (n <= state.length) return n; + // Don't have enough + if (!state.ended) { + state.needReadable = true; + return 0; + } + return state.length; +} + +// you can override either this method, or the async _read(n) below. +Readable.prototype.read = function (n) { + debug('read', n); + n = parseInt(n, 10); + var state = this._readableState; + var nOrig = n; + + if (n !== 0) state.emittedReadable = false; + + // if we're doing read(0) to trigger a readable event, but we + // already have a bunch of data in the buffer, then just trigger + // the 'readable' event and move on. + if (n === 0 && state.needReadable && (state.length >= state.highWaterMark || state.ended)) { + debug('read: emitReadable', state.length, state.ended); + if (state.length === 0 && state.ended) endReadable(this);else emitReadable(this); + return null; + } + + n = howMuchToRead(n, state); + + // if we've ended, and we're now clear, then finish it up. + if (n === 0 && state.ended) { + if (state.length === 0) endReadable(this); + return null; + } + + // All the actual chunk generation logic needs to be + // *below* the call to _read. The reason is that in certain + // synthetic stream cases, such as passthrough streams, _read + // may be a completely synchronous operation which may change + // the state of the read buffer, providing enough data when + // before there was *not* enough. + // + // So, the steps are: + // 1. Figure out what the state of things will be after we do + // a read from the buffer. + // + // 2. If that resulting state will trigger a _read, then call _read. + // Note that this may be asynchronous, or synchronous. Yes, it is + // deeply ugly to write APIs this way, but that still doesn't mean + // that the Readable class should behave improperly, as streams are + // designed to be sync/async agnostic. + // Take note if the _read call is sync or async (ie, if the read call + // has returned yet), so that we know whether or not it's safe to emit + // 'readable' etc. + // + // 3. Actually pull the requested chunks out of the buffer and return. + + // if we need a readable event, then we need to do some reading. + var doRead = state.needReadable; + debug('need readable', doRead); + + // if we currently have less than the highWaterMark, then also read some + if (state.length === 0 || state.length - n < state.highWaterMark) { + doRead = true; + debug('length less than watermark', doRead); + } + + // however, if we've ended, then there's no point, and if we're already + // reading, then it's unnecessary. + if (state.ended || state.reading) { + doRead = false; + debug('reading or ended', doRead); + } else if (doRead) { + debug('do read'); + state.reading = true; + state.sync = true; + // if the length is currently zero, then we *need* a readable event. + if (state.length === 0) state.needReadable = true; + // call internal read method + this._read(state.highWaterMark); + state.sync = false; + // If _read pushed data synchronously, then `reading` will be false, + // and we need to re-evaluate how much data we can return to the user. + if (!state.reading) n = howMuchToRead(nOrig, state); + } + + var ret; + if (n > 0) ret = fromList(n, state);else ret = null; + + if (ret === null) { + state.needReadable = true; + n = 0; + } else { + state.length -= n; + } + + if (state.length === 0) { + // If we have nothing in the buffer, then we want to know + // as soon as we *do* get something into the buffer. + if (!state.ended) state.needReadable = true; + + // If we tried to read() past the EOF, then emit end on the next tick. + if (nOrig !== n && state.ended) endReadable(this); + } + + if (ret !== null) this.emit('data', ret); + + return ret; +}; + +function onEofChunk(stream, state) { + if (state.ended) return; + if (state.decoder) { + var chunk = state.decoder.end(); + if (chunk && chunk.length) { + state.buffer.push(chunk); + state.length += state.objectMode ? 1 : chunk.length; + } + } + state.ended = true; + + // emit 'readable' now to make sure it gets picked up. + emitReadable(stream); +} + +// Don't emit readable right away in sync mode, because this can trigger +// another read() call => stack overflow. This way, it might trigger +// a nextTick recursion warning, but that's not so bad. +function emitReadable(stream) { + var state = stream._readableState; + state.needReadable = false; + if (!state.emittedReadable) { + debug('emitReadable', state.flowing); + state.emittedReadable = true; + if (state.sync) pna.nextTick(emitReadable_, stream);else emitReadable_(stream); + } +} + +function emitReadable_(stream) { + debug('emit readable'); + stream.emit('readable'); + flow(stream); +} + +// at this point, the user has presumably seen the 'readable' event, +// and called read() to consume some data. that may have triggered +// in turn another _read(n) call, in which case reading = true if +// it's in progress. +// However, if we're not ended, or reading, and the length < hwm, +// then go ahead and try to read some more preemptively. +function maybeReadMore(stream, state) { + if (!state.readingMore) { + state.readingMore = true; + pna.nextTick(maybeReadMore_, stream, state); + } +} + +function maybeReadMore_(stream, state) { + var len = state.length; + while (!state.reading && !state.flowing && !state.ended && state.length < state.highWaterMark) { + debug('maybeReadMore read 0'); + stream.read(0); + if (len === state.length) + // didn't get any data, stop spinning. + break;else len = state.length; + } + state.readingMore = false; +} + +// abstract method. to be overridden in specific implementation classes. +// call cb(er, data) where data is <= n in length. +// for virtual (non-string, non-buffer) streams, "length" is somewhat +// arbitrary, and perhaps not very meaningful. +Readable.prototype._read = function (n) { + this.emit('error', new Error('_read() is not implemented')); +}; + +Readable.prototype.pipe = function (dest, pipeOpts) { + var src = this; + var state = this._readableState; + + switch (state.pipesCount) { + case 0: + state.pipes = dest; + break; + case 1: + state.pipes = [state.pipes, dest]; + break; + default: + state.pipes.push(dest); + break; + } + state.pipesCount += 1; + debug('pipe count=%d opts=%j', state.pipesCount, pipeOpts); + + var doEnd = (!pipeOpts || pipeOpts.end !== false) && dest !== process.stdout && dest !== process.stderr; + + var endFn = doEnd ? onend : unpipe; + if (state.endEmitted) pna.nextTick(endFn);else src.once('end', endFn); + + dest.on('unpipe', onunpipe); + function onunpipe(readable, unpipeInfo) { + debug('onunpipe'); + if (readable === src) { + if (unpipeInfo && unpipeInfo.hasUnpiped === false) { + unpipeInfo.hasUnpiped = true; + cleanup(); + } + } + } + + function onend() { + debug('onend'); + dest.end(); + } + + // when the dest drains, it reduces the awaitDrain counter + // on the source. This would be more elegant with a .once() + // handler in flow(), but adding and removing repeatedly is + // too slow. + var ondrain = pipeOnDrain(src); + dest.on('drain', ondrain); + + var cleanedUp = false; + function cleanup() { + debug('cleanup'); + // cleanup event handlers once the pipe is broken + dest.removeListener('close', onclose); + dest.removeListener('finish', onfinish); + dest.removeListener('drain', ondrain); + dest.removeListener('error', onerror); + dest.removeListener('unpipe', onunpipe); + src.removeListener('end', onend); + src.removeListener('end', unpipe); + src.removeListener('data', ondata); + + cleanedUp = true; + + // if the reader is waiting for a drain event from this + // specific writer, then it would cause it to never start + // flowing again. + // So, if this is awaiting a drain, then we just call it now. + // If we don't know, then assume that we are waiting for one. + if (state.awaitDrain && (!dest._writableState || dest._writableState.needDrain)) ondrain(); + } + + // If the user pushes more data while we're writing to dest then we'll end up + // in ondata again. However, we only want to increase awaitDrain once because + // dest will only emit one 'drain' event for the multiple writes. + // => Introduce a guard on increasing awaitDrain. + var increasedAwaitDrain = false; + src.on('data', ondata); + function ondata(chunk) { + debug('ondata'); + increasedAwaitDrain = false; + var ret = dest.write(chunk); + if (false === ret && !increasedAwaitDrain) { + // If the user unpiped during `dest.write()`, it is possible + // to get stuck in a permanently paused state if that write + // also returned false. + // => Check whether `dest` is still a piping destination. + if ((state.pipesCount === 1 && state.pipes === dest || state.pipesCount > 1 && indexOf(state.pipes, dest) !== -1) && !cleanedUp) { + debug('false write response, pause', src._readableState.awaitDrain); + src._readableState.awaitDrain++; + increasedAwaitDrain = true; + } + src.pause(); + } + } + + // if the dest has an error, then stop piping into it. + // however, don't suppress the throwing behavior for this. + function onerror(er) { + debug('onerror', er); + unpipe(); + dest.removeListener('error', onerror); + if (EElistenerCount(dest, 'error') === 0) dest.emit('error', er); + } + + // Make sure our error handler is attached before userland ones. + prependListener(dest, 'error', onerror); + + // Both close and finish should trigger unpipe, but only once. + function onclose() { + dest.removeListener('finish', onfinish); + unpipe(); + } + dest.once('close', onclose); + function onfinish() { + debug('onfinish'); + dest.removeListener('close', onclose); + unpipe(); + } + dest.once('finish', onfinish); + + function unpipe() { + debug('unpipe'); + src.unpipe(dest); + } + + // tell the dest that it's being piped to + dest.emit('pipe', src); + + // start the flow if it hasn't been started already. + if (!state.flowing) { + debug('pipe resume'); + src.resume(); + } + + return dest; +}; + +function pipeOnDrain(src) { + return function () { + var state = src._readableState; + debug('pipeOnDrain', state.awaitDrain); + if (state.awaitDrain) state.awaitDrain--; + if (state.awaitDrain === 0 && EElistenerCount(src, 'data')) { + state.flowing = true; + flow(src); + } + }; +} + +Readable.prototype.unpipe = function (dest) { + var state = this._readableState; + var unpipeInfo = { hasUnpiped: false }; + + // if we're not piping anywhere, then do nothing. + if (state.pipesCount === 0) return this; + + // just one destination. most common case. + if (state.pipesCount === 1) { + // passed in one, but it's not the right one. + if (dest && dest !== state.pipes) return this; + + if (!dest) dest = state.pipes; + + // got a match. + state.pipes = null; + state.pipesCount = 0; + state.flowing = false; + if (dest) dest.emit('unpipe', this, unpipeInfo); + return this; + } + + // slow case. multiple pipe destinations. + + if (!dest) { + // remove all. + var dests = state.pipes; + var len = state.pipesCount; + state.pipes = null; + state.pipesCount = 0; + state.flowing = false; + + for (var i = 0; i < len; i++) { + dests[i].emit('unpipe', this, unpipeInfo); + }return this; + } + + // try to find the right one. + var index = indexOf(state.pipes, dest); + if (index === -1) return this; + + state.pipes.splice(index, 1); + state.pipesCount -= 1; + if (state.pipesCount === 1) state.pipes = state.pipes[0]; + + dest.emit('unpipe', this, unpipeInfo); + + return this; +}; + +// set up data events if they are asked for +// Ensure readable listeners eventually get something +Readable.prototype.on = function (ev, fn) { + var res = Stream.prototype.on.call(this, ev, fn); + + if (ev === 'data') { + // Start flowing on next tick if stream isn't explicitly paused + if (this._readableState.flowing !== false) this.resume(); + } else if (ev === 'readable') { + var state = this._readableState; + if (!state.endEmitted && !state.readableListening) { + state.readableListening = state.needReadable = true; + state.emittedReadable = false; + if (!state.reading) { + pna.nextTick(nReadingNextTick, this); + } else if (state.length) { + emitReadable(this); + } + } + } + + return res; +}; +Readable.prototype.addListener = Readable.prototype.on; + +function nReadingNextTick(self) { + debug('readable nexttick read 0'); + self.read(0); +} + +// pause() and resume() are remnants of the legacy readable stream API +// If the user uses them, then switch into old mode. +Readable.prototype.resume = function () { + var state = this._readableState; + if (!state.flowing) { + debug('resume'); + state.flowing = true; + resume(this, state); + } + return this; +}; + +function resume(stream, state) { + if (!state.resumeScheduled) { + state.resumeScheduled = true; + pna.nextTick(resume_, stream, state); + } +} + +function resume_(stream, state) { + if (!state.reading) { + debug('resume read 0'); + stream.read(0); + } + + state.resumeScheduled = false; + state.awaitDrain = 0; + stream.emit('resume'); + flow(stream); + if (state.flowing && !state.reading) stream.read(0); +} + +Readable.prototype.pause = function () { + debug('call pause flowing=%j', this._readableState.flowing); + if (false !== this._readableState.flowing) { + debug('pause'); + this._readableState.flowing = false; + this.emit('pause'); + } + return this; +}; + +function flow(stream) { + var state = stream._readableState; + debug('flow', state.flowing); + while (state.flowing && stream.read() !== null) {} +} + +// wrap an old-style stream as the async data source. +// This is *not* part of the readable stream interface. +// It is an ugly unfortunate mess of history. +Readable.prototype.wrap = function (stream) { + var _this = this; + + var state = this._readableState; + var paused = false; + + stream.on('end', function () { + debug('wrapped end'); + if (state.decoder && !state.ended) { + var chunk = state.decoder.end(); + if (chunk && chunk.length) _this.push(chunk); + } + + _this.push(null); + }); + + stream.on('data', function (chunk) { + debug('wrapped data'); + if (state.decoder) chunk = state.decoder.write(chunk); + + // don't skip over falsy values in objectMode + if (state.objectMode && (chunk === null || chunk === undefined)) return;else if (!state.objectMode && (!chunk || !chunk.length)) return; + + var ret = _this.push(chunk); + if (!ret) { + paused = true; + stream.pause(); + } + }); + + // proxy all the other methods. + // important when wrapping filters and duplexes. + for (var i in stream) { + if (this[i] === undefined && typeof stream[i] === 'function') { + this[i] = function (method) { + return function () { + return stream[method].apply(stream, arguments); + }; + }(i); + } + } + + // proxy certain important events. + for (var n = 0; n < kProxyEvents.length; n++) { + stream.on(kProxyEvents[n], this.emit.bind(this, kProxyEvents[n])); + } + + // when we try to consume some more bytes, simply unpause the + // underlying stream. + this._read = function (n) { + debug('wrapped _read', n); + if (paused) { + paused = false; + stream.resume(); + } + }; + + return this; +}; + +Object.defineProperty(Readable.prototype, 'readableHighWaterMark', { + // making it explicit this property is not enumerable + // because otherwise some prototype manipulation in + // userland will fail + enumerable: false, + get: function () { + return this._readableState.highWaterMark; + } +}); + +// exposed for testing purposes only. +Readable._fromList = fromList; + +// Pluck off n bytes from an array of buffers. +// Length is the combined lengths of all the buffers in the list. +// This function is designed to be inlinable, so please take care when making +// changes to the function body. +function fromList(n, state) { + // nothing buffered + if (state.length === 0) return null; + + var ret; + if (state.objectMode) ret = state.buffer.shift();else if (!n || n >= state.length) { + // read it all, truncate the list + if (state.decoder) ret = state.buffer.join('');else if (state.buffer.length === 1) ret = state.buffer.head.data;else ret = state.buffer.concat(state.length); + state.buffer.clear(); + } else { + // read part of list + ret = fromListPartial(n, state.buffer, state.decoder); + } + + return ret; +} + +// Extracts only enough buffered data to satisfy the amount requested. +// This function is designed to be inlinable, so please take care when making +// changes to the function body. +function fromListPartial(n, list, hasStrings) { + var ret; + if (n < list.head.data.length) { + // slice is the same for buffers and strings + ret = list.head.data.slice(0, n); + list.head.data = list.head.data.slice(n); + } else if (n === list.head.data.length) { + // first chunk is a perfect match + ret = list.shift(); + } else { + // result spans more than one buffer + ret = hasStrings ? copyFromBufferString(n, list) : copyFromBuffer(n, list); + } + return ret; +} + +// Copies a specified amount of characters from the list of buffered data +// chunks. +// This function is designed to be inlinable, so please take care when making +// changes to the function body. +function copyFromBufferString(n, list) { + var p = list.head; + var c = 1; + var ret = p.data; + n -= ret.length; + while (p = p.next) { + var str = p.data; + var nb = n > str.length ? str.length : n; + if (nb === str.length) ret += str;else ret += str.slice(0, n); + n -= nb; + if (n === 0) { + if (nb === str.length) { + ++c; + if (p.next) list.head = p.next;else list.head = list.tail = null; + } else { + list.head = p; + p.data = str.slice(nb); + } + break; + } + ++c; + } + list.length -= c; + return ret; +} + +// Copies a specified amount of bytes from the list of buffered data chunks. +// This function is designed to be inlinable, so please take care when making +// changes to the function body. +function copyFromBuffer(n, list) { + var ret = Buffer.allocUnsafe(n); + var p = list.head; + var c = 1; + p.data.copy(ret); + n -= p.data.length; + while (p = p.next) { + var buf = p.data; + var nb = n > buf.length ? buf.length : n; + buf.copy(ret, ret.length - n, 0, nb); + n -= nb; + if (n === 0) { + if (nb === buf.length) { + ++c; + if (p.next) list.head = p.next;else list.head = list.tail = null; + } else { + list.head = p; + p.data = buf.slice(nb); + } + break; + } + ++c; + } + list.length -= c; + return ret; +} + +function endReadable(stream) { + var state = stream._readableState; + + // If we get here before consuming all the bytes, then that is a + // bug in node. Should never happen. + if (state.length > 0) throw new Error('"endReadable()" called on non-empty stream'); + + if (!state.endEmitted) { + state.ended = true; + pna.nextTick(endReadableNT, state, stream); + } +} + +function endReadableNT(state, stream) { + // Check that we didn't get one last unshift. + if (!state.endEmitted && state.length === 0) { + state.endEmitted = true; + stream.readable = false; + stream.emit('end'); + } +} + +function indexOf(xs, x) { + for (var i = 0, l = xs.length; i < l; i++) { + if (xs[i] === x) return i; + } + return -1; +} +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../../../../webpack/buildin/global.js */ "../node_modules/webpack/buildin/global.js"), __webpack_require__(/*! ./../../../../../process/browser.js */ "../node_modules/process/browser.js"))) + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_transform.js": +/*!**************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_transform.js ***! + \**************************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +// a transform stream is a readable/writable stream where you do +// something with the data. Sometimes it's called a "filter", +// but that's not a great name for it, since that implies a thing where +// some bits pass through, and others are simply ignored. (That would +// be a valid example of a transform, of course.) +// +// While the output is causally related to the input, it's not a +// necessarily symmetric or synchronous transformation. For example, +// a zlib stream might take multiple plain-text writes(), and then +// emit a single compressed chunk some time in the future. +// +// Here's how this works: +// +// The Transform stream has all the aspects of the readable and writable +// stream classes. When you write(chunk), that calls _write(chunk,cb) +// internally, and returns false if there's a lot of pending writes +// buffered up. When you call read(), that calls _read(n) until +// there's enough pending readable data buffered up. +// +// In a transform stream, the written data is placed in a buffer. When +// _read(n) is called, it transforms the queued up data, calling the +// buffered _write cb's as it consumes chunks. If consuming a single +// written chunk would result in multiple output chunks, then the first +// outputted bit calls the readcb, and subsequent chunks just go into +// the read buffer, and will cause it to emit 'readable' if necessary. +// +// This way, back-pressure is actually determined by the reading side, +// since _read has to be called to start processing a new chunk. However, +// a pathological inflate type of transform can cause excessive buffering +// here. For example, imagine a stream where every byte of input is +// interpreted as an integer from 0-255, and then results in that many +// bytes of output. Writing the 4 bytes {ff,ff,ff,ff} would result in +// 1kb of data being output. In this case, you could write a very small +// amount of input, and end up with a very large amount of output. In +// such a pathological inflating mechanism, there'd be no way to tell +// the system to stop doing the transform. A single 4MB write could +// cause the system to run out of memory. +// +// However, even in such a pathological case, only a single written chunk +// would be consumed, and then the rest would wait (un-transformed) until +// the results of the previous transformed chunk were consumed. + + + +module.exports = Transform; + +var Duplex = __webpack_require__(/*! ./_stream_duplex */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_duplex.js"); + +/**/ +var util = __webpack_require__(/*! core-util-is */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/core-util-is/lib/util.js"); +util.inherits = __webpack_require__(/*! inherits */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/inherits/inherits_browser.js"); +/**/ + +util.inherits(Transform, Duplex); + +function afterTransform(er, data) { + var ts = this._transformState; + ts.transforming = false; + + var cb = ts.writecb; + + if (!cb) { + return this.emit('error', new Error('write callback called multiple times')); + } + + ts.writechunk = null; + ts.writecb = null; + + if (data != null) // single equals check for both `null` and `undefined` + this.push(data); + + cb(er); + + var rs = this._readableState; + rs.reading = false; + if (rs.needReadable || rs.length < rs.highWaterMark) { + this._read(rs.highWaterMark); + } +} + +function Transform(options) { + if (!(this instanceof Transform)) return new Transform(options); + + Duplex.call(this, options); + + this._transformState = { + afterTransform: afterTransform.bind(this), + needTransform: false, + transforming: false, + writecb: null, + writechunk: null, + writeencoding: null + }; + + // start out asking for a readable event once data is transformed. + this._readableState.needReadable = true; + + // we have implemented the _read method, and done the other things + // that Readable wants before the first _read call, so unset the + // sync guard flag. + this._readableState.sync = false; + + if (options) { + if (typeof options.transform === 'function') this._transform = options.transform; + + if (typeof options.flush === 'function') this._flush = options.flush; + } + + // When the writable side finishes, then flush out anything remaining. + this.on('prefinish', prefinish); +} + +function prefinish() { + var _this = this; + + if (typeof this._flush === 'function') { + this._flush(function (er, data) { + done(_this, er, data); + }); + } else { + done(this, null, null); + } +} + +Transform.prototype.push = function (chunk, encoding) { + this._transformState.needTransform = false; + return Duplex.prototype.push.call(this, chunk, encoding); +}; + +// This is the part where you do stuff! +// override this function in implementation classes. +// 'chunk' is an input chunk. +// +// Call `push(newChunk)` to pass along transformed output +// to the readable side. You may call 'push' zero or more times. +// +// Call `cb(err)` when you are done with this chunk. If you pass +// an error, then that'll put the hurt on the whole operation. If you +// never call cb(), then you'll never get another chunk. +Transform.prototype._transform = function (chunk, encoding, cb) { + throw new Error('_transform() is not implemented'); +}; + +Transform.prototype._write = function (chunk, encoding, cb) { + var ts = this._transformState; + ts.writecb = cb; + ts.writechunk = chunk; + ts.writeencoding = encoding; + if (!ts.transforming) { + var rs = this._readableState; + if (ts.needTransform || rs.needReadable || rs.length < rs.highWaterMark) this._read(rs.highWaterMark); + } +}; + +// Doesn't matter what the args are here. +// _transform does all the work. +// That we got here means that the readable side wants more data. +Transform.prototype._read = function (n) { + var ts = this._transformState; + + if (ts.writechunk !== null && ts.writecb && !ts.transforming) { + ts.transforming = true; + this._transform(ts.writechunk, ts.writeencoding, ts.afterTransform); + } else { + // mark that we need a transform, so that any data that comes in + // will get processed, now that we've asked for it. + ts.needTransform = true; + } +}; + +Transform.prototype._destroy = function (err, cb) { + var _this2 = this; + + Duplex.prototype._destroy.call(this, err, function (err2) { + cb(err2); + _this2.emit('close'); + }); +}; + +function done(stream, er, data) { + if (er) return stream.emit('error', er); + + if (data != null) // single equals check for both `null` and `undefined` + stream.push(data); + + // if there's nothing in the write buffer, then that means + // that nothing more will ever be provided + if (stream._writableState.length) throw new Error('Calling transform done when ws.length != 0'); + + if (stream._transformState.transforming) throw new Error('Calling transform done when still transforming'); + + return stream.push(null); +} + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_writable.js": +/*!*************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_writable.js ***! + \*************************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(process, setImmediate, global) {// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +// A bit simpler than readable streams. +// Implement an async ._write(chunk, encoding, cb), and it'll handle all +// the drain event emission and buffering. + + + +/**/ + +var pna = __webpack_require__(/*! process-nextick-args */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/process-nextick-args/index.js"); +/**/ + +module.exports = Writable; + +/* */ +function WriteReq(chunk, encoding, cb) { + this.chunk = chunk; + this.encoding = encoding; + this.callback = cb; + this.next = null; +} + +// It seems a linked list but it is not +// there will be only 2 of these for each stream +function CorkedRequest(state) { + var _this = this; + + this.next = null; + this.entry = null; + this.finish = function () { + onCorkedFinish(_this, state); + }; +} +/* */ + +/**/ +var asyncWrite = !process.browser && ['v0.10', 'v0.9.'].indexOf(process.version.slice(0, 5)) > -1 ? setImmediate : pna.nextTick; +/**/ + +/**/ +var Duplex; +/**/ + +Writable.WritableState = WritableState; + +/**/ +var util = __webpack_require__(/*! core-util-is */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/core-util-is/lib/util.js"); +util.inherits = __webpack_require__(/*! inherits */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/inherits/inherits_browser.js"); +/**/ + +/**/ +var internalUtil = { + deprecate: __webpack_require__(/*! util-deprecate */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/util-deprecate/browser.js") +}; +/**/ + +/**/ +var Stream = __webpack_require__(/*! ./internal/streams/stream */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/internal/streams/stream-browser.js"); +/**/ + +/**/ + +var Buffer = __webpack_require__(/*! safe-buffer */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/safe-buffer/index.js").Buffer; +var OurUint8Array = global.Uint8Array || function () {}; +function _uint8ArrayToBuffer(chunk) { + return Buffer.from(chunk); +} +function _isUint8Array(obj) { + return Buffer.isBuffer(obj) || obj instanceof OurUint8Array; +} + +/**/ + +var destroyImpl = __webpack_require__(/*! ./internal/streams/destroy */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/internal/streams/destroy.js"); + +util.inherits(Writable, Stream); + +function nop() {} + +function WritableState(options, stream) { + Duplex = Duplex || __webpack_require__(/*! ./_stream_duplex */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_duplex.js"); + + options = options || {}; + + // Duplex streams are both readable and writable, but share + // the same options object. + // However, some cases require setting options to different + // values for the readable and the writable sides of the duplex stream. + // These options can be provided separately as readableXXX and writableXXX. + var isDuplex = stream instanceof Duplex; + + // object stream flag to indicate whether or not this stream + // contains buffers or objects. + this.objectMode = !!options.objectMode; + + if (isDuplex) this.objectMode = this.objectMode || !!options.writableObjectMode; + + // the point at which write() starts returning false + // Note: 0 is a valid value, means that we always return false if + // the entire buffer is not flushed immediately on write() + var hwm = options.highWaterMark; + var writableHwm = options.writableHighWaterMark; + var defaultHwm = this.objectMode ? 16 : 16 * 1024; + + if (hwm || hwm === 0) this.highWaterMark = hwm;else if (isDuplex && (writableHwm || writableHwm === 0)) this.highWaterMark = writableHwm;else this.highWaterMark = defaultHwm; + + // cast to ints. + this.highWaterMark = Math.floor(this.highWaterMark); + + // if _final has been called + this.finalCalled = false; + + // drain event flag. + this.needDrain = false; + // at the start of calling end() + this.ending = false; + // when end() has been called, and returned + this.ended = false; + // when 'finish' is emitted + this.finished = false; + + // has it been destroyed + this.destroyed = false; + + // should we decode strings into buffers before passing to _write? + // this is here so that some node-core streams can optimize string + // handling at a lower level. + var noDecode = options.decodeStrings === false; + this.decodeStrings = !noDecode; + + // Crypto is kind of old and crusty. Historically, its default string + // encoding is 'binary' so we have to make this configurable. + // Everything else in the universe uses 'utf8', though. + this.defaultEncoding = options.defaultEncoding || 'utf8'; + + // not an actual buffer we keep track of, but a measurement + // of how much we're waiting to get pushed to some underlying + // socket or file. + this.length = 0; + + // a flag to see when we're in the middle of a write. + this.writing = false; + + // when true all writes will be buffered until .uncork() call + this.corked = 0; + + // a flag to be able to tell if the onwrite cb is called immediately, + // or on a later tick. We set this to true at first, because any + // actions that shouldn't happen until "later" should generally also + // not happen before the first write call. + this.sync = true; + + // a flag to know if we're processing previously buffered items, which + // may call the _write() callback in the same tick, so that we don't + // end up in an overlapped onwrite situation. + this.bufferProcessing = false; + + // the callback that's passed to _write(chunk,cb) + this.onwrite = function (er) { + onwrite(stream, er); + }; + + // the callback that the user supplies to write(chunk,encoding,cb) + this.writecb = null; + + // the amount that is being written when _write is called. + this.writelen = 0; + + this.bufferedRequest = null; + this.lastBufferedRequest = null; + + // number of pending user-supplied write callbacks + // this must be 0 before 'finish' can be emitted + this.pendingcb = 0; + + // emit prefinish if the only thing we're waiting for is _write cbs + // This is relevant for synchronous Transform streams + this.prefinished = false; + + // True if the error was already emitted and should not be thrown again + this.errorEmitted = false; + + // count buffered requests + this.bufferedRequestCount = 0; + + // allocate the first CorkedRequest, there is always + // one allocated and free to use, and we maintain at most two + this.corkedRequestsFree = new CorkedRequest(this); +} + +WritableState.prototype.getBuffer = function getBuffer() { + var current = this.bufferedRequest; + var out = []; + while (current) { + out.push(current); + current = current.next; + } + return out; +}; + +(function () { + try { + Object.defineProperty(WritableState.prototype, 'buffer', { + get: internalUtil.deprecate(function () { + return this.getBuffer(); + }, '_writableState.buffer is deprecated. Use _writableState.getBuffer ' + 'instead.', 'DEP0003') + }); + } catch (_) {} +})(); + +// Test _writableState for inheritance to account for Duplex streams, +// whose prototype chain only points to Readable. +var realHasInstance; +if (typeof Symbol === 'function' && Symbol.hasInstance && typeof Function.prototype[Symbol.hasInstance] === 'function') { + realHasInstance = Function.prototype[Symbol.hasInstance]; + Object.defineProperty(Writable, Symbol.hasInstance, { + value: function (object) { + if (realHasInstance.call(this, object)) return true; + if (this !== Writable) return false; + + return object && object._writableState instanceof WritableState; + } + }); +} else { + realHasInstance = function (object) { + return object instanceof this; + }; +} + +function Writable(options) { + Duplex = Duplex || __webpack_require__(/*! ./_stream_duplex */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_duplex.js"); + + // Writable ctor is applied to Duplexes, too. + // `realHasInstance` is necessary because using plain `instanceof` + // would return false, as no `_writableState` property is attached. + + // Trying to use the custom `instanceof` for Writable here will also break the + // Node.js LazyTransform implementation, which has a non-trivial getter for + // `_writableState` that would lead to infinite recursion. + if (!realHasInstance.call(Writable, this) && !(this instanceof Duplex)) { + return new Writable(options); + } + + this._writableState = new WritableState(options, this); + + // legacy. + this.writable = true; + + if (options) { + if (typeof options.write === 'function') this._write = options.write; + + if (typeof options.writev === 'function') this._writev = options.writev; + + if (typeof options.destroy === 'function') this._destroy = options.destroy; + + if (typeof options.final === 'function') this._final = options.final; + } + + Stream.call(this); +} + +// Otherwise people can pipe Writable streams, which is just wrong. +Writable.prototype.pipe = function () { + this.emit('error', new Error('Cannot pipe, not readable')); +}; + +function writeAfterEnd(stream, cb) { + var er = new Error('write after end'); + // TODO: defer error events consistently everywhere, not just the cb + stream.emit('error', er); + pna.nextTick(cb, er); +} + +// Checks that a user-supplied chunk is valid, especially for the particular +// mode the stream is in. Currently this means that `null` is never accepted +// and undefined/non-string values are only allowed in object mode. +function validChunk(stream, state, chunk, cb) { + var valid = true; + var er = false; + + if (chunk === null) { + er = new TypeError('May not write null values to stream'); + } else if (typeof chunk !== 'string' && chunk !== undefined && !state.objectMode) { + er = new TypeError('Invalid non-string/buffer chunk'); + } + if (er) { + stream.emit('error', er); + pna.nextTick(cb, er); + valid = false; + } + return valid; +} + +Writable.prototype.write = function (chunk, encoding, cb) { + var state = this._writableState; + var ret = false; + var isBuf = !state.objectMode && _isUint8Array(chunk); + + if (isBuf && !Buffer.isBuffer(chunk)) { + chunk = _uint8ArrayToBuffer(chunk); + } + + if (typeof encoding === 'function') { + cb = encoding; + encoding = null; + } + + if (isBuf) encoding = 'buffer';else if (!encoding) encoding = state.defaultEncoding; + + if (typeof cb !== 'function') cb = nop; + + if (state.ended) writeAfterEnd(this, cb);else if (isBuf || validChunk(this, state, chunk, cb)) { + state.pendingcb++; + ret = writeOrBuffer(this, state, isBuf, chunk, encoding, cb); + } + + return ret; +}; + +Writable.prototype.cork = function () { + var state = this._writableState; + + state.corked++; +}; + +Writable.prototype.uncork = function () { + var state = this._writableState; + + if (state.corked) { + state.corked--; + + if (!state.writing && !state.corked && !state.finished && !state.bufferProcessing && state.bufferedRequest) clearBuffer(this, state); + } +}; + +Writable.prototype.setDefaultEncoding = function setDefaultEncoding(encoding) { + // node::ParseEncoding() requires lower case. + if (typeof encoding === 'string') encoding = encoding.toLowerCase(); + if (!(['hex', 'utf8', 'utf-8', 'ascii', 'binary', 'base64', 'ucs2', 'ucs-2', 'utf16le', 'utf-16le', 'raw'].indexOf((encoding + '').toLowerCase()) > -1)) throw new TypeError('Unknown encoding: ' + encoding); + this._writableState.defaultEncoding = encoding; + return this; +}; + +function decodeChunk(state, chunk, encoding) { + if (!state.objectMode && state.decodeStrings !== false && typeof chunk === 'string') { + chunk = Buffer.from(chunk, encoding); + } + return chunk; +} + +Object.defineProperty(Writable.prototype, 'writableHighWaterMark', { + // making it explicit this property is not enumerable + // because otherwise some prototype manipulation in + // userland will fail + enumerable: false, + get: function () { + return this._writableState.highWaterMark; + } +}); + +// if we're already writing something, then just put this +// in the queue, and wait our turn. Otherwise, call _write +// If we return false, then we need a drain event, so set that flag. +function writeOrBuffer(stream, state, isBuf, chunk, encoding, cb) { + if (!isBuf) { + var newChunk = decodeChunk(state, chunk, encoding); + if (chunk !== newChunk) { + isBuf = true; + encoding = 'buffer'; + chunk = newChunk; + } + } + var len = state.objectMode ? 1 : chunk.length; + + state.length += len; + + var ret = state.length < state.highWaterMark; + // we must ensure that previous needDrain will not be reset to false. + if (!ret) state.needDrain = true; + + if (state.writing || state.corked) { + var last = state.lastBufferedRequest; + state.lastBufferedRequest = { + chunk: chunk, + encoding: encoding, + isBuf: isBuf, + callback: cb, + next: null + }; + if (last) { + last.next = state.lastBufferedRequest; + } else { + state.bufferedRequest = state.lastBufferedRequest; + } + state.bufferedRequestCount += 1; + } else { + doWrite(stream, state, false, len, chunk, encoding, cb); + } + + return ret; +} + +function doWrite(stream, state, writev, len, chunk, encoding, cb) { + state.writelen = len; + state.writecb = cb; + state.writing = true; + state.sync = true; + if (writev) stream._writev(chunk, state.onwrite);else stream._write(chunk, encoding, state.onwrite); + state.sync = false; +} + +function onwriteError(stream, state, sync, er, cb) { + --state.pendingcb; + + if (sync) { + // defer the callback if we are being called synchronously + // to avoid piling up things on the stack + pna.nextTick(cb, er); + // this can emit finish, and it will always happen + // after error + pna.nextTick(finishMaybe, stream, state); + stream._writableState.errorEmitted = true; + stream.emit('error', er); + } else { + // the caller expect this to happen before if + // it is async + cb(er); + stream._writableState.errorEmitted = true; + stream.emit('error', er); + // this can emit finish, but finish must + // always follow error + finishMaybe(stream, state); + } +} + +function onwriteStateUpdate(state) { + state.writing = false; + state.writecb = null; + state.length -= state.writelen; + state.writelen = 0; +} + +function onwrite(stream, er) { + var state = stream._writableState; + var sync = state.sync; + var cb = state.writecb; + + onwriteStateUpdate(state); + + if (er) onwriteError(stream, state, sync, er, cb);else { + // Check if we're actually ready to finish, but don't emit yet + var finished = needFinish(state); + + if (!finished && !state.corked && !state.bufferProcessing && state.bufferedRequest) { + clearBuffer(stream, state); + } + + if (sync) { + /**/ + asyncWrite(afterWrite, stream, state, finished, cb); + /**/ + } else { + afterWrite(stream, state, finished, cb); + } + } +} + +function afterWrite(stream, state, finished, cb) { + if (!finished) onwriteDrain(stream, state); + state.pendingcb--; + cb(); + finishMaybe(stream, state); +} + +// Must force callback to be called on nextTick, so that we don't +// emit 'drain' before the write() consumer gets the 'false' return +// value, and has a chance to attach a 'drain' listener. +function onwriteDrain(stream, state) { + if (state.length === 0 && state.needDrain) { + state.needDrain = false; + stream.emit('drain'); + } +} + +// if there's something in the buffer waiting, then process it +function clearBuffer(stream, state) { + state.bufferProcessing = true; + var entry = state.bufferedRequest; + + if (stream._writev && entry && entry.next) { + // Fast case, write everything using _writev() + var l = state.bufferedRequestCount; + var buffer = new Array(l); + var holder = state.corkedRequestsFree; + holder.entry = entry; + + var count = 0; + var allBuffers = true; + while (entry) { + buffer[count] = entry; + if (!entry.isBuf) allBuffers = false; + entry = entry.next; + count += 1; + } + buffer.allBuffers = allBuffers; + + doWrite(stream, state, true, state.length, buffer, '', holder.finish); + + // doWrite is almost always async, defer these to save a bit of time + // as the hot path ends with doWrite + state.pendingcb++; + state.lastBufferedRequest = null; + if (holder.next) { + state.corkedRequestsFree = holder.next; + holder.next = null; + } else { + state.corkedRequestsFree = new CorkedRequest(state); + } + state.bufferedRequestCount = 0; + } else { + // Slow case, write chunks one-by-one + while (entry) { + var chunk = entry.chunk; + var encoding = entry.encoding; + var cb = entry.callback; + var len = state.objectMode ? 1 : chunk.length; + + doWrite(stream, state, false, len, chunk, encoding, cb); + entry = entry.next; + state.bufferedRequestCount--; + // if we didn't call the onwrite immediately, then + // it means that we need to wait until it does. + // also, that means that the chunk and cb are currently + // being processed, so move the buffer counter past them. + if (state.writing) { + break; + } + } + + if (entry === null) state.lastBufferedRequest = null; + } + + state.bufferedRequest = entry; + state.bufferProcessing = false; +} + +Writable.prototype._write = function (chunk, encoding, cb) { + cb(new Error('_write() is not implemented')); +}; + +Writable.prototype._writev = null; + +Writable.prototype.end = function (chunk, encoding, cb) { + var state = this._writableState; + + if (typeof chunk === 'function') { + cb = chunk; + chunk = null; + encoding = null; + } else if (typeof encoding === 'function') { + cb = encoding; + encoding = null; + } + + if (chunk !== null && chunk !== undefined) this.write(chunk, encoding); + + // .end() fully uncorks + if (state.corked) { + state.corked = 1; + this.uncork(); + } + + // ignore unnecessary end() calls. + if (!state.ending && !state.finished) endWritable(this, state, cb); +}; + +function needFinish(state) { + return state.ending && state.length === 0 && state.bufferedRequest === null && !state.finished && !state.writing; +} +function callFinal(stream, state) { + stream._final(function (err) { + state.pendingcb--; + if (err) { + stream.emit('error', err); + } + state.prefinished = true; + stream.emit('prefinish'); + finishMaybe(stream, state); + }); +} +function prefinish(stream, state) { + if (!state.prefinished && !state.finalCalled) { + if (typeof stream._final === 'function') { + state.pendingcb++; + state.finalCalled = true; + pna.nextTick(callFinal, stream, state); + } else { + state.prefinished = true; + stream.emit('prefinish'); + } + } +} + +function finishMaybe(stream, state) { + var need = needFinish(state); + if (need) { + prefinish(stream, state); + if (state.pendingcb === 0) { + state.finished = true; + stream.emit('finish'); + } + } + return need; +} + +function endWritable(stream, state, cb) { + state.ending = true; + finishMaybe(stream, state); + if (cb) { + if (state.finished) pna.nextTick(cb);else stream.once('finish', cb); + } + state.ended = true; + stream.writable = false; +} + +function onCorkedFinish(corkReq, state, err) { + var entry = corkReq.entry; + corkReq.entry = null; + while (entry) { + var cb = entry.callback; + state.pendingcb--; + cb(err); + entry = entry.next; + } + if (state.corkedRequestsFree) { + state.corkedRequestsFree.next = corkReq; + } else { + state.corkedRequestsFree = corkReq; + } +} + +Object.defineProperty(Writable.prototype, 'destroyed', { + get: function () { + if (this._writableState === undefined) { + return false; + } + return this._writableState.destroyed; + }, + set: function (value) { + // we ignore the value if the stream + // has not been initialized yet + if (!this._writableState) { + return; + } + + // backward compatibility, the user is explicitly + // managing destroyed + this._writableState.destroyed = value; + } +}); + +Writable.prototype.destroy = destroyImpl.destroy; +Writable.prototype._undestroy = destroyImpl.undestroy; +Writable.prototype._destroy = function (err, cb) { + this.end(); + cb(err); +}; +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../../../../process/browser.js */ "../node_modules/process/browser.js"), __webpack_require__(/*! ./../../../../../timers-browserify/main.js */ "../node_modules/timers-browserify/main.js").setImmediate, __webpack_require__(/*! ./../../../../../webpack/buildin/global.js */ "../node_modules/webpack/buildin/global.js"))) + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/internal/streams/BufferList.js": +/*!************************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/internal/streams/BufferList.js ***! + \************************************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +var Buffer = __webpack_require__(/*! safe-buffer */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/safe-buffer/index.js").Buffer; +var util = __webpack_require__(/*! util */ 1); + +function copyBuffer(src, target, offset) { + src.copy(target, offset); +} + +module.exports = function () { + function BufferList() { + _classCallCheck(this, BufferList); + + this.head = null; + this.tail = null; + this.length = 0; + } + + BufferList.prototype.push = function push(v) { + var entry = { data: v, next: null }; + if (this.length > 0) this.tail.next = entry;else this.head = entry; + this.tail = entry; + ++this.length; + }; + + BufferList.prototype.unshift = function unshift(v) { + var entry = { data: v, next: this.head }; + if (this.length === 0) this.tail = entry; + this.head = entry; + ++this.length; + }; + + BufferList.prototype.shift = function shift() { + if (this.length === 0) return; + var ret = this.head.data; + if (this.length === 1) this.head = this.tail = null;else this.head = this.head.next; + --this.length; + return ret; + }; + + BufferList.prototype.clear = function clear() { + this.head = this.tail = null; + this.length = 0; + }; + + BufferList.prototype.join = function join(s) { + if (this.length === 0) return ''; + var p = this.head; + var ret = '' + p.data; + while (p = p.next) { + ret += s + p.data; + }return ret; + }; + + BufferList.prototype.concat = function concat(n) { + if (this.length === 0) return Buffer.alloc(0); + if (this.length === 1) return this.head.data; + var ret = Buffer.allocUnsafe(n >>> 0); + var p = this.head; + var i = 0; + while (p) { + copyBuffer(p.data, ret, i); + i += p.data.length; + p = p.next; + } + return ret; + }; + + return BufferList; +}(); + +if (util && util.inspect && util.inspect.custom) { + module.exports.prototype[util.inspect.custom] = function () { + var obj = util.inspect({ length: this.length }); + return this.constructor.name + ' ' + obj; + }; +} + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/internal/streams/destroy.js": +/*!*********************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/internal/streams/destroy.js ***! + \*********************************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +/**/ + +var pna = __webpack_require__(/*! process-nextick-args */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/process-nextick-args/index.js"); +/**/ + +// undocumented cb() API, needed for core, not for public API +function destroy(err, cb) { + var _this = this; + + var readableDestroyed = this._readableState && this._readableState.destroyed; + var writableDestroyed = this._writableState && this._writableState.destroyed; + + if (readableDestroyed || writableDestroyed) { + if (cb) { + cb(err); + } else if (err && (!this._writableState || !this._writableState.errorEmitted)) { + pna.nextTick(emitErrorNT, this, err); + } + return this; + } + + // we set destroyed to true before firing error callbacks in order + // to make it re-entrance safe in case destroy() is called within callbacks + + if (this._readableState) { + this._readableState.destroyed = true; + } + + // if this is a duplex stream mark the writable part as destroyed as well + if (this._writableState) { + this._writableState.destroyed = true; + } + + this._destroy(err || null, function (err) { + if (!cb && err) { + pna.nextTick(emitErrorNT, _this, err); + if (_this._writableState) { + _this._writableState.errorEmitted = true; + } + } else if (cb) { + cb(err); + } + }); + + return this; +} + +function undestroy() { + if (this._readableState) { + this._readableState.destroyed = false; + this._readableState.reading = false; + this._readableState.ended = false; + this._readableState.endEmitted = false; + } + + if (this._writableState) { + this._writableState.destroyed = false; + this._writableState.ended = false; + this._writableState.ending = false; + this._writableState.finished = false; + this._writableState.errorEmitted = false; + } +} + +function emitErrorNT(self, err) { + self.emit('error', err); +} + +module.exports = { + destroy: destroy, + undestroy: undestroy +}; + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/internal/streams/stream-browser.js": +/*!****************************************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/internal/streams/stream-browser.js ***! + \****************************************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = __webpack_require__(/*! events */ "../node_modules/events/events.js").EventEmitter; + + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/readable-browser.js": +/*!*********************************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/readable-browser.js ***! + \*********************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +exports = module.exports = __webpack_require__(/*! ./lib/_stream_readable.js */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_readable.js"); +exports.Stream = exports; +exports.Readable = exports; +exports.Writable = __webpack_require__(/*! ./lib/_stream_writable.js */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_writable.js"); +exports.Duplex = __webpack_require__(/*! ./lib/_stream_duplex.js */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_duplex.js"); +exports.Transform = __webpack_require__(/*! ./lib/_stream_transform.js */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_transform.js"); +exports.PassThrough = __webpack_require__(/*! ./lib/_stream_passthrough.js */ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/readable-stream/lib/_stream_passthrough.js"); + + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/safe-buffer/index.js": +/*!******************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/safe-buffer/index.js ***! + \******************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +/* eslint-disable node/no-deprecated-api */ +var buffer = __webpack_require__(/*! buffer */ "../node_modules/buffer/index.js") +var Buffer = buffer.Buffer + +// alternative to using Object.keys for old browsers +function copyProps (src, dst) { + for (var key in src) { + dst[key] = src[key] + } +} +if (Buffer.from && Buffer.alloc && Buffer.allocUnsafe && Buffer.allocUnsafeSlow) { + module.exports = buffer +} else { + // Copy properties from require('buffer') + copyProps(buffer, exports) + exports.Buffer = SafeBuffer +} + +function SafeBuffer (arg, encodingOrOffset, length) { + return Buffer(arg, encodingOrOffset, length) +} + +// Copy static methods from Buffer +copyProps(Buffer, SafeBuffer) + +SafeBuffer.from = function (arg, encodingOrOffset, length) { + if (typeof arg === 'number') { + throw new TypeError('Argument must not be a number') + } + return Buffer(arg, encodingOrOffset, length) +} + +SafeBuffer.alloc = function (size, fill, encoding) { + if (typeof size !== 'number') { + throw new TypeError('Argument must be a number') + } + var buf = Buffer(size) + if (fill !== undefined) { + if (typeof encoding === 'string') { + buf.fill(fill, encoding) + } else { + buf.fill(fill) + } + } else { + buf.fill(0) + } + return buf +} + +SafeBuffer.allocUnsafe = function (size) { + if (typeof size !== 'number') { + throw new TypeError('Argument must be a number') + } + return Buffer(size) +} + +SafeBuffer.allocUnsafeSlow = function (size) { + if (typeof size !== 'number') { + throw new TypeError('Argument must be a number') + } + return buffer.SlowBuffer(size) +} + + +/***/ }), + +/***/ "../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/util-deprecate/browser.js": +/*!***********************************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr-protocol-msgpack/node_modules/util-deprecate/browser.js ***! + \***********************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +/* WEBPACK VAR INJECTION */(function(global) { +/** + * Module exports. + */ + +module.exports = deprecate; + +/** + * Mark that a method should not be used. + * Returns a modified function which warns once by default. + * + * If `localStorage.noDeprecation = true` is set, then it is a no-op. + * + * If `localStorage.throwDeprecation = true` is set, then deprecated functions + * will throw an Error when invoked. + * + * If `localStorage.traceDeprecation = true` is set, then deprecated functions + * will invoke `console.trace()` instead of `console.error()`. + * + * @param {Function} fn - the function to deprecate + * @param {String} msg - the string to print to the console when `fn` is invoked + * @returns {Function} a new "deprecated" version of `fn` + * @api public + */ + +function deprecate (fn, msg) { + if (config('noDeprecation')) { + return fn; + } + + var warned = false; + function deprecated() { + if (!warned) { + if (config('throwDeprecation')) { + throw new Error(msg); + } else if (config('traceDeprecation')) { + console.trace(msg); + } else { + console.warn(msg); + } + warned = true; + } + return fn.apply(this, arguments); + } + + return deprecated; +} + +/** + * Checks `localStorage` for boolean values for the given `name`. + * + * @param {String} name + * @returns {Boolean} + * @api private + */ + +function config (name) { + // accessing global.localStorage can trigger a DOMException in sandboxed iframes + try { + if (!global.localStorage) return false; + } catch (_) { + return false; + } + var val = global.localStorage[name]; + if (null == val) return false; + return String(val).toLowerCase() === 'true'; +} + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../../../webpack/buildin/global.js */ "../node_modules/webpack/buildin/global.js"))) + +/***/ }), + /***/ "../node_modules/@aspnet/signalr/dist/esm/AbortController.js": /*!*******************************************************************!*\ !*** ../node_modules/@aspnet/signalr/dist/esm/AbortController.js ***! @@ -500,7 +8148,8 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DefaultHttpClient", function() { return DefaultHttpClient; }); /* harmony import */ var _Errors__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Errors */ "../node_modules/@aspnet/signalr/dist/esm/Errors.js"); /* harmony import */ var _HttpClient__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./HttpClient */ "../node_modules/@aspnet/signalr/dist/esm/HttpClient.js"); -/* harmony import */ var _XhrHttpClient__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./XhrHttpClient */ "../node_modules/@aspnet/signalr/dist/esm/XhrHttpClient.js"); +/* harmony import */ var _NodeHttpClient__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./NodeHttpClient */ "../node_modules/@aspnet/signalr/dist/esm/NodeHttpClient.js"); +/* harmony import */ var _XhrHttpClient__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./XhrHttpClient */ "../node_modules/@aspnet/signalr/dist/esm/XhrHttpClient.js"); // 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. var __extends = (undefined && undefined.__extends) || (function () { @@ -516,13 +8165,7 @@ var __extends = (undefined && undefined.__extends) || (function () { -var nodeHttpClientModule; -if (typeof XMLHttpRequest === "undefined") { - // In order to ignore the dynamic require in webpack builds we need to do this magic - // @ts-ignore: TS doesn't know about these names - var requireFunc = true ? require : undefined; - nodeHttpClientModule = requireFunc("./NodeHttpClient"); -} + /** Default implementation of {@link @aspnet/signalr.HttpClient}. */ var DefaultHttpClient = /** @class */ (function (_super) { __extends(DefaultHttpClient, _super); @@ -530,13 +8173,10 @@ var DefaultHttpClient = /** @class */ (function (_super) { function DefaultHttpClient(logger) { var _this = _super.call(this) || this; if (typeof XMLHttpRequest !== "undefined") { - _this.httpClient = new _XhrHttpClient__WEBPACK_IMPORTED_MODULE_2__["XhrHttpClient"](logger); - } - else if (typeof nodeHttpClientModule !== "undefined") { - _this.httpClient = new nodeHttpClientModule.NodeHttpClient(logger); + _this.httpClient = new _XhrHttpClient__WEBPACK_IMPORTED_MODULE_3__["XhrHttpClient"](logger); } else { - throw new Error("No HttpClient could be created."); + _this.httpClient = new _NodeHttpClient__WEBPACK_IMPORTED_MODULE_2__["NodeHttpClient"](logger); } return _this; } @@ -564,6 +8204,35 @@ var DefaultHttpClient = /** @class */ (function (_super) { /***/ }), +/***/ "../node_modules/@aspnet/signalr/dist/esm/DefaultReconnectPolicy.js": +/*!**************************************************************************!*\ + !*** ../node_modules/@aspnet/signalr/dist/esm/DefaultReconnectPolicy.js ***! + \**************************************************************************/ +/*! exports provided: DefaultReconnectPolicy */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DefaultReconnectPolicy", function() { return DefaultReconnectPolicy; }); +// 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. +// 0, 2, 10, 30 second delays before reconnect attempts. +var DEFAULT_RETRY_DELAYS_IN_MILLISECONDS = [0, 2000, 10000, 30000, null]; +/** @private */ +var DefaultReconnectPolicy = /** @class */ (function () { + function DefaultReconnectPolicy(retryDelays) { + this.retryDelays = retryDelays !== undefined ? retryDelays.concat([null]) : DEFAULT_RETRY_DELAYS_IN_MILLISECONDS; + } + DefaultReconnectPolicy.prototype.nextRetryDelayInMilliseconds = function (previousRetryCount) { + return this.retryDelays[previousRetryCount]; + }; + return DefaultReconnectPolicy; +}()); + +//# sourceMappingURL=DefaultReconnectPolicy.js.map + +/***/ }), + /***/ "../node_modules/@aspnet/signalr/dist/esm/Errors.js": /*!**********************************************************!*\ !*** ../node_modules/@aspnet/signalr/dist/esm/Errors.js ***! @@ -795,12 +8464,13 @@ var HttpClient = /** @class */ (function () { /*!******************************************************************!*\ !*** ../node_modules/@aspnet/signalr/dist/esm/HttpConnection.js ***! \******************************************************************/ -/*! exports provided: HttpConnection */ +/*! exports provided: HttpConnection, TransportSendQueue */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HttpConnection", function() { return HttpConnection; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TransportSendQueue", function() { return TransportSendQueue; }); /* harmony import */ var _DefaultHttpClient__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./DefaultHttpClient */ "../node_modules/@aspnet/signalr/dist/esm/DefaultHttpClient.js"); /* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./ILogger */ "../node_modules/@aspnet/signalr/dist/esm/ILogger.js"); /* harmony import */ var _ITransport__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./ITransport */ "../node_modules/@aspnet/signalr/dist/esm/ITransport.js"); @@ -855,7 +8525,7 @@ var __generator = (undefined && undefined.__generator) || function (thisArg, bod var MAX_REDIRECTS = 100; var WebSocketModule = null; var EventSourceModule = null; -if (typeof window === "undefined" && "function" !== "undefined") { +if (_Utils__WEBPACK_IMPORTED_MODULE_5__["Platform"].isNode && "function" !== "undefined") { // In order to ignore the dynamic require in webpack builds we need to do this magic // @ts-ignore: TS doesn't know about these names var requireFunc = true ? require : undefined; @@ -872,54 +8542,117 @@ var HttpConnection = /** @class */ (function () { this.baseUrl = this.resolveUrl(url); options = options || {}; options.logMessageContent = options.logMessageContent || false; - var isNode = typeof window === "undefined"; - if (!isNode && typeof WebSocket !== "undefined" && !options.WebSocket) { + if (!_Utils__WEBPACK_IMPORTED_MODULE_5__["Platform"].isNode && typeof WebSocket !== "undefined" && !options.WebSocket) { options.WebSocket = WebSocket; } - else if (isNode && !options.WebSocket) { + else if (_Utils__WEBPACK_IMPORTED_MODULE_5__["Platform"].isNode && !options.WebSocket) { if (WebSocketModule) { options.WebSocket = WebSocketModule; } } - if (!isNode && typeof EventSource !== "undefined" && !options.EventSource) { + if (!_Utils__WEBPACK_IMPORTED_MODULE_5__["Platform"].isNode && typeof EventSource !== "undefined" && !options.EventSource) { options.EventSource = EventSource; } - else if (isNode && !options.EventSource) { + else if (_Utils__WEBPACK_IMPORTED_MODULE_5__["Platform"].isNode && !options.EventSource) { if (typeof EventSourceModule !== "undefined") { options.EventSource = EventSourceModule; } } this.httpClient = options.httpClient || new _DefaultHttpClient__WEBPACK_IMPORTED_MODULE_0__["DefaultHttpClient"](this.logger); - this.connectionState = 2 /* Disconnected */; + this.connectionState = "Disconnected" /* Disconnected */; + this.connectionStarted = false; this.options = options; this.onreceive = null; this.onclose = null; } HttpConnection.prototype.start = function (transferFormat) { - transferFormat = transferFormat || _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"].Binary; - _Utils__WEBPACK_IMPORTED_MODULE_5__["Arg"].isIn(transferFormat, _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"], "transferFormat"); - this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Starting connection with transfer format '" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"][transferFormat] + "'."); - if (this.connectionState !== 2 /* Disconnected */) { - return Promise.reject(new Error("Cannot start a connection that is not in the 'Disconnected' state.")); - } - this.connectionState = 0 /* Connecting */; - this.startPromise = this.startInternal(transferFormat); - return this.startPromise; - }; - HttpConnection.prototype.send = function (data) { - if (this.connectionState !== 1 /* Connected */) { - throw new Error("Cannot send data if the connection is not in the 'Connected' State."); - } - // Transport will not be null if state is connected - return this.transport.send(data); - }; - HttpConnection.prototype.stop = function (error) { return __awaiter(this, void 0, void 0, function () { - var e_1; + var message, message; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + transferFormat = transferFormat || _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"].Binary; + _Utils__WEBPACK_IMPORTED_MODULE_5__["Arg"].isIn(transferFormat, _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"], "transferFormat"); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Starting connection with transfer format '" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"][transferFormat] + "'."); + if (this.connectionState !== "Disconnected" /* Disconnected */) { + return [2 /*return*/, Promise.reject(new Error("Cannot start an HttpConnection that is not in the 'Disconnected' state."))]; + } + this.connectionState = "Connecting " /* Connecting */; + this.startInternalPromise = this.startInternal(transferFormat); + return [4 /*yield*/, this.startInternalPromise]; + case 1: + _a.sent(); + if (!(this.connectionState === "Disconnecting" /* Disconnecting */)) return [3 /*break*/, 3]; + message = "Failed to start the HttpConnection before stop() was called."; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, message); + // We cannot await stopPromise inside startInternal since stopInternal awaits the startInternalPromise. + return [4 /*yield*/, this.stopPromise]; + case 2: + // We cannot await stopPromise inside startInternal since stopInternal awaits the startInternalPromise. + _a.sent(); + return [2 /*return*/, Promise.reject(new Error(message))]; + case 3: + if (this.connectionState !== "Connected" /* Connected */) { + message = "HttpConnection.startInternal completed gracefully but didn't enter the connection into the connected state!"; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, message); + return [2 /*return*/, Promise.reject(new Error(message))]; + } + _a.label = 4; + case 4: + this.connectionStarted = true; + return [2 /*return*/]; + } + }); + }); + }; + HttpConnection.prototype.send = function (data) { + if (this.connectionState !== "Connected" /* Connected */) { + return Promise.reject(new Error("Cannot send data if the connection is not in the 'Connected' State.")); + } + if (!this.sendQueue) { + this.sendQueue = new TransportSendQueue(this.transport); + } + // Transport will not be null if state is connected + return this.sendQueue.send(data); + }; + HttpConnection.prototype.stop = function (error) { + return __awaiter(this, void 0, void 0, function () { + var _this = this; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + if (this.connectionState === "Disconnected" /* Disconnected */) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Call to HttpConnection.stop(" + error + ") ignored because the connection is already in the disconnected state."); + return [2 /*return*/, Promise.resolve()]; + } + if (this.connectionState === "Disconnecting" /* Disconnecting */) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Call to HttpConnection.stop(" + error + ") ignored because the connection is already in the disconnecting state."); + return [2 /*return*/, this.stopPromise]; + } + this.connectionState = "Disconnecting" /* Disconnecting */; + this.stopPromise = new Promise(function (resolve) { + // Don't complete stop() until stopConnection() completes. + _this.stopPromiseResolver = resolve; + }); + // stopInternal should never throw so just observe it. + return [4 /*yield*/, this.stopInternal(error)]; + case 1: + // stopInternal should never throw so just observe it. + _a.sent(); + return [4 /*yield*/, this.stopPromise]; + case 2: + _a.sent(); + return [2 /*return*/]; + } + }); + }); + }; + HttpConnection.prototype.stopInternal = function (error) { + return __awaiter(this, void 0, void 0, function () { + var e_1, e_2; return __generator(this, function (_a) { switch (_a.label) { case 0: - this.connectionState = 2 /* Disconnected */; // Set error as soon as possible otherwise there is a race between // the transport closing and providing an error and the error from a close message // We would prefer the close message error. @@ -927,7 +8660,7 @@ var HttpConnection = /** @class */ (function () { _a.label = 1; case 1: _a.trys.push([1, 3, , 4]); - return [4 /*yield*/, this.startPromise]; + return [4 /*yield*/, this.startInternalPromise]; case 2: _a.sent(); return [3 /*break*/, 4]; @@ -935,20 +8668,38 @@ var HttpConnection = /** @class */ (function () { e_1 = _a.sent(); return [3 /*break*/, 4]; case 4: - if (!this.transport) return [3 /*break*/, 6]; - return [4 /*yield*/, this.transport.stop()]; + if (!this.transport) return [3 /*break*/, 9]; + if (this.sendQueue) { + this.sendQueue.stop(); + this.sendQueue = undefined; + } + _a.label = 5; case 5: + _a.trys.push([5, 7, , 8]); + return [4 /*yield*/, this.transport.stop()]; + case 6: _a.sent(); + return [3 /*break*/, 8]; + case 7: + e_2 = _a.sent(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, "HttpConnection.transport.stop() threw error '" + e_2 + "'."); + this.stopConnection(); + return [3 /*break*/, 8]; + case 8: this.transport = undefined; - _a.label = 6; - case 6: return [2 /*return*/]; + return [3 /*break*/, 10]; + case 9: + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "HttpConnection.transport is undefined in HttpConnection.stop() because start() failed."); + this.stopConnection(); + _a.label = 10; + case 10: return [2 /*return*/]; } }); }); }; HttpConnection.prototype.startInternal = function (transferFormat) { return __awaiter(this, void 0, void 0, function () { - var url, negotiateResponse, redirects, _loop_1, this_1, state_1, e_2; + var url, negotiateResponse, redirects, _loop_1, this_1, e_3; var _this = this; return __generator(this, function (_a) { switch (_a.label) { @@ -970,7 +8721,7 @@ var HttpConnection = /** @class */ (function () { // No fallback or negotiate in this case. _a.sent(); return [3 /*break*/, 4]; - case 3: throw Error("Negotiation can only be skipped when using the WebSocket transport directly."); + case 3: throw new Error("Negotiation can only be skipped when using the WebSocket transport directly."); case 4: return [3 /*break*/, 11]; case 5: negotiateResponse = null; @@ -983,14 +8734,14 @@ var HttpConnection = /** @class */ (function () { case 1: negotiateResponse = _a.sent(); // the user tries to stop the connection when it is being started - if (this_1.connectionState === 2 /* Disconnected */) { - return [2 /*return*/, { value: void 0 }]; + if (this_1.connectionState === "Disconnecting" /* Disconnecting */ || this_1.connectionState === "Disconnected" /* Disconnected */) { + throw new Error("The connection was stopped during negotiation."); } if (negotiateResponse.error) { - throw Error(negotiateResponse.error); + throw new Error(negotiateResponse.error); } if (negotiateResponse.ProtocolVersion) { - throw Error("Detected a connection attempt to an ASP.NET SignalR Server. This client only supports connecting to an ASP.NET Core SignalR Server. See https://aka.ms/signalr-core-differences for details."); + throw new Error("Detected a connection attempt to an ASP.NET SignalR Server. This client only supports connecting to an ASP.NET Core SignalR Server. See https://aka.ms/signalr-core-differences for details."); } if (negotiateResponse.url) { url = negotiateResponse.url; @@ -1008,17 +8759,16 @@ var HttpConnection = /** @class */ (function () { _a.label = 6; case 6: return [5 /*yield**/, _loop_1()]; case 7: - state_1 = _a.sent(); - if (typeof state_1 === "object") - return [2 /*return*/, state_1.value]; + _a.sent(); _a.label = 8; case 8: if (negotiateResponse.url && redirects < MAX_REDIRECTS) return [3 /*break*/, 6]; _a.label = 9; case 9: if (redirects === MAX_REDIRECTS && negotiateResponse.url) { - throw Error("Negotiate redirection limit exceeded."); + throw new Error("Negotiate redirection limit exceeded."); } + this.connectionId = negotiateResponse.connectionId; return [4 /*yield*/, this.createTransport(url, this.options.transport, negotiateResponse, transferFormat)]; case 10: _a.sent(); @@ -1029,16 +8779,19 @@ var HttpConnection = /** @class */ (function () { } this.transport.onreceive = this.onreceive; this.transport.onclose = function (e) { return _this.stopConnection(e); }; - // only change the state if we were connecting to not overwrite - // the state if the connection is already marked as Disconnected - this.changeState(0 /* Connecting */, 1 /* Connected */); + if (this.connectionState === "Connecting " /* Connecting */) { + // Ensure the connection transitions to the connected state prior to completing this.startInternalPromise. + // start() will handle the case when stop was called and startInternal exits still in the disconnecting state. + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "The HttpConnection connected successfully."); + this.connectionState = "Connected" /* Connected */; + } return [3 /*break*/, 13]; case 12: - e_2 = _a.sent(); - this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, "Failed to start the connection: " + e_2); - this.connectionState = 2 /* Disconnected */; + e_3 = _a.sent(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, "Failed to start the connection: " + e_3); + this.connectionState = "Disconnected" /* Disconnected */; this.transport = undefined; - throw e_2; + return [2 /*return*/, Promise.reject(e_3)]; case 13: return [2 /*return*/]; } }); @@ -1046,7 +8799,7 @@ var HttpConnection = /** @class */ (function () { }; HttpConnection.prototype.getNegotiationResponse = function (url) { return __awaiter(this, void 0, void 0, function () { - var _a, headers, token, negotiateUrl, response, e_3; + var _a, headers, token, negotiateUrl, response, e_4; return __generator(this, function (_b) { switch (_b.label) { case 0: @@ -1073,13 +8826,13 @@ var HttpConnection = /** @class */ (function () { case 4: response = _b.sent(); if (response.statusCode !== 200) { - throw Error("Unexpected status code returned from negotiate " + response.statusCode); + return [2 /*return*/, Promise.reject(new Error("Unexpected status code returned from negotiate " + response.statusCode))]; } return [2 /*return*/, JSON.parse(response.content)]; case 5: - e_3 = _b.sent(); - this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, "Failed to complete negotiation with the server: " + e_3); - throw e_3; + e_4 = _b.sent(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, "Failed to complete negotiation with the server: " + e_4); + return [2 /*return*/, Promise.reject(e_4)]; case 6: return [2 /*return*/]; } }); @@ -1093,7 +8846,7 @@ var HttpConnection = /** @class */ (function () { }; HttpConnection.prototype.createTransport = function (url, requestedTransport, negotiateResponse, requestedTransferFormat) { return __awaiter(this, void 0, void 0, function () { - var connectUrl, transports, _i, transports_1, endpoint, transport, ex_1; + var connectUrl, transportExceptions, transports, _i, transports_1, endpoint, transport, ex_1, message; return __generator(this, function (_a) { switch (_a.label) { case 0: @@ -1104,44 +8857,51 @@ var HttpConnection = /** @class */ (function () { return [4 /*yield*/, this.transport.connect(connectUrl, requestedTransferFormat)]; case 1: _a.sent(); - // only change the state if we were connecting to not overwrite - // the state if the connection is already marked as Disconnected - this.changeState(0 /* Connecting */, 1 /* Connected */); return [2 /*return*/]; case 2: + transportExceptions = []; transports = negotiateResponse.availableTransports || []; _i = 0, transports_1 = transports; _a.label = 3; case 3: - if (!(_i < transports_1.length)) return [3 /*break*/, 9]; + if (!(_i < transports_1.length)) return [3 /*break*/, 11]; endpoint = transports_1[_i]; - this.connectionState = 0 /* Connecting */; + _a.label = 4; + case 4: + _a.trys.push([4, 9, , 10]); transport = this.resolveTransport(endpoint, requestedTransport, requestedTransferFormat); if (!(typeof transport === "number")) return [3 /*break*/, 8]; this.transport = this.constructTransport(transport); - if (!!negotiateResponse.connectionId) return [3 /*break*/, 5]; + if (!!negotiateResponse.connectionId) return [3 /*break*/, 6]; return [4 /*yield*/, this.getNegotiationResponse(url)]; - case 4: + case 5: negotiateResponse = _a.sent(); connectUrl = this.createConnectUrl(url, negotiateResponse.connectionId); - _a.label = 5; - case 5: - _a.trys.push([5, 7, , 8]); - return [4 /*yield*/, this.transport.connect(connectUrl, requestedTransferFormat)]; - case 6: - _a.sent(); - this.changeState(0 /* Connecting */, 1 /* Connected */); - return [2 /*return*/]; + _a.label = 6; + case 6: return [4 /*yield*/, this.transport.connect(connectUrl, requestedTransferFormat)]; case 7: + _a.sent(); + return [2 /*return*/]; + case 8: return [3 /*break*/, 10]; + case 9: ex_1 = _a.sent(); - this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, "Failed to start the transport '" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport] + "': " + ex_1); - this.connectionState = 2 /* Disconnected */; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, "Failed to start the transport '" + endpoint.transport + "': " + ex_1); negotiateResponse.connectionId = undefined; - return [3 /*break*/, 8]; - case 8: + transportExceptions.push(endpoint.transport + " failed: " + ex_1); + if (this.connectionState !== "Connecting " /* Connecting */) { + message = "Failed to select transport before stop() was called."; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, message); + return [2 /*return*/, Promise.reject(new Error(message))]; + } + return [3 /*break*/, 10]; + case 10: _i++; return [3 /*break*/, 3]; - case 9: throw new Error("Unable to initialize any of the available transports."); + case 11: + if (transportExceptions.length > 0) { + return [2 /*return*/, Promise.reject(new Error("Unable to connect to the server with any of the available transports. " + transportExceptions.join(" ")))]; + } + return [2 /*return*/, Promise.reject(new Error("None of the transports supported by the client are supported by the server."))]; } }); }); @@ -1176,6 +8936,7 @@ var HttpConnection = /** @class */ (function () { if ((transport === _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"].WebSockets && !this.options.WebSocket) || (transport === _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"].ServerSentEvents && !this.options.EventSource)) { this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Skipping transport '" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport] + "' because it is not supported in your environment.'"); + throw new Error("'" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport] + "' is not supported in your environment."); } else { this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Selecting transport '" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport] + "'."); @@ -1184,10 +8945,12 @@ var HttpConnection = /** @class */ (function () { } else { this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Skipping transport '" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport] + "' because it does not support the requested transfer format '" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"][requestedTransferFormat] + "'."); + throw new Error("'" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport] + "' does not support " + _ITransport__WEBPACK_IMPORTED_MODULE_2__["TransferFormat"][requestedTransferFormat] + "."); } } else { this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Skipping transport '" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport] + "' because it was disabled by the client."); + throw new Error("'" + _ITransport__WEBPACK_IMPORTED_MODULE_2__["HttpTransportType"][transport] + "' is disabled by the client."); } } return null; @@ -1195,26 +8958,41 @@ var HttpConnection = /** @class */ (function () { HttpConnection.prototype.isITransport = function (transport) { return transport && typeof (transport) === "object" && "connect" in transport; }; - HttpConnection.prototype.changeState = function (from, to) { - if (this.connectionState === from) { - this.connectionState = to; - return true; - } - return false; - }; HttpConnection.prototype.stopConnection = function (error) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "HttpConnection.stopConnection(" + error + ") called while in state " + this.connectionState + "."); this.transport = undefined; // If we have a stopError, it takes precedence over the error from the transport error = this.stopError || error; + this.stopError = undefined; + if (this.connectionState === "Disconnected" /* Disconnected */) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Debug, "Call to HttpConnection.stopConnection(" + error + ") was ignored because the connection is already in the disconnected state."); + return; + } + if (this.connectionState === "Connecting " /* Connecting */) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Warning, "Call to HttpConnection.stopConnection(" + error + ") was ignored because the connection hasn't yet left the in the connecting state."); + return; + } + if (this.connectionState === "Disconnecting" /* Disconnecting */) { + // A call to stop() induced this call to stopConnection and needs to be completed. + // Any stop() awaiters will be scheduled to continue after the onclose callback fires. + this.stopPromiseResolver(); + } if (error) { this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, "Connection disconnected with error '" + error + "'."); } else { this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Information, "Connection disconnected."); } - this.connectionState = 2 /* Disconnected */; - if (this.onclose) { - this.onclose(error); + this.connectionId = undefined; + this.connectionState = "Disconnected" /* Disconnected */; + if (this.onclose && this.connectionStarted) { + this.connectionStarted = false; + try { + this.onclose(error); + } + catch (e) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_1__["LogLevel"].Error, "HttpConnection.onclose(" + error + ") threw error '" + e + "'."); + } } }; HttpConnection.prototype.resolveUrl = function (url) { @@ -1222,7 +9000,7 @@ var HttpConnection = /** @class */ (function () { if (url.lastIndexOf("https://", 0) === 0 || url.lastIndexOf("http://", 0) === 0) { return url; } - if (typeof window === "undefined" || !window || !window.document) { + if (!_Utils__WEBPACK_IMPORTED_MODULE_5__["Platform"].isBrowser || !window.document) { throw new Error("Cannot resolve '" + url + "'."); } // Setting the url to the href propery of an anchor tag handles normalization @@ -1251,6 +9029,100 @@ var HttpConnection = /** @class */ (function () { function transportMatches(requestedTransport, actualTransport) { return !requestedTransport || ((actualTransport & requestedTransport) !== 0); } +var TransportSendQueue = /** @class */ (function () { + function TransportSendQueue(transport) { + this.transport = transport; + this.buffer = []; + this.executing = true; + this.sendBufferedData = new PromiseSource(); + this.transportResult = new PromiseSource(); + // Suppress typescript error about handling Promises. The sendLoop doesn't need to be observed + this.sendLoop().then(function () { }, function (_) { }); + } + TransportSendQueue.prototype.send = function (data) { + this.bufferData(data); + return this.transportResult.promise; + }; + TransportSendQueue.prototype.stop = function () { + this.executing = false; + this.sendBufferedData.resolve(); + }; + TransportSendQueue.prototype.bufferData = function (data) { + if (this.buffer.length && typeof (this.buffer[0]) !== typeof (data)) { + throw new Error("Expected data to be of type " + typeof (this.buffer) + " but was of type " + typeof (data)); + } + this.buffer.push(data); + this.sendBufferedData.resolve(); + }; + TransportSendQueue.prototype.sendLoop = function () { + return __awaiter(this, void 0, void 0, function () { + var transportResult, data, error_1; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + if (false) {} + return [4 /*yield*/, this.sendBufferedData.promise]; + case 1: + _a.sent(); + if (!this.executing) { + // Did we stop? + return [3 /*break*/, 6]; + } + this.sendBufferedData = new PromiseSource(); + transportResult = this.transportResult; + this.transportResult = new PromiseSource(); + data = typeof (this.buffer[0]) === "string" ? + this.buffer.join("") : + TransportSendQueue.concatBuffers(this.buffer); + this.buffer.length = 0; + _a.label = 2; + case 2: + _a.trys.push([2, 4, , 5]); + return [4 /*yield*/, this.transport.send(data)]; + case 3: + _a.sent(); + transportResult.resolve(); + return [3 /*break*/, 5]; + case 4: + error_1 = _a.sent(); + transportResult.reject(error_1); + return [3 /*break*/, 5]; + case 5: return [3 /*break*/, 0]; + case 6: return [2 /*return*/]; + } + }); + }); + }; + TransportSendQueue.concatBuffers = function (arrayBuffers) { + var totalLength = arrayBuffers.map(function (b) { return b.byteLength; }).reduce(function (a, b) { return a + b; }); + var result = new Uint8Array(totalLength); + var offset = 0; + for (var _i = 0, arrayBuffers_1 = arrayBuffers; _i < arrayBuffers_1.length; _i++) { + var item = arrayBuffers_1[_i]; + result.set(new Uint8Array(item), offset); + offset += item.byteLength; + } + return result; + }; + return TransportSendQueue; +}()); + +var PromiseSource = /** @class */ (function () { + function PromiseSource() { + var _this = this; + this.promise = new Promise(function (resolve, reject) { + var _a; + return _a = [resolve, reject], _this.resolver = _a[0], _this.rejecter = _a[1], _a; + }); + } + PromiseSource.prototype.resolve = function () { + this.resolver(); + }; + PromiseSource.prototype.reject = function (reason) { + this.rejecter(reason); + }; + return PromiseSource; +}()); //# sourceMappingURL=HttpConnection.js.map /***/ }), @@ -1269,7 +9141,8 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _HandshakeProtocol__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./HandshakeProtocol */ "../node_modules/@aspnet/signalr/dist/esm/HandshakeProtocol.js"); /* harmony import */ var _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./IHubProtocol */ "../node_modules/@aspnet/signalr/dist/esm/IHubProtocol.js"); /* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./ILogger */ "../node_modules/@aspnet/signalr/dist/esm/ILogger.js"); -/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./Utils */ "../node_modules/@aspnet/signalr/dist/esm/Utils.js"); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./Subject */ "../node_modules/@aspnet/signalr/dist/esm/Subject.js"); +/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./Utils */ "../node_modules/@aspnet/signalr/dist/esm/Utils.js"); // 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. var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) { @@ -1311,37 +9184,48 @@ var __generator = (undefined && undefined.__generator) || function (thisArg, bod + var DEFAULT_TIMEOUT_IN_MS = 30 * 1000; var DEFAULT_PING_INTERVAL_IN_MS = 15 * 1000; /** Describes the current state of the {@link HubConnection} to the server. */ var HubConnectionState; (function (HubConnectionState) { /** The hub connection is disconnected. */ - HubConnectionState[HubConnectionState["Disconnected"] = 0] = "Disconnected"; + HubConnectionState["Disconnected"] = "Disconnected"; + /** The hub connection is connecting. */ + HubConnectionState["Connecting"] = "Connecting"; /** The hub connection is connected. */ - HubConnectionState[HubConnectionState["Connected"] = 1] = "Connected"; + HubConnectionState["Connected"] = "Connected"; + /** The hub connection is disconnecting. */ + HubConnectionState["Disconnecting"] = "Disconnecting"; + /** The hub connection is reconnecting. */ + HubConnectionState["Reconnecting"] = "Reconnecting"; })(HubConnectionState || (HubConnectionState = {})); /** Represents a connection to a SignalR Hub. */ var HubConnection = /** @class */ (function () { - function HubConnection(connection, logger, protocol) { + function HubConnection(connection, logger, protocol, reconnectPolicy) { var _this = this; - _Utils__WEBPACK_IMPORTED_MODULE_3__["Arg"].isRequired(connection, "connection"); - _Utils__WEBPACK_IMPORTED_MODULE_3__["Arg"].isRequired(logger, "logger"); - _Utils__WEBPACK_IMPORTED_MODULE_3__["Arg"].isRequired(protocol, "protocol"); + _Utils__WEBPACK_IMPORTED_MODULE_4__["Arg"].isRequired(connection, "connection"); + _Utils__WEBPACK_IMPORTED_MODULE_4__["Arg"].isRequired(logger, "logger"); + _Utils__WEBPACK_IMPORTED_MODULE_4__["Arg"].isRequired(protocol, "protocol"); this.serverTimeoutInMilliseconds = DEFAULT_TIMEOUT_IN_MS; this.keepAliveIntervalInMilliseconds = DEFAULT_PING_INTERVAL_IN_MS; this.logger = logger; this.protocol = protocol; this.connection = connection; + this.reconnectPolicy = reconnectPolicy; this.handshakeProtocol = new _HandshakeProtocol__WEBPACK_IMPORTED_MODULE_0__["HandshakeProtocol"](); this.connection.onreceive = function (data) { return _this.processIncomingData(data); }; this.connection.onclose = function (error) { return _this.connectionClosed(error); }; this.callbacks = {}; this.methods = {}; this.closedCallbacks = []; - this.id = 0; + this.reconnectingCallbacks = []; + this.reconnectedCallbacks = []; + this.invocationId = 0; this.receivedHandshakeResponse = false; this.connectionState = HubConnectionState.Disconnected; + this.connectionStarted = false; this.cachedPingMessage = this.protocol.writeMessage({ type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Ping }); } /** @internal */ @@ -1349,8 +9233,8 @@ var HubConnection = /** @class */ (function () { // create method that can be used by HubConnectionBuilder. An "internal" constructor would just // be stripped away and the '.d.ts' file would have no constructor, which is interpreted as a // public parameter-less constructor. - HubConnection.create = function (connection, logger, protocol) { - return new HubConnection(connection, logger, protocol); + HubConnection.create = function (connection, logger, protocol, reconnectPolicy) { + return new HubConnection(connection, logger, protocol, reconnectPolicy); }; Object.defineProperty(HubConnection.prototype, "state", { /** Indicates the state of the {@link HubConnection} to the server. */ @@ -1360,22 +9244,63 @@ var HubConnection = /** @class */ (function () { enumerable: true, configurable: true }); + Object.defineProperty(HubConnection.prototype, "connectionId", { + /** Represents the connection id of the {@link HubConnection} on the server. The connection id will be null when the connection is either + * in the disconnected state or if the negotiation step was skipped. + */ + get: function () { + return this.connection ? (this.connection.connectionId || null) : null; + }, + enumerable: true, + configurable: true + }); /** Starts the connection. * * @returns {Promise} A Promise that resolves when the connection has been successfully established, or rejects with an error. */ HubConnection.prototype.start = function () { + this.startPromise = this.startWithStateTransitions(); + return this.startPromise; + }; + HubConnection.prototype.startWithStateTransitions = function () { return __awaiter(this, void 0, void 0, function () { - var handshakeRequest, handshakePromise; + var e_1; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + if (this.connectionState !== HubConnectionState.Disconnected) { + return [2 /*return*/, Promise.reject(new Error("Cannot start a HubConnection that is not in the 'Disconnected' state."))]; + } + this.connectionState = HubConnectionState.Connecting; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Starting HubConnection."); + _a.label = 1; + case 1: + _a.trys.push([1, 3, , 4]); + return [4 /*yield*/, this.startInternal()]; + case 2: + _a.sent(); + this.connectionState = HubConnectionState.Connected; + this.connectionStarted = true; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "HubConnection connected successfully."); + return [3 /*break*/, 4]; + case 3: + e_1 = _a.sent(); + this.connectionState = HubConnectionState.Disconnected; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "HubConnection failed to start successfully because of error '" + e_1 + "'."); + return [2 /*return*/, Promise.reject(e_1)]; + case 4: return [2 /*return*/]; + } + }); + }); + }; + HubConnection.prototype.startInternal = function () { + return __awaiter(this, void 0, void 0, function () { + var handshakePromise, handshakeRequest, e_2; var _this = this; return __generator(this, function (_a) { switch (_a.label) { case 0: - handshakeRequest = { - protocol: this.protocol.name, - version: this.protocol.version, - }; - this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Starting HubConnection."); + this.stopDuringStartError = undefined; this.receivedHandshakeResponse = false; handshakePromise = new Promise(function (resolve, reject) { _this.handshakeResolver = resolve; @@ -1384,22 +9309,49 @@ var HubConnection = /** @class */ (function () { return [4 /*yield*/, this.connection.start(this.protocol.transferFormat)]; case 1: _a.sent(); + _a.label = 2; + case 2: + _a.trys.push([2, 5, , 7]); + handshakeRequest = { + protocol: this.protocol.name, + version: this.protocol.version, + }; this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Sending handshake request."); return [4 /*yield*/, this.sendMessage(this.handshakeProtocol.writeHandshakeRequest(handshakeRequest))]; - case 2: + case 3: _a.sent(); this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "Using HubProtocol '" + this.protocol.name + "'."); // defensively cleanup timeout in case we receive a message from the server before we finish start this.cleanupTimeout(); this.resetTimeoutPeriod(); this.resetKeepAliveInterval(); - // Wait for the handshake to complete before marking connection as connected return [4 /*yield*/, handshakePromise]; - case 3: - // Wait for the handshake to complete before marking connection as connected + case 4: _a.sent(); - this.connectionState = HubConnectionState.Connected; - return [2 /*return*/]; + // It's important to check the stopDuringStartError instead of just relying on the handshakePromise + // being rejected on close, because this continuation can run after both the handshake completed successfully + // and the connection was closed. + if (this.stopDuringStartError) { + // It's important to throw instead of returning a rejected promise, because we don't want to allow any state + // transitions to occur between now and the calling code observing the exceptions. Returning a rejected promise + // will cause the calling continuation to get scheduled to run later. + throw this.stopDuringStartError; + } + return [3 /*break*/, 7]; + case 5: + e_2 = _a.sent(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Hub handshake failed with error '" + e_2 + "' during start(). Stopping HubConnection."); + this.cleanupTimeout(); + this.cleanupPingTimer(); + // HttpConnection.stop() should not complete until after the onclose callback is invoked. + // This will transition the HubConnection to the disconnected state before HttpConnection.stop() completes. + return [4 /*yield*/, this.connection.stop(e_2)]; + case 6: + // HttpConnection.stop() should not complete until after the onclose callback is invoked. + // This will transition the HubConnection to the disconnected state before HttpConnection.stop() completes. + _a.sent(); + throw e_2; + case 7: return [2 /*return*/]; } }); }); @@ -1409,10 +9361,61 @@ var HubConnection = /** @class */ (function () { * @returns {Promise} A Promise that resolves when the connection has been successfully terminated, or rejects with an error. */ HubConnection.prototype.stop = function () { + return __awaiter(this, void 0, void 0, function () { + var startPromise, e_3; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + startPromise = this.startPromise; + this.stopPromise = this.stopInternal(); + return [4 /*yield*/, this.stopPromise]; + case 1: + _a.sent(); + _a.label = 2; + case 2: + _a.trys.push([2, 4, , 5]); + // Awaiting undefined continues immediately + return [4 /*yield*/, startPromise]; + case 3: + // Awaiting undefined continues immediately + _a.sent(); + return [3 /*break*/, 5]; + case 4: + e_3 = _a.sent(); + return [3 /*break*/, 5]; + case 5: return [2 /*return*/]; + } + }); + }); + }; + HubConnection.prototype.stopInternal = function (error) { + if (this.connectionState === HubConnectionState.Disconnected) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Call to HubConnection.stop(" + error + ") ignored because it is already in the disconnected state."); + return Promise.resolve(); + } + if (this.connectionState === HubConnectionState.Disconnecting) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Call to HttpConnection.stop(" + error + ") ignored because the connection is already in the disconnecting state."); + return this.stopPromise; + } + this.connectionState = HubConnectionState.Disconnecting; this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Stopping HubConnection."); + if (this.reconnectDelayHandle) { + // We're in a reconnect delay which means the underlying connection is currently already stopped. + // Just clear the handle to stop the reconnect loop (which no one is waiting on thankfully) and + // fire the onclose callbacks. + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Connection stopped during reconnect delay. Done reconnecting."); + clearTimeout(this.reconnectDelayHandle); + this.reconnectDelayHandle = undefined; + this.completeClose(); + return Promise.resolve(); + } this.cleanupTimeout(); this.cleanupPingTimer(); - return this.connection.stop(); + this.stopDuringStartError = error || new Error("The connection was stopped before the hub handshake could complete."); + // HttpConnection.stop() should not complete until after either HttpConnection.start() fails + // or the onclose callback is invoked. The onclose callback will transition the HubConnection + // to the disconnected state if need be before HttpConnection.stop() completes. + return this.connection.stop(error); }; /** Invokes a streaming hub method on the server using the specified name and arguments. * @@ -1427,13 +9430,17 @@ var HubConnection = /** @class */ (function () { for (var _i = 1; _i < arguments.length; _i++) { args[_i - 1] = arguments[_i]; } - var invocationDescriptor = this.createStreamInvocation(methodName, args); - var subject = new _Utils__WEBPACK_IMPORTED_MODULE_3__["Subject"](function () { + var _a = this.replaceStreamingParams(args), streams = _a[0], streamIds = _a[1]; + var invocationDescriptor = this.createStreamInvocation(methodName, args, streamIds); + var promiseQueue; + var subject = new _Subject__WEBPACK_IMPORTED_MODULE_3__["Subject"](); + subject.cancelCallback = function () { var cancelInvocation = _this.createCancelInvocation(invocationDescriptor.invocationId); - var cancelMessage = _this.protocol.writeMessage(cancelInvocation); delete _this.callbacks[invocationDescriptor.invocationId]; - return _this.sendMessage(cancelMessage); - }); + return promiseQueue.then(function () { + return _this.sendWithProtocol(cancelInvocation); + }); + }; this.callbacks[invocationDescriptor.invocationId] = function (invocationEvent, error) { if (error) { subject.error(error); @@ -1454,18 +9461,25 @@ var HubConnection = /** @class */ (function () { } } }; - var message = this.protocol.writeMessage(invocationDescriptor); - this.sendMessage(message) + promiseQueue = this.sendWithProtocol(invocationDescriptor) .catch(function (e) { subject.error(e); delete _this.callbacks[invocationDescriptor.invocationId]; }); + this.launchStreams(streams, promiseQueue); return subject; }; HubConnection.prototype.sendMessage = function (message) { this.resetKeepAliveInterval(); return this.connection.send(message); }; + /** + * Sends a js object to the server. + * @param message The js object to serialize and send. + */ + HubConnection.prototype.sendWithProtocol = function (message) { + return this.sendMessage(this.protocol.writeMessage(message)); + }; /** Invokes a hub method on the server using the specified name and arguments. Does not wait for a response from the receiver. * * The Promise returned by this method resolves when the client has sent the invocation to the server. The server may still @@ -1480,9 +9494,10 @@ var HubConnection = /** @class */ (function () { for (var _i = 1; _i < arguments.length; _i++) { args[_i - 1] = arguments[_i]; } - var invocationDescriptor = this.createInvocation(methodName, args, true); - var message = this.protocol.writeMessage(invocationDescriptor); - return this.sendMessage(message); + var _a = this.replaceStreamingParams(args), streams = _a[0], streamIds = _a[1]; + var sendPromise = this.sendWithProtocol(this.createInvocation(methodName, args, true, streamIds)); + this.launchStreams(streams, sendPromise); + return sendPromise; }; /** Invokes a hub method on the server using the specified name and arguments. * @@ -1501,7 +9516,8 @@ var HubConnection = /** @class */ (function () { for (var _i = 1; _i < arguments.length; _i++) { args[_i - 1] = arguments[_i]; } - var invocationDescriptor = this.createInvocation(methodName, args, false); + var _a = this.replaceStreamingParams(args), streams = _a[0], streamIds = _a[1]; + var invocationDescriptor = this.createInvocation(methodName, args, false, streamIds); var p = new Promise(function (resolve, reject) { // invocationId will always have a value for a non-blocking invocation _this.callbacks[invocationDescriptor.invocationId] = function (invocationEvent, error) { @@ -1524,13 +9540,13 @@ var HubConnection = /** @class */ (function () { } } }; - var message = _this.protocol.writeMessage(invocationDescriptor); - _this.sendMessage(message) + var promiseQueue = _this.sendWithProtocol(invocationDescriptor) .catch(function (e) { reject(e); // invocationId will always have a value for a non-blocking invocation delete _this.callbacks[invocationDescriptor.invocationId]; }); + _this.launchStreams(streams, promiseQueue); }); return p; }; @@ -1584,6 +9600,24 @@ var HubConnection = /** @class */ (function () { this.closedCallbacks.push(callback); } }; + /** Registers a handler that will be invoked when the connection starts reconnecting. + * + * @param {Function} callback The handler that will be invoked when the connection starts reconnecting. Optionally receives a single argument containing the error that caused the connection to start reconnecting (if any). + */ + HubConnection.prototype.onreconnecting = function (callback) { + if (callback) { + this.reconnectingCallbacks.push(callback); + } + }; + /** Registers a handler that will be invoked when the connection successfully reconnects. + * + * @param {Function} callback The handler that will be invoked when the connection successfully reconnects. + */ + HubConnection.prototype.onreconnected = function (callback) { + if (callback) { + this.reconnectedCallbacks.push(callback); + } + }; HubConnection.prototype.processIncomingData = function (data) { this.cleanupTimeout(); if (!this.receivedHandshakeResponse) { @@ -1603,7 +9637,7 @@ var HubConnection = /** @class */ (function () { case _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].StreamItem: case _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Completion: var callback = this.callbacks[message.invocationId]; - if (callback != null) { + if (callback) { if (message.type === _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Completion) { delete this.callbacks[message.invocationId]; } @@ -1616,8 +9650,7 @@ var HubConnection = /** @class */ (function () { case _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Close: this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "Close message received from server."); // We don't want to wait on the stop itself. - // tslint:disable-next-line:no-floating-promises - this.connection.stop(message.error ? new Error("Server returned an error on close: " + message.error) : undefined); + this.stopPromise = this.stopInternal(message.error ? new Error("Server returned an error on close: " + message.error) : undefined); break; default: this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Warning, "Invalid message type: " + message.type + "."); @@ -1638,20 +9671,15 @@ var HubConnection = /** @class */ (function () { var message = "Error parsing handshake response: " + e; this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, message); var error = new Error(message); - // We don't want to wait on the stop itself. - // tslint:disable-next-line:no-floating-promises - this.connection.stop(error); this.handshakeRejecter(error); throw error; } if (responseMessage.error) { var message = "Server returned handshake error: " + responseMessage.error; this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, message); - this.handshakeRejecter(message); - // We don't want to wait on the stop itself. - // tslint:disable-next-line:no-floating-promises - this.connection.stop(new Error(message)); - throw new Error(message); + var error = new Error(message); + this.handshakeRejecter(error); + throw error; } else { this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Server handshake complete."); @@ -1695,7 +9723,7 @@ var HubConnection = /** @class */ (function () { }; HubConnection.prototype.serverTimeout = function () { // The server hasn't talked to us in a while. It doesn't like us anymore ... :( - // Terminate the connection, but we don't need to wait on the promise. + // Terminate the connection, but we don't need to wait on the promise. This could trigger reconnecting. // tslint:disable-next-line:no-floating-promises this.connection.stop(new Error("Server timeout elapsed without receiving a message from the server.")); }; @@ -1703,14 +9731,18 @@ var HubConnection = /** @class */ (function () { var _this = this; var methods = this.methods[invocationMessage.target.toLowerCase()]; if (methods) { - methods.forEach(function (m) { return m.apply(_this, invocationMessage.arguments); }); + try { + methods.forEach(function (m) { return m.apply(_this, invocationMessage.arguments); }); + } + catch (e) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, "A callback for the method " + invocationMessage.target.toLowerCase() + " threw error '" + e + "'."); + } if (invocationMessage.invocationId) { // This is not supported in v1. So we return an error to avoid blocking the server waiting for the response. var message = "Server requested a response, which is not supported in this version of the client."; this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, message); - // We don't need to wait on this Promise. - // tslint:disable-next-line:no-floating-promises - this.connection.stop(new Error(message)); + // We don't want to wait on the stop itself. + this.stopPromise = this.stopInternal(new Error(message)); } } else { @@ -1718,23 +9750,148 @@ var HubConnection = /** @class */ (function () { } }; HubConnection.prototype.connectionClosed = function (error) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "HubConnection.connectionClosed(" + error + ") called while in state " + this.connectionState + "."); + // Triggering this.handshakeRejecter is insufficient because it could already be resolved without the continuation having run yet. + this.stopDuringStartError = this.stopDuringStartError || error || new Error("The underlying connection was closed before the hub handshake could complete."); + // If the handshake is in progress, start will be waiting for the handshake promise, so we complete it. + // If it has already completed, this should just noop. + if (this.handshakeResolver) { + this.handshakeResolver(); + } + this.cancelCallbacksWithError(error || new Error("Invocation canceled due to the underlying connection being closed.")); + this.cleanupTimeout(); + this.cleanupPingTimer(); + if (this.connectionState === HubConnectionState.Disconnecting) { + this.completeClose(error); + } + else if (this.connectionState === HubConnectionState.Connected && this.reconnectPolicy) { + // tslint:disable-next-line:no-floating-promises + this.reconnect(error); + } + else if (this.connectionState === HubConnectionState.Connected) { + this.completeClose(error); + } + // If none of the above if conditions were true were called the HubConnection must be in either: + // 1. The Connecting state in which case the handshakeResolver will complete it and stopDuringStartError will fail it. + // 2. The Reconnecting state in which case the handshakeResolver will complete it and stopDuringStartError will fail the current reconnect attempt + // and potentially continue the reconnect() loop. + // 3. The Disconnected state in which case we're already done. + }; + HubConnection.prototype.completeClose = function (error) { var _this = this; + if (this.connectionStarted) { + this.connectionState = HubConnectionState.Disconnected; + this.connectionStarted = false; + try { + this.closedCallbacks.forEach(function (c) { return c.apply(_this, [error]); }); + } + catch (e) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, "An onclose callback called with error '" + error + "' threw error '" + e + "'."); + } + } + }; + HubConnection.prototype.reconnect = function (error) { + return __awaiter(this, void 0, void 0, function () { + var reconnectStartTime, previousReconnectAttempts, nextRetryDelay, e_4; + var _this = this; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + reconnectStartTime = Date.now(); + previousReconnectAttempts = 0; + nextRetryDelay = this.getNextRetryDelay(previousReconnectAttempts++, 0); + if (nextRetryDelay === null) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Connection not reconnecting because the IReconnectPolicy returned null on the first reconnect attempt."); + this.completeClose(error); + return [2 /*return*/]; + } + this.connectionState = HubConnectionState.Reconnecting; + if (error) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "Connection reconnecting because of error '" + error + "'."); + } + else { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "Connection reconnecting."); + } + if (this.onreconnecting) { + try { + this.reconnectingCallbacks.forEach(function (c) { return c.apply(_this, [error]); }); + } + catch (e) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, "An onreconnecting callback called with error '" + error + "' threw error '" + e + "'."); + } + // Exit early if an onreconnecting callback called connection.stop(). + if (this.connectionState !== HubConnectionState.Reconnecting) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Connection left the reconnecting state in onreconnecting callback. Done reconnecting."); + return [2 /*return*/]; + } + } + _a.label = 1; + case 1: + if (!(nextRetryDelay !== null)) return [3 /*break*/, 7]; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "Reconnect attempt number " + previousReconnectAttempts + " will start in " + nextRetryDelay + " ms."); + return [4 /*yield*/, new Promise(function (resolve) { + _this.reconnectDelayHandle = setTimeout(resolve, nextRetryDelay); + })]; + case 2: + _a.sent(); + this.reconnectDelayHandle = undefined; + if (this.connectionState !== HubConnectionState.Reconnecting) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Connection left the reconnecting state during reconnect delay. Done reconnecting."); + return [2 /*return*/]; + } + _a.label = 3; + case 3: + _a.trys.push([3, 5, , 6]); + return [4 /*yield*/, this.startInternal()]; + case 4: + _a.sent(); + this.connectionState = HubConnectionState.Connected; + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "HubConnection reconnected successfully."); + if (this.onreconnected) { + try { + this.reconnectedCallbacks.forEach(function (c) { return c.apply(_this, [_this.connection.connectionId]); }); + } + catch (e) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, "An onreconnected callback called with connectionId '" + this.connection.connectionId + "; threw error '" + e + "'."); + } + } + return [2 /*return*/]; + case 5: + e_4 = _a.sent(); + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "Reconnect attempt failed because of error '" + e_4 + "'."); + if (this.connectionState !== HubConnectionState.Reconnecting) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Debug, "Connection left the reconnecting state during reconnect attempt. Done reconnecting."); + return [2 /*return*/]; + } + return [3 /*break*/, 6]; + case 6: + nextRetryDelay = this.getNextRetryDelay(previousReconnectAttempts++, Date.now() - reconnectStartTime); + return [3 /*break*/, 1]; + case 7: + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Information, "Reconnect retries have been exhausted after " + (Date.now() - reconnectStartTime) + " ms and " + previousReconnectAttempts + " failed attempts. Connection disconnecting."); + this.completeClose(); + return [2 /*return*/]; + } + }); + }); + }; + HubConnection.prototype.getNextRetryDelay = function (previousRetryCount, elapsedMilliseconds) { + try { + return this.reconnectPolicy.nextRetryDelayInMilliseconds(previousRetryCount, elapsedMilliseconds); + } + catch (e) { + this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Error, "IReconnectPolicy.nextRetryDelayInMilliseconds(" + previousRetryCount + ", " + elapsedMilliseconds + ") threw error '" + e + "'."); + return null; + } + }; + HubConnection.prototype.cancelCallbacksWithError = function (error) { var callbacks = this.callbacks; this.callbacks = {}; - this.connectionState = HubConnectionState.Disconnected; - // if handshake is in progress start will be waiting for the handshake promise, so we complete it - // if it has already completed this should just noop - if (this.handshakeRejecter) { - this.handshakeRejecter(error); - } Object.keys(callbacks) .forEach(function (key) { var callback = callbacks[key]; - callback(null, error ? error : new Error("Invocation canceled due to connection being closed.")); + callback(null, error); }); - this.cleanupTimeout(); - this.cleanupPingTimer(); - this.closedCallbacks.forEach(function (c) { return c.apply(_this, [error]); }); }; HubConnection.prototype.cleanupPingTimer = function () { if (this.pingServerHandle) { @@ -1746,31 +9903,93 @@ var HubConnection = /** @class */ (function () { clearTimeout(this.timeoutHandle); } }; - HubConnection.prototype.createInvocation = function (methodName, args, nonblocking) { + HubConnection.prototype.createInvocation = function (methodName, args, nonblocking, streamIds) { if (nonblocking) { return { arguments: args, + streamIds: streamIds, target: methodName, type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Invocation, }; } else { - var id = this.id; - this.id++; + var invocationId = this.invocationId; + this.invocationId++; return { arguments: args, - invocationId: id.toString(), + invocationId: invocationId.toString(), + streamIds: streamIds, target: methodName, type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Invocation, }; } }; - HubConnection.prototype.createStreamInvocation = function (methodName, args) { - var id = this.id; - this.id++; + HubConnection.prototype.launchStreams = function (streams, promiseQueue) { + var _this = this; + if (streams.length === 0) { + return; + } + // Synchronize stream data so they arrive in-order on the server + if (!promiseQueue) { + promiseQueue = Promise.resolve(); + } + var _loop_1 = function (streamId) { + streams[streamId].subscribe({ + complete: function () { + promiseQueue = promiseQueue.then(function () { return _this.sendWithProtocol(_this.createCompletionMessage(streamId)); }); + }, + error: function (err) { + var message; + if (err instanceof Error) { + message = err.message; + } + else if (err && err.toString) { + message = err.toString(); + } + else { + message = "Unknown error"; + } + promiseQueue = promiseQueue.then(function () { return _this.sendWithProtocol(_this.createCompletionMessage(streamId, message)); }); + }, + next: function (item) { + promiseQueue = promiseQueue.then(function () { return _this.sendWithProtocol(_this.createStreamItemMessage(streamId, item)); }); + }, + }); + }; + // We want to iterate over the keys, since the keys are the stream ids + // tslint:disable-next-line:forin + for (var streamId in streams) { + _loop_1(streamId); + } + }; + HubConnection.prototype.replaceStreamingParams = function (args) { + var streams = []; + var streamIds = []; + for (var i = 0; i < args.length; i++) { + var argument = args[i]; + if (this.isObservable(argument)) { + var streamId = this.invocationId; + this.invocationId++; + // Store the stream for later use + streams[streamId] = argument; + streamIds.push(streamId.toString()); + // remove stream from args + args.splice(i, 1); + } + } + return [streams, streamIds]; + }; + HubConnection.prototype.isObservable = function (arg) { + // This allows other stream implementations to just work (like rxjs) + return arg && arg.subscribe && typeof arg.subscribe === "function"; + }; + HubConnection.prototype.createStreamInvocation = function (methodName, args, streamIds) { + var invocationId = this.invocationId; + this.invocationId++; return { arguments: args, - invocationId: id.toString(), + invocationId: invocationId.toString(), + streamIds: streamIds, target: methodName, type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].StreamInvocation, }; @@ -1781,6 +10000,27 @@ var HubConnection = /** @class */ (function () { type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].CancelInvocation, }; }; + HubConnection.prototype.createStreamItemMessage = function (id, item) { + return { + invocationId: id, + item: item, + type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].StreamItem, + }; + }; + HubConnection.prototype.createCompletionMessage = function (id, error, result) { + if (error) { + return { + error: error, + invocationId: id, + type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Completion, + }; + } + return { + invocationId: id, + result: result, + type: _IHubProtocol__WEBPACK_IMPORTED_MODULE_1__["MessageType"].Completion, + }; + }; return HubConnection; }()); @@ -1798,44 +10038,82 @@ var HubConnection = /** @class */ (function () { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HubConnectionBuilder", function() { return HubConnectionBuilder; }); -/* harmony import */ var _HttpConnection__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./HttpConnection */ "../node_modules/@aspnet/signalr/dist/esm/HttpConnection.js"); -/* harmony import */ var _HubConnection__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./HubConnection */ "../node_modules/@aspnet/signalr/dist/esm/HubConnection.js"); -/* harmony import */ var _JsonHubProtocol__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./JsonHubProtocol */ "../node_modules/@aspnet/signalr/dist/esm/JsonHubProtocol.js"); -/* harmony import */ var _Loggers__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./Loggers */ "../node_modules/@aspnet/signalr/dist/esm/Loggers.js"); -/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./Utils */ "../node_modules/@aspnet/signalr/dist/esm/Utils.js"); +/* harmony import */ var _DefaultReconnectPolicy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./DefaultReconnectPolicy */ "../node_modules/@aspnet/signalr/dist/esm/DefaultReconnectPolicy.js"); +/* harmony import */ var _HttpConnection__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./HttpConnection */ "../node_modules/@aspnet/signalr/dist/esm/HttpConnection.js"); +/* harmony import */ var _HubConnection__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./HubConnection */ "../node_modules/@aspnet/signalr/dist/esm/HubConnection.js"); +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./ILogger */ "../node_modules/@aspnet/signalr/dist/esm/ILogger.js"); +/* harmony import */ var _JsonHubProtocol__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./JsonHubProtocol */ "../node_modules/@aspnet/signalr/dist/esm/JsonHubProtocol.js"); +/* harmony import */ var _Loggers__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./Loggers */ "../node_modules/@aspnet/signalr/dist/esm/Loggers.js"); +/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./Utils */ "../node_modules/@aspnet/signalr/dist/esm/Utils.js"); // 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. +var __assign = (undefined && undefined.__assign) || Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; +}; + + +// tslint:disable:object-literal-sort-keys +var LogLevelNameMapping = { + trace: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Trace, + debug: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Debug, + info: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Information, + information: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Information, + warn: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Warning, + warning: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Warning, + error: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Error, + critical: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].Critical, + none: _ILogger__WEBPACK_IMPORTED_MODULE_3__["LogLevel"].None, +}; +function parseLogLevel(name) { + // Case-insensitive matching via lower-casing + // Yes, I know case-folding is a complicated problem in Unicode, but we only support + // the ASCII strings defined in LogLevelNameMapping anyway, so it's fine -anurse. + var mapping = LogLevelNameMapping[name.toLowerCase()]; + if (typeof mapping !== "undefined") { + return mapping; + } + else { + throw new Error("Unknown log level: " + name); + } +} /** A builder for configuring {@link @aspnet/signalr.HubConnection} instances. */ var HubConnectionBuilder = /** @class */ (function () { function HubConnectionBuilder() { } HubConnectionBuilder.prototype.configureLogging = function (logging) { - _Utils__WEBPACK_IMPORTED_MODULE_4__["Arg"].isRequired(logging, "logging"); + _Utils__WEBPACK_IMPORTED_MODULE_6__["Arg"].isRequired(logging, "logging"); if (isLogger(logging)) { this.logger = logging; } + else if (typeof logging === "string") { + var logLevel = parseLogLevel(logging); + this.logger = new _Utils__WEBPACK_IMPORTED_MODULE_6__["ConsoleLogger"](logLevel); + } else { - this.logger = new _Utils__WEBPACK_IMPORTED_MODULE_4__["ConsoleLogger"](logging); + this.logger = new _Utils__WEBPACK_IMPORTED_MODULE_6__["ConsoleLogger"](logging); } return this; }; HubConnectionBuilder.prototype.withUrl = function (url, transportTypeOrOptions) { - _Utils__WEBPACK_IMPORTED_MODULE_4__["Arg"].isRequired(url, "url"); + _Utils__WEBPACK_IMPORTED_MODULE_6__["Arg"].isRequired(url, "url"); this.url = url; // Flow-typing knows where it's at. Since HttpTransportType is a number and IHttpConnectionOptions is guaranteed // to be an object, we know (as does TypeScript) this comparison is all we need to figure out which overload was called. if (typeof transportTypeOrOptions === "object") { - this.httpConnectionOptions = transportTypeOrOptions; + this.httpConnectionOptions = __assign({}, this.httpConnectionOptions, transportTypeOrOptions); } else { - this.httpConnectionOptions = { - transport: transportTypeOrOptions, - }; + this.httpConnectionOptions = __assign({}, this.httpConnectionOptions, { transport: transportTypeOrOptions }); } return this; }; @@ -1844,10 +10122,25 @@ var HubConnectionBuilder = /** @class */ (function () { * @param {IHubProtocol} protocol The {@link @aspnet/signalr.IHubProtocol} implementation to use. */ HubConnectionBuilder.prototype.withHubProtocol = function (protocol) { - _Utils__WEBPACK_IMPORTED_MODULE_4__["Arg"].isRequired(protocol, "protocol"); + _Utils__WEBPACK_IMPORTED_MODULE_6__["Arg"].isRequired(protocol, "protocol"); this.protocol = protocol; return this; }; + HubConnectionBuilder.prototype.withAutomaticReconnect = function (retryDelaysOrReconnectPolicy) { + if (this.reconnectPolicy) { + throw new Error("A reconnectPolicy has already been set."); + } + if (!retryDelaysOrReconnectPolicy) { + this.reconnectPolicy = new _DefaultReconnectPolicy__WEBPACK_IMPORTED_MODULE_0__["DefaultReconnectPolicy"](); + } + else if (Array.isArray(retryDelaysOrReconnectPolicy)) { + this.reconnectPolicy = new _DefaultReconnectPolicy__WEBPACK_IMPORTED_MODULE_0__["DefaultReconnectPolicy"](retryDelaysOrReconnectPolicy); + } + else { + this.reconnectPolicy = retryDelaysOrReconnectPolicy; + } + return this; + }; /** Creates a {@link @aspnet/signalr.HubConnection} from the configuration options specified in this builder. * * @returns {HubConnection} The configured {@link @aspnet/signalr.HubConnection}. @@ -1865,8 +10158,8 @@ var HubConnectionBuilder = /** @class */ (function () { if (!this.url) { throw new Error("The 'HubConnectionBuilder.withUrl' method must be called before building the connection."); } - var connection = new _HttpConnection__WEBPACK_IMPORTED_MODULE_0__["HttpConnection"](this.url, httpConnectionOptions); - return _HubConnection__WEBPACK_IMPORTED_MODULE_1__["HubConnection"].create(connection, this.logger || _Loggers__WEBPACK_IMPORTED_MODULE_3__["NullLogger"].instance, this.protocol || new _JsonHubProtocol__WEBPACK_IMPORTED_MODULE_2__["JsonHubProtocol"]()); + var connection = new _HttpConnection__WEBPACK_IMPORTED_MODULE_1__["HttpConnection"](this.url, httpConnectionOptions); + return _HubConnection__WEBPACK_IMPORTED_MODULE_2__["HubConnection"].create(connection, this.logger || _Loggers__WEBPACK_IMPORTED_MODULE_5__["NullLogger"].instance, this.protocol || new _JsonHubProtocol__WEBPACK_IMPORTED_MODULE_4__["JsonHubProtocol"](), this.reconnectPolicy); }; return HubConnectionBuilder; }()); @@ -2442,6 +10735,121 @@ var LongPollingTransport = /** @class */ (function () { /***/ }), +/***/ "../node_modules/@aspnet/signalr/dist/esm/NodeHttpClient.js": +/*!******************************************************************!*\ + !*** ../node_modules/@aspnet/signalr/dist/esm/NodeHttpClient.js ***! + \******************************************************************/ +/*! exports provided: NodeHttpClient */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* WEBPACK VAR INJECTION */(function(Buffer) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NodeHttpClient", function() { return NodeHttpClient; }); +/* harmony import */ var _Errors__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Errors */ "../node_modules/@aspnet/signalr/dist/esm/Errors.js"); +/* harmony import */ var _HttpClient__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./HttpClient */ "../node_modules/@aspnet/signalr/dist/esm/HttpClient.js"); +/* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./ILogger */ "../node_modules/@aspnet/signalr/dist/esm/ILogger.js"); +/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./Utils */ "../node_modules/@aspnet/signalr/dist/esm/Utils.js"); +// 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. +var __extends = (undefined && undefined.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +var __assign = (undefined && undefined.__assign) || Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; +}; + + + + +var requestModule; +if (typeof XMLHttpRequest === "undefined") { + // In order to ignore the dynamic require in webpack builds we need to do this magic + // @ts-ignore: TS doesn't know about these names + var requireFunc = true ? require : undefined; + requestModule = requireFunc("request"); +} +var NodeHttpClient = /** @class */ (function (_super) { + __extends(NodeHttpClient, _super); + function NodeHttpClient(logger) { + var _this = _super.call(this) || this; + if (typeof requestModule === "undefined") { + throw new Error("The 'request' module could not be loaded."); + } + _this.logger = logger; + _this.cookieJar = requestModule.jar(); + _this.request = requestModule.defaults({ jar: _this.cookieJar }); + return _this; + } + NodeHttpClient.prototype.send = function (httpRequest) { + var _this = this; + return new Promise(function (resolve, reject) { + var requestBody; + if (Object(_Utils__WEBPACK_IMPORTED_MODULE_3__["isArrayBuffer"])(httpRequest.content)) { + requestBody = Buffer.from(httpRequest.content); + } + else { + requestBody = httpRequest.content || ""; + } + var currentRequest = _this.request(httpRequest.url, { + body: requestBody, + // If binary is expected 'null' should be used, otherwise for text 'utf8' + encoding: httpRequest.responseType === "arraybuffer" ? null : "utf8", + headers: __assign({ + // Tell auth middleware to 401 instead of redirecting + "X-Requested-With": "XMLHttpRequest" }, httpRequest.headers), + method: httpRequest.method, + timeout: httpRequest.timeout, + }, function (error, response, body) { + if (httpRequest.abortSignal) { + httpRequest.abortSignal.onabort = null; + } + if (error) { + if (error.code === "ETIMEDOUT") { + _this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Warning, "Timeout from HTTP request."); + reject(new _Errors__WEBPACK_IMPORTED_MODULE_0__["TimeoutError"]()); + } + _this.logger.log(_ILogger__WEBPACK_IMPORTED_MODULE_2__["LogLevel"].Warning, "Error from HTTP request. " + error); + reject(error); + return; + } + if (response.statusCode >= 200 && response.statusCode < 300) { + resolve(new _HttpClient__WEBPACK_IMPORTED_MODULE_1__["HttpResponse"](response.statusCode, response.statusMessage || "", body)); + } + else { + reject(new _Errors__WEBPACK_IMPORTED_MODULE_0__["HttpError"](response.statusMessage || "", response.statusCode || 0)); + } + }); + if (httpRequest.abortSignal) { + httpRequest.abortSignal.onabort = function () { + currentRequest.abort(); + reject(new _Errors__WEBPACK_IMPORTED_MODULE_0__["AbortError"]()); + }; + } + }); + }; + NodeHttpClient.prototype.getCookieString = function (url) { + return this.cookieJar.getCookieString(url); + }; + return NodeHttpClient; +}(_HttpClient__WEBPACK_IMPORTED_MODULE_1__["HttpClient"])); + +//# sourceMappingURL=NodeHttpClient.js.map +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../../../buffer/index.js */ "../node_modules/buffer/index.js").Buffer)) + +/***/ }), + /***/ "../node_modules/@aspnet/signalr/dist/esm/ServerSentEventsTransport.js": /*!*****************************************************************************!*\ !*** ../node_modules/@aspnet/signalr/dist/esm/ServerSentEventsTransport.js ***! @@ -2534,7 +10942,7 @@ var ServerSentEventsTransport = /** @class */ (function () { return; } var eventSource; - if (typeof window !== "undefined") { + if (_Utils__WEBPACK_IMPORTED_MODULE_2__["Platform"].isBrowser || _Utils__WEBPACK_IMPORTED_MODULE_2__["Platform"].isWebWorker) { eventSource = new _this.eventSourceConstructor(url, { withCredentials: true }); } else { @@ -2610,6 +11018,58 @@ var ServerSentEventsTransport = /** @class */ (function () { /***/ }), +/***/ "../node_modules/@aspnet/signalr/dist/esm/Subject.js": +/*!***********************************************************!*\ + !*** ../node_modules/@aspnet/signalr/dist/esm/Subject.js ***! + \***********************************************************/ +/*! exports provided: Subject */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return Subject; }); +/* harmony import */ var _Utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Utils */ "../node_modules/@aspnet/signalr/dist/esm/Utils.js"); +// 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. + +/** Stream implementation to stream items to the server. */ +var Subject = /** @class */ (function () { + function Subject() { + this.observers = []; + } + Subject.prototype.next = function (item) { + for (var _i = 0, _a = this.observers; _i < _a.length; _i++) { + var observer = _a[_i]; + observer.next(item); + } + }; + Subject.prototype.error = function (err) { + for (var _i = 0, _a = this.observers; _i < _a.length; _i++) { + var observer = _a[_i]; + if (observer.error) { + observer.error(err); + } + } + }; + Subject.prototype.complete = function () { + for (var _i = 0, _a = this.observers; _i < _a.length; _i++) { + var observer = _a[_i]; + if (observer.complete) { + observer.complete(); + } + } + }; + Subject.prototype.subscribe = function (observer) { + this.observers.push(observer); + return new _Utils__WEBPACK_IMPORTED_MODULE_0__["SubjectSubscription"](this, observer); + }; + return Subject; +}()); + +//# sourceMappingURL=Subject.js.map + +/***/ }), + /***/ "../node_modules/@aspnet/signalr/dist/esm/TextMessageFormat.js": /*!*********************************************************************!*\ !*** ../node_modules/@aspnet/signalr/dist/esm/TextMessageFormat.js ***! @@ -2651,18 +11111,18 @@ var TextMessageFormat = /** @class */ (function () { /*!*********************************************************!*\ !*** ../node_modules/@aspnet/signalr/dist/esm/Utils.js ***! \*********************************************************/ -/*! exports provided: Arg, getDataDetail, formatArrayBuffer, isArrayBuffer, sendMessage, createLogger, Subject, SubjectSubscription, ConsoleLogger */ +/*! exports provided: Arg, Platform, getDataDetail, formatArrayBuffer, isArrayBuffer, sendMessage, createLogger, SubjectSubscription, ConsoleLogger */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Arg", function() { return Arg; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Platform", function() { return Platform; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getDataDetail", function() { return getDataDetail; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "formatArrayBuffer", function() { return formatArrayBuffer; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isArrayBuffer", function() { return isArrayBuffer; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sendMessage", function() { return sendMessage; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "createLogger", function() { return createLogger; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return Subject; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SubjectSubscription", function() { return SubjectSubscription; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ConsoleLogger", function() { return ConsoleLogger; }); /* harmony import */ var _ILogger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./ILogger */ "../node_modules/@aspnet/signalr/dist/esm/ILogger.js"); @@ -2724,6 +11184,34 @@ var Arg = /** @class */ (function () { return Arg; }()); +/** @private */ +var Platform = /** @class */ (function () { + function Platform() { + } + Object.defineProperty(Platform, "isBrowser", { + get: function () { + return typeof window === "object"; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Platform, "isWebWorker", { + get: function () { + return typeof self === "object" && "importScripts" in self; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Platform, "isNode", { + get: function () { + return !this.isBrowser && !this.isWebWorker; + }, + enumerable: true, + configurable: true + }); + return Platform; +}()); + /** @private */ function getDataDetail(data, includeContent) { var detail = ""; @@ -2807,41 +11295,6 @@ function createLogger(logger) { } return new ConsoleLogger(logger); } -/** @private */ -var Subject = /** @class */ (function () { - function Subject(cancelCallback) { - this.observers = []; - this.cancelCallback = cancelCallback; - } - Subject.prototype.next = function (item) { - for (var _i = 0, _a = this.observers; _i < _a.length; _i++) { - var observer = _a[_i]; - observer.next(item); - } - }; - Subject.prototype.error = function (err) { - for (var _i = 0, _a = this.observers; _i < _a.length; _i++) { - var observer = _a[_i]; - if (observer.error) { - observer.error(err); - } - } - }; - Subject.prototype.complete = function () { - for (var _i = 0, _a = this.observers; _i < _a.length; _i++) { - var observer = _a[_i]; - if (observer.complete) { - observer.complete(); - } - } - }; - Subject.prototype.subscribe = function (observer) { - this.observers.push(observer); - return new SubjectSubscription(this, observer); - }; - return Subject; -}()); - /** @private */ var SubjectSubscription = /** @class */ (function () { function SubjectSubscription(subject, observer) { @@ -2853,7 +11306,7 @@ var SubjectSubscription = /** @class */ (function () { if (index > -1) { this.subject.observers.splice(index, 1); } - if (this.subject.observers.length === 0) { + if (this.subject.observers.length === 0 && this.subject.cancelCallback) { this.subject.cancelCallback().catch(function (_) { }); } }; @@ -2864,23 +11317,24 @@ var SubjectSubscription = /** @class */ (function () { var ConsoleLogger = /** @class */ (function () { function ConsoleLogger(minimumLogLevel) { this.minimumLogLevel = minimumLogLevel; + this.outputConsole = console; } ConsoleLogger.prototype.log = function (logLevel, message) { if (logLevel >= this.minimumLogLevel) { switch (logLevel) { case _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Critical: case _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Error: - console.error("[" + new Date().toISOString() + "] " + _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"][logLevel] + ": " + message); + this.outputConsole.error("[" + new Date().toISOString() + "] " + _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"][logLevel] + ": " + message); break; case _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Warning: - console.warn("[" + new Date().toISOString() + "] " + _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"][logLevel] + ": " + message); + this.outputConsole.warn("[" + new Date().toISOString() + "] " + _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"][logLevel] + ": " + message); break; case _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"].Information: - console.info("[" + new Date().toISOString() + "] " + _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"][logLevel] + ": " + message); + this.outputConsole.info("[" + new Date().toISOString() + "] " + _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"][logLevel] + ": " + message); break; default: // console.debug only goes to attached debuggers in Node, so we use console.log for Trace and Debug - console.log("[" + new Date().toISOString() + "] " + _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"][logLevel] + ": " + message); + this.outputConsole.log("[" + new Date().toISOString() + "] " + _ILogger__WEBPACK_IMPORTED_MODULE_0__["LogLevel"][logLevel] + ": " + message); break; } } @@ -2979,7 +11433,7 @@ var WebSocketTransport = /** @class */ (function () { url = url.replace(/^http/, "ws"); var webSocket; var cookies = _this.httpClient.getCookieString(url); - if (typeof window === "undefined" && cookies) { + if (_Utils__WEBPACK_IMPORTED_MODULE_2__["Platform"].isNode && cookies) { // Only pass cookies when in non-browser environments webSocket = new _this.webSocketConstructor(url, undefined, { headers: { @@ -3168,7 +11622,7 @@ var XhrHttpClient = /** @class */ (function (_super) { /*!*********************************************************!*\ !*** ../node_modules/@aspnet/signalr/dist/esm/index.js ***! \*********************************************************/ -/*! exports provided: VERSION, AbortError, HttpError, TimeoutError, HttpClient, HttpResponse, DefaultHttpClient, HubConnection, HubConnectionState, HubConnectionBuilder, MessageType, LogLevel, HttpTransportType, TransferFormat, NullLogger, JsonHubProtocol */ +/*! exports provided: VERSION, AbortError, HttpError, TimeoutError, HttpClient, HttpResponse, DefaultHttpClient, HubConnection, HubConnectionState, HubConnectionBuilder, MessageType, LogLevel, HttpTransportType, TransferFormat, NullLogger, JsonHubProtocol, Subject */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -3214,11 +11668,15 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _JsonHubProtocol__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./JsonHubProtocol */ "../node_modules/@aspnet/signalr/dist/esm/JsonHubProtocol.js"); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "JsonHubProtocol", function() { return _JsonHubProtocol__WEBPACK_IMPORTED_MODULE_9__["JsonHubProtocol"]; }); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./Subject */ "../node_modules/@aspnet/signalr/dist/esm/Subject.js"); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return _Subject__WEBPACK_IMPORTED_MODULE_10__["Subject"]; }); + // 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. // Version token that will be replaced by the prepack command /** The version of the SignalR client. */ -var VERSION = "1.1.2"; +var VERSION = "0.0.0-DEV_BUILD"; + @@ -3463,17 +11921,14 @@ var DotNet; promise.catch(function (error) { return console.error(error); }); }; DotNetObject.prototype.serializeAsArg = function () { - return "__dotNetObject:" + this._id; + return { __dotNetObject: this._id }; }; return DotNetObject; }()); - var dotNetObjectValueFormat = /^__dotNetObject\:(\d+)$/; + var dotNetObjectRefKey = '__dotNetObject'; attachReviver(function reviveDotNetObject(key, value) { - if (typeof value === 'string') { - var match = value.match(dotNetObjectValueFormat); - if (match) { - return new DotNetObject(parseInt(match[1])); - } + if (value && typeof value === 'object' && value.hasOwnProperty(dotNetObjectRefKey)) { + return new DotNetObject(value.__dotNetObject); } // Unrecognized - let another reviver handle it return value; @@ -4150,401 +12605,6 @@ function fromByteArray (uint8) { } -/***/ }), - -/***/ "../node_modules/bl/bl.js": -/*!********************************!*\ - !*** ../node_modules/bl/bl.js ***! - \********************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - -var DuplexStream = __webpack_require__(/*! readable-stream */ "../node_modules/readable-stream/readable-browser.js").Duplex - , util = __webpack_require__(/*! util */ "../node_modules/util/util.js") - , Buffer = __webpack_require__(/*! safe-buffer */ "../node_modules/safe-buffer/index.js").Buffer - -function BufferList (callback) { - if (!(this instanceof BufferList)) - return new BufferList(callback) - - this._bufs = [] - this.length = 0 - - if (typeof callback == 'function') { - this._callback = callback - - var piper = function piper (err) { - if (this._callback) { - this._callback(err) - this._callback = null - } - }.bind(this) - - this.on('pipe', function onPipe (src) { - src.on('error', piper) - }) - this.on('unpipe', function onUnpipe (src) { - src.removeListener('error', piper) - }) - } else { - this.append(callback) - } - - DuplexStream.call(this) -} - - -util.inherits(BufferList, DuplexStream) - - -BufferList.prototype._offset = function _offset (offset) { - var tot = 0, i = 0, _t - if (offset === 0) return [ 0, 0 ] - for (; i < this._bufs.length; i++) { - _t = tot + this._bufs[i].length - if (offset < _t || i == this._bufs.length - 1) { - return [ i, offset - tot ] - } - tot = _t - } -} - -BufferList.prototype._reverseOffset = function (blOffset) { - var bufferId = blOffset[0] - var offset = blOffset[1] - for (var i = 0; i < bufferId; i++) { - offset += this._bufs[i].length - } - return offset -} - -BufferList.prototype.append = function append (buf) { - var i = 0 - - if (Buffer.isBuffer(buf)) { - this._appendBuffer(buf) - } else if (Array.isArray(buf)) { - for (; i < buf.length; i++) - this.append(buf[i]) - } else if (buf instanceof BufferList) { - // unwrap argument into individual BufferLists - for (; i < buf._bufs.length; i++) - this.append(buf._bufs[i]) - } else if (buf != null) { - // coerce number arguments to strings, since Buffer(number) does - // uninitialized memory allocation - if (typeof buf == 'number') - buf = buf.toString() - - this._appendBuffer(Buffer.from(buf)) - } - - return this -} - - -BufferList.prototype._appendBuffer = function appendBuffer (buf) { - this._bufs.push(buf) - this.length += buf.length -} - - -BufferList.prototype._write = function _write (buf, encoding, callback) { - this._appendBuffer(buf) - - if (typeof callback == 'function') - callback() -} - - -BufferList.prototype._read = function _read (size) { - if (!this.length) - return this.push(null) - - size = Math.min(size, this.length) - this.push(this.slice(0, size)) - this.consume(size) -} - - -BufferList.prototype.end = function end (chunk) { - DuplexStream.prototype.end.call(this, chunk) - - if (this._callback) { - this._callback(null, this.slice()) - this._callback = null - } -} - - -BufferList.prototype.get = function get (index) { - if (index > this.length || index < 0) { - return undefined - } - var offset = this._offset(index) - return this._bufs[offset[0]][offset[1]] -} - - -BufferList.prototype.slice = function slice (start, end) { - if (typeof start == 'number' && start < 0) - start += this.length - if (typeof end == 'number' && end < 0) - end += this.length - return this.copy(null, 0, start, end) -} - - -BufferList.prototype.copy = function copy (dst, dstStart, srcStart, srcEnd) { - if (typeof srcStart != 'number' || srcStart < 0) - srcStart = 0 - if (typeof srcEnd != 'number' || srcEnd > this.length) - srcEnd = this.length - if (srcStart >= this.length) - return dst || Buffer.alloc(0) - if (srcEnd <= 0) - return dst || Buffer.alloc(0) - - var copy = !!dst - , off = this._offset(srcStart) - , len = srcEnd - srcStart - , bytes = len - , bufoff = (copy && dstStart) || 0 - , start = off[1] - , l - , i - - // copy/slice everything - if (srcStart === 0 && srcEnd == this.length) { - if (!copy) { // slice, but full concat if multiple buffers - return this._bufs.length === 1 - ? this._bufs[0] - : Buffer.concat(this._bufs, this.length) - } - - // copy, need to copy individual buffers - for (i = 0; i < this._bufs.length; i++) { - this._bufs[i].copy(dst, bufoff) - bufoff += this._bufs[i].length - } - - return dst - } - - // easy, cheap case where it's a subset of one of the buffers - if (bytes <= this._bufs[off[0]].length - start) { - return copy - ? this._bufs[off[0]].copy(dst, dstStart, start, start + bytes) - : this._bufs[off[0]].slice(start, start + bytes) - } - - if (!copy) // a slice, we need something to copy in to - dst = Buffer.allocUnsafe(len) - - for (i = off[0]; i < this._bufs.length; i++) { - l = this._bufs[i].length - start - - if (bytes > l) { - this._bufs[i].copy(dst, bufoff, start) - } else { - this._bufs[i].copy(dst, bufoff, start, start + bytes) - break - } - - bufoff += l - bytes -= l - - if (start) - start = 0 - } - - return dst -} - -BufferList.prototype.shallowSlice = function shallowSlice (start, end) { - start = start || 0 - end = typeof end !== 'number' ? this.length : end - - if (start < 0) - start += this.length - if (end < 0) - end += this.length - - if (start === end) { - return new BufferList() - } - var startOffset = this._offset(start) - , endOffset = this._offset(end) - , buffers = this._bufs.slice(startOffset[0], endOffset[0] + 1) - - if (endOffset[1] == 0) - buffers.pop() - else - buffers[buffers.length-1] = buffers[buffers.length-1].slice(0, endOffset[1]) - - if (startOffset[1] != 0) - buffers[0] = buffers[0].slice(startOffset[1]) - - return new BufferList(buffers) -} - -BufferList.prototype.toString = function toString (encoding, start, end) { - return this.slice(start, end).toString(encoding) -} - -BufferList.prototype.consume = function consume (bytes) { - while (this._bufs.length) { - if (bytes >= this._bufs[0].length) { - bytes -= this._bufs[0].length - this.length -= this._bufs[0].length - this._bufs.shift() - } else { - this._bufs[0] = this._bufs[0].slice(bytes) - this.length -= bytes - break - } - } - return this -} - - -BufferList.prototype.duplicate = function duplicate () { - var i = 0 - , copy = new BufferList() - - for (; i < this._bufs.length; i++) - copy.append(this._bufs[i]) - - return copy -} - - -BufferList.prototype.destroy = function destroy () { - this._bufs.length = 0 - this.length = 0 - this.push(null) -} - - -BufferList.prototype.indexOf = function (search, offset, encoding) { - if (encoding === undefined && typeof offset === 'string') { - encoding = offset - offset = undefined - } - if (typeof search === 'function' || Array.isArray(search)) { - throw new TypeError('The "value" argument must be one of type string, Buffer, BufferList, or Uint8Array.') - } else if (typeof search === 'number') { - search = Buffer.from([search]) - } else if (typeof search === 'string') { - search = Buffer.from(search, encoding) - } else if (search instanceof BufferList) { - search = search.slice() - } else if (!Buffer.isBuffer(search)) { - search = Buffer.from(search) - } - - offset = Number(offset || 0) - if (isNaN(offset)) { - offset = 0 - } - - if (offset < 0) { - offset = this.length + offset - } - - if (offset < 0) { - offset = 0 - } - - if (search.length === 0) { - return offset > this.length ? this.length : offset - } - - var blOffset = this._offset(offset) - var blIndex = blOffset[0] // index of which internal buffer we're working on - var buffOffset = blOffset[1] // offset of the internal buffer we're working on - - // scan over each buffer - for (blIndex; blIndex < this._bufs.length; blIndex++) { - var buff = this._bufs[blIndex] - while(buffOffset < buff.length) { - var availableWindow = buff.length - buffOffset - if (availableWindow >= search.length) { - var nativeSearchResult = buff.indexOf(search, buffOffset) - if (nativeSearchResult !== -1) { - return this._reverseOffset([blIndex, nativeSearchResult]) - } - buffOffset = buff.length - search.length + 1 // end of native search window - } else { - var revOffset = this._reverseOffset([blIndex, buffOffset]) - if (this._match(revOffset, search)) { - return revOffset - } - buffOffset++ - } - } - buffOffset = 0 - } - return -1 -} - -BufferList.prototype._match = function(offset, search) { - if (this.length - offset < search.length) { - return false - } - for (var searchOffset = 0; searchOffset < search.length ; searchOffset++) { - if(this.get(offset + searchOffset) !== search[searchOffset]){ - return false - } - } - return true -} - - -;(function () { - var methods = { - 'readDoubleBE' : 8 - , 'readDoubleLE' : 8 - , 'readFloatBE' : 4 - , 'readFloatLE' : 4 - , 'readInt32BE' : 4 - , 'readInt32LE' : 4 - , 'readUInt32BE' : 4 - , 'readUInt32LE' : 4 - , 'readInt16BE' : 2 - , 'readInt16LE' : 2 - , 'readUInt16BE' : 2 - , 'readUInt16LE' : 2 - , 'readInt8' : 1 - , 'readUInt8' : 1 - , 'readIntBE' : null - , 'readIntLE' : null - , 'readUIntBE' : null - , 'readUIntLE' : null - } - - for (var m in methods) { - (function (m) { - if (methods[m] === null) { - BufferList.prototype[m] = function (offset, byteLength) { - return this.slice(offset, offset + byteLength)[m](0, byteLength) - } - } - else { - BufferList.prototype[m] = function (offset) { - return this.slice(offset, offset + methods[m])[m](0) - } - } - }(m)) - } -}()) - - -module.exports = BufferList - - /***/ }), /***/ "../node_modules/buffer/index.js": @@ -6349,125 +14409,6 @@ function isnan (val) { /***/ }), -/***/ "../node_modules/core-util-is/lib/util.js": -/*!************************************************!*\ - !*** ../node_modules/core-util-is/lib/util.js ***! - \************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -/* WEBPACK VAR INJECTION */(function(Buffer) {// Copyright Joyent, Inc. and other Node contributors. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to permit -// persons to whom the Software is furnished to do so, subject to the -// following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -// USE OR OTHER DEALINGS IN THE SOFTWARE. - -// NOTE: These type checking functions intentionally don't use `instanceof` -// because it is fragile and can be easily faked with `Object.create()`. - -function isArray(arg) { - if (Array.isArray) { - return Array.isArray(arg); - } - return objectToString(arg) === '[object Array]'; -} -exports.isArray = isArray; - -function isBoolean(arg) { - return typeof arg === 'boolean'; -} -exports.isBoolean = isBoolean; - -function isNull(arg) { - return arg === null; -} -exports.isNull = isNull; - -function isNullOrUndefined(arg) { - return arg == null; -} -exports.isNullOrUndefined = isNullOrUndefined; - -function isNumber(arg) { - return typeof arg === 'number'; -} -exports.isNumber = isNumber; - -function isString(arg) { - return typeof arg === 'string'; -} -exports.isString = isString; - -function isSymbol(arg) { - return typeof arg === 'symbol'; -} -exports.isSymbol = isSymbol; - -function isUndefined(arg) { - return arg === void 0; -} -exports.isUndefined = isUndefined; - -function isRegExp(re) { - return objectToString(re) === '[object RegExp]'; -} -exports.isRegExp = isRegExp; - -function isObject(arg) { - return typeof arg === 'object' && arg !== null; -} -exports.isObject = isObject; - -function isDate(d) { - return objectToString(d) === '[object Date]'; -} -exports.isDate = isDate; - -function isError(e) { - return (objectToString(e) === '[object Error]' || e instanceof Error); -} -exports.isError = isError; - -function isFunction(arg) { - return typeof arg === 'function'; -} -exports.isFunction = isFunction; - -function isPrimitive(arg) { - return arg === null || - typeof arg === 'boolean' || - typeof arg === 'number' || - typeof arg === 'string' || - typeof arg === 'symbol' || // ES6 symbol - typeof arg === 'undefined'; -} -exports.isPrimitive = isPrimitive; - -exports.isBuffer = Buffer.isBuffer; - -function objectToString(o) { - return Object.prototype.toString.call(o); -} - -/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../buffer/index.js */ "../node_modules/buffer/index.js").Buffer)) - -/***/ }), - /***/ "../node_modules/events/events.js": /*!****************************************!*\ !*** ../node_modules/events/events.js ***! @@ -7071,1065 +15012,6 @@ module.exports = Array.isArray || function (arr) { }; -/***/ }), - -/***/ "../node_modules/msgpack5/index.js": -/*!*****************************************!*\ - !*** ../node_modules/msgpack5/index.js ***! - \*****************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var Buffer = __webpack_require__(/*! safe-buffer */ "../node_modules/safe-buffer/index.js").Buffer -var assert = __webpack_require__(/*! assert */ "../node_modules/assert/assert.js") -var bl = __webpack_require__(/*! bl */ "../node_modules/bl/bl.js") -var streams = __webpack_require__(/*! ./lib/streams */ "../node_modules/msgpack5/lib/streams.js") -var buildDecode = __webpack_require__(/*! ./lib/decoder */ "../node_modules/msgpack5/lib/decoder.js") -var buildEncode = __webpack_require__(/*! ./lib/encoder */ "../node_modules/msgpack5/lib/encoder.js") - -function msgpack (options) { - var encodingTypes = [] - var decodingTypes = [] - - options = options || { - forceFloat64: false, - compatibilityMode: false, - disableTimestampEncoding: false // if true, skips encoding Dates using the msgpack timestamp ext format (-1) - } - - function registerEncoder (check, encode) { - assert(check, 'must have an encode function') - assert(encode, 'must have an encode function') - - encodingTypes.push({ - check: check, encode: encode - }) - - return this - } - - function registerDecoder (type, decode) { - assert(type >= 0, 'must have a non-negative type') - assert(decode, 'must have a decode function') - - decodingTypes.push({ - type: type, decode: decode - }) - - return this - } - - function register (type, constructor, encode, decode) { - assert(constructor, 'must have a constructor') - assert(encode, 'must have an encode function') - assert(type >= 0, 'must have a non-negative type') - assert(decode, 'must have a decode function') - - function check (obj) { - return (obj instanceof constructor) - } - - function reEncode (obj) { - var buf = bl() - var header = Buffer.allocUnsafe(1) - - header.writeInt8(type, 0) - - buf.append(header) - buf.append(encode(obj)) - - return buf - } - - this.registerEncoder(check, reEncode) - this.registerDecoder(type, decode) - - return this - } - - return { - encode: buildEncode(encodingTypes, options.forceFloat64, options.compatibilityMode, options.disableTimestampEncoding), - decode: buildDecode(decodingTypes), - register: register, - registerEncoder: registerEncoder, - registerDecoder: registerDecoder, - encoder: streams.encoder, - decoder: streams.decoder, - // needed for levelup support - buffer: true, - type: 'msgpack5', - IncompleteBufferError: buildDecode.IncompleteBufferError - } -} - -module.exports = msgpack - - -/***/ }), - -/***/ "../node_modules/msgpack5/lib/decoder.js": -/*!***********************************************!*\ - !*** ../node_modules/msgpack5/lib/decoder.js ***! - \***********************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var bl = __webpack_require__(/*! bl */ "../node_modules/bl/bl.js") -var util = __webpack_require__(/*! util */ "../node_modules/util/util.js") - -function IncompleteBufferError (message) { - Error.call(this) // super constructor - if (Error.captureStackTrace) { - Error.captureStackTrace(this, this.constructor) // super helper method to include stack trace in error object - } - this.name = this.constructor.name - this.message = message || 'unable to decode' -} - -util.inherits(IncompleteBufferError, Error) - -module.exports = function buildDecode (decodingTypes) { - return decode - - function getSize (first) { - switch (first) { - case 0xc4: - return 2 - case 0xc5: - return 3 - case 0xc6: - return 5 - case 0xc7: - return 3 - case 0xc8: - return 4 - case 0xc9: - return 6 - case 0xca: - return 5 - case 0xcb: - return 9 - case 0xcc: - return 2 - case 0xcd: - return 3 - case 0xce: - return 5 - case 0xcf: - return 9 - case 0xd0: - return 2 - case 0xd1: - return 3 - case 0xd2: - return 5 - case 0xd3: - return 9 - case 0xd4: - return 3 - case 0xd5: - return 4 - case 0xd6: - return 6 - case 0xd7: - return 10 - case 0xd8: - return 18 - case 0xd9: - return 2 - case 0xda: - return 3 - case 0xdb: - return 5 - case 0xde: - return 3 - default: - return -1 - } - } - - function hasMinBufferSize (first, length) { - var size = getSize(first) - - if (size !== -1 && length < size) { - return false - } else { - return true - } - } - - function isValidDataSize (dataLength, bufLength, headerLength) { - return bufLength >= headerLength + dataLength - } - - function buildDecodeResult (value, bytesConsumed) { - return { - value: value, - bytesConsumed: bytesConsumed - } - } - - function decode (buf) { - if (!(buf instanceof bl)) { - buf = bl().append(buf) - } - - var result = tryDecode(buf) - if (result) { - buf.consume(result.bytesConsumed) - return result.value - } else { - throw new IncompleteBufferError() - } - } - - function tryDecode (buf, offset) { - offset = offset === undefined ? 0 : offset - var bufLength = buf.length - offset - if (bufLength <= 0) { - return null - } - - var first = buf.readUInt8(offset) - var length - var result = 0 - var type - var bytePos - - if (!hasMinBufferSize(first, bufLength)) { - return null - } - - switch (first) { - case 0xc0: - return buildDecodeResult(null, 1) - case 0xc2: - return buildDecodeResult(false, 1) - case 0xc3: - return buildDecodeResult(true, 1) - case 0xcc: - // 1-byte unsigned int - result = buf.readUInt8(offset + 1) - return buildDecodeResult(result, 2) - case 0xcd: - // 2-bytes BE unsigned int - result = buf.readUInt16BE(offset + 1) - return buildDecodeResult(result, 3) - case 0xce: - // 4-bytes BE unsigned int - result = buf.readUInt32BE(offset + 1) - return buildDecodeResult(result, 5) - case 0xcf: - // 8-bytes BE unsigned int - // Read long byte by byte, big-endian - for (bytePos = 7; bytePos >= 0; bytePos--) { - result += (buf.readUInt8(offset + bytePos + 1) * Math.pow(2, (8 * (7 - bytePos)))) - } - return buildDecodeResult(result, 9) - case 0xd0: - // 1-byte signed int - result = buf.readInt8(offset + 1) - return buildDecodeResult(result, 2) - case 0xd1: - // 2-bytes signed int - result = buf.readInt16BE(offset + 1) - return buildDecodeResult(result, 3) - case 0xd2: - // 4-bytes signed int - result = buf.readInt32BE(offset + 1) - return buildDecodeResult(result, 5) - case 0xd3: - result = readInt64BE(buf.slice(offset + 1, offset + 9), 0) - return buildDecodeResult(result, 9) - case 0xca: - // 4-bytes float - result = buf.readFloatBE(offset + 1) - return buildDecodeResult(result, 5) - case 0xcb: - // 8-bytes double - result = buf.readDoubleBE(offset + 1) - return buildDecodeResult(result, 9) - case 0xd9: - // strings up to 2^8 - 1 bytes - length = buf.readUInt8(offset + 1) - if (!isValidDataSize(length, bufLength, 2)) { - return null - } - result = buf.toString('utf8', offset + 2, offset + 2 + length) - return buildDecodeResult(result, 2 + length) - case 0xda: - // strings up to 2^16 - 2 bytes - length = buf.readUInt16BE(offset + 1) - if (!isValidDataSize(length, bufLength, 3)) { - return null - } - result = buf.toString('utf8', offset + 3, offset + 3 + length) - return buildDecodeResult(result, 3 + length) - case 0xdb: - // strings up to 2^32 - 4 bytes - length = buf.readUInt32BE(offset + 1) - if (!isValidDataSize(length, bufLength, 5)) { - return null - } - result = buf.toString('utf8', offset + 5, offset + 5 + length) - return buildDecodeResult(result, 5 + length) - case 0xc4: - // buffers up to 2^8 - 1 bytes - length = buf.readUInt8(offset + 1) - if (!isValidDataSize(length, bufLength, 2)) { - return null - } - result = buf.slice(offset + 2, offset + 2 + length) - return buildDecodeResult(result, 2 + length) - case 0xc5: - // buffers up to 2^16 - 1 bytes - length = buf.readUInt16BE(offset + 1) - if (!isValidDataSize(length, bufLength, 3)) { - return null - } - result = buf.slice(offset + 3, offset + 3 + length) - return buildDecodeResult(result, 3 + length) - case 0xc6: - // buffers up to 2^32 - 1 bytes - length = buf.readUInt32BE(offset + 1) - if (!isValidDataSize(length, bufLength, 5)) { - return null - } - result = buf.slice(offset + 5, offset + 5 + length) - return buildDecodeResult(result, 5 + length) - case 0xdc: - // array up to 2^16 elements - 2 bytes - if (bufLength < 3) { - return null - } - - length = buf.readUInt16BE(offset + 1) - return decodeArray(buf, offset, length, 3) - case 0xdd: - // array up to 2^32 elements - 4 bytes - if (bufLength < 5) { - return null - } - - length = buf.readUInt32BE(offset + 1) - return decodeArray(buf, offset, length, 5) - case 0xde: - // maps up to 2^16 elements - 2 bytes - length = buf.readUInt16BE(offset + 1) - return decodeMap(buf, offset, length, 3) - case 0xdf: - length = buf.readUInt32BE(offset + 1) - return decodeMap(buf, offset, length, 5) - case 0xd4: - return decodeFixExt(buf, offset, 1) - case 0xd5: - return decodeFixExt(buf, offset, 2) - case 0xd6: - return decodeFixExt(buf, offset, 4) - case 0xd7: - return decodeFixExt(buf, offset, 8) - case 0xd8: - return decodeFixExt(buf, offset, 16) - case 0xc7: - // ext up to 2^8 - 1 bytes - length = buf.readUInt8(offset + 1) - type = buf.readUInt8(offset + 2) - if (!isValidDataSize(length, bufLength, 3)) { - return null - } - return decodeExt(buf, offset, type, length, 3) - case 0xc8: - // ext up to 2^16 - 1 bytes - length = buf.readUInt16BE(offset + 1) - type = buf.readUInt8(offset + 3) - if (!isValidDataSize(length, bufLength, 4)) { - return null - } - return decodeExt(buf, offset, type, length, 4) - case 0xc9: - // ext up to 2^32 - 1 bytes - length = buf.readUInt32BE(offset + 1) - type = buf.readUInt8(offset + 5) - if (!isValidDataSize(length, bufLength, 6)) { - return null - } - return decodeExt(buf, offset, type, length, 6) - } - - if ((first & 0xf0) === 0x90) { - // we have an array with less than 15 elements - length = first & 0x0f - return decodeArray(buf, offset, length, 1) - } else if ((first & 0xf0) === 0x80) { - // we have a map with less than 15 elements - length = first & 0x0f - return decodeMap(buf, offset, length, 1) - } else if ((first & 0xe0) === 0xa0) { - // fixstr up to 31 bytes - length = first & 0x1f - if (isValidDataSize(length, bufLength, 1)) { - result = buf.toString('utf8', offset + 1, offset + length + 1) - return buildDecodeResult(result, length + 1) - } else { - return null - } - } else if (first >= 0xe0) { - // 5 bits negative ints - result = first - 0x100 - return buildDecodeResult(result, 1) - } else if (first < 0x80) { - // 7-bits positive ints - return buildDecodeResult(first, 1) - } else { - throw new Error('not implemented yet') - } - } - - function readInt64BE (buf, offset) { - var negate = (buf[offset] & 0x80) == 0x80 // eslint-disable-line - - if (negate) { - var carry = 1 - for (var i = offset + 7; i >= offset; i--) { - var v = (buf[i] ^ 0xff) + carry - buf[i] = v & 0xff - carry = v >> 8 - } - } - - var hi = buf.readUInt32BE(offset + 0) - var lo = buf.readUInt32BE(offset + 4) - return (hi * 4294967296 + lo) * (negate ? -1 : +1) - } - - function decodeArray (buf, offset, length, headerLength) { - var result = [] - var i - var totalBytesConsumed = 0 - - offset += headerLength - for (i = 0; i < length; i++) { - var decodeResult = tryDecode(buf, offset) - if (decodeResult) { - result.push(decodeResult.value) - offset += decodeResult.bytesConsumed - totalBytesConsumed += decodeResult.bytesConsumed - } else { - return null - } - } - return buildDecodeResult(result, headerLength + totalBytesConsumed) - } - - function decodeMap (buf, offset, length, headerLength) { - var result = {} - var key - var i - var totalBytesConsumed = 0 - - offset += headerLength - for (i = 0; i < length; i++) { - var keyResult = tryDecode(buf, offset) - if (keyResult) { - offset += keyResult.bytesConsumed - var valueResult = tryDecode(buf, offset) - if (valueResult) { - key = keyResult.value - result[key] = valueResult.value - offset += valueResult.bytesConsumed - totalBytesConsumed += (keyResult.bytesConsumed + valueResult.bytesConsumed) - } else { - return null - } - } else { - return null - } - } - return buildDecodeResult(result, headerLength + totalBytesConsumed) - } - - function decodeFixExt (buf, offset, size) { - var type = buf.readInt8(offset + 1) // Signed - return decodeExt(buf, offset, type, size, 2) - } - - function decodeTimestamp (buf, size, headerSize) { - var seconds - var nanoseconds = 0 - - switch (size) { - case 4: - // timestamp 32 stores the number of seconds that have elapsed since 1970-01-01 00:00:00 UTC in an 32-bit unsigned integer - seconds = buf.readUInt32BE(0) - break - - case 8: - // Timestamp 64 stores the number of seconds and nanoseconds that have elapsed - // since 1970-01-01 00:00:00 UTC in 32-bit unsigned integers, split 30/34 bits - var upper = buf.readUInt32BE(0) - var lower = buf.readUInt32BE(4) - nanoseconds = upper / 4 - seconds = ((upper & 0x03) * Math.pow(2, 32)) + lower // If we use bitwise operators, we get truncated to 32bits - break - - case 12: - throw new Error('timestamp 96 is not yet implemented') - } - - var millis = (seconds * 1000) + Math.round(nanoseconds / 1E6) - return buildDecodeResult(new Date(millis), size + headerSize) - } - - function decodeExt (buf, offset, type, size, headerSize) { - var i, - toDecode - - offset += headerSize - - // Pre-defined - if (type < 0) { // Reserved for future extensions - switch (type) { - case -1: // Tiemstamp https://github.com/msgpack/msgpack/blob/master/spec.md#timestamp-extension-type - toDecode = buf.slice(offset, offset + size) - return decodeTimestamp(toDecode, size, headerSize) - } - } - - for (i = 0; i < decodingTypes.length; i++) { - if (type === decodingTypes[i].type) { - toDecode = buf.slice(offset, offset + size) - var value = decodingTypes[i].decode(toDecode) - return buildDecodeResult(value, headerSize + size) - } - } - - throw new Error('unable to find ext type ' + type) - } -} - -module.exports.IncompleteBufferError = IncompleteBufferError - - -/***/ }), - -/***/ "../node_modules/msgpack5/lib/encoder.js": -/*!***********************************************!*\ - !*** ../node_modules/msgpack5/lib/encoder.js ***! - \***********************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var Buffer = __webpack_require__(/*! safe-buffer */ "../node_modules/safe-buffer/index.js").Buffer -var bl = __webpack_require__(/*! bl */ "../node_modules/bl/bl.js") - -module.exports = function buildEncode (encodingTypes, forceFloat64, compatibilityMode, disableTimestampEncoding) { - function encode (obj, avoidSlice) { - var buf - var len - - if (obj === undefined) { - throw new Error('undefined is not encodable in msgpack!') - } else if (isNaN(obj)) { - throw new Error('NaN is not encodable in msgpack!') - } else if (obj === null) { - buf = Buffer.allocUnsafe(1) - buf[0] = 0xc0 - } else if (obj === true) { - buf = Buffer.allocUnsafe(1) - buf[0] = 0xc3 - } else if (obj === false) { - buf = Buffer.allocUnsafe(1) - buf[0] = 0xc2 - } else if (typeof obj === 'string') { - len = Buffer.byteLength(obj) - if (len < 32) { - buf = Buffer.allocUnsafe(1 + len) - buf[0] = 0xa0 | len - if (len > 0) { - buf.write(obj, 1) - } - } else if (len <= 0xff && !compatibilityMode) { - // str8, but only when not in compatibility mode - buf = Buffer.allocUnsafe(2 + len) - buf[0] = 0xd9 - buf[1] = len - buf.write(obj, 2) - } else if (len <= 0xffff) { - buf = Buffer.allocUnsafe(3 + len) - buf[0] = 0xda - buf.writeUInt16BE(len, 1) - buf.write(obj, 3) - } else { - buf = Buffer.allocUnsafe(5 + len) - buf[0] = 0xdb - buf.writeUInt32BE(len, 1) - buf.write(obj, 5) - } - } else if (obj && (obj.readUInt32LE || obj instanceof Uint8Array)) { - if (obj instanceof Uint8Array) { - obj = Buffer.from(obj) - } - // weird hack to support Buffer - // and Buffer-like objects - if (obj.length <= 0xff) { - buf = Buffer.allocUnsafe(2) - buf[0] = 0xc4 - buf[1] = obj.length - } else if (obj.length <= 0xffff) { - buf = Buffer.allocUnsafe(3) - buf[0] = 0xc5 - buf.writeUInt16BE(obj.length, 1) - } else { - buf = Buffer.allocUnsafe(5) - buf[0] = 0xc6 - buf.writeUInt32BE(obj.length, 1) - } - - buf = bl([buf, obj]) - } else if (Array.isArray(obj)) { - if (obj.length < 16) { - buf = Buffer.allocUnsafe(1) - buf[0] = 0x90 | obj.length - } else if (obj.length < 65536) { - buf = Buffer.allocUnsafe(3) - buf[0] = 0xdc - buf.writeUInt16BE(obj.length, 1) - } else { - buf = Buffer.allocUnsafe(5) - buf[0] = 0xdd - buf.writeUInt32BE(obj.length, 1) - } - - buf = obj.reduce(function (acc, obj) { - acc.append(encode(obj, true)) - return acc - }, bl().append(buf)) - } else if (!disableTimestampEncoding && typeof obj.getDate === 'function') { - return encodeDate(obj) - } else if (typeof obj === 'object') { - buf = encodeExt(obj) || encodeObject(obj) - } else if (typeof obj === 'number') { - if (isFloat(obj)) { - return encodeFloat(obj, forceFloat64) - } else if (obj >= 0) { - if (obj < 128) { - buf = Buffer.allocUnsafe(1) - buf[0] = obj - } else if (obj < 256) { - buf = Buffer.allocUnsafe(2) - buf[0] = 0xcc - buf[1] = obj - } else if (obj < 65536) { - buf = Buffer.allocUnsafe(3) - buf[0] = 0xcd - buf.writeUInt16BE(obj, 1) - } else if (obj <= 0xffffffff) { - buf = Buffer.allocUnsafe(5) - buf[0] = 0xce - buf.writeUInt32BE(obj, 1) - } else if (obj <= 9007199254740991) { - buf = Buffer.allocUnsafe(9) - buf[0] = 0xcf - write64BitUint(buf, obj) - } else { - return encodeFloat(obj, true) - } - } else { - if (obj >= -32) { - buf = Buffer.allocUnsafe(1) - buf[0] = 0x100 + obj - } else if (obj >= -128) { - buf = Buffer.allocUnsafe(2) - buf[0] = 0xd0 - buf.writeInt8(obj, 1) - } else if (obj >= -32768) { - buf = Buffer.allocUnsafe(3) - buf[0] = 0xd1 - buf.writeInt16BE(obj, 1) - } else if (obj > -214748365) { - buf = Buffer.allocUnsafe(5) - buf[0] = 0xd2 - buf.writeInt32BE(obj, 1) - } else if (obj >= -9007199254740991) { - buf = Buffer.allocUnsafe(9) - buf[0] = 0xd3 - write64BitInt(buf, 1, obj) - } else { - return encodeFloat(obj, true) - } - } - } - - if (!buf) { - throw new Error('not implemented yet') - } - - if (avoidSlice) { - return buf - } else { - return buf.slice() - } - } - - function encodeDate (dt) { - var encoded - var millis = dt * 1 - var seconds = Math.floor(millis / 1000) - var nanos = (millis - (seconds * 1000)) * 1E6 - - if (nanos || seconds > 0xFFFFFFFF) { - // Timestamp64 - encoded = Buffer.allocUnsafe(10) - encoded[0] = 0xd7 - encoded[1] = -1 - - var upperNanos = ((nanos * 4)) - var upperSeconds = seconds / Math.pow(2, 32) - var upper = (upperNanos + upperSeconds) & 0xFFFFFFFF - var lower = seconds & 0xFFFFFFFF - - encoded.writeInt32BE(upper, 2) - encoded.writeInt32BE(lower, 6) - } else { - // Timestamp32 - encoded = Buffer.allocUnsafe(6) - encoded[0] = 0xd6 - encoded[1] = -1 - encoded.writeUInt32BE(Math.floor(millis / 1000), 2) - } - return bl().append(encoded) - } - - function encodeExt (obj) { - var i - var encoded - var length = -1 - var headers = [] - - for (i = 0; i < encodingTypes.length; i++) { - if (encodingTypes[i].check(obj)) { - encoded = encodingTypes[i].encode(obj) - break - } - } - - if (!encoded) { - return null - } - - // we subtract 1 because the length does not - // include the type - length = encoded.length - 1 - - if (length === 1) { - headers.push(0xd4) - } else if (length === 2) { - headers.push(0xd5) - } else if (length === 4) { - headers.push(0xd6) - } else if (length === 8) { - headers.push(0xd7) - } else if (length === 16) { - headers.push(0xd8) - } else if (length < 256) { - headers.push(0xc7) - headers.push(length) - } else if (length < 0x10000) { - headers.push(0xc8) - headers.push(length >> 8) - headers.push(length & 0x00ff) - } else { - headers.push(0xc9) - headers.push(length >> 24) - headers.push((length >> 16) & 0x000000ff) - headers.push((length >> 8) & 0x000000ff) - headers.push(length & 0x000000ff) - } - - return bl().append(Buffer.from(headers)).append(encoded) - } - - function encodeObject (obj) { - var acc = [] - var length = 0 - var key - var header - - for (key in obj) { - if (obj.hasOwnProperty(key) && - obj[key] !== undefined && - typeof obj[key] !== 'function') { - ++length - acc.push(encode(key, true)) - acc.push(encode(obj[key], true)) - } - } - - if (length < 16) { - header = Buffer.allocUnsafe(1) - header[0] = 0x80 | length - } else if (length < 0xFFFF) { - header = Buffer.allocUnsafe(3) - header[0] = 0xde - header.writeUInt16BE(length, 1) - } else { - header = Buffer.allocUnsafe(5) - header[0] = 0xdf - header.writeUInt32BE(length, 1) - } - - acc.unshift(header) - - var result = acc.reduce(function (list, buf) { - return list.append(buf) - }, bl()) - - return result - } - - return encode -} - -function write64BitUint (buf, obj) { - // Write long byte by byte, in big-endian order - for (var currByte = 7; currByte >= 0; currByte--) { - buf[currByte + 1] = (obj & 0xff) - obj = obj / 256 - } -} - -function write64BitInt (buf, offset, num) { - var negate = num < 0 - - if (negate) { - num = Math.abs(num) - } - - var lo = num % 4294967296 - var hi = num / 4294967296 - buf.writeUInt32BE(Math.floor(hi), offset + 0) - buf.writeUInt32BE(lo, offset + 4) - - if (negate) { - var carry = 1 - for (var i = offset + 7; i >= offset; i--) { - var v = (buf[i] ^ 0xff) + carry - buf[i] = v & 0xff - carry = v >> 8 - } - } -} - -function isFloat (n) { - return n % 1 !== 0 -} - -function isNaN (n) { - /* eslint-disable no-self-compare */ - return n !== n && typeof n === 'number' - /* eslint-enable no-self-compare */ -} - -function encodeFloat (obj, forceFloat64) { - var useDoublePrecision = true - - // If `fround` is supported, we can check if a float - // is double or single precision by rounding the object - // to single precision and comparing the difference. - // If it's not supported, it's safer to use a 64 bit - // float so we don't lose precision without meaning to. - if (Math.fround) { - useDoublePrecision = Math.fround(obj) !== obj - } - - if (forceFloat64) { - useDoublePrecision = true - } - - var buf - - if (useDoublePrecision) { - buf = Buffer.allocUnsafe(9) - buf[0] = 0xcb - buf.writeDoubleBE(obj, 1) - } else { - buf = Buffer.allocUnsafe(5) - buf[0] = 0xca - buf.writeFloatBE(obj, 1) - } - - return buf -} - - -/***/ }), - -/***/ "../node_modules/msgpack5/lib/streams.js": -/*!***********************************************!*\ - !*** ../node_modules/msgpack5/lib/streams.js ***! - \***********************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var Transform = __webpack_require__(/*! readable-stream */ "../node_modules/readable-stream/readable-browser.js").Transform -var inherits = __webpack_require__(/*! inherits */ "../node_modules/inherits/inherits_browser.js") -var bl = __webpack_require__(/*! bl */ "../node_modules/bl/bl.js") - -function Base (opts) { - opts = opts || {} - - opts.objectMode = true - opts.highWaterMark = 16 - - Transform.call(this, opts) - - this._msgpack = opts.msgpack -} - -inherits(Base, Transform) - -function Encoder (opts) { - if (!(this instanceof Encoder)) { - opts = opts || {} - opts.msgpack = this - return new Encoder(opts) - } - - Base.call(this, opts) - this._wrap = ('wrap' in opts) && opts.wrap -} - -inherits(Encoder, Base) - -Encoder.prototype._transform = function (obj, enc, done) { - var buf = null - - try { - buf = this._msgpack.encode(this._wrap ? obj.value : obj).slice(0) - } catch (err) { - this.emit('error', err) - return done() - } - - this.push(buf) - done() -} - -function Decoder (opts) { - if (!(this instanceof Decoder)) { - opts = opts || {} - opts.msgpack = this - return new Decoder(opts) - } - - Base.call(this, opts) - - this._chunks = bl() - this._wrap = ('wrap' in opts) && opts.wrap -} - -inherits(Decoder, Base) - -Decoder.prototype._transform = function (buf, enc, done) { - if (buf) { - this._chunks.append(buf) - } - - try { - var result = this._msgpack.decode(this._chunks) - if (this._wrap) { - result = {value: result} - } - this.push(result) - } catch (err) { - if (err instanceof this._msgpack.IncompleteBufferError) { - done() - } else { - this.emit('error', err) - } - return - } - - if (this._chunks.length > 0) { - this._transform(null, enc, done) - } else { - done() - } -} - -module.exports.decoder = Decoder -module.exports.encoder = Encoder - - -/***/ }), - -/***/ "../node_modules/process-nextick-args/index.js": -/*!*****************************************************!*\ - !*** ../node_modules/process-nextick-args/index.js ***! - \*****************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; -/* WEBPACK VAR INJECTION */(function(process) { - -if (!process.version || - process.version.indexOf('v0.') === 0 || - process.version.indexOf('v1.') === 0 && process.version.indexOf('v1.8.') !== 0) { - module.exports = { nextTick: nextTick }; -} else { - module.exports = process -} - -function nextTick(fn, arg1, arg2, arg3) { - if (typeof fn !== 'function') { - throw new TypeError('"callback" argument must be a function'); - } - var len = arguments.length; - var args, i; - switch (len) { - case 0: - case 1: - return process.nextTick(fn); - case 2: - return process.nextTick(function afterTickOne() { - fn.call(null, arg1); - }); - case 3: - return process.nextTick(function afterTickTwo() { - fn.call(null, arg1, arg2); - }); - case 4: - return process.nextTick(function afterTickThree() { - fn.call(null, arg1, arg2, arg3); - }); - default: - args = new Array(len - 1); - i = 0; - while (i < args.length) { - args[i++] = arguments[i]; - } - return process.nextTick(function afterTick() { - fn.apply(null, args); - }); - } -} - - -/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../process/browser.js */ "../node_modules/process/browser.js"))) - /***/ }), /***/ "../node_modules/process/browser.js": @@ -8325,2366 +15207,6 @@ process.chdir = function (dir) { process.umask = function() { return 0; }; -/***/ }), - -/***/ "../node_modules/readable-stream/lib/_stream_duplex.js": -/*!*************************************************************!*\ - !*** ../node_modules/readable-stream/lib/_stream_duplex.js ***! - \*************************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; -// Copyright Joyent, Inc. and other Node contributors. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to permit -// persons to whom the Software is furnished to do so, subject to the -// following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -// USE OR OTHER DEALINGS IN THE SOFTWARE. - -// a duplex stream is just a stream that is both readable and writable. -// Since JS doesn't have multiple prototypal inheritance, this class -// prototypally inherits from Readable, and then parasitically from -// Writable. - - - -/**/ - -var pna = __webpack_require__(/*! process-nextick-args */ "../node_modules/process-nextick-args/index.js"); -/**/ - -/**/ -var objectKeys = Object.keys || function (obj) { - var keys = []; - for (var key in obj) { - keys.push(key); - }return keys; -}; -/**/ - -module.exports = Duplex; - -/**/ -var util = __webpack_require__(/*! core-util-is */ "../node_modules/core-util-is/lib/util.js"); -util.inherits = __webpack_require__(/*! inherits */ "../node_modules/inherits/inherits_browser.js"); -/**/ - -var Readable = __webpack_require__(/*! ./_stream_readable */ "../node_modules/readable-stream/lib/_stream_readable.js"); -var Writable = __webpack_require__(/*! ./_stream_writable */ "../node_modules/readable-stream/lib/_stream_writable.js"); - -util.inherits(Duplex, Readable); - -{ - // avoid scope creep, the keys array can then be collected - var keys = objectKeys(Writable.prototype); - for (var v = 0; v < keys.length; v++) { - var method = keys[v]; - if (!Duplex.prototype[method]) Duplex.prototype[method] = Writable.prototype[method]; - } -} - -function Duplex(options) { - if (!(this instanceof Duplex)) return new Duplex(options); - - Readable.call(this, options); - Writable.call(this, options); - - if (options && options.readable === false) this.readable = false; - - if (options && options.writable === false) this.writable = false; - - this.allowHalfOpen = true; - if (options && options.allowHalfOpen === false) this.allowHalfOpen = false; - - this.once('end', onend); -} - -Object.defineProperty(Duplex.prototype, 'writableHighWaterMark', { - // making it explicit this property is not enumerable - // because otherwise some prototype manipulation in - // userland will fail - enumerable: false, - get: function () { - return this._writableState.highWaterMark; - } -}); - -// the no-half-open enforcer -function onend() { - // if we allow half-open state, or if the writable side ended, - // then we're ok. - if (this.allowHalfOpen || this._writableState.ended) return; - - // no more data can be written. - // But allow more writes to happen in this tick. - pna.nextTick(onEndNT, this); -} - -function onEndNT(self) { - self.end(); -} - -Object.defineProperty(Duplex.prototype, 'destroyed', { - get: function () { - if (this._readableState === undefined || this._writableState === undefined) { - return false; - } - return this._readableState.destroyed && this._writableState.destroyed; - }, - set: function (value) { - // we ignore the value if the stream - // has not been initialized yet - if (this._readableState === undefined || this._writableState === undefined) { - return; - } - - // backward compatibility, the user is explicitly - // managing destroyed - this._readableState.destroyed = value; - this._writableState.destroyed = value; - } -}); - -Duplex.prototype._destroy = function (err, cb) { - this.push(null); - this.end(); - - pna.nextTick(cb, err); -}; - -/***/ }), - -/***/ "../node_modules/readable-stream/lib/_stream_passthrough.js": -/*!******************************************************************!*\ - !*** ../node_modules/readable-stream/lib/_stream_passthrough.js ***! - \******************************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; -// Copyright Joyent, Inc. and other Node contributors. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to permit -// persons to whom the Software is furnished to do so, subject to the -// following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -// USE OR OTHER DEALINGS IN THE SOFTWARE. - -// a passthrough stream. -// basically just the most minimal sort of Transform stream. -// Every written chunk gets output as-is. - - - -module.exports = PassThrough; - -var Transform = __webpack_require__(/*! ./_stream_transform */ "../node_modules/readable-stream/lib/_stream_transform.js"); - -/**/ -var util = __webpack_require__(/*! core-util-is */ "../node_modules/core-util-is/lib/util.js"); -util.inherits = __webpack_require__(/*! inherits */ "../node_modules/inherits/inherits_browser.js"); -/**/ - -util.inherits(PassThrough, Transform); - -function PassThrough(options) { - if (!(this instanceof PassThrough)) return new PassThrough(options); - - Transform.call(this, options); -} - -PassThrough.prototype._transform = function (chunk, encoding, cb) { - cb(null, chunk); -}; - -/***/ }), - -/***/ "../node_modules/readable-stream/lib/_stream_readable.js": -/*!***************************************************************!*\ - !*** ../node_modules/readable-stream/lib/_stream_readable.js ***! - \***************************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; -/* WEBPACK VAR INJECTION */(function(global, process) {// Copyright Joyent, Inc. and other Node contributors. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to permit -// persons to whom the Software is furnished to do so, subject to the -// following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -// USE OR OTHER DEALINGS IN THE SOFTWARE. - - - -/**/ - -var pna = __webpack_require__(/*! process-nextick-args */ "../node_modules/process-nextick-args/index.js"); -/**/ - -module.exports = Readable; - -/**/ -var isArray = __webpack_require__(/*! isarray */ "../node_modules/isarray/index.js"); -/**/ - -/**/ -var Duplex; -/**/ - -Readable.ReadableState = ReadableState; - -/**/ -var EE = __webpack_require__(/*! events */ "../node_modules/events/events.js").EventEmitter; - -var EElistenerCount = function (emitter, type) { - return emitter.listeners(type).length; -}; -/**/ - -/**/ -var Stream = __webpack_require__(/*! ./internal/streams/stream */ "../node_modules/readable-stream/lib/internal/streams/stream-browser.js"); -/**/ - -/**/ - -var Buffer = __webpack_require__(/*! safe-buffer */ "../node_modules/safe-buffer/index.js").Buffer; -var OurUint8Array = global.Uint8Array || function () {}; -function _uint8ArrayToBuffer(chunk) { - return Buffer.from(chunk); -} -function _isUint8Array(obj) { - return Buffer.isBuffer(obj) || obj instanceof OurUint8Array; -} - -/**/ - -/**/ -var util = __webpack_require__(/*! core-util-is */ "../node_modules/core-util-is/lib/util.js"); -util.inherits = __webpack_require__(/*! inherits */ "../node_modules/inherits/inherits_browser.js"); -/**/ - -/**/ -var debugUtil = __webpack_require__(/*! util */ 0); -var debug = void 0; -if (debugUtil && debugUtil.debuglog) { - debug = debugUtil.debuglog('stream'); -} else { - debug = function () {}; -} -/**/ - -var BufferList = __webpack_require__(/*! ./internal/streams/BufferList */ "../node_modules/readable-stream/lib/internal/streams/BufferList.js"); -var destroyImpl = __webpack_require__(/*! ./internal/streams/destroy */ "../node_modules/readable-stream/lib/internal/streams/destroy.js"); -var StringDecoder; - -util.inherits(Readable, Stream); - -var kProxyEvents = ['error', 'close', 'destroy', 'pause', 'resume']; - -function prependListener(emitter, event, fn) { - // Sadly this is not cacheable as some libraries bundle their own - // event emitter implementation with them. - if (typeof emitter.prependListener === 'function') return emitter.prependListener(event, fn); - - // This is a hack to make sure that our error handler is attached before any - // userland ones. NEVER DO THIS. This is here only because this code needs - // to continue to work with older versions of Node.js that do not include - // the prependListener() method. The goal is to eventually remove this hack. - if (!emitter._events || !emitter._events[event]) emitter.on(event, fn);else if (isArray(emitter._events[event])) emitter._events[event].unshift(fn);else emitter._events[event] = [fn, emitter._events[event]]; -} - -function ReadableState(options, stream) { - Duplex = Duplex || __webpack_require__(/*! ./_stream_duplex */ "../node_modules/readable-stream/lib/_stream_duplex.js"); - - options = options || {}; - - // Duplex streams are both readable and writable, but share - // the same options object. - // However, some cases require setting options to different - // values for the readable and the writable sides of the duplex stream. - // These options can be provided separately as readableXXX and writableXXX. - var isDuplex = stream instanceof Duplex; - - // object stream flag. Used to make read(n) ignore n and to - // make all the buffer merging and length checks go away - this.objectMode = !!options.objectMode; - - if (isDuplex) this.objectMode = this.objectMode || !!options.readableObjectMode; - - // the point at which it stops calling _read() to fill the buffer - // Note: 0 is a valid value, means "don't call _read preemptively ever" - var hwm = options.highWaterMark; - var readableHwm = options.readableHighWaterMark; - var defaultHwm = this.objectMode ? 16 : 16 * 1024; - - if (hwm || hwm === 0) this.highWaterMark = hwm;else if (isDuplex && (readableHwm || readableHwm === 0)) this.highWaterMark = readableHwm;else this.highWaterMark = defaultHwm; - - // cast to ints. - this.highWaterMark = Math.floor(this.highWaterMark); - - // A linked list is used to store data chunks instead of an array because the - // linked list can remove elements from the beginning faster than - // array.shift() - this.buffer = new BufferList(); - this.length = 0; - this.pipes = null; - this.pipesCount = 0; - this.flowing = null; - this.ended = false; - this.endEmitted = false; - this.reading = false; - - // a flag to be able to tell if the event 'readable'/'data' is emitted - // immediately, or on a later tick. We set this to true at first, because - // any actions that shouldn't happen until "later" should generally also - // not happen before the first read call. - this.sync = true; - - // whenever we return null, then we set a flag to say - // that we're awaiting a 'readable' event emission. - this.needReadable = false; - this.emittedReadable = false; - this.readableListening = false; - this.resumeScheduled = false; - - // has it been destroyed - this.destroyed = false; - - // Crypto is kind of old and crusty. Historically, its default string - // encoding is 'binary' so we have to make this configurable. - // Everything else in the universe uses 'utf8', though. - this.defaultEncoding = options.defaultEncoding || 'utf8'; - - // the number of writers that are awaiting a drain event in .pipe()s - this.awaitDrain = 0; - - // if true, a maybeReadMore has been scheduled - this.readingMore = false; - - this.decoder = null; - this.encoding = null; - if (options.encoding) { - if (!StringDecoder) StringDecoder = __webpack_require__(/*! string_decoder/ */ "../node_modules/string_decoder/lib/string_decoder.js").StringDecoder; - this.decoder = new StringDecoder(options.encoding); - this.encoding = options.encoding; - } -} - -function Readable(options) { - Duplex = Duplex || __webpack_require__(/*! ./_stream_duplex */ "../node_modules/readable-stream/lib/_stream_duplex.js"); - - if (!(this instanceof Readable)) return new Readable(options); - - this._readableState = new ReadableState(options, this); - - // legacy - this.readable = true; - - if (options) { - if (typeof options.read === 'function') this._read = options.read; - - if (typeof options.destroy === 'function') this._destroy = options.destroy; - } - - Stream.call(this); -} - -Object.defineProperty(Readable.prototype, 'destroyed', { - get: function () { - if (this._readableState === undefined) { - return false; - } - return this._readableState.destroyed; - }, - set: function (value) { - // we ignore the value if the stream - // has not been initialized yet - if (!this._readableState) { - return; - } - - // backward compatibility, the user is explicitly - // managing destroyed - this._readableState.destroyed = value; - } -}); - -Readable.prototype.destroy = destroyImpl.destroy; -Readable.prototype._undestroy = destroyImpl.undestroy; -Readable.prototype._destroy = function (err, cb) { - this.push(null); - cb(err); -}; - -// Manually shove something into the read() buffer. -// This returns true if the highWaterMark has not been hit yet, -// similar to how Writable.write() returns true if you should -// write() some more. -Readable.prototype.push = function (chunk, encoding) { - var state = this._readableState; - var skipChunkCheck; - - if (!state.objectMode) { - if (typeof chunk === 'string') { - encoding = encoding || state.defaultEncoding; - if (encoding !== state.encoding) { - chunk = Buffer.from(chunk, encoding); - encoding = ''; - } - skipChunkCheck = true; - } - } else { - skipChunkCheck = true; - } - - return readableAddChunk(this, chunk, encoding, false, skipChunkCheck); -}; - -// Unshift should *always* be something directly out of read() -Readable.prototype.unshift = function (chunk) { - return readableAddChunk(this, chunk, null, true, false); -}; - -function readableAddChunk(stream, chunk, encoding, addToFront, skipChunkCheck) { - var state = stream._readableState; - if (chunk === null) { - state.reading = false; - onEofChunk(stream, state); - } else { - var er; - if (!skipChunkCheck) er = chunkInvalid(state, chunk); - if (er) { - stream.emit('error', er); - } else if (state.objectMode || chunk && chunk.length > 0) { - if (typeof chunk !== 'string' && !state.objectMode && Object.getPrototypeOf(chunk) !== Buffer.prototype) { - chunk = _uint8ArrayToBuffer(chunk); - } - - if (addToFront) { - if (state.endEmitted) stream.emit('error', new Error('stream.unshift() after end event'));else addChunk(stream, state, chunk, true); - } else if (state.ended) { - stream.emit('error', new Error('stream.push() after EOF')); - } else { - state.reading = false; - if (state.decoder && !encoding) { - chunk = state.decoder.write(chunk); - if (state.objectMode || chunk.length !== 0) addChunk(stream, state, chunk, false);else maybeReadMore(stream, state); - } else { - addChunk(stream, state, chunk, false); - } - } - } else if (!addToFront) { - state.reading = false; - } - } - - return needMoreData(state); -} - -function addChunk(stream, state, chunk, addToFront) { - if (state.flowing && state.length === 0 && !state.sync) { - stream.emit('data', chunk); - stream.read(0); - } else { - // update the buffer info. - state.length += state.objectMode ? 1 : chunk.length; - if (addToFront) state.buffer.unshift(chunk);else state.buffer.push(chunk); - - if (state.needReadable) emitReadable(stream); - } - maybeReadMore(stream, state); -} - -function chunkInvalid(state, chunk) { - var er; - if (!_isUint8Array(chunk) && typeof chunk !== 'string' && chunk !== undefined && !state.objectMode) { - er = new TypeError('Invalid non-string/buffer chunk'); - } - return er; -} - -// if it's past the high water mark, we can push in some more. -// Also, if we have no data yet, we can stand some -// more bytes. This is to work around cases where hwm=0, -// such as the repl. Also, if the push() triggered a -// readable event, and the user called read(largeNumber) such that -// needReadable was set, then we ought to push more, so that another -// 'readable' event will be triggered. -function needMoreData(state) { - return !state.ended && (state.needReadable || state.length < state.highWaterMark || state.length === 0); -} - -Readable.prototype.isPaused = function () { - return this._readableState.flowing === false; -}; - -// backwards compatibility. -Readable.prototype.setEncoding = function (enc) { - if (!StringDecoder) StringDecoder = __webpack_require__(/*! string_decoder/ */ "../node_modules/string_decoder/lib/string_decoder.js").StringDecoder; - this._readableState.decoder = new StringDecoder(enc); - this._readableState.encoding = enc; - return this; -}; - -// Don't raise the hwm > 8MB -var MAX_HWM = 0x800000; -function computeNewHighWaterMark(n) { - if (n >= MAX_HWM) { - n = MAX_HWM; - } else { - // Get the next highest power of 2 to prevent increasing hwm excessively in - // tiny amounts - n--; - n |= n >>> 1; - n |= n >>> 2; - n |= n >>> 4; - n |= n >>> 8; - n |= n >>> 16; - n++; - } - return n; -} - -// This function is designed to be inlinable, so please take care when making -// changes to the function body. -function howMuchToRead(n, state) { - if (n <= 0 || state.length === 0 && state.ended) return 0; - if (state.objectMode) return 1; - if (n !== n) { - // Only flow one buffer at a time - if (state.flowing && state.length) return state.buffer.head.data.length;else return state.length; - } - // If we're asking for more than the current hwm, then raise the hwm. - if (n > state.highWaterMark) state.highWaterMark = computeNewHighWaterMark(n); - if (n <= state.length) return n; - // Don't have enough - if (!state.ended) { - state.needReadable = true; - return 0; - } - return state.length; -} - -// you can override either this method, or the async _read(n) below. -Readable.prototype.read = function (n) { - debug('read', n); - n = parseInt(n, 10); - var state = this._readableState; - var nOrig = n; - - if (n !== 0) state.emittedReadable = false; - - // if we're doing read(0) to trigger a readable event, but we - // already have a bunch of data in the buffer, then just trigger - // the 'readable' event and move on. - if (n === 0 && state.needReadable && (state.length >= state.highWaterMark || state.ended)) { - debug('read: emitReadable', state.length, state.ended); - if (state.length === 0 && state.ended) endReadable(this);else emitReadable(this); - return null; - } - - n = howMuchToRead(n, state); - - // if we've ended, and we're now clear, then finish it up. - if (n === 0 && state.ended) { - if (state.length === 0) endReadable(this); - return null; - } - - // All the actual chunk generation logic needs to be - // *below* the call to _read. The reason is that in certain - // synthetic stream cases, such as passthrough streams, _read - // may be a completely synchronous operation which may change - // the state of the read buffer, providing enough data when - // before there was *not* enough. - // - // So, the steps are: - // 1. Figure out what the state of things will be after we do - // a read from the buffer. - // - // 2. If that resulting state will trigger a _read, then call _read. - // Note that this may be asynchronous, or synchronous. Yes, it is - // deeply ugly to write APIs this way, but that still doesn't mean - // that the Readable class should behave improperly, as streams are - // designed to be sync/async agnostic. - // Take note if the _read call is sync or async (ie, if the read call - // has returned yet), so that we know whether or not it's safe to emit - // 'readable' etc. - // - // 3. Actually pull the requested chunks out of the buffer and return. - - // if we need a readable event, then we need to do some reading. - var doRead = state.needReadable; - debug('need readable', doRead); - - // if we currently have less than the highWaterMark, then also read some - if (state.length === 0 || state.length - n < state.highWaterMark) { - doRead = true; - debug('length less than watermark', doRead); - } - - // however, if we've ended, then there's no point, and if we're already - // reading, then it's unnecessary. - if (state.ended || state.reading) { - doRead = false; - debug('reading or ended', doRead); - } else if (doRead) { - debug('do read'); - state.reading = true; - state.sync = true; - // if the length is currently zero, then we *need* a readable event. - if (state.length === 0) state.needReadable = true; - // call internal read method - this._read(state.highWaterMark); - state.sync = false; - // If _read pushed data synchronously, then `reading` will be false, - // and we need to re-evaluate how much data we can return to the user. - if (!state.reading) n = howMuchToRead(nOrig, state); - } - - var ret; - if (n > 0) ret = fromList(n, state);else ret = null; - - if (ret === null) { - state.needReadable = true; - n = 0; - } else { - state.length -= n; - } - - if (state.length === 0) { - // If we have nothing in the buffer, then we want to know - // as soon as we *do* get something into the buffer. - if (!state.ended) state.needReadable = true; - - // If we tried to read() past the EOF, then emit end on the next tick. - if (nOrig !== n && state.ended) endReadable(this); - } - - if (ret !== null) this.emit('data', ret); - - return ret; -}; - -function onEofChunk(stream, state) { - if (state.ended) return; - if (state.decoder) { - var chunk = state.decoder.end(); - if (chunk && chunk.length) { - state.buffer.push(chunk); - state.length += state.objectMode ? 1 : chunk.length; - } - } - state.ended = true; - - // emit 'readable' now to make sure it gets picked up. - emitReadable(stream); -} - -// Don't emit readable right away in sync mode, because this can trigger -// another read() call => stack overflow. This way, it might trigger -// a nextTick recursion warning, but that's not so bad. -function emitReadable(stream) { - var state = stream._readableState; - state.needReadable = false; - if (!state.emittedReadable) { - debug('emitReadable', state.flowing); - state.emittedReadable = true; - if (state.sync) pna.nextTick(emitReadable_, stream);else emitReadable_(stream); - } -} - -function emitReadable_(stream) { - debug('emit readable'); - stream.emit('readable'); - flow(stream); -} - -// at this point, the user has presumably seen the 'readable' event, -// and called read() to consume some data. that may have triggered -// in turn another _read(n) call, in which case reading = true if -// it's in progress. -// However, if we're not ended, or reading, and the length < hwm, -// then go ahead and try to read some more preemptively. -function maybeReadMore(stream, state) { - if (!state.readingMore) { - state.readingMore = true; - pna.nextTick(maybeReadMore_, stream, state); - } -} - -function maybeReadMore_(stream, state) { - var len = state.length; - while (!state.reading && !state.flowing && !state.ended && state.length < state.highWaterMark) { - debug('maybeReadMore read 0'); - stream.read(0); - if (len === state.length) - // didn't get any data, stop spinning. - break;else len = state.length; - } - state.readingMore = false; -} - -// abstract method. to be overridden in specific implementation classes. -// call cb(er, data) where data is <= n in length. -// for virtual (non-string, non-buffer) streams, "length" is somewhat -// arbitrary, and perhaps not very meaningful. -Readable.prototype._read = function (n) { - this.emit('error', new Error('_read() is not implemented')); -}; - -Readable.prototype.pipe = function (dest, pipeOpts) { - var src = this; - var state = this._readableState; - - switch (state.pipesCount) { - case 0: - state.pipes = dest; - break; - case 1: - state.pipes = [state.pipes, dest]; - break; - default: - state.pipes.push(dest); - break; - } - state.pipesCount += 1; - debug('pipe count=%d opts=%j', state.pipesCount, pipeOpts); - - var doEnd = (!pipeOpts || pipeOpts.end !== false) && dest !== process.stdout && dest !== process.stderr; - - var endFn = doEnd ? onend : unpipe; - if (state.endEmitted) pna.nextTick(endFn);else src.once('end', endFn); - - dest.on('unpipe', onunpipe); - function onunpipe(readable, unpipeInfo) { - debug('onunpipe'); - if (readable === src) { - if (unpipeInfo && unpipeInfo.hasUnpiped === false) { - unpipeInfo.hasUnpiped = true; - cleanup(); - } - } - } - - function onend() { - debug('onend'); - dest.end(); - } - - // when the dest drains, it reduces the awaitDrain counter - // on the source. This would be more elegant with a .once() - // handler in flow(), but adding and removing repeatedly is - // too slow. - var ondrain = pipeOnDrain(src); - dest.on('drain', ondrain); - - var cleanedUp = false; - function cleanup() { - debug('cleanup'); - // cleanup event handlers once the pipe is broken - dest.removeListener('close', onclose); - dest.removeListener('finish', onfinish); - dest.removeListener('drain', ondrain); - dest.removeListener('error', onerror); - dest.removeListener('unpipe', onunpipe); - src.removeListener('end', onend); - src.removeListener('end', unpipe); - src.removeListener('data', ondata); - - cleanedUp = true; - - // if the reader is waiting for a drain event from this - // specific writer, then it would cause it to never start - // flowing again. - // So, if this is awaiting a drain, then we just call it now. - // If we don't know, then assume that we are waiting for one. - if (state.awaitDrain && (!dest._writableState || dest._writableState.needDrain)) ondrain(); - } - - // If the user pushes more data while we're writing to dest then we'll end up - // in ondata again. However, we only want to increase awaitDrain once because - // dest will only emit one 'drain' event for the multiple writes. - // => Introduce a guard on increasing awaitDrain. - var increasedAwaitDrain = false; - src.on('data', ondata); - function ondata(chunk) { - debug('ondata'); - increasedAwaitDrain = false; - var ret = dest.write(chunk); - if (false === ret && !increasedAwaitDrain) { - // If the user unpiped during `dest.write()`, it is possible - // to get stuck in a permanently paused state if that write - // also returned false. - // => Check whether `dest` is still a piping destination. - if ((state.pipesCount === 1 && state.pipes === dest || state.pipesCount > 1 && indexOf(state.pipes, dest) !== -1) && !cleanedUp) { - debug('false write response, pause', src._readableState.awaitDrain); - src._readableState.awaitDrain++; - increasedAwaitDrain = true; - } - src.pause(); - } - } - - // if the dest has an error, then stop piping into it. - // however, don't suppress the throwing behavior for this. - function onerror(er) { - debug('onerror', er); - unpipe(); - dest.removeListener('error', onerror); - if (EElistenerCount(dest, 'error') === 0) dest.emit('error', er); - } - - // Make sure our error handler is attached before userland ones. - prependListener(dest, 'error', onerror); - - // Both close and finish should trigger unpipe, but only once. - function onclose() { - dest.removeListener('finish', onfinish); - unpipe(); - } - dest.once('close', onclose); - function onfinish() { - debug('onfinish'); - dest.removeListener('close', onclose); - unpipe(); - } - dest.once('finish', onfinish); - - function unpipe() { - debug('unpipe'); - src.unpipe(dest); - } - - // tell the dest that it's being piped to - dest.emit('pipe', src); - - // start the flow if it hasn't been started already. - if (!state.flowing) { - debug('pipe resume'); - src.resume(); - } - - return dest; -}; - -function pipeOnDrain(src) { - return function () { - var state = src._readableState; - debug('pipeOnDrain', state.awaitDrain); - if (state.awaitDrain) state.awaitDrain--; - if (state.awaitDrain === 0 && EElistenerCount(src, 'data')) { - state.flowing = true; - flow(src); - } - }; -} - -Readable.prototype.unpipe = function (dest) { - var state = this._readableState; - var unpipeInfo = { hasUnpiped: false }; - - // if we're not piping anywhere, then do nothing. - if (state.pipesCount === 0) return this; - - // just one destination. most common case. - if (state.pipesCount === 1) { - // passed in one, but it's not the right one. - if (dest && dest !== state.pipes) return this; - - if (!dest) dest = state.pipes; - - // got a match. - state.pipes = null; - state.pipesCount = 0; - state.flowing = false; - if (dest) dest.emit('unpipe', this, unpipeInfo); - return this; - } - - // slow case. multiple pipe destinations. - - if (!dest) { - // remove all. - var dests = state.pipes; - var len = state.pipesCount; - state.pipes = null; - state.pipesCount = 0; - state.flowing = false; - - for (var i = 0; i < len; i++) { - dests[i].emit('unpipe', this, unpipeInfo); - }return this; - } - - // try to find the right one. - var index = indexOf(state.pipes, dest); - if (index === -1) return this; - - state.pipes.splice(index, 1); - state.pipesCount -= 1; - if (state.pipesCount === 1) state.pipes = state.pipes[0]; - - dest.emit('unpipe', this, unpipeInfo); - - return this; -}; - -// set up data events if they are asked for -// Ensure readable listeners eventually get something -Readable.prototype.on = function (ev, fn) { - var res = Stream.prototype.on.call(this, ev, fn); - - if (ev === 'data') { - // Start flowing on next tick if stream isn't explicitly paused - if (this._readableState.flowing !== false) this.resume(); - } else if (ev === 'readable') { - var state = this._readableState; - if (!state.endEmitted && !state.readableListening) { - state.readableListening = state.needReadable = true; - state.emittedReadable = false; - if (!state.reading) { - pna.nextTick(nReadingNextTick, this); - } else if (state.length) { - emitReadable(this); - } - } - } - - return res; -}; -Readable.prototype.addListener = Readable.prototype.on; - -function nReadingNextTick(self) { - debug('readable nexttick read 0'); - self.read(0); -} - -// pause() and resume() are remnants of the legacy readable stream API -// If the user uses them, then switch into old mode. -Readable.prototype.resume = function () { - var state = this._readableState; - if (!state.flowing) { - debug('resume'); - state.flowing = true; - resume(this, state); - } - return this; -}; - -function resume(stream, state) { - if (!state.resumeScheduled) { - state.resumeScheduled = true; - pna.nextTick(resume_, stream, state); - } -} - -function resume_(stream, state) { - if (!state.reading) { - debug('resume read 0'); - stream.read(0); - } - - state.resumeScheduled = false; - state.awaitDrain = 0; - stream.emit('resume'); - flow(stream); - if (state.flowing && !state.reading) stream.read(0); -} - -Readable.prototype.pause = function () { - debug('call pause flowing=%j', this._readableState.flowing); - if (false !== this._readableState.flowing) { - debug('pause'); - this._readableState.flowing = false; - this.emit('pause'); - } - return this; -}; - -function flow(stream) { - var state = stream._readableState; - debug('flow', state.flowing); - while (state.flowing && stream.read() !== null) {} -} - -// wrap an old-style stream as the async data source. -// This is *not* part of the readable stream interface. -// It is an ugly unfortunate mess of history. -Readable.prototype.wrap = function (stream) { - var _this = this; - - var state = this._readableState; - var paused = false; - - stream.on('end', function () { - debug('wrapped end'); - if (state.decoder && !state.ended) { - var chunk = state.decoder.end(); - if (chunk && chunk.length) _this.push(chunk); - } - - _this.push(null); - }); - - stream.on('data', function (chunk) { - debug('wrapped data'); - if (state.decoder) chunk = state.decoder.write(chunk); - - // don't skip over falsy values in objectMode - if (state.objectMode && (chunk === null || chunk === undefined)) return;else if (!state.objectMode && (!chunk || !chunk.length)) return; - - var ret = _this.push(chunk); - if (!ret) { - paused = true; - stream.pause(); - } - }); - - // proxy all the other methods. - // important when wrapping filters and duplexes. - for (var i in stream) { - if (this[i] === undefined && typeof stream[i] === 'function') { - this[i] = function (method) { - return function () { - return stream[method].apply(stream, arguments); - }; - }(i); - } - } - - // proxy certain important events. - for (var n = 0; n < kProxyEvents.length; n++) { - stream.on(kProxyEvents[n], this.emit.bind(this, kProxyEvents[n])); - } - - // when we try to consume some more bytes, simply unpause the - // underlying stream. - this._read = function (n) { - debug('wrapped _read', n); - if (paused) { - paused = false; - stream.resume(); - } - }; - - return this; -}; - -Object.defineProperty(Readable.prototype, 'readableHighWaterMark', { - // making it explicit this property is not enumerable - // because otherwise some prototype manipulation in - // userland will fail - enumerable: false, - get: function () { - return this._readableState.highWaterMark; - } -}); - -// exposed for testing purposes only. -Readable._fromList = fromList; - -// Pluck off n bytes from an array of buffers. -// Length is the combined lengths of all the buffers in the list. -// This function is designed to be inlinable, so please take care when making -// changes to the function body. -function fromList(n, state) { - // nothing buffered - if (state.length === 0) return null; - - var ret; - if (state.objectMode) ret = state.buffer.shift();else if (!n || n >= state.length) { - // read it all, truncate the list - if (state.decoder) ret = state.buffer.join('');else if (state.buffer.length === 1) ret = state.buffer.head.data;else ret = state.buffer.concat(state.length); - state.buffer.clear(); - } else { - // read part of list - ret = fromListPartial(n, state.buffer, state.decoder); - } - - return ret; -} - -// Extracts only enough buffered data to satisfy the amount requested. -// This function is designed to be inlinable, so please take care when making -// changes to the function body. -function fromListPartial(n, list, hasStrings) { - var ret; - if (n < list.head.data.length) { - // slice is the same for buffers and strings - ret = list.head.data.slice(0, n); - list.head.data = list.head.data.slice(n); - } else if (n === list.head.data.length) { - // first chunk is a perfect match - ret = list.shift(); - } else { - // result spans more than one buffer - ret = hasStrings ? copyFromBufferString(n, list) : copyFromBuffer(n, list); - } - return ret; -} - -// Copies a specified amount of characters from the list of buffered data -// chunks. -// This function is designed to be inlinable, so please take care when making -// changes to the function body. -function copyFromBufferString(n, list) { - var p = list.head; - var c = 1; - var ret = p.data; - n -= ret.length; - while (p = p.next) { - var str = p.data; - var nb = n > str.length ? str.length : n; - if (nb === str.length) ret += str;else ret += str.slice(0, n); - n -= nb; - if (n === 0) { - if (nb === str.length) { - ++c; - if (p.next) list.head = p.next;else list.head = list.tail = null; - } else { - list.head = p; - p.data = str.slice(nb); - } - break; - } - ++c; - } - list.length -= c; - return ret; -} - -// Copies a specified amount of bytes from the list of buffered data chunks. -// This function is designed to be inlinable, so please take care when making -// changes to the function body. -function copyFromBuffer(n, list) { - var ret = Buffer.allocUnsafe(n); - var p = list.head; - var c = 1; - p.data.copy(ret); - n -= p.data.length; - while (p = p.next) { - var buf = p.data; - var nb = n > buf.length ? buf.length : n; - buf.copy(ret, ret.length - n, 0, nb); - n -= nb; - if (n === 0) { - if (nb === buf.length) { - ++c; - if (p.next) list.head = p.next;else list.head = list.tail = null; - } else { - list.head = p; - p.data = buf.slice(nb); - } - break; - } - ++c; - } - list.length -= c; - return ret; -} - -function endReadable(stream) { - var state = stream._readableState; - - // If we get here before consuming all the bytes, then that is a - // bug in node. Should never happen. - if (state.length > 0) throw new Error('"endReadable()" called on non-empty stream'); - - if (!state.endEmitted) { - state.ended = true; - pna.nextTick(endReadableNT, state, stream); - } -} - -function endReadableNT(state, stream) { - // Check that we didn't get one last unshift. - if (!state.endEmitted && state.length === 0) { - state.endEmitted = true; - stream.readable = false; - stream.emit('end'); - } -} - -function indexOf(xs, x) { - for (var i = 0, l = xs.length; i < l; i++) { - if (xs[i] === x) return i; - } - return -1; -} -/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../webpack/buildin/global.js */ "../node_modules/webpack/buildin/global.js"), __webpack_require__(/*! ./../../process/browser.js */ "../node_modules/process/browser.js"))) - -/***/ }), - -/***/ "../node_modules/readable-stream/lib/_stream_transform.js": -/*!****************************************************************!*\ - !*** ../node_modules/readable-stream/lib/_stream_transform.js ***! - \****************************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; -// Copyright Joyent, Inc. and other Node contributors. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to permit -// persons to whom the Software is furnished to do so, subject to the -// following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -// USE OR OTHER DEALINGS IN THE SOFTWARE. - -// a transform stream is a readable/writable stream where you do -// something with the data. Sometimes it's called a "filter", -// but that's not a great name for it, since that implies a thing where -// some bits pass through, and others are simply ignored. (That would -// be a valid example of a transform, of course.) -// -// While the output is causally related to the input, it's not a -// necessarily symmetric or synchronous transformation. For example, -// a zlib stream might take multiple plain-text writes(), and then -// emit a single compressed chunk some time in the future. -// -// Here's how this works: -// -// The Transform stream has all the aspects of the readable and writable -// stream classes. When you write(chunk), that calls _write(chunk,cb) -// internally, and returns false if there's a lot of pending writes -// buffered up. When you call read(), that calls _read(n) until -// there's enough pending readable data buffered up. -// -// In a transform stream, the written data is placed in a buffer. When -// _read(n) is called, it transforms the queued up data, calling the -// buffered _write cb's as it consumes chunks. If consuming a single -// written chunk would result in multiple output chunks, then the first -// outputted bit calls the readcb, and subsequent chunks just go into -// the read buffer, and will cause it to emit 'readable' if necessary. -// -// This way, back-pressure is actually determined by the reading side, -// since _read has to be called to start processing a new chunk. However, -// a pathological inflate type of transform can cause excessive buffering -// here. For example, imagine a stream where every byte of input is -// interpreted as an integer from 0-255, and then results in that many -// bytes of output. Writing the 4 bytes {ff,ff,ff,ff} would result in -// 1kb of data being output. In this case, you could write a very small -// amount of input, and end up with a very large amount of output. In -// such a pathological inflating mechanism, there'd be no way to tell -// the system to stop doing the transform. A single 4MB write could -// cause the system to run out of memory. -// -// However, even in such a pathological case, only a single written chunk -// would be consumed, and then the rest would wait (un-transformed) until -// the results of the previous transformed chunk were consumed. - - - -module.exports = Transform; - -var Duplex = __webpack_require__(/*! ./_stream_duplex */ "../node_modules/readable-stream/lib/_stream_duplex.js"); - -/**/ -var util = __webpack_require__(/*! core-util-is */ "../node_modules/core-util-is/lib/util.js"); -util.inherits = __webpack_require__(/*! inherits */ "../node_modules/inherits/inherits_browser.js"); -/**/ - -util.inherits(Transform, Duplex); - -function afterTransform(er, data) { - var ts = this._transformState; - ts.transforming = false; - - var cb = ts.writecb; - - if (!cb) { - return this.emit('error', new Error('write callback called multiple times')); - } - - ts.writechunk = null; - ts.writecb = null; - - if (data != null) // single equals check for both `null` and `undefined` - this.push(data); - - cb(er); - - var rs = this._readableState; - rs.reading = false; - if (rs.needReadable || rs.length < rs.highWaterMark) { - this._read(rs.highWaterMark); - } -} - -function Transform(options) { - if (!(this instanceof Transform)) return new Transform(options); - - Duplex.call(this, options); - - this._transformState = { - afterTransform: afterTransform.bind(this), - needTransform: false, - transforming: false, - writecb: null, - writechunk: null, - writeencoding: null - }; - - // start out asking for a readable event once data is transformed. - this._readableState.needReadable = true; - - // we have implemented the _read method, and done the other things - // that Readable wants before the first _read call, so unset the - // sync guard flag. - this._readableState.sync = false; - - if (options) { - if (typeof options.transform === 'function') this._transform = options.transform; - - if (typeof options.flush === 'function') this._flush = options.flush; - } - - // When the writable side finishes, then flush out anything remaining. - this.on('prefinish', prefinish); -} - -function prefinish() { - var _this = this; - - if (typeof this._flush === 'function') { - this._flush(function (er, data) { - done(_this, er, data); - }); - } else { - done(this, null, null); - } -} - -Transform.prototype.push = function (chunk, encoding) { - this._transformState.needTransform = false; - return Duplex.prototype.push.call(this, chunk, encoding); -}; - -// This is the part where you do stuff! -// override this function in implementation classes. -// 'chunk' is an input chunk. -// -// Call `push(newChunk)` to pass along transformed output -// to the readable side. You may call 'push' zero or more times. -// -// Call `cb(err)` when you are done with this chunk. If you pass -// an error, then that'll put the hurt on the whole operation. If you -// never call cb(), then you'll never get another chunk. -Transform.prototype._transform = function (chunk, encoding, cb) { - throw new Error('_transform() is not implemented'); -}; - -Transform.prototype._write = function (chunk, encoding, cb) { - var ts = this._transformState; - ts.writecb = cb; - ts.writechunk = chunk; - ts.writeencoding = encoding; - if (!ts.transforming) { - var rs = this._readableState; - if (ts.needTransform || rs.needReadable || rs.length < rs.highWaterMark) this._read(rs.highWaterMark); - } -}; - -// Doesn't matter what the args are here. -// _transform does all the work. -// That we got here means that the readable side wants more data. -Transform.prototype._read = function (n) { - var ts = this._transformState; - - if (ts.writechunk !== null && ts.writecb && !ts.transforming) { - ts.transforming = true; - this._transform(ts.writechunk, ts.writeencoding, ts.afterTransform); - } else { - // mark that we need a transform, so that any data that comes in - // will get processed, now that we've asked for it. - ts.needTransform = true; - } -}; - -Transform.prototype._destroy = function (err, cb) { - var _this2 = this; - - Duplex.prototype._destroy.call(this, err, function (err2) { - cb(err2); - _this2.emit('close'); - }); -}; - -function done(stream, er, data) { - if (er) return stream.emit('error', er); - - if (data != null) // single equals check for both `null` and `undefined` - stream.push(data); - - // if there's nothing in the write buffer, then that means - // that nothing more will ever be provided - if (stream._writableState.length) throw new Error('Calling transform done when ws.length != 0'); - - if (stream._transformState.transforming) throw new Error('Calling transform done when still transforming'); - - return stream.push(null); -} - -/***/ }), - -/***/ "../node_modules/readable-stream/lib/_stream_writable.js": -/*!***************************************************************!*\ - !*** ../node_modules/readable-stream/lib/_stream_writable.js ***! - \***************************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; -/* WEBPACK VAR INJECTION */(function(process, setImmediate, global) {// Copyright Joyent, Inc. and other Node contributors. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to permit -// persons to whom the Software is furnished to do so, subject to the -// following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -// USE OR OTHER DEALINGS IN THE SOFTWARE. - -// A bit simpler than readable streams. -// Implement an async ._write(chunk, encoding, cb), and it'll handle all -// the drain event emission and buffering. - - - -/**/ - -var pna = __webpack_require__(/*! process-nextick-args */ "../node_modules/process-nextick-args/index.js"); -/**/ - -module.exports = Writable; - -/* */ -function WriteReq(chunk, encoding, cb) { - this.chunk = chunk; - this.encoding = encoding; - this.callback = cb; - this.next = null; -} - -// It seems a linked list but it is not -// there will be only 2 of these for each stream -function CorkedRequest(state) { - var _this = this; - - this.next = null; - this.entry = null; - this.finish = function () { - onCorkedFinish(_this, state); - }; -} -/* */ - -/**/ -var asyncWrite = !process.browser && ['v0.10', 'v0.9.'].indexOf(process.version.slice(0, 5)) > -1 ? setImmediate : pna.nextTick; -/**/ - -/**/ -var Duplex; -/**/ - -Writable.WritableState = WritableState; - -/**/ -var util = __webpack_require__(/*! core-util-is */ "../node_modules/core-util-is/lib/util.js"); -util.inherits = __webpack_require__(/*! inherits */ "../node_modules/inherits/inherits_browser.js"); -/**/ - -/**/ -var internalUtil = { - deprecate: __webpack_require__(/*! util-deprecate */ "../node_modules/util-deprecate/browser.js") -}; -/**/ - -/**/ -var Stream = __webpack_require__(/*! ./internal/streams/stream */ "../node_modules/readable-stream/lib/internal/streams/stream-browser.js"); -/**/ - -/**/ - -var Buffer = __webpack_require__(/*! safe-buffer */ "../node_modules/safe-buffer/index.js").Buffer; -var OurUint8Array = global.Uint8Array || function () {}; -function _uint8ArrayToBuffer(chunk) { - return Buffer.from(chunk); -} -function _isUint8Array(obj) { - return Buffer.isBuffer(obj) || obj instanceof OurUint8Array; -} - -/**/ - -var destroyImpl = __webpack_require__(/*! ./internal/streams/destroy */ "../node_modules/readable-stream/lib/internal/streams/destroy.js"); - -util.inherits(Writable, Stream); - -function nop() {} - -function WritableState(options, stream) { - Duplex = Duplex || __webpack_require__(/*! ./_stream_duplex */ "../node_modules/readable-stream/lib/_stream_duplex.js"); - - options = options || {}; - - // Duplex streams are both readable and writable, but share - // the same options object. - // However, some cases require setting options to different - // values for the readable and the writable sides of the duplex stream. - // These options can be provided separately as readableXXX and writableXXX. - var isDuplex = stream instanceof Duplex; - - // object stream flag to indicate whether or not this stream - // contains buffers or objects. - this.objectMode = !!options.objectMode; - - if (isDuplex) this.objectMode = this.objectMode || !!options.writableObjectMode; - - // the point at which write() starts returning false - // Note: 0 is a valid value, means that we always return false if - // the entire buffer is not flushed immediately on write() - var hwm = options.highWaterMark; - var writableHwm = options.writableHighWaterMark; - var defaultHwm = this.objectMode ? 16 : 16 * 1024; - - if (hwm || hwm === 0) this.highWaterMark = hwm;else if (isDuplex && (writableHwm || writableHwm === 0)) this.highWaterMark = writableHwm;else this.highWaterMark = defaultHwm; - - // cast to ints. - this.highWaterMark = Math.floor(this.highWaterMark); - - // if _final has been called - this.finalCalled = false; - - // drain event flag. - this.needDrain = false; - // at the start of calling end() - this.ending = false; - // when end() has been called, and returned - this.ended = false; - // when 'finish' is emitted - this.finished = false; - - // has it been destroyed - this.destroyed = false; - - // should we decode strings into buffers before passing to _write? - // this is here so that some node-core streams can optimize string - // handling at a lower level. - var noDecode = options.decodeStrings === false; - this.decodeStrings = !noDecode; - - // Crypto is kind of old and crusty. Historically, its default string - // encoding is 'binary' so we have to make this configurable. - // Everything else in the universe uses 'utf8', though. - this.defaultEncoding = options.defaultEncoding || 'utf8'; - - // not an actual buffer we keep track of, but a measurement - // of how much we're waiting to get pushed to some underlying - // socket or file. - this.length = 0; - - // a flag to see when we're in the middle of a write. - this.writing = false; - - // when true all writes will be buffered until .uncork() call - this.corked = 0; - - // a flag to be able to tell if the onwrite cb is called immediately, - // or on a later tick. We set this to true at first, because any - // actions that shouldn't happen until "later" should generally also - // not happen before the first write call. - this.sync = true; - - // a flag to know if we're processing previously buffered items, which - // may call the _write() callback in the same tick, so that we don't - // end up in an overlapped onwrite situation. - this.bufferProcessing = false; - - // the callback that's passed to _write(chunk,cb) - this.onwrite = function (er) { - onwrite(stream, er); - }; - - // the callback that the user supplies to write(chunk,encoding,cb) - this.writecb = null; - - // the amount that is being written when _write is called. - this.writelen = 0; - - this.bufferedRequest = null; - this.lastBufferedRequest = null; - - // number of pending user-supplied write callbacks - // this must be 0 before 'finish' can be emitted - this.pendingcb = 0; - - // emit prefinish if the only thing we're waiting for is _write cbs - // This is relevant for synchronous Transform streams - this.prefinished = false; - - // True if the error was already emitted and should not be thrown again - this.errorEmitted = false; - - // count buffered requests - this.bufferedRequestCount = 0; - - // allocate the first CorkedRequest, there is always - // one allocated and free to use, and we maintain at most two - this.corkedRequestsFree = new CorkedRequest(this); -} - -WritableState.prototype.getBuffer = function getBuffer() { - var current = this.bufferedRequest; - var out = []; - while (current) { - out.push(current); - current = current.next; - } - return out; -}; - -(function () { - try { - Object.defineProperty(WritableState.prototype, 'buffer', { - get: internalUtil.deprecate(function () { - return this.getBuffer(); - }, '_writableState.buffer is deprecated. Use _writableState.getBuffer ' + 'instead.', 'DEP0003') - }); - } catch (_) {} -})(); - -// Test _writableState for inheritance to account for Duplex streams, -// whose prototype chain only points to Readable. -var realHasInstance; -if (typeof Symbol === 'function' && Symbol.hasInstance && typeof Function.prototype[Symbol.hasInstance] === 'function') { - realHasInstance = Function.prototype[Symbol.hasInstance]; - Object.defineProperty(Writable, Symbol.hasInstance, { - value: function (object) { - if (realHasInstance.call(this, object)) return true; - if (this !== Writable) return false; - - return object && object._writableState instanceof WritableState; - } - }); -} else { - realHasInstance = function (object) { - return object instanceof this; - }; -} - -function Writable(options) { - Duplex = Duplex || __webpack_require__(/*! ./_stream_duplex */ "../node_modules/readable-stream/lib/_stream_duplex.js"); - - // Writable ctor is applied to Duplexes, too. - // `realHasInstance` is necessary because using plain `instanceof` - // would return false, as no `_writableState` property is attached. - - // Trying to use the custom `instanceof` for Writable here will also break the - // Node.js LazyTransform implementation, which has a non-trivial getter for - // `_writableState` that would lead to infinite recursion. - if (!realHasInstance.call(Writable, this) && !(this instanceof Duplex)) { - return new Writable(options); - } - - this._writableState = new WritableState(options, this); - - // legacy. - this.writable = true; - - if (options) { - if (typeof options.write === 'function') this._write = options.write; - - if (typeof options.writev === 'function') this._writev = options.writev; - - if (typeof options.destroy === 'function') this._destroy = options.destroy; - - if (typeof options.final === 'function') this._final = options.final; - } - - Stream.call(this); -} - -// Otherwise people can pipe Writable streams, which is just wrong. -Writable.prototype.pipe = function () { - this.emit('error', new Error('Cannot pipe, not readable')); -}; - -function writeAfterEnd(stream, cb) { - var er = new Error('write after end'); - // TODO: defer error events consistently everywhere, not just the cb - stream.emit('error', er); - pna.nextTick(cb, er); -} - -// Checks that a user-supplied chunk is valid, especially for the particular -// mode the stream is in. Currently this means that `null` is never accepted -// and undefined/non-string values are only allowed in object mode. -function validChunk(stream, state, chunk, cb) { - var valid = true; - var er = false; - - if (chunk === null) { - er = new TypeError('May not write null values to stream'); - } else if (typeof chunk !== 'string' && chunk !== undefined && !state.objectMode) { - er = new TypeError('Invalid non-string/buffer chunk'); - } - if (er) { - stream.emit('error', er); - pna.nextTick(cb, er); - valid = false; - } - return valid; -} - -Writable.prototype.write = function (chunk, encoding, cb) { - var state = this._writableState; - var ret = false; - var isBuf = !state.objectMode && _isUint8Array(chunk); - - if (isBuf && !Buffer.isBuffer(chunk)) { - chunk = _uint8ArrayToBuffer(chunk); - } - - if (typeof encoding === 'function') { - cb = encoding; - encoding = null; - } - - if (isBuf) encoding = 'buffer';else if (!encoding) encoding = state.defaultEncoding; - - if (typeof cb !== 'function') cb = nop; - - if (state.ended) writeAfterEnd(this, cb);else if (isBuf || validChunk(this, state, chunk, cb)) { - state.pendingcb++; - ret = writeOrBuffer(this, state, isBuf, chunk, encoding, cb); - } - - return ret; -}; - -Writable.prototype.cork = function () { - var state = this._writableState; - - state.corked++; -}; - -Writable.prototype.uncork = function () { - var state = this._writableState; - - if (state.corked) { - state.corked--; - - if (!state.writing && !state.corked && !state.finished && !state.bufferProcessing && state.bufferedRequest) clearBuffer(this, state); - } -}; - -Writable.prototype.setDefaultEncoding = function setDefaultEncoding(encoding) { - // node::ParseEncoding() requires lower case. - if (typeof encoding === 'string') encoding = encoding.toLowerCase(); - if (!(['hex', 'utf8', 'utf-8', 'ascii', 'binary', 'base64', 'ucs2', 'ucs-2', 'utf16le', 'utf-16le', 'raw'].indexOf((encoding + '').toLowerCase()) > -1)) throw new TypeError('Unknown encoding: ' + encoding); - this._writableState.defaultEncoding = encoding; - return this; -}; - -function decodeChunk(state, chunk, encoding) { - if (!state.objectMode && state.decodeStrings !== false && typeof chunk === 'string') { - chunk = Buffer.from(chunk, encoding); - } - return chunk; -} - -Object.defineProperty(Writable.prototype, 'writableHighWaterMark', { - // making it explicit this property is not enumerable - // because otherwise some prototype manipulation in - // userland will fail - enumerable: false, - get: function () { - return this._writableState.highWaterMark; - } -}); - -// if we're already writing something, then just put this -// in the queue, and wait our turn. Otherwise, call _write -// If we return false, then we need a drain event, so set that flag. -function writeOrBuffer(stream, state, isBuf, chunk, encoding, cb) { - if (!isBuf) { - var newChunk = decodeChunk(state, chunk, encoding); - if (chunk !== newChunk) { - isBuf = true; - encoding = 'buffer'; - chunk = newChunk; - } - } - var len = state.objectMode ? 1 : chunk.length; - - state.length += len; - - var ret = state.length < state.highWaterMark; - // we must ensure that previous needDrain will not be reset to false. - if (!ret) state.needDrain = true; - - if (state.writing || state.corked) { - var last = state.lastBufferedRequest; - state.lastBufferedRequest = { - chunk: chunk, - encoding: encoding, - isBuf: isBuf, - callback: cb, - next: null - }; - if (last) { - last.next = state.lastBufferedRequest; - } else { - state.bufferedRequest = state.lastBufferedRequest; - } - state.bufferedRequestCount += 1; - } else { - doWrite(stream, state, false, len, chunk, encoding, cb); - } - - return ret; -} - -function doWrite(stream, state, writev, len, chunk, encoding, cb) { - state.writelen = len; - state.writecb = cb; - state.writing = true; - state.sync = true; - if (writev) stream._writev(chunk, state.onwrite);else stream._write(chunk, encoding, state.onwrite); - state.sync = false; -} - -function onwriteError(stream, state, sync, er, cb) { - --state.pendingcb; - - if (sync) { - // defer the callback if we are being called synchronously - // to avoid piling up things on the stack - pna.nextTick(cb, er); - // this can emit finish, and it will always happen - // after error - pna.nextTick(finishMaybe, stream, state); - stream._writableState.errorEmitted = true; - stream.emit('error', er); - } else { - // the caller expect this to happen before if - // it is async - cb(er); - stream._writableState.errorEmitted = true; - stream.emit('error', er); - // this can emit finish, but finish must - // always follow error - finishMaybe(stream, state); - } -} - -function onwriteStateUpdate(state) { - state.writing = false; - state.writecb = null; - state.length -= state.writelen; - state.writelen = 0; -} - -function onwrite(stream, er) { - var state = stream._writableState; - var sync = state.sync; - var cb = state.writecb; - - onwriteStateUpdate(state); - - if (er) onwriteError(stream, state, sync, er, cb);else { - // Check if we're actually ready to finish, but don't emit yet - var finished = needFinish(state); - - if (!finished && !state.corked && !state.bufferProcessing && state.bufferedRequest) { - clearBuffer(stream, state); - } - - if (sync) { - /**/ - asyncWrite(afterWrite, stream, state, finished, cb); - /**/ - } else { - afterWrite(stream, state, finished, cb); - } - } -} - -function afterWrite(stream, state, finished, cb) { - if (!finished) onwriteDrain(stream, state); - state.pendingcb--; - cb(); - finishMaybe(stream, state); -} - -// Must force callback to be called on nextTick, so that we don't -// emit 'drain' before the write() consumer gets the 'false' return -// value, and has a chance to attach a 'drain' listener. -function onwriteDrain(stream, state) { - if (state.length === 0 && state.needDrain) { - state.needDrain = false; - stream.emit('drain'); - } -} - -// if there's something in the buffer waiting, then process it -function clearBuffer(stream, state) { - state.bufferProcessing = true; - var entry = state.bufferedRequest; - - if (stream._writev && entry && entry.next) { - // Fast case, write everything using _writev() - var l = state.bufferedRequestCount; - var buffer = new Array(l); - var holder = state.corkedRequestsFree; - holder.entry = entry; - - var count = 0; - var allBuffers = true; - while (entry) { - buffer[count] = entry; - if (!entry.isBuf) allBuffers = false; - entry = entry.next; - count += 1; - } - buffer.allBuffers = allBuffers; - - doWrite(stream, state, true, state.length, buffer, '', holder.finish); - - // doWrite is almost always async, defer these to save a bit of time - // as the hot path ends with doWrite - state.pendingcb++; - state.lastBufferedRequest = null; - if (holder.next) { - state.corkedRequestsFree = holder.next; - holder.next = null; - } else { - state.corkedRequestsFree = new CorkedRequest(state); - } - state.bufferedRequestCount = 0; - } else { - // Slow case, write chunks one-by-one - while (entry) { - var chunk = entry.chunk; - var encoding = entry.encoding; - var cb = entry.callback; - var len = state.objectMode ? 1 : chunk.length; - - doWrite(stream, state, false, len, chunk, encoding, cb); - entry = entry.next; - state.bufferedRequestCount--; - // if we didn't call the onwrite immediately, then - // it means that we need to wait until it does. - // also, that means that the chunk and cb are currently - // being processed, so move the buffer counter past them. - if (state.writing) { - break; - } - } - - if (entry === null) state.lastBufferedRequest = null; - } - - state.bufferedRequest = entry; - state.bufferProcessing = false; -} - -Writable.prototype._write = function (chunk, encoding, cb) { - cb(new Error('_write() is not implemented')); -}; - -Writable.prototype._writev = null; - -Writable.prototype.end = function (chunk, encoding, cb) { - var state = this._writableState; - - if (typeof chunk === 'function') { - cb = chunk; - chunk = null; - encoding = null; - } else if (typeof encoding === 'function') { - cb = encoding; - encoding = null; - } - - if (chunk !== null && chunk !== undefined) this.write(chunk, encoding); - - // .end() fully uncorks - if (state.corked) { - state.corked = 1; - this.uncork(); - } - - // ignore unnecessary end() calls. - if (!state.ending && !state.finished) endWritable(this, state, cb); -}; - -function needFinish(state) { - return state.ending && state.length === 0 && state.bufferedRequest === null && !state.finished && !state.writing; -} -function callFinal(stream, state) { - stream._final(function (err) { - state.pendingcb--; - if (err) { - stream.emit('error', err); - } - state.prefinished = true; - stream.emit('prefinish'); - finishMaybe(stream, state); - }); -} -function prefinish(stream, state) { - if (!state.prefinished && !state.finalCalled) { - if (typeof stream._final === 'function') { - state.pendingcb++; - state.finalCalled = true; - pna.nextTick(callFinal, stream, state); - } else { - state.prefinished = true; - stream.emit('prefinish'); - } - } -} - -function finishMaybe(stream, state) { - var need = needFinish(state); - if (need) { - prefinish(stream, state); - if (state.pendingcb === 0) { - state.finished = true; - stream.emit('finish'); - } - } - return need; -} - -function endWritable(stream, state, cb) { - state.ending = true; - finishMaybe(stream, state); - if (cb) { - if (state.finished) pna.nextTick(cb);else stream.once('finish', cb); - } - state.ended = true; - stream.writable = false; -} - -function onCorkedFinish(corkReq, state, err) { - var entry = corkReq.entry; - corkReq.entry = null; - while (entry) { - var cb = entry.callback; - state.pendingcb--; - cb(err); - entry = entry.next; - } - if (state.corkedRequestsFree) { - state.corkedRequestsFree.next = corkReq; - } else { - state.corkedRequestsFree = corkReq; - } -} - -Object.defineProperty(Writable.prototype, 'destroyed', { - get: function () { - if (this._writableState === undefined) { - return false; - } - return this._writableState.destroyed; - }, - set: function (value) { - // we ignore the value if the stream - // has not been initialized yet - if (!this._writableState) { - return; - } - - // backward compatibility, the user is explicitly - // managing destroyed - this._writableState.destroyed = value; - } -}); - -Writable.prototype.destroy = destroyImpl.destroy; -Writable.prototype._undestroy = destroyImpl.undestroy; -Writable.prototype._destroy = function (err, cb) { - this.end(); - cb(err); -}; -/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../process/browser.js */ "../node_modules/process/browser.js"), __webpack_require__(/*! ./../../timers-browserify/main.js */ "../node_modules/timers-browserify/main.js").setImmediate, __webpack_require__(/*! ./../../webpack/buildin/global.js */ "../node_modules/webpack/buildin/global.js"))) - -/***/ }), - -/***/ "../node_modules/readable-stream/lib/internal/streams/BufferList.js": -/*!**************************************************************************!*\ - !*** ../node_modules/readable-stream/lib/internal/streams/BufferList.js ***! - \**************************************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -var Buffer = __webpack_require__(/*! safe-buffer */ "../node_modules/safe-buffer/index.js").Buffer; -var util = __webpack_require__(/*! util */ 1); - -function copyBuffer(src, target, offset) { - src.copy(target, offset); -} - -module.exports = function () { - function BufferList() { - _classCallCheck(this, BufferList); - - this.head = null; - this.tail = null; - this.length = 0; - } - - BufferList.prototype.push = function push(v) { - var entry = { data: v, next: null }; - if (this.length > 0) this.tail.next = entry;else this.head = entry; - this.tail = entry; - ++this.length; - }; - - BufferList.prototype.unshift = function unshift(v) { - var entry = { data: v, next: this.head }; - if (this.length === 0) this.tail = entry; - this.head = entry; - ++this.length; - }; - - BufferList.prototype.shift = function shift() { - if (this.length === 0) return; - var ret = this.head.data; - if (this.length === 1) this.head = this.tail = null;else this.head = this.head.next; - --this.length; - return ret; - }; - - BufferList.prototype.clear = function clear() { - this.head = this.tail = null; - this.length = 0; - }; - - BufferList.prototype.join = function join(s) { - if (this.length === 0) return ''; - var p = this.head; - var ret = '' + p.data; - while (p = p.next) { - ret += s + p.data; - }return ret; - }; - - BufferList.prototype.concat = function concat(n) { - if (this.length === 0) return Buffer.alloc(0); - if (this.length === 1) return this.head.data; - var ret = Buffer.allocUnsafe(n >>> 0); - var p = this.head; - var i = 0; - while (p) { - copyBuffer(p.data, ret, i); - i += p.data.length; - p = p.next; - } - return ret; - }; - - return BufferList; -}(); - -if (util && util.inspect && util.inspect.custom) { - module.exports.prototype[util.inspect.custom] = function () { - var obj = util.inspect({ length: this.length }); - return this.constructor.name + ' ' + obj; - }; -} - -/***/ }), - -/***/ "../node_modules/readable-stream/lib/internal/streams/destroy.js": -/*!***********************************************************************!*\ - !*** ../node_modules/readable-stream/lib/internal/streams/destroy.js ***! - \***********************************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -/**/ - -var pna = __webpack_require__(/*! process-nextick-args */ "../node_modules/process-nextick-args/index.js"); -/**/ - -// undocumented cb() API, needed for core, not for public API -function destroy(err, cb) { - var _this = this; - - var readableDestroyed = this._readableState && this._readableState.destroyed; - var writableDestroyed = this._writableState && this._writableState.destroyed; - - if (readableDestroyed || writableDestroyed) { - if (cb) { - cb(err); - } else if (err && (!this._writableState || !this._writableState.errorEmitted)) { - pna.nextTick(emitErrorNT, this, err); - } - return this; - } - - // we set destroyed to true before firing error callbacks in order - // to make it re-entrance safe in case destroy() is called within callbacks - - if (this._readableState) { - this._readableState.destroyed = true; - } - - // if this is a duplex stream mark the writable part as destroyed as well - if (this._writableState) { - this._writableState.destroyed = true; - } - - this._destroy(err || null, function (err) { - if (!cb && err) { - pna.nextTick(emitErrorNT, _this, err); - if (_this._writableState) { - _this._writableState.errorEmitted = true; - } - } else if (cb) { - cb(err); - } - }); - - return this; -} - -function undestroy() { - if (this._readableState) { - this._readableState.destroyed = false; - this._readableState.reading = false; - this._readableState.ended = false; - this._readableState.endEmitted = false; - } - - if (this._writableState) { - this._writableState.destroyed = false; - this._writableState.ended = false; - this._writableState.ending = false; - this._writableState.finished = false; - this._writableState.errorEmitted = false; - } -} - -function emitErrorNT(self, err) { - self.emit('error', err); -} - -module.exports = { - destroy: destroy, - undestroy: undestroy -}; - -/***/ }), - -/***/ "../node_modules/readable-stream/lib/internal/streams/stream-browser.js": -/*!******************************************************************************!*\ - !*** ../node_modules/readable-stream/lib/internal/streams/stream-browser.js ***! - \******************************************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -module.exports = __webpack_require__(/*! events */ "../node_modules/events/events.js").EventEmitter; - - -/***/ }), - -/***/ "../node_modules/readable-stream/readable-browser.js": -/*!***********************************************************!*\ - !*** ../node_modules/readable-stream/readable-browser.js ***! - \***********************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -exports = module.exports = __webpack_require__(/*! ./lib/_stream_readable.js */ "../node_modules/readable-stream/lib/_stream_readable.js"); -exports.Stream = exports; -exports.Readable = exports; -exports.Writable = __webpack_require__(/*! ./lib/_stream_writable.js */ "../node_modules/readable-stream/lib/_stream_writable.js"); -exports.Duplex = __webpack_require__(/*! ./lib/_stream_duplex.js */ "../node_modules/readable-stream/lib/_stream_duplex.js"); -exports.Transform = __webpack_require__(/*! ./lib/_stream_transform.js */ "../node_modules/readable-stream/lib/_stream_transform.js"); -exports.PassThrough = __webpack_require__(/*! ./lib/_stream_passthrough.js */ "../node_modules/readable-stream/lib/_stream_passthrough.js"); - - /***/ }), /***/ "../node_modules/safe-buffer/index.js": @@ -11340,85 +15862,6 @@ exports.clearImmediate = (typeof self !== "undefined" && self.clearImmediate) || /***/ }), -/***/ "../node_modules/util-deprecate/browser.js": -/*!*************************************************!*\ - !*** ../node_modules/util-deprecate/browser.js ***! - \*************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -/* WEBPACK VAR INJECTION */(function(global) { -/** - * Module exports. - */ - -module.exports = deprecate; - -/** - * Mark that a method should not be used. - * Returns a modified function which warns once by default. - * - * If `localStorage.noDeprecation = true` is set, then it is a no-op. - * - * If `localStorage.throwDeprecation = true` is set, then deprecated functions - * will throw an Error when invoked. - * - * If `localStorage.traceDeprecation = true` is set, then deprecated functions - * will invoke `console.trace()` instead of `console.error()`. - * - * @param {Function} fn - the function to deprecate - * @param {String} msg - the string to print to the console when `fn` is invoked - * @returns {Function} a new "deprecated" version of `fn` - * @api public - */ - -function deprecate (fn, msg) { - if (config('noDeprecation')) { - return fn; - } - - var warned = false; - function deprecated() { - if (!warned) { - if (config('throwDeprecation')) { - throw new Error(msg); - } else if (config('traceDeprecation')) { - console.trace(msg); - } else { - console.warn(msg); - } - warned = true; - } - return fn.apply(this, arguments); - } - - return deprecated; -} - -/** - * Checks `localStorage` for boolean values for the given `name`. - * - * @param {String} name - * @returns {Boolean} - * @api private - */ - -function config (name) { - // accessing global.localStorage can trigger a DOMException in sandboxed iframes - try { - if (!global.localStorage) return false; - } catch (_) { - return false; - } - var val = global.localStorage[name]; - if (null == val) return false; - return String(val).toLowerCase() === 'true'; -} - -/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../webpack/buildin/global.js */ "../node_modules/webpack/buildin/global.js"))) - -/***/ }), - /***/ "../node_modules/util/support/isBufferBrowser.js": /*!*******************************************************!*\ !*** ../node_modules/util/support/isBufferBrowser.js ***! @@ -13645,7 +18088,7 @@ function getCaptureIdAttributeName(referenceCaptureId) { return "_bl_" + referenceCaptureId; } // Support receiving ElementRef instances as args in interop calls -var elementRefKey = '_blazorElementRef'; // Keep in sync with ElementRef.cs +var elementRefKey = '__internalId'; // Keep in sync with ElementRef.cs DotNet.attachReviver(function (key, value) { if (value && typeof value === 'object' && value.hasOwnProperty(elementRefKey) && typeof value[elementRefKey] === 'string') { return getElementByCaptureId(value[elementRefKey]); @@ -14773,7 +19216,7 @@ function sendAsync(id, body, jsonFetchArgs) { switch (_a.label) { case 0: fetchOptions = JSON.parse(Environment_1.platform.toJavaScriptString(jsonFetchArgs)); - requestInit = Object.assign(fetchOptions.requestInit, fetchOptions.requestInitOverrides); + requestInit = Object.assign(convertToRequestInit(fetchOptions.requestInit), fetchOptions.requestInitOverrides); if (body) { requestInit.body = Environment_1.platform.toUint8Array(body); } @@ -14798,6 +19241,13 @@ function sendAsync(id, body, jsonFetchArgs) { }); }); } +function convertToRequestInit(blazorRequestInit) { + return { + credentials: blazorRequestInit.credentials, + method: blazorRequestInit.method, + headers: blazorRequestInit.headers.map(function (item) { return [item.name, item.value]; }) + }; +} function dispatchSuccessResponse(id, response, responseData) { var responseDescriptor = { statusCode: response.status, @@ -14805,7 +19255,7 @@ function dispatchSuccessResponse(id, response, responseData) { headers: [], }; response.headers.forEach(function (value, name) { - responseDescriptor.headers.push([name, value]); + responseDescriptor.headers.push({ name: name, value: value }); }); if (!allocateArrayMethod) { allocateArrayMethod = Environment_1.platform.findMethod(httpClientAssembly, httpClientNamespace, httpClientTypeName, 'AllocateArray'); diff --git a/src/Components/Browser.JS/dist/Debug/blazor.webassembly.js b/src/Components/Browser.JS/dist/Debug/blazor.webassembly.js index 328a626aea..0d464ecb0e 100644 --- a/src/Components/Browser.JS/dist/Debug/blazor.webassembly.js +++ b/src/Components/Browser.JS/dist/Debug/blazor.webassembly.js @@ -316,17 +316,14 @@ var DotNet; promise.catch(function (error) { return console.error(error); }); }; DotNetObject.prototype.serializeAsArg = function () { - return "__dotNetObject:" + this._id; + return { __dotNetObject: this._id }; }; return DotNetObject; }()); - var dotNetObjectValueFormat = /^__dotNetObject\:(\d+)$/; + var dotNetObjectRefKey = '__dotNetObject'; attachReviver(function reviveDotNetObject(key, value) { - if (typeof value === 'string') { - var match = value.match(dotNetObjectValueFormat); - if (match) { - return new DotNetObject(parseInt(match[1])); - } + if (value && typeof value === 'object' && value.hasOwnProperty(dotNetObjectRefKey)) { + return new DotNetObject(value.__dotNetObject); } // Unrecognized - let another reviver handle it return value; @@ -880,6 +877,7 @@ function createEmscriptenModuleInstance(loadAssemblyUrls, onReady, onError) { }); }); module.postRun.push(function () { + MONO.mono_wasm_setenv("MONO_URI_DOTNETRELATIVEORABSOLUTE", "true"); var load_runtime = Module.cwrap('mono_wasm_load_runtime', null, ['string', 'number']); load_runtime(appBinDirName, MonoDebugger_1.hasDebuggingEnabled() ? 1 : 0); MONO.mono_wasm_runtime_is_ready = true; @@ -1405,7 +1403,7 @@ function getCaptureIdAttributeName(referenceCaptureId) { return "_bl_" + referenceCaptureId; } // Support receiving ElementRef instances as args in interop calls -var elementRefKey = '_blazorElementRef'; // Keep in sync with ElementRef.cs +var elementRefKey = '__internalId'; // Keep in sync with ElementRef.cs DotNet.attachReviver(function (key, value) { if (value && typeof value === 'object' && value.hasOwnProperty(elementRefKey) && typeof value[elementRefKey] === 'string') { return getElementByCaptureId(value[elementRefKey]); @@ -2338,7 +2336,7 @@ function sendAsync(id, body, jsonFetchArgs) { switch (_a.label) { case 0: fetchOptions = JSON.parse(Environment_1.platform.toJavaScriptString(jsonFetchArgs)); - requestInit = Object.assign(fetchOptions.requestInit, fetchOptions.requestInitOverrides); + requestInit = Object.assign(convertToRequestInit(fetchOptions.requestInit), fetchOptions.requestInitOverrides); if (body) { requestInit.body = Environment_1.platform.toUint8Array(body); } @@ -2363,6 +2361,13 @@ function sendAsync(id, body, jsonFetchArgs) { }); }); } +function convertToRequestInit(blazorRequestInit) { + return { + credentials: blazorRequestInit.credentials, + method: blazorRequestInit.method, + headers: blazorRequestInit.headers.map(function (item) { return [item.name, item.value]; }) + }; +} function dispatchSuccessResponse(id, response, responseData) { var responseDescriptor = { statusCode: response.status, @@ -2370,7 +2375,7 @@ function dispatchSuccessResponse(id, response, responseData) { headers: [], }; response.headers.forEach(function (value, name) { - responseDescriptor.headers.push([name, value]); + responseDescriptor.headers.push({ name: name, value: value }); }); if (!allocateArrayMethod) { allocateArrayMethod = Environment_1.platform.findMethod(httpClientAssembly, httpClientNamespace, httpClientTypeName, 'AllocateArray'); diff --git a/src/Components/Browser.JS/dist/Release/blazor.server.js b/src/Components/Browser.JS/dist/Release/blazor.server.js index 5745d30b93..cf70e47bf1 100644 --- a/src/Components/Browser.JS/dist/Release/blazor.server.js +++ b/src/Components/Browser.JS/dist/Release/blazor.server.js @@ -1,15 +1,15 @@ -!function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=46)}([function(e,t,n){"use strict";var r;n.d(t,"a",function(){return r}),function(e){e[e.Trace=0]="Trace",e[e.Debug=1]="Debug",e[e.Information=2]="Information",e[e.Warning=3]="Warning",e[e.Error=4]="Error",e[e.Critical=5]="Critical",e[e.None=6]="None"}(r||(r={}))},function(e,t,n){"use strict";n.d(t,"a",function(){return s}),n.d(t,"e",function(){return u}),n.d(t,"f",function(){return c}),n.d(t,"g",function(){return l}),n.d(t,"d",function(){return f}),n.d(t,"c",function(){return h}),n.d(t,"b",function(){return d});var r=n(0),o=n(3),i=function(e,t,n,r){return new(n||(n=Promise))(function(o,i){function a(e){try{u(r.next(e))}catch(e){i(e)}}function s(e){try{u(r.throw(e))}catch(e){i(e)}}function u(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(a,s)}u((r=r.apply(e,t||[])).next())})},a=function(e,t){var n,r,o,i,a={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function s(i){return function(s){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;a;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return a.label++,{value:i[1],done:!1};case 5:a.label++,r=i[1],i=[0];continue;case 7:i=a.ops.pop(),a.trys.pop();continue;default:if(!(o=(o=a.trys).length>0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]-1&&this.subject.observers.splice(e,1),0===this.subject.observers.length&&this.subject.cancelCallback().catch(function(e){})},e}(),d=function(){function e(e){this.minimumLogLevel=e}return e.prototype.log=function(e,t){if(e>=this.minimumLogLevel)switch(e){case r.a.Critical:case r.a.Error:console.error("["+(new Date).toISOString()+"] "+r.a[e]+": "+t);break;case r.a.Warning:console.warn("["+(new Date).toISOString()+"] "+r.a[e]+": "+t);break;case r.a.Information:console.info("["+(new Date).toISOString()+"] "+r.a[e]+": "+t);break;default:console.log("["+(new Date).toISOString()+"] "+r.a[e]+": "+t)}},e}()},function(e,t,n){"use strict";n.r(t);var r,o,i=(r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])},function(e,t){function n(){this.constructor=e}r(e,t),e.prototype=null===t?Object.create(t):(n.prototype=t.prototype,new n)}),a=function(e){function t(t,n){var r=this,o=this.constructor.prototype;return(r=e.call(this,t)||this).statusCode=n,r.__proto__=o,r}return i(t,e),t}(Error),s=function(e){function t(t){void 0===t&&(t="A timeout occurred.");var n=this,r=this.constructor.prototype;return(n=e.call(this,t)||this).__proto__=r,n}return i(t,e),t}(Error),u=function(e){function t(t){void 0===t&&(t="An abort occurred.");var n=this,r=this.constructor.prototype;return(n=e.call(this,t)||this).__proto__=r,n}return i(t,e),t}(Error),c=Object.assign||function(e){for(var t,n=1,r=arguments.length;n=200&&o.status<300?n(new l(o.status,o.statusText,o.response||o.responseText)):r(new a(o.statusText,o.status))},o.onerror=function(){t.logger.log(h.a.Warning,"Error from HTTP request. "+o.status+": "+o.statusText+"."),r(new a(o.statusText,o.status))},o.ontimeout=function(){t.logger.log(h.a.Warning,"Timeout from HTTP request."),r(new s)},o.send(e.content||"")}):Promise.reject(new Error("No url defined.")):Promise.reject(new Error("No method defined."))},t}(f),g=function(){var e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])};return function(t,n){function r(){this.constructor=t}e(t,n),t.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();if("undefined"==typeof XMLHttpRequest){var y=require;o=y("./NodeHttpClient")}var v,m=function(e){function t(t){var n=e.call(this)||this;if("undefined"!=typeof XMLHttpRequest)n.httpClient=new d(t);else{if(void 0===o)throw new Error("No HttpClient could be created.");n.httpClient=new o.NodeHttpClient(t)}return n}return g(t,e),t.prototype.send=function(e){return e.abortSignal&&e.abortSignal.aborted?Promise.reject(new u):e.method?e.url?this.httpClient.send(e):Promise.reject(new Error("No url defined.")):Promise.reject(new Error("No method defined."))},t.prototype.getCookieString=function(e){return this.httpClient.getCookieString(e)},t}(f),b=n(41);!function(e){e[e.Invocation=1]="Invocation",e[e.StreamItem=2]="StreamItem",e[e.Completion=3]="Completion",e[e.StreamInvocation=4]="StreamInvocation",e[e.CancelInvocation=5]="CancelInvocation",e[e.Ping=6]="Ping",e[e.Close=7]="Close"}(v||(v={}));var w,E=n(1),S=function(e,t,n,r){return new(n||(n=Promise))(function(o,i){function a(e){try{u(r.next(e))}catch(e){i(e)}}function s(e){try{u(r.throw(e))}catch(e){i(e)}}function u(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(a,s)}u((r=r.apply(e,t||[])).next())})},_=function(e,t){var n,r,o,i,a={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function s(i){return function(s){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;a;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return a.label++,{value:i[1],done:!1};case 5:a.label++,r=i[1],i=[0];continue;case 7:i=a.ops.pop(),a.trys.pop();continue;default:if(!(o=(o=a.trys).length>0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]=0){if((r!==C.WebSockets||this.options.WebSocket)&&(r!==C.ServerSentEvents||this.options.EventSource))return this.logger.log(h.a.Debug,"Selecting transport '"+C[r]+"'."),r;this.logger.log(h.a.Debug,"Skipping transport '"+C[r]+"' because it is not supported in your environment.'")}else this.logger.log(h.a.Debug,"Skipping transport '"+C[r]+"' because it does not support the requested transfer format '"+I[n]+"'.");else this.logger.log(h.a.Debug,"Skipping transport '"+C[r]+"' because it was disabled by the client.")}return null},e.prototype.isITransport=function(e){return e&&"object"==typeof e&&"connect"in e},e.prototype.changeState=function(e,t){return this.connectionState===e&&(this.connectionState=t,!0)},e.prototype.stopConnection=function(e){this.transport=void 0,(e=this.stopError||e)?this.logger.log(h.a.Error,"Connection disconnected with error '"+e+"'."):this.logger.log(h.a.Information,"Connection disconnected."),this.connectionState=2,this.onclose&&this.onclose(e)},e.prototype.resolveUrl=function(e){if(0===e.lastIndexOf("https://",0)||0===e.lastIndexOf("http://",0))return e;if("undefined"==typeof window||!window||!window.document)throw new Error("Cannot resolve '"+e+"'.");var t=window.document.createElement("a");return t.href=e,this.logger.log(h.a.Information,"Normalizing '"+e+"' to '"+t.href+"'."),t.href},e.prototype.resolveNegotiateUrl=function(e){var t=e.indexOf("?"),n=e.substring(0,-1===t?e.length:t);return"/"!==n[n.length-1]&&(n+="/"),n+="negotiate",n+=-1===t?"":e.substring(t)},e}();var Y=n(3),K=n(4),J="json",X=function(){function e(){this.name=J,this.version=1,this.transferFormat=I.Text}return e.prototype.parseMessages=function(e,t){if("string"!=typeof e)throw new Error("Invalid input for JSON hub protocol. Expected a string.");if(!e)return[];null===t&&(t=Y.a.instance);for(var n=[],r=0,o=K.a.parse(e);r0&&!t)throw new Error("New logical elements must start empty, or allowExistingContents must be true");return e[r]=[],e}function s(e,t,n){var i=e;if(e instanceof Comment&&(c(i)&&c(i).length>0))throw new Error("Not implemented: inserting non-empty logical container");if(u(i))throw new Error("Not implemented: moving existing logical children");var a=c(t);if(n0;)e(r,0);var i=r;i.parentNode.removeChild(i)},t.getLogicalParent=u,t.getLogicalSiblingEnd=function(e){return e[i]||null},t.getLogicalChild=function(e,t){return c(e)[t]},t.isSvgElement=function(e){return"http://www.w3.org/2000/svg"===l(e).namespaceURI},t.getLogicalChildrenArray=c,t.permuteLogicalChildren=function(e,t){var n=c(e);t.forEach(function(e){e.moveRangeStart=n[e.fromSiblingIndex],e.moveRangeEnd=function e(t){if(t instanceof Element)return t;var n=f(t);if(n)return n.previousSibling;var r=u(t);return r instanceof Element?r.lastChild:e(r)}(e.moveRangeStart)}),t.forEach(function(t){var r=t.moveToBeforeMarker=document.createComment("marker"),o=n[t.toSiblingIndex+1];o?o.parentNode.insertBefore(r,o):h(r,e)}),t.forEach(function(e){for(var t=e.moveToBeforeMarker,n=t.parentNode,r=e.moveRangeStart,o=e.moveRangeEnd,i=r;i;){var a=i.nextSibling;if(n.insertBefore(i,t),i===o)break;i=a}n.removeChild(t)}),t.forEach(function(e){n[e.toSiblingIndex]=e.moveRangeStart})},t.getClosestDomElement=l},function(e,t,n){"use strict";var r=n(18),o=Object.keys||function(e){var t=[];for(var n in e)t.push(n);return t};e.exports=f;var i=n(15);i.inherits=n(7);var a=n(33),s=n(37);i.inherits(f,a);for(var u=o(s.prototype),c=0;c0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]-1&&this.subject.observers.splice(e,1),0===this.subject.observers.length&&this.subject.cancelCallback&&this.subject.cancelCallback().catch(function(e){})},e}(),d=function(){function e(e){this.minimumLogLevel=e,this.outputConsole=console}return e.prototype.log=function(e,t){if(e>=this.minimumLogLevel)switch(e){case r.a.Critical:case r.a.Error:this.outputConsole.error("["+(new Date).toISOString()+"] "+r.a[e]+": "+t);break;case r.a.Warning:this.outputConsole.warn("["+(new Date).toISOString()+"] "+r.a[e]+": "+t);break;case r.a.Information:this.outputConsole.info("["+(new Date).toISOString()+"] "+r.a[e]+": "+t);break;default:this.outputConsole.log("["+(new Date).toISOString()+"] "+r.a[e]+": "+t)}},e}()},function(e,t,n){"use strict";n.d(t,"a",function(){return a}),n.d(t,"c",function(){return c}),n.d(t,"f",function(){return u}),n.d(t,"g",function(){return l}),n.d(t,"h",function(){return h}),n.d(t,"e",function(){return f}),n.d(t,"d",function(){return p}),n.d(t,"b",function(){return d});var r=n(1),o=n(10),i=function(e,t,n,r){return new(n||(n=Promise))(function(o,i){function s(e){try{c(r.next(e))}catch(e){i(e)}}function a(e){try{c(r.throw(e))}catch(e){i(e)}}function c(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(s,a)}c((r=r.apply(e,t||[])).next())})},s=function(e,t){var n,r,o,i,s={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function a(i){return function(a){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return s.label++,{value:i[1],done:!1};case 5:s.label++,r=i[1],i=[0];continue;case 7:i=s.ops.pop(),s.trys.pop();continue;default:if(!(o=(o=s.trys).length>0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]-1&&this.subject.observers.splice(e,1),0===this.subject.observers.length&&this.subject.cancelCallback&&this.subject.cancelCallback().catch(function(e){})},e}(),d=function(){function e(e){this.minimumLogLevel=e,this.outputConsole=console}return e.prototype.log=function(e,t){if(e>=this.minimumLogLevel)switch(e){case r.a.Critical:case r.a.Error:this.outputConsole.error("["+(new Date).toISOString()+"] "+r.a[e]+": "+t);break;case r.a.Warning:this.outputConsole.warn("["+(new Date).toISOString()+"] "+r.a[e]+": "+t);break;case r.a.Information:this.outputConsole.info("["+(new Date).toISOString()+"] "+r.a[e]+": "+t);break;default:this.outputConsole.log("["+(new Date).toISOString()+"] "+r.a[e]+": "+t)}},e}()},function(e,t,n){"use strict";n.d(t,"b",function(){return i}),n.d(t,"c",function(){return s}),n.d(t,"a",function(){return a});var r,o=(r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])},function(e,t){function n(){this.constructor=e}r(e,t),e.prototype=null===t?Object.create(t):(n.prototype=t.prototype,new n)}),i=function(e){function t(t,n){var r=this,o=this.constructor.prototype;return(r=e.call(this,t)||this).statusCode=n,r.__proto__=o,r}return o(t,e),t}(Error),s=function(e){function t(t){void 0===t&&(t="A timeout occurred.");var n=this,r=this.constructor.prototype;return(n=e.call(this,t)||this).__proto__=r,n}return o(t,e),t}(Error),a=function(e){function t(t){void 0===t&&(t="An abort occurred.");var n=this,r=this.constructor.prototype;return(n=e.call(this,t)||this).__proto__=r,n}return o(t,e),t}(Error)},function(e,t,n){"use strict";n.d(t,"b",function(){return i}),n.d(t,"c",function(){return s}),n.d(t,"a",function(){return a});var r,o=(r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])},function(e,t){function n(){this.constructor=e}r(e,t),e.prototype=null===t?Object.create(t):(n.prototype=t.prototype,new n)}),i=function(e){function t(t,n){var r=this,o=this.constructor.prototype;return(r=e.call(this,t)||this).statusCode=n,r.__proto__=o,r}return o(t,e),t}(Error),s=function(e){function t(t){void 0===t&&(t="A timeout occurred.");var n=this,r=this.constructor.prototype;return(n=e.call(this,t)||this).__proto__=r,n}return o(t,e),t}(Error),a=function(e){function t(t){void 0===t&&(t="An abort occurred.");var n=this,r=this.constructor.prototype;return(n=e.call(this,t)||this).__proto__=r,n}return o(t,e),t}(Error)},function(e,t,n){"use strict";n.d(t,"b",function(){return o}),n.d(t,"a",function(){return i});var r=Object.assign||function(e){for(var t,n=1,r=arguments.length;n * @license MIT */ -var r=n(47),o=n(48),i=n(31);function a(){return u.TYPED_ARRAY_SUPPORT?2147483647:1073741823}function s(e,t){if(a()=a())throw new RangeError("Attempt to allocate Buffer larger than maximum size: 0x"+a().toString(16)+" bytes");return 0|e}function d(e,t){if(u.isBuffer(e))return e.length;if("undefined"!=typeof ArrayBuffer&&"function"==typeof ArrayBuffer.isView&&(ArrayBuffer.isView(e)||e instanceof ArrayBuffer))return e.byteLength;"string"!=typeof e&&(e=""+e);var n=e.length;if(0===n)return 0;for(var r=!1;;)switch(t){case"ascii":case"latin1":case"binary":return n;case"utf8":case"utf-8":case void 0:return F(e).length;case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return 2*n;case"hex":return n>>>1;case"base64":return H(e).length;default:if(r)return F(e).length;t=(""+t).toLowerCase(),r=!0}}function g(e,t,n){var r=e[t];e[t]=e[n],e[n]=r}function y(e,t,n,r,o){if(0===e.length)return-1;if("string"==typeof n?(r=n,n=0):n>2147483647?n=2147483647:n<-2147483648&&(n=-2147483648),n=+n,isNaN(n)&&(n=o?0:e.length-1),n<0&&(n=e.length+n),n>=e.length){if(o)return-1;n=e.length-1}else if(n<0){if(!o)return-1;n=0}if("string"==typeof t&&(t=u.from(t,r)),u.isBuffer(t))return 0===t.length?-1:v(e,t,n,r,o);if("number"==typeof t)return t&=255,u.TYPED_ARRAY_SUPPORT&&"function"==typeof Uint8Array.prototype.indexOf?o?Uint8Array.prototype.indexOf.call(e,t,n):Uint8Array.prototype.lastIndexOf.call(e,t,n):v(e,[t],n,r,o);throw new TypeError("val must be string, number or Buffer")}function v(e,t,n,r,o){var i,a=1,s=e.length,u=t.length;if(void 0!==r&&("ucs2"===(r=String(r).toLowerCase())||"ucs-2"===r||"utf16le"===r||"utf-16le"===r)){if(e.length<2||t.length<2)return-1;a=2,s/=2,u/=2,n/=2}function c(e,t){return 1===a?e[t]:e.readUInt16BE(t*a)}if(o){var l=-1;for(i=n;is&&(n=s-u),i=n;i>=0;i--){for(var f=!0,h=0;ho&&(r=o):r=o;var i=t.length;if(i%2!=0)throw new TypeError("Invalid hex string");r>i/2&&(r=i/2);for(var a=0;a>8,o=n%256,i.push(o),i.push(r);return i}(t,e.length-n),e,n,r)}function T(e,t,n){return 0===t&&n===e.length?r.fromByteArray(e):r.fromByteArray(e.slice(t,n))}function k(e,t,n){n=Math.min(e.length,n);for(var r=[],o=t;o239?4:c>223?3:c>191?2:1;if(o+f<=n)switch(f){case 1:c<128&&(l=c);break;case 2:128==(192&(i=e[o+1]))&&(u=(31&c)<<6|63&i)>127&&(l=u);break;case 3:i=e[o+1],a=e[o+2],128==(192&i)&&128==(192&a)&&(u=(15&c)<<12|(63&i)<<6|63&a)>2047&&(u<55296||u>57343)&&(l=u);break;case 4:i=e[o+1],a=e[o+2],s=e[o+3],128==(192&i)&&128==(192&a)&&128==(192&s)&&(u=(15&c)<<18|(63&i)<<12|(63&a)<<6|63&s)>65535&&u<1114112&&(l=u)}null===l?(l=65533,f=1):l>65535&&(l-=65536,r.push(l>>>10&1023|55296),l=56320|1023&l),r.push(l),o+=f}return function(e){var t=e.length;if(t<=C)return String.fromCharCode.apply(String,e);var n="",r=0;for(;rthis.length)return"";if((void 0===n||n>this.length)&&(n=this.length),n<=0)return"";if((n>>>=0)<=(t>>>=0))return"";for(e||(e="utf8");;)switch(e){case"hex":return R(this,t,n);case"utf8":case"utf-8":return k(this,t,n);case"ascii":return I(this,t,n);case"latin1":case"binary":return x(this,t,n);case"base64":return T(this,t,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return O(this,t,n);default:if(r)throw new TypeError("Unknown encoding: "+e);e=(e+"").toLowerCase(),r=!0}}.apply(this,arguments)},u.prototype.equals=function(e){if(!u.isBuffer(e))throw new TypeError("Argument must be a Buffer");return this===e||0===u.compare(this,e)},u.prototype.inspect=function(){var e="",n=t.INSPECT_MAX_BYTES;return this.length>0&&(e=this.toString("hex",0,n).match(/.{2}/g).join(" "),this.length>n&&(e+=" ... ")),""},u.prototype.compare=function(e,t,n,r,o){if(!u.isBuffer(e))throw new TypeError("Argument must be a Buffer");if(void 0===t&&(t=0),void 0===n&&(n=e?e.length:0),void 0===r&&(r=0),void 0===o&&(o=this.length),t<0||n>e.length||r<0||o>this.length)throw new RangeError("out of range index");if(r>=o&&t>=n)return 0;if(r>=o)return-1;if(t>=n)return 1;if(this===e)return 0;for(var i=(o>>>=0)-(r>>>=0),a=(n>>>=0)-(t>>>=0),s=Math.min(i,a),c=this.slice(r,o),l=e.slice(t,n),f=0;fo)&&(n=o),e.length>0&&(n<0||t<0)||t>this.length)throw new RangeError("Attempt to write outside buffer bounds");r||(r="utf8");for(var i=!1;;)switch(r){case"hex":return m(this,e,t,n);case"utf8":case"utf-8":return b(this,e,t,n);case"ascii":return w(this,e,t,n);case"latin1":case"binary":return E(this,e,t,n);case"base64":return S(this,e,t,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return _(this,e,t,n);default:if(i)throw new TypeError("Unknown encoding: "+r);r=(""+r).toLowerCase(),i=!0}},u.prototype.toJSON=function(){return{type:"Buffer",data:Array.prototype.slice.call(this._arr||this,0)}};var C=4096;function I(e,t,n){var r="";n=Math.min(e.length,n);for(var o=t;or)&&(n=r);for(var o="",i=t;in)throw new RangeError("Trying to access beyond buffer length")}function M(e,t,n,r,o,i){if(!u.isBuffer(e))throw new TypeError('"buffer" argument must be a Buffer instance');if(t>o||te.length)throw new RangeError("Index out of range")}function L(e,t,n,r){t<0&&(t=65535+t+1);for(var o=0,i=Math.min(e.length-n,2);o>>8*(r?o:1-o)}function A(e,t,n,r){t<0&&(t=4294967295+t+1);for(var o=0,i=Math.min(e.length-n,4);o>>8*(r?o:3-o)&255}function B(e,t,n,r,o,i){if(n+r>e.length)throw new RangeError("Index out of range");if(n<0)throw new RangeError("Index out of range")}function D(e,t,n,r,i){return i||B(e,0,n,4),o.write(e,t,n,r,23,4),n+4}function U(e,t,n,r,i){return i||B(e,0,n,8),o.write(e,t,n,r,52,8),n+8}u.prototype.slice=function(e,t){var n,r=this.length;if((e=~~e)<0?(e+=r)<0&&(e=0):e>r&&(e=r),(t=void 0===t?r:~~t)<0?(t+=r)<0&&(t=0):t>r&&(t=r),t0&&(o*=256);)r+=this[e+--t]*o;return r},u.prototype.readUInt8=function(e,t){return t||P(e,1,this.length),this[e]},u.prototype.readUInt16LE=function(e,t){return t||P(e,2,this.length),this[e]|this[e+1]<<8},u.prototype.readUInt16BE=function(e,t){return t||P(e,2,this.length),this[e]<<8|this[e+1]},u.prototype.readUInt32LE=function(e,t){return t||P(e,4,this.length),(this[e]|this[e+1]<<8|this[e+2]<<16)+16777216*this[e+3]},u.prototype.readUInt32BE=function(e,t){return t||P(e,4,this.length),16777216*this[e]+(this[e+1]<<16|this[e+2]<<8|this[e+3])},u.prototype.readIntLE=function(e,t,n){e|=0,t|=0,n||P(e,t,this.length);for(var r=this[e],o=1,i=0;++i=(o*=128)&&(r-=Math.pow(2,8*t)),r},u.prototype.readIntBE=function(e,t,n){e|=0,t|=0,n||P(e,t,this.length);for(var r=t,o=1,i=this[e+--r];r>0&&(o*=256);)i+=this[e+--r]*o;return i>=(o*=128)&&(i-=Math.pow(2,8*t)),i},u.prototype.readInt8=function(e,t){return t||P(e,1,this.length),128&this[e]?-1*(255-this[e]+1):this[e]},u.prototype.readInt16LE=function(e,t){t||P(e,2,this.length);var n=this[e]|this[e+1]<<8;return 32768&n?4294901760|n:n},u.prototype.readInt16BE=function(e,t){t||P(e,2,this.length);var n=this[e+1]|this[e]<<8;return 32768&n?4294901760|n:n},u.prototype.readInt32LE=function(e,t){return t||P(e,4,this.length),this[e]|this[e+1]<<8|this[e+2]<<16|this[e+3]<<24},u.prototype.readInt32BE=function(e,t){return t||P(e,4,this.length),this[e]<<24|this[e+1]<<16|this[e+2]<<8|this[e+3]},u.prototype.readFloatLE=function(e,t){return t||P(e,4,this.length),o.read(this,e,!0,23,4)},u.prototype.readFloatBE=function(e,t){return t||P(e,4,this.length),o.read(this,e,!1,23,4)},u.prototype.readDoubleLE=function(e,t){return t||P(e,8,this.length),o.read(this,e,!0,52,8)},u.prototype.readDoubleBE=function(e,t){return t||P(e,8,this.length),o.read(this,e,!1,52,8)},u.prototype.writeUIntLE=function(e,t,n,r){(e=+e,t|=0,n|=0,r)||M(this,e,t,n,Math.pow(2,8*n)-1,0);var o=1,i=0;for(this[t]=255&e;++i=0&&(i*=256);)this[t+o]=e/i&255;return t+n},u.prototype.writeUInt8=function(e,t,n){return e=+e,t|=0,n||M(this,e,t,1,255,0),u.TYPED_ARRAY_SUPPORT||(e=Math.floor(e)),this[t]=255&e,t+1},u.prototype.writeUInt16LE=function(e,t,n){return e=+e,t|=0,n||M(this,e,t,2,65535,0),u.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8):L(this,e,t,!0),t+2},u.prototype.writeUInt16BE=function(e,t,n){return e=+e,t|=0,n||M(this,e,t,2,65535,0),u.TYPED_ARRAY_SUPPORT?(this[t]=e>>>8,this[t+1]=255&e):L(this,e,t,!1),t+2},u.prototype.writeUInt32LE=function(e,t,n){return e=+e,t|=0,n||M(this,e,t,4,4294967295,0),u.TYPED_ARRAY_SUPPORT?(this[t+3]=e>>>24,this[t+2]=e>>>16,this[t+1]=e>>>8,this[t]=255&e):A(this,e,t,!0),t+4},u.prototype.writeUInt32BE=function(e,t,n){return e=+e,t|=0,n||M(this,e,t,4,4294967295,0),u.TYPED_ARRAY_SUPPORT?(this[t]=e>>>24,this[t+1]=e>>>16,this[t+2]=e>>>8,this[t+3]=255&e):A(this,e,t,!1),t+4},u.prototype.writeIntLE=function(e,t,n,r){if(e=+e,t|=0,!r){var o=Math.pow(2,8*n-1);M(this,e,t,n,o-1,-o)}var i=0,a=1,s=0;for(this[t]=255&e;++i>0)-s&255;return t+n},u.prototype.writeIntBE=function(e,t,n,r){if(e=+e,t|=0,!r){var o=Math.pow(2,8*n-1);M(this,e,t,n,o-1,-o)}var i=n-1,a=1,s=0;for(this[t+i]=255&e;--i>=0&&(a*=256);)e<0&&0===s&&0!==this[t+i+1]&&(s=1),this[t+i]=(e/a>>0)-s&255;return t+n},u.prototype.writeInt8=function(e,t,n){return e=+e,t|=0,n||M(this,e,t,1,127,-128),u.TYPED_ARRAY_SUPPORT||(e=Math.floor(e)),e<0&&(e=255+e+1),this[t]=255&e,t+1},u.prototype.writeInt16LE=function(e,t,n){return e=+e,t|=0,n||M(this,e,t,2,32767,-32768),u.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8):L(this,e,t,!0),t+2},u.prototype.writeInt16BE=function(e,t,n){return e=+e,t|=0,n||M(this,e,t,2,32767,-32768),u.TYPED_ARRAY_SUPPORT?(this[t]=e>>>8,this[t+1]=255&e):L(this,e,t,!1),t+2},u.prototype.writeInt32LE=function(e,t,n){return e=+e,t|=0,n||M(this,e,t,4,2147483647,-2147483648),u.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8,this[t+2]=e>>>16,this[t+3]=e>>>24):A(this,e,t,!0),t+4},u.prototype.writeInt32BE=function(e,t,n){return e=+e,t|=0,n||M(this,e,t,4,2147483647,-2147483648),e<0&&(e=4294967295+e+1),u.TYPED_ARRAY_SUPPORT?(this[t]=e>>>24,this[t+1]=e>>>16,this[t+2]=e>>>8,this[t+3]=255&e):A(this,e,t,!1),t+4},u.prototype.writeFloatLE=function(e,t,n){return D(this,e,t,!0,n)},u.prototype.writeFloatBE=function(e,t,n){return D(this,e,t,!1,n)},u.prototype.writeDoubleLE=function(e,t,n){return U(this,e,t,!0,n)},u.prototype.writeDoubleBE=function(e,t,n){return U(this,e,t,!1,n)},u.prototype.copy=function(e,t,n,r){if(n||(n=0),r||0===r||(r=this.length),t>=e.length&&(t=e.length),t||(t=0),r>0&&r=this.length)throw new RangeError("sourceStart out of bounds");if(r<0)throw new RangeError("sourceEnd out of bounds");r>this.length&&(r=this.length),e.length-t=0;--o)e[o+t]=this[o+n];else if(i<1e3||!u.TYPED_ARRAY_SUPPORT)for(o=0;o>>=0,n=void 0===n?this.length:n>>>0,e||(e=0),"number"==typeof e)for(i=t;i55295&&n<57344){if(!o){if(n>56319){(t-=3)>-1&&i.push(239,191,189);continue}if(a+1===r){(t-=3)>-1&&i.push(239,191,189);continue}o=n;continue}if(n<56320){(t-=3)>-1&&i.push(239,191,189),o=n;continue}n=65536+(o-55296<<10|n-56320)}else o&&(t-=3)>-1&&i.push(239,191,189);if(o=null,n<128){if((t-=1)<0)break;i.push(n)}else if(n<2048){if((t-=2)<0)break;i.push(n>>6|192,63&n|128)}else if(n<65536){if((t-=3)<0)break;i.push(n>>12|224,n>>6&63|128,63&n|128)}else{if(!(n<1114112))throw new Error("Invalid code point");if((t-=4)<0)break;i.push(n>>18|240,n>>12&63|128,n>>6&63|128,63&n|128)}}return i}function H(e){return r.toByteArray(function(e){if((e=function(e){return e.trim?e.trim():e.replace(/^\s+|\s+$/g,"")}(e).replace(N,"")).length<2)return"";for(;e.length%4!=0;)e+="=";return e}(e))}function q(e,t,n,r){for(var o=0;o=t.length||o>=e.length);++o)t[o+n]=e[o];return o}}).call(this,n(5))},function(e,t,n){"use strict";var r;!function(e){window.DotNet=e;var t=[],n={},r={},o=1,i=null;function a(e){t.push(e)}function s(e,t){for(var n=[],r=2;r1)for(var n=1;n0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]this.length||e<0)){var t=this._offset(e);return this._bufs[t[0]][t[1]]}},a.prototype.slice=function(e,t){return"number"==typeof e&&e<0&&(e+=this.length),"number"==typeof t&&t<0&&(t+=this.length),this.copy(null,0,e,t)},a.prototype.copy=function(e,t,n,r){if(("number"!=typeof n||n<0)&&(n=0),("number"!=typeof r||r>this.length)&&(r=this.length),n>=this.length)return e||i.alloc(0);if(r<=0)return e||i.alloc(0);var o,a,s=!!e,u=this._offset(n),c=r-n,l=c,f=s&&t||0,h=u[1];if(0===n&&r==this.length){if(!s)return 1===this._bufs.length?this._bufs[0]:i.concat(this._bufs,this.length);for(a=0;a(o=this._bufs[a].length-h))){this._bufs[a].copy(e,f,h,h+l);break}this._bufs[a].copy(e,f,h),f+=o,l-=o,h&&(h=0)}return e},a.prototype.shallowSlice=function(e,t){if(e=e||0,t="number"!=typeof t?this.length:t,e<0&&(e+=this.length),t<0&&(t+=this.length),e===t)return new a;var n=this._offset(e),r=this._offset(t),o=this._bufs.slice(n[0],r[0]+1);return 0==r[1]?o.pop():o[o.length-1]=o[o.length-1].slice(0,r[1]),0!=n[1]&&(o[0]=o[0].slice(n[1])),new a(o)},a.prototype.toString=function(e,t,n){return this.slice(t,n).toString(e)},a.prototype.consume=function(e){for(;this._bufs.length;){if(!(e>=this._bufs[0].length)){this._bufs[0]=this._bufs[0].slice(e),this.length-=e;break}e-=this._bufs[0].length,this.length-=this._bufs[0].length,this._bufs.shift()}return this},a.prototype.duplicate=function(){for(var e=0,t=new a;ethis.length?this.length:t;for(var r=this._offset(t),o=r[0],s=r[1];o=e.length){var c=u.indexOf(e,s);if(-1!==c)return this._reverseOffset([o,c]);s=u.length-e.length+1}else{var l=this._reverseOffset([o,s]);if(this._match(l,e))return l;s++}}s=0}return-1},a.prototype._match=function(e,t){if(this.length-e=0,"must have a non-negative type"),o(a,"must have a decode function"),this.registerEncoder(function(e){return e instanceof t},function(t){var o=i(),a=r.allocUnsafe(1);return a.writeInt8(e,0),o.append(a),o.append(n(t)),o}),this.registerDecoder(e,a),this},registerEncoder:function(e,n){return o(e,"must have an encode function"),o(n,"must have an encode function"),t.push({check:e,encode:n}),this},registerDecoder:function(e,t){return o(e>=0,"must have a non-negative type"),o(t,"must have a decode function"),n.push({type:e,decode:t}),this},encoder:a.encoder,decoder:a.decoder,buffer:!0,type:"msgpack5",IncompleteBufferError:s.IncompleteBufferError}}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(16),o=n(22),i=n(8);window.Blazor={navigateTo:r.navigateTo,_internal:{attachRootComponentToElement:i.attachRootComponentToElement,http:o.internalFunctions,uriHelper:r.internalFunctions}}},function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,i){function a(e){try{u(r.next(e))}catch(e){i(e)}}function s(e){try{u(r.throw(e))}catch(e){i(e)}}function u(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(a,s)}u((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,i,a={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function s(i){return function(s){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;a;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return a.label++,{value:i[1],done:!1};case 5:a.label++,r=i[1],i=[0];continue;case 7:i=a.ops.pop(),a.trys.pop();continue;default:if(!(o=(o=a.trys).length>0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]=i)return e;switch(e){case"%s":return String(r[n++]);case"%d":return Number(r[n++]);case"%j":try{return JSON.stringify(r[n++])}catch(e){return"[Circular]"}default:return e}}),u=r[n];n=3&&(r.depth=arguments[2]),arguments.length>=4&&(r.colors=arguments[3]),d(n)?r.showHidden=n:n&&t._extend(r,n),m(r.showHidden)&&(r.showHidden=!1),m(r.depth)&&(r.depth=2),m(r.colors)&&(r.colors=!1),m(r.customInspect)&&(r.customInspect=!0),r.colors&&(r.stylize=u),l(r,e,r.depth)}function u(e,t){var n=s.styles[t];return n?"["+s.colors[n][0]+"m"+e+"["+s.colors[n][1]+"m":e}function c(e,t){return e}function l(e,n,r){if(e.customInspect&&n&&_(n.inspect)&&n.inspect!==t.inspect&&(!n.constructor||n.constructor.prototype!==n)){var o=n.inspect(r,e);return v(o)||(o=l(e,o,r)),o}var i=function(e,t){if(m(t))return e.stylize("undefined","undefined");if(v(t)){var n="'"+JSON.stringify(t).replace(/^"|"$/g,"").replace(/'/g,"\\'").replace(/\\"/g,'"')+"'";return e.stylize(n,"string")}if(y(t))return e.stylize(""+t,"number");if(d(t))return e.stylize(""+t,"boolean");if(g(t))return e.stylize("null","null")}(e,n);if(i)return i;var a=Object.keys(n),s=function(e){var t={};return e.forEach(function(e,n){t[e]=!0}),t}(a);if(e.showHidden&&(a=Object.getOwnPropertyNames(n)),S(n)&&(a.indexOf("message")>=0||a.indexOf("description")>=0))return f(n);if(0===a.length){if(_(n)){var u=n.name?": "+n.name:"";return e.stylize("[Function"+u+"]","special")}if(b(n))return e.stylize(RegExp.prototype.toString.call(n),"regexp");if(E(n))return e.stylize(Date.prototype.toString.call(n),"date");if(S(n))return f(n)}var c,w="",T=!1,k=["{","}"];(p(n)&&(T=!0,k=["[","]"]),_(n))&&(w=" [Function"+(n.name?": "+n.name:"")+"]");return b(n)&&(w=" "+RegExp.prototype.toString.call(n)),E(n)&&(w=" "+Date.prototype.toUTCString.call(n)),S(n)&&(w=" "+f(n)),0!==a.length||T&&0!=n.length?r<0?b(n)?e.stylize(RegExp.prototype.toString.call(n),"regexp"):e.stylize("[Object]","special"):(e.seen.push(n),c=T?function(e,t,n,r,o){for(var i=[],a=0,s=t.length;a=0&&0,e+t.replace(/\u001b\[\d\d?m/g,"").length+1},0)>60)return n[0]+(""===t?"":t+"\n ")+" "+e.join(",\n ")+" "+n[1];return n[0]+t+" "+e.join(", ")+" "+n[1]}(c,w,k)):k[0]+w+k[1]}function f(e){return"["+Error.prototype.toString.call(e)+"]"}function h(e,t,n,r,o,i){var a,s,u;if((u=Object.getOwnPropertyDescriptor(t,o)||{value:t[o]}).get?s=u.set?e.stylize("[Getter/Setter]","special"):e.stylize("[Getter]","special"):u.set&&(s=e.stylize("[Setter]","special")),I(r,o)||(a="["+o+"]"),s||(e.seen.indexOf(u.value)<0?(s=g(n)?l(e,u.value,null):l(e,u.value,n-1)).indexOf("\n")>-1&&(s=i?s.split("\n").map(function(e){return" "+e}).join("\n").substr(2):"\n"+s.split("\n").map(function(e){return" "+e}).join("\n")):s=e.stylize("[Circular]","special")),m(a)){if(i&&o.match(/^\d+$/))return s;(a=JSON.stringify(""+o)).match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)?(a=a.substr(1,a.length-2),a=e.stylize(a,"name")):(a=a.replace(/'/g,"\\'").replace(/\\"/g,'"').replace(/(^"|"$)/g,"'"),a=e.stylize(a,"string"))}return a+": "+s}function p(e){return Array.isArray(e)}function d(e){return"boolean"==typeof e}function g(e){return null===e}function y(e){return"number"==typeof e}function v(e){return"string"==typeof e}function m(e){return void 0===e}function b(e){return w(e)&&"[object RegExp]"===T(e)}function w(e){return"object"==typeof e&&null!==e}function E(e){return w(e)&&"[object Date]"===T(e)}function S(e){return w(e)&&("[object Error]"===T(e)||e instanceof Error)}function _(e){return"function"==typeof e}function T(e){return Object.prototype.toString.call(e)}function k(e){return e<10?"0"+e.toString(10):e.toString(10)}t.debuglog=function(n){if(m(i)&&(i=e.env.NODE_DEBUG||""),n=n.toUpperCase(),!a[n])if(new RegExp("\\b"+n+"\\b","i").test(i)){var r=e.pid;a[n]=function(){var e=t.format.apply(t,arguments);console.error("%s %d: %s",n,r,e)}}else a[n]=function(){};return a[n]},t.inspect=s,s.colors={bold:[1,22],italic:[3,23],underline:[4,24],inverse:[7,27],white:[37,39],grey:[90,39],black:[30,39],blue:[34,39],cyan:[36,39],green:[32,39],magenta:[35,39],red:[31,39],yellow:[33,39]},s.styles={special:"cyan",number:"yellow",boolean:"yellow",undefined:"grey",null:"bold",string:"green",date:"magenta",regexp:"red"},t.isArray=p,t.isBoolean=d,t.isNull=g,t.isNullOrUndefined=function(e){return null==e},t.isNumber=y,t.isString=v,t.isSymbol=function(e){return"symbol"==typeof e},t.isUndefined=m,t.isRegExp=b,t.isObject=w,t.isDate=E,t.isError=S,t.isFunction=_,t.isPrimitive=function(e){return null===e||"boolean"==typeof e||"number"==typeof e||"string"==typeof e||"symbol"==typeof e||void 0===e},t.isBuffer=n(50);var C=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];function I(e,t){return Object.prototype.hasOwnProperty.call(e,t)}t.log=function(){var e,n;console.log("%s - %s",(e=new Date,n=[k(e.getHours()),k(e.getMinutes()),k(e.getSeconds())].join(":"),[e.getDate(),C[e.getMonth()],n].join(" ")),t.format.apply(t,arguments))},t.inherits=n(7),t._extend=function(e,t){if(!t||!w(t))return e;for(var n=Object.keys(t),r=n.length;r--;)e[n[r]]=t[n[r]];return e};var x="undefined"!=typeof Symbol?Symbol("util.promisify.custom"):void 0;function R(e,t){if(!e){var n=new Error("Promise was rejected with a falsy value");n.reason=e,e=n}return t(e)}t.promisify=function(e){if("function"!=typeof e)throw new TypeError('The "original" argument must be of type Function');if(x&&e[x]){var t;if("function"!=typeof(t=e[x]))throw new TypeError('The "util.promisify.custom" argument must be of type Function');return Object.defineProperty(t,x,{value:t,enumerable:!1,writable:!1,configurable:!0}),t}function t(){for(var t,n,r=new Promise(function(e,r){t=e,n=r}),o=[],i=0;i0?("string"==typeof t||a.objectMode||Object.getPrototypeOf(t)===c.prototype||(t=function(e){return c.from(e)}(t)),r?a.endEmitted?e.emit("error",new Error("stream.unshift() after end event")):E(e,a,t,!0):a.ended?e.emit("error",new Error("stream.push() after EOF")):(a.reading=!1,a.decoder&&!n?(t=a.decoder.write(t),a.objectMode||0!==t.length?E(e,a,t,!1):C(e,a)):E(e,a,t,!1))):r||(a.reading=!1));return function(e){return!e.ended&&(e.needReadable||e.lengtht.highWaterMark&&(t.highWaterMark=function(e){return e>=S?e=S:(e--,e|=e>>>1,e|=e>>>2,e|=e>>>4,e|=e>>>8,e|=e>>>16,e++),e}(e)),e<=t.length?e:t.ended?t.length:(t.needReadable=!0,0))}function T(e){var t=e._readableState;t.needReadable=!1,t.emittedReadable||(p("emitReadable",t.flowing),t.emittedReadable=!0,t.sync?o.nextTick(k,e):k(e))}function k(e){p("emit readable"),e.emit("readable"),O(e)}function C(e,t){t.readingMore||(t.readingMore=!0,o.nextTick(I,e,t))}function I(e,t){for(var n=t.length;!t.reading&&!t.flowing&&!t.ended&&t.length=t.length?(n=t.decoder?t.buffer.join(""):1===t.buffer.length?t.buffer.head.data:t.buffer.concat(t.length),t.buffer.clear()):n=function(e,t,n){var r;ei.length?i.length:e;if(a===i.length?o+=i:o+=i.slice(0,e),0===(e-=a)){a===i.length?(++r,n.next?t.head=n.next:t.head=t.tail=null):(t.head=n,n.data=i.slice(a));break}++r}return t.length-=r,o}(e,t):function(e,t){var n=c.allocUnsafe(e),r=t.head,o=1;r.data.copy(n),e-=r.data.length;for(;r=r.next;){var i=r.data,a=e>i.length?i.length:e;if(i.copy(n,n.length-e,0,a),0===(e-=a)){a===i.length?(++o,r.next?t.head=r.next:t.head=t.tail=null):(t.head=r,r.data=i.slice(a));break}++o}return t.length-=o,n}(e,t);return r}(e,t.buffer,t.decoder),n);var n}function M(e){var t=e._readableState;if(t.length>0)throw new Error('"endReadable()" called on non-empty stream');t.endEmitted||(t.ended=!0,o.nextTick(L,t,e))}function L(e,t){e.endEmitted||0!==e.length||(e.endEmitted=!0,t.readable=!1,t.emit("end"))}function A(e,t){for(var n=0,r=e.length;n=t.highWaterMark||t.ended))return p("read: emitReadable",t.length,t.ended),0===t.length&&t.ended?M(this):T(this),null;if(0===(e=_(e,t))&&t.ended)return 0===t.length&&M(this),null;var r,o=t.needReadable;return p("need readable",o),(0===t.length||t.length-e0?P(e,t):null)?(t.needReadable=!0,e=0):t.length-=e,0===t.length&&(t.ended||(t.needReadable=!0),n!==e&&t.ended&&M(this)),null!==r&&this.emit("data",r),r},b.prototype._read=function(e){this.emit("error",new Error("_read() is not implemented"))},b.prototype.pipe=function(e,t){var n=this,i=this._readableState;switch(i.pipesCount){case 0:i.pipes=e;break;case 1:i.pipes=[i.pipes,e];break;default:i.pipes.push(e)}i.pipesCount+=1,p("pipe count=%d opts=%j",i.pipesCount,t);var u=(!t||!1!==t.end)&&e!==r.stdout&&e!==r.stderr?l:b;function c(t,r){p("onunpipe"),t===n&&r&&!1===r.hasUnpiped&&(r.hasUnpiped=!0,p("cleanup"),e.removeListener("close",v),e.removeListener("finish",m),e.removeListener("drain",f),e.removeListener("error",y),e.removeListener("unpipe",c),n.removeListener("end",l),n.removeListener("end",b),n.removeListener("data",g),h=!0,!i.awaitDrain||e._writableState&&!e._writableState.needDrain||f())}function l(){p("onend"),e.end()}i.endEmitted?o.nextTick(u):n.once("end",u),e.on("unpipe",c);var f=function(e){return function(){var t=e._readableState;p("pipeOnDrain",t.awaitDrain),t.awaitDrain&&t.awaitDrain--,0===t.awaitDrain&&s(e,"data")&&(t.flowing=!0,O(e))}}(n);e.on("drain",f);var h=!1;var d=!1;function g(t){p("ondata"),d=!1,!1!==e.write(t)||d||((1===i.pipesCount&&i.pipes===e||i.pipesCount>1&&-1!==A(i.pipes,e))&&!h&&(p("false write response, pause",n._readableState.awaitDrain),n._readableState.awaitDrain++,d=!0),n.pause())}function y(t){p("onerror",t),b(),e.removeListener("error",y),0===s(e,"error")&&e.emit("error",t)}function v(){e.removeListener("finish",m),b()}function m(){p("onfinish"),e.removeListener("close",v),b()}function b(){p("unpipe"),n.unpipe(e)}return n.on("data",g),function(e,t,n){if("function"==typeof e.prependListener)return e.prependListener(t,n);e._events&&e._events[t]?a(e._events[t])?e._events[t].unshift(n):e._events[t]=[n,e._events[t]]:e.on(t,n)}(e,"error",y),e.once("close",v),e.once("finish",m),e.emit("pipe",n),i.flowing||(p("pipe resume"),n.resume()),e},b.prototype.unpipe=function(e){var t=this._readableState,n={hasUnpiped:!1};if(0===t.pipesCount)return this;if(1===t.pipesCount)return e&&e!==t.pipes?this:(e||(e=t.pipes),t.pipes=null,t.pipesCount=0,t.flowing=!1,e&&e.emit("unpipe",this,n),this);if(!e){var r=t.pipes,o=t.pipesCount;t.pipes=null,t.pipesCount=0,t.flowing=!1;for(var i=0;i0&&a.length>o&&!a.warned){a.warned=!0;var u=new Error("Possible EventEmitter memory leak detected. "+a.length+" "+String(t)+" listeners added. Use emitter.setMaxListeners() to increase limit");u.name="MaxListenersExceededWarning",u.emitter=e,u.type=t,u.count=a.length,s=u,console&&console.warn&&console.warn(s)}return e}function f(e,t,n){var r={fired:!1,wrapFn:void 0,target:e,type:t,listener:n},o=function(){for(var e=[],t=0;t0&&(a=t[0]),a instanceof Error)throw a;var s=new Error("Unhandled error."+(a?" ("+a.message+")":""));throw s.context=a,s}var u=o[e];if(void 0===u)return!1;if("function"==typeof u)i(u,this,t);else{var c=u.length,l=d(u,c);for(n=0;n=0;i--)if(n[i]===t||n[i].listener===t){a=n[i].listener,o=i;break}if(o<0)return this;0===o?n.shift():function(e,t){for(;t+1=0;r--)this.removeListener(e,t[r]);return this},s.prototype.listeners=function(e){return h(this,e,!0)},s.prototype.rawListeners=function(e){return h(this,e,!1)},s.listenerCount=function(e,t){return"function"==typeof e.listenerCount?e.listenerCount(t):p.call(e,t)},s.prototype.listenerCount=p,s.prototype.eventNames=function(){return this._eventsCount>0?r(this._events):[]}},function(e,t,n){e.exports=n(34).EventEmitter},function(e,t,n){"use strict";var r=n(18);function o(e,t){e.emit("error",t)}e.exports={destroy:function(e,t){var n=this,i=this._readableState&&this._readableState.destroyed,a=this._writableState&&this._writableState.destroyed;return i||a?(t?t(e):!e||this._writableState&&this._writableState.errorEmitted||r.nextTick(o,this,e),this):(this._readableState&&(this._readableState.destroyed=!0),this._writableState&&(this._writableState.destroyed=!0),this._destroy(e||null,function(e){!t&&e?(r.nextTick(o,n,e),n._writableState&&(n._writableState.errorEmitted=!0)):t&&t(e)}),this)},undestroy:function(){this._readableState&&(this._readableState.destroyed=!1,this._readableState.reading=!1,this._readableState.ended=!1,this._readableState.endEmitted=!1),this._writableState&&(this._writableState.destroyed=!1,this._writableState.ended=!1,this._writableState.ending=!1,this._writableState.finished=!1,this._writableState.errorEmitted=!1)}}},function(e,t,n){"use strict";(function(t,r,o){var i=n(18);function a(e){var t=this;this.next=null,this.entry=null,this.finish=function(){!function(e,t,n){var r=e.entry;e.entry=null;for(;r;){var o=r.callback;t.pendingcb--,o(n),r=r.next}t.corkedRequestsFree?t.corkedRequestsFree.next=e:t.corkedRequestsFree=e}(t,e)}}e.exports=m;var s,u=!t.browser&&["v0.10","v0.9."].indexOf(t.version.slice(0,5))>-1?r:i.nextTick;m.WritableState=v;var c=n(15);c.inherits=n(7);var l={deprecate:n(56)},f=n(35),h=n(6).Buffer,p=o.Uint8Array||function(){};var d,g=n(36);function y(){}function v(e,t){s=s||n(10),e=e||{};var r=t instanceof s;this.objectMode=!!e.objectMode,r&&(this.objectMode=this.objectMode||!!e.writableObjectMode);var o=e.highWaterMark,c=e.writableHighWaterMark,l=this.objectMode?16:16384;this.highWaterMark=o||0===o?o:r&&(c||0===c)?c:l,this.highWaterMark=Math.floor(this.highWaterMark),this.finalCalled=!1,this.needDrain=!1,this.ending=!1,this.ended=!1,this.finished=!1,this.destroyed=!1;var f=!1===e.decodeStrings;this.decodeStrings=!f,this.defaultEncoding=e.defaultEncoding||"utf8",this.length=0,this.writing=!1,this.corked=0,this.sync=!0,this.bufferProcessing=!1,this.onwrite=function(e){!function(e,t){var n=e._writableState,r=n.sync,o=n.writecb;if(function(e){e.writing=!1,e.writecb=null,e.length-=e.writelen,e.writelen=0}(n),t)!function(e,t,n,r,o){--t.pendingcb,n?(i.nextTick(o,r),i.nextTick(T,e,t),e._writableState.errorEmitted=!0,e.emit("error",r)):(o(r),e._writableState.errorEmitted=!0,e.emit("error",r),T(e,t))}(e,n,r,t,o);else{var a=S(n);a||n.corked||n.bufferProcessing||!n.bufferedRequest||E(e,n),r?u(w,e,n,a,o):w(e,n,a,o)}}(t,e)},this.writecb=null,this.writelen=0,this.bufferedRequest=null,this.lastBufferedRequest=null,this.pendingcb=0,this.prefinished=!1,this.errorEmitted=!1,this.bufferedRequestCount=0,this.corkedRequestsFree=new a(this)}function m(e){if(s=s||n(10),!(d.call(m,this)||this instanceof s))return new m(e);this._writableState=new v(e,this),this.writable=!0,e&&("function"==typeof e.write&&(this._write=e.write),"function"==typeof e.writev&&(this._writev=e.writev),"function"==typeof e.destroy&&(this._destroy=e.destroy),"function"==typeof e.final&&(this._final=e.final)),f.call(this)}function b(e,t,n,r,o,i,a){t.writelen=r,t.writecb=a,t.writing=!0,t.sync=!0,n?e._writev(o,t.onwrite):e._write(o,i,t.onwrite),t.sync=!1}function w(e,t,n,r){n||function(e,t){0===t.length&&t.needDrain&&(t.needDrain=!1,e.emit("drain"))}(e,t),t.pendingcb--,r(),T(e,t)}function E(e,t){t.bufferProcessing=!0;var n=t.bufferedRequest;if(e._writev&&n&&n.next){var r=t.bufferedRequestCount,o=new Array(r),i=t.corkedRequestsFree;i.entry=n;for(var s=0,u=!0;n;)o[s]=n,n.isBuf||(u=!1),n=n.next,s+=1;o.allBuffers=u,b(e,t,!0,t.length,o,"",i.finish),t.pendingcb++,t.lastBufferedRequest=null,i.next?(t.corkedRequestsFree=i.next,i.next=null):t.corkedRequestsFree=new a(t),t.bufferedRequestCount=0}else{for(;n;){var c=n.chunk,l=n.encoding,f=n.callback;if(b(e,t,!1,t.objectMode?1:c.length,c,l,f),n=n.next,t.bufferedRequestCount--,t.writing)break}null===n&&(t.lastBufferedRequest=null)}t.bufferedRequest=n,t.bufferProcessing=!1}function S(e){return e.ending&&0===e.length&&null===e.bufferedRequest&&!e.finished&&!e.writing}function _(e,t){e._final(function(n){t.pendingcb--,n&&e.emit("error",n),t.prefinished=!0,e.emit("prefinish"),T(e,t)})}function T(e,t){var n=S(t);return n&&(!function(e,t){t.prefinished||t.finalCalled||("function"==typeof e._final?(t.pendingcb++,t.finalCalled=!0,i.nextTick(_,e,t)):(t.prefinished=!0,e.emit("prefinish")))}(e,t),0===t.pendingcb&&(t.finished=!0,e.emit("finish"))),n}c.inherits(m,f),v.prototype.getBuffer=function(){for(var e=this.bufferedRequest,t=[];e;)t.push(e),e=e.next;return t},function(){try{Object.defineProperty(v.prototype,"buffer",{get:l.deprecate(function(){return this.getBuffer()},"_writableState.buffer is deprecated. Use _writableState.getBuffer instead.","DEP0003")})}catch(e){}}(),"function"==typeof Symbol&&Symbol.hasInstance&&"function"==typeof Function.prototype[Symbol.hasInstance]?(d=Function.prototype[Symbol.hasInstance],Object.defineProperty(m,Symbol.hasInstance,{value:function(e){return!!d.call(this,e)||this===m&&(e&&e._writableState instanceof v)}})):d=function(e){return e instanceof this},m.prototype.pipe=function(){this.emit("error",new Error("Cannot pipe, not readable"))},m.prototype.write=function(e,t,n){var r,o=this._writableState,a=!1,s=!o.objectMode&&(r=e,h.isBuffer(r)||r instanceof p);return s&&!h.isBuffer(e)&&(e=function(e){return h.from(e)}(e)),"function"==typeof t&&(n=t,t=null),s?t="buffer":t||(t=o.defaultEncoding),"function"!=typeof n&&(n=y),o.ended?function(e,t){var n=new Error("write after end");e.emit("error",n),i.nextTick(t,n)}(this,n):(s||function(e,t,n,r){var o=!0,a=!1;return null===n?a=new TypeError("May not write null values to stream"):"string"==typeof n||void 0===n||t.objectMode||(a=new TypeError("Invalid non-string/buffer chunk")),a&&(e.emit("error",a),i.nextTick(r,a),o=!1),o}(this,o,e,n))&&(o.pendingcb++,a=function(e,t,n,r,o,i){if(!n){var a=function(e,t,n){e.objectMode||!1===e.decodeStrings||"string"!=typeof t||(t=h.from(t,n));return t}(t,r,o);r!==a&&(n=!0,o="buffer",r=a)}var s=t.objectMode?1:r.length;t.length+=s;var u=t.length-1))throw new TypeError("Unknown encoding: "+e);return this._writableState.defaultEncoding=e,this},Object.defineProperty(m.prototype,"writableHighWaterMark",{enumerable:!1,get:function(){return this._writableState.highWaterMark}}),m.prototype._write=function(e,t,n){n(new Error("_write() is not implemented"))},m.prototype._writev=null,m.prototype.end=function(e,t,n){var r=this._writableState;"function"==typeof e?(n=e,e=null,t=null):"function"==typeof t&&(n=t,t=null),null!=e&&this.write(e,t),r.corked&&(r.corked=1,this.uncork()),r.ending||r.finished||function(e,t,n){t.ending=!0,T(e,t),n&&(t.finished?i.nextTick(n):e.once("finish",n));t.ended=!0,e.writable=!1}(this,r,n)},Object.defineProperty(m.prototype,"destroyed",{get:function(){return void 0!==this._writableState&&this._writableState.destroyed},set:function(e){this._writableState&&(this._writableState.destroyed=e)}}),m.prototype.destroy=g.destroy,m.prototype._undestroy=g.undestroy,m.prototype._destroy=function(e,t){this.end(),t(e)}}).call(this,n(14),n(54).setImmediate,n(5))},function(e,t,n){"use strict";var r=n(6).Buffer,o=r.isEncoding||function(e){switch((e=""+e)&&e.toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":case"raw":return!0;default:return!1}};function i(e){var t;switch(this.encoding=function(e){var t=function(e){if(!e)return"utf8";for(var t;;)switch(e){case"utf8":case"utf-8":return"utf8";case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return"utf16le";case"latin1":case"binary":return"latin1";case"base64":case"ascii":case"hex":return e;default:if(t)return;e=(""+e).toLowerCase(),t=!0}}(e);if("string"!=typeof t&&(r.isEncoding===o||!o(e)))throw new Error("Unknown encoding: "+e);return t||e}(e),this.encoding){case"utf16le":this.text=u,this.end=c,t=4;break;case"utf8":this.fillLast=s,t=4;break;case"base64":this.text=l,this.end=f,t=3;break;default:return this.write=h,void(this.end=p)}this.lastNeed=0,this.lastTotal=0,this.lastChar=r.allocUnsafe(t)}function a(e){return e<=127?0:e>>5==6?2:e>>4==14?3:e>>3==30?4:e>>6==2?-1:-2}function s(e){var t=this.lastTotal-this.lastNeed,n=function(e,t,n){if(128!=(192&t[0]))return e.lastNeed=0,"�";if(e.lastNeed>1&&t.length>1){if(128!=(192&t[1]))return e.lastNeed=1,"�";if(e.lastNeed>2&&t.length>2&&128!=(192&t[2]))return e.lastNeed=2,"�"}}(this,e);return void 0!==n?n:this.lastNeed<=e.length?(e.copy(this.lastChar,t,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal)):(e.copy(this.lastChar,t,0,e.length),void(this.lastNeed-=e.length))}function u(e,t){if((e.length-t)%2==0){var n=e.toString("utf16le",t);if(n){var r=n.charCodeAt(n.length-1);if(r>=55296&&r<=56319)return this.lastNeed=2,this.lastTotal=4,this.lastChar[0]=e[e.length-2],this.lastChar[1]=e[e.length-1],n.slice(0,-1)}return n}return this.lastNeed=1,this.lastTotal=2,this.lastChar[0]=e[e.length-1],e.toString("utf16le",t,e.length-1)}function c(e){var t=e&&e.length?this.write(e):"";if(this.lastNeed){var n=this.lastTotal-this.lastNeed;return t+this.lastChar.toString("utf16le",0,n)}return t}function l(e,t){var n=(e.length-t)%3;return 0===n?e.toString("base64",t):(this.lastNeed=3-n,this.lastTotal=3,1===n?this.lastChar[0]=e[e.length-1]:(this.lastChar[0]=e[e.length-2],this.lastChar[1]=e[e.length-1]),e.toString("base64",t,e.length-n))}function f(e){var t=e&&e.length?this.write(e):"";return this.lastNeed?t+this.lastChar.toString("base64",0,3-this.lastNeed):t}function h(e){return e.toString(this.encoding)}function p(e){return e&&e.length?this.write(e):""}t.StringDecoder=i,i.prototype.write=function(e){if(0===e.length)return"";var t,n;if(this.lastNeed){if(void 0===(t=this.fillLast(e)))return"";n=this.lastNeed,this.lastNeed=0}else n=0;return n=0)return o>0&&(e.lastNeed=o-1),o;if(--r=0)return o>0&&(e.lastNeed=o-2),o;if(--r=0)return o>0&&(2===o?o=0:e.lastNeed=o-3),o;return 0}(this,e,t);if(!this.lastNeed)return e.toString("utf8",t);this.lastTotal=n;var r=e.length-(n-this.lastNeed);return e.copy(this.lastChar,0,r),e.toString("utf8",t,r)},i.prototype.fillLast=function(e){if(this.lastNeed<=e.length)return e.copy(this.lastChar,this.lastTotal-this.lastNeed,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal);e.copy(this.lastChar,this.lastTotal-this.lastNeed,0,e.length),this.lastNeed-=e.length}},function(e,t,n){"use strict";e.exports=a;var r=n(10),o=n(15);function i(e,t){var n=this._transformState;n.transforming=!1;var r=n.writecb;if(!r)return this.emit("error",new Error("write callback called multiple times"));n.writechunk=null,n.writecb=null,null!=t&&this.push(t),r(e);var o=this._readableState;o.reading=!1,(o.needReadable||o.length0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]s?a.slice(s).buffer:null}else{var u,c=t;if(-1===(u=c.indexOf(r.a.RecordSeparator)))throw new Error("Message is incomplete.");s=u+1;n=c.substring(0,s),i=c.length>s?c.substring(s):null}var l=r.a.parse(n),f=JSON.parse(l[0]);if(f.type)throw new Error("Expected a handshake response from the server.");return[i,f]},t}()}).call(this,n(11).Buffer)},,,,,function(e,t,n){"use strict";var r=this&&this.__assign||function(){return(r=Object.assign||function(e){for(var t,n=1,r=arguments.length;n0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0?r-4:r,f=0;f>16&255,s[u++]=t>>8&255,s[u++]=255&t;2===a&&(t=o[e.charCodeAt(f)]<<2|o[e.charCodeAt(f+1)]>>4,s[u++]=255&t);1===a&&(t=o[e.charCodeAt(f)]<<10|o[e.charCodeAt(f+1)]<<4|o[e.charCodeAt(f+2)]>>2,s[u++]=t>>8&255,s[u++]=255&t);return s},t.fromByteArray=function(e){for(var t,n=e.length,o=n%3,i=[],a=0,s=n-o;as?s:a+16383));1===o?(t=e[n-1],i.push(r[t>>2]+r[t<<4&63]+"==")):2===o&&(t=(e[n-2]<<8)+e[n-1],i.push(r[t>>10]+r[t>>4&63]+r[t<<2&63]+"="));return i.join("")};for(var r=[],o=[],i="undefined"!=typeof Uint8Array?Uint8Array:Array,a="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",s=0,u=a.length;s0)throw new Error("Invalid string. Length must be a multiple of 4");var n=e.indexOf("=");return-1===n&&(n=t),[n,n===t?0:4-n%4]}function l(e,t,n){for(var o,i,a=[],s=t;s>18&63]+r[i>>12&63]+r[i>>6&63]+r[63&i]);return a.join("")}o["-".charCodeAt(0)]=62,o["_".charCodeAt(0)]=63},function(e,t){t.read=function(e,t,n,r,o){var i,a,s=8*o-r-1,u=(1<>1,l=-7,f=n?o-1:0,h=n?-1:1,p=e[t+f];for(f+=h,i=p&(1<<-l)-1,p>>=-l,l+=s;l>0;i=256*i+e[t+f],f+=h,l-=8);for(a=i&(1<<-l)-1,i>>=-l,l+=r;l>0;a=256*a+e[t+f],f+=h,l-=8);if(0===i)i=1-c;else{if(i===u)return a?NaN:1/0*(p?-1:1);a+=Math.pow(2,r),i-=c}return(p?-1:1)*a*Math.pow(2,i-r)},t.write=function(e,t,n,r,o,i){var a,s,u,c=8*i-o-1,l=(1<>1,h=23===o?Math.pow(2,-24)-Math.pow(2,-77):0,p=r?0:i-1,d=r?1:-1,g=t<0||0===t&&1/t<0?1:0;for(t=Math.abs(t),isNaN(t)||t===1/0?(s=isNaN(t)?1:0,a=l):(a=Math.floor(Math.log(t)/Math.LN2),t*(u=Math.pow(2,-a))<1&&(a--,u*=2),(t+=a+f>=1?h/u:h*Math.pow(2,1-f))*u>=2&&(a++,u/=2),a+f>=l?(s=0,a=l):a+f>=1?(s=(t*u-1)*Math.pow(2,o),a+=f):(s=t*Math.pow(2,f-1)*Math.pow(2,o),a=0));o>=8;e[n+p]=255&s,p+=d,s/=256,o-=8);for(a=a<0;e[n+p]=255&a,p+=d,a/=256,c-=8);e[n+p-d]|=128*g}},function(e,t,n){"use strict";(function(t){ +var r=n(55),o=n(56),i=n(57);function s(){return c.TYPED_ARRAY_SUPPORT?2147483647:1073741823}function a(e,t){if(s()=s())throw new RangeError("Attempt to allocate Buffer larger than maximum size: 0x"+s().toString(16)+" bytes");return 0|e}function d(e,t){if(c.isBuffer(e))return e.length;if("undefined"!=typeof ArrayBuffer&&"function"==typeof ArrayBuffer.isView&&(ArrayBuffer.isView(e)||e instanceof ArrayBuffer))return e.byteLength;"string"!=typeof e&&(e=""+e);var n=e.length;if(0===n)return 0;for(var r=!1;;)switch(t){case"ascii":case"latin1":case"binary":return n;case"utf8":case"utf-8":case void 0:return H(e).length;case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return 2*n;case"hex":return n>>>1;case"base64":return F(e).length;default:if(r)return H(e).length;t=(""+t).toLowerCase(),r=!0}}function g(e,t,n){var r=e[t];e[t]=e[n],e[n]=r}function y(e,t,n,r,o){if(0===e.length)return-1;if("string"==typeof n?(r=n,n=0):n>2147483647?n=2147483647:n<-2147483648&&(n=-2147483648),n=+n,isNaN(n)&&(n=o?0:e.length-1),n<0&&(n=e.length+n),n>=e.length){if(o)return-1;n=e.length-1}else if(n<0){if(!o)return-1;n=0}if("string"==typeof t&&(t=c.from(t,r)),c.isBuffer(t))return 0===t.length?-1:v(e,t,n,r,o);if("number"==typeof t)return t&=255,c.TYPED_ARRAY_SUPPORT&&"function"==typeof Uint8Array.prototype.indexOf?o?Uint8Array.prototype.indexOf.call(e,t,n):Uint8Array.prototype.lastIndexOf.call(e,t,n):v(e,[t],n,r,o);throw new TypeError("val must be string, number or Buffer")}function v(e,t,n,r,o){var i,s=1,a=e.length,c=t.length;if(void 0!==r&&("ucs2"===(r=String(r).toLowerCase())||"ucs-2"===r||"utf16le"===r||"utf-16le"===r)){if(e.length<2||t.length<2)return-1;s=2,a/=2,c/=2,n/=2}function u(e,t){return 1===s?e[t]:e.readUInt16BE(t*s)}if(o){var l=-1;for(i=n;ia&&(n=a-c),i=n;i>=0;i--){for(var h=!0,f=0;fo&&(r=o):r=o;var i=t.length;if(i%2!=0)throw new TypeError("Invalid hex string");r>i/2&&(r=i/2);for(var s=0;s>8,o=n%256,i.push(o),i.push(r);return i}(t,e.length-n),e,n,r)}function k(e,t,n){return 0===t&&n===e.length?r.fromByteArray(e):r.fromByteArray(e.slice(t,n))}function I(e,t,n){n=Math.min(e.length,n);for(var r=[],o=t;o239?4:u>223?3:u>191?2:1;if(o+h<=n)switch(h){case 1:u<128&&(l=u);break;case 2:128==(192&(i=e[o+1]))&&(c=(31&u)<<6|63&i)>127&&(l=c);break;case 3:i=e[o+1],s=e[o+2],128==(192&i)&&128==(192&s)&&(c=(15&u)<<12|(63&i)<<6|63&s)>2047&&(c<55296||c>57343)&&(l=c);break;case 4:i=e[o+1],s=e[o+2],a=e[o+3],128==(192&i)&&128==(192&s)&&128==(192&a)&&(c=(15&u)<<18|(63&i)<<12|(63&s)<<6|63&a)>65535&&c<1114112&&(l=c)}null===l?(l=65533,h=1):l>65535&&(l-=65536,r.push(l>>>10&1023|55296),l=56320|1023&l),r.push(l),o+=h}return function(e){var t=e.length;if(t<=T)return String.fromCharCode.apply(String,e);var n="",r=0;for(;rthis.length)return"";if((void 0===n||n>this.length)&&(n=this.length),n<=0)return"";if((n>>>=0)<=(t>>>=0))return"";for(e||(e="utf8");;)switch(e){case"hex":return x(this,t,n);case"utf8":case"utf-8":return I(this,t,n);case"ascii":return _(this,t,n);case"latin1":case"binary":return P(this,t,n);case"base64":return k(this,t,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return R(this,t,n);default:if(r)throw new TypeError("Unknown encoding: "+e);e=(e+"").toLowerCase(),r=!0}}.apply(this,arguments)},c.prototype.equals=function(e){if(!c.isBuffer(e))throw new TypeError("Argument must be a Buffer");return this===e||0===c.compare(this,e)},c.prototype.inspect=function(){var e="",n=t.INSPECT_MAX_BYTES;return this.length>0&&(e=this.toString("hex",0,n).match(/.{2}/g).join(" "),this.length>n&&(e+=" ... ")),""},c.prototype.compare=function(e,t,n,r,o){if(!c.isBuffer(e))throw new TypeError("Argument must be a Buffer");if(void 0===t&&(t=0),void 0===n&&(n=e?e.length:0),void 0===r&&(r=0),void 0===o&&(o=this.length),t<0||n>e.length||r<0||o>this.length)throw new RangeError("out of range index");if(r>=o&&t>=n)return 0;if(r>=o)return-1;if(t>=n)return 1;if(this===e)return 0;for(var i=(o>>>=0)-(r>>>=0),s=(n>>>=0)-(t>>>=0),a=Math.min(i,s),u=this.slice(r,o),l=e.slice(t,n),h=0;ho)&&(n=o),e.length>0&&(n<0||t<0)||t>this.length)throw new RangeError("Attempt to write outside buffer bounds");r||(r="utf8");for(var i=!1;;)switch(r){case"hex":return b(this,e,t,n);case"utf8":case"utf-8":return m(this,e,t,n);case"ascii":return w(this,e,t,n);case"latin1":case"binary":return S(this,e,t,n);case"base64":return E(this,e,t,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return C(this,e,t,n);default:if(i)throw new TypeError("Unknown encoding: "+r);r=(""+r).toLowerCase(),i=!0}},c.prototype.toJSON=function(){return{type:"Buffer",data:Array.prototype.slice.call(this._arr||this,0)}};var T=4096;function _(e,t,n){var r="";n=Math.min(e.length,n);for(var o=t;or)&&(n=r);for(var o="",i=t;in)throw new RangeError("Trying to access beyond buffer length")}function O(e,t,n,r,o,i){if(!c.isBuffer(e))throw new TypeError('"buffer" argument must be a Buffer instance');if(t>o||te.length)throw new RangeError("Index out of range")}function L(e,t,n,r){t<0&&(t=65535+t+1);for(var o=0,i=Math.min(e.length-n,2);o>>8*(r?o:1-o)}function A(e,t,n,r){t<0&&(t=4294967295+t+1);for(var o=0,i=Math.min(e.length-n,4);o>>8*(r?o:3-o)&255}function M(e,t,n,r,o,i){if(n+r>e.length)throw new RangeError("Index out of range");if(n<0)throw new RangeError("Index out of range")}function j(e,t,n,r,i){return i||M(e,0,n,4),o.write(e,t,n,r,23,4),n+4}function B(e,t,n,r,i){return i||M(e,0,n,8),o.write(e,t,n,r,52,8),n+8}c.prototype.slice=function(e,t){var n,r=this.length;if((e=~~e)<0?(e+=r)<0&&(e=0):e>r&&(e=r),(t=void 0===t?r:~~t)<0?(t+=r)<0&&(t=0):t>r&&(t=r),t0&&(o*=256);)r+=this[e+--t]*o;return r},c.prototype.readUInt8=function(e,t){return t||D(e,1,this.length),this[e]},c.prototype.readUInt16LE=function(e,t){return t||D(e,2,this.length),this[e]|this[e+1]<<8},c.prototype.readUInt16BE=function(e,t){return t||D(e,2,this.length),this[e]<<8|this[e+1]},c.prototype.readUInt32LE=function(e,t){return t||D(e,4,this.length),(this[e]|this[e+1]<<8|this[e+2]<<16)+16777216*this[e+3]},c.prototype.readUInt32BE=function(e,t){return t||D(e,4,this.length),16777216*this[e]+(this[e+1]<<16|this[e+2]<<8|this[e+3])},c.prototype.readIntLE=function(e,t,n){e|=0,t|=0,n||D(e,t,this.length);for(var r=this[e],o=1,i=0;++i=(o*=128)&&(r-=Math.pow(2,8*t)),r},c.prototype.readIntBE=function(e,t,n){e|=0,t|=0,n||D(e,t,this.length);for(var r=t,o=1,i=this[e+--r];r>0&&(o*=256);)i+=this[e+--r]*o;return i>=(o*=128)&&(i-=Math.pow(2,8*t)),i},c.prototype.readInt8=function(e,t){return t||D(e,1,this.length),128&this[e]?-1*(255-this[e]+1):this[e]},c.prototype.readInt16LE=function(e,t){t||D(e,2,this.length);var n=this[e]|this[e+1]<<8;return 32768&n?4294901760|n:n},c.prototype.readInt16BE=function(e,t){t||D(e,2,this.length);var n=this[e+1]|this[e]<<8;return 32768&n?4294901760|n:n},c.prototype.readInt32LE=function(e,t){return t||D(e,4,this.length),this[e]|this[e+1]<<8|this[e+2]<<16|this[e+3]<<24},c.prototype.readInt32BE=function(e,t){return t||D(e,4,this.length),this[e]<<24|this[e+1]<<16|this[e+2]<<8|this[e+3]},c.prototype.readFloatLE=function(e,t){return t||D(e,4,this.length),o.read(this,e,!0,23,4)},c.prototype.readFloatBE=function(e,t){return t||D(e,4,this.length),o.read(this,e,!1,23,4)},c.prototype.readDoubleLE=function(e,t){return t||D(e,8,this.length),o.read(this,e,!0,52,8)},c.prototype.readDoubleBE=function(e,t){return t||D(e,8,this.length),o.read(this,e,!1,52,8)},c.prototype.writeUIntLE=function(e,t,n,r){(e=+e,t|=0,n|=0,r)||O(this,e,t,n,Math.pow(2,8*n)-1,0);var o=1,i=0;for(this[t]=255&e;++i=0&&(i*=256);)this[t+o]=e/i&255;return t+n},c.prototype.writeUInt8=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,1,255,0),c.TYPED_ARRAY_SUPPORT||(e=Math.floor(e)),this[t]=255&e,t+1},c.prototype.writeUInt16LE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,2,65535,0),c.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8):L(this,e,t,!0),t+2},c.prototype.writeUInt16BE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,2,65535,0),c.TYPED_ARRAY_SUPPORT?(this[t]=e>>>8,this[t+1]=255&e):L(this,e,t,!1),t+2},c.prototype.writeUInt32LE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,4,4294967295,0),c.TYPED_ARRAY_SUPPORT?(this[t+3]=e>>>24,this[t+2]=e>>>16,this[t+1]=e>>>8,this[t]=255&e):A(this,e,t,!0),t+4},c.prototype.writeUInt32BE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,4,4294967295,0),c.TYPED_ARRAY_SUPPORT?(this[t]=e>>>24,this[t+1]=e>>>16,this[t+2]=e>>>8,this[t+3]=255&e):A(this,e,t,!1),t+4},c.prototype.writeIntLE=function(e,t,n,r){if(e=+e,t|=0,!r){var o=Math.pow(2,8*n-1);O(this,e,t,n,o-1,-o)}var i=0,s=1,a=0;for(this[t]=255&e;++i>0)-a&255;return t+n},c.prototype.writeIntBE=function(e,t,n,r){if(e=+e,t|=0,!r){var o=Math.pow(2,8*n-1);O(this,e,t,n,o-1,-o)}var i=n-1,s=1,a=0;for(this[t+i]=255&e;--i>=0&&(s*=256);)e<0&&0===a&&0!==this[t+i+1]&&(a=1),this[t+i]=(e/s>>0)-a&255;return t+n},c.prototype.writeInt8=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,1,127,-128),c.TYPED_ARRAY_SUPPORT||(e=Math.floor(e)),e<0&&(e=255+e+1),this[t]=255&e,t+1},c.prototype.writeInt16LE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,2,32767,-32768),c.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8):L(this,e,t,!0),t+2},c.prototype.writeInt16BE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,2,32767,-32768),c.TYPED_ARRAY_SUPPORT?(this[t]=e>>>8,this[t+1]=255&e):L(this,e,t,!1),t+2},c.prototype.writeInt32LE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,4,2147483647,-2147483648),c.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8,this[t+2]=e>>>16,this[t+3]=e>>>24):A(this,e,t,!0),t+4},c.prototype.writeInt32BE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,4,2147483647,-2147483648),e<0&&(e=4294967295+e+1),c.TYPED_ARRAY_SUPPORT?(this[t]=e>>>24,this[t+1]=e>>>16,this[t+2]=e>>>8,this[t+3]=255&e):A(this,e,t,!1),t+4},c.prototype.writeFloatLE=function(e,t,n){return j(this,e,t,!0,n)},c.prototype.writeFloatBE=function(e,t,n){return j(this,e,t,!1,n)},c.prototype.writeDoubleLE=function(e,t,n){return B(this,e,t,!0,n)},c.prototype.writeDoubleBE=function(e,t,n){return B(this,e,t,!1,n)},c.prototype.copy=function(e,t,n,r){if(n||(n=0),r||0===r||(r=this.length),t>=e.length&&(t=e.length),t||(t=0),r>0&&r=this.length)throw new RangeError("sourceStart out of bounds");if(r<0)throw new RangeError("sourceEnd out of bounds");r>this.length&&(r=this.length),e.length-t=0;--o)e[o+t]=this[o+n];else if(i<1e3||!c.TYPED_ARRAY_SUPPORT)for(o=0;o>>=0,n=void 0===n?this.length:n>>>0,e||(e=0),"number"==typeof e)for(i=t;i55295&&n<57344){if(!o){if(n>56319){(t-=3)>-1&&i.push(239,191,189);continue}if(s+1===r){(t-=3)>-1&&i.push(239,191,189);continue}o=n;continue}if(n<56320){(t-=3)>-1&&i.push(239,191,189),o=n;continue}n=65536+(o-55296<<10|n-56320)}else o&&(t-=3)>-1&&i.push(239,191,189);if(o=null,n<128){if((t-=1)<0)break;i.push(n)}else if(n<2048){if((t-=2)<0)break;i.push(n>>6|192,63&n|128)}else if(n<65536){if((t-=3)<0)break;i.push(n>>12|224,n>>6&63|128,63&n|128)}else{if(!(n<1114112))throw new Error("Invalid code point");if((t-=4)<0)break;i.push(n>>18|240,n>>12&63|128,n>>6&63|128,63&n|128)}}return i}function F(e){return r.toByteArray(function(e){if((e=function(e){return e.trim?e.trim():e.replace(/^\s+|\s+$/g,"")}(e).replace(N,"")).length<2)return"";for(;e.length%4!=0;)e+="=";return e}(e))}function W(e,t,n,r){for(var o=0;o=t.length||o>=e.length);++o)t[o+n]=e[o];return o}}).call(this,n(13))},function(e,t,n){"use strict";n.d(t,"a",function(){return r});var r=function(){function e(){}return e.prototype.log=function(e,t){},e.instance=new e,e}()},function(e,t,n){"use strict";n.d(t,"a",function(){return r});var r=function(){function e(){}return e.prototype.log=function(e,t){},e.instance=new e,e}()},function(e,t,n){"use strict";n.d(t,"a",function(){return r});var r=function(){function e(){}return e.write=function(t){return""+t+e.RecordSeparator},e.parse=function(t){if(t[t.length-1]!==e.RecordSeparator)throw new Error("Message is incomplete.");var n=t.split(e.RecordSeparator);return n.pop(),n},e.RecordSeparatorCode=30,e.RecordSeparator=String.fromCharCode(e.RecordSeparatorCode),e}()},function(e,t,n){"use strict";n.d(t,"a",function(){return r});var r=function(){function e(){}return e.write=function(t){return""+t+e.RecordSeparator},e.parse=function(t){if(t[t.length-1]!==e.RecordSeparator)throw new Error("Message is incomplete.");var n=t.split(e.RecordSeparator);return n.pop(),n},e.RecordSeparatorCode=30,e.RecordSeparator=String.fromCharCode(e.RecordSeparatorCode),e}()},function(e,t){var n;n=function(){return this}();try{n=n||new Function("return this")()}catch(e){"object"==typeof window&&(n=window)}e.exports=n},function(e,t,n){"use strict";var r=n(26),o=Object.keys||function(e){var t=[];for(var n in e)t.push(n);return t};e.exports=h;var i=n(23);i.inherits=n(19);var s=n(38),a=n(43);i.inherits(h,s);for(var c=o(a.prototype),u=0;u=0,"must have a non-negative type"),o(s,"must have a decode function"),this.registerEncoder(function(e){return e instanceof t},function(t){var o=i(),s=r.allocUnsafe(1);return s.writeInt8(e,0),o.append(s),o.append(n(t)),o}),this.registerDecoder(e,s),this},registerEncoder:function(e,n){return o(e,"must have an encode function"),o(n,"must have an encode function"),t.push({check:e,encode:n}),this},registerDecoder:function(e,t){return o(e>=0,"must have a non-negative type"),o(t,"must have a decode function"),n.push({type:e,decode:t}),this},encoder:s.encoder,decoder:s.decoder,buffer:!0,type:"msgpack5",IncompleteBufferError:a.IncompleteBufferError}}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(30),o=n(17),i={};function s(e,t,n){var o=i[e];o||(o=i[e]=new r.BrowserRenderer(e)),o.attachRootComponentToLogicalElement(n,t)}t.attachRootComponentToLogicalElement=s,t.attachRootComponentToElement=function(e,t,n){var r=document.querySelector(t);if(!r)throw new Error("Could not find any element matching selector '"+t+"'.");s(e,o.toLogicalElement(r,!0),n)},t.renderBatch=function(e,t){var n=i[e];if(!n)throw new Error("There is no browser renderer with ID "+e+".");for(var r=t.arrayRangeReader,o=t.updatedComponents(),s=r.values(o),a=r.count(o),c=t.referenceFrames(),u=r.values(c),l=t.diffReader,h=0;h0&&!t)throw new Error("New logical elements must start empty, or allowExistingContents must be true");return e[r]=[],e}function a(e,t,n){var i=e;if(e instanceof Comment&&(u(i)&&u(i).length>0))throw new Error("Not implemented: inserting non-empty logical container");if(c(i))throw new Error("Not implemented: moving existing logical children");var s=u(t);if(n0;)e(r,0);var i=r;i.parentNode.removeChild(i)},t.getLogicalParent=c,t.getLogicalSiblingEnd=function(e){return e[i]||null},t.getLogicalChild=function(e,t){return u(e)[t]},t.isSvgElement=function(e){return"http://www.w3.org/2000/svg"===l(e).namespaceURI},t.getLogicalChildrenArray=u,t.permuteLogicalChildren=function(e,t){var n=u(e);t.forEach(function(e){e.moveRangeStart=n[e.fromSiblingIndex],e.moveRangeEnd=function e(t){if(t instanceof Element)return t;var n=h(t);if(n)return n.previousSibling;var r=c(t);return r instanceof Element?r.lastChild:e(r)}(e.moveRangeStart)}),t.forEach(function(t){var r=t.moveToBeforeMarker=document.createComment("marker"),o=n[t.toSiblingIndex+1];o?o.parentNode.insertBefore(r,o):f(r,e)}),t.forEach(function(e){for(var t=e.moveToBeforeMarker,n=t.parentNode,r=e.moveRangeStart,o=e.moveRangeEnd,i=r;i;){var s=i.nextSibling;if(n.insertBefore(i,t),i===o)break;i=s}n.removeChild(t)}),t.forEach(function(e){n[e.toSiblingIndex]=e.moveRangeStart})},t.getClosestDomElement=l},function(e,t,n){var r=n(8),o=r.Buffer;function i(e,t){for(var n in e)t[n]=e[n]}function s(e,t,n){return o(e,t,n)}o.from&&o.alloc&&o.allocUnsafe&&o.allocUnsafeSlow?e.exports=r:(i(r,t),t.Buffer=s),i(o,s),s.from=function(e,t,n){if("number"==typeof e)throw new TypeError("Argument must not be a number");return o(e,t,n)},s.alloc=function(e,t,n){if("number"!=typeof e)throw new TypeError("Argument must be a number");var r=o(e);return void 0!==t?"string"==typeof n?r.fill(t,n):r.fill(t):r.fill(0),r},s.allocUnsafe=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return o(e)},s.allocUnsafeSlow=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return r.SlowBuffer(e)}},function(e,t){"function"==typeof Object.create?e.exports=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})}:e.exports=function(e,t){e.super_=t;var n=function(){};n.prototype=t.prototype,e.prototype=new n,e.prototype.constructor=e}},function(e,t,n){"use strict";var r;!function(e){window.DotNet=e;var t=[],n={},r={},o=1,i=null;function s(e){t.push(e)}function a(e,t){for(var n=[],r=2;r1)for(var n=1;n0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]this.length)&&(r=this.length),n>=this.length)return e||i.alloc(0);if(r<=0)return e||i.alloc(0);var o,s,a=!!e,c=this._offset(n),u=r-n,l=u,h=a&&t||0,f=c[1];if(0===n&&r==this.length){if(!a)return 1===this._bufs.length?this._bufs[0]:i.concat(this._bufs,this.length);for(s=0;s(o=this._bufs[s].length-f))){this._bufs[s].copy(e,h,f,f+l);break}this._bufs[s].copy(e,h,f),h+=o,l-=o,f&&(f=0)}return e},s.prototype.shallowSlice=function(e,t){e=e||0,t=t||this.length,e<0&&(e+=this.length),t<0&&(t+=this.length);var n=this._offset(e),r=this._offset(t),o=this._bufs.slice(n[0],r[0]+1);return 0==r[1]?o.pop():o[o.length-1]=o[o.length-1].slice(0,r[1]),0!=n[1]&&(o[0]=o[0].slice(n[1])),new s(o)},s.prototype.toString=function(e,t,n){return this.slice(t,n).toString(e)},s.prototype.consume=function(e){for(;this._bufs.length;){if(!(e>=this._bufs[0].length)){this._bufs[0]=this._bufs[0].slice(e),this.length-=e;break}e-=this._bufs[0].length,this.length-=this._bufs[0].length,this._bufs.shift()}return this},s.prototype.duplicate=function(){for(var e=0,t=new s;e0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]=i)return e;switch(e){case"%s":return String(r[n++]);case"%d":return Number(r[n++]);case"%j":try{return JSON.stringify(r[n++])}catch(e){return"[Circular]"}default:return e}}),c=r[n];n=3&&(r.depth=arguments[2]),arguments.length>=4&&(r.colors=arguments[3]),d(n)?r.showHidden=n:n&&t._extend(r,n),b(r.showHidden)&&(r.showHidden=!1),b(r.depth)&&(r.depth=2),b(r.colors)&&(r.colors=!1),b(r.customInspect)&&(r.customInspect=!0),r.colors&&(r.stylize=c),l(r,e,r.depth)}function c(e,t){var n=a.styles[t];return n?"["+a.colors[n][0]+"m"+e+"["+a.colors[n][1]+"m":e}function u(e,t){return e}function l(e,n,r){if(e.customInspect&&n&&C(n.inspect)&&n.inspect!==t.inspect&&(!n.constructor||n.constructor.prototype!==n)){var o=n.inspect(r,e);return v(o)||(o=l(e,o,r)),o}var i=function(e,t){if(b(t))return e.stylize("undefined","undefined");if(v(t)){var n="'"+JSON.stringify(t).replace(/^"|"$/g,"").replace(/'/g,"\\'").replace(/\\"/g,'"')+"'";return e.stylize(n,"string")}if(y(t))return e.stylize(""+t,"number");if(d(t))return e.stylize(""+t,"boolean");if(g(t))return e.stylize("null","null")}(e,n);if(i)return i;var s=Object.keys(n),a=function(e){var t={};return e.forEach(function(e,n){t[e]=!0}),t}(s);if(e.showHidden&&(s=Object.getOwnPropertyNames(n)),E(n)&&(s.indexOf("message")>=0||s.indexOf("description")>=0))return h(n);if(0===s.length){if(C(n)){var c=n.name?": "+n.name:"";return e.stylize("[Function"+c+"]","special")}if(m(n))return e.stylize(RegExp.prototype.toString.call(n),"regexp");if(S(n))return e.stylize(Date.prototype.toString.call(n),"date");if(E(n))return h(n)}var u,w="",k=!1,I=["{","}"];(p(n)&&(k=!0,I=["[","]"]),C(n))&&(w=" [Function"+(n.name?": "+n.name:"")+"]");return m(n)&&(w=" "+RegExp.prototype.toString.call(n)),S(n)&&(w=" "+Date.prototype.toUTCString.call(n)),E(n)&&(w=" "+h(n)),0!==s.length||k&&0!=n.length?r<0?m(n)?e.stylize(RegExp.prototype.toString.call(n),"regexp"):e.stylize("[Object]","special"):(e.seen.push(n),u=k?function(e,t,n,r,o){for(var i=[],s=0,a=t.length;s=0&&0,e+t.replace(/\u001b\[\d\d?m/g,"").length+1},0)>60)return n[0]+(""===t?"":t+"\n ")+" "+e.join(",\n ")+" "+n[1];return n[0]+t+" "+e.join(", ")+" "+n[1]}(u,w,I)):I[0]+w+I[1]}function h(e){return"["+Error.prototype.toString.call(e)+"]"}function f(e,t,n,r,o,i){var s,a,c;if((c=Object.getOwnPropertyDescriptor(t,o)||{value:t[o]}).get?a=c.set?e.stylize("[Getter/Setter]","special"):e.stylize("[Getter]","special"):c.set&&(a=e.stylize("[Setter]","special")),_(r,o)||(s="["+o+"]"),a||(e.seen.indexOf(c.value)<0?(a=g(n)?l(e,c.value,null):l(e,c.value,n-1)).indexOf("\n")>-1&&(a=i?a.split("\n").map(function(e){return" "+e}).join("\n").substr(2):"\n"+a.split("\n").map(function(e){return" "+e}).join("\n")):a=e.stylize("[Circular]","special")),b(s)){if(i&&o.match(/^\d+$/))return a;(s=JSON.stringify(""+o)).match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)?(s=s.substr(1,s.length-2),s=e.stylize(s,"name")):(s=s.replace(/'/g,"\\'").replace(/\\"/g,'"').replace(/(^"|"$)/g,"'"),s=e.stylize(s,"string"))}return s+": "+a}function p(e){return Array.isArray(e)}function d(e){return"boolean"==typeof e}function g(e){return null===e}function y(e){return"number"==typeof e}function v(e){return"string"==typeof e}function b(e){return void 0===e}function m(e){return w(e)&&"[object RegExp]"===k(e)}function w(e){return"object"==typeof e&&null!==e}function S(e){return w(e)&&"[object Date]"===k(e)}function E(e){return w(e)&&("[object Error]"===k(e)||e instanceof Error)}function C(e){return"function"==typeof e}function k(e){return Object.prototype.toString.call(e)}function I(e){return e<10?"0"+e.toString(10):e.toString(10)}t.debuglog=function(n){if(b(i)&&(i=e.env.NODE_DEBUG||""),n=n.toUpperCase(),!s[n])if(new RegExp("\\b"+n+"\\b","i").test(i)){var r=e.pid;s[n]=function(){var e=t.format.apply(t,arguments);console.error("%s %d: %s",n,r,e)}}else s[n]=function(){};return s[n]},t.inspect=a,a.colors={bold:[1,22],italic:[3,23],underline:[4,24],inverse:[7,27],white:[37,39],grey:[90,39],black:[30,39],blue:[34,39],cyan:[36,39],green:[32,39],magenta:[35,39],red:[31,39],yellow:[33,39]},a.styles={special:"cyan",number:"yellow",boolean:"yellow",undefined:"grey",null:"bold",string:"green",date:"magenta",regexp:"red"},t.isArray=p,t.isBoolean=d,t.isNull=g,t.isNullOrUndefined=function(e){return null==e},t.isNumber=y,t.isString=v,t.isSymbol=function(e){return"symbol"==typeof e},t.isUndefined=b,t.isRegExp=m,t.isObject=w,t.isDate=S,t.isError=E,t.isFunction=C,t.isPrimitive=function(e){return null===e||"boolean"==typeof e||"number"==typeof e||"string"==typeof e||"symbol"==typeof e||void 0===e},t.isBuffer=n(59);var T=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];function _(e,t){return Object.prototype.hasOwnProperty.call(e,t)}t.log=function(){var e,n;console.log("%s - %s",(e=new Date,n=[I(e.getHours()),I(e.getMinutes()),I(e.getSeconds())].join(":"),[e.getDate(),T[e.getMonth()],n].join(" ")),t.format.apply(t,arguments))},t.inherits=n(60),t._extend=function(e,t){if(!t||!w(t))return e;for(var n=Object.keys(t),r=n.length;r--;)e[n[r]]=t[n[r]];return e};var P="undefined"!=typeof Symbol?Symbol("util.promisify.custom"):void 0;function x(e,t){if(!e){var n=new Error("Promise was rejected with a falsy value");n.reason=e,e=n}return t(e)}t.promisify=function(e){if("function"!=typeof e)throw new TypeError('The "original" argument must be of type Function');if(P&&e[P]){var t;if("function"!=typeof(t=e[P]))throw new TypeError('The "util.promisify.custom" argument must be of type Function');return Object.defineProperty(t,P,{value:t,enumerable:!1,writable:!1,configurable:!0}),t}function t(){for(var t,n,r=new Promise(function(e,r){t=e,n=r}),o=[],i=0;i0?("string"==typeof t||s.objectMode||Object.getPrototypeOf(t)===u.prototype||(t=function(e){return u.from(e)}(t)),r?s.endEmitted?e.emit("error",new Error("stream.unshift() after end event")):S(e,s,t,!0):s.ended?e.emit("error",new Error("stream.push() after EOF")):(s.reading=!1,s.decoder&&!n?(t=s.decoder.write(t),s.objectMode||0!==t.length?S(e,s,t,!1):T(e,s)):S(e,s,t,!1))):r||(s.reading=!1));return function(e){return!e.ended&&(e.needReadable||e.lengtht.highWaterMark&&(t.highWaterMark=function(e){return e>=E?e=E:(e--,e|=e>>>1,e|=e>>>2,e|=e>>>4,e|=e>>>8,e|=e>>>16,e++),e}(e)),e<=t.length?e:t.ended?t.length:(t.needReadable=!0,0))}function k(e){var t=e._readableState;t.needReadable=!1,t.emittedReadable||(p("emitReadable",t.flowing),t.emittedReadable=!0,t.sync?o.nextTick(I,e):I(e))}function I(e){p("emit readable"),e.emit("readable"),R(e)}function T(e,t){t.readingMore||(t.readingMore=!0,o.nextTick(_,e,t))}function _(e,t){for(var n=t.length;!t.reading&&!t.flowing&&!t.ended&&t.length=t.length?(n=t.decoder?t.buffer.join(""):1===t.buffer.length?t.buffer.head.data:t.buffer.concat(t.length),t.buffer.clear()):n=function(e,t,n){var r;ei.length?i.length:e;if(s===i.length?o+=i:o+=i.slice(0,e),0===(e-=s)){s===i.length?(++r,n.next?t.head=n.next:t.head=t.tail=null):(t.head=n,n.data=i.slice(s));break}++r}return t.length-=r,o}(e,t):function(e,t){var n=u.allocUnsafe(e),r=t.head,o=1;r.data.copy(n),e-=r.data.length;for(;r=r.next;){var i=r.data,s=e>i.length?i.length:e;if(i.copy(n,n.length-e,0,s),0===(e-=s)){s===i.length?(++o,r.next?t.head=r.next:t.head=t.tail=null):(t.head=r,r.data=i.slice(s));break}++o}return t.length-=o,n}(e,t);return r}(e,t.buffer,t.decoder),n);var n}function O(e){var t=e._readableState;if(t.length>0)throw new Error('"endReadable()" called on non-empty stream');t.endEmitted||(t.ended=!0,o.nextTick(L,t,e))}function L(e,t){e.endEmitted||0!==e.length||(e.endEmitted=!0,t.readable=!1,t.emit("end"))}function A(e,t){for(var n=0,r=e.length;n=t.highWaterMark||t.ended))return p("read: emitReadable",t.length,t.ended),0===t.length&&t.ended?O(this):k(this),null;if(0===(e=C(e,t))&&t.ended)return 0===t.length&&O(this),null;var r,o=t.needReadable;return p("need readable",o),(0===t.length||t.length-e0?D(e,t):null)?(t.needReadable=!0,e=0):t.length-=e,0===t.length&&(t.ended||(t.needReadable=!0),n!==e&&t.ended&&O(this)),null!==r&&this.emit("data",r),r},m.prototype._read=function(e){this.emit("error",new Error("_read() is not implemented"))},m.prototype.pipe=function(e,t){var n=this,i=this._readableState;switch(i.pipesCount){case 0:i.pipes=e;break;case 1:i.pipes=[i.pipes,e];break;default:i.pipes.push(e)}i.pipesCount+=1,p("pipe count=%d opts=%j",i.pipesCount,t);var c=(!t||!1!==t.end)&&e!==r.stdout&&e!==r.stderr?l:m;function u(t,r){p("onunpipe"),t===n&&r&&!1===r.hasUnpiped&&(r.hasUnpiped=!0,p("cleanup"),e.removeListener("close",v),e.removeListener("finish",b),e.removeListener("drain",h),e.removeListener("error",y),e.removeListener("unpipe",u),n.removeListener("end",l),n.removeListener("end",m),n.removeListener("data",g),f=!0,!i.awaitDrain||e._writableState&&!e._writableState.needDrain||h())}function l(){p("onend"),e.end()}i.endEmitted?o.nextTick(c):n.once("end",c),e.on("unpipe",u);var h=function(e){return function(){var t=e._readableState;p("pipeOnDrain",t.awaitDrain),t.awaitDrain&&t.awaitDrain--,0===t.awaitDrain&&a(e,"data")&&(t.flowing=!0,R(e))}}(n);e.on("drain",h);var f=!1;var d=!1;function g(t){p("ondata"),d=!1,!1!==e.write(t)||d||((1===i.pipesCount&&i.pipes===e||i.pipesCount>1&&-1!==A(i.pipes,e))&&!f&&(p("false write response, pause",n._readableState.awaitDrain),n._readableState.awaitDrain++,d=!0),n.pause())}function y(t){p("onerror",t),m(),e.removeListener("error",y),0===a(e,"error")&&e.emit("error",t)}function v(){e.removeListener("finish",b),m()}function b(){p("onfinish"),e.removeListener("close",v),m()}function m(){p("unpipe"),n.unpipe(e)}return n.on("data",g),function(e,t,n){if("function"==typeof e.prependListener)return e.prependListener(t,n);e._events&&e._events[t]?s(e._events[t])?e._events[t].unshift(n):e._events[t]=[n,e._events[t]]:e.on(t,n)}(e,"error",y),e.once("close",v),e.once("finish",b),e.emit("pipe",n),i.flowing||(p("pipe resume"),n.resume()),e},m.prototype.unpipe=function(e){var t=this._readableState,n={hasUnpiped:!1};if(0===t.pipesCount)return this;if(1===t.pipesCount)return e&&e!==t.pipes?this:(e||(e=t.pipes),t.pipes=null,t.pipesCount=0,t.flowing=!1,e&&e.emit("unpipe",this,n),this);if(!e){var r=t.pipes,o=t.pipesCount;t.pipes=null,t.pipesCount=0,t.flowing=!1;for(var i=0;i0&&s.length>o&&!s.warned){s.warned=!0;var c=new Error("Possible EventEmitter memory leak detected. "+s.length+" "+String(t)+" listeners added. Use emitter.setMaxListeners() to increase limit");c.name="MaxListenersExceededWarning",c.emitter=e,c.type=t,c.count=s.length,a=c,console&&console.warn&&console.warn(a)}return e}function h(e,t,n){var r={fired:!1,wrapFn:void 0,target:e,type:t,listener:n},o=function(){for(var e=[],t=0;t0&&(s=t[0]),s instanceof Error)throw s;var a=new Error("Unhandled error."+(s?" ("+s.message+")":""));throw a.context=s,a}var c=o[e];if(void 0===c)return!1;if("function"==typeof c)i(c,this,t);else{var u=c.length,l=d(c,u);for(n=0;n=0;i--)if(n[i]===t||n[i].listener===t){s=n[i].listener,o=i;break}if(o<0)return this;0===o?n.shift():function(e,t){for(;t+1=0;r--)this.removeListener(e,t[r]);return this},a.prototype.listeners=function(e){return f(this,e,!0)},a.prototype.rawListeners=function(e){return f(this,e,!1)},a.listenerCount=function(e,t){return"function"==typeof e.listenerCount?e.listenerCount(t):p.call(e,t)},a.prototype.listenerCount=p,a.prototype.eventNames=function(){return this._eventsCount>0?r(this._events):[]}},function(e,t,n){e.exports=n(39).EventEmitter},function(e,t,n){"use strict";var r=n(26);function o(e,t){e.emit("error",t)}e.exports={destroy:function(e,t){var n=this,i=this._readableState&&this._readableState.destroyed,s=this._writableState&&this._writableState.destroyed;return i||s?(t?t(e):!e||this._writableState&&this._writableState.errorEmitted||r.nextTick(o,this,e),this):(this._readableState&&(this._readableState.destroyed=!0),this._writableState&&(this._writableState.destroyed=!0),this._destroy(e||null,function(e){!t&&e?(r.nextTick(o,n,e),n._writableState&&(n._writableState.errorEmitted=!0)):t&&t(e)}),this)},undestroy:function(){this._readableState&&(this._readableState.destroyed=!1,this._readableState.reading=!1,this._readableState.ended=!1,this._readableState.endEmitted=!1),this._writableState&&(this._writableState.destroyed=!1,this._writableState.ended=!1,this._writableState.ending=!1,this._writableState.finished=!1,this._writableState.errorEmitted=!1)}}},function(e,t,n){"use strict";var r=n(66).Buffer,o=r.isEncoding||function(e){switch((e=""+e)&&e.toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":case"raw":return!0;default:return!1}};function i(e){var t;switch(this.encoding=function(e){var t=function(e){if(!e)return"utf8";for(var t;;)switch(e){case"utf8":case"utf-8":return"utf8";case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return"utf16le";case"latin1":case"binary":return"latin1";case"base64":case"ascii":case"hex":return e;default:if(t)return;e=(""+e).toLowerCase(),t=!0}}(e);if("string"!=typeof t&&(r.isEncoding===o||!o(e)))throw new Error("Unknown encoding: "+e);return t||e}(e),this.encoding){case"utf16le":this.text=c,this.end=u,t=4;break;case"utf8":this.fillLast=a,t=4;break;case"base64":this.text=l,this.end=h,t=3;break;default:return this.write=f,void(this.end=p)}this.lastNeed=0,this.lastTotal=0,this.lastChar=r.allocUnsafe(t)}function s(e){return e<=127?0:e>>5==6?2:e>>4==14?3:e>>3==30?4:e>>6==2?-1:-2}function a(e){var t=this.lastTotal-this.lastNeed,n=function(e,t,n){if(128!=(192&t[0]))return e.lastNeed=0,"�";if(e.lastNeed>1&&t.length>1){if(128!=(192&t[1]))return e.lastNeed=1,"�";if(e.lastNeed>2&&t.length>2&&128!=(192&t[2]))return e.lastNeed=2,"�"}}(this,e);return void 0!==n?n:this.lastNeed<=e.length?(e.copy(this.lastChar,t,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal)):(e.copy(this.lastChar,t,0,e.length),void(this.lastNeed-=e.length))}function c(e,t){if((e.length-t)%2==0){var n=e.toString("utf16le",t);if(n){var r=n.charCodeAt(n.length-1);if(r>=55296&&r<=56319)return this.lastNeed=2,this.lastTotal=4,this.lastChar[0]=e[e.length-2],this.lastChar[1]=e[e.length-1],n.slice(0,-1)}return n}return this.lastNeed=1,this.lastTotal=2,this.lastChar[0]=e[e.length-1],e.toString("utf16le",t,e.length-1)}function u(e){var t=e&&e.length?this.write(e):"";if(this.lastNeed){var n=this.lastTotal-this.lastNeed;return t+this.lastChar.toString("utf16le",0,n)}return t}function l(e,t){var n=(e.length-t)%3;return 0===n?e.toString("base64",t):(this.lastNeed=3-n,this.lastTotal=3,1===n?this.lastChar[0]=e[e.length-1]:(this.lastChar[0]=e[e.length-2],this.lastChar[1]=e[e.length-1]),e.toString("base64",t,e.length-n))}function h(e){var t=e&&e.length?this.write(e):"";return this.lastNeed?t+this.lastChar.toString("base64",0,3-this.lastNeed):t}function f(e){return e.toString(this.encoding)}function p(e){return e&&e.length?this.write(e):""}t.StringDecoder=i,i.prototype.write=function(e){if(0===e.length)return"";var t,n;if(this.lastNeed){if(void 0===(t=this.fillLast(e)))return"";n=this.lastNeed,this.lastNeed=0}else n=0;return n=0)return o>0&&(e.lastNeed=o-1),o;if(--r=0)return o>0&&(e.lastNeed=o-2),o;if(--r=0)return o>0&&(2===o?o=0:e.lastNeed=o-3),o;return 0}(this,e,t);if(!this.lastNeed)return e.toString("utf8",t);this.lastTotal=n;var r=e.length-(n-this.lastNeed);return e.copy(this.lastChar,0,r),e.toString("utf8",t,r)},i.prototype.fillLast=function(e){if(this.lastNeed<=e.length)return e.copy(this.lastChar,this.lastTotal-this.lastNeed,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal);e.copy(this.lastChar,this.lastTotal-this.lastNeed,0,e.length),this.lastNeed-=e.length}},function(e,t,n){"use strict";(function(t,r,o){var i=n(26);function s(e){var t=this;this.next=null,this.entry=null,this.finish=function(){!function(e,t,n){var r=e.entry;e.entry=null;for(;r;){var o=r.callback;t.pendingcb--,o(n),r=r.next}t.corkedRequestsFree?t.corkedRequestsFree.next=e:t.corkedRequestsFree=e}(t,e)}}e.exports=b;var a,c=!t.browser&&["v0.10","v0.9."].indexOf(t.version.slice(0,5))>-1?r:i.nextTick;b.WritableState=v;var u=n(23);u.inherits=n(19);var l={deprecate:n(69)},h=n(40),f=n(18).Buffer,p=o.Uint8Array||function(){};var d,g=n(41);function y(){}function v(e,t){a=a||n(14),e=e||{};var r=t instanceof a;this.objectMode=!!e.objectMode,r&&(this.objectMode=this.objectMode||!!e.writableObjectMode);var o=e.highWaterMark,u=e.writableHighWaterMark,l=this.objectMode?16:16384;this.highWaterMark=o||0===o?o:r&&(u||0===u)?u:l,this.highWaterMark=Math.floor(this.highWaterMark),this.finalCalled=!1,this.needDrain=!1,this.ending=!1,this.ended=!1,this.finished=!1,this.destroyed=!1;var h=!1===e.decodeStrings;this.decodeStrings=!h,this.defaultEncoding=e.defaultEncoding||"utf8",this.length=0,this.writing=!1,this.corked=0,this.sync=!0,this.bufferProcessing=!1,this.onwrite=function(e){!function(e,t){var n=e._writableState,r=n.sync,o=n.writecb;if(function(e){e.writing=!1,e.writecb=null,e.length-=e.writelen,e.writelen=0}(n),t)!function(e,t,n,r,o){--t.pendingcb,n?(i.nextTick(o,r),i.nextTick(k,e,t),e._writableState.errorEmitted=!0,e.emit("error",r)):(o(r),e._writableState.errorEmitted=!0,e.emit("error",r),k(e,t))}(e,n,r,t,o);else{var s=E(n);s||n.corked||n.bufferProcessing||!n.bufferedRequest||S(e,n),r?c(w,e,n,s,o):w(e,n,s,o)}}(t,e)},this.writecb=null,this.writelen=0,this.bufferedRequest=null,this.lastBufferedRequest=null,this.pendingcb=0,this.prefinished=!1,this.errorEmitted=!1,this.bufferedRequestCount=0,this.corkedRequestsFree=new s(this)}function b(e){if(a=a||n(14),!(d.call(b,this)||this instanceof a))return new b(e);this._writableState=new v(e,this),this.writable=!0,e&&("function"==typeof e.write&&(this._write=e.write),"function"==typeof e.writev&&(this._writev=e.writev),"function"==typeof e.destroy&&(this._destroy=e.destroy),"function"==typeof e.final&&(this._final=e.final)),h.call(this)}function m(e,t,n,r,o,i,s){t.writelen=r,t.writecb=s,t.writing=!0,t.sync=!0,n?e._writev(o,t.onwrite):e._write(o,i,t.onwrite),t.sync=!1}function w(e,t,n,r){n||function(e,t){0===t.length&&t.needDrain&&(t.needDrain=!1,e.emit("drain"))}(e,t),t.pendingcb--,r(),k(e,t)}function S(e,t){t.bufferProcessing=!0;var n=t.bufferedRequest;if(e._writev&&n&&n.next){var r=t.bufferedRequestCount,o=new Array(r),i=t.corkedRequestsFree;i.entry=n;for(var a=0,c=!0;n;)o[a]=n,n.isBuf||(c=!1),n=n.next,a+=1;o.allBuffers=c,m(e,t,!0,t.length,o,"",i.finish),t.pendingcb++,t.lastBufferedRequest=null,i.next?(t.corkedRequestsFree=i.next,i.next=null):t.corkedRequestsFree=new s(t),t.bufferedRequestCount=0}else{for(;n;){var u=n.chunk,l=n.encoding,h=n.callback;if(m(e,t,!1,t.objectMode?1:u.length,u,l,h),n=n.next,t.bufferedRequestCount--,t.writing)break}null===n&&(t.lastBufferedRequest=null)}t.bufferedRequest=n,t.bufferProcessing=!1}function E(e){return e.ending&&0===e.length&&null===e.bufferedRequest&&!e.finished&&!e.writing}function C(e,t){e._final(function(n){t.pendingcb--,n&&e.emit("error",n),t.prefinished=!0,e.emit("prefinish"),k(e,t)})}function k(e,t){var n=E(t);return n&&(!function(e,t){t.prefinished||t.finalCalled||("function"==typeof e._final?(t.pendingcb++,t.finalCalled=!0,i.nextTick(C,e,t)):(t.prefinished=!0,e.emit("prefinish")))}(e,t),0===t.pendingcb&&(t.finished=!0,e.emit("finish"))),n}u.inherits(b,h),v.prototype.getBuffer=function(){for(var e=this.bufferedRequest,t=[];e;)t.push(e),e=e.next;return t},function(){try{Object.defineProperty(v.prototype,"buffer",{get:l.deprecate(function(){return this.getBuffer()},"_writableState.buffer is deprecated. Use _writableState.getBuffer instead.","DEP0003")})}catch(e){}}(),"function"==typeof Symbol&&Symbol.hasInstance&&"function"==typeof Function.prototype[Symbol.hasInstance]?(d=Function.prototype[Symbol.hasInstance],Object.defineProperty(b,Symbol.hasInstance,{value:function(e){return!!d.call(this,e)||this===b&&(e&&e._writableState instanceof v)}})):d=function(e){return e instanceof this},b.prototype.pipe=function(){this.emit("error",new Error("Cannot pipe, not readable"))},b.prototype.write=function(e,t,n){var r,o=this._writableState,s=!1,a=!o.objectMode&&(r=e,f.isBuffer(r)||r instanceof p);return a&&!f.isBuffer(e)&&(e=function(e){return f.from(e)}(e)),"function"==typeof t&&(n=t,t=null),a?t="buffer":t||(t=o.defaultEncoding),"function"!=typeof n&&(n=y),o.ended?function(e,t){var n=new Error("write after end");e.emit("error",n),i.nextTick(t,n)}(this,n):(a||function(e,t,n,r){var o=!0,s=!1;return null===n?s=new TypeError("May not write null values to stream"):"string"==typeof n||void 0===n||t.objectMode||(s=new TypeError("Invalid non-string/buffer chunk")),s&&(e.emit("error",s),i.nextTick(r,s),o=!1),o}(this,o,e,n))&&(o.pendingcb++,s=function(e,t,n,r,o,i){if(!n){var s=function(e,t,n){e.objectMode||!1===e.decodeStrings||"string"!=typeof t||(t=f.from(t,n));return t}(t,r,o);r!==s&&(n=!0,o="buffer",r=s)}var a=t.objectMode?1:r.length;t.length+=a;var c=t.length-1))throw new TypeError("Unknown encoding: "+e);return this._writableState.defaultEncoding=e,this},Object.defineProperty(b.prototype,"writableHighWaterMark",{enumerable:!1,get:function(){return this._writableState.highWaterMark}}),b.prototype._write=function(e,t,n){n(new Error("_write() is not implemented"))},b.prototype._writev=null,b.prototype.end=function(e,t,n){var r=this._writableState;"function"==typeof e?(n=e,e=null,t=null):"function"==typeof t&&(n=t,t=null),null!=e&&this.write(e,t),r.corked&&(r.corked=1,this.uncork()),r.ending||r.finished||function(e,t,n){t.ending=!0,k(e,t),n&&(t.finished?i.nextTick(n):e.once("finish",n));t.ended=!0,e.writable=!1}(this,r,n)},Object.defineProperty(b.prototype,"destroyed",{get:function(){return void 0!==this._writableState&&this._writableState.destroyed},set:function(e){this._writableState&&(this._writableState.destroyed=e)}}),b.prototype.destroy=g.destroy,b.prototype._undestroy=g.undestroy,b.prototype._destroy=function(e,t){this.end(),t(e)}}).call(this,n(22),n(67).setImmediate,n(13))},function(e,t,n){"use strict";e.exports=s;var r=n(14),o=n(23);function i(e,t){var n=this._transformState;n.transforming=!1;var r=n.writecb;if(!r)return this.emit("error",new Error("write callback called multiple times"));n.writechunk=null,n.writecb=null,null!=t&&this.push(t),r(e);var o=this._readableState;o.reading=!1,(o.needReadable||o.length0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]=200&&c.statusCode<300?r(new s.b(c.statusCode,c.statusMessage||"",u)):o(new i.b(c.statusMessage||"",c.statusCode||0))});t.abortSignal&&(t.abortSignal.onabort=function(){h.abort(),o(new i.a)})})},n.prototype.getCookieString=function(e){return this.cookieJar.getCookieString(e)},n}(s.a)}).call(this,n(8).Buffer)},function(e,t,n){"use strict";(function(e){n.d(t,"a",function(){return i});var r=n(11),o=n(2),i=function(){function t(){}return t.prototype.writeHandshakeRequest=function(e){return r.a.write(JSON.stringify(e))},t.prototype.parseHandshakeResponse=function(t){var n,i;if(Object(o.g)(t)||void 0!==e&&t instanceof e){var s=new Uint8Array(t);if(-1===(c=s.indexOf(r.a.RecordSeparatorCode)))throw new Error("Message is incomplete.");var a=c+1;n=String.fromCharCode.apply(null,s.slice(0,a)),i=s.byteLength>a?s.slice(a).buffer:null}else{var c,u=t;if(-1===(c=u.indexOf(r.a.RecordSeparator)))throw new Error("Message is incomplete.");a=c+1;n=u.substring(0,a),i=u.length>a?u.substring(a):null}var l=r.a.parse(n),h=JSON.parse(l[0]);if(h.type)throw new Error("Expected a handshake response from the server.");return[i,h]},t}()}).call(this,n(8).Buffer)},function(e,t,n){"use strict";(function(e){n.d(t,"a",function(){return f});var r,o,i=n(5),s=n(7),a=n(1),c=n(3),u=(r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])},function(e,t){function n(){this.constructor=e}r(e,t),e.prototype=null===t?Object.create(t):(n.prototype=t.prototype,new n)}),l=Object.assign||function(e){for(var t,n=1,r=arguments.length;n=200&&c.statusCode<300?r(new s.b(c.statusCode,c.statusMessage||"",u)):o(new i.b(c.statusMessage||"",c.statusCode||0))});t.abortSignal&&(t.abortSignal.onabort=function(){h.abort(),o(new i.a)})})},n.prototype.getCookieString=function(e){return this.cookieJar.getCookieString(e)},n}(s.a)}).call(this,n(8).Buffer)},function(e,t,n){"use strict";(function(e){n.d(t,"a",function(){return i});var r=n(12),o=n(3),i=function(){function t(){}return t.prototype.writeHandshakeRequest=function(e){return r.a.write(JSON.stringify(e))},t.prototype.parseHandshakeResponse=function(t){var n,i;if(Object(o.g)(t)||void 0!==e&&t instanceof e){var s=new Uint8Array(t);if(-1===(c=s.indexOf(r.a.RecordSeparatorCode)))throw new Error("Message is incomplete.");var a=c+1;n=String.fromCharCode.apply(null,s.slice(0,a)),i=s.byteLength>a?s.slice(a).buffer:null}else{var c,u=t;if(-1===(c=u.indexOf(r.a.RecordSeparator)))throw new Error("Message is incomplete.");a=c+1;n=u.substring(0,a),i=u.length>a?u.substring(a):null}var l=r.a.parse(n),h=JSON.parse(l[0]);if(h.type)throw new Error("Expected a handshake response from the server.");return[i,h]},t}()}).call(this,n(8).Buffer)},,,,,function(e,t,n){"use strict";var r=this&&this.__assign||function(){return(r=Object.assign||function(e){for(var t,n=1,r=arguments.length;n0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0?r-4:r,h=0;h>16&255,a[c++]=t>>8&255,a[c++]=255&t;2===s&&(t=o[e.charCodeAt(h)]<<2|o[e.charCodeAt(h+1)]>>4,a[c++]=255&t);1===s&&(t=o[e.charCodeAt(h)]<<10|o[e.charCodeAt(h+1)]<<4|o[e.charCodeAt(h+2)]>>2,a[c++]=t>>8&255,a[c++]=255&t);return a},t.fromByteArray=function(e){for(var t,n=e.length,o=n%3,i=[],s=0,a=n-o;sa?a:s+16383));1===o?(t=e[n-1],i.push(r[t>>2]+r[t<<4&63]+"==")):2===o&&(t=(e[n-2]<<8)+e[n-1],i.push(r[t>>10]+r[t>>4&63]+r[t<<2&63]+"="));return i.join("")};for(var r=[],o=[],i="undefined"!=typeof Uint8Array?Uint8Array:Array,s="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",a=0,c=s.length;a0)throw new Error("Invalid string. Length must be a multiple of 4");var n=e.indexOf("=");return-1===n&&(n=t),[n,n===t?0:4-n%4]}function l(e,t,n){for(var o,i,s=[],a=t;a>18&63]+r[i>>12&63]+r[i>>6&63]+r[63&i]);return s.join("")}o["-".charCodeAt(0)]=62,o["_".charCodeAt(0)]=63},function(e,t){t.read=function(e,t,n,r,o){var i,s,a=8*o-r-1,c=(1<>1,l=-7,h=n?o-1:0,f=n?-1:1,p=e[t+h];for(h+=f,i=p&(1<<-l)-1,p>>=-l,l+=a;l>0;i=256*i+e[t+h],h+=f,l-=8);for(s=i&(1<<-l)-1,i>>=-l,l+=r;l>0;s=256*s+e[t+h],h+=f,l-=8);if(0===i)i=1-u;else{if(i===c)return s?NaN:1/0*(p?-1:1);s+=Math.pow(2,r),i-=u}return(p?-1:1)*s*Math.pow(2,i-r)},t.write=function(e,t,n,r,o,i){var s,a,c,u=8*i-o-1,l=(1<>1,f=23===o?Math.pow(2,-24)-Math.pow(2,-77):0,p=r?0:i-1,d=r?1:-1,g=t<0||0===t&&1/t<0?1:0;for(t=Math.abs(t),isNaN(t)||t===1/0?(a=isNaN(t)?1:0,s=l):(s=Math.floor(Math.log(t)/Math.LN2),t*(c=Math.pow(2,-s))<1&&(s--,c*=2),(t+=s+h>=1?f/c:f*Math.pow(2,1-h))*c>=2&&(s++,c/=2),s+h>=l?(a=0,s=l):s+h>=1?(a=(t*c-1)*Math.pow(2,o),s+=h):(a=t*Math.pow(2,h-1)*Math.pow(2,o),s=0));o>=8;e[n+p]=255&a,p+=d,a/=256,o-=8);for(s=s<0;e[n+p]=255&s,p+=d,s/=256,u-=8);e[n+p-d]|=128*g}},function(e,t){var n={}.toString;e.exports=Array.isArray||function(e){return"[object Array]"==n.call(e)}},function(e,t,n){"use strict";(function(t){ /*! * The buffer module from node.js, for the browser. * * @author Feross Aboukhadijeh * @license MIT */ -function r(e,t){if(e===t)return 0;for(var n=e.length,r=t.length,o=0,i=Math.min(n,r);o=0;c--)if(l[c]!==f[c])return!1;for(c=l.length-1;c>=0;c--)if(u=l[c],!m(e[u],t[u],n,r))return!1;return!0}(e,t,n,a))}return n?e===t:e==t}function b(e){return"[object Arguments]"==Object.prototype.toString.call(e)}function w(e,t){if(!e||!t)return!1;if("[object RegExp]"==Object.prototype.toString.call(t))return t.test(e);try{if(e instanceof t)return!0}catch(e){}return!Error.isPrototypeOf(t)&&!0===t.call({},e)}function E(e,t,n,r){var o;if("function"!=typeof t)throw new TypeError('"block" argument must be a function');"string"==typeof n&&(r=n,n=null),o=function(e){var t;try{e()}catch(e){t=e}return t}(t),r=(n&&n.name?" ("+n.name+").":".")+(r?" "+r:"."),e&&!o&&y(o,n,"Missing expected exception"+r);var a="string"==typeof r,s=!e&&o&&!n;if((!e&&i.isError(o)&&a&&w(o,n)||s)&&y(o,n,"Got unwanted exception"+r),e&&o&&n&&!w(o,n)||!e&&o)throw o}f.AssertionError=function(e){var t;this.name="AssertionError",this.actual=e.actual,this.expected=e.expected,this.operator=e.operator,e.message?(this.message=e.message,this.generatedMessage=!1):(this.message=d(g((t=this).actual),128)+" "+t.operator+" "+d(g(t.expected),128),this.generatedMessage=!0);var n=e.stackStartFunction||y;if(Error.captureStackTrace)Error.captureStackTrace(this,n);else{var r=new Error;if(r.stack){var o=r.stack,i=p(n),a=o.indexOf("\n"+i);if(a>=0){var s=o.indexOf("\n",a+1);o=o.substring(s+1)}this.stack=o}}},i.inherits(f.AssertionError,Error),f.fail=y,f.ok=v,f.equal=function(e,t,n){e!=t&&y(e,t,n,"==",f.equal)},f.notEqual=function(e,t,n){e==t&&y(e,t,n,"!=",f.notEqual)},f.deepEqual=function(e,t,n){m(e,t,!1)||y(e,t,n,"deepEqual",f.deepEqual)},f.deepStrictEqual=function(e,t,n){m(e,t,!0)||y(e,t,n,"deepStrictEqual",f.deepStrictEqual)},f.notDeepEqual=function(e,t,n){m(e,t,!1)&&y(e,t,n,"notDeepEqual",f.notDeepEqual)},f.notDeepStrictEqual=function e(t,n,r){m(t,n,!0)&&y(t,n,r,"notDeepStrictEqual",e)},f.strictEqual=function(e,t,n){e!==t&&y(e,t,n,"===",f.strictEqual)},f.notStrictEqual=function(e,t,n){e===t&&y(e,t,n,"!==",f.notStrictEqual)},f.throws=function(e,t,n){E(!0,e,t,n)},f.doesNotThrow=function(e,t,n){E(!1,e,t,n)},f.ifError=function(e){if(e)throw e};var S=Object.keys||function(e){var t=[];for(var n in e)a.call(e,n)&&t.push(n);return t}}).call(this,n(5))},function(e,t){e.exports=function(e){return e&&"object"==typeof e&&"function"==typeof e.copy&&"function"==typeof e.fill&&"function"==typeof e.readUInt8}},function(e,t){},function(e,t,n){"use strict";var r=n(6).Buffer,o=n(53);e.exports=function(){function e(){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),this.head=null,this.tail=null,this.length=0}return e.prototype.push=function(e){var t={data:e,next:null};this.length>0?this.tail.next=t:this.head=t,this.tail=t,++this.length},e.prototype.unshift=function(e){var t={data:e,next:this.head};0===this.length&&(this.tail=t),this.head=t,++this.length},e.prototype.shift=function(){if(0!==this.length){var e=this.head.data;return 1===this.length?this.head=this.tail=null:this.head=this.head.next,--this.length,e}},e.prototype.clear=function(){this.head=this.tail=null,this.length=0},e.prototype.join=function(e){if(0===this.length)return"";for(var t=this.head,n=""+t.data;t=t.next;)n+=e+t.data;return n},e.prototype.concat=function(e){if(0===this.length)return r.alloc(0);if(1===this.length)return this.head.data;for(var t,n,o,i=r.allocUnsafe(e>>>0),a=this.head,s=0;a;)t=a.data,n=i,o=s,t.copy(n,o),s+=a.data.length,a=a.next;return i},e}(),o&&o.inspect&&o.inspect.custom&&(e.exports.prototype[o.inspect.custom]=function(){var e=o.inspect({length:this.length});return this.constructor.name+" "+e})},function(e,t){},function(e,t,n){(function(e){var r=void 0!==e&&e||"undefined"!=typeof self&&self||window,o=Function.prototype.apply;function i(e,t){this._id=e,this._clearFn=t}t.setTimeout=function(){return new i(o.call(setTimeout,r,arguments),clearTimeout)},t.setInterval=function(){return new i(o.call(setInterval,r,arguments),clearInterval)},t.clearTimeout=t.clearInterval=function(e){e&&e.close()},i.prototype.unref=i.prototype.ref=function(){},i.prototype.close=function(){this._clearFn.call(r,this._id)},t.enroll=function(e,t){clearTimeout(e._idleTimeoutId),e._idleTimeout=t},t.unenroll=function(e){clearTimeout(e._idleTimeoutId),e._idleTimeout=-1},t._unrefActive=t.active=function(e){clearTimeout(e._idleTimeoutId);var t=e._idleTimeout;t>=0&&(e._idleTimeoutId=setTimeout(function(){e._onTimeout&&e._onTimeout()},t))},n(55),t.setImmediate="undefined"!=typeof self&&self.setImmediate||void 0!==e&&e.setImmediate||this&&this.setImmediate,t.clearImmediate="undefined"!=typeof self&&self.clearImmediate||void 0!==e&&e.clearImmediate||this&&this.clearImmediate}).call(this,n(5))},function(e,t,n){(function(e,t){!function(e,n){"use strict";if(!e.setImmediate){var r,o,i,a,s,u=1,c={},l=!1,f=e.document,h=Object.getPrototypeOf&&Object.getPrototypeOf(e);h=h&&h.setTimeout?h:e,"[object process]"==={}.toString.call(e.process)?r=function(e){t.nextTick(function(){d(e)})}:!function(){if(e.postMessage&&!e.importScripts){var t=!0,n=e.onmessage;return e.onmessage=function(){t=!1},e.postMessage("","*"),e.onmessage=n,t}}()?e.MessageChannel?((i=new MessageChannel).port1.onmessage=function(e){d(e.data)},r=function(e){i.port2.postMessage(e)}):f&&"onreadystatechange"in f.createElement("script")?(o=f.documentElement,r=function(e){var t=f.createElement("script");t.onreadystatechange=function(){d(e),t.onreadystatechange=null,o.removeChild(t),t=null},o.appendChild(t)}):r=function(e){setTimeout(d,0,e)}:(a="setImmediate$"+Math.random()+"$",s=function(t){t.source===e&&"string"==typeof t.data&&0===t.data.indexOf(a)&&d(+t.data.slice(a.length))},e.addEventListener?e.addEventListener("message",s,!1):e.attachEvent("onmessage",s),r=function(t){e.postMessage(a+t,"*")}),h.setImmediate=function(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),n=0;n0?this._transform(null,t,n):n()},e.exports.decoder=u,e.exports.encoder=s},function(e,t,n){"use strict";var r=n(17);function o(e){Error.call(this),Error.captureStackTrace&&Error.captureStackTrace(this,this.constructor),this.name=this.constructor.name,this.message=e||"unable to decode"}n(30).inherits(o,Error),e.exports=function(e){return function(e){e instanceof r||(e=r().append(e));var t=i(e);if(t)return e.consume(t.bytesConsumed),t.value;throw new o};function t(e,t,n){return t>=n+e}function n(e,t){return{value:e,bytesConsumed:t}}function i(e,r){r=void 0===r?0:r;var o=e.length-r;if(o<=0)return null;var i,l,f,h=e.readUInt8(r),p=0;if(!function(e,t){var n=function(e){switch(e){case 196:return 2;case 197:return 3;case 198:return 5;case 199:return 3;case 200:return 4;case 201:return 6;case 202:return 5;case 203:return 9;case 204:return 2;case 205:return 3;case 206:return 5;case 207:return 9;case 208:return 2;case 209:return 3;case 210:return 5;case 211:return 9;case 212:return 3;case 213:return 4;case 214:return 6;case 215:return 10;case 216:return 18;case 217:return 2;case 218:return 3;case 219:return 5;case 222:return 3;default:return-1}}(e);return!(-1!==n&&t=0;f--)p+=e.readUInt8(r+f+1)*Math.pow(2,8*(7-f));return n(p,9);case 208:return n(p=e.readInt8(r+1),2);case 209:return n(p=e.readInt16BE(r+1),3);case 210:return n(p=e.readInt32BE(r+1),5);case 211:return n(p=function(e,t){var n=128==(128&e[t]);if(n)for(var r=1,o=t+7;o>=t;o--){var i=(255^e[o])+r;e[o]=255&i,r=i>>8}var a=e.readUInt32BE(t+0),s=e.readUInt32BE(t+4);return(4294967296*a+s)*(n?-1:1)}(e.slice(r+1,r+9),0),9);case 202:return n(p=e.readFloatBE(r+1),5);case 203:return n(p=e.readDoubleBE(r+1),9);case 217:return t(i=e.readUInt8(r+1),o,2)?n(p=e.toString("utf8",r+2,r+2+i),2+i):null;case 218:return t(i=e.readUInt16BE(r+1),o,3)?n(p=e.toString("utf8",r+3,r+3+i),3+i):null;case 219:return t(i=e.readUInt32BE(r+1),o,5)?n(p=e.toString("utf8",r+5,r+5+i),5+i):null;case 196:return t(i=e.readUInt8(r+1),o,2)?n(p=e.slice(r+2,r+2+i),2+i):null;case 197:return t(i=e.readUInt16BE(r+1),o,3)?n(p=e.slice(r+3,r+3+i),3+i):null;case 198:return t(i=e.readUInt32BE(r+1),o,5)?n(p=e.slice(r+5,r+5+i),5+i):null;case 220:return o<3?null:(i=e.readUInt16BE(r+1),a(e,r,i,3));case 221:return o<5?null:(i=e.readUInt32BE(r+1),a(e,r,i,5));case 222:return i=e.readUInt16BE(r+1),s(e,r,i,3);case 223:return i=e.readUInt32BE(r+1),s(e,r,i,5);case 212:return u(e,r,1);case 213:return u(e,r,2);case 214:return u(e,r,4);case 215:return u(e,r,8);case 216:return u(e,r,16);case 199:return i=e.readUInt8(r+1),l=e.readUInt8(r+2),t(i,o,3)?c(e,r,l,i,3):null;case 200:return i=e.readUInt16BE(r+1),l=e.readUInt8(r+3),t(i,o,4)?c(e,r,l,i,4):null;case 201:return i=e.readUInt32BE(r+1),l=e.readUInt8(r+5),t(i,o,6)?c(e,r,l,i,6):null}if(144==(240&h))return a(e,r,i=15&h,1);if(128==(240&h))return s(e,r,i=15&h,1);if(160==(224&h))return t(i=31&h,o,1)?n(p=e.toString("utf8",r+1,r+i+1),i+1):null;if(h>=224)return n(p=h-256,1);if(h<128)return n(h,1);throw new Error("not implemented yet")}function a(e,t,r,o){var a,s=[],u=0;for(t+=o,a=0;a0&&l.write(u,1)):f<=255&&!n?((l=r.allocUnsafe(2+f))[0]=217,l[1]=f,l.write(u,2)):f<=65535?((l=r.allocUnsafe(3+f))[0]=218,l.writeUInt16BE(f,1),l.write(u,3)):((l=r.allocUnsafe(5+f))[0]=219,l.writeUInt32BE(f,1),l.write(u,5));else if(u&&(u.readUInt32LE||u instanceof Uint8Array))u instanceof Uint8Array&&(u=r.from(u)),u.length<=255?((l=r.allocUnsafe(2))[0]=196,l[1]=u.length):u.length<=65535?((l=r.allocUnsafe(3))[0]=197,l.writeUInt16BE(u.length,1)):((l=r.allocUnsafe(5))[0]=198,l.writeUInt32BE(u.length,1)),l=o([l,u]);else if(Array.isArray(u))u.length<16?(l=r.allocUnsafe(1))[0]=144|u.length:u.length<65536?((l=r.allocUnsafe(3))[0]=220,l.writeUInt16BE(u.length,1)):((l=r.allocUnsafe(5))[0]=221,l.writeUInt32BE(u.length,1)),l=u.reduce(function(e,t){return e.append(s(t,!0)),e},o().append(l));else{if(!a&&"function"==typeof u.getDate)return function(e){var t,n=1*e,i=Math.floor(n/1e3),a=1e6*(n-1e3*i);if(a||i>4294967295){(t=r.allocUnsafe(10))[0]=215,t[1]=-1;var s=4*a,u=i/Math.pow(2,32),c=s+u&4294967295,l=4294967295&i;t.writeInt32BE(c,2),t.writeInt32BE(l,6)}else(t=r.allocUnsafe(6))[0]=214,t[1]=-1,t.writeUInt32BE(Math.floor(n/1e3),2);return o().append(t)}(u);if("object"==typeof u)l=function(t){var n,i,a=-1,s=[];for(n=0;n>8),s.push(255&a)):(s.push(201),s.push(a>>24),s.push(a>>16&255),s.push(a>>8&255),s.push(255&a));return o().append(r.from(s)).append(i)}(u)||function(e){var t,n,i=[],a=0;for(t in e)e.hasOwnProperty(t)&&void 0!==e[t]&&"function"!=typeof e[t]&&(++a,i.push(s(t,!0)),i.push(s(e[t],!0)));a<16?(n=r.allocUnsafe(1))[0]=128|a:a<65535?((n=r.allocUnsafe(3))[0]=222,n.writeUInt16BE(a,1)):((n=r.allocUnsafe(5))[0]=223,n.writeUInt32BE(a,1));return i.unshift(n),i.reduce(function(e,t){return e.append(t)},o())}(u);else if("number"==typeof u){if(function(e){return e%1!=0}(u))return i(u,t);if(u>=0)if(u<128)(l=r.allocUnsafe(1))[0]=u;else if(u<256)(l=r.allocUnsafe(2))[0]=204,l[1]=u;else if(u<65536)(l=r.allocUnsafe(3))[0]=205,l.writeUInt16BE(u,1);else if(u<=4294967295)(l=r.allocUnsafe(5))[0]=206,l.writeUInt32BE(u,1);else{if(!(u<=9007199254740991))return i(u,!0);(l=r.allocUnsafe(9))[0]=207,function(e,t){for(var n=7;n>=0;n--)e[n+1]=255&t,t/=256}(l,u)}else if(u>=-32)(l=r.allocUnsafe(1))[0]=256+u;else if(u>=-128)(l=r.allocUnsafe(2))[0]=208,l.writeInt8(u,1);else if(u>=-32768)(l=r.allocUnsafe(3))[0]=209,l.writeInt16BE(u,1);else if(u>-214748365)(l=r.allocUnsafe(5))[0]=210,l.writeInt32BE(u,1);else{if(!(u>=-9007199254740991))return i(u,!0);(l=r.allocUnsafe(9))[0]=211,function(e,t,n){var r=n<0;r&&(n=Math.abs(n));var o=n%4294967296,i=n/4294967296;if(e.writeUInt32BE(Math.floor(i),t+0),e.writeUInt32BE(o,t+4),r)for(var a=1,s=t+7;s>=t;s--){var u=(255^e[s])+a;e[s]=255&u,a=u>>8}}(l,1,u)}}}if(!l)throw new Error("not implemented yet");return c?l:l.slice()}return s}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=function(){function e(e){this.dialog=e}return e.prototype.show=function(){this.removeClasses(),this.dialog.classList.add(e.ShowClassName)},e.prototype.hide=function(){this.removeClasses(),this.dialog.classList.add(e.HideClassName)},e.prototype.failed=function(){this.removeClasses(),this.dialog.classList.add(e.FailedClassName)},e.prototype.removeClasses=function(){this.dialog.classList.remove(e.ShowClassName,e.HideClassName,e.FailedClassName)},e.ShowClassName="components-reconnect-show",e.HideClassName="components-reconnect-hide",e.FailedClassName="components-reconnect-failed",e}();t.UserSpecifiedDisplay=r},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(40),o=function(){function e(e){this.document=e,this.addedToDom=!1,this.modal=this.document.createElement("div"),this.modal.id=r.AutoReconnectCircuitHandler.DialogId;this.modal.style.cssText=["position: fixed","top: 0","right: 0","bottom: 0","left: 0","z-index: 1000","display: none","overflow: hidden","background-color: #fff","opacity: 0.8","text-align: center","font-weight: bold"].join(";"),this.modal.innerHTML='
',this.message=this.modal.querySelector("h5"),this.button=this.modal.querySelector("button"),this.button.addEventListener("click",function(){return window.Blazor.reconnect()})}return e.prototype.show=function(){this.addedToDom||(this.addedToDom=!0,this.document.body.appendChild(this.modal)),this.modal.style.display="block",this.button.style.display="none",this.message.textContent="Attempting to reconnect to the server..."},e.prototype.hide=function(){this.modal.style.display="none"},e.prototype.failed=function(){this.button.style.display="block",this.message.textContent="Failed to reconnect to the server."},e}();t.DefaultReconnectDisplay=o},function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,i){function a(e){try{u(r.next(e))}catch(e){i(e)}}function s(e){try{u(r.throw(e))}catch(e){i(e)}}function u(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(a,s)}u((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,i,a={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function s(i){return function(s){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;a;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return a.label++,{value:i[1],done:!1};case 5:a.label++,r=i[1],i=[0];continue;case 7:i=a.ops.pop(),a.trys.pop();continue;default:if(!(o=(o=a.trys).length>0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]this.nextBatchId)this.logger.log(s.LogLevel.Debug,"Waiting for batch "+this.nextBatchId+". Batch "+e+" not processed.");else try{this.nextBatchId++,this.logger.log(s.LogLevel.Debug,"Applying batch "+e+"."),i.renderBatch(this.browserRendererId,new a.OutOfProcessRenderBatch(t)),this.completeBatch(n,e)}catch(t){throw this.logger.log(s.LogLevel.Error,"There was an error applying batch "+e+"."),n.send("OnRenderCompleted",e,t.toString()),t}},e.prototype.getLastBatchid=function(){return this.nextBatchId-1},e.prototype.completeBatch=function(e,t){return r(this,void 0,void 0,function(){return o(this,function(n){switch(n.label){case 0:return n.trys.push([0,2,,3]),[4,e.send("OnRenderCompleted",t,null)];case 1:return n.sent(),[3,3];case 2:return n.sent(),this.logger.log(s.LogLevel.Warning,"Failed to deliver completion notification for render '"+t+"'."),[3,3];case 3:return[2]}})})},e.renderQueues=new Map,e}();t.default=u},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(65),o=function(){function e(e){this.batchData=e;var t=new u(e);this.arrayRangeReader=new c(e),this.arraySegmentReader=new l(e),this.diffReader=new i(e),this.editReader=new a(e,t),this.frameReader=new s(e,t)}return e.prototype.updatedComponents=function(){return f(this.batchData,this.batchData.length-20)},e.prototype.referenceFrames=function(){return f(this.batchData,this.batchData.length-16)},e.prototype.disposedComponentIds=function(){return f(this.batchData,this.batchData.length-12)},e.prototype.disposedEventHandlerIds=function(){return f(this.batchData,this.batchData.length-8)},e.prototype.updatedComponentsEntry=function(e,t){var n=e+4*t;return f(this.batchData,n)},e.prototype.referenceFramesEntry=function(e,t){return e+16*t},e.prototype.disposedComponentIdsEntry=function(e,t){var n=e+4*t;return f(this.batchData,n)},e.prototype.disposedEventHandlerIdsEntry=function(e,t){var n=e+4*t;return f(this.batchData,n)},e}();t.OutOfProcessRenderBatch=o;var i=function(){function e(e){this.batchDataUint8=e}return e.prototype.componentId=function(e){return f(this.batchDataUint8,e)},e.prototype.edits=function(e){return e+4},e.prototype.editsEntry=function(e,t){return e+16*t},e}(),a=function(){function e(e,t){this.batchDataUint8=e,this.stringReader=t}return e.prototype.editType=function(e){return f(this.batchDataUint8,e)},e.prototype.siblingIndex=function(e){return f(this.batchDataUint8,e+4)},e.prototype.newTreeIndex=function(e){return f(this.batchDataUint8,e+8)},e.prototype.moveToSiblingIndex=function(e){return f(this.batchDataUint8,e+8)},e.prototype.removedAttributeName=function(e){var t=f(this.batchDataUint8,e+12);return this.stringReader.readString(t)},e}(),s=function(){function e(e,t){this.batchDataUint8=e,this.stringReader=t}return e.prototype.frameType=function(e){return f(this.batchDataUint8,e)},e.prototype.subtreeLength=function(e){return f(this.batchDataUint8,e+4)},e.prototype.elementReferenceCaptureId=function(e){var t=f(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.componentId=function(e){return f(this.batchDataUint8,e+8)},e.prototype.elementName=function(e){var t=f(this.batchDataUint8,e+8);return this.stringReader.readString(t)},e.prototype.textContent=function(e){var t=f(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.markupContent=function(e){var t=f(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.attributeName=function(e){var t=f(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.attributeValue=function(e){var t=f(this.batchDataUint8,e+8);return this.stringReader.readString(t)},e.prototype.attributeEventHandlerId=function(e){return f(this.batchDataUint8,e+12)},e}(),u=function(){function e(e){this.batchDataUint8=e,this.stringTableStartIndex=f(e,e.length-4)}return e.prototype.readString=function(e){if(-1===e)return null;var t,n=f(this.batchDataUint8,this.stringTableStartIndex+4*e),o=function(e,t){for(var n=0,r=0,o=0;o<4;o++){var i=e[t+o];if(n|=(127&i)<65535&&(c-=65536,r.push(c>>>10&1023|55296),c=56320|1023&c),r.push(c)}r.length>1024&&(o.push(String.fromCharCode.apply(null,r)),r.length=0)}return o.push(String.fromCharCode.apply(null,r)),o.join("")}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(19),o=function(){function e(){}return e.prototype.log=function(e,t){},e.instance=new e,e}();t.NullLogger=o;var i=function(){function e(e){this.minimumLogLevel=e}return e.prototype.log=function(e,t){if(e>=this.minimumLogLevel)switch(e){case r.LogLevel.Critical:case r.LogLevel.Error:console.error("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t);break;case r.LogLevel.Warning:console.warn("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t);break;case r.LogLevel.Information:console.info("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t);break;default:console.log("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t)}},e}();t.ConsoleLogger=i},function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,i){function a(e){try{u(r.next(e))}catch(e){i(e)}}function s(e){try{u(r.throw(e))}catch(e){i(e)}}function u(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(a,s)}u((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,i,a={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function s(i){return function(s){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;a;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return a.label++,{value:i[1],done:!1};case 5:a.label++,r=i[1],i=[0];continue;case 7:i=a.ops.pop(),a.trys.pop();continue;default:if(!(o=(o=a.trys).length>0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]=e.length&&(e=void 0),{value:e&&e[n++],done:!e}}}},a=this&&this.__read||function(e,t){var n="function"==typeof Symbol&&e[Symbol.iterator];if(!n)return e;var r,o,i=n.call(e),a=[];try{for(;(void 0===t||t-- >0)&&!(r=i.next()).done;)a.push(r.value)}catch(e){o={error:e}}finally{try{r&&!r.done&&(n=i.return)&&n.call(i)}finally{if(o)throw o.error}}return a};Object.defineProperty(t,"__esModule",{value:!0});var s=n(16),u=n(68),c=function(){function e(e,t){this.circuitId=e,this.components=t}return e.prototype.reconnect=function(e){return e.invoke("ConnectCircuit",this.circuitId)},e}();function l(e){if(e.nodeType===Node.COMMENT_NODE&&e.textContent){var t=/\W+M.A.C.Component:[^{]*(.*)$/.exec(e.textContent),n=t&&t[1];if(n)try{var r=JSON.parse(n),o=r.componentId,i=r.circuitId,a=r.rendererId;if(!!o&&!!i&&!!a)return{node:e,circuitId:i,rendererId:Number.parseInt(a),componentId:Number.parseInt(o)};throw new Error("Found malformed start component comment at "+e.textContent)}catch(t){throw new Error("Found malformed start component comment at "+e.textContent)}}}function f(e,t,n,r){for(var o=n;o>=7)>0&&(r|=128),n.push(r)}while(t>0);t=e.byteLength||e.length;var o=new Uint8Array(n.length+t);return o.set(n,0),o.set(e,n.length),o.buffer},e.parse=function(e){for(var t=[],n=new Uint8Array(e),r=[0,7,14,21,28],o=0;o7)throw new Error("Messages bigger than 2GB are not supported.");if(!(n.byteLength>=o+i+a))throw new Error("Incomplete message.");t.push(n.slice?n.slice(o+i,o+i+a):n.subarray(o+i,o+i+a)),o=o+i+a}return t},e}();var s=new Uint8Array([145,i.MessageType.Ping]),u=function(){function e(){this.name="messagepack",this.version=1,this.transferFormat=i.TransferFormat.Binary}return e.prototype.parseMessages=function(e,t){if(!(e instanceof r.Buffer||(n=e,n&&"undefined"!=typeof ArrayBuffer&&(n instanceof ArrayBuffer||n.constructor&&"ArrayBuffer"===n.constructor.name))))throw new Error("Invalid input for MessagePack hub protocol. Expected an ArrayBuffer or Buffer.");var n;null===t&&(t=i.NullLogger.instance);for(var o=[],s=0,u=a.parse(e);s=0;u--)if(l[u]!==h[u])return!1;for(u=l.length-1;u>=0;u--)if(c=l[u],!b(e[c],t[c],n,r))return!1;return!0}(e,t,n,s))}return n?e===t:e==t}function m(e){return"[object Arguments]"==Object.prototype.toString.call(e)}function w(e,t){if(!e||!t)return!1;if("[object RegExp]"==Object.prototype.toString.call(t))return t.test(e);try{if(e instanceof t)return!0}catch(e){}return!Error.isPrototypeOf(t)&&!0===t.call({},e)}function S(e,t,n,r){var o;if("function"!=typeof t)throw new TypeError('"block" argument must be a function');"string"==typeof n&&(r=n,n=null),o=function(e){var t;try{e()}catch(e){t=e}return t}(t),r=(n&&n.name?" ("+n.name+").":".")+(r?" "+r:"."),e&&!o&&y(o,n,"Missing expected exception"+r);var s="string"==typeof r,a=!e&&o&&!n;if((!e&&i.isError(o)&&s&&w(o,n)||a)&&y(o,n,"Got unwanted exception"+r),e&&o&&n&&!w(o,n)||!e&&o)throw o}h.AssertionError=function(e){var t;this.name="AssertionError",this.actual=e.actual,this.expected=e.expected,this.operator=e.operator,e.message?(this.message=e.message,this.generatedMessage=!1):(this.message=d(g((t=this).actual),128)+" "+t.operator+" "+d(g(t.expected),128),this.generatedMessage=!0);var n=e.stackStartFunction||y;if(Error.captureStackTrace)Error.captureStackTrace(this,n);else{var r=new Error;if(r.stack){var o=r.stack,i=p(n),s=o.indexOf("\n"+i);if(s>=0){var a=o.indexOf("\n",s+1);o=o.substring(a+1)}this.stack=o}}},i.inherits(h.AssertionError,Error),h.fail=y,h.ok=v,h.equal=function(e,t,n){e!=t&&y(e,t,n,"==",h.equal)},h.notEqual=function(e,t,n){e==t&&y(e,t,n,"!=",h.notEqual)},h.deepEqual=function(e,t,n){b(e,t,!1)||y(e,t,n,"deepEqual",h.deepEqual)},h.deepStrictEqual=function(e,t,n){b(e,t,!0)||y(e,t,n,"deepStrictEqual",h.deepStrictEqual)},h.notDeepEqual=function(e,t,n){b(e,t,!1)&&y(e,t,n,"notDeepEqual",h.notDeepEqual)},h.notDeepStrictEqual=function e(t,n,r){b(t,n,!0)&&y(t,n,r,"notDeepStrictEqual",e)},h.strictEqual=function(e,t,n){e!==t&&y(e,t,n,"===",h.strictEqual)},h.notStrictEqual=function(e,t,n){e===t&&y(e,t,n,"!==",h.notStrictEqual)},h.throws=function(e,t,n){S(!0,e,t,n)},h.doesNotThrow=function(e,t,n){S(!1,e,t,n)},h.ifError=function(e){if(e)throw e};var E=Object.keys||function(e){var t=[];for(var n in e)s.call(e,n)&&t.push(n);return t}}).call(this,n(13))},function(e,t){e.exports=function(e){return e&&"object"==typeof e&&"function"==typeof e.copy&&"function"==typeof e.fill&&"function"==typeof e.readUInt8}},function(e,t){"function"==typeof Object.create?e.exports=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})}:e.exports=function(e,t){e.super_=t;var n=function(){};n.prototype=t.prototype,e.prototype=new n,e.prototype.constructor=e}},function(e,t,n){e.exports=n(14)},function(e,t){var n={}.toString;e.exports=Array.isArray||function(e){return"[object Array]"==n.call(e)}},function(e,t){},function(e,t,n){"use strict";var r=n(18).Buffer,o=n(65);e.exports=function(){function e(){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),this.head=null,this.tail=null,this.length=0}return e.prototype.push=function(e){var t={data:e,next:null};this.length>0?this.tail.next=t:this.head=t,this.tail=t,++this.length},e.prototype.unshift=function(e){var t={data:e,next:this.head};0===this.length&&(this.tail=t),this.head=t,++this.length},e.prototype.shift=function(){if(0!==this.length){var e=this.head.data;return 1===this.length?this.head=this.tail=null:this.head=this.head.next,--this.length,e}},e.prototype.clear=function(){this.head=this.tail=null,this.length=0},e.prototype.join=function(e){if(0===this.length)return"";for(var t=this.head,n=""+t.data;t=t.next;)n+=e+t.data;return n},e.prototype.concat=function(e){if(0===this.length)return r.alloc(0);if(1===this.length)return this.head.data;for(var t,n,o,i=r.allocUnsafe(e>>>0),s=this.head,a=0;s;)t=s.data,n=i,o=a,t.copy(n,o),a+=s.data.length,s=s.next;return i},e}(),o&&o.inspect&&o.inspect.custom&&(e.exports.prototype[o.inspect.custom]=function(){var e=o.inspect({length:this.length});return this.constructor.name+" "+e})},function(e,t){},function(e,t,n){var r=n(8),o=r.Buffer;function i(e,t){for(var n in e)t[n]=e[n]}function s(e,t,n){return o(e,t,n)}o.from&&o.alloc&&o.allocUnsafe&&o.allocUnsafeSlow?e.exports=r:(i(r,t),t.Buffer=s),i(o,s),s.from=function(e,t,n){if("number"==typeof e)throw new TypeError("Argument must not be a number");return o(e,t,n)},s.alloc=function(e,t,n){if("number"!=typeof e)throw new TypeError("Argument must be a number");var r=o(e);return void 0!==t?"string"==typeof n?r.fill(t,n):r.fill(t):r.fill(0),r},s.allocUnsafe=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return o(e)},s.allocUnsafeSlow=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return r.SlowBuffer(e)}},function(e,t,n){(function(e){var r=void 0!==e&&e||"undefined"!=typeof self&&self||window,o=Function.prototype.apply;function i(e,t){this._id=e,this._clearFn=t}t.setTimeout=function(){return new i(o.call(setTimeout,r,arguments),clearTimeout)},t.setInterval=function(){return new i(o.call(setInterval,r,arguments),clearInterval)},t.clearTimeout=t.clearInterval=function(e){e&&e.close()},i.prototype.unref=i.prototype.ref=function(){},i.prototype.close=function(){this._clearFn.call(r,this._id)},t.enroll=function(e,t){clearTimeout(e._idleTimeoutId),e._idleTimeout=t},t.unenroll=function(e){clearTimeout(e._idleTimeoutId),e._idleTimeout=-1},t._unrefActive=t.active=function(e){clearTimeout(e._idleTimeoutId);var t=e._idleTimeout;t>=0&&(e._idleTimeoutId=setTimeout(function(){e._onTimeout&&e._onTimeout()},t))},n(68),t.setImmediate="undefined"!=typeof self&&self.setImmediate||void 0!==e&&e.setImmediate||this&&this.setImmediate,t.clearImmediate="undefined"!=typeof self&&self.clearImmediate||void 0!==e&&e.clearImmediate||this&&this.clearImmediate}).call(this,n(13))},function(e,t,n){(function(e,t){!function(e,n){"use strict";if(!e.setImmediate){var r,o,i,s,a,c=1,u={},l=!1,h=e.document,f=Object.getPrototypeOf&&Object.getPrototypeOf(e);f=f&&f.setTimeout?f:e,"[object process]"==={}.toString.call(e.process)?r=function(e){t.nextTick(function(){d(e)})}:!function(){if(e.postMessage&&!e.importScripts){var t=!0,n=e.onmessage;return e.onmessage=function(){t=!1},e.postMessage("","*"),e.onmessage=n,t}}()?e.MessageChannel?((i=new MessageChannel).port1.onmessage=function(e){d(e.data)},r=function(e){i.port2.postMessage(e)}):h&&"onreadystatechange"in h.createElement("script")?(o=h.documentElement,r=function(e){var t=h.createElement("script");t.onreadystatechange=function(){d(e),t.onreadystatechange=null,o.removeChild(t),t=null},o.appendChild(t)}):r=function(e){setTimeout(d,0,e)}:(s="setImmediate$"+Math.random()+"$",a=function(t){t.source===e&&"string"==typeof t.data&&0===t.data.indexOf(s)&&d(+t.data.slice(s.length))},e.addEventListener?e.addEventListener("message",a,!1):e.attachEvent("onmessage",a),r=function(t){e.postMessage(s+t,"*")}),f.setImmediate=function(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),n=0;n0?this._transform(null,t,n):n()},e.exports.decoder=c,e.exports.encoder=a},function(e,t,n){(t=e.exports=n(38)).Stream=t,t.Readable=t,t.Writable=n(43),t.Duplex=n(14),t.Transform=n(44),t.PassThrough=n(72)},function(e,t,n){"use strict";e.exports=i;var r=n(44),o=n(23);function i(e){if(!(this instanceof i))return new i(e);r.call(this,e)}o.inherits=n(19),o.inherits(i,r),i.prototype._transform=function(e,t,n){n(null,e)}},function(e,t,n){var r=n(25);function o(e){Error.call(this),Error.captureStackTrace&&Error.captureStackTrace(this,this.constructor),this.name=this.constructor.name,this.message=e||"unable to decode"}n(37).inherits(o,Error),e.exports=function(e){return function(e){e instanceof r||(e=r().append(e));var t=i(e);if(t)return e.consume(t.bytesConsumed),t.value;throw new o};function t(e,t,n){return t>=n+e}function n(e,t){return{value:e,bytesConsumed:t}}function i(e,r){r=void 0===r?0:r;var o=e.length-r;if(o<=0)return null;var i,l,h,f=e.readUInt8(r),p=0;if(!function(e,t){var n=function(e){switch(e){case 196:return 2;case 197:return 3;case 198:return 5;case 199:return 3;case 200:return 4;case 201:return 6;case 202:return 5;case 203:return 9;case 204:return 2;case 205:return 3;case 206:return 5;case 207:return 9;case 208:return 2;case 209:return 3;case 210:return 5;case 211:return 9;case 212:return 3;case 213:return 4;case 214:return 6;case 215:return 10;case 216:return 18;case 217:return 2;case 218:return 3;case 219:return 5;case 222:return 3;default:return-1}}(e);return!(-1!==n&&t=0;h--)p+=e.readUInt8(r+h+1)*Math.pow(2,8*(7-h));return n(p,9);case 208:return n(p=e.readInt8(r+1),2);case 209:return n(p=e.readInt16BE(r+1),3);case 210:return n(p=e.readInt32BE(r+1),5);case 211:return n(p=function(e,t){var n=128==(128&e[t]);if(n)for(var r=1,o=t+7;o>=t;o--){var i=(255^e[o])+r;e[o]=255&i,r=i>>8}var s=e.readUInt32BE(t+0),a=e.readUInt32BE(t+4);return(4294967296*s+a)*(n?-1:1)}(e.slice(r+1,r+9),0),9);case 202:return n(p=e.readFloatBE(r+1),5);case 203:return n(p=e.readDoubleBE(r+1),9);case 217:return t(i=e.readUInt8(r+1),o,2)?n(p=e.toString("utf8",r+2,r+2+i),2+i):null;case 218:return t(i=e.readUInt16BE(r+1),o,3)?n(p=e.toString("utf8",r+3,r+3+i),3+i):null;case 219:return t(i=e.readUInt32BE(r+1),o,5)?n(p=e.toString("utf8",r+5,r+5+i),5+i):null;case 196:return t(i=e.readUInt8(r+1),o,2)?n(p=e.slice(r+2,r+2+i),2+i):null;case 197:return t(i=e.readUInt16BE(r+1),o,3)?n(p=e.slice(r+3,r+3+i),3+i):null;case 198:return t(i=e.readUInt32BE(r+1),o,5)?n(p=e.slice(r+5,r+5+i),5+i):null;case 220:return o<3?null:(i=e.readUInt16BE(r+1),s(e,r,i,3));case 221:return o<5?null:(i=e.readUInt32BE(r+1),s(e,r,i,5));case 222:return i=e.readUInt16BE(r+1),a(e,r,i,3);case 223:throw new Error("map too big to decode in JS");case 212:return c(e,r,1);case 213:return c(e,r,2);case 214:return c(e,r,4);case 215:return c(e,r,8);case 216:return c(e,r,16);case 199:return i=e.readUInt8(r+1),l=e.readUInt8(r+2),t(i,o,3)?u(e,r,l,i,3):null;case 200:return i=e.readUInt16BE(r+1),l=e.readUInt8(r+3),t(i,o,4)?u(e,r,l,i,4):null;case 201:return i=e.readUInt32BE(r+1),l=e.readUInt8(r+5),t(i,o,6)?u(e,r,l,i,6):null}if(144==(240&f))return s(e,r,i=15&f,1);if(128==(240&f))return a(e,r,i=15&f,1);if(160==(224&f))return t(i=31&f,o,1)?n(p=e.toString("utf8",r+1,r+i+1),i+1):null;if(f>=224)return n(p=f-256,1);if(f<128)return n(f,1);throw new Error("not implemented yet")}function s(e,t,r,o){var s,a=[],c=0;for(t+=o,s=0;si)&&((n=r.allocUnsafe(9))[0]=203,n.writeDoubleBE(e,1)),n}e.exports=function(e,t,n,i){function a(c,u){var l,h,f;if(void 0===c)throw new Error("undefined is not encodable in msgpack!");if(null===c)(l=r.allocUnsafe(1))[0]=192;else if(!0===c)(l=r.allocUnsafe(1))[0]=195;else if(!1===c)(l=r.allocUnsafe(1))[0]=194;else if("string"==typeof c)(h=r.byteLength(c))<32?((l=r.allocUnsafe(1+h))[0]=160|h,h>0&&l.write(c,1)):h<=255&&!n?((l=r.allocUnsafe(2+h))[0]=217,l[1]=h,l.write(c,2)):h<=65535?((l=r.allocUnsafe(3+h))[0]=218,l.writeUInt16BE(h,1),l.write(c,3)):((l=r.allocUnsafe(5+h))[0]=219,l.writeUInt32BE(h,1),l.write(c,5));else if(c&&(c.readUInt32LE||c instanceof Uint8Array))c instanceof Uint8Array&&(c=r.from(c)),c.length<=255?((l=r.allocUnsafe(2))[0]=196,l[1]=c.length):c.length<=65535?((l=r.allocUnsafe(3))[0]=197,l.writeUInt16BE(c.length,1)):((l=r.allocUnsafe(5))[0]=198,l.writeUInt32BE(c.length,1)),l=o([l,c]);else if(Array.isArray(c))c.length<16?(l=r.allocUnsafe(1))[0]=144|c.length:c.length<65536?((l=r.allocUnsafe(3))[0]=220,l.writeUInt16BE(c.length,1)):((l=r.allocUnsafe(5))[0]=221,l.writeUInt32BE(c.length,1)),l=c.reduce(function(e,t){return e.append(a(t,!0)),e},o().append(l));else{if(!i&&"function"==typeof c.getDate)return function(e){var t,n=1*e,i=Math.floor(n/1e3),s=1e6*(n-1e3*i);if(s||i>4294967295){(t=new r(10))[0]=215,t[1]=-1;var a=4*s,c=i/Math.pow(2,32),u=a+c&4294967295,l=4294967295&i;t.writeInt32BE(u,2),t.writeInt32BE(l,6)}else(t=new r(6))[0]=214,t[1]=-1,t.writeUInt32BE(Math.floor(n/1e3),2);return o().append(t)}(c);if("object"==typeof c)l=function(t){var n,i,s=-1,a=[];for(n=0;n>8),a.push(255&s)):(a.push(201),a.push(s>>24),a.push(s>>16&255),a.push(s>>8&255),a.push(255&s));return o().append(r.from(a)).append(i)}(c)||function(e){var t,n,i=[],s=0;for(t in e)e.hasOwnProperty(t)&&void 0!==e[t]&&"function"!=typeof e[t]&&(++s,i.push(a(t,!0)),i.push(a(e[t],!0)));s<16?(n=r.allocUnsafe(1))[0]=128|s:((n=r.allocUnsafe(3))[0]=222,n.writeUInt16BE(s,1));return i.unshift(n),i.reduce(function(e,t){return e.append(t)},o())}(c);else if("number"==typeof c){if((f=c)!==Math.floor(f))return s(c,t);if(c>=0)if(c<128)(l=r.allocUnsafe(1))[0]=c;else if(c<256)(l=r.allocUnsafe(2))[0]=204,l[1]=c;else if(c<65536)(l=r.allocUnsafe(3))[0]=205,l.writeUInt16BE(c,1);else if(c<=4294967295)(l=r.allocUnsafe(5))[0]=206,l.writeUInt32BE(c,1);else{if(!(c<=9007199254740991))return s(c,!0);(l=r.allocUnsafe(9))[0]=207,function(e,t){for(var n=7;n>=0;n--)e[n+1]=255&t,t/=256}(l,c)}else if(c>=-32)(l=r.allocUnsafe(1))[0]=256+c;else if(c>=-128)(l=r.allocUnsafe(2))[0]=208,l.writeInt8(c,1);else if(c>=-32768)(l=r.allocUnsafe(3))[0]=209,l.writeInt16BE(c,1);else if(c>-214748365)(l=r.allocUnsafe(5))[0]=210,l.writeInt32BE(c,1);else{if(!(c>=-9007199254740991))return s(c,!0);(l=r.allocUnsafe(9))[0]=211,function(e,t,n){var r=n<0;r&&(n=Math.abs(n));var o=n%4294967296,i=n/4294967296;if(e.writeUInt32BE(Math.floor(i),t+0),e.writeUInt32BE(o,t+4),r)for(var s=1,a=t+7;a>=t;a--){var c=(255^e[a])+s;e[a]=255&c,s=c>>8}}(l,1,c)}}}if(!l)throw new Error("not implemented yet");return u?l:l.slice()}return a}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=function(){function e(e){this.dialog=e}return e.prototype.show=function(){this.removeClasses(),this.dialog.classList.add(e.ShowClassName)},e.prototype.hide=function(){this.removeClasses(),this.dialog.classList.add(e.HideClassName)},e.prototype.failed=function(){this.removeClasses(),this.dialog.classList.add(e.FailedClassName)},e.prototype.removeClasses=function(){this.dialog.classList.remove(e.ShowClassName,e.HideClassName,e.FailedClassName)},e.ShowClassName="components-reconnect-show",e.HideClassName="components-reconnect-hide",e.FailedClassName="components-reconnect-failed",e}();t.UserSpecifiedDisplay=r},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(45),o=function(){function e(e){this.document=e,this.addedToDom=!1,this.modal=this.document.createElement("div"),this.modal.id=r.AutoReconnectCircuitHandler.DialogId;this.modal.style.cssText=["position: fixed","top: 0","right: 0","bottom: 0","left: 0","z-index: 1000","display: none","overflow: hidden","background-color: #fff","opacity: 0.8","text-align: center","font-weight: bold"].join(";"),this.modal.innerHTML='
',this.message=this.modal.querySelector("h5"),this.button=this.modal.querySelector("button"),this.button.addEventListener("click",function(){return window.Blazor.reconnect()})}return e.prototype.show=function(){this.addedToDom||(this.addedToDom=!0,this.document.body.appendChild(this.modal)),this.modal.style.display="block",this.button.style.display="none",this.message.textContent="Attempting to reconnect to the server..."},e.prototype.hide=function(){this.modal.style.display="none"},e.prototype.failed=function(){this.button.style.display="block",this.message.textContent="Failed to reconnect to the server."},e}();t.DefaultReconnectDisplay=o},function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,i){function s(e){try{c(r.next(e))}catch(e){i(e)}}function a(e){try{c(r.throw(e))}catch(e){i(e)}}function c(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(s,a)}c((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,i,s={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function a(i){return function(a){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return s.label++,{value:i[1],done:!1};case 5:s.label++,r=i[1],i=[0];continue;case 7:i=s.ops.pop(),s.trys.pop();continue;default:if(!(o=(o=s.trys).length>0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]this.nextBatchId)this.logger.log(a.LogLevel.Debug,"Waiting for batch "+this.nextBatchId+". Batch "+e+" not processed.");else try{this.nextBatchId++,this.logger.log(a.LogLevel.Debug,"Applying batch "+e+"."),i.renderBatch(this.browserRendererId,new s.OutOfProcessRenderBatch(t)),this.completeBatch(n,e)}catch(t){throw this.logger.log(a.LogLevel.Error,"There was an error applying batch "+e+"."),n.send("OnRenderCompleted",e,t.toString()),t}},e.prototype.getLastBatchid=function(){return this.nextBatchId-1},e.prototype.completeBatch=function(e,t){return r(this,void 0,void 0,function(){return o(this,function(n){switch(n.label){case 0:return n.trys.push([0,2,,3]),[4,e.send("OnRenderCompleted",t,null)];case 1:return n.sent(),[3,3];case 2:return n.sent(),this.logger.log(a.LogLevel.Warning,"Failed to deliver completion notification for render '"+t+"'."),[3,3];case 3:return[2]}})})},e.renderQueues=new Map,e}();t.default=c},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(79),o=function(){function e(e){this.batchData=e;var t=new c(e);this.arrayRangeReader=new u(e),this.arraySegmentReader=new l(e),this.diffReader=new i(e),this.editReader=new s(e,t),this.frameReader=new a(e,t)}return e.prototype.updatedComponents=function(){return h(this.batchData,this.batchData.length-20)},e.prototype.referenceFrames=function(){return h(this.batchData,this.batchData.length-16)},e.prototype.disposedComponentIds=function(){return h(this.batchData,this.batchData.length-12)},e.prototype.disposedEventHandlerIds=function(){return h(this.batchData,this.batchData.length-8)},e.prototype.updatedComponentsEntry=function(e,t){var n=e+4*t;return h(this.batchData,n)},e.prototype.referenceFramesEntry=function(e,t){return e+16*t},e.prototype.disposedComponentIdsEntry=function(e,t){var n=e+4*t;return h(this.batchData,n)},e.prototype.disposedEventHandlerIdsEntry=function(e,t){var n=e+4*t;return h(this.batchData,n)},e}();t.OutOfProcessRenderBatch=o;var i=function(){function e(e){this.batchDataUint8=e}return e.prototype.componentId=function(e){return h(this.batchDataUint8,e)},e.prototype.edits=function(e){return e+4},e.prototype.editsEntry=function(e,t){return e+16*t},e}(),s=function(){function e(e,t){this.batchDataUint8=e,this.stringReader=t}return e.prototype.editType=function(e){return h(this.batchDataUint8,e)},e.prototype.siblingIndex=function(e){return h(this.batchDataUint8,e+4)},e.prototype.newTreeIndex=function(e){return h(this.batchDataUint8,e+8)},e.prototype.moveToSiblingIndex=function(e){return h(this.batchDataUint8,e+8)},e.prototype.removedAttributeName=function(e){var t=h(this.batchDataUint8,e+12);return this.stringReader.readString(t)},e}(),a=function(){function e(e,t){this.batchDataUint8=e,this.stringReader=t}return e.prototype.frameType=function(e){return h(this.batchDataUint8,e)},e.prototype.subtreeLength=function(e){return h(this.batchDataUint8,e+4)},e.prototype.elementReferenceCaptureId=function(e){var t=h(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.componentId=function(e){return h(this.batchDataUint8,e+8)},e.prototype.elementName=function(e){var t=h(this.batchDataUint8,e+8);return this.stringReader.readString(t)},e.prototype.textContent=function(e){var t=h(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.markupContent=function(e){var t=h(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.attributeName=function(e){var t=h(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.attributeValue=function(e){var t=h(this.batchDataUint8,e+8);return this.stringReader.readString(t)},e.prototype.attributeEventHandlerId=function(e){return h(this.batchDataUint8,e+12)},e}(),c=function(){function e(e){this.batchDataUint8=e,this.stringTableStartIndex=h(e,e.length-4)}return e.prototype.readString=function(e){if(-1===e)return null;var t,n=h(this.batchDataUint8,this.stringTableStartIndex+4*e),o=function(e,t){for(var n=0,r=0,o=0;o<4;o++){var i=e[t+o];if(n|=(127&i)<65535&&(u-=65536,r.push(u>>>10&1023|55296),u=56320|1023&u),r.push(u)}r.length>1024&&(o.push(String.fromCharCode.apply(null,r)),r.length=0)}return o.push(String.fromCharCode.apply(null,r)),o.join("")}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(27),o=function(){function e(){}return e.prototype.log=function(e,t){},e.instance=new e,e}();t.NullLogger=o;var i=function(){function e(e){this.minimumLogLevel=e}return e.prototype.log=function(e,t){if(e>=this.minimumLogLevel)switch(e){case r.LogLevel.Critical:case r.LogLevel.Error:console.error("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t);break;case r.LogLevel.Warning:console.warn("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t);break;case r.LogLevel.Information:console.info("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t);break;default:console.log("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t)}},e}();t.ConsoleLogger=i},function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,i){function s(e){try{c(r.next(e))}catch(e){i(e)}}function a(e){try{c(r.throw(e))}catch(e){i(e)}}function c(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(s,a)}c((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,i,s={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function a(i){return function(a){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return s.label++,{value:i[1],done:!1};case 5:s.label++,r=i[1],i=[0];continue;case 7:i=s.ops.pop(),s.trys.pop();continue;default:if(!(o=(o=s.trys).length>0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]=e.length&&(e=void 0),{value:e&&e[n++],done:!e}}}},s=this&&this.__read||function(e,t){var n="function"==typeof Symbol&&e[Symbol.iterator];if(!n)return e;var r,o,i=n.call(e),s=[];try{for(;(void 0===t||t-- >0)&&!(r=i.next()).done;)s.push(r.value)}catch(e){o={error:e}}finally{try{r&&!r.done&&(n=i.return)&&n.call(i)}finally{if(o)throw o.error}}return s};Object.defineProperty(t,"__esModule",{value:!0});var a=n(24),c=n(82),u=function(){function e(e,t){this.circuitId=e,this.components=t}return e.prototype.reconnect=function(e){return e.invoke("ConnectCircuit",this.circuitId)},e}();function l(e){if(e.nodeType===Node.COMMENT_NODE&&e.textContent){var t=/\W+M.A.C.Component:[^{]*(.*)$/.exec(e.textContent),n=t&&t[1];if(n)try{var r=JSON.parse(n),o=r.componentId,i=r.circuitId,s=r.rendererId;if(!!o&&!!i&&!!s)return{node:e,circuitId:i,rendererId:Number.parseInt(s),componentId:Number.parseInt(o)};throw new Error("Found malformed start component comment at "+e.textContent)}catch(t){throw new Error("Found malformed start component comment at "+e.textContent)}}}function h(e,t,n,r){for(var o=n;o=200&&o.status<300?n(new c.b(o.status,o.statusText,o.response||o.responseText)):r(new a.b(o.statusText,o.status))},o.onerror=function(){t.logger.log(l.a.Warning,"Error from HTTP request. "+o.status+": "+o.statusText+"."),r(new a.b(o.statusText,o.status))},o.ontimeout=function(){t.logger.log(l.a.Warning,"Timeout from HTTP request."),r(new a.c)},o.send(e.content||"")}):Promise.reject(new Error("No url defined.")):Promise.reject(new Error("No method defined."))},t}(c.a),p=function(){var e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])};return function(t,n){function r(){this.constructor=t}e(t,n),t.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}(),d=function(e){function t(t){var n=e.call(this)||this;return"undefined"!=typeof XMLHttpRequest?n.httpClient=new f(t):n.httpClient=new u.a(t),n}return p(t,e),t.prototype.send=function(e){return e.abortSignal&&e.abortSignal.aborted?Promise.reject(new a.a):e.method?e.url?this.httpClient.send(e):Promise.reject(new Error("No url defined.")):Promise.reject(new Error("No method defined."))},t.prototype.getCookieString=function(e){return this.httpClient.getCookieString(e)},t}(c.a),g=n(49);!function(e){e[e.Invocation=1]="Invocation",e[e.StreamItem=2]="StreamItem",e[e.Completion=3]="Completion",e[e.StreamInvocation=4]="StreamInvocation",e[e.CancelInvocation=5]="CancelInvocation",e[e.Ping=6]="Ping",e[e.Close=7]="Close"}(o||(o={}));var y,v=n(3),b=function(){function e(){this.observers=[]}return e.prototype.next=function(e){for(var t=0,n=this.observers;t0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0?[2,Promise.reject(new Error("Unable to connect to the server with any of the available transports. "+i.join(" ")))]:[2,Promise.reject(new Error("None of the transports supported by the client are supported by the server."))]}})})},e.prototype.constructTransport=function(e){switch(e){case C.WebSockets:if(!this.options.WebSocket)throw new Error("'WebSocket' is not supported in your environment.");return new B(this.httpClient,this.accessTokenFactory,this.logger,this.options.logMessageContent||!1,this.options.WebSocket);case C.ServerSentEvents:if(!this.options.EventSource)throw new Error("'EventSource' is not supported in your environment.");return new A(this.httpClient,this.accessTokenFactory,this.logger,this.options.logMessageContent||!1,this.options.EventSource);case C.LongPolling:return new D(this.httpClient,this.accessTokenFactory,this.logger,this.options.logMessageContent||!1);default:throw new Error("Unknown transport: "+e+".")}},e.prototype.resolveTransport=function(e,t,n){var r=C[e.transport];if(null!=r){var o=e.transferFormats.map(function(e){return k[e]});if(function(e,t){return!e||0!=(t&e)}(t,r)){if(o.indexOf(n)>=0){if(r===C.WebSockets&&!this.options.WebSocket||r===C.ServerSentEvents&&!this.options.EventSource)throw this.logger.log(l.a.Debug,"Skipping transport '"+C[r]+"' because it is not supported in your environment.'"),new Error("'"+C[r]+"' is not supported in your environment.");return this.logger.log(l.a.Debug,"Selecting transport '"+C[r]+"'."),r}throw this.logger.log(l.a.Debug,"Skipping transport '"+C[r]+"' because it does not support the requested transfer format '"+k[n]+"'."),new Error("'"+C[r]+"' does not support "+k[n]+".")}throw this.logger.log(l.a.Debug,"Skipping transport '"+C[r]+"' because it was disabled by the client."),new Error("'"+C[r]+"' is disabled by the client.")}return this.logger.log(l.a.Debug,"Skipping transport '"+e.transport+"' because it is not supported by this client."),null},e.prototype.isITransport=function(e){return e&&"object"==typeof e&&"connect"in e},e.prototype.stopConnection=function(e){if(this.logger.log(l.a.Debug,"HttpConnection.stopConnection("+e+") called while in state "+this.connectionState+"."),this.transport=void 0,e=this.stopError||e,this.stopError=void 0,"Disconnected"!==this.connectionState)if("Connecting "!==this.connectionState){if("Disconnecting"===this.connectionState&&this.stopPromiseResolver(),e?this.logger.log(l.a.Error,"Connection disconnected with error '"+e+"'."):this.logger.log(l.a.Information,"Connection disconnected."),this.connectionId=void 0,this.connectionState="Disconnected",this.onclose&&this.connectionStarted){this.connectionStarted=!1;try{this.onclose(e)}catch(t){this.logger.log(l.a.Error,"HttpConnection.onclose("+e+") threw error '"+t+"'.")}}}else this.logger.log(l.a.Warning,"Call to HttpConnection.stopConnection("+e+") was ignored because the connection hasn't yet left the in the connecting state.");else this.logger.log(l.a.Debug,"Call to HttpConnection.stopConnection("+e+") was ignored because the connection is already in the disconnected state.")},e.prototype.resolveUrl=function(e){if(0===e.lastIndexOf("https://",0)||0===e.lastIndexOf("http://",0))return e;if(!v.c.isBrowser||!window.document)throw new Error("Cannot resolve '"+e+"'.");var t=window.document.createElement("a");return t.href=e,this.logger.log(l.a.Information,"Normalizing '"+e+"' to '"+t.href+"'."),t.href},e.prototype.resolveNegotiateUrl=function(e){var t=e.indexOf("?"),n=e.substring(0,-1===t?e.length:t);return"/"!==n[n.length-1]&&(n+="/"),n+="negotiate",n+=-1===t?"":e.substring(t)},e}();var z=function(){function e(e){this.transport=e,this.buffer=[],this.executing=!0,this.sendBufferedData=new Y,this.transportResult=new Y,this.sendLoop().then(function(){},function(e){})}return e.prototype.send=function(e){return this.bufferData(e),this.transportResult.promise},e.prototype.stop=function(){this.executing=!1,this.sendBufferedData.resolve()},e.prototype.bufferData=function(e){if(this.buffer.length&&typeof this.buffer[0]!=typeof e)throw new Error("Expected data to be of type "+typeof this.buffer+" but was of type "+typeof e);this.buffer.push(e),this.sendBufferedData.resolve()},e.prototype.sendLoop=function(){return N(this,void 0,void 0,function(){var t,n,r;return U(this,function(o){switch(o.label){case 0:return[4,this.sendBufferedData.promise];case 1:if(o.sent(),!this.executing)return[3,6];this.sendBufferedData=new Y,t=this.transportResult,this.transportResult=new Y,n="string"==typeof this.buffer[0]?this.buffer.join(""):e.concatBuffers(this.buffer),this.buffer.length=0,o.label=2;case 2:return o.trys.push([2,4,,5]),[4,this.transport.send(n)];case 3:return o.sent(),t.resolve(),[3,5];case 4:return r=o.sent(),t.reject(r),[3,5];case 5:return[3,0];case 6:return[2]}})})},e.concatBuffers=function(e){for(var t=e.map(function(e){return e.byteLength}).reduce(function(e,t){return e+t}),n=new Uint8Array(t),r=0,o=0,i=e;o>=7)>0&&(r|=128),n.push(r)}while(t>0);t=e.byteLength||e.length;var o=new Uint8Array(n.length+t);return o.set(n,0),o.set(e,n.length),o.buffer},e.parse=function(e){for(var t=[],n=new Uint8Array(e),r=[0,7,14,21,28],o=0;o7)throw new Error("Messages bigger than 2GB are not supported.");if(!(n.byteLength>=o+i+s))throw new Error("Incomplete message.");t.push(n.slice?n.slice(o+i,o+i+s):n.subarray(o+i,o+i+s)),o=o+i+s}return t},e}();var Z=new Uint8Array([145,o.Ping]),ee=function(){function e(){this.name="messagepack",this.version=1,this.transferFormat=k.Binary,this.errorResult=1,this.voidResult=2,this.nonVoidResult=3}return e.prototype.parseMessages=function(e,t){if(!(e instanceof i.Buffer||(n=e,n&&"undefined"!=typeof ArrayBuffer&&(n instanceof ArrayBuffer||n.constructor&&"ArrayBuffer"===n.constructor.name))))throw new Error("Invalid input for MessagePack hub protocol. Expected an ArrayBuffer or Buffer.");var n;null===t&&(t=J.a.instance);for(var r=[],o=0,s=$.parse(e);o=200&&o.status<300?n(new s.b(o.status,o.statusText,o.response||o.responseText)):r(new i.b(o.statusText,o.status))},o.onerror=function(){t.logger.log(c.a.Warning,"Error from HTTP request. "+o.status+": "+o.statusText+"."),r(new i.b(o.statusText,o.status))},o.ontimeout=function(){t.logger.log(c.a.Warning,"Timeout from HTTP request."),r(new i.c)},o.send(e.content||"")}):Promise.reject(new Error("No url defined.")):Promise.reject(new Error("No method defined."))},t}(s.a),h=function(){var e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])};return function(t,n){function r(){this.constructor=t}e(t,n),t.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}(),f=function(e){function t(t){var n=e.call(this)||this;return"undefined"!=typeof XMLHttpRequest?n.httpClient=new l(t):n.httpClient=new a.a(t),n}return h(t,e),t.prototype.send=function(e){return e.abortSignal&&e.abortSignal.aborted?Promise.reject(new i.a):e.method?e.url?this.httpClient.send(e):Promise.reject(new Error("No url defined.")):Promise.reject(new Error("No method defined."))},t.prototype.getCookieString=function(e){return this.httpClient.getCookieString(e)},t}(s.a),p=n(47);!function(e){e[e.Invocation=1]="Invocation",e[e.StreamItem=2]="StreamItem",e[e.Completion=3]="Completion",e[e.StreamInvocation=4]="StreamInvocation",e[e.CancelInvocation=5]="CancelInvocation",e[e.Ping=6]="Ping",e[e.Close=7]="Close"}(o||(o={}));var d,g=n(2),y=function(){function e(){this.observers=[]}return e.prototype.next=function(e){for(var t=0,n=this.observers;t0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0?[2,Promise.reject(new Error("Unable to connect to the server with any of the available transports. "+i.join(" ")))]:[2,Promise.reject(new Error("None of the transports supported by the client are supported by the server."))]}})})},e.prototype.constructTransport=function(e){switch(e){case S.WebSockets:if(!this.options.WebSocket)throw new Error("'WebSocket' is not supported in your environment.");return new M(this.httpClient,this.accessTokenFactory,this.logger,this.options.logMessageContent||!1,this.options.WebSocket);case S.ServerSentEvents:if(!this.options.EventSource)throw new Error("'EventSource' is not supported in your environment.");return new O(this.httpClient,this.accessTokenFactory,this.logger,this.options.logMessageContent||!1,this.options.EventSource);case S.LongPolling:return new x(this.httpClient,this.accessTokenFactory,this.logger,this.options.logMessageContent||!1);default:throw new Error("Unknown transport: "+e+".")}},e.prototype.resolveTransport=function(e,t,n){var r=S[e.transport];if(null!=r){var o=e.transferFormats.map(function(e){return E[e]});if(function(e,t){return!e||0!=(t&e)}(t,r)){if(o.indexOf(n)>=0){if(r===S.WebSockets&&!this.options.WebSocket||r===S.ServerSentEvents&&!this.options.EventSource)throw this.logger.log(c.a.Debug,"Skipping transport '"+S[r]+"' because it is not supported in your environment.'"),new Error("'"+S[r]+"' is not supported in your environment.");return this.logger.log(c.a.Debug,"Selecting transport '"+S[r]+"'."),r}throw this.logger.log(c.a.Debug,"Skipping transport '"+S[r]+"' because it does not support the requested transfer format '"+E[n]+"'."),new Error("'"+S[r]+"' does not support "+E[n]+".")}throw this.logger.log(c.a.Debug,"Skipping transport '"+S[r]+"' because it was disabled by the client."),new Error("'"+S[r]+"' is disabled by the client.")}return this.logger.log(c.a.Debug,"Skipping transport '"+e.transport+"' because it is not supported by this client."),null},e.prototype.isITransport=function(e){return e&&"object"==typeof e&&"connect"in e},e.prototype.stopConnection=function(e){if(this.logger.log(c.a.Debug,"HttpConnection.stopConnection("+e+") called while in state "+this.connectionState+"."),this.transport=void 0,e=this.stopError||e,this.stopError=void 0,"Disconnected"!==this.connectionState)if("Connecting "!==this.connectionState){if("Disconnecting"===this.connectionState&&this.stopPromiseResolver(),e?this.logger.log(c.a.Error,"Connection disconnected with error '"+e+"'."):this.logger.log(c.a.Information,"Connection disconnected."),this.connectionId=void 0,this.connectionState="Disconnected",this.onclose&&this.connectionStarted){this.connectionStarted=!1;try{this.onclose(e)}catch(t){this.logger.log(c.a.Error,"HttpConnection.onclose("+e+") threw error '"+t+"'.")}}}else this.logger.log(c.a.Warning,"Call to HttpConnection.stopConnection("+e+") was ignored because the connection hasn't yet left the in the connecting state.");else this.logger.log(c.a.Debug,"Call to HttpConnection.stopConnection("+e+") was ignored because the connection is already in the disconnected state.")},e.prototype.resolveUrl=function(e){if(0===e.lastIndexOf("https://",0)||0===e.lastIndexOf("http://",0))return e;if(!g.c.isBrowser||!window.document)throw new Error("Cannot resolve '"+e+"'.");var t=window.document.createElement("a");return t.href=e,this.logger.log(c.a.Information,"Normalizing '"+e+"' to '"+t.href+"'."),t.href},e.prototype.resolveNegotiateUrl=function(e){var t=e.indexOf("?"),n=e.substring(0,-1===t?e.length:t);return"/"!==n[n.length-1]&&(n+="/"),n+="negotiate",n+=-1===t?"":e.substring(t)},e}();var W=function(){function e(e){this.transport=e,this.buffer=[],this.executing=!0,this.sendBufferedData=new q,this.transportResult=new q,this.sendLoop().then(function(){},function(e){})}return e.prototype.send=function(e){return this.bufferData(e),this.transportResult.promise},e.prototype.stop=function(){this.executing=!1,this.sendBufferedData.resolve()},e.prototype.bufferData=function(e){if(this.buffer.length&&typeof this.buffer[0]!=typeof e)throw new Error("Expected data to be of type "+typeof this.buffer+" but was of type "+typeof e);this.buffer.push(e),this.sendBufferedData.resolve()},e.prototype.sendLoop=function(){return j(this,void 0,void 0,function(){var t,n,r;return B(this,function(o){switch(o.label){case 0:return[4,this.sendBufferedData.promise];case 1:if(o.sent(),!this.executing)return[3,6];this.sendBufferedData=new q,t=this.transportResult,this.transportResult=new q,n="string"==typeof this.buffer[0]?this.buffer.join(""):e.concatBuffers(this.buffer),this.buffer.length=0,o.label=2;case 2:return o.trys.push([2,4,,5]),[4,this.transport.send(n)];case 3:return o.sent(),t.resolve(),[3,5];case 4:return r=o.sent(),t.reject(r),[3,5];case 5:return[3,0];case 6:return[2]}})})},e.concatBuffers=function(e){for(var t=e.map(function(e){return e.byteLength}).reduce(function(e,t){return e+t}),n=new Uint8Array(t),r=0,o=0,i=e;o0&&!t)throw new Error("New logical elements must start empty, or allowExistingContents must be true");return e[r]=[],e}function u(e,t,n){var a=e;if(e instanceof Comment&&(s(a)&&s(a).length>0))throw new Error("Not implemented: inserting non-empty logical container");if(l(a))throw new Error("Not implemented: moving existing logical children");var i=s(t);if(n0;)e(r,0);var a=r;a.parentNode.removeChild(a)},t.getLogicalParent=l,t.getLogicalSiblingEnd=function(e){return e[a]||null},t.getLogicalChild=function(e,t){return s(e)[t]},t.isSvgElement=function(e){return"http://www.w3.org/2000/svg"===c(e).namespaceURI},t.getLogicalChildrenArray=s,t.permuteLogicalChildren=function(e,t){var n=s(e);t.forEach(function(e){e.moveRangeStart=n[e.fromSiblingIndex],e.moveRangeEnd=function e(t){if(t instanceof Element)return t;var n=f(t);if(n)return n.previousSibling;var r=l(t);return r instanceof Element?r.lastChild:e(r)}(e.moveRangeStart)}),t.forEach(function(t){var r=t.moveToBeforeMarker=document.createComment("marker"),o=n[t.toSiblingIndex+1];o?o.parentNode.insertBefore(r,o):d(r,e)}),t.forEach(function(e){for(var t=e.moveToBeforeMarker,n=t.parentNode,r=e.moveRangeStart,o=e.moveRangeEnd,a=r;a;){var i=a.nextSibling;if(n.insertBefore(a,t),a===o)break;a=i}n.removeChild(t)}),t.forEach(function(e){n[e.toSiblingIndex]=e.moveRangeStart})},t.getClosestDomElement=c},,,function(e,t,n){"use strict";var r;!function(e){window.DotNet=e;var t=[],n={},r={},o=1,a=null;function i(e){t.push(e)}function u(e,t){for(var n=[],r=2;r0&&o[o.length-1])&&(6===a[0]||2===a[0])){i=0;continue}if(3===a[0]&&(!o||a[1]>o[0]&&a[1]0&&o[o.length-1])&&(6===a[0]||2===a[0])){i=0;continue}if(3===a[0]&&(!o||a[1]>o[0]&&a[1]0&&o[o.length-1])&&(6===a[0]||2===a[0])){i=0;continue}if(3===a[0]&&(!o||a[1]>o[0]&&a[1]0&&o[o.length-1])&&(6===a[0]||2===a[0])){i=0;continue}if(3===a[0]&&(!o||a[1]>o[0]&&a[1]-1?a.substring(0,u):"",s=u>-1?a.substring(u+1):a,c=t.monoPlatform.findMethod(e,l,s,i);t.monoPlatform.callMethod(c,null,r)},callMethod:function(e,n,r){if(r.length>4)throw new Error("Currently, MonoPlatform supports passing a maximum of 4 arguments from JS to .NET. You tried to pass "+r.length+".");var o=Module.stackSave();try{for(var a=Module.stackAlloc(r.length),u=Module.stackAlloc(4),l=0;l0&&!t)throw new Error("New logical elements must start empty, or allowExistingContents must be true");return e[r]=[],e}function u(e,t,n){var a=e;if(e instanceof Comment&&(s(a)&&s(a).length>0))throw new Error("Not implemented: inserting non-empty logical container");if(l(a))throw new Error("Not implemented: moving existing logical children");var i=s(t);if(n0;)e(r,0);var a=r;a.parentNode.removeChild(a)},t.getLogicalParent=l,t.getLogicalSiblingEnd=function(e){return e[a]||null},t.getLogicalChild=function(e,t){return s(e)[t]},t.isSvgElement=function(e){return"http://www.w3.org/2000/svg"===c(e).namespaceURI},t.getLogicalChildrenArray=s,t.permuteLogicalChildren=function(e,t){var n=s(e);t.forEach(function(e){e.moveRangeStart=n[e.fromSiblingIndex],e.moveRangeEnd=function e(t){if(t instanceof Element)return t;var n=f(t);if(n)return n.previousSibling;var r=l(t);return r instanceof Element?r.lastChild:e(r)}(e.moveRangeStart)}),t.forEach(function(t){var r=t.moveToBeforeMarker=document.createComment("marker"),o=n[t.toSiblingIndex+1];o?o.parentNode.insertBefore(r,o):d(r,e)}),t.forEach(function(e){for(var t=e.moveToBeforeMarker,n=t.parentNode,r=e.moveRangeStart,o=e.moveRangeEnd,a=r;a;){var i=a.nextSibling;if(n.insertBefore(a,t),a===o)break;a=i}n.removeChild(t)}),t.forEach(function(e){n[e.toSiblingIndex]=e.moveRangeStart})},t.getClosestDomElement=c},,,function(e,t,n){"use strict";var r;!function(e){window.DotNet=e;var t=[],n={},r={},o=1,a=null;function i(e){t.push(e)}function u(e,t){for(var n=[],r=2;r0&&o[o.length-1])&&(6===a[0]||2===a[0])){i=0;continue}if(3===a[0]&&(!o||a[1]>o[0]&&a[1]0&&o[o.length-1])&&(6===a[0]||2===a[0])){i=0;continue}if(3===a[0]&&(!o||a[1]>o[0]&&a[1]0&&o[o.length-1])&&(6===a[0]||2===a[0])){i=0;continue}if(3===a[0]&&(!o||a[1]>o[0]&&a[1]0&&o[o.length-1])&&(6===a[0]||2===a[0])){i=0;continue}if(3===a[0]&&(!o||a[1]>o[0]&&a[1]-1?a.substring(0,u):"",s=u>-1?a.substring(u+1):a,c=t.monoPlatform.findMethod(e,l,s,i);t.monoPlatform.callMethod(c,null,r)},callMethod:function(e,n,r){if(r.length>4)throw new Error("Currently, MonoPlatform supports passing a maximum of 4 arguments from JS to .NET. You tried to pass "+r.length+".");var o=Module.stackSave();try{for(var a=Module.stackAlloc(r.length),u=Module.stackAlloc(4),l=0;l { + MONO.mono_wasm_setenv("MONO_URI_DOTNETRELATIVEORABSOLUTE","true"); const load_runtime = Module.cwrap('mono_wasm_load_runtime', null, ['string', 'number']); load_runtime(appBinDirName, hasDebuggingEnabled() ? 1 : 0); MONO.mono_wasm_runtime_is_ready = true; diff --git a/src/Components/Browser.JS/src/Platform/Mono/MonoTypes.d.ts b/src/Components/Browser.JS/src/Platform/Mono/MonoTypes.d.ts index 1001286e55..783af016f7 100644 --- a/src/Components/Browser.JS/src/Platform/Mono/MonoTypes.d.ts +++ b/src/Components/Browser.JS/src/Platform/Mono/MonoTypes.d.ts @@ -24,4 +24,5 @@ declare namespace Mono { declare namespace MONO { var loaded_files: string[]; var mono_wasm_runtime_is_ready: boolean; + function mono_wasm_setenv (name: string, value: string): void; } diff --git a/src/Components/Browser.JS/src/Rendering/ElementReferenceCapture.ts b/src/Components/Browser.JS/src/Rendering/ElementReferenceCapture.ts index 5d898eaa52..080cfc2077 100644 --- a/src/Components/Browser.JS/src/Rendering/ElementReferenceCapture.ts +++ b/src/Components/Browser.JS/src/Rendering/ElementReferenceCapture.ts @@ -12,7 +12,7 @@ function getCaptureIdAttributeName(referenceCaptureId: string) { } // Support receiving ElementRef instances as args in interop calls -const elementRefKey = '_blazorElementRef'; // Keep in sync with ElementRef.cs +const elementRefKey = '__internalId'; // Keep in sync with ElementRef.cs DotNet.attachReviver((key, value) => { if (value && typeof value === 'object' && value.hasOwnProperty(elementRefKey) && typeof value[elementRefKey] === 'string') { return getElementByCaptureId(value[elementRefKey]); diff --git a/src/Components/Browser.JS/src/Services/Http.ts b/src/Components/Browser.JS/src/Services/Http.ts index 4f1e29078c..994a11e82e 100644 --- a/src/Components/Browser.JS/src/Services/Http.ts +++ b/src/Components/Browser.JS/src/Services/Http.ts @@ -16,7 +16,7 @@ async function sendAsync(id: number, body: System_Array, jsonFetchArgs: Sys let responseData: ArrayBuffer; const fetchOptions: FetchOptions = JSON.parse(platform.toJavaScriptString(jsonFetchArgs)); - const requestInit: RequestInit = Object.assign(fetchOptions.requestInit, fetchOptions.requestInitOverrides); + const requestInit: RequestInit = Object.assign(convertToRequestInit(fetchOptions.requestInit), fetchOptions.requestInitOverrides); if (body) { requestInit.body = platform.toUint8Array(body); @@ -33,6 +33,14 @@ async function sendAsync(id: number, body: System_Array, jsonFetchArgs: Sys dispatchSuccessResponse(id, response, responseData); } +function convertToRequestInit(blazorRequestInit: BlazorRequestInit) { + return { + credentials: blazorRequestInit.credentials, + method: blazorRequestInit.method, + headers: blazorRequestInit.headers.map(item => [item.name, item.value]) + }; +} + function dispatchSuccessResponse(id: number, response: Response, responseData: ArrayBuffer) { const responseDescriptor: ResponseDescriptor = { statusCode: response.status, @@ -40,7 +48,7 @@ function dispatchSuccessResponse(id: number, response: Response, responseData: A headers: [], }; response.headers.forEach((value, name) => { - responseDescriptor.headers.push([name, value]); + responseDescriptor.headers.push({ name: name, value: value }); }); if (!allocateArrayMethod) { @@ -99,15 +107,26 @@ function dispatchResponse(id: number, responseDescriptor: System_String | null, // Keep these in sync with the .NET equivalent in WebAssemblyHttpMessageHandler.cs interface FetchOptions { requestUri: string; - requestInit: RequestInit; + requestInit: BlazorRequestInit; requestInitOverrides: RequestInit; } +interface BlazorRequestInit { + credentials: string; + headers: Header[]; + method: string; +} + interface ResponseDescriptor { // We don't have BodyText in here because if we did, then in the JSON-response case (which // is the most common case), we'd be double-encoding it, since the entire ResponseDescriptor // also gets JSON encoded. It would work but is twice the amount of string processing. statusCode: number; statusText: string; - headers: string[][]; + headers: Header[]; +} + +interface Header { + name: string; + value: string; } diff --git a/src/Components/Browser.JS/utils/package.json b/src/Components/Browser.JS/utils/package.json new file mode 100644 index 0000000000..d907073b21 --- /dev/null +++ b/src/Components/Browser.JS/utils/package.json @@ -0,0 +1,9 @@ +{ + "name": "common", + "private": true, + "version": "0.0.1", + "description": "Common dependencies used during dev time. DO NOT PUBLISH", + "devDependencies": { + "rimraf": "^2.6.2" + } +} diff --git a/src/Components/Browser.JS/utils/yarn.lock b/src/Components/Browser.JS/utils/yarn.lock new file mode 100644 index 0000000000..146ae612a0 --- /dev/null +++ b/src/Components/Browser.JS/utils/yarn.lock @@ -0,0 +1,82 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +balanced-match@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +glob@^7.1.3: + version "7.1.4" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255" + integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + +minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +rimraf@^2.6.2: + version "2.6.3" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" + integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== + dependencies: + glob "^7.1.3" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= diff --git a/src/Components/Browser.JS/yarn.lock b/src/Components/Browser.JS/yarn.lock index dfb2e1969a..93412c449f 100644 --- a/src/Components/Browser.JS/yarn.lock +++ b/src/Components/Browser.JS/yarn.lock @@ -2,17 +2,13 @@ # yarn lockfile v1 -"@aspnet/signalr-protocol-msgpack@^1.0.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@aspnet/signalr-protocol-msgpack/-/signalr-protocol-msgpack-1.1.0.tgz#155038149e8e0eee1f97f4d1319f9f3271ff06fb" - integrity sha512-AQv5AavWvoFz2iLSIDK1DAIXMNhQ1Jt1qRDouXxLKAKP13u8iFq7i3/MwJ30ShOBGBoL5/zn6pBlNjAzTmAsMA== +"@aspnet/signalr-protocol-msgpack@file:../../SignalR/clients/ts/signalr-protocol-msgpack": + version "3.0.0-dev" dependencies: msgpack5 "^4.0.2" -"@aspnet/signalr@^1.0.0": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@aspnet/signalr/-/signalr-1.1.2.tgz#eb9cbc758ff5bfe9a2aba6669e05dfc25a6d783d" - integrity sha512-Xu2ndFTWYhyE+TOCK3LkPWGmc5xGLezBKgGEchyOA++alJ6fdWJ8P/Wsb4Mmd1buzcxGLlIyjpLfUP20rrCHIg== +"@aspnet/signalr@file:../../SignalR/clients/ts/signalr": + version "3.0.0-dev" dependencies: eventsource "^1.0.7" request "^2.88.0" @@ -147,10 +143,10 @@ lodash "^4.17.11" to-fast-properties "^2.0.0" -"@dotnet/jsinterop@^0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@dotnet/jsinterop/-/jsinterop-0.1.1.tgz#f54ba865f241596ea3744f28634454a160476399" - integrity sha512-/Y5f3rtzZ85y8ukBds6IHRgnu7zwlAxe/JhaqN8mvj/JPDA4AtfdNqjJBZuZJxLrP0k6+q4owx/DS7LyZWccFQ== +"@dotnet/jsinterop@3.0.0-preview6.19280.1": + version "3.0.0-preview6.19280.1" + resolved "https://dotnet.myget.org/F/aspnetcore-dev/npm/@dotnet/jsinterop/-/@dotnet/jsinterop-3.0.0-preview6.19280.1.tgz#4c991132f33157de93bc3b6db93cffc9e964b241" + integrity sha1-TJkRMvMxV96TvDttuTz/yelkskE= "@types/emscripten@0.0.31": version "0.0.31" diff --git a/src/Components/Browser/src/Microsoft.AspNetCore.Components.Browser.csproj b/src/Components/Browser/src/Microsoft.AspNetCore.Components.Browser.csproj index b1e7c37548..b673bdbdb7 100644 --- a/src/Components/Browser/src/Microsoft.AspNetCore.Components.Browser.csproj +++ b/src/Components/Browser/src/Microsoft.AspNetCore.Components.Browser.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -13,4 +13,8 @@ + + + + diff --git a/src/Components/Browser/src/RendererRegistryEventDispatcher.cs b/src/Components/Browser/src/RendererRegistryEventDispatcher.cs index 469a0dcae0..37bb3c229d 100644 --- a/src/Components/Browser/src/RendererRegistryEventDispatcher.cs +++ b/src/Components/Browser/src/RendererRegistryEventDispatcher.cs @@ -2,6 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Text.Json; +using System.Text.Json.Serialization; using System.Threading.Tasks; using Microsoft.AspNetCore.Components.Rendering; using Microsoft.JSInterop; @@ -30,34 +32,61 @@ namespace Microsoft.AspNetCore.Components.Browser switch (eventArgsType) { case "change": - return Json.Deserialize(eventArgsJson); + return DeserializeUIEventChangeArgs(eventArgsJson); case "clipboard": - return Json.Deserialize(eventArgsJson); + return Deserialize(eventArgsJson); case "drag": - return Json.Deserialize(eventArgsJson); + return Deserialize(eventArgsJson); case "error": - return Json.Deserialize(eventArgsJson); + return Deserialize(eventArgsJson); case "focus": - return Json.Deserialize(eventArgsJson); + return Deserialize(eventArgsJson); case "keyboard": - return Json.Deserialize(eventArgsJson); + return Deserialize(eventArgsJson); case "mouse": - return Json.Deserialize(eventArgsJson); + return Deserialize(eventArgsJson); case "pointer": - return Json.Deserialize(eventArgsJson); + return Deserialize(eventArgsJson); case "progress": - return Json.Deserialize(eventArgsJson); + return Deserialize(eventArgsJson); case "touch": - return Json.Deserialize(eventArgsJson); + return Deserialize(eventArgsJson); case "unknown": - return Json.Deserialize(eventArgsJson); + return Deserialize(eventArgsJson); case "wheel": - return Json.Deserialize(eventArgsJson); + return Deserialize(eventArgsJson); default: throw new ArgumentException($"Unsupported value '{eventArgsType}'.", nameof(eventArgsType)); } } + private static T Deserialize(string eventArgsJson) + { + return JsonSerializer.Parse(eventArgsJson, JsonSerializerOptionsProvider.Options); + } + + private static UIChangeEventArgs DeserializeUIEventChangeArgs(string eventArgsJson) + { + var changeArgs = Deserialize(eventArgsJson); + var jsonElement = (JsonElement)changeArgs.Value; + switch (jsonElement.Type) + { + case JsonValueType.Null: + changeArgs.Value = null; + break; + case JsonValueType.String: + changeArgs.Value = jsonElement.GetString(); + break; + case JsonValueType.True: + case JsonValueType.False: + changeArgs.Value = jsonElement.GetBoolean(); + break; + default: + throw new ArgumentException($"Unsupported {nameof(UIChangeEventArgs)} value {jsonElement}."); + } + return changeArgs; + } + /// /// For framework use only. /// diff --git a/src/Components/Components.sln b/src/Components/Components.sln index f6ea985b7f..f0245a5de9 100644 --- a/src/Components/Components.sln +++ b/src/Components/Components.sln @@ -179,8 +179,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{E01CD19E-B0BE-4480-8B8E-3701DE862E62}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions", "..\Servers\Kestrel\Transport.Abstractions\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj", "{06E9B7E9-3ABA-4766-BAF8-8904942470A9}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "..\Servers\Kestrel\Transport.Sockets\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", "{AA87CAA1-2456-4108-A02F-E16B9B8A98EE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Connections.Common", "..\SignalR\common\Http.Connections.Common\src\Microsoft.AspNetCore.Http.Connections.Common.csproj", "{DC2F67CC-79DD-4F7C-AFD1-AC0D12B331C9}" @@ -1184,18 +1182,6 @@ Global {E01CD19E-B0BE-4480-8B8E-3701DE862E62}.Release|x64.Build.0 = Release|Any CPU {E01CD19E-B0BE-4480-8B8E-3701DE862E62}.Release|x86.ActiveCfg = Release|Any CPU {E01CD19E-B0BE-4480-8B8E-3701DE862E62}.Release|x86.Build.0 = Release|Any CPU - {06E9B7E9-3ABA-4766-BAF8-8904942470A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {06E9B7E9-3ABA-4766-BAF8-8904942470A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {06E9B7E9-3ABA-4766-BAF8-8904942470A9}.Debug|x64.ActiveCfg = Debug|Any CPU - {06E9B7E9-3ABA-4766-BAF8-8904942470A9}.Debug|x64.Build.0 = Debug|Any CPU - {06E9B7E9-3ABA-4766-BAF8-8904942470A9}.Debug|x86.ActiveCfg = Debug|Any CPU - {06E9B7E9-3ABA-4766-BAF8-8904942470A9}.Debug|x86.Build.0 = Debug|Any CPU - {06E9B7E9-3ABA-4766-BAF8-8904942470A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {06E9B7E9-3ABA-4766-BAF8-8904942470A9}.Release|Any CPU.Build.0 = Release|Any CPU - {06E9B7E9-3ABA-4766-BAF8-8904942470A9}.Release|x64.ActiveCfg = Release|Any CPU - {06E9B7E9-3ABA-4766-BAF8-8904942470A9}.Release|x64.Build.0 = Release|Any CPU - {06E9B7E9-3ABA-4766-BAF8-8904942470A9}.Release|x86.ActiveCfg = Release|Any CPU - {06E9B7E9-3ABA-4766-BAF8-8904942470A9}.Release|x86.Build.0 = Release|Any CPU {AA87CAA1-2456-4108-A02F-E16B9B8A98EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AA87CAA1-2456-4108-A02F-E16B9B8A98EE}.Debug|Any CPU.Build.0 = Debug|Any CPU {AA87CAA1-2456-4108-A02F-E16B9B8A98EE}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1439,7 +1425,6 @@ Global {D8C72607-7E3E-4124-A065-A57F23E9F2BA} = {2FC10057-7A0A-4E34-8302-879925BC0102} {4272499A-C424-41DF-B6B8-DF3C19416BE2} = {2FC10057-7A0A-4E34-8302-879925BC0102} {E01CD19E-B0BE-4480-8B8E-3701DE862E62} = {2FC10057-7A0A-4E34-8302-879925BC0102} - {06E9B7E9-3ABA-4766-BAF8-8904942470A9} = {2FC10057-7A0A-4E34-8302-879925BC0102} {AA87CAA1-2456-4108-A02F-E16B9B8A98EE} = {2FC10057-7A0A-4E34-8302-879925BC0102} {DC2F67CC-79DD-4F7C-AFD1-AC0D12B331C9} = {2FC10057-7A0A-4E34-8302-879925BC0102} {56DA124E-A37A-44DE-9DED-2764DDF0816C} = {2FC10057-7A0A-4E34-8302-879925BC0102} diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj index bb08a3ecfe..4e878d13e3 100644 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj @@ -5,6 +5,7 @@ + diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs index 72db875d48..0b9e98dbda 100644 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs @@ -49,18 +49,31 @@ namespace Microsoft.AspNetCore.Components.RenderTree // Built-in components: https://github.com/aspnet/AspNetCore/issues/8825 namespace Microsoft.AspNetCore.Components { - public partial class AuthorizeView : Microsoft.AspNetCore.Components.ComponentBase + public partial class AuthorizeView : Microsoft.AspNetCore.Components.AuthorizeViewCore { public AuthorizeView() { } [Microsoft.AspNetCore.Components.ParameterAttribute] + public string Policy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; } } + [Microsoft.AspNetCore.Components.ParameterAttribute] + public object Resource { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; } } + [Microsoft.AspNetCore.Components.ParameterAttribute] + public string Roles { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; } } + protected override Microsoft.AspNetCore.Authorization.IAuthorizeData[] GetAuthorizeData() { throw null; } + } + + public abstract partial class AuthorizeViewCore : Microsoft.AspNetCore.Components.ComponentBase + { + public AuthorizeViewCore() { } + [Microsoft.AspNetCore.Components.ParameterAttribute] public Microsoft.AspNetCore.Components.RenderFragment Authorized { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; } } [Microsoft.AspNetCore.Components.ParameterAttribute] public Microsoft.AspNetCore.Components.RenderFragment Authorizing { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; } } [Microsoft.AspNetCore.Components.ParameterAttribute] public Microsoft.AspNetCore.Components.RenderFragment ChildContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; } } [Microsoft.AspNetCore.Components.ParameterAttribute] - public Microsoft.AspNetCore.Components.RenderFragment NotAuthorized { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; } } + public Microsoft.AspNetCore.Components.RenderFragment NotAuthorized { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; } } protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { } + protected abstract Microsoft.AspNetCore.Authorization.IAuthorizeData[] GetAuthorizeData(); [System.Diagnostics.DebuggerStepThroughAttribute] protected override System.Threading.Tasks.Task OnParametersSetAsync() { throw null; } } @@ -102,6 +115,8 @@ namespace Microsoft.AspNetCore.Components.Forms public partial class EditForm : Microsoft.AspNetCore.Components.ComponentBase { public EditForm() { } + [Parameter(CaptureUnmatchedValues = true)] + public System.Collections.Generic.IReadOnlyDictionary AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; }} [Microsoft.AspNetCore.Components.ParameterAttribute] public Microsoft.AspNetCore.Components.RenderFragment ChildContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; }} [Microsoft.AspNetCore.Components.ParameterAttribute] @@ -121,6 +136,8 @@ namespace Microsoft.AspNetCore.Components.Forms public abstract partial class InputBase : Microsoft.AspNetCore.Components.ComponentBase { protected InputBase() { } + [Parameter(CaptureUnmatchedValues = true)] + public System.Collections.Generic.IReadOnlyDictionary AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; }} [Microsoft.AspNetCore.Components.ParameterAttribute] public string Class { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; }} protected string CssClass { get { throw null; } } @@ -194,6 +211,8 @@ namespace Microsoft.AspNetCore.Components.Forms public partial class ValidationMessage : Microsoft.AspNetCore.Components.ComponentBase, System.IDisposable { public ValidationMessage() { } + [Parameter(CaptureUnmatchedValues = true)] + public System.Collections.Generic.IReadOnlyDictionary AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; }} [Microsoft.AspNetCore.Components.ParameterAttribute] public System.Linq.Expressions.Expression> For { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; }} protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { } @@ -204,6 +223,8 @@ namespace Microsoft.AspNetCore.Components.Forms public partial class ValidationSummary : Microsoft.AspNetCore.Components.ComponentBase, System.IDisposable { public ValidationSummary() { } + [Parameter(CaptureUnmatchedValues = true)] + public System.Collections.Generic.IReadOnlyDictionary AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; }} protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { } protected override void OnParametersSet() { } void System.IDisposable.Dispose() { } @@ -212,9 +233,13 @@ namespace Microsoft.AspNetCore.Components.Forms namespace Microsoft.AspNetCore.Components.Layouts { - public partial class LayoutDisplay : Microsoft.AspNetCore.Components.IComponent + public partial class PageDisplay : Microsoft.AspNetCore.Components.IComponent { - public LayoutDisplay() { } + public PageDisplay() { } + [Microsoft.AspNetCore.Components.ParameterAttribute] + public Microsoft.AspNetCore.Components.RenderFragment AuthorizingContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; }} + [Microsoft.AspNetCore.Components.ParameterAttribute] + public Microsoft.AspNetCore.Components.RenderFragment NotAuthorizedContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; }} [Microsoft.AspNetCore.Components.ParameterAttribute] public System.Type Page { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; }} [Microsoft.AspNetCore.Components.ParameterAttribute] @@ -244,7 +269,7 @@ namespace Microsoft.AspNetCore.Components.Routing [Microsoft.AspNetCore.Components.ParameterAttribute] public System.Reflection.Assembly AppAssembly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; }} [Microsoft.AspNetCore.Components.ParameterAttribute] - public System.Type FallbackComponent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; }} + public Microsoft.AspNetCore.Components.RenderFragment NotFoundContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; }} public void Configure(Microsoft.AspNetCore.Components.RenderHandle renderHandle) { } public void Dispose() { } protected virtual void Render(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, System.Type handler, System.Collections.Generic.IDictionary parameters) { } diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs index a1b3d1e2f8..382346efce 100644 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs @@ -105,10 +105,11 @@ namespace Microsoft.AspNetCore.Components public string[] Types { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } } [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct ElementRef : Microsoft.JSInterop.Internal.ICustomArgSerializer + public readonly partial struct ElementRef { private readonly object _dummy; - object Microsoft.JSInterop.Internal.ICustomArgSerializer.ToJsonPrimitive() { throw null; } + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public string __internalId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } } [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] public readonly partial struct EventCallback @@ -360,6 +361,11 @@ namespace Microsoft.AspNetCore.Components public static explicit operator Microsoft.AspNetCore.Components.MarkupString (string value) { throw null; } public override string ToString() { throw null; } } + public partial class NavigationException : System.Exception + { + public NavigationException(string uri) { } + public string Location { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] public readonly partial struct Parameter { @@ -373,6 +379,7 @@ namespace Microsoft.AspNetCore.Components public sealed partial class ParameterAttribute : System.Attribute { public ParameterAttribute() { } + public bool CaptureUnmatchedValues { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } } [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] public readonly partial struct ParameterCollection @@ -769,6 +776,7 @@ namespace Microsoft.AspNetCore.Components.RenderTree public void AddContent(int sequence, Microsoft.AspNetCore.Components.RenderFragment fragment, T value) { } public void AddElementReferenceCapture(int sequence, System.Action elementReferenceCaptureAction) { } public void AddMarkupContent(int sequence, string markupContent) { } + public void AddMultipleAttributes(int sequence, System.Collections.Generic.IEnumerable> attributes) { } public void Clear() { } public void CloseComponent() { } public void CloseElement() { } @@ -813,6 +821,7 @@ namespace Microsoft.AspNetCore.Components.RenderTree } public enum RenderTreeFrameType { + None = 0, Element = 1, Text = 2, Attribute = 3, diff --git a/src/Components/Components/src/Auth/AttributeAuthorizeDataCache.cs b/src/Components/Components/src/Auth/AttributeAuthorizeDataCache.cs new file mode 100644 index 0000000000..92cdf1fb39 --- /dev/null +++ b/src/Components/Components/src/Auth/AttributeAuthorizeDataCache.cs @@ -0,0 +1,42 @@ +// 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.Concurrent; +using System.Linq; +using System.Reflection; +using Microsoft.AspNetCore.Authorization; + +namespace Microsoft.AspNetCore.Components.Auth +{ + internal static class AttributeAuthorizeDataCache + { + private static ConcurrentDictionary _cache + = new ConcurrentDictionary(); + + public static IAuthorizeData[] GetAuthorizeDataForType(Type type) + { + IAuthorizeData[] result; + if (!_cache.TryGetValue(type, out result)) + { + result = ComputeAuthorizeDataForType(type); + _cache[type] = result; // Safe race - doesn't matter if it overwrites + } + + return result; + } + + private static IAuthorizeData[] ComputeAuthorizeDataForType(Type type) + { + // Allow Anonymous skips all authorization + var allAttributes = type.GetCustomAttributes(inherit: true); + if (allAttributes.OfType().Any()) + { + return null; + } + + var authorizeDataAttributes = allAttributes.OfType().ToArray(); + return authorizeDataAttributes.Length > 0 ? authorizeDataAttributes : null; + } + } +} diff --git a/src/Components/Components/src/Auth/AuthorizeDataAdapter.cs b/src/Components/Components/src/Auth/AuthorizeDataAdapter.cs new file mode 100644 index 0000000000..3da3e76261 --- /dev/null +++ b/src/Components/Components/src/Auth/AuthorizeDataAdapter.cs @@ -0,0 +1,39 @@ +// 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 Microsoft.AspNetCore.Authorization; + +namespace Microsoft.AspNetCore.Components +{ + // This is so the AuthorizeView can avoid implementing IAuthorizeData (even privately) + internal class AuthorizeDataAdapter : IAuthorizeData + { + private readonly AuthorizeView _component; + + public AuthorizeDataAdapter(AuthorizeView component) + { + _component = component ?? throw new ArgumentNullException(nameof(component)); + } + + public string Policy + { + get => _component.Policy; + set => throw new NotSupportedException(); + } + + public string Roles + { + get => _component.Roles; + set => throw new NotSupportedException(); + } + + // AuthorizeView doesn't expose any such parameter, as it wouldn't be used anyway, + // since we already have the ClaimsPrincipal by the time AuthorizeView gets involved. + public string AuthenticationSchemes + { + get => null; + set => throw new NotSupportedException(); + } + } +} diff --git a/src/Components/Components/src/Auth/AuthorizeView.cs b/src/Components/Components/src/Auth/AuthorizeView.cs new file mode 100644 index 0000000000..f1a65b0804 --- /dev/null +++ b/src/Components/Components/src/Auth/AuthorizeView.cs @@ -0,0 +1,39 @@ +// 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 Microsoft.AspNetCore.Authorization; + +namespace Microsoft.AspNetCore.Components +{ + /// + /// Displays differing content depending on the user's authorization status. + /// + public class AuthorizeView : AuthorizeViewCore + { + private readonly IAuthorizeData[] selfAsAuthorizeData; + + /// + /// Constructs an instance of . + /// + public AuthorizeView() + { + selfAsAuthorizeData = new[] { new AuthorizeDataAdapter(this) }; + } + + /// + /// The policy name that determines whether the content can be displayed. + /// + [Parameter] public string Policy { get; private set; } + + /// + /// A comma delimited list of roles that are allowed to display the content. + /// + [Parameter] public string Roles { get; private set; } + + /// + /// Gets the data used for authorization. + /// + protected override IAuthorizeData[] GetAuthorizeData() + => selfAsAuthorizeData; + } +} diff --git a/src/Components/Components/src/Auth/AuthorizeView.razor b/src/Components/Components/src/Auth/AuthorizeView.razor deleted file mode 100644 index ae7b1682d5..0000000000 --- a/src/Components/Components/src/Auth/AuthorizeView.razor +++ /dev/null @@ -1,68 +0,0 @@ -@namespace Microsoft.AspNetCore.Components - -@if (currentAuthenticationState == null) -{ - @Authorizing -} -else if (IsAuthorized()) -{ - @((Authorized ?? ChildContent)?.Invoke(currentAuthenticationState)) -} -else -{ - @NotAuthorized -} - -@functions { - private AuthenticationState currentAuthenticationState; - - [CascadingParameter] private Task AuthenticationState { get; set; } - - /// - /// The content that will be displayed if the user is authorized. - /// - [Parameter] public RenderFragment ChildContent { get; private set; } - - /// - /// The content that will be displayed if the user is not authorized. - /// - [Parameter] public RenderFragment NotAuthorized { get; private set; } - - /// - /// The content that will be displayed if the user is authorized. - /// If you specify a value for this parameter, do not also specify a value for . - /// - [Parameter] public RenderFragment Authorized { get; private set; } - - /// - /// The content that will be displayed while asynchronous authorization is in progress. - /// - [Parameter] public RenderFragment Authorizing { get; private set; } - - protected override async Task OnParametersSetAsync() - { - // We allow 'ChildContent' for convenience in basic cases, and 'Authorized' for symmetry - // with 'NotAuthorized' in other cases. Besides naming, they are equivalent. To avoid - // confusion, explicitly prevent the case where both are supplied. - if (ChildContent != null && Authorized != null) - { - throw new InvalidOperationException($"When using {nameof(AuthorizeView)}, do not specify both '{nameof(Authorized)}' and '{nameof(ChildContent)}'."); - } - - // First render in pending state - // If the task has already completed, this render will be skipped - currentAuthenticationState = null; - - // Then render in completed state - currentAuthenticationState = await AuthenticationState; - } - - private bool IsAuthorized() - { - // TODO: Support various authorization condition parameters, equivalent to those offered - // by the [Authorize] attribute, e.g., "Roles" and "Policy". This is on hold until we're - // able to reference the policy evaluator APIs from this package. - - return currentAuthenticationState.User?.Identity?.IsAuthenticated == true; - } -} diff --git a/src/Components/Components/src/Auth/AuthorizeViewCore.cs b/src/Components/Components/src/Auth/AuthorizeViewCore.cs new file mode 100644 index 0000000000..07e2cd1c48 --- /dev/null +++ b/src/Components/Components/src/Auth/AuthorizeViewCore.cs @@ -0,0 +1,111 @@ +// 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.Security.Claims; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Components.RenderTree; + +namespace Microsoft.AspNetCore.Components +{ + /// + /// A base class for components that display differing content depending on the user's authorization status. + /// + public abstract class AuthorizeViewCore : ComponentBase + { + private AuthenticationState currentAuthenticationState; + private bool isAuthorized; + + /// + /// The content that will be displayed if the user is authorized. + /// + [Parameter] public RenderFragment ChildContent { get; private set; } + + /// + /// The content that will be displayed if the user is not authorized. + /// + [Parameter] public RenderFragment NotAuthorized { get; private set; } + + /// + /// The content that will be displayed if the user is authorized. + /// If you specify a value for this parameter, do not also specify a value for . + /// + [Parameter] public RenderFragment Authorized { get; private set; } + + /// + /// The content that will be displayed while asynchronous authorization is in progress. + /// + [Parameter] public RenderFragment Authorizing { get; private set; } + + /// + /// The resource to which access is being controlled. + /// + [Parameter] public object Resource { get; private set; } + + [CascadingParameter] private Task AuthenticationState { get; set; } + + [Inject] private IAuthorizationPolicyProvider AuthorizationPolicyProvider { get; set; } + + [Inject] private IAuthorizationService AuthorizationService { get; set; } + + /// + protected override void BuildRenderTree(RenderTreeBuilder builder) + { + if (currentAuthenticationState == null) + { + builder.AddContent(0, Authorizing); + } + else if (isAuthorized) + { + var authorizedContent = Authorized ?? ChildContent; + builder.AddContent(1, authorizedContent?.Invoke(currentAuthenticationState)); + } + else + { + builder.AddContent(2, NotAuthorized?.Invoke(currentAuthenticationState)); + } + } + + /// + protected override async Task OnParametersSetAsync() + { + // We allow 'ChildContent' for convenience in basic cases, and 'Authorized' for symmetry + // with 'NotAuthorized' in other cases. Besides naming, they are equivalent. To avoid + // confusion, explicitly prevent the case where both are supplied. + if (ChildContent != null && Authorized != null) + { + throw new InvalidOperationException($"Do not specify both '{nameof(Authorized)}' and '{nameof(ChildContent)}'."); + } + + if (AuthenticationState == null) + { + throw new InvalidOperationException($"Authorization requires a cascading parameter of type Task<{nameof(AuthenticationState)}>. Consider using {typeof(CascadingAuthenticationState).Name} to supply this."); + } + + // First render in pending state + // If the task has already completed, this render will be skipped + currentAuthenticationState = null; + + // Then render in completed state + // Importantly, we *don't* call StateHasChanged between the following async steps, + // otherwise we'd display an incorrect UI state while waiting for IsAuthorizedAsync + currentAuthenticationState = await AuthenticationState; + isAuthorized = await IsAuthorizedAsync(currentAuthenticationState.User); + } + + /// + /// Gets the data required to apply authorization rules. + /// + protected abstract IAuthorizeData[] GetAuthorizeData(); + + private async Task IsAuthorizedAsync(ClaimsPrincipal user) + { + var authorizeData = GetAuthorizeData(); + var policy = await AuthorizationPolicy.CombineAsync( + AuthorizationPolicyProvider, authorizeData); + var result = await AuthorizationService.AuthorizeAsync(user, Resource, policy); + return result.Succeeded; + } + } +} diff --git a/src/Components/Components/src/Auth/CascadingAuthenticationState.razor b/src/Components/Components/src/Auth/CascadingAuthenticationState.razor index f3bf0bd327..2910fc5fba 100644 --- a/src/Components/Components/src/Auth/CascadingAuthenticationState.razor +++ b/src/Components/Components/src/Auth/CascadingAuthenticationState.razor @@ -4,7 +4,7 @@ -@functions { +@code { private Task _currentAuthenticationStateTask; /// diff --git a/src/Components/Components/src/BindAttributes.cs b/src/Components/Components/src/BindAttributes.cs index 6651f8db6b..3506b485fa 100644 --- a/src/Components/Components/src/BindAttributes.cs +++ b/src/Components/Components/src/BindAttributes.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 Microsoft.AspNetCore.Components @@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Components /// BindAttributes and annotate it with the appropriate attributes. /// - // Handles cases like - this is a fallback and will be ignored + // Handles cases like - this is a fallback and will be ignored // when a specific type attribute is applied. [BindInputElement(null, null, "value", "onchange")] diff --git a/src/Components/Components/src/ElementRef.cs b/src/Components/Components/src/ElementRef.cs index 139a091dc0..3bd600bd88 100644 --- a/src/Components/Components/src/ElementRef.cs +++ b/src/Components/Components/src/ElementRef.cs @@ -1,9 +1,8 @@ // 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 Microsoft.JSInterop.Internal; using System; -using System.Collections.Generic; +using System.ComponentModel; using System.Threading; namespace Microsoft.AspNetCore.Components @@ -11,29 +10,30 @@ namespace Microsoft.AspNetCore.Components /// /// Represents a reference to a rendered element. /// - public readonly struct ElementRef : ICustomArgSerializer + public readonly struct ElementRef { static long _nextIdForWebAssemblyOnly = 1; - // The Id is unique at least within the scope of a given user/circuit - internal string Id { get; } + /// + /// Gets a unique identifier for . + /// + /// + /// 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. + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public string __internalId { get; } + + internal string Id => __internalId; private ElementRef(string id) { - Id = id; + __internalId = id; } internal static ElementRef CreateWithUniqueId() => new ElementRef(CreateUniqueId()); - object ICustomArgSerializer.ToJsonPrimitive() - { - return new Dictionary - { - { "_blazorElementRef", Id } - }; - } - static string CreateUniqueId() { if (PlatformInfo.IsWebAssembly) diff --git a/src/Components/Components/src/EventCallback.cs b/src/Components/Components/src/EventCallback.cs index ca3e3d6adc..5a396e306b 100644 --- a/src/Components/Components/src/EventCallback.cs +++ b/src/Components/Components/src/EventCallback.cs @@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Components /// /// A bound event handler delegate. /// - public readonly struct EventCallback + public readonly struct EventCallback : IEventCallback { /// /// Gets a reference to the . @@ -60,12 +60,17 @@ namespace Microsoft.AspNetCore.Components return Receiver.HandleEventAsync(new EventCallbackWorkItem(Delegate), arg); } + + object IEventCallback.UnpackForRenderTree() + { + return RequiresExplicitReceiver ? (object)this : Delegate; + } } /// /// A bound event handler delegate. /// - public readonly struct EventCallback + public readonly struct EventCallback : IEventCallback { internal readonly MulticastDelegate Delegate; internal readonly IHandleEvent Receiver; @@ -86,7 +91,7 @@ namespace Microsoft.AspNetCore.Components /// public bool HasDelegate => Delegate != null; - // This is a hint to the runtime that Reciever is a different object than what + // This is a hint to the runtime that Receiver is a different object than what // Delegate.Target points to. This allows us to avoid boxing the command object // when building the render tree. See logic where this is used. internal bool RequiresExplicitReceiver => Receiver != null && !object.ReferenceEquals(Receiver, Delegate?.Target); @@ -111,5 +116,18 @@ namespace Microsoft.AspNetCore.Components { return new EventCallback(Receiver ?? Delegate?.Target as IHandleEvent, Delegate); } + + object IEventCallback.UnpackForRenderTree() + { + return RequiresExplicitReceiver ? (object)AsUntyped() : Delegate; + } + } + + // Used to understand boxed generic EventCallbacks + internal interface IEventCallback + { + bool HasDelegate { get; } + + object UnpackForRenderTree(); } } diff --git a/src/Components/Components/src/Forms/EditForm.cs b/src/Components/Components/src/Forms/EditForm.cs index 2041144bdb..89a329165b 100644 --- a/src/Components/Components/src/Forms/EditForm.cs +++ b/src/Components/Components/src/Forms/EditForm.cs @@ -2,6 +2,7 @@ // 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.Threading.Tasks; using Microsoft.AspNetCore.Components.RenderTree; @@ -24,6 +25,11 @@ namespace Microsoft.AspNetCore.Components.Forms _handleSubmitDelegate = HandleSubmitAsync; } + /// + /// Gets or sets a collection of additional attributes that will be applied to the created form element. + /// + [Parameter(CaptureUnmatchedValues = true)] public IReadOnlyDictionary AdditionalAttributes { get; private set; } + /// /// Supplies the edit context explicitly. If using this parameter, do not /// also supply , since the model value will be taken @@ -99,11 +105,12 @@ namespace Microsoft.AspNetCore.Components.Forms builder.OpenRegion(_fixedEditContext.GetHashCode()); builder.OpenElement(0, "form"); - builder.AddAttribute(1, "onsubmit", _handleSubmitDelegate); - builder.OpenComponent>(2); - builder.AddAttribute(3, "IsFixed", true); - builder.AddAttribute(4, "Value", _fixedEditContext); - builder.AddAttribute(5, RenderTreeBuilder.ChildContent, ChildContent?.Invoke(_fixedEditContext)); + builder.AddMultipleAttributes(1, AdditionalAttributes); + builder.AddAttribute(2, "onsubmit", _handleSubmitDelegate); + builder.OpenComponent>(3); + builder.AddAttribute(4, "IsFixed", true); + builder.AddAttribute(5, "Value", _fixedEditContext); + builder.AddAttribute(6, RenderTreeBuilder.ChildContent, ChildContent?.Invoke(_fixedEditContext)); builder.CloseComponent(); builder.CloseElement(); diff --git a/src/Components/Components/src/Forms/InputComponents/InputBase.cs b/src/Components/Components/src/Forms/InputComponents/InputBase.cs index e8f4c6d756..da13ccbdee 100644 --- a/src/Components/Components/src/Forms/InputComponents/InputBase.cs +++ b/src/Components/Components/src/Forms/InputComponents/InputBase.cs @@ -21,6 +21,11 @@ namespace Microsoft.AspNetCore.Components.Forms [CascadingParameter] EditContext CascadedEditContext { get; set; } + /// + /// Gets or sets a collection of additional attributes that will be applied to the created element. + /// + [Parameter(CaptureUnmatchedValues = true)] public IReadOnlyDictionary AdditionalAttributes { get; private set; } + /// /// Gets a value for the component's 'id' attribute. /// @@ -35,7 +40,7 @@ namespace Microsoft.AspNetCore.Components.Forms /// Gets or sets the value of the input. This should be used with two-way binding. /// /// - /// bind-Value="@model.PropertyName" + /// @bind-Value="@model.PropertyName" /// [Parameter] public T Value { get; private set; } diff --git a/src/Components/Components/src/Forms/InputComponents/InputCheckbox.cs b/src/Components/Components/src/Forms/InputComponents/InputCheckbox.cs index 300d77f1d9..e25867aa1a 100644 --- a/src/Components/Components/src/Forms/InputComponents/InputCheckbox.cs +++ b/src/Components/Components/src/Forms/InputComponents/InputCheckbox.cs @@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Components.Forms /* This is exactly equivalent to a .razor file containing: * * @inherits InputBase - * + * * * The only reason it's not implemented as a .razor file is that we don't presently have the ability to compile those * files within this project. Developers building their own input components should use Razor syntax. @@ -24,11 +24,12 @@ namespace Microsoft.AspNetCore.Components.Forms protected override void BuildRenderTree(RenderTreeBuilder builder) { builder.OpenElement(0, "input"); - builder.AddAttribute(1, "type", "checkbox"); - builder.AddAttribute(2, "id", Id); - builder.AddAttribute(3, "class", CssClass); - builder.AddAttribute(4, "checked", BindMethods.GetValue(CurrentValue)); - builder.AddAttribute(5, "onchange", BindMethods.SetValueHandler(__value => CurrentValue = __value, CurrentValue)); + builder.AddMultipleAttributes(1, AdditionalAttributes); + builder.AddAttribute(2, "type", "checkbox"); + builder.AddAttribute(3, "id", Id); + builder.AddAttribute(4, "class", CssClass); + builder.AddAttribute(5, "checked", BindMethods.GetValue(CurrentValue)); + builder.AddAttribute(6, "onchange", BindMethods.SetValueHandler(__value => CurrentValue = __value, CurrentValue)); builder.CloseElement(); } diff --git a/src/Components/Components/src/Forms/InputComponents/InputDate.cs b/src/Components/Components/src/Forms/InputComponents/InputDate.cs index 5f794d4813..26e253b3c7 100644 --- a/src/Components/Components/src/Forms/InputComponents/InputDate.cs +++ b/src/Components/Components/src/Forms/InputComponents/InputDate.cs @@ -23,11 +23,12 @@ namespace Microsoft.AspNetCore.Components.Forms protected override void BuildRenderTree(RenderTreeBuilder builder) { builder.OpenElement(0, "input"); - builder.AddAttribute(1, "type", "date"); - builder.AddAttribute(2, "id", Id); - builder.AddAttribute(3, "class", CssClass); - builder.AddAttribute(4, "value", BindMethods.GetValue(CurrentValueAsString)); - builder.AddAttribute(5, "onchange", BindMethods.SetValueHandler(__value => CurrentValueAsString = __value, CurrentValueAsString)); + builder.AddMultipleAttributes(1, AdditionalAttributes); + builder.AddAttribute(2, "type", "date"); + builder.AddAttribute(3, "id", Id); + builder.AddAttribute(4, "class", CssClass); + builder.AddAttribute(5, "value", BindMethods.GetValue(CurrentValueAsString)); + builder.AddAttribute(6, "onchange", BindMethods.SetValueHandler(__value => CurrentValueAsString = __value, CurrentValueAsString)); builder.CloseElement(); } diff --git a/src/Components/Components/src/Forms/InputComponents/InputNumber.cs b/src/Components/Components/src/Forms/InputComponents/InputNumber.cs index 72f0fea0f7..9301f33559 100644 --- a/src/Components/Components/src/Forms/InputComponents/InputNumber.cs +++ b/src/Components/Components/src/Forms/InputComponents/InputNumber.cs @@ -62,12 +62,13 @@ namespace Microsoft.AspNetCore.Components.Forms protected override void BuildRenderTree(RenderTreeBuilder builder) { builder.OpenElement(0, "input"); - builder.AddAttribute(1, "type", "number"); - builder.AddAttribute(2, "step", _stepAttributeValue); - builder.AddAttribute(3, "id", Id); - builder.AddAttribute(4, "class", CssClass); - builder.AddAttribute(5, "value", BindMethods.GetValue(CurrentValueAsString)); - builder.AddAttribute(6, "onchange", BindMethods.SetValueHandler(__value => CurrentValueAsString = __value, CurrentValueAsString)); + builder.AddMultipleAttributes(1, AdditionalAttributes); + builder.AddAttribute(2, "type", "number"); + builder.AddAttribute(3, "step", _stepAttributeValue); + builder.AddAttribute(4, "id", Id); + builder.AddAttribute(5, "class", CssClass); + builder.AddAttribute(6, "value", BindMethods.GetValue(CurrentValueAsString)); + builder.AddAttribute(7, "onchange", BindMethods.SetValueHandler(__value => CurrentValueAsString = __value, CurrentValueAsString)); builder.CloseElement(); } diff --git a/src/Components/Components/src/Forms/InputComponents/InputSelect.cs b/src/Components/Components/src/Forms/InputComponents/InputSelect.cs index cee64cb281..e54a8078c6 100644 --- a/src/Components/Components/src/Forms/InputComponents/InputSelect.cs +++ b/src/Components/Components/src/Forms/InputComponents/InputSelect.cs @@ -20,11 +20,12 @@ namespace Microsoft.AspNetCore.Components.Forms protected override void BuildRenderTree(RenderTreeBuilder builder) { builder.OpenElement(0, "select"); - builder.AddAttribute(1, "id", Id); - builder.AddAttribute(2, "class", CssClass); - builder.AddAttribute(3, "value", BindMethods.GetValue(CurrentValueAsString)); - builder.AddAttribute(4, "onchange", BindMethods.SetValueHandler(__value => CurrentValueAsString = __value, CurrentValueAsString)); - builder.AddContent(5, ChildContent); + builder.AddMultipleAttributes(1, AdditionalAttributes); + builder.AddAttribute(2, "id", Id); + builder.AddAttribute(3, "class", CssClass); + builder.AddAttribute(4, "value", BindMethods.GetValue(CurrentValueAsString)); + builder.AddAttribute(5, "onchange", BindMethods.SetValueHandler(__value => CurrentValueAsString = __value, CurrentValueAsString)); + builder.AddContent(6, ChildContent); builder.CloseElement(); } diff --git a/src/Components/Components/src/Forms/InputComponents/InputText.cs b/src/Components/Components/src/Forms/InputComponents/InputText.cs index 71657b13f8..61b4ea13dc 100644 --- a/src/Components/Components/src/Forms/InputComponents/InputText.cs +++ b/src/Components/Components/src/Forms/InputComponents/InputText.cs @@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Components.Forms /* This is almost equivalent to a .razor file containing: * * @inherits InputBase - * + * * * The only reason it's not implemented as a .razor file is that we don't presently have the ability to compile those * files within this project. Developers building their own input components should use Razor syntax. @@ -25,10 +25,11 @@ namespace Microsoft.AspNetCore.Components.Forms protected override void BuildRenderTree(RenderTreeBuilder builder) { builder.OpenElement(0, "input"); - builder.AddAttribute(1, "id", Id); - builder.AddAttribute(2, "class", CssClass); - builder.AddAttribute(3, "value", BindMethods.GetValue(CurrentValue)); - builder.AddAttribute(4, "onchange", BindMethods.SetValueHandler(__value => CurrentValue = __value, CurrentValue)); + builder.AddMultipleAttributes(1, AdditionalAttributes); + builder.AddAttribute(2, "id", Id); + builder.AddAttribute(3, "class", CssClass); + builder.AddAttribute(4, "value", BindMethods.GetValue(CurrentValue)); + builder.AddAttribute(5, "onchange", BindMethods.SetValueHandler(__value => CurrentValue = __value, CurrentValue)); builder.CloseElement(); } diff --git a/src/Components/Components/src/Forms/InputComponents/InputTextArea.cs b/src/Components/Components/src/Forms/InputComponents/InputTextArea.cs index 72c9563d7d..e170d4ff19 100644 --- a/src/Components/Components/src/Forms/InputComponents/InputTextArea.cs +++ b/src/Components/Components/src/Forms/InputComponents/InputTextArea.cs @@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Components.Forms /* This is almost equivalent to a .razor file containing: * * @inherits InputBase - * + * * * The only reason it's not implemented as a .razor file is that we don't presently have the ability to compile those * files within this project. Developers building their own input components should use Razor syntax. @@ -25,10 +25,11 @@ namespace Microsoft.AspNetCore.Components.Forms protected override void BuildRenderTree(RenderTreeBuilder builder) { builder.OpenElement(0, "textarea"); - builder.AddAttribute(1, "id", Id); - builder.AddAttribute(2, "class", CssClass); - builder.AddAttribute(3, "value", BindMethods.GetValue(CurrentValue)); - builder.AddAttribute(4, "onchange", BindMethods.SetValueHandler(__value => CurrentValue = __value, CurrentValue)); + builder.AddMultipleAttributes(1, AdditionalAttributes); + builder.AddAttribute(2, "id", Id); + builder.AddAttribute(3, "class", CssClass); + builder.AddAttribute(4, "value", BindMethods.GetValue(CurrentValue)); + builder.AddAttribute(5, "onchange", BindMethods.SetValueHandler(__value => CurrentValue = __value, CurrentValue)); builder.CloseElement(); } diff --git a/src/Components/Components/src/Forms/ValidationMessage.cs b/src/Components/Components/src/Forms/ValidationMessage.cs index 52b86551dc..ef8ee1fbd8 100644 --- a/src/Components/Components/src/Forms/ValidationMessage.cs +++ b/src/Components/Components/src/Forms/ValidationMessage.cs @@ -2,6 +2,7 @@ // 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.Linq.Expressions; using Microsoft.AspNetCore.Components.RenderTree; @@ -17,6 +18,11 @@ namespace Microsoft.AspNetCore.Components.Forms private readonly EventHandler _validationStateChangedHandler; private FieldIdentifier _fieldIdentifier; + /// + /// Gets or sets a collection of additional attributes that will be applied to the created div element. + /// + [Parameter(CaptureUnmatchedValues = true)] public IReadOnlyDictionary AdditionalAttributes { get; private set; } + [CascadingParameter] EditContext CurrentEditContext { get; set; } /// @@ -67,8 +73,9 @@ namespace Microsoft.AspNetCore.Components.Forms foreach (var message in CurrentEditContext.GetValidationMessages(_fieldIdentifier)) { builder.OpenElement(0, "div"); - builder.AddAttribute(1, "class", "validation-message"); - builder.AddContent(2, message); + builder.AddMultipleAttributes(1, AdditionalAttributes); + builder.AddAttribute(2, "class", "validation-message"); + builder.AddContent(3, message); builder.CloseElement(); } } diff --git a/src/Components/Components/src/Forms/ValidationSummary.cs b/src/Components/Components/src/Forms/ValidationSummary.cs index 0159f1be31..1bd46fde66 100644 --- a/src/Components/Components/src/Forms/ValidationSummary.cs +++ b/src/Components/Components/src/Forms/ValidationSummary.cs @@ -2,6 +2,7 @@ // 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 Microsoft.AspNetCore.Components.RenderTree; namespace Microsoft.AspNetCore.Components.Forms @@ -18,6 +19,11 @@ namespace Microsoft.AspNetCore.Components.Forms private EditContext _previousEditContext; private readonly EventHandler _validationStateChangedHandler; + /// + /// Gets or sets a collection of additional attributes that will be applied to the created ul element. + /// + [Parameter(CaptureUnmatchedValues = true)] public IReadOnlyDictionary AdditionalAttributes { get; private set; } + [CascadingParameter] EditContext CurrentEditContext { get; set; } /// ` @@ -55,13 +61,14 @@ namespace Microsoft.AspNetCore.Components.Forms if (messagesEnumerator.MoveNext()) { builder.OpenElement(0, "ul"); - builder.AddAttribute(1, "class", "validation-errors"); + builder.AddMultipleAttributes(1, AdditionalAttributes); + builder.AddAttribute(2, "class", "validation-errors"); do { - builder.OpenElement(2, "li"); - builder.AddAttribute(3, "class", "validation-message"); - builder.AddContent(4, messagesEnumerator.Current); + builder.OpenElement(3, "li"); + builder.AddAttribute(4, "class", "validation-message"); + builder.AddContent(5, messagesEnumerator.Current); builder.CloseElement(); } while (messagesEnumerator.MoveNext()); diff --git a/src/Components/Components/src/HttpClientJsonExtensions.cs b/src/Components/Components/src/HttpClientJsonExtensions.cs index 7ef07497a7..1312399f41 100644 --- a/src/Components/Components/src/HttpClientJsonExtensions.cs +++ b/src/Components/Components/src/HttpClientJsonExtensions.cs @@ -1,9 +1,9 @@ // 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 Microsoft.JSInterop; using System.Net.Http; using System.Text; +using System.Text.Json.Serialization; using System.Threading.Tasks; namespace Microsoft.AspNetCore.Components @@ -23,8 +23,8 @@ namespace Microsoft.AspNetCore.Components /// The response parsed as an object of the generic type. public static async Task GetJsonAsync(this HttpClient httpClient, string requestUri) { - var responseJson = await httpClient.GetStringAsync(requestUri); - return Json.Deserialize(responseJson); + var stringContent = await httpClient.GetStringAsync(requestUri); + return JsonSerializer.Parse(stringContent, JsonSerializerOptionsProvider.Options); } /// @@ -95,7 +95,7 @@ namespace Microsoft.AspNetCore.Components /// The response parsed as an object of the generic type. public static async Task SendJsonAsync(this HttpClient httpClient, HttpMethod method, string requestUri, object content) { - var requestJson = Json.Serialize(content); + var requestJson = JsonSerializer.ToString(content, JsonSerializerOptionsProvider.Options); var response = await httpClient.SendAsync(new HttpRequestMessage(method, requestUri) { Content = new StringContent(requestJson, Encoding.UTF8, "application/json") @@ -111,8 +111,8 @@ namespace Microsoft.AspNetCore.Components } else { - var responseJson = await response.Content.ReadAsStringAsync(); - return Json.Deserialize(responseJson); + var stringContent = await response.Content.ReadAsStringAsync(); + return JsonSerializer.Parse(stringContent, JsonSerializerOptionsProvider.Options); } } diff --git a/src/Components/Components/src/JsonSerializerOptionsProvider.cs b/src/Components/Components/src/JsonSerializerOptionsProvider.cs new file mode 100644 index 0000000000..a6f29e8005 --- /dev/null +++ b/src/Components/Components/src/JsonSerializerOptionsProvider.cs @@ -0,0 +1,15 @@ +// 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.Text.Json.Serialization; + +namespace Microsoft.AspNetCore.Components +{ + internal static class JsonSerializerOptionsProvider + { + public static readonly JsonSerializerOptions Options = new JsonSerializerOptions + { + PropertyNamingPolicy = JsonNamingPolicy.CamelCase + }; + } +} diff --git a/src/Components/Components/src/Layouts/LayoutDisplay.cs b/src/Components/Components/src/Layouts/LayoutDisplay.cs deleted file mode 100644 index c4ae14ab46..0000000000 --- a/src/Components/Components/src/Layouts/LayoutDisplay.cs +++ /dev/null @@ -1,90 +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.Collections.Generic; -using System.Reflection; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Components; -using Microsoft.AspNetCore.Components.RenderTree; - -namespace Microsoft.AspNetCore.Components.Layouts -{ - /// - /// Displays the specified page component, rendering it inside its layout - /// and any further nested layouts. - /// - public class LayoutDisplay : IComponent - { - internal const string NameOfPage = nameof(Page); - internal const string NameOfPageParameters = nameof(PageParameters); - - private RenderHandle _renderHandle; - - /// - /// Gets or sets the type of the page component to display. - /// The type must implement . - /// - [Parameter] - public Type Page { get; private set; } - - /// - /// Gets or sets the parameters to pass to the page. - /// - [Parameter] - public IDictionary PageParameters { get; private set; } - - /// - public void Configure(RenderHandle renderHandle) - { - _renderHandle = renderHandle; - } - - /// - public Task SetParametersAsync(ParameterCollection parameters) - { - parameters.SetParameterProperties(this); - Render(); - return Task.CompletedTask; - } - - private void Render() - { - // In the middle, we render the requested page - var fragment = RenderComponentWithBody(Page, bodyParam: null); - - // Repeatedly wrap it in each layer of nested layout until we get - // to a layout that has no parent - Type layoutType = Page; - while ((layoutType = GetLayoutType(layoutType)) != null) - { - fragment = RenderComponentWithBody(layoutType, fragment); - } - - _renderHandle.Render(fragment); - } - - private RenderFragment RenderComponentWithBody(Type componentType, RenderFragment bodyParam) => builder => - { - builder.OpenComponent(0, componentType); - if (bodyParam != null) - { - builder.AddAttribute(1, LayoutComponentBase.BodyPropertyName, bodyParam); - } - else - { - if (PageParameters != null) - { - foreach (var kvp in PageParameters) - { - builder.AddAttribute(1, kvp.Key, kvp.Value); - } - } - } - builder.CloseComponent(); - }; - - private Type GetLayoutType(Type type) - => type.GetCustomAttribute()?.LayoutType; - } -} diff --git a/src/Components/Components/src/Layouts/PageDisplay.cs b/src/Components/Components/src/Layouts/PageDisplay.cs new file mode 100644 index 0000000000..a73a7ee6e2 --- /dev/null +++ b/src/Components/Components/src/Layouts/PageDisplay.cs @@ -0,0 +1,140 @@ +// 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.Reflection; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Components.Auth; +using Microsoft.AspNetCore.Components.Layouts; +using Microsoft.AspNetCore.Components.RenderTree; + +namespace Microsoft.AspNetCore.Components +{ + /// + /// Displays the specified page component, rendering it inside its layout + /// and any further nested layouts, plus applying any authorization rules. + /// + public class PageDisplay : IComponent + { + private RenderHandle _renderHandle; + + /// + /// Gets or sets the type of the page component to display. + /// The type must implement . + /// + [Parameter] + public Type Page { get; private set; } + + /// + /// Gets or sets the parameters to pass to the page. + /// + [Parameter] + public IDictionary PageParameters { get; private set; } + + /// + /// The content that will be displayed if the user is not authorized. + /// + [Parameter] + public RenderFragment NotAuthorizedContent { get; private set; } + + /// + /// The content that will be displayed while asynchronous authorization is in progress. + /// + [Parameter] + public RenderFragment AuthorizingContent { get; private set; } + + /// + public void Configure(RenderHandle renderHandle) + { + _renderHandle = renderHandle; + } + + /// + public Task SetParametersAsync(ParameterCollection parameters) + { + parameters.SetParameterProperties(this); + Render(); + return Task.CompletedTask; + } + + private void Render() + { + // In the middle goes the requested page + var fragment = (RenderFragment)RenderPageWithParameters; + + // Around that goes an AuthorizeViewCore + fragment = WrapInAuthorizeViewCore(fragment); + + // Then repeatedly wrap that in each layer of nested layout until we get + // to a layout that has no parent + Type layoutType = Page; + while ((layoutType = GetLayoutType(layoutType)) != null) + { + fragment = WrapInLayout(layoutType, fragment); + } + + _renderHandle.Render(fragment); + } + + private RenderFragment WrapInLayout(Type layoutType, RenderFragment bodyParam) => builder => + { + builder.OpenComponent(0, layoutType); + builder.AddAttribute(1, LayoutComponentBase.BodyPropertyName, bodyParam); + builder.CloseComponent(); + }; + + private void RenderPageWithParameters(RenderTreeBuilder builder) + { + builder.OpenComponent(0, Page); + + if (PageParameters != null) + { + foreach (var kvp in PageParameters) + { + builder.AddAttribute(1, kvp.Key, kvp.Value); + } + } + + builder.CloseComponent(); + } + + private RenderFragment WrapInAuthorizeViewCore(RenderFragment pageFragment) + { + var authorizeData = AttributeAuthorizeDataCache.GetAuthorizeDataForType(Page); + if (authorizeData == null) + { + // No authorization, so no need to wrap the fragment + return pageFragment; + } + + // Some authorization data exists, so we do need to wrap the fragment + RenderFragment authorizedContent = context => pageFragment; + return builder => + { + builder.OpenComponent(0); + builder.AddAttribute(1, nameof(AuthorizeViewWithSuppliedData.AuthorizeDataParam), authorizeData); + builder.AddAttribute(2, nameof(AuthorizeViewWithSuppliedData.Authorized), authorizedContent); + builder.AddAttribute(3, nameof(AuthorizeViewWithSuppliedData.NotAuthorized), NotAuthorizedContent ?? DefaultNotAuthorizedContent); + builder.AddAttribute(4, nameof(AuthorizeViewWithSuppliedData.Authorizing), AuthorizingContent); + builder.CloseComponent(); + }; + } + + private static Type GetLayoutType(Type type) + => type.GetCustomAttribute()?.LayoutType; + + private class AuthorizeViewWithSuppliedData : AuthorizeViewCore + { + [Parameter] public IAuthorizeData[] AuthorizeDataParam { get; private set; } + + protected override IAuthorizeData[] GetAuthorizeData() => AuthorizeDataParam; + } + + // There has to be some default content. If we render blank by default, developers + // will find it hard to guess why their UI isn't appearing. + private static RenderFragment DefaultNotAuthorizedContent(AuthenticationState authenticationState) + => builder => builder.AddContent(0, "Not authorized"); + } +} diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj index 46121def31..da740506b5 100644 --- a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj +++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -10,6 +10,7 @@ + diff --git a/src/Components/Components/src/NavigationException.cs b/src/Components/Components/src/NavigationException.cs new file mode 100644 index 0000000000..2693ce39b0 --- /dev/null +++ b/src/Components/Components/src/NavigationException.cs @@ -0,0 +1,26 @@ +// 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; + +namespace Microsoft.AspNetCore.Components +{ + /// + /// Exception thrown when an is not able to navigate to a different url. + /// + public class NavigationException : Exception + { + /// + /// Initializes a new instance. + /// + public NavigationException(string uri) + { + Location = uri; + } + + /// + /// Gets the uri to which navigation was attempted. + /// + public string Location { get; } + } +} diff --git a/src/Components/Components/src/ParameterAttribute.cs b/src/Components/Components/src/ParameterAttribute.cs index ffe39191bf..5fb5ec2088 100644 --- a/src/Components/Components/src/ParameterAttribute.cs +++ b/src/Components/Components/src/ParameterAttribute.cs @@ -2,6 +2,8 @@ // 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 Microsoft.AspNetCore.Components.RenderTree; namespace Microsoft.AspNetCore.Components { @@ -11,5 +13,24 @@ namespace Microsoft.AspNetCore.Components [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)] public sealed class ParameterAttribute : Attribute { + /// + /// Gets or sets a value that determines whether the parameter will capture values that + /// don't match any other parameter. + /// + /// + /// + /// allows a component to accept arbitrary additional + /// attributes, and pass them to another component, or some element of the underlying markup. + /// + /// + /// can be used on at most one parameter per component. + /// + /// + /// should only be applied to parameters of a type that + /// can be used with + /// such as . + /// + /// + public bool CaptureUnmatchedValues { get; set; } } } diff --git a/src/Components/Components/src/ParameterCollectionExtensions.cs b/src/Components/Components/src/ParameterCollectionExtensions.cs index 323662f403..fb23b5de49 100644 --- a/src/Components/Components/src/ParameterCollectionExtensions.cs +++ b/src/Components/Components/src/ParameterCollectionExtensions.cs @@ -1,11 +1,13 @@ // 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 Microsoft.AspNetCore.Components.Reflection; using System; using System.Collections.Concurrent; using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; using System.Reflection; +using Microsoft.AspNetCore.Components.Reflection; namespace Microsoft.AspNetCore.Components { @@ -41,17 +43,72 @@ namespace Microsoft.AspNetCore.Components _cachedWritersByType[targetType] = writers; } - foreach (var parameter in parameterCollection) + // The logic is split up for simplicity now that we have CaptureUnmatchedValues parameters. + if (writers.CaptureUnmatchedValuesWriter == null) { - var parameterName = parameter.Name; - if (!writers.WritersByName.TryGetValue(parameterName, out var writerWithIndex)) + // Logic for components without a CaptureUnmatchedValues parameter + foreach (var parameter in parameterCollection) { - ThrowForUnknownIncomingParameterName(targetType, parameterName); + var parameterName = parameter.Name; + if (!writers.WritersByName.TryGetValue(parameterName, out var writer)) + { + // Case 1: There is nowhere to put this value. + ThrowForUnknownIncomingParameterName(targetType, parameterName); + throw null; // Unreachable + } + + SetProperty(target, writer, parameterName, parameter.Value); + } + } + else + { + // Logic with components with a CaptureUnmatchedValues parameter + var isCaptureUnmatchedValuesParameterSetExplicitly = false; + Dictionary unmatched = null; + foreach (var parameter in parameterCollection) + { + var parameterName = parameter.Name; + if (string.Equals(parameterName, writers.CaptureUnmatchedValuesPropertyName, StringComparison.OrdinalIgnoreCase)) + { + isCaptureUnmatchedValuesParameterSetExplicitly = true; + } + + var isUnmatchedValue = !writers.WritersByName.TryGetValue(parameterName, out var writer); + if (isUnmatchedValue) + { + unmatched ??= new Dictionary(StringComparer.OrdinalIgnoreCase); + unmatched[parameterName] = parameter.Value; + } + else + { + Debug.Assert(writer != null); + SetProperty(target, writer, parameterName, parameter.Value); + } } + if (unmatched != null && isCaptureUnmatchedValuesParameterSetExplicitly) + { + // This has to be an error because we want to allow users to set the CaptureUnmatchedValues + // parameter explicitly and .... + // 1. We don't ever want to mutate a value the user gives us. + // 2. We also don't want to implicitly copy a value the user gives us. + // + // Either one of those implementation choices would do something unexpected. + ThrowForCaptureUnmatchedValuesConflict(targetType, writers.CaptureUnmatchedValuesPropertyName, unmatched); + throw null; // Unreachable + } + else if (unmatched != null) + { + // We had some unmatched values, set the CaptureUnmatchedValues property + SetProperty(target, writers.CaptureUnmatchedValuesWriter, writers.CaptureUnmatchedValuesPropertyName, unmatched); + } + } + + static void SetProperty(object target, IPropertySetter writer, string parameterName, object value) + { try { - writerWithIndex.SetValue(target, parameter.Value); + writer.SetValue(target, value); } catch (Exception ex) { @@ -93,18 +150,49 @@ namespace Microsoft.AspNetCore.Components } } - class WritersForType + private static void ThrowForCaptureUnmatchedValuesConflict(Type targetType, string parameterName, Dictionary unmatched) { - public Dictionary WritersByName { get; } + throw new InvalidOperationException( + $"The property '{parameterName}' on component type '{targetType.FullName}' cannot be set explicitly " + + $"when also used to capture unmatched values. Unmatched values:" + Environment.NewLine + + string.Join(Environment.NewLine, unmatched.Keys.OrderBy(k => k))); + } + private static void ThrowForMultipleCaptureUnmatchedValuesParameters(Type targetType) + { + // We don't care about perf here, we want to report an accurate and useful error. + var propertyNames = targetType + .GetProperties(_bindablePropertyFlags) + .Where(p => p.GetCustomAttribute()?.CaptureUnmatchedValues == true) + .Select(p => p.Name) + .OrderBy(p => p) + .ToArray(); + + throw new InvalidOperationException( + $"Multiple properties were found on component type '{targetType.FullName}' with " + + $"'{nameof(ParameterAttribute)}.{nameof(ParameterAttribute.CaptureUnmatchedValues)}'. Only a single property " + + $"per type can use '{nameof(ParameterAttribute)}.{nameof(ParameterAttribute.CaptureUnmatchedValues)}'. Properties:" + Environment.NewLine + + string.Join(Environment.NewLine, propertyNames)); + } + + private static void ThrowForInvalidCaptureUnmatchedValuesParameterType(Type targetType, PropertyInfo propertyInfo) + { + throw new InvalidOperationException( + $"The property '{propertyInfo.Name}' on component type '{targetType.FullName}' cannot be used " + + $"with '{nameof(ParameterAttribute)}.{nameof(ParameterAttribute.CaptureUnmatchedValues)}' because it has the wrong type. " + + $"The property must be assignable from 'Dictionary'."); + } + + private class WritersForType + { public WritersForType(Type targetType) { WritersByName = new Dictionary(StringComparer.OrdinalIgnoreCase); foreach (var propertyInfo in GetCandidateBindableProperties(targetType)) { - var shouldCreateWriter = propertyInfo.IsDefined(typeof(ParameterAttribute)) - || propertyInfo.IsDefined(typeof(CascadingParameterAttribute)); - if (!shouldCreateWriter) + var parameterAttribute = propertyInfo.GetCustomAttribute(); + var isParameter = parameterAttribute != null || propertyInfo.IsDefined(typeof(CascadingParameterAttribute)); + if (!isParameter) { continue; } @@ -120,8 +208,34 @@ namespace Microsoft.AspNetCore.Components } WritersByName.Add(propertyName, propertySetter); + + if (parameterAttribute != null && parameterAttribute.CaptureUnmatchedValues) + { + // This is an "Extra" parameter. + // + // There should only be one of these. + if (CaptureUnmatchedValuesWriter != null) + { + ThrowForMultipleCaptureUnmatchedValuesParameters(targetType); + } + + // It must be able to hold a Dictionary since that's what we create. + if (!propertyInfo.PropertyType.IsAssignableFrom(typeof(Dictionary))) + { + ThrowForInvalidCaptureUnmatchedValuesParameterType(targetType, propertyInfo); + } + + CaptureUnmatchedValuesWriter = MemberAssignment.CreatePropertySetter(targetType, propertyInfo); + CaptureUnmatchedValuesPropertyName = propertyInfo.Name; + } } } + + public Dictionary WritersByName { get; } + + public IPropertySetter CaptureUnmatchedValuesWriter { get; } + + public string CaptureUnmatchedValuesPropertyName { get; } } } } diff --git a/src/Components/Components/src/RenderTree/ArrayBuilder.cs b/src/Components/Components/src/RenderTree/ArrayBuilder.cs index 918766aee9..6d38c95b32 100644 --- a/src/Components/Components/src/RenderTree/ArrayBuilder.cs +++ b/src/Components/Components/src/RenderTree/ArrayBuilder.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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; diff --git a/src/Components/Components/src/RenderTree/RenderTreeBuilder.cs b/src/Components/Components/src/RenderTree/RenderTreeBuilder.cs index 78a174885b..79290f8e07 100644 --- a/src/Components/Components/src/RenderTree/RenderTreeBuilder.cs +++ b/src/Components/Components/src/RenderTree/RenderTreeBuilder.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Threading.Tasks; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Rendering; @@ -27,6 +28,8 @@ namespace Microsoft.AspNetCore.Components.RenderTree private readonly ArrayBuilder _entries = new ArrayBuilder(10); private readonly Stack _openElementIndices = new Stack(); private RenderTreeFrameType? _lastNonAttributeFrameType; + private bool _hasSeenAddMultipleAttributes; + private Dictionary _seenAttributeNames; /// /// The reserved parameter name used for supplying child content. @@ -52,6 +55,14 @@ namespace Microsoft.AspNetCore.Components.RenderTree /// A value representing the type of the element. public void OpenElement(int sequence, string elementName) { + // We are entering a new scope, since we track the "duplicate attributes" per + // element/component we might need to clean them up now. + if (_hasSeenAddMultipleAttributes) + { + var indexOfLastElementOrComponent = _openElementIndices.Peek(); + ProcessDuplicateAttributes(first: indexOfLastElementOrComponent + 1); + } + _openElementIndices.Push(_entries.Count); Append(RenderTreeFrame.Element(sequence, elementName)); } @@ -63,6 +74,14 @@ namespace Microsoft.AspNetCore.Components.RenderTree public void CloseElement() { var indexOfEntryBeingClosed = _openElementIndices.Pop(); + + // We might be closing an element with only attributes, run the duplicate cleanup pass + // if necessary. + if (_hasSeenAddMultipleAttributes) + { + ProcessDuplicateAttributes(first: indexOfEntryBeingClosed + 1); + } + ref var entry = ref _entries.Buffer[indexOfEntryBeingClosed]; entry = entry.WithElementSubtreeLength(_entries.Count - indexOfEntryBeingClosed); } @@ -157,6 +176,10 @@ namespace Microsoft.AspNetCore.Components.RenderTree // or absence of an attribute, and false => "False" which isn't falsy in js. Append(RenderTreeFrame.Attribute(sequence, name, BoxedTrue)); } + else + { + TrackAttributeName(name); + } } /// @@ -178,6 +201,10 @@ namespace Microsoft.AspNetCore.Components.RenderTree { Append(RenderTreeFrame.Attribute(sequence, name, value)); } + else + { + TrackAttributeName(name); + } } /// @@ -275,6 +302,10 @@ namespace Microsoft.AspNetCore.Components.RenderTree { Append(RenderTreeFrame.Attribute(sequence, name, value)); } + else + { + TrackAttributeName(name); + } } /// @@ -308,12 +339,17 @@ namespace Microsoft.AspNetCore.Components.RenderTree // so we can get it out on the other side. Append(RenderTreeFrame.Attribute(sequence, name, (object)value)); } - else + else if (value.HasDelegate) { // In the common case the receiver is also the delegate's target, so we // just need to retain the delegate. This allows us to avoid an allocation. Append(RenderTreeFrame.Attribute(sequence, name, value.Delegate)); } + else + { + // Track the attribute name if needed since we elided the frame. + TrackAttributeName(name); + } } /// @@ -347,12 +383,17 @@ namespace Microsoft.AspNetCore.Components.RenderTree // need to preserve the type of an EventCallback when it's invoked from the DOM. Append(RenderTreeFrame.Attribute(sequence, name, (object)value.AsUntyped())); } - else + else if (value.HasDelegate) { // In the common case the receiver is also the delegate's target, so we // just need to retain the delegate. This allows us to avoid an allocation. Append(RenderTreeFrame.Attribute(sequence, name, value.Delegate)); } + else + { + // Track the attribute name if needed since we elided the frame. + TrackAttributeName(name); + } } /// @@ -372,7 +413,8 @@ namespace Microsoft.AspNetCore.Components.RenderTree { if (value == null) { - // Do nothing, treat 'null' attribute values for elements as a conditional attribute. + // Treat 'null' attribute values for elements as a conditional attribute. + TrackAttributeName(name); } else if (value is bool boolValue) { @@ -380,8 +422,22 @@ namespace Microsoft.AspNetCore.Components.RenderTree { Append(RenderTreeFrame.Attribute(sequence, name, BoxedTrue)); } - - // Don't add anything for false bool value. + else + { + // Don't add anything for false bool value. + TrackAttributeName(name); + } + } + else if (value is IEventCallback callbackValue) + { + if (callbackValue.HasDelegate) + { + Append(RenderTreeFrame.Attribute(sequence, name, callbackValue.UnpackForRenderTree())); + } + else + { + TrackAttributeName(name); + } } else if (value is MulticastDelegate) { @@ -395,6 +451,7 @@ namespace Microsoft.AspNetCore.Components.RenderTree } else if (_lastNonAttributeFrameType == RenderTreeFrameType.Component) { + // If this is a component, we always want to preserve the original type. Append(RenderTreeFrame.Attribute(sequence, name, value)); } else @@ -425,6 +482,40 @@ namespace Microsoft.AspNetCore.Components.RenderTree Append(frame.WithAttributeSequence(sequence)); } + /// + /// Adds frames representing multiple attributes with the same sequence number. + /// + /// The attribute value type. + /// An integer that represents the position of the instruction in the source code. + /// A collection of key-value pairs representing attributes. + public void AddMultipleAttributes(int sequence, IEnumerable> attributes) + { + // NOTE: The IEnumerable> is the simplest way to support a variety of + // different types like IReadOnlyDictionary<>, Dictionary<>, and IDictionary<>. + // + // None of those types are contravariant, and since we want to support attributes having a value + // of type object, the simplest thing to do is drop down to IEnumerable> which + // is contravariant. This also gives us things like List> and KeyValuePair<>[] + // for free even though we don't expect those types to be common. + + // Calling this up-front just to make sure we validate before mutating anything. + AssertCanAddAttribute(); + + if (attributes != null) + { + _hasSeenAddMultipleAttributes = true; + + foreach (var attribute in attributes) + { + // This will call the AddAttribute(int, string, object) overload. + // + // This is fine because we try to make the object overload behave identically + // to the others. + AddAttribute(sequence, attribute.Key, attribute.Value); + } + } + } + /// /// Appends a frame representing a child component. /// @@ -482,6 +573,14 @@ namespace Microsoft.AspNetCore.Components.RenderTree private void OpenComponentUnchecked(int sequence, Type componentType) { + // We are entering a new scope, since we track the "duplicate attributes" per + // element/component we might need to clean them up now. + if (_hasSeenAddMultipleAttributes) + { + var indexOfLastElementOrComponent = _openElementIndices.Peek(); + ProcessDuplicateAttributes(first: indexOfLastElementOrComponent + 1); + } + _openElementIndices.Push(_entries.Count); Append(RenderTreeFrame.ChildComponent(sequence, componentType)); } @@ -493,6 +592,14 @@ namespace Microsoft.AspNetCore.Components.RenderTree public void CloseComponent() { var indexOfEntryBeingClosed = _openElementIndices.Pop(); + + // We might be closing a component with only attributes. Run the attribute cleanup pass + // if necessary. + if (_hasSeenAddMultipleAttributes) + { + ProcessDuplicateAttributes(first: indexOfEntryBeingClosed + 1); + } + ref var entry = ref _entries.Buffer[indexOfEntryBeingClosed]; entry = entry.WithComponentSubtreeLength(_entries.Count - indexOfEntryBeingClosed); } @@ -579,6 +686,8 @@ namespace Microsoft.AspNetCore.Components.RenderTree _entries.Clear(); _openElementIndices.Clear(); _lastNonAttributeFrameType = null; + _hasSeenAddMultipleAttributes = false; + _seenAttributeNames?.Clear(); } /// @@ -590,13 +699,111 @@ namespace Microsoft.AspNetCore.Components.RenderTree private void Append(in RenderTreeFrame frame) { + var frameType = frame.FrameType; _entries.Append(frame); - var frameType = frame.FrameType; if (frameType != RenderTreeFrameType.Attribute) { _lastNonAttributeFrameType = frame.FrameType; } } + + // Internal for testing + internal void ProcessDuplicateAttributes(int first) + { + Debug.Assert(_hasSeenAddMultipleAttributes); + + // When AddMultipleAttributes method has been called, we need to postprocess attributes while closing + // the element/component. However, we also don't know the end index we should look at because it + // will contain nested content. + var buffer = _entries.Buffer; + var last = _entries.Count - 1; + + for (var i = first; i <= last; i++) + { + if (buffer[i].FrameType != RenderTreeFrameType.Attribute) + { + last = i - 1; + break; + } + } + + // Now that we've found the last attribute, we can iterate backwards and process duplicates. + var seenAttributeNames = (_seenAttributeNames ??= new Dictionary(StringComparer.OrdinalIgnoreCase)); + for (var i = last; i >= first; i--) + { + ref var frame = ref buffer[i]; + Debug.Assert(frame.FrameType == RenderTreeFrameType.Attribute, $"Frame type is {frame.FrameType} at {i}"); + + if (!seenAttributeNames.TryGetValue(frame.AttributeName, out var index)) + { + // This is the first time seeing this attribute name. Add to the dictionary and move on. + seenAttributeNames.Add(frame.AttributeName, i); + } + else if (index < i) + { + // This attribute is overriding a "silent frame" where we didn't create a frame for an AddAttribute call. + // This is the case for a null event handler, or bool false value. + // + // We need to update our tracking, in case the attribute appeared 3 or more times. + seenAttributeNames[frame.AttributeName] = i; + } + else if (index > i) + { + // This attribute has been overridden. For now, blank out its name to *mark* it. We'll do a pass + // later to wipe it out. + frame = default; + } + else + { + // OK so index == i. How is that possible? Well it's possible for a "silent frame" immediately + // followed by setting the same attribute. Think of it this way, when we create a "silent frame" + // we have to track that attribute name with *some* index. + // + // The only index value we can safely use is _entries.Count (next available). This is fine because + // we never use these indexes to look stuff up, only for comparison. + // + // That gets you here, and there's no action to take. + } + } + + // This is the pass where we cleanup attributes that have been wiped out. + // + // We copy the entries we're keeping into the earlier parts of the list (preserving order). + // + // Note that we iterate to the end of the list here, there might be additional frames after the attributes + // (ref) or content) that need to move to the left. + var offset = first; + for (var i = first; i < _entries.Count; i++) + { + ref var frame = ref buffer[i]; + if (frame.FrameType != RenderTreeFrameType.None) + { + buffer[offset++] = frame; + } + } + + // Clean up now unused space at the end of the list. + var residue = _entries.Count - offset; + for (var i = 0; i < residue; i++) + { + _entries.RemoveLast(); + } + + seenAttributeNames.Clear(); + _hasSeenAddMultipleAttributes = false; + } + + // Internal for testing + internal void TrackAttributeName(string name) + { + if (!_hasSeenAddMultipleAttributes) + { + return; + } + + var seenAttributeNames = (_seenAttributeNames ??= new Dictionary(StringComparer.OrdinalIgnoreCase)); + seenAttributeNames[name] = _entries.Count; // See comment in ProcessAttributes for why this is OK. + } } } diff --git a/src/Components/Components/src/RenderTree/RenderTreeFrameType.cs b/src/Components/Components/src/RenderTree/RenderTreeFrameType.cs index 799185e202..09630e3fcf 100644 --- a/src/Components/Components/src/RenderTree/RenderTreeFrameType.cs +++ b/src/Components/Components/src/RenderTree/RenderTreeFrameType.cs @@ -8,6 +8,11 @@ namespace Microsoft.AspNetCore.Components.RenderTree /// public enum RenderTreeFrameType: int { + /// + /// Used only for unintialized frames. + /// + None = 0, + /// /// Represents a container for other frames. /// diff --git a/src/Components/Components/src/Rendering/RendererSynchronizationContext.cs b/src/Components/Components/src/Rendering/RendererSynchronizationContext.cs index 9a235b791f..4a97329fe1 100644 --- a/src/Components/Components/src/Rendering/RendererSynchronizationContext.cs +++ b/src/Components/Components/src/Rendering/RendererSynchronizationContext.cs @@ -39,12 +39,13 @@ namespace Microsoft.AspNetCore.Components.Rendering public Task Invoke(Action action) { - var completion = new TaskCompletionSource(); - Post(_ => + var completion = new RendererSynchronizationTaskCompletionSource(action); + ExecuteSynchronouslyIfPossible((state) => { + var completion = (RendererSynchronizationTaskCompletionSource)state; try { - action(); + completion.Callback(); completion.SetResult(null); } catch (OperationCanceledException) @@ -55,19 +56,20 @@ namespace Microsoft.AspNetCore.Components.Rendering { completion.SetException(exception); } - }, null); + }, completion); return completion.Task; } public Task InvokeAsync(Func asyncAction) { - var completion = new TaskCompletionSource(); - Post(async (_) => + var completion = new RendererSynchronizationTaskCompletionSource, object>(asyncAction); + ExecuteSynchronouslyIfPossible(async (state) => { + var completion = (RendererSynchronizationTaskCompletionSource, object>)state; try { - await asyncAction(); + await completion.Callback(); completion.SetResult(null); } catch (OperationCanceledException) @@ -78,19 +80,20 @@ namespace Microsoft.AspNetCore.Components.Rendering { completion.SetException(exception); } - }, null); + }, completion); return completion.Task; } public Task Invoke(Func function) { - var completion = new TaskCompletionSource(); - Post(_ => + var completion = new RendererSynchronizationTaskCompletionSource, TResult>(function); + ExecuteSynchronouslyIfPossible((state) => { + var completion = (RendererSynchronizationTaskCompletionSource, TResult>)state; try { - var result = function(); + var result = completion.Callback(); completion.SetResult(result); } catch (OperationCanceledException) @@ -101,19 +104,20 @@ namespace Microsoft.AspNetCore.Components.Rendering { completion.SetException(exception); } - }, null); + }, completion); return completion.Task; } public Task InvokeAsync(Func> asyncFunction) { - var completion = new TaskCompletionSource(); - Post(async (_) => + var completion = new RendererSynchronizationTaskCompletionSource>, TResult>(asyncFunction); + ExecuteSynchronouslyIfPossible(async (state) => { + var completion = (RendererSynchronizationTaskCompletionSource>, TResult>)state; try { - var result = await asyncFunction(); + var result = await completion.Callback(); completion.SetResult(result); } catch (OperationCanceledException) @@ -124,30 +128,20 @@ namespace Microsoft.AspNetCore.Components.Rendering { completion.SetException(exception); } - }, null); + }, completion); return completion.Task; } // asynchronously runs the callback + // + // NOTE: this must always run async. It's not legal here to execute the work item synchronously. public override void Post(SendOrPostCallback d, object state) { - TaskCompletionSource completion; lock (_state.Lock) { - if (!_state.Task.IsCompleted) - { - _state.Task = Enqueue(_state.Task, d, state); - return; - } - - // We can execute this synchronously because nothing is currently running - // or queued. - completion = new TaskCompletionSource(); - _state.Task = completion.Task; + _state.Task = Enqueue(_state.Task, d, state, forceAsync: true); } - - ExecuteSynchronously(completion, d, state); } // synchronously runs the callback @@ -177,10 +171,33 @@ namespace Microsoft.AspNetCore.Components.Rendering return new RendererSynchronizationContext(_state); } - private Task Enqueue(Task antecedant, SendOrPostCallback d, object state) + // Similar to Post, but it can runs the work item synchronously if the context is not busy. + // + // This is the main code path used by components, we want to be able to run async work but only dispatch + // if necessary. + private void ExecuteSynchronouslyIfPossible(SendOrPostCallback d, object state) { - // If we get here is means that a callback is being queued while something is currently executing - // in this context. Let's instead add it to the queue and yield. + TaskCompletionSource completion; + lock (_state.Lock) + { + if (!_state.Task.IsCompleted) + { + _state.Task = Enqueue(_state.Task, d, state); + return; + } + + // We can execute this synchronously because nothing is currently running + // or queued. + completion = new TaskCompletionSource(); + _state.Task = completion.Task; + } + + ExecuteSynchronously(completion, d, state); + } + + private Task Enqueue(Task antecedant, SendOrPostCallback d, object state, bool forceAsync = false) + { + // If we get here is means that a callback is being explicitly queued. Let's instead add it to the queue and yield. // // We use our own queue here to maintain the execution order of the callbacks scheduled here. Also // we need a queue rather than just scheduling an item in the thread pool - those items would immediately @@ -194,13 +211,14 @@ namespace Microsoft.AspNetCore.Components.Rendering executionContext = ExecutionContext.Capture(); } + var flags = forceAsync ? TaskContinuationOptions.RunContinuationsAsynchronously : TaskContinuationOptions.None; return antecedant.ContinueWith(BackgroundWorkThunk, new WorkItem() { SynchronizationContext = this, ExecutionContext = executionContext, Callback = d, State = state, - }, CancellationToken.None, TaskContinuationOptions.None, TaskScheduler.Current); + }, CancellationToken.None, flags, TaskScheduler.Current); } private void ExecuteSynchronously( @@ -280,5 +298,15 @@ namespace Microsoft.AspNetCore.Components.Rendering public SendOrPostCallback Callback; public object State; } + + private class RendererSynchronizationTaskCompletionSource : TaskCompletionSource + { + public RendererSynchronizationTaskCompletionSource(TCallback callback) + { + Callback = callback; + } + + public TCallback Callback { get; } + } } } diff --git a/src/Components/Components/src/Routing/Router.cs b/src/Components/Components/src/Routing/Router.cs index 88c781bbc7..e8060708f4 100644 --- a/src/Components/Components/src/Routing/Router.cs +++ b/src/Components/Components/src/Routing/Router.cs @@ -40,6 +40,16 @@ namespace Microsoft.AspNetCore.Components.Routing /// [Parameter] public RenderFragment NotFoundContent { get; private set; } + /// + /// The content that will be displayed if the user is not authorized. + /// + [Parameter] public RenderFragment NotAuthorizedContent { get; private set; } + + /// + /// The content that will be displayed while asynchronous authorization is in progress. + /// + [Parameter] public RenderFragment AuthorizingContent { get; private set; } + private RouteTable Routes { get; set; } /// @@ -78,9 +88,11 @@ namespace Microsoft.AspNetCore.Components.Routing /// protected virtual void Render(RenderTreeBuilder builder, Type handler, IDictionary parameters) { - builder.OpenComponent(0, typeof(LayoutDisplay)); - builder.AddAttribute(1, LayoutDisplay.NameOfPage, handler); - builder.AddAttribute(2, LayoutDisplay.NameOfPageParameters, parameters); + builder.OpenComponent(0, typeof(PageDisplay)); + builder.AddAttribute(1, nameof(PageDisplay.Page), handler); + builder.AddAttribute(2, nameof(PageDisplay.PageParameters), parameters); + builder.AddAttribute(3, nameof(PageDisplay.NotAuthorizedContent), NotAuthorizedContent); + builder.AddAttribute(4, nameof(PageDisplay.AuthorizingContent), AuthorizingContent); builder.CloseComponent(); } diff --git a/src/Components/Components/test/Auth/AuthorizeViewTest.cs b/src/Components/Components/test/Auth/AuthorizeViewTest.cs index 3039cca28e..36a83cd935 100644 --- a/src/Components/Components/test/Auth/AuthorizeViewTest.cs +++ b/src/Components/Components/test/Auth/AuthorizeViewTest.cs @@ -2,23 +2,34 @@ // 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.Diagnostics; using System.Linq; using System.Security.Claims; using System.Security.Principal; +using System.Threading; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Authorization.Infrastructure; using Microsoft.AspNetCore.Components.RenderTree; using Microsoft.AspNetCore.Components.Test.Helpers; +using Microsoft.Extensions.DependencyInjection; using Xunit; namespace Microsoft.AspNetCore.Components { public class AuthorizeViewTest { + // Nothing should exceed the timeout in a successful run of the the tests, this is just here to catch + // failures. + private static readonly TimeSpan Timeout = Debugger.IsAttached ? System.Threading.Timeout.InfiniteTimeSpan : TimeSpan.FromSeconds(10); + [Fact] public void RendersNothingIfNotAuthorized() { // Arrange - var renderer = new TestRenderer(); + var authorizationService = new TestAuthorizationService(); + var renderer = CreateTestRenderer(authorizationService); var rootComponent = WrapInAuthorizeView( childContent: context => builder => builder.AddContent(0, "This should not be rendered")); @@ -30,18 +41,27 @@ namespace Microsoft.AspNetCore.Components // Assert var diff = renderer.Batches.Single().GetComponentDiffs().Single(); Assert.Empty(diff.Edits); + + // Assert: The IAuthorizationService was given expected criteria + Assert.Collection(authorizationService.AuthorizeCalls, call => + { + Assert.Null(call.user.Identity); + Assert.Null(call.resource); + Assert.Collection(call.requirements, + req => Assert.IsType(req)); + }); } [Fact] public void RendersNotAuthorizedContentIfNotAuthorized() { // Arrange - var renderer = new TestRenderer(); + var authorizationService = new TestAuthorizationService(); + var renderer = CreateTestRenderer(authorizationService); var rootComponent = WrapInAuthorizeView( - childContent: - context => builder => builder.AddContent(0, "This should not be rendered"), notAuthorizedContent: - builder => builder.AddContent(0, "You are not authorized")); + context => builder => builder.AddContent(0, $"You are not authorized, even though we know you are {context.User.Identity.Name}")); + rootComponent.AuthenticationState = CreateAuthenticationState("Nellie"); // Act renderer.AssignRootComponentId(rootComponent); @@ -54,7 +74,16 @@ namespace Microsoft.AspNetCore.Components Assert.Equal(RenderTreeEditType.PrependFrame, edit.Type); AssertFrame.Text( renderer.Batches.Single().ReferenceFrames[edit.ReferenceFrameIndex], - "You are not authorized"); + "You are not authorized, even though we know you are Nellie"); + }); + + // Assert: The IAuthorizationService was given expected criteria + Assert.Collection(authorizationService.AuthorizeCalls, call => + { + Assert.Equal("Nellie", call.user.Identity.Name); + Assert.Null(call.resource); + Assert.Collection(call.requirements, + req => Assert.IsType(req)); }); } @@ -62,7 +91,9 @@ namespace Microsoft.AspNetCore.Components public void RendersNothingIfAuthorizedButNoChildContentOrAuthorizedContentProvided() { // Arrange - var renderer = new TestRenderer(); + var authorizationService = new TestAuthorizationService(); + authorizationService.NextResult = AuthorizationResult.Success(); + var renderer = CreateTestRenderer(authorizationService); var rootComponent = WrapInAuthorizeView(); rootComponent.AuthenticationState = CreateAuthenticationState("Nellie"); @@ -73,13 +104,24 @@ namespace Microsoft.AspNetCore.Components // Assert var diff = renderer.Batches.Single().GetComponentDiffs().Single(); Assert.Empty(diff.Edits); + + // Assert: The IAuthorizationService was given expected criteria + Assert.Collection(authorizationService.AuthorizeCalls, call => + { + Assert.Equal("Nellie", call.user.Identity.Name); + Assert.Null(call.resource); + Assert.Collection(call.requirements, + req => Assert.IsType(req)); + }); } [Fact] public void RendersChildContentIfAuthorized() { // Arrange - var renderer = new TestRenderer(); + var authorizationService = new TestAuthorizationService(); + authorizationService.NextResult = AuthorizationResult.Success(); + var renderer = CreateTestRenderer(authorizationService); var rootComponent = WrapInAuthorizeView( childContent: context => builder => builder.AddContent(0, $"You are authenticated as {context.User.Identity.Name}")); @@ -98,13 +140,24 @@ namespace Microsoft.AspNetCore.Components renderer.Batches.Single().ReferenceFrames[edit.ReferenceFrameIndex], "You are authenticated as Nellie"); }); + + // Assert: The IAuthorizationService was given expected criteria + Assert.Collection(authorizationService.AuthorizeCalls, call => + { + Assert.Equal("Nellie", call.user.Identity.Name); + Assert.Null(call.resource); + Assert.Collection(call.requirements, + req => Assert.IsType(req)); + }); } [Fact] public void RendersAuthorizedContentIfAuthorized() { // Arrange - var renderer = new TestRenderer(); + var authorizationService = new TestAuthorizationService(); + authorizationService.NextResult = AuthorizationResult.Success(); + var renderer = CreateTestRenderer(authorizationService); var rootComponent = WrapInAuthorizeView( authorizedContent: context => builder => builder.AddContent(0, $"You are authenticated as {context.User.Identity.Name}")); @@ -123,13 +176,24 @@ namespace Microsoft.AspNetCore.Components renderer.Batches.Single().ReferenceFrames[edit.ReferenceFrameIndex], "You are authenticated as Nellie"); }); + + // Assert: The IAuthorizationService was given expected criteria + Assert.Collection(authorizationService.AuthorizeCalls, call => + { + Assert.Equal("Nellie", call.user.Identity.Name); + Assert.Null(call.resource); + Assert.Collection(call.requirements, + req => Assert.IsType(req)); + }); } [Fact] public void RespondsToChangeInAuthorizationState() { // Arrange - var renderer = new TestRenderer(); + var authorizationService = new TestAuthorizationService(); + authorizationService.NextResult = AuthorizationResult.Success(); + var renderer = CreateTestRenderer(authorizationService); var rootComponent = WrapInAuthorizeView( childContent: context => builder => builder.AddContent(0, $"You are authenticated as {context.User.Identity.Name}")); @@ -141,6 +205,7 @@ namespace Microsoft.AspNetCore.Components rootComponent.TriggerRender(); var authorizeViewComponentId = renderer.Batches.Single() .GetComponentFrames().Single().ComponentId; + authorizationService.AuthorizeCalls.Clear(); // Act rootComponent.AuthenticationState = CreateAuthenticationState("Ronaldo"); @@ -158,13 +223,23 @@ namespace Microsoft.AspNetCore.Components batch.ReferenceFrames[edit.ReferenceFrameIndex], "You are authenticated as Ronaldo"); }); + + // Assert: The IAuthorizationService was given expected criteria + Assert.Collection(authorizationService.AuthorizeCalls, call => + { + Assert.Equal("Ronaldo", call.user.Identity.Name); + Assert.Null(call.resource); + Assert.Collection(call.requirements, + req => Assert.IsType(req)); + }); } [Fact] public void ThrowsIfBothChildContentAndAuthorizedContentProvided() { // Arrange - var renderer = new TestRenderer(); + var authorizationService = new TestAuthorizationService(); + var renderer = CreateTestRenderer(authorizationService); var rootComponent = WrapInAuthorizeView( authorizedContent: context => builder => { }, childContent: context => builder => { }); @@ -173,16 +248,20 @@ namespace Microsoft.AspNetCore.Components renderer.AssignRootComponentId(rootComponent); var ex = Assert.Throws(() => rootComponent.TriggerRender()); - Assert.Equal("When using AuthorizeView, do not specify both 'Authorized' and 'ChildContent'.", ex.Message); + Assert.Equal("Do not specify both 'Authorized' and 'ChildContent'.", ex.Message); } [Fact] public void RendersNothingUntilAuthorizationCompleted() { // Arrange - var renderer = new TestRenderer(); + var @event = new ManualResetEventSlim(); + var authorizationService = new TestAuthorizationService(); + var renderer = CreateTestRenderer(authorizationService); + renderer.OnUpdateDisplayComplete = () => { @event.Set(); }; var rootComponent = WrapInAuthorizeView( - notAuthorizedContent: builder => builder.AddContent(0, "You are not authorized")); + notAuthorizedContent: + context => builder => builder.AddContent(0, "You are not authorized")); var authTcs = new TaskCompletionSource(); rootComponent.AuthenticationState = authTcs.Task; @@ -195,7 +274,12 @@ namespace Microsoft.AspNetCore.Components Assert.Empty(diff1.Edits); // Act/Assert 2: Auth process completes asynchronously + @event.Reset(); authTcs.SetResult(new AuthenticationState(new ClaimsPrincipal())); + + // We need to wait here because the continuations of SetResult will be scheduled to run asynchronously. + @event.Wait(Timeout); + Assert.Equal(2, renderer.Batches.Count); var batch2 = renderer.Batches[1]; var diff2 = batch2.DiffsByComponentId[authorizeViewComponentId].Single(); @@ -212,7 +296,11 @@ namespace Microsoft.AspNetCore.Components public void RendersAuthorizingContentUntilAuthorizationCompleted() { // Arrange - var renderer = new TestRenderer(); + var @event = new ManualResetEventSlim(); + var authorizationService = new TestAuthorizationService(); + authorizationService.NextResult = AuthorizationResult.Success(); + var renderer = CreateTestRenderer(authorizationService); + renderer.OnUpdateDisplayComplete = () => { @event.Set(); }; var rootComponent = WrapInAuthorizeView( authorizingContent: builder => builder.AddContent(0, "Auth pending..."), authorizedContent: context => builder => builder.AddContent(0, $"Hello, {context.User.Identity.Name}!")); @@ -234,7 +322,12 @@ namespace Microsoft.AspNetCore.Components }); // Act/Assert 2: Auth process completes asynchronously + @event.Reset(); authTcs.SetResult(CreateAuthenticationState("Monsieur").Result); + + // We need to wait here because the continuations of SetResult will be scheduled to run asynchronously. + @event.Wait(Timeout); + Assert.Equal(2, renderer.Batches.Count); var batch2 = renderer.Batches[1]; var diff2 = batch2.DiffsByComponentId[authorizeViewComponentId].Single(); @@ -252,13 +345,96 @@ namespace Microsoft.AspNetCore.Components batch2.ReferenceFrames[edit.ReferenceFrameIndex], "Hello, Monsieur!"); }); + + // Assert: The IAuthorizationService was given expected criteria + Assert.Collection(authorizationService.AuthorizeCalls, call => + { + Assert.Equal("Monsieur", call.user.Identity.Name); + Assert.Null(call.resource); + Assert.Collection(call.requirements, + req => Assert.IsType(req)); + }); + } + + [Fact] + public void IncludesPolicyInAuthorizeCall() + { + // Arrange + var authorizationService = new TestAuthorizationService(); + var renderer = CreateTestRenderer(authorizationService); + var rootComponent = WrapInAuthorizeView(policy: "MyTestPolicy"); + rootComponent.AuthenticationState = CreateAuthenticationState("Nellie"); + + // Act + renderer.AssignRootComponentId(rootComponent); + rootComponent.TriggerRender(); + + // Assert + Assert.Collection(authorizationService.AuthorizeCalls, call => + { + Assert.Equal("Nellie", call.user.Identity.Name); + Assert.Null(call.resource); + Assert.Collection(call.requirements, + req => Assert.Equal("MyTestPolicy", ((TestPolicyRequirement)req).PolicyName)); + }); + } + + [Fact] + public void IncludesRolesInAuthorizeCall() + { + // Arrange + var authorizationService = new TestAuthorizationService(); + var renderer = CreateTestRenderer(authorizationService); + var rootComponent = WrapInAuthorizeView(roles: "SuperTestRole1, SuperTestRole2"); + rootComponent.AuthenticationState = CreateAuthenticationState("Nellie"); + + // Act + renderer.AssignRootComponentId(rootComponent); + rootComponent.TriggerRender(); + + // Assert + Assert.Collection(authorizationService.AuthorizeCalls, call => + { + Assert.Equal("Nellie", call.user.Identity.Name); + Assert.Null(call.resource); + Assert.Collection(call.requirements, req => Assert.Equal( + new[] { "SuperTestRole1", "SuperTestRole2" }, + ((RolesAuthorizationRequirement)req).AllowedRoles)); + }); + } + + [Fact] + public void IncludesResourceInAuthorizeCall() + { + // Arrange + var authorizationService = new TestAuthorizationService(); + var renderer = CreateTestRenderer(authorizationService); + var resource = new object(); + var rootComponent = WrapInAuthorizeView(resource: resource); + rootComponent.AuthenticationState = CreateAuthenticationState("Nellie"); + + // Act + renderer.AssignRootComponentId(rootComponent); + rootComponent.TriggerRender(); + + // Assert + Assert.Collection(authorizationService.AuthorizeCalls, call => + { + Assert.Equal("Nellie", call.user.Identity.Name); + Assert.Same(resource, call.resource); + Assert.Collection(call.requirements, req => + Assert.IsType(req)); + }); } private static TestAuthStateProviderComponent WrapInAuthorizeView( RenderFragment childContent = null, RenderFragment authorizedContent = null, - RenderFragment notAuthorizedContent = null, - RenderFragment authorizingContent = null) + RenderFragment notAuthorizedContent = null, + RenderFragment authorizingContent = null, + string policy = null, + string roles = null, + object resource = null) { return new TestAuthStateProviderComponent(builder => { @@ -267,6 +443,9 @@ namespace Microsoft.AspNetCore.Components builder.AddAttribute(2, nameof(AuthorizeView.Authorized), authorizedContent); builder.AddAttribute(3, nameof(AuthorizeView.NotAuthorized), notAuthorizedContent); builder.AddAttribute(4, nameof(AuthorizeView.Authorizing), authorizingContent); + builder.AddAttribute(5, nameof(AuthorizeView.Policy), policy); + builder.AddAttribute(6, nameof(AuthorizeView.Roles), roles); + builder.AddAttribute(7, nameof(AuthorizeView.Resource), resource); builder.CloseComponent(); }); } @@ -287,11 +466,31 @@ namespace Microsoft.AspNetCore.Components { builder.OpenComponent>>(0); builder.AddAttribute(1, nameof(CascadingValue>.Value), AuthenticationState); - builder.AddAttribute(2, RenderTreeBuilder.ChildContent, _childContent); + builder.AddAttribute(2, RenderTreeBuilder.ChildContent, (RenderFragment)(builder => + { + builder.OpenComponent(0); + builder.AddAttribute(1, RenderTreeBuilder.ChildContent, _childContent); + builder.CloseComponent(); + })); builder.CloseComponent(); } } + // This is useful to show that the reason why a CascadingValue refreshes is because the + // value itself changed, not just that we're re-rendering the entire tree and have to + // recurse into all descendants because we're passing ChildContent + class NeverReRenderComponent : ComponentBase + { + [Parameter] RenderFragment ChildContent { get; set; } + + protected override bool ShouldRender() => false; + + protected override void BuildRenderTree(RenderTreeBuilder builder) + { + builder.AddContent(0, ChildContent); + } + } + public static Task CreateAuthenticationState(string username) => Task.FromResult(new AuthenticationState( new ClaimsPrincipal(new TestIdentity { Name = username }))); @@ -304,5 +503,59 @@ namespace Microsoft.AspNetCore.Components public string Name { get; set; } } + + public TestRenderer CreateTestRenderer(IAuthorizationService authorizationService) + { + var serviceCollection = new ServiceCollection(); + serviceCollection.AddSingleton(authorizationService); + serviceCollection.AddSingleton(new TestAuthorizationPolicyProvider()); + return new TestRenderer(serviceCollection.BuildServiceProvider()); + } + + private class TestAuthorizationService : IAuthorizationService + { + public AuthorizationResult NextResult { get; set; } + = AuthorizationResult.Failed(); + + public List<(ClaimsPrincipal user, object resource, IEnumerable requirements)> AuthorizeCalls { get; } + = new List<(ClaimsPrincipal user, object resource, IEnumerable requirements)>(); + + public Task AuthorizeAsync(ClaimsPrincipal user, object resource, IEnumerable requirements) + { + AuthorizeCalls.Add((user, resource, requirements)); + + // The TestAuthorizationService doesn't actually apply any authorization requirements + // It just returns the specified NextResult, since we're not trying to test the logic + // in DefaultAuthorizationService or similar here. So it's up to tests to set a desired + // NextResult and assert that the expected criteria were passed by inspecting AuthorizeCalls. + return Task.FromResult(NextResult); + } + + public Task AuthorizeAsync(ClaimsPrincipal user, object resource, string policyName) + => throw new NotImplementedException(); + } + + private class TestAuthorizationPolicyProvider : IAuthorizationPolicyProvider + { + private readonly AuthorizationOptions options = new AuthorizationOptions(); + + public Task GetDefaultPolicyAsync() + => Task.FromResult(options.DefaultPolicy); + + public Task GetFallbackPolicyAsync() + => Task.FromResult(options.FallbackPolicy); + + public Task GetPolicyAsync(string policyName) => Task.FromResult( + new AuthorizationPolicy(new[] + { + new TestPolicyRequirement { PolicyName = policyName } + }, + new[] { $"TestScheme:{policyName}" })); + } + + public class TestPolicyRequirement : IAuthorizationRequirement + { + public string PolicyName { get; set; } + } } } diff --git a/src/Components/Components/test/ComponentBaseTest.cs b/src/Components/Components/test/ComponentBaseTest.cs index 15c2ae98c2..ba9c17f46b 100644 --- a/src/Components/Components/test/ComponentBaseTest.cs +++ b/src/Components/Components/test/ComponentBaseTest.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Diagnostics; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Components.RenderTree; @@ -12,6 +13,10 @@ namespace Microsoft.AspNetCore.Components.Test { public class ComponentBaseTest { + // Nothing should exceed the timeout in a successful run of the the tests, this is just here to catch + // failures. + private static readonly TimeSpan Timeout = Debugger.IsAttached ? System.Threading.Timeout.InfiniteTimeSpan : TimeSpan.FromSeconds(10); + [Fact] public void RunsOnInitWhenRendered() { @@ -178,7 +183,12 @@ namespace Microsoft.AspNetCore.Components.Test public async Task RendersAfterParametersSetAndInitAsyncTasksAreCompleted() { // Arrange - var renderer = new TestRenderer(); + var @event = new ManualResetEventSlim(); + + var renderer = new TestRenderer() + { + OnUpdateDisplayComplete = () => { @event.Set(); }, + }; var component = new TestComponent(); component.Counter = 1; @@ -197,10 +207,16 @@ namespace Microsoft.AspNetCore.Components.Test // A rendering should have happened after the synchronous execution of Init Assert.Single(renderer.Batches); + @event.Reset(); + // Completes task started by OnInitAsync component.Counter = 2; initTask.SetResult(true); + // We need to wait here, because the continuation from SetResult needs to be scheduled. + @event.Wait(Timeout); + @event.Reset(); + // Component should be rendered once, after set parameters Assert.Equal(2, renderer.Batches.Count); @@ -209,6 +225,7 @@ namespace Microsoft.AspNetCore.Components.Test parametersSetTask.SetResult(false); await renderTask; + Assert.True(@event.IsSet); // Component should be rendered again // after the async part of onparameterssetasync completes diff --git a/src/Components/Components/test/HttpClientJsonExtensionsTest.cs b/src/Components/Components/test/HttpClientJsonExtensionsTest.cs index 16494b795b..af3c918445 100644 --- a/src/Components/Components/test/HttpClientJsonExtensionsTest.cs +++ b/src/Components/Components/test/HttpClientJsonExtensionsTest.cs @@ -1,10 +1,10 @@ // 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 Microsoft.JSInterop; using System; using System.Net; using System.Net.Http; +using System.Text.Json.Serialization; using System.Threading; using System.Threading.Tasks; using Xunit; @@ -13,6 +13,11 @@ namespace Microsoft.AspNetCore.Components.Test { public class HttpClientJsonExtensionsTest { + private readonly JsonSerializerOptions _jsonSerializerOptions = new JsonSerializerOptions + { + PropertyNamingPolicy = JsonNamingPolicy.CamelCase, + }; + const string TestUri = "http://example.com/some/uri"; [Fact] @@ -69,7 +74,7 @@ namespace Microsoft.AspNetCore.Components.Test { Assert.Equal(httpMethod, req.Method); Assert.Equal(TestUri, req.RequestUri.AbsoluteUri); - Assert.Equal(Json.Serialize(requestContent), await ((StringContent)req.Content).ReadAsStringAsync()); + Assert.Equal(JsonSerializer.ToString(requestContent, _jsonSerializerOptions), await ((StringContent)req.Content).ReadAsStringAsync()); return CreateJsonResponse(HttpStatusCode.OK, new Person { Name = "Abc", @@ -101,7 +106,7 @@ namespace Microsoft.AspNetCore.Components.Test { Assert.Equal(httpMethod, req.Method); Assert.Equal(TestUri, req.RequestUri.AbsoluteUri); - Assert.Equal(Json.Serialize(requestContent), await ((StringContent)req.Content).ReadAsStringAsync()); + Assert.Equal(JsonSerializer.ToString(requestContent, _jsonSerializerOptions), await ((StringContent)req.Content).ReadAsStringAsync()); return new HttpResponseMessage(HttpStatusCode.BadGateway); })); @@ -115,7 +120,7 @@ namespace Microsoft.AspNetCore.Components.Test { return new HttpResponseMessage(statusCode) { - Content = new StringContent(Json.Serialize(content)) + Content = new StringContent(JsonSerializer.ToString(content, _jsonSerializerOptions)) }; } diff --git a/src/Components/Components/test/LayoutTest.cs b/src/Components/Components/test/PageDisplayTest.cs similarity index 86% rename from src/Components/Components/test/LayoutTest.cs rename to src/Components/Components/test/PageDisplayTest.cs index 9439068bd8..f2b64a7001 100644 --- a/src/Components/Components/test/LayoutTest.cs +++ b/src/Components/Components/test/PageDisplayTest.cs @@ -11,26 +11,26 @@ using Xunit; namespace Microsoft.AspNetCore.Components.Test { - public class LayoutTest + public class PageDisplayTest { private TestRenderer _renderer = new TestRenderer(); - private LayoutDisplay _layoutDisplayComponent = new LayoutDisplay(); - private int _layoutDisplayComponentId; + private PageDisplay _pageDisplayComponent = new PageDisplay(); + private int _pageDisplayComponentId; - public LayoutTest() + public PageDisplayTest() { _renderer = new TestRenderer(); - _layoutDisplayComponent = new LayoutDisplay(); - _layoutDisplayComponentId = _renderer.AssignRootComponentId(_layoutDisplayComponent); + _pageDisplayComponent = new PageDisplay(); + _pageDisplayComponentId = _renderer.AssignRootComponentId(_pageDisplayComponent); } [Fact] public void DisplaysComponentInsideLayout() { // Arrange/Act - _renderer.Invoke(() => _layoutDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary + _renderer.Invoke(() => _pageDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary { - { LayoutDisplay.NameOfPage, typeof(ComponentWithLayout) } + { nameof(PageDisplay.Page), typeof(ComponentWithLayout) } }))); // Assert @@ -85,9 +85,9 @@ namespace Microsoft.AspNetCore.Components.Test public void DisplaysComponentInsideNestedLayout() { // Arrange/Act - _renderer.Invoke(() => _layoutDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary + _renderer.Invoke(() => _pageDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary { - { LayoutDisplay.NameOfPage, typeof(ComponentWithNestedLayout) } + { nameof(PageDisplay.Page), typeof(ComponentWithNestedLayout) } }))); // Assert @@ -112,15 +112,15 @@ namespace Microsoft.AspNetCore.Components.Test public void CanChangeDisplayedPageWithSameLayout() { // Arrange - _renderer.Invoke(() => _layoutDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary + _renderer.Invoke(() => _pageDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary { - { LayoutDisplay.NameOfPage, typeof(ComponentWithLayout) } + { nameof(PageDisplay.Page), typeof(ComponentWithLayout) } }))); // Act - _renderer.Invoke(() => _layoutDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary + _renderer.Invoke(() => _pageDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary { - { LayoutDisplay.NameOfPage, typeof(DifferentComponentWithLayout) } + { nameof(PageDisplay.Page), typeof(DifferentComponentWithLayout) } }))); // Assert @@ -163,15 +163,15 @@ namespace Microsoft.AspNetCore.Components.Test public void CanChangeDisplayedPageWithDifferentLayout() { // Arrange - _renderer.Invoke(() => _layoutDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary + _renderer.Invoke(() => _pageDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary { - { LayoutDisplay.NameOfPage, typeof(ComponentWithLayout) } + { nameof(PageDisplay.Page), typeof(ComponentWithLayout) } }))); // Act - _renderer.Invoke(() => _layoutDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary + _renderer.Invoke(() => _pageDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary { - { LayoutDisplay.NameOfPage, typeof(ComponentWithNestedLayout) } + { nameof(PageDisplay.Page), typeof(ComponentWithNestedLayout) } }))); // Assert diff --git a/src/Components/Components/test/ParameterCollectionAssignmentExtensionsTest.cs b/src/Components/Components/test/ParameterCollectionAssignmentExtensionsTest.cs index 44c58dd4d6..7193081888 100644 --- a/src/Components/Components/test/ParameterCollectionAssignmentExtensionsTest.cs +++ b/src/Components/Components/test/ParameterCollectionAssignmentExtensionsTest.cs @@ -4,8 +4,8 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.RenderTree; using Microsoft.AspNetCore.Components.Test.Helpers; using Xunit; @@ -138,6 +138,142 @@ namespace Microsoft.AspNetCore.Components.Test ex.Message); } + [Fact] + public void SettingCaptureUnmatchedValuesParameterExplicitlyWorks() + { + // Arrange + var target = new HasCaptureUnmatchedValuesProperty(); + var value = new Dictionary(); + var parameterCollection = new ParameterCollectionBuilder + { + { nameof(HasCaptureUnmatchedValuesProperty.CaptureUnmatchedValues), value }, + }.Build(); + + // Act + parameterCollection.SetParameterProperties(target); + + // Assert + Assert.Same(value, target.CaptureUnmatchedValues); + } + + [Fact] + public void SettingCaptureUnmatchedValuesParameterWithUnmatchedValuesWorks() + { + // Arrange + var target = new HasCaptureUnmatchedValuesProperty(); + var parameterCollection = new ParameterCollectionBuilder + { + { nameof(HasCaptureUnmatchedValuesProperty.StringProp), "hi" }, + { "test1", 123 }, + { "test2", 456 }, + }.Build(); + + // Act + parameterCollection.SetParameterProperties(target); + + // Assert + Assert.Equal("hi", target.StringProp); + Assert.Collection( + target.CaptureUnmatchedValues.OrderBy(kvp => kvp.Key), + kvp => + { + Assert.Equal("test1", kvp.Key); + Assert.Equal(123, kvp.Value); + }, + kvp => + { + Assert.Equal("test2", kvp.Key); + Assert.Equal(456, kvp.Value); + }); + } + + [Fact] + public void SettingCaptureUnmatchedValuesParameterExplicitlyAndImplicitly_Throws() + { + // Arrange + var target = new HasCaptureUnmatchedValuesProperty(); + var parameterCollection = new ParameterCollectionBuilder + { + { nameof(HasCaptureUnmatchedValuesProperty.CaptureUnmatchedValues), new Dictionary() }, + { "test1", 123 }, + { "test2", 456 }, + }.Build(); + + // Act + var ex = Assert.Throws(() => parameterCollection.SetParameterProperties(target)); + + // Assert + Assert.Equal( + $"The property '{nameof(HasCaptureUnmatchedValuesProperty.CaptureUnmatchedValues)}' on component type '{typeof(HasCaptureUnmatchedValuesProperty).FullName}' cannot be set explicitly when " + + $"also used to capture unmatched values. Unmatched values:" + Environment.NewLine + + $"test1" + Environment.NewLine + + $"test2", + ex.Message); + } + + [Fact] + public void SettingCaptureUnmatchedValuesParameterExplicitlyAndImplicitly_ReverseOrder_Throws() + { + // Arrange + var target = new HasCaptureUnmatchedValuesProperty(); + var parameterCollection = new ParameterCollectionBuilder + { + { "test2", 456 }, + { "test1", 123 }, + { nameof(HasCaptureUnmatchedValuesProperty.CaptureUnmatchedValues), new Dictionary() }, + }.Build(); + + // Act + var ex = Assert.Throws(() => parameterCollection.SetParameterProperties(target)); + + // Assert + Assert.Equal( + $"The property '{nameof(HasCaptureUnmatchedValuesProperty.CaptureUnmatchedValues)}' on component type '{typeof(HasCaptureUnmatchedValuesProperty).FullName}' cannot be set explicitly when " + + $"also used to capture unmatched values. Unmatched values:" + Environment.NewLine + + $"test1" + Environment.NewLine + + $"test2", + ex.Message); + } + + [Fact] + public void HasDuplicateCaptureUnmatchedValuesParameters_Throws() + { + // Arrange + var target = new HasDupliateCaptureUnmatchedValuesProperty(); + var parameterCollection = new ParameterCollectionBuilder().Build(); + + // Act + var ex = Assert.Throws(() => parameterCollection.SetParameterProperties(target)); + + // Assert + Assert.Equal( + $"Multiple properties were found on component type '{typeof(HasDupliateCaptureUnmatchedValuesProperty).FullName}' " + + $"with '{nameof(ParameterAttribute)}.{nameof(ParameterAttribute.CaptureUnmatchedValues)}'. " + + $"Only a single property per type can use '{nameof(ParameterAttribute)}.{nameof(ParameterAttribute.CaptureUnmatchedValues)}'. " + + $"Properties:" + Environment.NewLine + + $"{nameof(HasDupliateCaptureUnmatchedValuesProperty.CaptureUnmatchedValuesProp1)}" + Environment.NewLine + + $"{nameof(HasDupliateCaptureUnmatchedValuesProperty.CaptureUnmatchedValuesProp2)}", + ex.Message); + } + + [Fact] + public void HasCaptureUnmatchedValuesParameteterWithWrongType_Throws() + { + // Arrange + var target = new HasWrongTypeCaptureUnmatchedValuesProperty(); + var parameterCollection = new ParameterCollectionBuilder().Build(); + + // Act + var ex = Assert.Throws(() => parameterCollection.SetParameterProperties(target)); + + // Assert + Assert.Equal( + $"The property '{nameof(HasWrongTypeCaptureUnmatchedValuesProperty.CaptureUnmatchedValuesProp)}' on component type '{typeof(HasWrongTypeCaptureUnmatchedValuesProperty).FullName}' cannot be used with " + + $"'{nameof(ParameterAttribute)}.{nameof(ParameterAttribute.CaptureUnmatchedValues)}' because it has the wrong type. " + + $"The property must be assignable from 'Dictionary'.", + ex.Message); + } + [Fact] public void IncomingParameterValueMismatchesDeclaredParameterType_Throws() { @@ -273,6 +409,25 @@ namespace Microsoft.AspNetCore.Components.Test [Parameter] new int IntProp { get; set; } } + class HasCaptureUnmatchedValuesProperty + { + [Parameter] internal int IntProp { get; set; } + [Parameter] internal string StringProp { get; set; } + [Parameter] internal object ObjectProp { get; set; } + [Parameter(CaptureUnmatchedValues = true)] internal IReadOnlyDictionary CaptureUnmatchedValues { get; set; } + } + + class HasDupliateCaptureUnmatchedValuesProperty + { + [Parameter(CaptureUnmatchedValues = true)] internal Dictionary CaptureUnmatchedValuesProp1 { get; set; } + [Parameter(CaptureUnmatchedValues = true)] internal IDictionary CaptureUnmatchedValuesProp2 { get; set; } + } + + class HasWrongTypeCaptureUnmatchedValuesProperty + { + [Parameter(CaptureUnmatchedValues = true)] internal KeyValuePair[] CaptureUnmatchedValuesProp { get; set; } + } + class ParameterCollectionBuilder : IEnumerable { private readonly List<(string Name, object Value)> _keyValuePairs diff --git a/src/Components/Components/test/RenderTreeBuilderTest.cs b/src/Components/Components/test/RenderTreeBuilderTest.cs index ac05e9b195..c92ee63658 100644 --- a/src/Components/Components/test/RenderTreeBuilderTest.cs +++ b/src/Components/Components/test/RenderTreeBuilderTest.cs @@ -1,13 +1,14 @@ // 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 Microsoft.AspNetCore.Components; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; using Microsoft.AspNetCore.Components.Rendering; using Microsoft.AspNetCore.Components.RenderTree; using Microsoft.AspNetCore.Components.Test.Helpers; -using System; -using System.Linq; -using System.Threading.Tasks; +using Moq; using Xunit; namespace Microsoft.AspNetCore.Components.Test @@ -245,6 +246,200 @@ namespace Microsoft.AspNetCore.Components.Test frame => AssertFrame.Text(frame, "some text")); } + [Fact] + public void CanAddMultipleAttributes_AllowsNull() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + + // Act + builder.OpenElement(0, "myelement"); + builder.AddMultipleAttributes(0, null); + builder.CloseElement(); + + // Assert + var frames = builder.GetFrames().AsEnumerable().ToArray(); + Assert.Collection( + frames, + frame => AssertFrame.Element(frame, "myelement", 1)); + } + + [Fact] + public void CanAddMultipleAttributes_InterspersedWithOtherAttributes() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + Action eventHandler = eventInfo => { }; + + // Act + builder.OpenElement(0, "myelement"); + builder.AddAttribute(0, "attribute1", "value 1"); + builder.AddMultipleAttributes(0, new Dictionary(StringComparer.OrdinalIgnoreCase) + { + { "attribute1", "test1" }, + { "attribute2", true }, + { "attribute3", eventHandler }, + }); + builder.AddAttribute(0, "ATTRIBUTE2", true); + builder.AddMultipleAttributes(0, new Dictionary(StringComparer.OrdinalIgnoreCase) + { + { "attribute4", "test4" }, + { "attribute5", false }, + { "attribute6", eventHandler }, + }); + + // Null or false values don't create frames of their own, but they can + // "knock out" earlier values. + builder.AddAttribute(0, "attribute6", false); + builder.AddAttribute(0, "attribute4", (string)null); + + builder.AddAttribute(0, "attribute7", "the end"); + builder.CloseElement(); + + // Assert + var frames = builder.GetFrames().AsEnumerable().ToArray(); + Assert.Collection( + frames, + frame => AssertFrame.Element(frame, "myelement", 5), + frame => AssertFrame.Attribute(frame, "attribute1", "test1"), + frame => AssertFrame.Attribute(frame, "attribute3", eventHandler), + frame => AssertFrame.Attribute(frame, "ATTRIBUTE2", true), + frame => AssertFrame.Attribute(frame, "attribute7", "the end")); + } + + [Fact] + public void CanAddMultipleAttributes_DictionaryString() + { + var attributes = new Dictionary + { + { "attribute1", "test1" }, + { "attribute2", "123" }, + { "attribute3", "456" }, + }; + + // Act & Assert + CanAddMultipleAttributesTest(attributes); + } + + [Fact] + public void CanAddMultipleAttributes_DictionaryObject() + { + var attributes = new Dictionary + { + { "attribute1", "test1" }, + { "attribute2", "123" }, + { "attribute3", true }, + }; + + // Act & Assert + CanAddMultipleAttributesTest(attributes); + } + + [Fact] + public void CanAddMultipleAttributes_IReadOnlyDictionaryString() + { + var attributes = new Dictionary + { + { "attribute1", "test1" }, + { "attribute2", "123" }, + { "attribute3", "456" }, + }; + + // Act & Assert + CanAddMultipleAttributesTest((IReadOnlyDictionary)attributes); + } + + [Fact] + public void CanAddMultipleAttributes_IReadOnlyDictionaryObject() + { + var attributes = new Dictionary + { + { "attribute1", "test1" }, + { "attribute2", "123" }, + { "attribute3", true }, + }; + + // Act & Assert + CanAddMultipleAttributesTest((IReadOnlyDictionary)attributes); + } + + [Fact] + public void CanAddMultipleAttributes_ListKvpString() + { + var attributes = new List>() + { + new KeyValuePair("attribute1", "test1"), + new KeyValuePair("attribute2", "123"), + new KeyValuePair("attribute3", "456"), + }; + + // Act & Assert + CanAddMultipleAttributesTest(attributes); + } + + [Fact] + public void CanAddMultipleAttributes_ListKvpObject() + { + var attributes = new List>() + { + new KeyValuePair("attribute1", "test1"), + new KeyValuePair("attribute2", "123"), + new KeyValuePair("attribute3", true), + }; + + // Act & Assert + CanAddMultipleAttributesTest(attributes); + } + + [Fact] + public void CanAddMultipleAttributes_ArrayKvpString() + { + var attributes = new KeyValuePair[] + { + new KeyValuePair("attribute1", "test1"), + new KeyValuePair("attribute2", "123"), + new KeyValuePair("attribute3", "456"), + }; + + // Act & Assert + CanAddMultipleAttributesTest(attributes); + } + + [Fact] + public void CanAddMultipleAttributes_ArrayKvpObject() + { + var attributes = new KeyValuePair[] + { + new KeyValuePair("attribute1", "test1"), + new KeyValuePair("attribute2", "123"), + new KeyValuePair("attribute3", true), + }; + + // Act & Assert + CanAddMultipleAttributesTest(attributes); + } + + private void CanAddMultipleAttributesTest(IEnumerable> attributes) + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + + // Act + builder.OpenElement(0, "myelement"); + builder.AddMultipleAttributes(0, attributes); + builder.CloseElement(); + + // Assert + var frames = builder.GetFrames().AsEnumerable().ToArray(); + + var i = 1; + foreach (var attribute in attributes) + { + var frame = frames[i++]; + AssertFrame.Attribute(frame, attribute.Key, attribute.Value); + } + } + [Fact] public void CannotAddAttributeAtRoot() { @@ -859,6 +1054,160 @@ namespace Microsoft.AspNetCore.Components.Test frame => AssertFrame.Attribute(frame, "attr", value, 1)); } + [Fact] + public void AddAttribute_Element_EventCallback_AddsFrame() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + var callback = new EventCallback(null, new Action(() => { })); + + // Act + builder.OpenElement(0, "elem"); + builder.AddAttribute(1, "attr", callback); + builder.CloseElement(); + + // Assert + Assert.Collection( + builder.GetFrames().AsEnumerable(), + frame => AssertFrame.Element(frame, "elem", 2, 0), + frame => AssertFrame.Attribute(frame, "attr", callback.Delegate, 1)); + } + + [Fact] + public void AddAttribute_Element_EventCallback_Default_DoesNotAddFrame() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + var callback = default(EventCallback); + + // Act + builder.OpenElement(0, "elem"); + builder.AddAttribute(1, "attr", callback); + builder.CloseElement(); + + // Assert + Assert.Collection( + builder.GetFrames().AsEnumerable(), + frame => AssertFrame.Element(frame, "elem", 1, 0)); + } + + [Fact] + public void AddAttribute_Element_EventCallbackWithReceiver_AddsFrame() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + var receiver = Mock.Of(); + var callback = new EventCallback(receiver, new Action(() => { })); + + // Act + builder.OpenElement(0, "elem"); + builder.AddAttribute(1, "attr", callback); + builder.CloseElement(); + + // Assert + Assert.Collection( + builder.GetFrames().AsEnumerable(), + frame => AssertFrame.Element(frame, "elem", 2, 0), + frame => AssertFrame.Attribute(frame, "attr", callback, 1)); + } + + [Fact] + public void AddAttribute_Component_EventCallback_AddsFrame() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + var receiver = Mock.Of(); + var callback = new EventCallback(receiver, new Action(() => { })); + + // Act + builder.OpenComponent(0); + builder.AddAttribute(1, "attr", callback); + builder.CloseComponent(); + + // Assert + Assert.Collection( + builder.GetFrames().AsEnumerable(), + frame => AssertFrame.Component(frame, 2, 0), + frame => AssertFrame.Attribute(frame, "attr", callback, 1)); + } + + [Fact] + public void AddAttribute_Element_EventCallbackOfT_AddsFrame() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + var callback = new EventCallback(null, new Action((s) => { })); + + // Act + builder.OpenElement(0, "elem"); + builder.AddAttribute(1, "attr", callback); + builder.CloseElement(); + + // Assert + Assert.Collection( + builder.GetFrames().AsEnumerable(), + frame => AssertFrame.Element(frame, "elem", 2, 0), + frame => AssertFrame.Attribute(frame, "attr", callback.Delegate, 1)); + } + + [Fact] + public void AddAttribute_Element_EventCallbackOfT_Default_DoesNotAddFrame() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + var callback = default(EventCallback); + + // Act + builder.OpenElement(0, "elem"); + builder.AddAttribute(1, "attr", callback); + builder.CloseElement(); + + // Assert + Assert.Collection( + builder.GetFrames().AsEnumerable(), + frame => AssertFrame.Element(frame, "elem", 1, 0)); + } + + [Fact] + public void AddAttribute_Element_EventCallbackWithReceiverOfT_AddsFrame() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + var receiver = Mock.Of(); + var callback = new EventCallback(receiver, new Action((s) => { })); + + // Act + builder.OpenElement(0, "elem"); + builder.AddAttribute(1, "attr", callback); + builder.CloseElement(); + + // Assert + Assert.Collection( + builder.GetFrames().AsEnumerable(), + frame => AssertFrame.Element(frame, "elem", 2, 0), + frame => AssertFrame.Attribute(frame, "attr", new EventCallback(callback.Receiver, callback.Delegate), 1)); + } + + [Fact] + public void AddAttribute_Component_EventCallbackOfT_AddsFrame() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + var receiver = Mock.Of(); + var callback = new EventCallback(receiver, new Action((s) => { })); + + // Act + builder.OpenComponent(0); + builder.AddAttribute(1, "attr", callback); + builder.CloseComponent(); + + // Assert + Assert.Collection( + builder.GetFrames().AsEnumerable(), + frame => AssertFrame.Component(frame, 2, 0), + frame => AssertFrame.Attribute(frame, "attr", callback, 1)); + } + [Fact] public void AddAttribute_Element_ObjectBoolTrue_AddsFrame() { @@ -1030,6 +1379,140 @@ namespace Microsoft.AspNetCore.Components.Test frame => AssertFrame.Attribute(frame, "attr", value, 1)); } + [Fact] + public void AddAttribute_Element_ObjectEventCallback_AddsFrame() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + var callback = new EventCallback(null, new Action(() => { })); + + // Act + builder.OpenElement(0, "elem"); + builder.AddAttribute(1, "attr", (object)callback); + builder.CloseElement(); + + // Assert + Assert.Collection( + builder.GetFrames().AsEnumerable(), + frame => AssertFrame.Element(frame, "elem", 2, 0), + frame => AssertFrame.Attribute(frame, "attr", callback.Delegate, 1)); + } + + [Fact] + public void AddAttribute_Element_ObjectEventCallback_Default_DoesNotAddFrame() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + var callback = default(EventCallback); + + // Act + builder.OpenElement(0, "elem"); + builder.AddAttribute(1, "attr", (object)callback); + builder.CloseElement(); + + // Assert + Assert.Collection( + builder.GetFrames().AsEnumerable(), + frame => AssertFrame.Element(frame, "elem", 1, 0)); + } + + [Fact] + public void AddAttribute_Element_ObjectEventCallbackWithReceiver_AddsFrame() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + var receiver = Mock.Of(); + var callback = new EventCallback(receiver, new Action(() => { })); + + // Act + builder.OpenElement(0, "elem"); + builder.AddAttribute(1, "attr", (object)callback); + builder.CloseElement(); + + // Assert + Assert.Collection( + builder.GetFrames().AsEnumerable(), + frame => AssertFrame.Element(frame, "elem", 2, 0), + frame => AssertFrame.Attribute(frame, "attr", callback, 1)); + } + + [Fact] + public void AddAttribute_Component_ObjectEventCallback_AddsFrame() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + var receiver = Mock.Of(); + var callback = new EventCallback(receiver, new Action(() => { })); + + // Act + builder.OpenComponent(0); + builder.AddAttribute(1, "attr", (object)callback); + builder.CloseComponent(); + + // Assert + Assert.Collection( + builder.GetFrames().AsEnumerable(), + frame => AssertFrame.Component(frame, 2, 0), + frame => AssertFrame.Attribute(frame, "attr", callback, 1)); + } + + [Fact] + public void AddAttribute_Element_ObjectEventCallbackOfT_AddsFrame() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + var callback = new EventCallback(null, new Action((s) => { })); + + // Act + builder.OpenElement(0, "elem"); + builder.AddAttribute(1, "attr", (object)callback); + builder.CloseElement(); + + // Assert + Assert.Collection( + builder.GetFrames().AsEnumerable(), + frame => AssertFrame.Element(frame, "elem", 2, 0), + frame => AssertFrame.Attribute(frame, "attr", callback.Delegate, 1)); + } + + [Fact] + public void AddAttribute_Element_ObjectEventCallbackOfT_Default_DoesNotAddFrame() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + var callback = default(EventCallback); + + // Act + builder.OpenElement(0, "elem"); + builder.AddAttribute(1, "attr", (object)callback); + builder.CloseElement(); + + // Assert + Assert.Collection( + builder.GetFrames().AsEnumerable(), + frame => AssertFrame.Element(frame, "elem", 1, 0)); + } + + [Fact] + public void AddAttribute_Element_ObjectEventCallbackWithReceiverOfT_AddsFrame() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + var receiver = Mock.Of(); + var callback = new EventCallback(receiver, new Action((s) => { })); + + // Act + builder.OpenElement(0, "elem"); + builder.AddAttribute(1, "attr", (object)callback); + builder.CloseElement(); + + // Assert + Assert.Collection( + builder.GetFrames().AsEnumerable(), + frame => AssertFrame.Element(frame, "elem", 2, 0), + frame => AssertFrame.Attribute(frame, "attr", new EventCallback(callback.Receiver, callback.Delegate), 1)); + } + [Fact] public void AddAttribute_Element_ObjectNull_IgnoresFrame() { @@ -1148,6 +1631,215 @@ namespace Microsoft.AspNetCore.Components.Test Assert.Equal("value", ex.ParamName); } + [Fact] + public void ProcessDuplicateAttributes_DoesNotRemoveDuplicatesWithoutAddMultipleAttributes() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + builder.OpenElement(0, "div"); + builder.AddAttribute(0, "id", "hi"); + builder.AddAttribute(0, "id", "bye"); + builder.CloseElement(); + + // Act + var frames = builder.GetFrames().AsEnumerable(); + + // Assert + Assert.Collection( + frames, + f => AssertFrame.Element(f, "div", 3, 0), + f => AssertFrame.Attribute(f, "id", "hi"), + f => AssertFrame.Attribute(f, "id", "bye")); + } + + + [Fact] + public void ProcessDuplicateAttributes_StopsAtFirstNonAttributeFrame_Capture() + { + // Arrange + var capture = (Action)((_) => { }); + + var builder = new RenderTreeBuilder(new TestRenderer()); + builder.OpenElement(0, "div"); + builder.AddAttribute(0, "id", "hi"); + builder.AddMultipleAttributes(0, new Dictionary(StringComparer.OrdinalIgnoreCase) + { + { "id", "bye" }, + }); + builder.AddElementReferenceCapture(0, capture); + builder.CloseElement(); + + // Act + var frames = builder.GetFrames().AsEnumerable(); + + // Assert + Assert.Collection( + frames, + f => AssertFrame.Element(f, "div", 3, 0), + f => AssertFrame.Attribute(f, "id", "bye"), + f => AssertFrame.ElementReferenceCapture(f, capture)); + } + + [Fact] + public void ProcessDuplicateAttributes_StopsAtFirstNonAttributeFrame_Content() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + builder.OpenElement(0, "div"); + builder.AddAttribute(0, "id", "hi"); + builder.AddMultipleAttributes(0, new Dictionary(StringComparer.OrdinalIgnoreCase) + { + { "id", "bye" }, + }); + builder.AddContent(0, "hey"); + builder.CloseElement(); + + // Act + var frames = builder.GetFrames().AsEnumerable(); + + // Assert + Assert.Collection( + frames, + f => AssertFrame.Element(f, "div", 3, 0), + f => AssertFrame.Attribute(f, "id", "bye"), + f => AssertFrame.Text(f, "hey")); + } + + [Fact] + public void ProcessDuplicateAttributes_CanRemoveDuplicateInsideElement() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + builder.OpenElement(0, "div"); + builder.AddAttribute(0, "id", "hi"); + builder.AddMultipleAttributes(0, new Dictionary(StringComparer.OrdinalIgnoreCase) + { + { "id", "bye" }, + }); + builder.CloseElement(); + + // Act + var frames = builder.GetFrames().AsEnumerable(); + + // Assert + Assert.Collection( + frames, + f => AssertFrame.Element(f, "div", 2, 0), + f => AssertFrame.Attribute(f, "id", "bye")); + } + + [Fact] + public void ProcessDuplicateAttributes_CanRemoveDuplicateInsideComponent() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + builder.OpenComponent(0); + builder.AddAttribute(0, "id", "hi"); + builder.AddMultipleAttributes(0, new Dictionary(StringComparer.OrdinalIgnoreCase) + { + { "id", "bye" }, + }); + builder.CloseComponent(); + + // Act + var frames = builder.GetFrames().AsEnumerable(); + + // Assert + Assert.Collection( + frames, + f => AssertFrame.Component(f, 2, 0), + f => AssertFrame.Attribute(f, "id", "bye")); + } + + // This covers a special case we have to handle explicitly in the RTB logic. + [Fact] + public void ProcessDuplicateAttributes_SilentFrameFollowedBySameAttribute() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + builder.OpenComponent(0); + builder.AddAttribute(0, "id", (string)null); + builder.AddMultipleAttributes(0, new Dictionary(StringComparer.OrdinalIgnoreCase) + { + { "id", "bye" }, + }); + builder.CloseComponent(); + + // Act + var frames = builder.GetFrames().AsEnumerable(); + + // Assert + Assert.Collection( + frames, + f => AssertFrame.Component(f, 2, 0), + f => AssertFrame.Attribute(f, "id", "bye")); + } + + [Fact] + public void ProcessDuplicateAttributes_DoesNotRemoveDuplicatesInsideChildElement() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + builder.OpenElement(0, "div"); + builder.AddAttribute(0, "id", "hi"); + builder.AddMultipleAttributes(0, new Dictionary(StringComparer.OrdinalIgnoreCase) + { + { "id", "bye" }, + }); + builder.OpenElement(0, "strong"); + builder.AddAttribute(0, "id", "hi"); + builder.AddAttribute(0, "id", "bye"); + builder.CloseElement(); + builder.CloseElement(); + + // Act + var frames = builder.GetFrames().AsEnumerable(); + + // Assert + Assert.Collection( + frames, + f => AssertFrame.Element(f, "div", 5, 0), + f => AssertFrame.Attribute(f, "id", "bye"), + f => AssertFrame.Element(f, "strong", 3), + f => AssertFrame.Attribute(f, "id", "hi"), + f => AssertFrame.Attribute(f, "id", "bye")); + } + + [Fact] + public void ProcessDuplicateAttributes_CanRemoveOverwrittenAttributes() + { + // Arrange + var builder = new RenderTreeBuilder(new TestRenderer()); + builder.OpenElement(0, "div"); + builder.AddAttribute(0, "A", "hi"); + builder.AddAttribute(0, "2", new EventCallback(null, (Action)(() => { }))); + builder.AddMultipleAttributes(0, new Dictionary(StringComparer.OrdinalIgnoreCase) + { + { "a", null }, // Replace with null value (case-insensitive) + { "2", false }, // Replace with 'false' + { "3", "hey there" }, // Add a new value + }); + builder.AddAttribute(0, "3", "see ya"); // Overwrite value added by splat + builder.AddAttribute(0, "4", false); // Add a false value + builder.AddAttribute(0, "5", "another one"); + builder.AddMultipleAttributes(0, new Dictionary(StringComparer.OrdinalIgnoreCase) + { + { "5", null }, // overwrite value with null + { "6", new EventCallback(null, (Action)(() =>{ })) }, + }); + builder.AddAttribute(0, "6", default(EventCallback)); // Replace with a 'silent' EventCallback + builder.CloseElement(); + + // Act + var frames = builder.GetFrames().AsEnumerable(); + + // Assert + Assert.Collection( + frames, + f => AssertFrame.Element(f, "div", 2, 0), + f => AssertFrame.Attribute(f, "3", "see ya")); + } + private class TestComponent : IComponent { public void Configure(RenderHandle renderHandle) { } diff --git a/src/Components/Components/test/RendererTest.cs b/src/Components/Components/test/RendererTest.cs index be4994a83b..2c3e110e41 100644 --- a/src/Components/Components/test/RendererTest.cs +++ b/src/Components/Components/test/RendererTest.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Runtime.ExceptionServices; using System.Threading; @@ -19,6 +20,10 @@ namespace Microsoft.AspNetCore.Components.Test { public class RendererTest { + // Nothing should exceed the timeout in a successful run of the the tests, this is just here to catch + // failures. + private static readonly TimeSpan Timeout = Debugger.IsAttached ? System.Threading.Timeout.InfiniteTimeSpan : TimeSpan.FromSeconds(10); + private const string EventActionsName = nameof(NestedAsyncComponent.EventActions); private const string WhatToRenderName = nameof(NestedAsyncComponent.WhatToRender); private const string LogName = nameof(NestedAsyncComponent.Log); @@ -1895,6 +1900,76 @@ namespace Microsoft.AspNetCore.Components.Test AssertFrame.Text(renderer.Batches[1].ReferenceFrames[0], "second"); } + [Fact] + public void ReRendersChildComponentWhenUnmatchedValuesChange() + { + // Arrange: First render + var renderer = new TestRenderer(); + var firstRender = true; + var component = new TestComponent(builder => + { + builder.OpenComponent(1); + builder.AddAttribute(1, "class", firstRender ? "first" : "second"); + builder.AddAttribute(2, "id", "some_text"); + builder.AddAttribute(3, nameof(MyStrongComponent.Text), "hi there."); + builder.CloseComponent(); + }); + + var rootComponentId = renderer.AssignRootComponentId(component); + component.TriggerRender(); + + var childComponentId = renderer.Batches.Single() + .ReferenceFrames + .Single(frame => frame.FrameType == RenderTreeFrameType.Component) + .ComponentId; + + // Act: Second render + firstRender = false; + component.TriggerRender(); + var diff = renderer.Batches[1].DiffsByComponentId[childComponentId].Single(); + + // Assert + Assert.Collection(diff.Edits, + edit => + { + Assert.Equal(RenderTreeEditType.SetAttribute, edit.Type); + Assert.Equal(0, edit.ReferenceFrameIndex); + }); + AssertFrame.Attribute(renderer.Batches[1].ReferenceFrames[0], "class", "second"); + } + + // This is a sanity check that diffs of "unmatched" values *just work* without any specialized + // code in the renderer to handle it. All of the data that's used in the diff is contained in + // the render tree, and the diff process does not need to inspect the state of the component. + [Fact] + public void ReRendersDoesNotReRenderChildComponentWhenUnmatchedValuesDoNotChange() + { + // Arrange: First render + var renderer = new TestRenderer(); + var component = new TestComponent(builder => + { + builder.OpenComponent(1); + builder.AddAttribute(1, "class", "cool-beans"); + builder.AddAttribute(2, "id", "some_text"); + builder.AddAttribute(3, nameof(MyStrongComponent.Text), "hi there."); + builder.CloseComponent(); + }); + + var rootComponentId = renderer.AssignRootComponentId(component); + component.TriggerRender(); + + var childComponentId = renderer.Batches.Single() + .ReferenceFrames + .Single(frame => frame.FrameType == RenderTreeFrameType.Component) + .ComponentId; + + // Act: Second render + component.TriggerRender(); + + // Assert + Assert.False(renderer.Batches[1].DiffsByComponentId.ContainsKey(childComponentId)); + } + [Fact] public void RenderBatchIncludesListOfDisposedComponents() { @@ -2458,13 +2533,17 @@ namespace Microsoft.AspNetCore.Components.Test public void CallsAfterRenderAfterTheUIHasFinishedUpdatingAsynchronously() { // Arrange + var @event = new ManualResetEventSlim(); var tcs = new TaskCompletionSource(); var afterRenderTcs = new TaskCompletionSource(); var onAfterRenderCallCountLog = new List(); - var component = new AsyncAfterRenderComponent(afterRenderTcs.Task); + var component = new AsyncAfterRenderComponent(afterRenderTcs.Task) + { + OnAfterRenderComplete = () => @event.Set(), + }; var renderer = new AsyncUpdateTestRenderer() { - OnUpdateDisplayAsync = _ => tcs.Task + OnUpdateDisplayAsync = _ => tcs.Task, }; renderer.AssignRootComponentId(component); @@ -2473,6 +2552,9 @@ namespace Microsoft.AspNetCore.Components.Test tcs.SetResult(null); afterRenderTcs.SetResult(null); + // We need to wait here because the completions from SetResult will be scheduled. + @event.Wait(Timeout); + // Assert Assert.True(component.Called); } @@ -2481,9 +2563,13 @@ namespace Microsoft.AspNetCore.Components.Test public void CallsAfterRenderAfterTheUIHasFinishedUpdatingSynchronously() { // Arrange + var @event = new ManualResetEventSlim(); var afterRenderTcs = new TaskCompletionSource(); var onAfterRenderCallCountLog = new List(); - var component = new AsyncAfterRenderComponent(afterRenderTcs.Task); + var component = new AsyncAfterRenderComponent(afterRenderTcs.Task) + { + OnAfterRenderComplete = () => @event.Set(), + }; var renderer = new AsyncUpdateTestRenderer() { OnUpdateDisplayAsync = _ => Task.CompletedTask @@ -2494,6 +2580,9 @@ namespace Microsoft.AspNetCore.Components.Test component.TriggerRender(); afterRenderTcs.SetResult(null); + // We need to wait here because the completions from SetResult will be scheduled. + @event.Wait(Timeout); + // Assert Assert.True(component.Called); } @@ -2798,7 +2887,12 @@ namespace Microsoft.AspNetCore.Components.Test // code paths are special cased for the first render because of prerendering. // Arrange - var renderer = new TestRenderer { ShouldHandleExceptions = true }; + var @event = new ManualResetEventSlim(); + var renderer = new TestRenderer() + { + ShouldHandleExceptions = true, + OnExceptionHandled = () => { @event.Set(); }, + }; var taskToAwait = Task.CompletedTask; var component = new TestComponent(builder => { @@ -2815,8 +2909,13 @@ namespace Microsoft.AspNetCore.Components.Test // Act var exception = new InvalidOperationException(); + + @event.Reset(); asyncExceptionTcs.SetException(exception); + // We need to wait here because the continuations of SetException will be scheduled to run asynchronously. + @event.Wait(Timeout); + // Assert Assert.Same(exception, Assert.Single(renderer.HandledExceptions).GetBaseException()); } @@ -3241,6 +3340,21 @@ namespace Microsoft.AspNetCore.Components.Test } } + private class MyStrongComponent : AutoRenderComponent + { + [Parameter(CaptureUnmatchedValues = true)] internal IDictionary Attributes { get; set; } + + [Parameter] internal string Text { get; set; } + + protected override void BuildRenderTree(RenderTreeBuilder builder) + { + builder.OpenElement(0, "strong"); + builder.AddMultipleAttributes(1, Attributes); + builder.AddContent(2, Text); + builder.CloseElement(); + } + } + private class FakeComponent : IComponent { [Parameter] @@ -3829,10 +3943,14 @@ namespace Microsoft.AspNetCore.Components.Test public bool Called { get; private set; } + public Action OnAfterRenderComplete { get; set; } + public async Task OnAfterRenderAsync() { await _task; Called = true; + + OnAfterRenderComplete?.Invoke(); } protected override void BuildRenderTree(RenderTreeBuilder builder) diff --git a/src/Components/Components/test/Rendering/HtmlRendererTestBase.cs b/src/Components/Components/test/Rendering/HtmlRendererTestBase.cs index 8d4ba09a46..fbf5a8f9bf 100644 --- a/src/Components/Components/test/Rendering/HtmlRendererTestBase.cs +++ b/src/Components/Components/test/Rendering/HtmlRendererTestBase.cs @@ -125,6 +125,40 @@ namespace Microsoft.AspNetCore.Components.Rendering Assert.Equal(expectedHtml, result); } + [Fact] + public void RenderComponentAsync_SkipsDuplicatedAttribute() + { + // Arrange + var expectedHtml = new[] + { + "<", "p", " ", + "another", "=", "\"", "another-value", "\"", " ", + "Class", "=", "\"", "test2", "\"", ">", + "Hello world!", + "" + }; + var serviceProvider = new ServiceCollection().AddSingleton(new RenderFragment(rtb => + { + rtb.OpenElement(0, "p"); + rtb.AddAttribute(1, "class", "test1"); + rtb.AddAttribute(2, "another", "another-value"); + rtb.AddMultipleAttributes(3, new Dictionary() + { + { "Class", "test2" }, // Matching is case-insensitive. + }); + rtb.AddContent(4, "Hello world!"); + rtb.CloseElement(); + })).BuildServiceProvider(); + + var htmlRenderer = GetHtmlRenderer(serviceProvider); + + // Act + var result = GetResult(Dispatcher.InvokeAsync(() => htmlRenderer.RenderComponentAsync(ParameterCollection.Empty))); + + // Assert + Assert.Equal(expectedHtml, result); + } + [Fact] public void RenderComponentAsync_HtmlEncodesAttributeValues() { diff --git a/src/Components/Components/test/Rendering/RendererSynchronizationContextTests.cs b/src/Components/Components/test/Rendering/RendererSynchronizationContextTest.cs similarity index 95% rename from src/Components/Components/test/Rendering/RendererSynchronizationContextTests.cs rename to src/Components/Components/test/Rendering/RendererSynchronizationContextTest.cs index 153f362b0c..5be5050983 100644 --- a/src/Components/Components/test/Rendering/RendererSynchronizationContextTests.cs +++ b/src/Components/Components/test/Rendering/RendererSynchronizationContextTest.cs @@ -1,8 +1,9 @@ +// 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.Diagnostics; using System.Globalization; -using System.Text; using System.Threading; using System.Threading.Tasks; using Xunit; @@ -16,34 +17,51 @@ namespace Microsoft.AspNetCore.Components.Rendering public TimeSpan Timeout = Debugger.IsAttached ? System.Threading.Timeout.InfiniteTimeSpan : TimeSpan.FromSeconds(10); [Fact] - public void Post_CanRunSynchronously_WhenNotBusy() + public void Post_RunsAsynchronously_WhenNotBusy() { // Arrange var context = new RendererSynchronizationContext(); var thread = Thread.CurrentThread; Thread capturedThread = null; + var e = new ManualResetEventSlim(); + // Act context.Post((_) => { capturedThread = Thread.CurrentThread; + + e.Set(); }, null); // Assert - Assert.Same(thread, capturedThread); + Assert.True(e.Wait(Timeout), "timeout"); + Assert.NotSame(thread, capturedThread); } [Fact] - public void Post_CanRunSynchronously_WhenNotBusy_Exception() + public void Post_RunsAynchronously_WhenNotBusy_Exception() { // Arrange var context = new RendererSynchronizationContext(); - // Act & Assert - Assert.Throws(() => context.Post((_) => + Exception exception = null; + context.UnhandledException += (sender, e) => + { + exception = (InvalidTimeZoneException)e.ExceptionObject; + }; + + // Act + context.Post((_) => { throw new InvalidTimeZoneException(); - }, null)); + }, null); + + // Assert + // + // Use another item to 'push through' the throwing one + context.Send((_) => { }, null); + Assert.NotNull(exception); } [Fact] @@ -573,7 +591,7 @@ namespace Microsoft.AspNetCore.Components.Rendering Thread capturedThread = null; // Act - var task = context.Invoke(() => + var task = context.InvokeAsync(() => { capturedThread = Thread.CurrentThread; return Task.CompletedTask; diff --git a/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj index 39a46bbae2..856e59f6ca 100644 --- a/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj +++ b/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj @@ -6,6 +6,7 @@ + diff --git a/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.netcoreapp3.0.cs b/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.netcoreapp3.0.cs index f0254238ba..91d7621b0f 100644 --- a/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.netcoreapp3.0.cs +++ b/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.netcoreapp3.0.cs @@ -10,10 +10,15 @@ namespace Microsoft.AspNetCore.Builder public static partial class ComponentEndpointRouteBuilderExtensions { public static Microsoft.AspNetCore.Components.Server.ComponentEndpointConventionBuilder MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints) { throw null; } + public static Microsoft.AspNetCore.Components.Server.ComponentEndpointConventionBuilder MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, System.Action configureOptions) { throw null; } public static Microsoft.AspNetCore.Components.Server.ComponentEndpointConventionBuilder MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, System.Type type, string selector) { throw null; } + public static Microsoft.AspNetCore.Components.Server.ComponentEndpointConventionBuilder MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, System.Type type, string selector, System.Action configureOptions) { throw null; } public static Microsoft.AspNetCore.Components.Server.ComponentEndpointConventionBuilder MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, System.Type componentType, string selector, string path) { throw null; } + public static Microsoft.AspNetCore.Components.Server.ComponentEndpointConventionBuilder MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, System.Type componentType, string selector, string path, System.Action configureOptions) { throw null; } public static Microsoft.AspNetCore.Components.Server.ComponentEndpointConventionBuilder MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, string selector) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; } + public static Microsoft.AspNetCore.Components.Server.ComponentEndpointConventionBuilder MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, string selector, System.Action configureOptions) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; } public static Microsoft.AspNetCore.Components.Server.ComponentEndpointConventionBuilder MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, string selector, string path) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; } + public static Microsoft.AspNetCore.Components.Server.ComponentEndpointConventionBuilder MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, string selector, string path, System.Action configureOptions) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; } } } namespace Microsoft.AspNetCore.Components.Browser.Rendering diff --git a/src/Components/Server/src/Builder/ComponentEndpointRouteBuilderExtensions.cs b/src/Components/Server/src/Builder/ComponentEndpointRouteBuilderExtensions.cs index 5a65519916..4248dae1d7 100644 --- a/src/Components/Server/src/Builder/ComponentEndpointRouteBuilderExtensions.cs +++ b/src/Components/Server/src/Builder/ComponentEndpointRouteBuilderExtensions.cs @@ -4,7 +4,9 @@ using System; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Server; +using Microsoft.AspNetCore.Http.Connections; using Microsoft.AspNetCore.Routing; +using Microsoft.AspNetCore.SignalR; namespace Microsoft.AspNetCore.Builder { @@ -14,7 +16,7 @@ namespace Microsoft.AspNetCore.Builder public static class ComponentEndpointRouteBuilderExtensions { /// - /// Maps the SignalR to the path . + /// Maps the Blazor to the default path. /// /// The . /// The . @@ -25,20 +27,41 @@ namespace Microsoft.AspNetCore.Builder throw new ArgumentNullException(nameof(endpoints)); } - return new ComponentEndpointConventionBuilder(endpoints.MapHub(ComponentHub.DefaultPath)); + return endpoints.MapBlazorHub(configureOptions: _ => { }); } /// - /// Maps the SignalR to the path and associates + /// Maps the Blazor to the default path. + /// + /// The . + /// A callback to configure dispatcher options. + /// The . + public static ComponentEndpointConventionBuilder MapBlazorHub(this IEndpointRouteBuilder endpoints, Action configureOptions) + { + if (endpoints == null) + { + throw new ArgumentNullException(nameof(endpoints)); + } + + if (configureOptions == null) + { + throw new ArgumentNullException(nameof(configureOptions)); + } + + return new ComponentEndpointConventionBuilder(endpoints.MapHub(ComponentHub.DefaultPath, configureOptions)); + } + + /// + ///Maps the Blazor to the default path and associates /// the component to this hub instance as the given DOM . /// - /// The first associated with this . + /// The first associated with this Blazor . /// The . /// The selector for the . /// The . public static ComponentEndpointConventionBuilder MapBlazorHub( this IEndpointRouteBuilder endpoints, - string selector) where TComponent: IComponent + string selector) where TComponent : IComponent { if (endpoints == null) { @@ -54,11 +77,43 @@ namespace Microsoft.AspNetCore.Builder } /// - /// Maps the SignalR to the path and associates + ///Maps the Blazor to the default path and associates + /// the component to this hub instance as the given DOM . + /// + /// The first associated with this Blazor . + /// The . + /// The selector for the . + /// A callback to configure dispatcher options. + /// The . + public static ComponentEndpointConventionBuilder MapBlazorHub( + this IEndpointRouteBuilder endpoints, + string selector, + Action configureOptions) where TComponent : IComponent + { + if (endpoints == null) + { + throw new ArgumentNullException(nameof(endpoints)); + } + + if (selector == null) + { + throw new ArgumentNullException(nameof(selector)); + } + + if (configureOptions == null) + { + throw new ArgumentNullException(nameof(configureOptions)); + } + + return endpoints.MapBlazorHub(typeof(TComponent), selector, ComponentHub.DefaultPath, configureOptions); + } + + /// + ///Maps the Blazor to the default path and associates /// the component to this hub instance as the given DOM . /// /// The . - /// The first associated with this . + /// The first associated with this Blazor . /// The selector for the component. /// The . public static ComponentEndpointConventionBuilder MapBlazorHub( @@ -85,13 +140,51 @@ namespace Microsoft.AspNetCore.Builder } /// - /// Maps the SignalR to the path and associates + ///Maps the Blazor to the default path and associates + /// the component to this hub instance as the given DOM . + /// + /// The . + /// The first associated with this Blazor . + /// The selector for the component. + /// A callback to configure dispatcher options. + /// The . + public static ComponentEndpointConventionBuilder MapBlazorHub( + this IEndpointRouteBuilder endpoints, + Type type, + string selector, + Action configureOptions) + { + if (endpoints == null) + { + throw new ArgumentNullException(nameof(endpoints)); + } + + if (type == null) + { + throw new ArgumentNullException(nameof(type)); + } + + if (selector == null) + { + throw new ArgumentNullException(nameof(selector)); + } + + if (configureOptions == null) + { + throw new ArgumentNullException(nameof(configureOptions)); + } + + return endpoints.MapBlazorHub(type, selector, ComponentHub.DefaultPath, configureOptions); + } + + /// + /// Maps the Blazor to the path and associates /// the component to this hub instance as the given DOM . /// - /// The first associated with this . + /// The first associated with this Blazor . /// The . /// The selector for the . - /// The path to map to which the will be mapped. + /// The path to map the Blazor . /// The . public static ComponentEndpointConventionBuilder MapBlazorHub( this IEndpointRouteBuilder endpoints, @@ -117,13 +210,52 @@ namespace Microsoft.AspNetCore.Builder } /// - /// Maps the SignalR to the path and associates + /// Maps the Blazor to the path and associates + /// the component to this hub instance as the given DOM . + /// + /// The first associated with this Blazor . + /// The . + /// The selector for the . + /// The path to map the Blazor . + /// A callback to configure dispatcher options. + /// The . + public static ComponentEndpointConventionBuilder MapBlazorHub( + this IEndpointRouteBuilder endpoints, + string selector, + string path, + Action configureOptions) where TComponent : IComponent + { + if (endpoints == null) + { + throw new ArgumentNullException(nameof(endpoints)); + } + + if (path == null) + { + throw new ArgumentNullException(nameof(path)); + } + + if (selector == null) + { + throw new ArgumentNullException(nameof(selector)); + } + + if (configureOptions == null) + { + throw new ArgumentNullException(nameof(configureOptions)); + } + + return endpoints.MapBlazorHub(typeof(TComponent), selector, path, configureOptions); + } + + /// + /// Maps the Blazor to the path and associates /// the component to this hub instance as the given DOM . /// /// The . - /// The first associated with this . + /// The first associated with this Blazor . /// The selector for the . - /// The path to map to which the will be mapped. + /// The path to map the Blazor . /// The . public static ComponentEndpointConventionBuilder MapBlazorHub( this IEndpointRouteBuilder endpoints, @@ -151,7 +283,52 @@ namespace Microsoft.AspNetCore.Builder throw new ArgumentNullException(nameof(selector)); } - return new ComponentEndpointConventionBuilder(endpoints.MapHub(path)).AddComponent(componentType, selector); + return endpoints.MapBlazorHub(componentType, selector, path, configureOptions: _ => { }); + } + + /// + /// Maps the Blazor to the path and associates + /// the component to this hub instance as the given DOM . + /// + /// The . + /// The first associated with this Blazor . + /// The selector for the . + /// A callback to configure dispatcher options. + /// The path to map the Blazor . + /// The . + public static ComponentEndpointConventionBuilder MapBlazorHub( + this IEndpointRouteBuilder endpoints, + Type componentType, + string selector, + string path, + Action configureOptions) + { + if (endpoints == null) + { + throw new ArgumentNullException(nameof(endpoints)); + } + + if (path == null) + { + throw new ArgumentNullException(nameof(path)); + } + + if (componentType == null) + { + throw new ArgumentNullException(nameof(componentType)); + } + + if (selector == null) + { + throw new ArgumentNullException(nameof(selector)); + } + + if (configureOptions == null) + { + throw new ArgumentNullException(nameof(configureOptions)); + } + + return new ComponentEndpointConventionBuilder(endpoints.MapHub(path, configureOptions)).AddComponent(componentType, selector); } } } diff --git a/src/Components/Server/src/CircuitOptions.cs b/src/Components/Server/src/CircuitOptions.cs index 8820fbab15..d4f444fe91 100644 --- a/src/Components/Server/src/CircuitOptions.cs +++ b/src/Components/Server/src/CircuitOptions.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using Microsoft.AspNetCore.DataProtection; namespace Microsoft.AspNetCore.Components.Server { diff --git a/src/Components/Server/src/Circuits/CircuitHost.cs b/src/Components/Server/src/Circuits/CircuitHost.cs index 955f26aa93..1ea6eba1c7 100644 --- a/src/Components/Server/src/Circuits/CircuitHost.cs +++ b/src/Components/Server/src/Circuits/CircuitHost.cs @@ -50,6 +50,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits public event UnhandledExceptionEventHandler UnhandledException; public CircuitHost( + string circuitId, IServiceScope scope, CircuitClientProxy client, RendererRegistry rendererRegistry, @@ -60,6 +61,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits CircuitHandler[] circuitHandlers, ILogger logger) { + CircuitId = circuitId; _scope = scope ?? throw new ArgumentNullException(nameof(scope)); Dispatcher = dispatcher; Client = client; @@ -78,7 +80,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits Renderer.UnhandledSynchronizationException += SynchronizationContext_UnhandledException; } - public string CircuitId { get; } = Guid.NewGuid().ToString(); + public string CircuitId { get; } public Circuit Circuit { get; } diff --git a/src/Components/Server/src/Circuits/CircuitIdFactory.cs b/src/Components/Server/src/Circuits/CircuitIdFactory.cs new file mode 100644 index 0000000000..830ac8d51a --- /dev/null +++ b/src/Components/Server/src/Circuits/CircuitIdFactory.cs @@ -0,0 +1,57 @@ +// 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.Security.Cryptography; +using Microsoft.AspNetCore.DataProtection; +using Microsoft.AspNetCore.WebUtilities; +using Microsoft.Extensions.Options; + +namespace Microsoft.AspNetCore.Components.Server.Circuits +{ + // This is a singleton instance + // Generates strong cryptographic ids for circuits that are protected with authenticated encryption. + internal class CircuitIdFactory + { + private const string CircuitIdProtectorPurpose = "Microsoft.AspNetCore.Components.Server"; + + private readonly RandomNumberGenerator _generator = RandomNumberGenerator.Create(); + private readonly IDataProtector _protector; + + public CircuitIdFactory(IDataProtectionProvider provider) + { + _protector = provider.CreateProtector(CircuitIdProtectorPurpose); + } + + // Generates a circuit id that is produced from a strong cryptographic random number generator + // we don't care about the underlying payload, other than its uniqueness and the fact that we + // authenticate encrypt it using data protection. + // For validation, the fact that we can unprotect the payload is guarantee enough. + public string CreateCircuitId() + { + var buffer = new byte[32]; + _generator.GetBytes(buffer); + var payload = _protector.Protect(buffer); + + return Base64UrlTextEncoder.Encode(payload); + } + + public bool ValidateCircuitId(string circuitId) + { + try + { + var protectedBytes = Base64UrlTextEncoder.Decode(circuitId); + _protector.Unprotect(protectedBytes); + + // Its enough that we prove that we can unprotect the payload to validate the circuit id, + // as this demonstrates that it the id wasn't tampered with. + return true; + } + catch (Exception) + { + // The payload format is not correct (either not base64urlencoded or not data protected) + return false; + } + } + } +} diff --git a/src/Components/Server/src/Circuits/CircuitPrerenderer.cs b/src/Components/Server/src/Circuits/CircuitPrerenderer.cs index 5bb9254a89..e433fd1748 100644 --- a/src/Components/Server/src/Circuits/CircuitPrerenderer.cs +++ b/src/Components/Server/src/Circuits/CircuitPrerenderer.cs @@ -5,14 +5,17 @@ using System; using System.Linq; using System.Runtime.ExceptionServices; using System.Threading.Tasks; +using Microsoft.AspNetCore.Components.Rendering; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Extensions; +using Microsoft.AspNetCore.Http.Features; namespace Microsoft.AspNetCore.Components.Server.Circuits { internal class CircuitPrerenderer : IComponentPrerenderer { private static object CircuitHostKey = new object(); + private static object NavigationStatusKey = new object(); private readonly CircuitFactory _circuitFactory; private readonly CircuitRegistry _registry; @@ -26,11 +29,41 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits public async Task PrerenderComponentAsync(ComponentPrerenderingContext prerenderingContext) { var context = prerenderingContext.Context; - var circuitHost = GetOrCreateCircuitHost(context); + var navigationStatus = GetOrCreateNavigationStatus(context); + if (navigationStatus.Navigated) + { + // Avoid creating a circuit host if other component earlier in the pipeline already triggered + // a navigation request. Instead rendre nothing + return new ComponentPrerenderResult(Array.Empty()); + } + var circuitHost = GetOrCreateCircuitHost(context, navigationStatus); + ComponentRenderedText renderResult = default; + try + { + renderResult = await circuitHost.PrerenderComponentAsync( + prerenderingContext.ComponentType, + prerenderingContext.Parameters); + } + catch (NavigationException navigationException) + { + // Cleanup the state as we won't need it any longer. + // Signal callbacks that we don't have to register the circuit. + await CleanupCircuitState(context, navigationStatus, circuitHost); - var renderResult = await circuitHost.PrerenderComponentAsync( - prerenderingContext.ComponentType, - prerenderingContext.Parameters); + // Navigation was attempted during prerendering. + if (prerenderingContext.Context.Response.HasStarted) + { + // We can't perform a redirect as the server already started sending the response. + // This is considered an application error as the developer should buffer the response until + // all components have rendered. + throw new InvalidOperationException("A navigation command was attempted during prerendering after the server already started sending the response. " + + "Navigation commands can not be issued during server-side prerendering after the response from the server has started. Applications must buffer the" + + "reponse and avoid using features like FlushAsync() before all components on the page have been rendered to prevent failed navigation commands.", navigationException); + } + + context.Response.Redirect(navigationException.Location); + return new ComponentPrerenderResult(Array.Empty()); + } circuitHost.Descriptors.Add(new ComponentDescriptor { @@ -38,9 +71,9 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits Prerendered = true }); - var result = new[] { + var result = (new[] { $"", - }.Concat(renderResult.Tokens).Concat( + }).Concat(renderResult.Tokens).Concat( new[] { $"" }); @@ -48,7 +81,28 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits return new ComponentPrerenderResult(result); } - private CircuitHost GetOrCreateCircuitHost(HttpContext context) + private CircuitNavigationStatus GetOrCreateNavigationStatus(HttpContext context) + { + if (context.Items.TryGetValue(NavigationStatusKey, out var existingHost)) + { + return (CircuitNavigationStatus)existingHost; + } + else + { + var navigationStatus = new CircuitNavigationStatus(); + context.Items[NavigationStatusKey] = navigationStatus; + return navigationStatus; + } + } + + private static async Task CleanupCircuitState(HttpContext context, CircuitNavigationStatus navigationStatus, CircuitHost circuitHost) + { + navigationStatus.Navigated = true; + context.Items.Remove(CircuitHostKey); + await circuitHost.DisposeAsync(); + } + + private CircuitHost GetOrCreateCircuitHost(HttpContext context, CircuitNavigationStatus navigationStatus) { if (context.Items.TryGetValue(CircuitHostKey, out var existingHost)) { @@ -66,7 +120,11 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits context.Response.OnCompleted(() => { result.UnhandledException -= CircuitHost_UnhandledException; - _registry.RegisterDisconnectedCircuit(result); + if (!navigationStatus.Navigated) + { + _registry.RegisterDisconnectedCircuit(result); + } + return Task.CompletedTask; }); context.Items.Add(CircuitHostKey, result); @@ -105,5 +163,10 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits return result; } + + private class CircuitNavigationStatus + { + public bool Navigated { get; set; } + } } } diff --git a/src/Components/Server/src/Circuits/CircuitRegistry.cs b/src/Components/Server/src/Circuits/CircuitRegistry.cs index ac9c3eef44..d101af8a38 100644 --- a/src/Components/Server/src/Circuits/CircuitRegistry.cs +++ b/src/Components/Server/src/Circuits/CircuitRegistry.cs @@ -6,7 +6,6 @@ using System.Collections.Concurrent; using System.Diagnostics; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Components.Rendering; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Logging; @@ -41,15 +40,17 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits private readonly object CircuitRegistryLock = new object(); private readonly CircuitOptions _options; private readonly ILogger _logger; + private readonly CircuitIdFactory _circuitIdFactory; private readonly PostEvictionCallbackRegistration _postEvictionCallback; public CircuitRegistry( IOptions options, - ILogger logger) + ILogger logger, + CircuitIdFactory circuitIdFactory) { _options = options.Value; _logger = logger; - + _circuitIdFactory = circuitIdFactory; ConnectedCircuits = new ConcurrentDictionary(StringComparer.Ordinal); DisconnectedCircuits = new MemoryCache(new MemoryCacheOptions @@ -139,6 +140,11 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits public virtual async Task ConnectAsync(string circuitId, IClientProxy clientProxy, string connectionId, CancellationToken cancellationToken) { + if (!_circuitIdFactory.ValidateCircuitId(circuitId)) + { + return null; + } + CircuitHost circuitHost; bool previouslyConnected; diff --git a/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs b/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs index d2924cd795..913faa3c86 100644 --- a/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs +++ b/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs @@ -21,13 +21,16 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits { private readonly IServiceScopeFactory _scopeFactory; private readonly ILoggerFactory _loggerFactory; + private readonly CircuitIdFactory _circuitIdFactory; public DefaultCircuitFactory( IServiceScopeFactory scopeFactory, - ILoggerFactory loggerFactory) + ILoggerFactory loggerFactory, + CircuitIdFactory circuitIdFactory) { _scopeFactory = scopeFactory ?? throw new ArgumentNullException(nameof(scopeFactory)); _loggerFactory = loggerFactory; + _circuitIdFactory = circuitIdFactory ?? throw new ArgumentNullException(nameof(circuitIdFactory)); } public override CircuitHost CreateCircuitHost( @@ -81,6 +84,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits .ToArray(); var circuitHost = new CircuitHost( + _circuitIdFactory.CreateCircuitId(), scope, client, rendererRegistry, diff --git a/src/Components/Server/src/Circuits/RemoteUriHelper.cs b/src/Components/Server/src/Circuits/RemoteUriHelper.cs index 8271f4450d..03b492a1e0 100644 --- a/src/Components/Server/src/Circuits/RemoteUriHelper.cs +++ b/src/Components/Server/src/Circuits/RemoteUriHelper.cs @@ -90,10 +90,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits if (_jsRuntime == null) { - throw new InvalidOperationException("Navigation commands can not be issued at this time. This is because the component is being " + - "prerendered and the page has not yet loaded in the browser or because the circuit is currently disconnected. " + - "Components must wrap any navigation calls in conditional logic to ensure those navigation calls are not " + - "attempted during prerendering or while the client is disconnected."); + throw new NavigationException(uri); } _jsRuntime.InvokeAsync(Interop.NavigateTo, uri, forceLoad); } diff --git a/src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs b/src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs index e5fd5f2aca..31cdcce444 100644 --- a/src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs +++ b/src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs @@ -28,6 +28,8 @@ namespace Microsoft.Extensions.DependencyInjection { var builder = new DefaultServerSideBlazorBuilder(services); + services.AddDataProtection(); + // This call INTENTIONALLY uses the AddHubOptions on the SignalR builder, because it will merge // the global HubOptions before running the configure callback. We want to ensure that happens // once. Our AddHubOptions method doesn't do this. @@ -51,6 +53,9 @@ namespace Microsoft.Extensions.DependencyInjection // Components entrypoints, this lot is the same and repeated registrations are a no-op. services.TryAddEnumerable(ServiceDescriptor.Singleton, ConfigureStaticFilesOptions>()); services.TryAddSingleton(); + + services.TryAddSingleton(); + services.TryAddScoped(s => s.GetRequiredService().Circuit); services.TryAddScoped(); diff --git a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj index 1d2eb08cb1..64c49afc9d 100644 --- a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj +++ b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.0 @@ -13,6 +13,7 @@ + @@ -52,10 +53,7 @@ - + diff --git a/src/Components/Server/test/Circuits/CircuitHostTest.cs b/src/Components/Server/test/Circuits/CircuitHostTest.cs index 507ff4e315..73c9681903 100644 --- a/src/Components/Server/test/Circuits/CircuitHostTest.cs +++ b/src/Components/Server/test/Circuits/CircuitHostTest.cs @@ -28,6 +28,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits var serviceScope = new Mock(); var remoteRenderer = GetRemoteRenderer(Renderer.CreateDefaultDispatcher()); var circuitHost = TestCircuitHost.Create( + Guid.NewGuid().ToString(), serviceScope.Object, remoteRenderer); @@ -46,6 +47,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits var serviceScope = new Mock(); var remoteRenderer = GetRemoteRenderer(Renderer.CreateDefaultDispatcher()); var circuitHost = TestCircuitHost.Create( + Guid.NewGuid().ToString(), serviceScope.Object, remoteRenderer); diff --git a/src/Components/Server/test/Circuits/CircuitIdFactoryTest.cs b/src/Components/Server/test/Circuits/CircuitIdFactoryTest.cs new file mode 100644 index 0000000000..50b5f1701e --- /dev/null +++ b/src/Components/Server/test/Circuits/CircuitIdFactoryTest.cs @@ -0,0 +1,89 @@ +// 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.Linq; +using Microsoft.AspNetCore.DataProtection; +using Microsoft.AspNetCore.WebUtilities; +using Xunit; + +namespace Microsoft.AspNetCore.Components.Server.Circuits +{ + public class CircuitIdFactoryTest + { + [Fact] + public void CreateCircuitId_Generates_NewRandomId() + { + var factory = TestCircuitIdFactory.CreateTestFactory(); + + // Act + var id = factory.CreateCircuitId(); + + // Assert + Assert.NotNull(id); + // This is the magic data protection header that validates its protected + Assert.StartsWith("CfDJ", id); + } + + [Fact] + public void CreateCircuitId_Generates_GeneratesDifferentIds_ForSuccesiveCalls() + { + // Arrange + var factory = TestCircuitIdFactory.CreateTestFactory(); + + // Act + var ids = Enumerable.Range(0, 100).Select(i => factory.CreateCircuitId()).ToArray(); + + // Assert + Assert.All(ids, id => Assert.NotNull(id)); + Assert.Equal(100, ids.Distinct(StringComparer.Ordinal).Count()); + } + + [Fact] + public void CircuitIds_Roundtrip() + { + // Arrange + var factory = TestCircuitIdFactory.CreateTestFactory(); + var id = factory.CreateCircuitId(); + + // Act + var isValid = factory.ValidateCircuitId(id); + + // Assert + Assert.True(isValid, "Failed to validate id"); + } + + [Fact] + public void ValidateCircuitId_ReturnsFalseForMalformedPayloads() + { + // Arrange + var factory = TestCircuitIdFactory.CreateTestFactory(); + + // Act + var isValid = factory.ValidateCircuitId("$%@&=="); + + // Assert + Assert.False(isValid, "Accepted an invalid payload"); + } + + [Fact] + public void ValidateCircuitId_ReturnsFalseForPotentiallyTamperedPayloads() + { + // Arrange + var factory = TestCircuitIdFactory.CreateTestFactory(); + var id = factory.CreateCircuitId(); + var protectedBytes = Base64UrlTextEncoder.Decode(id); + for (int i = protectedBytes.Length - 10; i < protectedBytes.Length; i++) + { + protectedBytes[i] = 0; + } + var tamperedId = Base64UrlTextEncoder.Encode(protectedBytes); + + // Act + var isValid = factory.ValidateCircuitId(tamperedId); + + // Assert + Assert.False(isValid, "Accepted a tampered payload"); + } + } +} diff --git a/src/Components/Server/test/Circuits/CircuitPrerendererTest.cs b/src/Components/Server/test/Circuits/CircuitPrerendererTest.cs index 9f2c4ec66f..b96541455c 100644 --- a/src/Components/Server/test/Circuits/CircuitPrerendererTest.cs +++ b/src/Components/Server/test/Circuits/CircuitPrerendererTest.cs @@ -35,7 +35,10 @@ namespace Microsoft.AspNetCore.Components.Server.Tests.Circuits { // Arrange var circuitFactory = new TestCircuitFactory(); - var circuitRegistry = new CircuitRegistry(Options.Create(new CircuitOptions()), Mock.Of>()); + var circuitRegistry = new CircuitRegistry( + Options.Create(new CircuitOptions()), + Mock.Of>(), + TestCircuitIdFactory.CreateTestFactory()); var circuitPrerenderer = new CircuitPrerenderer(circuitFactory, circuitRegistry); var httpContext = new DefaultHttpContext(); var httpRequest = httpContext.Request; @@ -76,7 +79,10 @@ namespace Microsoft.AspNetCore.Components.Server.Tests.Circuits { // Arrange var circuitFactory = new TestCircuitFactory(); - var circuitRegistry = new CircuitRegistry(Options.Create(new CircuitOptions()), Mock.Of>()); + var circuitRegistry = new CircuitRegistry( + Options.Create(new CircuitOptions()), + Mock.Of>(), + TestCircuitIdFactory.CreateTestFactory()); var circuitPrerenderer = new CircuitPrerenderer(circuitFactory, circuitRegistry); var httpContext = new DefaultHttpContext(); var httpRequest = httpContext.Request; @@ -117,7 +123,7 @@ namespace Microsoft.AspNetCore.Components.Server.Tests.Circuits return uriHelper; }); var serviceScope = serviceCollection.BuildServiceProvider().CreateScope(); - return TestCircuitHost.Create(serviceScope); + return TestCircuitHost.Create(Guid.NewGuid().ToString(), serviceScope); } } diff --git a/src/Components/Server/test/Circuits/CircuitRegistryTest.cs b/src/Components/Server/test/Circuits/CircuitRegistryTest.cs index d0da0cf00d..54e85ba323 100644 --- a/src/Components/Server/test/Circuits/CircuitRegistryTest.cs +++ b/src/Components/Server/test/Circuits/CircuitRegistryTest.cs @@ -4,6 +4,7 @@ using System; using System.Threading; using System.Threading.Tasks; +using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Logging.Abstractions; @@ -34,8 +35,10 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits public async Task ConnectAsync_TransfersClientOnActiveCircuit() { // Arrange - var registry = CreateRegistry(); - var circuitHost = TestCircuitHost.Create(); + var circuitIdFactory = TestCircuitIdFactory.CreateTestFactory(); + + var registry = CreateRegistry(circuitIdFactory); + var circuitHost = TestCircuitHost.Create(circuitIdFactory.CreateCircuitId()); registry.Register(circuitHost); var newClient = Mock.Of(); @@ -57,8 +60,10 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits public async Task ConnectAsync_MakesInactiveCircuitActive() { // Arrange - var registry = CreateRegistry(); - var circuitHost = TestCircuitHost.Create(); + var circuitIdFactory = TestCircuitIdFactory.CreateTestFactory(); + + var registry = CreateRegistry(circuitIdFactory); + var circuitHost = TestCircuitHost.Create(circuitIdFactory.CreateCircuitId()); registry.DisconnectedCircuits.Set(circuitHost.CircuitId, circuitHost, new MemoryCacheEntryOptions { Size = 1 }); var newClient = Mock.Of(); @@ -81,9 +86,10 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits public async Task ConnectAsync_InvokesCircuitHandlers_WhenCircuitWasPreviouslyDisconnected() { // Arrange - var registry = CreateRegistry(); + var circuitIdFactory = TestCircuitIdFactory.CreateTestFactory(); + var registry = CreateRegistry(circuitIdFactory); var handler = new Mock { CallBase = true }; - var circuitHost = TestCircuitHost.Create(handlers: new[] { handler.Object }); + var circuitHost = TestCircuitHost.Create(circuitIdFactory.CreateCircuitId(), handlers: new[] { handler.Object }); registry.DisconnectedCircuits.Set(circuitHost.CircuitId, circuitHost, new MemoryCacheEntryOptions { Size = 1 }); var newClient = Mock.Of(); @@ -104,9 +110,10 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits public async Task ConnectAsync_InvokesCircuitHandlers_WhenCircuitWasConsideredConnected() { // Arrange - var registry = CreateRegistry(); + var circuitIdFactory = TestCircuitIdFactory.CreateTestFactory(); + var registry = CreateRegistry(circuitIdFactory); var handler = new Mock { CallBase = true }; - var circuitHost = TestCircuitHost.Create(handlers: new[] { handler.Object }); + var circuitHost = TestCircuitHost.Create(circuitIdFactory.CreateCircuitId(), handlers: new[] { handler.Object }); registry.Register(circuitHost); var newClient = Mock.Of(); @@ -199,11 +206,13 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits public async Task Connect_WhileDisconnectIsInProgress() { // Arrange - var registry = new TestCircuitRegistry(); + var circuitIdFactory = TestCircuitIdFactory.CreateTestFactory(); + + var registry = new TestCircuitRegistry(circuitIdFactory); registry.BeforeDisconnect = new ManualResetEventSlim(); var tcs = new TaskCompletionSource(); - var circuitHost = TestCircuitHost.Create(); + var circuitHost = TestCircuitHost.Create(circuitIdFactory.CreateCircuitId()); registry.Register(circuitHost); var client = Mock.Of(); var newId = "new-connection"; @@ -238,13 +247,15 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits public async Task Connect_WhileDisconnectIsInProgress_SeriallyExecutesCircuitHandlers() { // Arrange - var registry = new TestCircuitRegistry(); + var circuitIdFactory = TestCircuitIdFactory.CreateTestFactory(); + + var registry = new TestCircuitRegistry(circuitIdFactory); registry.BeforeDisconnect = new ManualResetEventSlim(); // This verifies that connection up \ down events on a circuit handler are always invoked serially. var circuitHandler = new SerialCircuitHandler(); var tcs = new TaskCompletionSource(); - var circuitHost = TestCircuitHost.Create(handlers: new[] { circuitHandler }); + var circuitHost = TestCircuitHost.Create(circuitIdFactory.CreateCircuitId(), handlers: new[] { circuitHandler }); registry.Register(circuitHost); var client = Mock.Of(); var newId = "new-connection"; @@ -276,9 +287,11 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits public async Task DisconnectWhenAConnectIsInProgress() { // Arrange - var registry = new TestCircuitRegistry(); + var circuitIdFactory = TestCircuitIdFactory.CreateTestFactory(); + + var registry = new TestCircuitRegistry(circuitIdFactory); registry.BeforeConnect = new ManualResetEventSlim(); - var circuitHost = TestCircuitHost.Create(); + var circuitHost = TestCircuitHost.Create(circuitIdFactory.CreateCircuitId()); registry.Register(circuitHost); var client = Mock.Of(); var oldId = circuitHost.Client.ConnectionId; @@ -302,8 +315,8 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits private class TestCircuitRegistry : CircuitRegistry { - public TestCircuitRegistry() - : base(Options.Create(new CircuitOptions()), NullLogger.Instance) + public TestCircuitRegistry(CircuitIdFactory factory) + : base(Options.Create(new CircuitOptions()), NullLogger.Instance, factory) { } @@ -331,11 +344,12 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits } } - private static CircuitRegistry CreateRegistry() + private static CircuitRegistry CreateRegistry(CircuitIdFactory factory = null) { return new CircuitRegistry( Options.Create(new CircuitOptions()), - NullLogger.Instance); + NullLogger.Instance, + factory ?? TestCircuitIdFactory.CreateTestFactory()); } private class SerialCircuitHandler : CircuitHandler diff --git a/src/Components/Server/test/Circuits/RemoteRendererTest.cs b/src/Components/Server/test/Circuits/RemoteRendererTest.cs index 428e173a26..630fd75c7e 100644 --- a/src/Components/Server/test/Circuits/RemoteRendererTest.cs +++ b/src/Components/Server/test/Circuits/RemoteRendererTest.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Text.Encodings.Web; using System.Threading; using System.Threading.Tasks; @@ -19,6 +20,10 @@ namespace Microsoft.AspNetCore.Components.Browser.Rendering { public class RemoteRendererTest : HtmlRendererTestBase { + // Nothing should exceed the timeout in a successful run of the the tests, this is just here to catch + // failures. + private static readonly TimeSpan Timeout = Debugger.IsAttached ? System.Threading.Timeout.InfiniteTimeSpan : TimeSpan.FromSeconds(10); + protected override HtmlRenderer GetHtmlRenderer(IServiceProvider serviceProvider) { return GetRemoteRenderer(serviceProvider, new CircuitClientProxy()); @@ -50,6 +55,7 @@ namespace Microsoft.AspNetCore.Components.Browser.Rendering public async Task ProcessBufferedRenderBatches_WritesRenders() { // Arrange + var @event = new ManualResetEventSlim(); var serviceProvider = new ServiceCollection().BuildServiceProvider(); var renderIds = new List(); @@ -78,8 +84,13 @@ namespace Microsoft.AspNetCore.Components.Browser.Rendering var componentId = renderer.AssignRootComponentId(component); component.TriggerRender(); renderer.OnRenderCompleted(2, null); + + @event.Reset(); firstBatchTCS.SetResult(null); + // Waiting is required here because the continuations of SetResult will not execute synchronously. + @event.Wait(Timeout); + circuitClient.SetDisconnected(); component.TriggerRender(); component.TriggerRender(); @@ -261,7 +272,7 @@ namespace Microsoft.AspNetCore.Components.Browser.Rendering NullLogger.Instance); } - private class TestComponent : IComponent + private class TestComponent : IComponent, IHandleAfterRender { private RenderHandle _renderHandle; private RenderFragment _renderFragment = (builder) => @@ -280,11 +291,19 @@ namespace Microsoft.AspNetCore.Components.Browser.Rendering _renderFragment = renderFragment; } + public Action OnAfterRenderComplete { get; set; } + public void Configure(RenderHandle renderHandle) { _renderHandle = renderHandle; } + public Task OnAfterRenderAsync() + { + OnAfterRenderComplete?.Invoke(); + return Task.CompletedTask; + } + public Task SetParametersAsync(ParameterCollection parameters) { TriggerRender(); diff --git a/src/Components/Server/test/Circuits/TestCircuitHost.cs b/src/Components/Server/test/Circuits/TestCircuitHost.cs index c07fb92932..26ca1f224d 100644 --- a/src/Components/Server/test/Circuits/TestCircuitHost.cs +++ b/src/Components/Server/test/Circuits/TestCircuitHost.cs @@ -18,8 +18,8 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits { internal class TestCircuitHost : CircuitHost { - private TestCircuitHost(IServiceScope scope, CircuitClientProxy client, RendererRegistry rendererRegistry, RemoteRenderer renderer, IList descriptors, IDispatcher dispatcher, RemoteJSRuntime jsRuntime, CircuitHandler[] circuitHandlers, ILogger logger) - : base(scope, client, rendererRegistry, renderer, descriptors, dispatcher, jsRuntime, circuitHandlers, logger) + private TestCircuitHost(string circuitId, IServiceScope scope, CircuitClientProxy client, RendererRegistry rendererRegistry, RemoteRenderer renderer, IList descriptors, IDispatcher dispatcher, RemoteJSRuntime jsRuntime, CircuitHandler[] circuitHandlers, ILogger logger) + : base(circuitId, scope, client, rendererRegistry, renderer, descriptors, dispatcher, jsRuntime, circuitHandlers, logger) { } @@ -29,6 +29,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits } public static CircuitHost Create( + string circuitId = null, IServiceScope serviceScope = null, RemoteRenderer remoteRenderer = null, CircuitHandler[] handlers = null, @@ -54,6 +55,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits handlers = handlers ?? Array.Empty(); return new TestCircuitHost( + circuitId ?? Guid.NewGuid().ToString(), serviceScope, clientProxy, renderRegistry, diff --git a/src/Components/Server/test/Circuits/TestCircuitIdFactory.cs b/src/Components/Server/test/Circuits/TestCircuitIdFactory.cs new file mode 100644 index 0000000000..18dca9b964 --- /dev/null +++ b/src/Components/Server/test/Circuits/TestCircuitIdFactory.cs @@ -0,0 +1,15 @@ +// 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 Microsoft.AspNetCore.DataProtection; + +namespace Microsoft.AspNetCore.Components.Server.Circuits +{ + internal class TestCircuitIdFactory + { + public static CircuitIdFactory CreateTestFactory() + { + return new CircuitIdFactory(new EphemeralDataProtectionProvider()); + } + } +} diff --git a/src/Components/Server/test/ComponentEndpointRouteBuilderExtensionsTest.cs b/src/Components/Server/test/ComponentEndpointRouteBuilderExtensionsTest.cs new file mode 100644 index 0000000000..817ec5474d --- /dev/null +++ b/src/Components/Server/test/ComponentEndpointRouteBuilderExtensionsTest.cs @@ -0,0 +1,64 @@ +// 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 Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Builder.Internal; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using Moq; +using Xunit; + +namespace Microsoft.AspNetCore.Components.Server.Tests +{ + public class ComponentEndpointRouteBuilderExtensionsTest + { + [Fact] + public void MapBlazorHub_WiresUp_UnderlyingHub() + { + // Arrange + var applicationBuilder = new ApplicationBuilder( + new ServiceCollection() + .AddLogging() + .AddSingleton(Mock.Of()) + .AddSignalR().Services + .AddServerSideBlazor().Services.BuildServiceProvider()); + var called = false; + + // Act + var app = applicationBuilder + .UseRouting() + .UseEndpoints(endpoints => + { + endpoints.MapBlazorHub(dispatchOptions => called = true); + }).Build(); + + // Assert + Assert.True(called); + } + + [Fact] + public void MapBlazorHub_MostGeneralOverload_MapsUnderlyingHub() + { + // Arrange + var applicationBuilder = new ApplicationBuilder( + new ServiceCollection() + .AddLogging() + .AddSingleton(Mock.Of()) + .AddSignalR().Services + .AddServerSideBlazor().Services.BuildServiceProvider()); + var called = false; + + // Act + var app = applicationBuilder + .UseRouting() + .UseEndpoints(endpoints => + { + endpoints.MapBlazorHub(Mock.Of().GetType(),"app", "_blazor", dispatchOptions => called = true); + }).Build(); + + // Assert + Assert.True(called); + } + } +} diff --git a/src/Components/Shared/test/TestRenderer.cs b/src/Components/Shared/test/TestRenderer.cs index 8b0cecd4f9..d838ea007b 100644 --- a/src/Components/Shared/test/TestRenderer.cs +++ b/src/Components/Shared/test/TestRenderer.cs @@ -25,8 +25,12 @@ namespace Microsoft.AspNetCore.Components.Test.Helpers { } + public Action OnExceptionHandled { get; set; } + public Action OnUpdateDisplay { get; set; } + public Action OnUpdateDisplayComplete { get; set; } + public List Batches { get; } = new List(); @@ -77,10 +81,11 @@ namespace Microsoft.AspNetCore.Components.Test.Helpers { if (!ShouldHandleExceptions) { - throw exception; + ExceptionDispatchInfo.Capture(exception).Throw(); } HandledExceptions.Add(exception); + OnExceptionHandled?.Invoke(); } protected override Task UpdateDisplayAsync(in RenderBatch renderBatch) @@ -102,6 +107,8 @@ namespace Microsoft.AspNetCore.Components.Test.Helpers // This renderer updates the UI synchronously, like the WebAssembly one. // To test async UI updates, subclass TestRenderer and override UpdateDisplayAsync. + + OnUpdateDisplayComplete?.Invoke(); return Task.CompletedTask; } } diff --git a/src/Components/test/E2ETest/TestJsonSerializerOptionsProvider.cs b/src/Components/test/E2ETest/TestJsonSerializerOptionsProvider.cs new file mode 100644 index 0000000000..b6cb0d025e --- /dev/null +++ b/src/Components/test/E2ETest/TestJsonSerializerOptionsProvider.cs @@ -0,0 +1,15 @@ +// 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.Text.Json.Serialization; + +namespace Microsoft.AspNetCore.Components.E2ETest +{ + internal static class TestJsonSerializerOptionsProvider + { + public static JsonSerializerOptions Options { get; } = new JsonSerializerOptions + { + PropertyNamingPolicy = JsonNamingPolicy.CamelCase, + }; + } +} diff --git a/src/Components/test/E2ETest/Tests/AuthTest.cs b/src/Components/test/E2ETest/Tests/AuthTest.cs index cc3139b6ab..9c2c26b0c6 100644 --- a/src/Components/test/E2ETest/Tests/AuthTest.cs +++ b/src/Components/test/E2ETest/Tests/AuthTest.cs @@ -16,6 +16,10 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests // These strings correspond to the links in BasicTestApp\AuthTest\Links.razor const string CascadingAuthenticationStateLink = "Cascading authentication state"; const string AuthorizeViewCases = "AuthorizeView cases"; + const string PageAllowingAnonymous = "Page allowing anonymous"; + const string PageRequiringAuthorization = "Page requiring any authentication"; + const string PageRequiringPolicy = "Page requiring policy"; + const string PageRequiringRole = "Page requiring role"; public AuthTest( BrowserFixture browserFixture, @@ -32,7 +36,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests [Fact] public void CascadingAuthenticationState_Unauthenticated() { - SignInAs(null); + SignInAs(null, null); var appElement = MountAndNavigateToAuthTest(CascadingAuthenticationStateLink); @@ -44,7 +48,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests [Fact] public void CascadingAuthenticationState_Authenticated() { - SignInAs("someone cool"); + SignInAs("someone cool", null); var appElement = MountAndNavigateToAuthTest(CascadingAuthenticationStateLink); @@ -54,22 +58,132 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests } [Fact] - public void AuthorizeViewCases_NoAuthorizationRule_Unauthenticated() + public void AuthorizeViewCases_NoAuthorizationRule_NotAuthorized() { - SignInAs(null); - MountAndNavigateToAuthTest(AuthorizeViewCases); + SignInAs(null, null); + var appElement = MountAndNavigateToAuthTest(AuthorizeViewCases); WaitUntilExists(By.CssSelector("#no-authorization-rule .not-authorized")); + Browser.Equal("You're not authorized, anonymous", () => + appElement.FindElement(By.CssSelector("#no-authorization-rule .not-authorized")).Text); } [Fact] - public void AuthorizeViewCases_NoAuthorizationRule_Authenticated() + public void AuthorizeViewCases_NoAuthorizationRule_Authorized() { - SignInAs("Some User"); + SignInAs("Some User", null); var appElement = MountAndNavigateToAuthTest(AuthorizeViewCases); Browser.Equal("Welcome, Some User!", () => appElement.FindElement(By.CssSelector("#no-authorization-rule .authorized")).Text); } + [Fact] + public void AuthorizeViewCases_RequireRole_Authorized() + { + SignInAs("Some User", "IrrelevantRole,TestRole"); + var appElement = MountAndNavigateToAuthTest(AuthorizeViewCases); + Browser.Equal("Welcome, Some User!", () => + appElement.FindElement(By.CssSelector("#authorize-role .authorized")).Text); + } + + [Fact] + public void AuthorizeViewCases_RequireRole_NotAuthorized() + { + SignInAs("Some User", "IrrelevantRole"); + var appElement = MountAndNavigateToAuthTest(AuthorizeViewCases); + Browser.Equal("You're not authorized, Some User", () => + appElement.FindElement(By.CssSelector("#authorize-role .not-authorized")).Text); + } + + [Fact] + public void AuthorizeViewCases_RequirePolicy_Authorized() + { + SignInAs("Bert", null); + var appElement = MountAndNavigateToAuthTest(AuthorizeViewCases); + Browser.Equal("Welcome, Bert!", () => + appElement.FindElement(By.CssSelector("#authorize-policy .authorized")).Text); + } + + [Fact] + public void AuthorizeViewCases_RequirePolicy_NotAuthorized() + { + SignInAs("Mallory", null); + var appElement = MountAndNavigateToAuthTest(AuthorizeViewCases); + Browser.Equal("You're not authorized, Mallory", () => + appElement.FindElement(By.CssSelector("#authorize-policy .not-authorized")).Text); + } + + [Fact] + public void Router_AllowAnonymous_Anonymous() + { + SignInAs(null, null); + var appElement = MountAndNavigateToAuthTest(PageAllowingAnonymous); + Browser.Equal("Welcome to PageAllowingAnonymous!", () => + appElement.FindElement(By.CssSelector("#auth-success")).Text); + } + + [Fact] + public void Router_AllowAnonymous_Authenticated() + { + SignInAs("Bert", null); + var appElement = MountAndNavigateToAuthTest(PageAllowingAnonymous); + Browser.Equal("Welcome to PageAllowingAnonymous!", () => + appElement.FindElement(By.CssSelector("#auth-success")).Text); + } + + [Fact] + public void Router_RequireAuthorization_Authorized() + { + SignInAs("Bert", null); + var appElement = MountAndNavigateToAuthTest(PageRequiringAuthorization); + Browser.Equal("Welcome to PageRequiringAuthorization!", () => + appElement.FindElement(By.CssSelector("#auth-success")).Text); + } + + [Fact] + public void Router_RequireAuthorization_NotAuthorized() + { + SignInAs(null, null); + var appElement = MountAndNavigateToAuthTest(PageRequiringAuthorization); + Browser.Equal("Sorry, anonymous, you're not authorized.", () => + appElement.FindElement(By.CssSelector("#auth-failure")).Text); + } + + [Fact] + public void Router_RequirePolicy_Authorized() + { + SignInAs("Bert", null); + var appElement = MountAndNavigateToAuthTest(PageRequiringPolicy); + Browser.Equal("Welcome to PageRequiringPolicy!", () => + appElement.FindElement(By.CssSelector("#auth-success")).Text); + } + + [Fact] + public void Router_RequirePolicy_NotAuthorized() + { + SignInAs("Mallory", null); + var appElement = MountAndNavigateToAuthTest(PageRequiringPolicy); + Browser.Equal("Sorry, Mallory, you're not authorized.", () => + appElement.FindElement(By.CssSelector("#auth-failure")).Text); + } + + [Fact] + public void Router_RequireRole_Authorized() + { + SignInAs("Bert", "IrrelevantRole,TestRole"); + var appElement = MountAndNavigateToAuthTest(PageRequiringRole); + Browser.Equal("Welcome to PageRequiringRole!", () => + appElement.FindElement(By.CssSelector("#auth-success")).Text); + } + + [Fact] + public void Router_RequireRole_NotAuthorized() + { + SignInAs("Bert", "IrrelevantRole"); + var appElement = MountAndNavigateToAuthTest(PageRequiringRole); + Browser.Equal("Sorry, Bert, you're not authorized.", () => + appElement.FindElement(By.CssSelector("#auth-failure")).Text); + } + IWebElement MountAndNavigateToAuthTest(string authLinkText) { Navigate(ServerPathBase); @@ -79,12 +193,12 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests return appElement; } - void SignInAs(string usernameOrNull) + void SignInAs(string usernameOrNull, string rolesOrNull) { const string authenticationPageUrl = "/Authentication"; var baseRelativeUri = usernameOrNull == null ? $"{authenticationPageUrl}?signout=true" - : $"{authenticationPageUrl}?username={usernameOrNull}"; + : $"{authenticationPageUrl}?username={usernameOrNull}&roles={rolesOrNull}"; Navigate(baseRelativeUri); WaitUntilExists(By.CssSelector("h1#authentication")); } diff --git a/src/Components/test/E2ETest/Tests/ComponentRenderingTest.cs b/src/Components/test/E2ETest/Tests/ComponentRenderingTest.cs index c88d2997c6..59d6c73211 100644 --- a/src/Components/test/E2ETest/Tests/ComponentRenderingTest.cs +++ b/src/Components/test/E2ETest/Tests/ComponentRenderingTest.cs @@ -597,6 +597,26 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests Browser.Equal("Hello from interop call", () => appElement.FindElement(By.Id("val-set-by-interop")).GetAttribute("value")); } + [Fact] + public void CanUseAddMultipleAttributes() + { + var appElement = MountTestComponent(); + + var selector = By.CssSelector("#duplicate-on-element > div"); + WaitUntilExists(selector); + + var element = appElement.FindElement(selector); + Assert.Equal(string.Empty, element.GetAttribute("bool")); // attribute is present + Assert.Equal("middle-value", element.GetAttribute("string")); + Assert.Equal("unmatched-value", element.GetAttribute("unmatched")); + + selector = By.CssSelector("#duplicate-on-element-override > div"); + element = appElement.FindElement(selector); + Assert.Null(element.GetAttribute("bool")); // attribute is not present + Assert.Equal("other-text", element.GetAttribute("string")); + Assert.Equal("unmatched-value", element.GetAttribute("unmatched")); + } + static IAlert SwitchToAlert(IWebDriver driver) { try diff --git a/src/Components/test/E2ETest/Tests/EventCallbackTest.cs b/src/Components/test/E2ETest/Tests/EventCallbackTest.cs index 01d53d6b20..2ab5bebe05 100644 --- a/src/Components/test/E2ETest/Tests/EventCallbackTest.cs +++ b/src/Components/test/E2ETest/Tests/EventCallbackTest.cs @@ -1,7 +1,6 @@ // 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.Threading.Tasks; using BasicTestApp; using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; @@ -40,9 +39,9 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests { var target = Browser.FindElement(By.CssSelector($"#{@case} button")); var count = Browser.FindElement(By.Id("render_count")); - Assert.Equal("Render Count: 1", count.Text); + Browser.Equal("Render Count: 1", () => count.Text); target.Click(); - Assert.Equal("Render Count: 2", count.Text); + Browser.Equal("Render Count: 2", () => count.Text); } } } diff --git a/src/Components/test/E2ETest/Tests/FormsTest.cs b/src/Components/test/E2ETest/Tests/FormsTest.cs index 9f1083af20..ec0c5fcddf 100644 --- a/src/Components/test/E2ETest/Tests/FormsTest.cs +++ b/src/Components/test/E2ETest/Tests/FormsTest.cs @@ -12,6 +12,7 @@ using OpenQA.Selenium; using OpenQA.Selenium.Support.UI; using System; using System.Linq; +using System.Security.Cryptography; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -38,11 +39,15 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests public async Task EditFormWorksWithDataAnnotationsValidator() { var appElement = MountTestComponent(); + var form = appElement.FindElement(By.TagName("form")); var userNameInput = appElement.FindElement(By.ClassName("user-name")).FindElement(By.TagName("input")); var acceptsTermsInput = appElement.FindElement(By.ClassName("accepts-terms")).FindElement(By.TagName("input")); var submitButton = appElement.FindElement(By.TagName("button")); var messagesAccessor = CreateValidationMessagesAccessor(appElement); + // The form emits unmatched attributes + Browser.Equal("off", () => form.GetAttribute("autocomplete")); + // Editing a field doesn't trigger validation on its own userNameInput.SendKeys("Bert\t"); acceptsTermsInput.Click(); // Accept terms @@ -77,6 +82,9 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests var nameInput = appElement.FindElement(By.ClassName("name")).FindElement(By.TagName("input")); var messagesAccessor = CreateValidationMessagesAccessor(appElement); + // InputText emits unmatched attributes + Browser.Equal("Enter your name", () => nameInput.GetAttribute("placeholder")); + // Validates on edit Browser.Equal("valid", () => nameInput.GetAttribute("class")); nameInput.SendKeys("Bert\t"); @@ -101,6 +109,9 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests var ageInput = appElement.FindElement(By.ClassName("age")).FindElement(By.TagName("input")); var messagesAccessor = CreateValidationMessagesAccessor(appElement); + // InputNumber emits unmatched attributes + Browser.Equal("Enter your age", () => ageInput.GetAttribute("placeholder")); + // Validates on edit Browser.Equal("valid", () => ageInput.GetAttribute("class")); ageInput.SendKeys("123\t"); @@ -154,6 +165,9 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests var descriptionInput = appElement.FindElement(By.ClassName("description")).FindElement(By.TagName("textarea")); var messagesAccessor = CreateValidationMessagesAccessor(appElement); + // InputTextArea emits unmatched attributes + Browser.Equal("Tell us about yourself", () => descriptionInput.GetAttribute("placeholder")); + // Validates on edit Browser.Equal("valid", () => descriptionInput.GetAttribute("class")); descriptionInput.SendKeys("Hello\t"); @@ -178,6 +192,9 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests var renewalDateInput = appElement.FindElement(By.ClassName("renewal-date")).FindElement(By.TagName("input")); var messagesAccessor = CreateValidationMessagesAccessor(appElement); + // InputDate emits unmatched attributes + Browser.Equal("Enter the date", () => renewalDateInput.GetAttribute("placeholder")); + // Validates on edit Browser.Equal("valid", () => renewalDateInput.GetAttribute("class")); renewalDateInput.SendKeys("01/01/2000\t"); @@ -232,6 +249,9 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests var select = ticketClassInput.WrappedElement; var messagesAccessor = CreateValidationMessagesAccessor(appElement); + // InputSelect emits unmatched attributes + Browser.Equal("4", () => select.GetAttribute("size")); + // Validates on edit Browser.Equal("valid", () => select.GetAttribute("class")); ticketClassInput.SelectByText("First class"); @@ -251,6 +271,9 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests var isEvilInput = appElement.FindElement(By.ClassName("is-evil")).FindElement(By.TagName("input")); var messagesAccessor = CreateValidationMessagesAccessor(appElement); + // InputCheckbox emits unmatched attributes + Browser.Equal("You have to check this", () => acceptsTermsInput.GetAttribute("title")); + // Correct initial checkedness Assert.False(acceptsTermsInput.Selected); Assert.True(isEvilInput.Selected); diff --git a/src/Components/test/E2ETest/Tests/InteropTest.cs b/src/Components/test/E2ETest/Tests/InteropTest.cs index 7ab262c465..72b6ceec20 100644 --- a/src/Components/test/E2ETest/Tests/InteropTest.cs +++ b/src/Components/test/E2ETest/Tests/InteropTest.cs @@ -1,6 +1,8 @@ +// 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.Threading.Tasks; using BasicTestApp; using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; diff --git a/src/Components/test/E2ETest/Tests/KeyTest.cs b/src/Components/test/E2ETest/Tests/KeyTest.cs index 2cb0e58d18..8622144969 100644 --- a/src/Components/test/E2ETest/Tests/KeyTest.cs +++ b/src/Components/test/E2ETest/Tests/KeyTest.cs @@ -4,12 +4,12 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Text.Json.Serialization; using System.Threading.Tasks; using BasicTestApp; using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using Microsoft.AspNetCore.E2ETesting; -using Microsoft.JSInterop; using OpenQA.Selenium; using OpenQA.Selenium.Interactions; using Xunit; @@ -276,8 +276,8 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests { var rootBefore = new Node(null, "root", before); var rootAfter = new Node(null, "root", after); - var jsonBefore = Json.Serialize(rootBefore); - var jsonAfter = Json.Serialize(rootAfter); + var jsonBefore = JsonSerializer.ToString(rootBefore, TestJsonSerializerOptionsProvider.Options); + var jsonAfter = JsonSerializer.ToString(rootAfter, TestJsonSerializerOptionsProvider.Options); var appElem = MountTestComponent(); var textbox = appElem.FindElement(By.TagName("textarea")); @@ -328,7 +328,8 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests private void SetTextAreaValueFast(IWebElement textAreaElementWithId, string value) { var javascript = (IJavaScriptExecutor)Browser; - javascript.ExecuteScript($"document.getElementById('{textAreaElementWithId.GetAttribute("id")}').value = {Json.Serialize(value)}"); + javascript.ExecuteScript( + $"document.getElementById('{textAreaElementWithId.GetAttribute("id")}').value = {JsonSerializer.ToString(value, TestJsonSerializerOptionsProvider.Options)}"); textAreaElementWithId.SendKeys(" "); // So it fires the change event } diff --git a/src/Components/test/E2ETest/Tests/PerformanceTest.cs b/src/Components/test/E2ETest/Tests/PerformanceTest.cs index 6bfd995e6f..652226bf26 100644 --- a/src/Components/test/E2ETest/Tests/PerformanceTest.cs +++ b/src/Components/test/E2ETest/Tests/PerformanceTest.cs @@ -1,13 +1,12 @@ // 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.Linq; using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using Microsoft.AspNetCore.E2ETesting; using OpenQA.Selenium; -using System; -using System.Linq; -using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; diff --git a/src/Components/test/testassets/BasicTestApp/AddRemoveChildComponents.razor b/src/Components/test/testassets/BasicTestApp/AddRemoveChildComponents.razor index 3603cbb45f..91d7525c8d 100644 --- a/src/Components/test/testassets/BasicTestApp/AddRemoveChildComponents.razor +++ b/src/Components/test/testassets/BasicTestApp/AddRemoveChildComponents.razor @@ -1,14 +1,14 @@ -@using System.Collections.Generic +@using System.Collections.Generic Child components follow. - - + + @foreach (var message in currentChildrenMessages) {

} -@functions { +@code { int numAdded = 0; List currentChildrenMessages = new List(); diff --git a/src/Components/test/testassets/BasicTestApp/AfterRenderInteropComponent.razor b/src/Components/test/testassets/BasicTestApp/AfterRenderInteropComponent.razor index c0a8cb4bca..97492052fd 100644 --- a/src/Components/test/testassets/BasicTestApp/AfterRenderInteropComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/AfterRenderInteropComponent.razor @@ -1,9 +1,9 @@ @using Microsoft.JSInterop @inject IJSRuntime JSRuntime - + -@functions { +@code { ElementRef myInput; protected override void OnAfterRender() diff --git a/src/Components/test/testassets/BasicTestApp/AsyncEventHandlerComponent.razor b/src/Components/test/testassets/BasicTestApp/AsyncEventHandlerComponent.razor index b35b775cd7..592ceb275a 100644 --- a/src/Components/test/testassets/BasicTestApp/AsyncEventHandlerComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/AsyncEventHandlerComponent.razor @@ -1,12 +1,12 @@ -@using System.Threading.Tasks +@using System.Threading.Tasks
@state - - + +
-@functions +@code { TaskCompletionSource _tcs; string state = "Stopped"; diff --git a/src/Components/test/testassets/BasicTestApp/AuthTest/AuthRouter.razor b/src/Components/test/testassets/BasicTestApp/AuthTest/AuthRouter.razor index 299a5beb87..34be56726f 100644 --- a/src/Components/test/testassets/BasicTestApp/AuthTest/AuthRouter.razor +++ b/src/Components/test/testassets/BasicTestApp/AuthTest/AuthRouter.razor @@ -9,13 +9,20 @@ *@ - + + Authorizing... + +
+ Sorry, @(context.User.Identity.Name ?? "anonymous"), you're not authorized. +
+ +
-@functions { +@code { protected override void OnInit() { // Start at AuthHome, not at any other component in the same app that happens to diff --git a/src/Components/test/testassets/BasicTestApp/AuthTest/AuthorizeViewCases.razor b/src/Components/test/testassets/BasicTestApp/AuthTest/AuthorizeViewCases.razor index d78c70f72a..00b39652f2 100644 --- a/src/Components/test/testassets/BasicTestApp/AuthTest/AuthorizeViewCases.razor +++ b/src/Components/test/testassets/BasicTestApp/AuthTest/AuthorizeViewCases.razor @@ -11,7 +11,39 @@

Welcome, @context.User.Identity.Name!

-

You're not logged in.

+

You're not authorized, @(context.User.Identity.Name ?? "anonymous")

+ + + + +
+

Scenario: Require role

+ + + +

Authorizing...

+ + +

Welcome, @context.User.Identity.Name!

+ + +

You're not authorized, @(context.User.Identity.Name ?? "anonymous")

+ + +
+ +
+

Scenario: Require policy

+ + + +

Authorizing...

+ + +

Welcome, @context.User.Identity.Name!

+ + +

You're not authorized, @(context.User.Identity.Name ?? "anonymous")
diff --git a/src/Components/test/testassets/BasicTestApp/AuthTest/CascadingAuthenticationStateConsumer.razor b/src/Components/test/testassets/BasicTestApp/AuthTest/CascadingAuthenticationStateConsumer.razor index 8113e1080f..9c61665fc7 100644 --- a/src/Components/test/testassets/BasicTestApp/AuthTest/CascadingAuthenticationStateConsumer.razor +++ b/src/Components/test/testassets/BasicTestApp/AuthTest/CascadingAuthenticationStateConsumer.razor @@ -32,7 +32,7 @@ else

} -@functions +@code { static Predicate TestClaimPredicate = c => c.Type == "test-claim"; diff --git a/src/Components/test/testassets/BasicTestApp/AuthTest/ClientSideAuthenticationStateData.cs b/src/Components/test/testassets/BasicTestApp/AuthTest/ClientSideAuthenticationStateData.cs index 15178b5d82..ad8253dd40 100644 --- a/src/Components/test/testassets/BasicTestApp/AuthTest/ClientSideAuthenticationStateData.cs +++ b/src/Components/test/testassets/BasicTestApp/AuthTest/ClientSideAuthenticationStateData.cs @@ -12,6 +12,12 @@ namespace BasicTestApp.AuthTest public string UserName { get; set; } - public Dictionary ExposedClaims { get; set; } + public List ExposedClaims { get; set; } + } + + public class ExposedClaim + { + public string Type { get; set; } + public string Value { get; set; } } } diff --git a/src/Components/test/testassets/BasicTestApp/AuthTest/Links.razor b/src/Components/test/testassets/BasicTestApp/AuthTest/Links.razor index 70f524a763..35ff333ed7 100644 --- a/src/Components/test/testassets/BasicTestApp/AuthTest/Links.razor +++ b/src/Components/test/testassets/BasicTestApp/AuthTest/Links.razor @@ -1,8 +1,11 @@ -@using Microsoft.AspNetCore.Components.Routing

To change the underlying authentication state, go here.

diff --git a/src/Components/test/testassets/BasicTestApp/AuthTest/PageAllowingAnonymous.razor b/src/Components/test/testassets/BasicTestApp/AuthTest/PageAllowingAnonymous.razor new file mode 100644 index 0000000000..7a5d7597e3 --- /dev/null +++ b/src/Components/test/testassets/BasicTestApp/AuthTest/PageAllowingAnonymous.razor @@ -0,0 +1,5 @@ +@page "/PageAllowingAnonymous" +@using Microsoft.AspNetCore.Authorization +@attribute [Authorize(Roles = "NobodyIsInThisRole")] +@attribute [AllowAnonymous] +
Welcome to PageAllowingAnonymous!
diff --git a/src/Components/test/testassets/BasicTestApp/AuthTest/PageRequiringAuthorization.razor b/src/Components/test/testassets/BasicTestApp/AuthTest/PageRequiringAuthorization.razor new file mode 100644 index 0000000000..a509e07df8 --- /dev/null +++ b/src/Components/test/testassets/BasicTestApp/AuthTest/PageRequiringAuthorization.razor @@ -0,0 +1,4 @@ +@page "/PageRequiringAuthorization" +@using Microsoft.AspNetCore.Authorization +@attribute [Authorize] +
Welcome to PageRequiringAuthorization!
diff --git a/src/Components/test/testassets/BasicTestApp/AuthTest/PageRequiringPolicy.razor b/src/Components/test/testassets/BasicTestApp/AuthTest/PageRequiringPolicy.razor new file mode 100644 index 0000000000..61d831b9f6 --- /dev/null +++ b/src/Components/test/testassets/BasicTestApp/AuthTest/PageRequiringPolicy.razor @@ -0,0 +1,4 @@ +@page "/PageRequiringPolicy" +@using Microsoft.AspNetCore.Authorization +@attribute [Authorize(Policy = "NameMustStartWithB")] +
Welcome to PageRequiringPolicy!
diff --git a/src/Components/test/testassets/BasicTestApp/AuthTest/PageRequiringRole.razor b/src/Components/test/testassets/BasicTestApp/AuthTest/PageRequiringRole.razor new file mode 100644 index 0000000000..e12462c7e2 --- /dev/null +++ b/src/Components/test/testassets/BasicTestApp/AuthTest/PageRequiringRole.razor @@ -0,0 +1,4 @@ +@page "/PageRequiringRole" +@using Microsoft.AspNetCore.Authorization +@attribute [Authorize(Roles = "TestRole")] +
Welcome to PageRequiringRole!
diff --git a/src/Components/test/testassets/BasicTestApp/AuthTest/ServerAuthenticationStateProvider.cs b/src/Components/test/testassets/BasicTestApp/AuthTest/ServerAuthenticationStateProvider.cs index 08639f9254..40750c9c9d 100644 --- a/src/Components/test/testassets/BasicTestApp/AuthTest/ServerAuthenticationStateProvider.cs +++ b/src/Components/test/testassets/BasicTestApp/AuthTest/ServerAuthenticationStateProvider.cs @@ -29,7 +29,7 @@ namespace BasicTestApp.AuthTest if (data.IsAuthenticated) { var claims = new[] { new Claim(ClaimTypes.Name, data.UserName) } - .Concat(data.ExposedClaims.Select(c => new Claim(c.Key, c.Value))); + .Concat(data.ExposedClaims.Select(c => new Claim(c.Type, c.Value))); identity = new ClaimsIdentity(claims, "Server authentication"); } else diff --git a/src/Components/test/testassets/BasicTestApp/BindCasesComponent.razor b/src/Components/test/testassets/BasicTestApp/BindCasesComponent.razor index 707ed9124a..362db2936f 100644 --- a/src/Components/test/testassets/BasicTestApp/BindCasesComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/BindCasesComponent.razor @@ -3,128 +3,128 @@

Textbox

Initially blank: - + @textboxInitiallyBlankValue - - + +

Initially populated: - + @textboxInitiallyPopulatedValue - - + +

Numeric Textboxes

int: - + @textboxIntValue - +

Nullable int: - + @textboxNullableIntValue - +

long: - + @textboxLongValue - +

Nullable long: - + @textboxNullableLongValue - +

float: - + @textboxFloatValue - +

Nullable float: - + @textboxNullableFloatValue - +

double: - + @textboxDoubleValue - +

Nullable double: - + @textboxNullableDoubleValue - +

decimal: - + @textboxDecimalValue - +

Nullable decimal: - + @textboxNullableDecimalValue - +

decimal (invalid-input): - + @textboxDecimalInvalidValue - +

Nullable decimal (invalid-input): - + @textboxNullableDecimalInvalidValue - +

Text Area

Initially blank: - + @textAreaInitiallyBlankValue

Initially populated: - + @textAreaInitiallyPopulatedValue

Checkbox

Initially null: - + @checkboxInitiallyNullValue - +

Initially unchecked: - + @checkboxInitiallyUncheckedValue - +

Initially checked: - + @checkboxInitiallyCheckedValue - +

Select

- @@ -134,10 +134,10 @@ } @selectValue - +

-@functions { +@code { string textboxInitiallyBlankValue = null; string textboxInitiallyPopulatedValue = "Hello"; diff --git a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByName.razor b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByName.razor index a0d14e571a..ce912c78f8 100644 --- a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByName.razor +++ b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByName.razor @@ -10,7 +10,7 @@ Flag 2: @MyFlag2

-@functions { +@code { [CascadingParameter(Name = "TestFlag1")] bool MyFlag1 { get; set; } [CascadingParameter(Name = "TestFlag2")] bool MyFlag2 { get; set; } } diff --git a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByType.razor b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByType.razor index a1731d14d5..e51cfd66cd 100644 --- a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByType.razor +++ b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByType.razor @@ -3,6 +3,6 @@ @CurrentCounter.NumClicks

-@functions { +@code { [CascadingParameter] CounterDTO CurrentCounter { get; set; } } diff --git a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveFixedByInterface.razor b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveFixedByInterface.razor index cf6b9abc90..f55db35bb8 100644 --- a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveFixedByInterface.razor +++ b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveFixedByInterface.razor @@ -13,10 +13,10 @@ @numRenders @* Prevent rerendering this component when the button is clicked. *@ - +

-@functions { +@code { int numRenders = 0; [CascadingParameter] ICanDecrement Ancestor { get; set; } diff --git a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueSupplier.razor b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueSupplier.razor index f1f70cfba0..6557c0b30b 100644 --- a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueSupplier.razor +++ b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueSupplier.razor @@ -16,11 +16,11 @@ -

-

-

+

+

+

-@functions { +@code { CounterDTO counterState = new CounterDTO { NumClicks = 100 }; bool currentFlagValue1; bool currentFlagValue2; diff --git a/src/Components/test/testassets/BasicTestApp/ComponentRefComponent.razor b/src/Components/test/testassets/BasicTestApp/ComponentRefComponent.razor index ded245d99b..940de94ce5 100644 --- a/src/Components/test/testassets/BasicTestApp/ComponentRefComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/ComponentRefComponent.razor @@ -1,4 +1,4 @@ -

Component capture

+

Component capture

This shows how a component reference may be captured as a field value using 'ref' syntax. @@ -11,20 +11,20 @@ @if (_toggleCapturedComponentPresence) {

- +
}
External controls - +
-@functions { +@code { bool _toggleCapturedComponentPresence = true; CounterComponent _myChildCounter; diff --git a/src/Components/test/testassets/BasicTestApp/ConcurrentRenderChild.razor b/src/Components/test/testassets/BasicTestApp/ConcurrentRenderChild.razor index 817f31bbdd..c843e11a91 100644 --- a/src/Components/test/testassets/BasicTestApp/ConcurrentRenderChild.razor +++ b/src/Components/test/testassets/BasicTestApp/ConcurrentRenderChild.razor @@ -1,5 +1,5 @@ @(isAfterDelay ? "😊" :"WAITING") -@functions +@code { protected bool isAfterDelay; diff --git a/src/Components/test/testassets/BasicTestApp/CounterComponent.razor b/src/Components/test/testassets/BasicTestApp/CounterComponent.razor index ed58054b8f..121e59dd08 100644 --- a/src/Components/test/testassets/BasicTestApp/CounterComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/CounterComponent.razor @@ -1,9 +1,9 @@

Counter

Current count: @currentCount

-

+

@@ -12,7 +12,7 @@

Listening

} -@functions { +@code { int currentCount = 0; bool handleClicks = true; diff --git a/src/Components/test/testassets/BasicTestApp/CounterComponentUsingChild.razor b/src/Components/test/testassets/BasicTestApp/CounterComponentUsingChild.razor index 08e55d6027..8ea24c82f1 100644 --- a/src/Components/test/testassets/BasicTestApp/CounterComponentUsingChild.razor +++ b/src/Components/test/testassets/BasicTestApp/CounterComponentUsingChild.razor @@ -1,11 +1,11 @@ -

Counter

+

Counter

Current count:

- + -@functions { +@code { int currentCount = 0; void IncrementCount() diff --git a/src/Components/test/testassets/BasicTestApp/DataDashComponent.razor b/src/Components/test/testassets/BasicTestApp/DataDashComponent.razor index ae00ab1bc9..435ef0fc04 100644 --- a/src/Components/test/testassets/BasicTestApp/DataDashComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/DataDashComponent.razor @@ -1,5 +1,5 @@
@TabId
-@functions { +@code { string TabId = "17"; } diff --git a/src/Components/test/testassets/BasicTestApp/DispatchingComponent.razor b/src/Components/test/testassets/BasicTestApp/DispatchingComponent.razor index f59d58bb33..89997ee1ff 100644 --- a/src/Components/test/testassets/BasicTestApp/DispatchingComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/DispatchingComponent.razor @@ -10,12 +10,12 @@ Result: @result

- - - - + + + + -@functions { +@code { string result; async Task RunWithoutDispatch() diff --git a/src/Components/test/testassets/BasicTestApp/DuplicateAttributesComponent.razor b/src/Components/test/testassets/BasicTestApp/DuplicateAttributesComponent.razor new file mode 100644 index 0000000000..6993a5e400 --- /dev/null +++ b/src/Components/test/testassets/BasicTestApp/DuplicateAttributesComponent.razor @@ -0,0 +1,28 @@ +
+ +
+ +
+ +
+ +@functions { + void SomeMethod() + { + } + + Dictionary elementValues = new Dictionary() + { + { "bool", true }, + { "string", "middle-value" }, + { "unmatched", "unmatched-value" }, + }; +} diff --git a/src/Components/test/testassets/BasicTestApp/DuplicateAttributesOnElementChildComponent.cs b/src/Components/test/testassets/BasicTestApp/DuplicateAttributesOnElementChildComponent.cs new file mode 100644 index 0000000000..055ecf7149 --- /dev/null +++ b/src/Components/test/testassets/BasicTestApp/DuplicateAttributesOnElementChildComponent.cs @@ -0,0 +1,37 @@ +// 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.Collections.Generic; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.RenderTree; + +namespace BasicTestApp +{ + // Written in C# for flexibility and because we don't currently have the ability to write this in .razor. + public class DuplicateAttributesOnElementChildComponent : ComponentBase + { + [Parameter] public string StringAttributeBefore { get; private set; } + [Parameter] public bool BoolAttributeBefore { get; private set; } + [Parameter] public string StringAttributeAfter { get; private set; } + [Parameter] public bool? BoolAttributeAfter { get; private set; } + + [Parameter(CaptureUnmatchedValues = true)] public Dictionary UnmatchedValues { get; private set; } + + protected override void BuildRenderTree(RenderTreeBuilder builder) + { + builder.OpenElement(0, "div"); + builder.AddAttribute(1, "string", StringAttributeBefore); + builder.AddAttribute(2, "bool", BoolAttributeBefore); + builder.AddMultipleAttributes(3, UnmatchedValues); + if (StringAttributeAfter != null) + { + builder.AddAttribute(4, "string", StringAttributeAfter); + } + if (BoolAttributeAfter != null) + { + builder.AddAttribute(5, "bool", BoolAttributeAfter); + } + builder.CloseElement(); + } + } +} diff --git a/src/Components/test/testassets/BasicTestApp/ElementRefComponent.razor b/src/Components/test/testassets/BasicTestApp/ElementRefComponent.razor index a8a0a85aa5..fa00db1d90 100644 --- a/src/Components/test/testassets/BasicTestApp/ElementRefComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/ElementRefComponent.razor @@ -17,15 +17,15 @@ @if (_toggleCapturedElementPresence) { - + } - + -@functions { +@code { int _count = 0; bool _toggleCapturedElementPresence = true; ElementRef _myInput; diff --git a/src/Components/test/testassets/BasicTestApp/EventBubblingComponent.razor b/src/Components/test/testassets/BasicTestApp/EventBubblingComponent.razor index f5fcfac319..17984e9ee6 100644 --- a/src/Components/test/testassets/BasicTestApp/EventBubblingComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/EventBubblingComponent.razor @@ -1,7 +1,7 @@

Bubbling standard event

-
- +
+
@@ -15,16 +15,16 @@

Non-bubbling standard event

-
-

With onfocus:

+
+

With onfocus:

Without onfocus:

Event log

- + -@functions { +@code { string logValue = string.Empty; void LogEvent(string message) diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/ButtonComponent.razor b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/ButtonComponent.razor index 13d814bbe3..57264d659c 100644 --- a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/ButtonComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/ButtonComponent.razor @@ -1,7 +1,7 @@ - + -@functions { +@code { [Parameter] int Count { get; set; } [Parameter] EventCallback CountChanged { get; set; } [Parameter] string Text { get; set; } diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/EventCallbackCases.razor b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/EventCallbackCases.razor index 945e89a290..20c64b0c95 100644 --- a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/EventCallbackCases.razor +++ b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/EventCallbackCases.razor @@ -27,15 +27,15 @@

Passing Child Content

- +

Passing Child Content

- +
-@functions { +@code { int renderCount; int buttonComponentCount = 1; // Avoid CS0649 diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/InnerButton.razor b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/InnerButton.razor index 32a59dbeed..1d6a5e25fb 100644 --- a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/InnerButton.razor +++ b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/InnerButton.razor @@ -1,7 +1,7 @@ - + -@functions { +@code { [Parameter] EventCallback OnClick { get; set; } [Parameter] string Text { get; set; } } diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/MiddleButton.razor b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/MiddleButton.razor index 642b201430..33294d11b7 100644 --- a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/MiddleButton.razor +++ b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/MiddleButton.razor @@ -1,7 +1,7 @@ -@functions { +@code { [Parameter] EventCallback OnClick { get; set; } [Parameter] string Text { get; set; } } diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/StronglyTypedButton.razor b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/StronglyTypedButton.razor index 727aaa5e33..d4e0904167 100644 --- a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/StronglyTypedButton.razor +++ b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/StronglyTypedButton.razor @@ -1,7 +1,7 @@ - + -@functions { +@code { [Parameter] EventCallback OnClick { get; set; } [Parameter] string Text { get; set; } } diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/TemplatedControl.razor b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/TemplatedControl.razor index f5a1bfbf1b..c200183f3f 100644 --- a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/TemplatedControl.razor +++ b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/TemplatedControl.razor @@ -3,6 +3,6 @@ @ChildContent
-@functions { +@code { [Parameter] RenderFragment ChildContent { get; set; } } diff --git a/src/Components/test/testassets/BasicTestApp/EventPreventDefaultComponent.razor b/src/Components/test/testassets/BasicTestApp/EventPreventDefaultComponent.razor index 3681b170f8..2e23df0070 100644 --- a/src/Components/test/testassets/BasicTestApp/EventPreventDefaultComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/EventPreventDefaultComponent.razor @@ -13,14 +13,14 @@

Form with onsubmit handler

-
{ })> - + { })> +

Form without onsubmit handler

- +
@if (didHandleEvent) @@ -28,7 +28,7 @@

Event was handled

} -@functions { +@code { bool didHandleEvent; async Task HandleClick() diff --git a/src/Components/test/testassets/BasicTestApp/ExternalContentPackage.razor b/src/Components/test/testassets/BasicTestApp/ExternalContentPackage.razor index ef02e9f256..c90b7096da 100644 --- a/src/Components/test/testassets/BasicTestApp/ExternalContentPackage.razor +++ b/src/Components/test/testassets/BasicTestApp/ExternalContentPackage.razor @@ -13,7 +13,7 @@

Click the following button to invoke a JavaScript function.

- + @if (!string.IsNullOrEmpty(result)) { @@ -29,7 +29,7 @@ -@functions +@code { string result; diff --git a/src/Components/test/testassets/BasicTestApp/FocusEventComponent.razor b/src/Components/test/testassets/BasicTestApp/FocusEventComponent.razor index b6ca0f7141..00843460fa 100644 --- a/src/Components/test/testassets/BasicTestApp/FocusEventComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/FocusEventComponent.razor @@ -1,22 +1,22 @@ -@using System.Collections.Generic +@using System.Collections.Generic

Focus and activation

-

- Input: +

+ Input:

Output: @message

- +

Another input (to distract you)

-@functions { +@code { string message; @@ -48,4 +48,4 @@ { message = string.Empty; } -} \ No newline at end of file +} diff --git a/src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.razor b/src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.razor index e921bc58aa..51393a1e3f 100644 --- a/src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.razor @@ -12,17 +12,17 @@

This example also shows that you don't strictly have to use EditForm. You can manually - cascade an EditContext to the components that integrate with it. + cascade an EditContext to the components that integrate with it.

-
+

User name: - +

Accept terms: - +

@@ -34,7 +34,7 @@
@submissionStatus
-@functions { +@code { MyModel person = new MyModel(); EditContext editContext; string submissionStatus; diff --git a/src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.razor b/src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.razor index bc9a267403..c95a75c2a2 100644 --- a/src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.razor @@ -1,14 +1,14 @@ @using System.ComponentModel.DataAnnotations @using Microsoft.AspNetCore.Components.Forms - +

- User name: + User name:

- Accept terms: + Accept terms:

@@ -28,7 +28,7 @@ @lastCallback } -@functions { +@code { string lastCallback; [Required(ErrorMessage = "Please choose a username")] diff --git a/src/Components/test/testassets/BasicTestApp/FormsTest/TypicalValidationComponent.razor b/src/Components/test/testassets/BasicTestApp/FormsTest/TypicalValidationComponent.razor index d4285e92e2..39819ee729 100644 --- a/src/Components/test/testassets/BasicTestApp/FormsTest/TypicalValidationComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/FormsTest/TypicalValidationComponent.razor @@ -5,30 +5,30 @@

- Name: + Name:

- Age (years): + Age (years):

- Height (optional): + Height (optional):

- Description: + Description:

- Renewal date: + Renewal date:

- Expiry date (optional): + Expiry date (optional):

Ticket class: - + @@ -37,10 +37,10 @@ @person.TicketClass

- Accepts terms: + Accepts terms:

- Is evil: + Is evil:

@@ -50,7 +50,7 @@
    @foreach (var entry in submissionLog) {
  • @entry
    • }
-@functions { +@code { Person person = new Person(); // Usually this would be in a different file diff --git a/src/Components/test/testassets/BasicTestApp/HttpClientTest/BinaryHttpRequestsComponent.razor b/src/Components/test/testassets/BasicTestApp/HttpClientTest/BinaryHttpRequestsComponent.razor index 3ffbd88850..f4906da4fc 100644 --- a/src/Components/test/testassets/BasicTestApp/HttpClientTest/BinaryHttpRequestsComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/HttpClientTest/BinaryHttpRequestsComponent.razor @@ -1,4 +1,4 @@ -@using System.Net +@using System.Net @using System.Net.Http @inject HttpClient Http @@ -6,10 +6,10 @@

URI:
- +

- + @if (responseStatusCode.HasValue) { @@ -20,7 +20,7 @@ @testOutcome -@functions { +@code { string uri = ""; HttpStatusCode? responseStatusCode; string responseStatusText; diff --git a/src/Components/test/testassets/BasicTestApp/HttpClientTest/CookieCounterComponent.razor b/src/Components/test/testassets/BasicTestApp/HttpClientTest/CookieCounterComponent.razor index 7570dc9915..0065dc34e8 100644 --- a/src/Components/test/testassets/BasicTestApp/HttpClientTest/CookieCounterComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/HttpClientTest/CookieCounterComponent.razor @@ -1,17 +1,17 @@ -@inject System.Net.Http.HttpClient Http +@inject System.Net.Http.HttpClient Http

Cookie counter

The server increments the count by one on each request.

-

TestServer base URL:

- - +

TestServer base URL:

+ + @if (!requestInProgress) {

@responseText

} -@functions +@code { bool requestInProgress = false; string testServerBaseUrl; diff --git a/src/Components/test/testassets/BasicTestApp/HttpClientTest/HttpRequestsComponent.razor b/src/Components/test/testassets/BasicTestApp/HttpClientTest/HttpRequestsComponent.razor index 81594508de..a6c0b9badc 100644 --- a/src/Components/test/testassets/BasicTestApp/HttpClientTest/HttpRequestsComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/HttpClientTest/HttpRequestsComponent.razor @@ -7,12 +7,12 @@

URI:
- +

Method:
- @@ -22,7 +22,7 @@

Request body:
- +

@@ -30,20 +30,20 @@ @foreach (var header in requestHeaders) {

- Name: - Value: - [remove] + Name: + Value: + [remove]
} - +

Request referrer:
- +

- + @if (responseStatusCode.HasValue) { @@ -60,7 +60,7 @@ } -@functions { +@code { string uri = "http://api.icndb.com/jokes/random"; string method = "GET"; string requestBody = ""; diff --git a/src/Components/test/testassets/BasicTestApp/Index.razor b/src/Components/test/testassets/BasicTestApp/Index.razor index 7570d92e99..addf55f07e 100644 --- a/src/Components/test/testassets/BasicTestApp/Index.razor +++ b/src/Components/test/testassets/BasicTestApp/Index.razor @@ -1,7 +1,7 @@ @using Microsoft.AspNetCore.Components.RenderTree
Select test: - @@ -56,6 +56,7 @@ + @if (SelectedComponentType != null) @@ -69,7 +70,7 @@ @((RenderFragment)RenderSelectedComponent) -@functions { +@code { string SelectedComponentTypeName { get; set; } = "none"; Type SelectedComponentType diff --git a/src/Components/test/testassets/BasicTestApp/InputEventComponent.razor b/src/Components/test/testassets/BasicTestApp/InputEventComponent.razor index f6b5a003f8..f7aafa6277 100644 --- a/src/Components/test/testassets/BasicTestApp/InputEventComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/InputEventComponent.razor @@ -1,9 +1,9 @@ - +

The text below should update automatically as you type in the text field above

@inputText

-@functions { +@code { string inputText { get; set; } } diff --git a/src/Components/test/testassets/BasicTestApp/InteropComponent.razor b/src/Components/test/testassets/BasicTestApp/InteropComponent.razor index 1a1b26535d..987f05ad12 100644 --- a/src/Components/test/testassets/BasicTestApp/InteropComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/InteropComponent.razor @@ -1,9 +1,10 @@ @using Microsoft.JSInterop @using BasicTestApp.InteropTest @using System.Runtime.InteropServices +@using System.Text.Json.Serialization @inject IJSRuntime JSRuntime - +

Invocations

@@ -51,8 +52,7 @@

Done with interop.

} -@functions { - +@code { public IDictionary ReturnValues { get; set; } = new Dictionary(); public IDictionary Invocations { get; set; } = new Dictionary(); @@ -75,8 +75,8 @@ await JSRuntime.InvokeAsync( "jsInteropTests.invokeDotNetInteropMethodsAsync", shouldSupportSyncInterop, - new DotNetObjectRef(testDTOTOPassByRef), - new DotNetObjectRef(instanceMethodsTarget)); + DotNetObjectRef.Create(testDTOTOPassByRef), + DotNetObjectRef.Create(instanceMethodsTarget)); if (shouldSupportSyncInterop) { @@ -84,14 +84,14 @@ } Console.WriteLine("Showing interop invocation results."); - var collectResults = await JSRuntime.InvokeAsync>("jsInteropTests.collectInteropResults"); + var collectResults = await JSRuntime.InvokeAsync>("jsInteropTests.collectInteropResults"); - ReturnValues = collectResults.ToDictionary(kvp => kvp.Key,kvp => System.Text.Encoding.UTF8.GetString(Convert.FromBase64String(kvp.Value))); + ReturnValues = collectResults.ToDictionary(kvp => kvp.Key, kvp => System.Text.Encoding.UTF8.GetString(Convert.FromBase64String(kvp.Value))); var invocations = new Dictionary(); foreach (var interopResult in JavaScriptInterop.Invocations) { - var interopResultValue = Json.Serialize(interopResult.Value); + var interopResultValue = JsonSerializer.ToString(interopResult.Value, TestJsonSerializerOptionsProvider.Options); invocations[interopResult.Key] = interopResultValue; } @@ -114,13 +114,15 @@ } var passDotNetObjectByRef = new TestDTO(99999); - var passDotNetObjectByRefArg = new Dictionary + var passDotNetObjectByRefArg = new PassDotNetObjectByRefArgs { - { "stringValue", "My string" }, - { "testDto", new DotNetObjectRef(passDotNetObjectByRef) }, + StringValue = "My string", + TestDto = DotNetObjectRef.Create(passDotNetObjectByRef), }; - ReceiveDotNetObjectByRefAsyncResult = await JSRuntime.InvokeAsync>("receiveDotNetObjectByRefAsync", passDotNetObjectByRefArg); - ReceiveDotNetObjectByRefAsyncResult["testDto"] = ReceiveDotNetObjectByRefAsyncResult["testDto"] == passDotNetObjectByRef ? "Same" : "Different"; + var result = await JSRuntime.InvokeAsync("receiveDotNetObjectByRefAsync", passDotNetObjectByRefArg); + ReceiveDotNetObjectByRefAsyncResult["stringValueUpper"] = result.StringValueUpper; + ReceiveDotNetObjectByRefAsyncResult["testDtoNonSerializedValue"] = result.TestDtoNonSerializedValue; + ReceiveDotNetObjectByRefAsyncResult["testDto"] = result.TestDto.Value == passDotNetObjectByRef ? "Same" : "Different"; ReturnValues["returnPrimitiveAsync"] = (await JSRuntime.InvokeAsync("returnPrimitiveAsync")).ToString(); ReturnValues["returnArrayAsync"] = string.Join(",", (await JSRuntime.InvokeAsync("returnArrayAsync")).Select(x => x.Source).ToArray()); @@ -148,12 +150,30 @@ } var passDotNetObjectByRef = new TestDTO(99999); - var passDotNetObjectByRefArg = new Dictionary + var passDotNetObjectByRefArg = new PassDotNetObjectByRefArgs { - { "stringValue", "My string" }, - { "testDto", new DotNetObjectRef(passDotNetObjectByRef) }, + StringValue = "My string", + TestDto = DotNetObjectRef.Create(passDotNetObjectByRef), }; - ReceiveDotNetObjectByRefResult = inProcRuntime.Invoke>("receiveDotNetObjectByRef", passDotNetObjectByRefArg); - ReceiveDotNetObjectByRefResult["testDto"] = ReceiveDotNetObjectByRefResult["testDto"] == passDotNetObjectByRef ? "Same" : "Different"; + var result = inProcRuntime.Invoke("receiveDotNetObjectByRef", passDotNetObjectByRefArg); + ReceiveDotNetObjectByRefResult["stringValueUpper"] = result.StringValueUpper; + ReceiveDotNetObjectByRefResult["testDtoNonSerializedValue"] = result.TestDtoNonSerializedValue; + ReceiveDotNetObjectByRefResult["testDto"] = result.TestDto.Value == passDotNetObjectByRef ? "Same" : "Different"; + } + + public class PassDotNetObjectByRefArgs + { + public string StringValue { get; set; } + + public DotNetObjectRef TestDto { get; set; } + } + + public class ReceiveDotNetObjectByRefArgs + { + public string StringValueUpper { get; set; } + + public int TestDtoNonSerializedValue { get; set; } + + public DotNetObjectRef TestDto { get; set; } } } diff --git a/src/Components/test/testassets/BasicTestApp/InteropOnInitializationComponent.razor b/src/Components/test/testassets/BasicTestApp/InteropOnInitializationComponent.razor index 8ac0815070..125db6a477 100644 --- a/src/Components/test/testassets/BasicTestApp/InteropOnInitializationComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/InteropOnInitializationComponent.razor @@ -19,10 +19,10 @@

Value set via JS interop call: - +

-@functions { +@code { string infoFromJs; ElementRef myElem; diff --git a/src/Components/test/testassets/BasicTestApp/InteropTest/JavaScriptInterop.cs b/src/Components/test/testassets/BasicTestApp/InteropTest/JavaScriptInterop.cs index f1487c06e3..a0f35c8040 100644 --- a/src/Components/test/testassets/BasicTestApp/InteropTest/JavaScriptInterop.cs +++ b/src/Components/test/testassets/BasicTestApp/InteropTest/JavaScriptInterop.cs @@ -4,6 +4,7 @@ using Microsoft.JSInterop; using System; using System.Collections.Generic; +using System.Text.Json; using System.Threading.Tasks; namespace BasicTestApp.InteropTest @@ -50,69 +51,69 @@ namespace BasicTestApp.InteropTest public static void VoidWithThreeParameters( ComplexParameter parameter1, byte parameter2, - TestDTO parameter3) + DotNetObjectRef parameter3) { - Invocations[nameof(VoidWithThreeParameters)] = new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue() }; + Invocations[nameof(VoidWithThreeParameters)] = new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue() }; } [JSInvokable] public static void VoidWithFourParameters( ComplexParameter parameter1, byte parameter2, - TestDTO parameter3, + DotNetObjectRef parameter3, int parameter4) { - Invocations[nameof(VoidWithFourParameters)] = new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue(), parameter4 }; + Invocations[nameof(VoidWithFourParameters)] = new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4 }; } [JSInvokable] public static void VoidWithFiveParameters( ComplexParameter parameter1, byte parameter2, - TestDTO parameter3, + DotNetObjectRef parameter3, int parameter4, long parameter5) { - Invocations[nameof(VoidWithFiveParameters)] = new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue(), parameter4, parameter5 }; + Invocations[nameof(VoidWithFiveParameters)] = new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4, parameter5 }; } [JSInvokable] public static void VoidWithSixParameters( ComplexParameter parameter1, byte parameter2, - TestDTO parameter3, + DotNetObjectRef parameter3, int parameter4, long parameter5, float parameter6) { - Invocations[nameof(VoidWithSixParameters)] = new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue(), parameter4, parameter5, parameter6 }; + Invocations[nameof(VoidWithSixParameters)] = new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4, parameter5, parameter6 }; } [JSInvokable] public static void VoidWithSevenParameters( ComplexParameter parameter1, byte parameter2, - TestDTO parameter3, + DotNetObjectRef parameter3, int parameter4, long parameter5, float parameter6, List parameter7) { - Invocations[nameof(VoidWithSevenParameters)] = new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue(), parameter4, parameter5, parameter6, parameter7 }; + Invocations[nameof(VoidWithSevenParameters)] = new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4, parameter5, parameter6, parameter7 }; } [JSInvokable] public static void VoidWithEightParameters( ComplexParameter parameter1, byte parameter2, - TestDTO parameter3, + DotNetObjectRef parameter3, int parameter4, long parameter5, float parameter6, List parameter7, Segment parameter8) { - Invocations[nameof(VoidWithEightParameters)] = new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue(), parameter4, parameter5, parameter6, parameter7, parameter8 }; + Invocations[nameof(VoidWithEightParameters)] = new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4, parameter5, parameter6, parameter7, parameter8 }; } [JSInvokable] @@ -139,67 +140,67 @@ namespace BasicTestApp.InteropTest public static object[] EchoThreeParameters( ComplexParameter parameter1, byte parameter2, - TestDTO parameter3) + DotNetObjectRef parameter3) { - return new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue() }; + return new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue() }; } [JSInvokable] public static object[] EchoFourParameters( ComplexParameter parameter1, byte parameter2, - TestDTO parameter3, + DotNetObjectRef parameter3, int parameter4) { - return new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue(), parameter4 }; + return new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4 }; } [JSInvokable] public static object[] EchoFiveParameters( ComplexParameter parameter1, byte parameter2, - TestDTO parameter3, + DotNetObjectRef parameter3, int parameter4, long parameter5) { - return new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue(), parameter4, parameter5 }; + return new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4, parameter5 }; } [JSInvokable] public static object[] EchoSixParameters(ComplexParameter parameter1, byte parameter2, - TestDTO parameter3, + DotNetObjectRef parameter3, int parameter4, long parameter5, float parameter6) { - return new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue(), parameter4, parameter5, parameter6 }; + return new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4, parameter5, parameter6 }; } [JSInvokable] public static object[] EchoSevenParameters(ComplexParameter parameter1, byte parameter2, - TestDTO parameter3, + DotNetObjectRef parameter3, int parameter4, long parameter5, float parameter6, List parameter7) { - return new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue(), parameter4, parameter5, parameter6, parameter7 }; + return new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4, parameter5, parameter6, parameter7 }; } [JSInvokable] public static object[] EchoEightParameters( ComplexParameter parameter1, byte parameter2, - TestDTO parameter3, + DotNetObjectRef parameter3, int parameter4, long parameter5, float parameter6, List parameter7, Segment parameter8) { - return new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue(), parameter4, parameter5, parameter6, parameter7, parameter8 }; + return new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4, parameter5, parameter6, parameter7, parameter8 }; } [JSInvokable] @@ -229,9 +230,9 @@ namespace BasicTestApp.InteropTest public static Task VoidWithThreeParametersAsync( ComplexParameter parameter1, byte parameter2, - TestDTO parameter3) + DotNetObjectRef parameter3) { - Invocations[nameof(VoidWithThreeParametersAsync)] = new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue() }; + Invocations[nameof(VoidWithThreeParametersAsync)] = new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue() }; return Task.CompletedTask; } @@ -239,10 +240,10 @@ namespace BasicTestApp.InteropTest public static Task VoidWithFourParametersAsync( ComplexParameter parameter1, byte parameter2, - TestDTO parameter3, + DotNetObjectRef parameter3, int parameter4) { - Invocations[nameof(VoidWithFourParametersAsync)] = new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue(), parameter4 }; + Invocations[nameof(VoidWithFourParametersAsync)] = new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4 }; return Task.CompletedTask; } @@ -250,11 +251,11 @@ namespace BasicTestApp.InteropTest public static Task VoidWithFiveParametersAsync( ComplexParameter parameter1, byte parameter2, - TestDTO parameter3, + DotNetObjectRef parameter3, int parameter4, long parameter5) { - Invocations[nameof(VoidWithFiveParametersAsync)] = new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue(), parameter4, parameter5 }; + Invocations[nameof(VoidWithFiveParametersAsync)] = new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4, parameter5 }; return Task.CompletedTask; } @@ -262,12 +263,12 @@ namespace BasicTestApp.InteropTest public static Task VoidWithSixParametersAsync( ComplexParameter parameter1, byte parameter2, - TestDTO parameter3, + DotNetObjectRef parameter3, int parameter4, long parameter5, float parameter6) { - Invocations[nameof(VoidWithSixParametersAsync)] = new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue(), parameter4, parameter5, parameter6 }; + Invocations[nameof(VoidWithSixParametersAsync)] = new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4, parameter5, parameter6 }; return Task.CompletedTask; } @@ -275,13 +276,13 @@ namespace BasicTestApp.InteropTest public static Task VoidWithSevenParametersAsync( ComplexParameter parameter1, byte parameter2, - TestDTO parameter3, + DotNetObjectRef parameter3, int parameter4, long parameter5, float parameter6, List parameter7) { - Invocations[nameof(VoidWithSevenParametersAsync)] = new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue(), parameter4, parameter5, parameter6, parameter7 }; + Invocations[nameof(VoidWithSevenParametersAsync)] = new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4, parameter5, parameter6, parameter7 }; return Task.CompletedTask; } @@ -289,14 +290,14 @@ namespace BasicTestApp.InteropTest public static Task VoidWithEightParametersAsync( ComplexParameter parameter1, byte parameter2, - TestDTO parameter3, + DotNetObjectRef parameter3, int parameter4, long parameter5, float parameter6, List parameter7, Segment parameter8) { - Invocations[nameof(VoidWithEightParametersAsync)] = new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue(), parameter4, parameter5, parameter6, parameter7, parameter8 }; + Invocations[nameof(VoidWithEightParametersAsync)] = new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4, parameter5, parameter6, parameter7, parameter8 }; return Task.CompletedTask; } @@ -324,124 +325,142 @@ namespace BasicTestApp.InteropTest public static Task EchoThreeParametersAsync( ComplexParameter parameter1, byte parameter2, - TestDTO parameter3) + DotNetObjectRef parameter3) { - return Task.FromResult(new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue() }); + return Task.FromResult(new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue() }); } [JSInvokable] public static Task EchoFourParametersAsync( ComplexParameter parameter1, byte parameter2, - TestDTO parameter3, + DotNetObjectRef parameter3, int parameter4) { - return Task.FromResult(new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue(), parameter4 }); + return Task.FromResult(new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4 }); } [JSInvokable] public static Task EchoFiveParametersAsync( ComplexParameter parameter1, byte parameter2, - TestDTO parameter3, + DotNetObjectRef parameter3, int parameter4, long parameter5) { - return Task.FromResult(new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue(), parameter4, parameter5 }); + return Task.FromResult(new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4, parameter5 }); } [JSInvokable] public static Task EchoSixParametersAsync(ComplexParameter parameter1, byte parameter2, - TestDTO parameter3, + DotNetObjectRef parameter3, int parameter4, long parameter5, float parameter6) { - return Task.FromResult(new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue(), parameter4, parameter5, parameter6 }); + return Task.FromResult(new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4, parameter5, parameter6 }); } [JSInvokable] public static Task EchoSevenParametersAsync( ComplexParameter parameter1, byte parameter2, - TestDTO parameter3, + DotNetObjectRef parameter3, int parameter4, long parameter5, float parameter6, List parameter7) { - return Task.FromResult(new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue(), parameter4, parameter5, parameter6, parameter7 }); + return Task.FromResult(new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4, parameter5, parameter6, parameter7 }); } [JSInvokable] public static Task EchoEightParametersAsync( ComplexParameter parameter1, byte parameter2, - TestDTO parameter3, + DotNetObjectRef parameter3, int parameter4, long parameter5, float parameter6, List parameter7, Segment parameter8) { - return Task.FromResult(new object[] { parameter1, parameter2, parameter3.GetNonSerializedValue(), parameter4, parameter5, parameter6, parameter7, parameter8 }); + return Task.FromResult(new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4, parameter5, parameter6, parameter7, parameter8 }); } [JSInvokable] - public static Dictionary ReturnDotNetObjectByRef() + public static Dictionary> ReturnDotNetObjectByRef() { - return new Dictionary + return new Dictionary> { - { "Some sync instance", new DotNetObjectRef(new TestDTO(1000)) } + { "Some sync instance", DotNetObjectRef.Create(new TestDTO(1000)) } }; } [JSInvokable] - public static async Task> ReturnDotNetObjectByRefAsync() + public static async Task>> ReturnDotNetObjectByRefAsync() { await Task.Yield(); - return new Dictionary + return new Dictionary> { - { "Some async instance", new DotNetObjectRef(new TestDTO(1001)) } + { "Some async instance", DotNetObjectRef.Create(new TestDTO(1001)) } }; } [JSInvokable] - public static int ExtractNonSerializedValue(TestDTO objectByRef) + public static int ExtractNonSerializedValue(DotNetObjectRef objectByRef) { - return objectByRef.GetNonSerializedValue(); + return objectByRef.Value.GetNonSerializedValue(); } [JSInvokable] - public Dictionary InstanceMethod(Dictionary dict) + public InstanceMethodOutput InstanceMethod(InstanceMethodInput input) { // This method shows we can pass in values marshalled both as JSON (the dict itself) // and by ref (the incoming dtoByRef), plus that we can return values marshalled as // JSON (the returned dictionary) and by ref (the outgoingByRef value) - return new Dictionary + return new InstanceMethodOutput { - { "thisTypeName", GetType().Name }, - { "stringValueUpper", ((string)dict["stringValue"]).ToUpperInvariant() }, - { "incomingByRef", ((TestDTO)dict["dtoByRef"]).GetNonSerializedValue() }, - { "outgoingByRef", new DotNetObjectRef(new TestDTO(1234)) }, + ThisTypeName = GetType().Name, + StringValueUpper = input.StringValue.ToUpperInvariant(), + IncomingByRef = input.DTOByRef.Value.GetNonSerializedValue(), + OutgoingByRef = DotNetObjectRef.Create(new TestDTO(1234)), }; } [JSInvokable] - public async Task> InstanceMethodAsync(Dictionary dict) + public async Task InstanceMethodAsync(InstanceMethodInput input) { - // This method shows we can pass in values marshalled both as JSON (the dict itself) + // This method shows we can pass in values marshalled both as JSON // and by ref (the incoming dtoByRef), plus that we can return values marshalled as // JSON (the returned dictionary) and by ref (the outgoingByRef value) await Task.Yield(); - return new Dictionary + return new InstanceMethodOutput { - { "thisTypeName", GetType().Name }, - { "stringValueUpper", ((string)dict["stringValue"]).ToUpperInvariant() }, - { "incomingByRef", ((TestDTO)dict["dtoByRef"]).GetNonSerializedValue() }, - { "outgoingByRef", new DotNetObjectRef(new TestDTO(1234)) }, + ThisTypeName = GetType().Name, + StringValueUpper = input.StringValue.ToUpperInvariant(), + IncomingByRef = input.DTOByRef.Value.GetNonSerializedValue(), + OutgoingByRef = DotNetObjectRef.Create(new TestDTO(1234)), }; } + + public class InstanceMethodInput + { + public string StringValue { get; set; } + + public DotNetObjectRef DTOByRef { get; set; } + } + + public class InstanceMethodOutput + { + public string ThisTypeName { get; set; } + + public string StringValueUpper { get; set; } + + public int IncomingByRef { get; set; } + + public DotNetObjectRef OutgoingByRef { get; set; } + } } } diff --git a/src/Components/test/testassets/BasicTestApp/InteropTest/Segment.cs b/src/Components/test/testassets/BasicTestApp/InteropTest/Segment.cs index 2d7967775d..09c9cf282e 100644 --- a/src/Components/test/testassets/BasicTestApp/InteropTest/Segment.cs +++ b/src/Components/test/testassets/BasicTestApp/InteropTest/Segment.cs @@ -3,7 +3,7 @@ namespace BasicTestApp.InteropTest { - public struct Segment + public class Segment { public string Source { get; set; } public int Start { get; set; } diff --git a/src/Components/test/testassets/BasicTestApp/KeyCasesComponent.razor b/src/Components/test/testassets/BasicTestApp/KeyCasesComponent.razor index 9ef1a5bffa..7cf94526d9 100644 --- a/src/Components/test/testassets/BasicTestApp/KeyCasesComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/KeyCasesComponent.razor @@ -1,9 +1,9 @@ -@using Microsoft.JSInterop +@using System.Text.Json.Serialization

Model

- - + +

Output

@@ -25,7 +25,7 @@ .key-cases .node .node .children { margin-left: 1.1rem; } -@functions { +@code { string modelJson = @"{ ""label"": ""root"", ""children"": [ @@ -61,7 +61,7 @@ void Update() { renderContext.UpdateCount++; - parsedRootNode = Json.Deserialize(modelJson); + parsedRootNode = JsonSerializer.Parse(modelJson, TestJsonSerializerOptionsProvider.Options); } public class RenderContext diff --git a/src/Components/test/testassets/BasicTestApp/KeyCasesTreeNode.razor b/src/Components/test/testassets/BasicTestApp/KeyCasesTreeNode.razor index 16ed8de0eb..551038293c 100644 --- a/src/Components/test/testassets/BasicTestApp/KeyCasesTreeNode.razor +++ b/src/Components/test/testassets/BasicTestApp/KeyCasesTreeNode.razor @@ -21,7 +21,7 @@ { if (child.Key != null) { - + } else { @@ -32,10 +32,10 @@ }
-@functions { +@code { public class Node { - public object Key { get; set; } + public string Key { get; set; } public string Label { get; set; } public List Children { get; set; } } diff --git a/src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.razor b/src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.razor index 4281b7d297..31a2248609 100644 --- a/src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.razor @@ -1,6 +1,6 @@ -@using Microsoft.JSInterop +@using System.Text.Json.Serialization -Type here: +Type here:
    @foreach (var key in keysPressed) { @@ -8,12 +8,12 @@ Type here: }
-@functions { +@code { List keysPressed = new List(); void OnKeyPressed(UIKeyboardEventArgs eventArgs) { - Console.WriteLine(Json.Serialize(eventArgs)); + Console.WriteLine(JsonSerializer.ToString(eventArgs)); keysPressed.Add(eventArgs.Key); } } diff --git a/src/Components/test/testassets/BasicTestApp/MarkupBlockComponent.razor b/src/Components/test/testassets/BasicTestApp/MarkupBlockComponent.razor index 175091fc0b..28055dbff4 100644 --- a/src/Components/test/testassets/BasicTestApp/MarkupBlockComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/MarkupBlockComponent.razor @@ -16,7 +16,7 @@ [@((RenderFragment)EmitMarkupBlock)]
- +

Markup string

@@ -24,7 +24,7 @@ @((MarkupString)myMarkup) -@functions { +@code { bool changeOutput; string myMarkup = "

This is a markup string.

"; diff --git a/src/Components/test/testassets/BasicTestApp/MessageComponent.razor b/src/Components/test/testassets/BasicTestApp/MessageComponent.razor index 75b3ecc823..889c938517 100644 --- a/src/Components/test/testassets/BasicTestApp/MessageComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/MessageComponent.razor @@ -1,4 +1,4 @@ @Message -@functions { +@code { [Parameter] string Message { get; set; } } diff --git a/src/Components/test/testassets/BasicTestApp/MouseEventComponent.razor b/src/Components/test/testassets/BasicTestApp/MouseEventComponent.razor index 9576fdc848..8b3fe5cd0a 100644 --- a/src/Components/test/testassets/BasicTestApp/MouseEventComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/MouseEventComponent.razor @@ -1,5 +1,5 @@ @using System.Collections.Generic -@using Microsoft.JSInterop +@using System.Text.Json.Serialization

Mouse position

@@ -7,16 +7,16 @@ Output: @message

- Mouseover: + Mouseover:

- Mousemove city! + Mousemove city!

- Mousedown: + Mousedown:

- +

@@ -24,7 +24,7 @@

-@functions { +@code { string message; @@ -65,11 +65,11 @@ void DumpEvent(UIMouseEventArgs e) { - Console.WriteLine(Json.Serialize(e)); + Console.WriteLine(JsonSerializer.ToString(e)); } void Clear() { message = string.Empty; } -} \ No newline at end of file +} diff --git a/src/Components/test/testassets/BasicTestApp/MultipleChildContent.razor b/src/Components/test/testassets/BasicTestApp/MultipleChildContent.razor index cc0338c7d3..9229fb49ae 100644 --- a/src/Components/test/testassets/BasicTestApp/MultipleChildContent.razor +++ b/src/Components/test/testassets/BasicTestApp/MultipleChildContent.razor @@ -11,9 +11,9 @@ -Toggle: +Toggle: -@functions { +@code { List Items { get; } = new List() { new Item(){ Col1 = "a0", Col2 = "b0", Col3 = "c0", }, @@ -29,4 +29,4 @@ Toggle: public string Col2 { get; set; } public string Col3 { get; set; } } -} \ No newline at end of file +} diff --git a/src/Components/test/testassets/BasicTestApp/OrderedList.razor b/src/Components/test/testassets/BasicTestApp/OrderedList.razor index 3e9dafb1b3..c212f194d6 100644 --- a/src/Components/test/testassets/BasicTestApp/OrderedList.razor +++ b/src/Components/test/testassets/BasicTestApp/OrderedList.razor @@ -10,7 +10,7 @@ } -@functions{ +@code{ [Parameter] IEnumerable Items { get; set; } [Parameter] RenderFragment Template { get; set; } @@ -21,4 +21,4 @@ public TItem Item { get; set; } } -} \ No newline at end of file +} diff --git a/src/Components/test/testassets/BasicTestApp/PassThroughContentComponent.razor b/src/Components/test/testassets/BasicTestApp/PassThroughContentComponent.razor index 6e9c3d941b..8ab805ed1b 100644 --- a/src/Components/test/testassets/BasicTestApp/PassThroughContentComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/PassThroughContentComponent.razor @@ -1,5 +1,5 @@ @ChildContent -@functions { +@code { // Note: The lack of any whitespace or other output besides @ChildContent is important for // what scenarios this component is used for in E2E tests. diff --git a/src/Components/test/testassets/BasicTestApp/PrerenderedToInteractiveTransition.razor b/src/Components/test/testassets/BasicTestApp/PrerenderedToInteractiveTransition.razor index 05be9c65e1..192efbacd0 100644 --- a/src/Components/test/testassets/BasicTestApp/PrerenderedToInteractiveTransition.razor +++ b/src/Components/test/testassets/BasicTestApp/PrerenderedToInteractiveTransition.razor @@ -12,10 +12,10 @@

Clicks: @count - +

-@functions { +@code { int count; bool firstRender = false; protected override Task OnAfterRenderAsync() diff --git a/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerChild.razor b/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerChild.razor index 28ec61b45c..f359d6c326 100644 --- a/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerChild.razor +++ b/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerChild.razor @@ -1,7 +1,7 @@ 
You supplied: @SuppliedValue
I computed: @computedValue
-@functions { +@code { [Parameter] int SuppliedValue { get; set; } diff --git a/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerParent.razor b/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerParent.razor index 4fbdada071..476e8cbb10 100644 --- a/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerParent.razor +++ b/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerParent.razor @@ -1,6 +1,6 @@ - - + + -@functions { +@code { private int valueToSupply = 100; } diff --git a/src/Components/test/testassets/BasicTestApp/RenderFragmentToggler.razor b/src/Components/test/testassets/BasicTestApp/RenderFragmentToggler.razor index 6ce52d14b1..a13806f756 100644 --- a/src/Components/test/testassets/BasicTestApp/RenderFragmentToggler.razor +++ b/src/Components/test/testassets/BasicTestApp/RenderFragmentToggler.razor @@ -1,4 +1,4 @@ -
+

Fragment will be toggled below

@if (showFragment) @@ -6,11 +6,11 @@ @ExampleFragment } - +

The end

-@functions { +@code { bool showFragment; static RenderFragment ExampleFragment = builder => diff --git a/src/Components/test/testassets/BasicTestApp/ReorderingFocusComponent.razor b/src/Components/test/testassets/BasicTestApp/ReorderingFocusComponent.razor index acede2b465..bc06f23056 100644 --- a/src/Components/test/testassets/BasicTestApp/ReorderingFocusComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/ReorderingFocusComponent.razor @@ -11,9 +11,9 @@
    @foreach (var item in todoItems.Where(item => !item.IsDone)) { -
  • - - +
  • + +
    • }
@@ -23,14 +23,14 @@
    @foreach (var item in todoItems.Where(item => item.IsDone)) { -
  • - - +
  • + +
    • }
-@functions { +@code { Random rng = new Random(); TodoItem[] todoItems = new[] { diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/Links.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/Links.razor index 6c405d4774..fdedf1852f 100644 --- a/src/Components/test/testassets/BasicTestApp/RouterTest/Links.razor +++ b/src/Components/test/testassets/BasicTestApp/RouterTest/Links.razor @@ -14,11 +14,11 @@
  • With more parameters
    • - - diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/UriHelperComponent.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/UriHelperComponent.razor index 27268d73fe..5d5d2cf4ec 100644 --- a/src/Components/test/testassets/BasicTestApp/RouterTest/UriHelperComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/RouterTest/UriHelperComponent.razor @@ -1,11 +1,11 @@ @inject IUriHelper UriHelper @inject Microsoft.JSInterop.IJSRuntime JSRuntime - + @UrlLocation -@functions{ +@code{ string UrlLocation; protected override void OnInit() diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/WithNumberParameters.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/WithNumberParameters.razor index 634e2d40c5..67ffca8770 100644 --- a/src/Components/test/testassets/BasicTestApp/RouterTest/WithNumberParameters.razor +++ b/src/Components/test/testassets/BasicTestApp/RouterTest/WithNumberParameters.razor @@ -1,7 +1,7 @@ @page "/WithNumberParameters/{TestInt:int}/{TestLong:long}/{TestDouble:double}/{TestFloat:float}/{TestDec:decimal}"
    Test parameters: @TestInt @TestLong @TestDouble @TestFloat @TestDec
    -@functions +@code { [Parameter] int TestInt { get; set; } [Parameter] long TestLong { get; set; } diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/WithParameters.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/WithParameters.razor index 2caf8c67bb..e13b253ff1 100644 --- a/src/Components/test/testassets/BasicTestApp/RouterTest/WithParameters.razor +++ b/src/Components/test/testassets/BasicTestApp/RouterTest/WithParameters.razor @@ -3,7 +3,7 @@
    Your full name is @FirstName @LastName.
    -@functions +@code { [Parameter] string FirstName { get; set; } diff --git a/src/Components/test/testassets/BasicTestApp/Startup.cs b/src/Components/test/testassets/BasicTestApp/Startup.cs index 73084e0260..a97b966f69 100644 --- a/src/Components/test/testassets/BasicTestApp/Startup.cs +++ b/src/Components/test/testassets/BasicTestApp/Startup.cs @@ -15,6 +15,12 @@ namespace BasicTestApp public void ConfigureServices(IServiceCollection services) { services.AddSingleton(); + + services.AddAuthorizationCore(options => + { + options.AddPolicy("NameMustStartWithB", policy => + policy.RequireAssertion(ctx => ctx.User.Identity.Name?.StartsWith("B") ?? false)); + }); } public void Configure(IComponentsApplicationBuilder app) diff --git a/src/Components/test/testassets/BasicTestApp/SvgComponent.razor b/src/Components/test/testassets/BasicTestApp/SvgComponent.razor index 342e6fcb8c..2cece59303 100644 --- a/src/Components/test/testassets/BasicTestApp/SvgComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/SvgComponent.razor @@ -2,8 +2,8 @@ - + -@functions { +@code { int radius = 10; } diff --git a/src/Components/test/testassets/BasicTestApp/TemplatedTable.razor b/src/Components/test/testassets/BasicTestApp/TemplatedTable.razor index 57fb0a3fa1..18ea949f31 100644 --- a/src/Components/test/testassets/BasicTestApp/TemplatedTable.razor +++ b/src/Components/test/testassets/BasicTestApp/TemplatedTable.razor @@ -20,7 +20,7 @@ } -@functions { +@code { [Parameter] RenderFragment Header { get; set; } @@ -32,4 +32,4 @@ [Parameter] IReadOnlyList Items { get; set; } -} \ No newline at end of file +} diff --git a/src/Components/test/testassets/BasicTestApp/TestJsonSerializerOptionsProvider.cs b/src/Components/test/testassets/BasicTestApp/TestJsonSerializerOptionsProvider.cs new file mode 100644 index 0000000000..d125ae306d --- /dev/null +++ b/src/Components/test/testassets/BasicTestApp/TestJsonSerializerOptionsProvider.cs @@ -0,0 +1,15 @@ +// 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.Text.Json.Serialization; + +namespace BasicTestApp +{ + internal static class TestJsonSerializerOptionsProvider + { + public static JsonSerializerOptions Options { get; } = new JsonSerializerOptions + { + PropertyNamingPolicy = JsonNamingPolicy.CamelCase, + }; + } +} diff --git a/src/Components/test/testassets/BasicTestApp/TouchEventComponent.razor b/src/Components/test/testassets/BasicTestApp/TouchEventComponent.razor index 425abfcd87..3e11741903 100644 --- a/src/Components/test/testassets/BasicTestApp/TouchEventComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/TouchEventComponent.razor @@ -1,5 +1,5 @@ @using System.Collections.Generic -@using Microsoft.JSInterop +@using System.Text.Json.Serialization

    Touch position

    @@ -7,28 +7,28 @@ Output: @message

    -

    - +

    -@functions { +@code { string message; void OnTouch(UITouchEventArgs e) { message += e.Type; - Console.WriteLine(Json.Serialize(e)); + Console.WriteLine(JsonSerializer.ToString(e)); StateHasChanged(); } @@ -36,4 +36,4 @@ { message = string.Empty; } -} \ No newline at end of file +} diff --git a/src/Components/test/testassets/ComponentsApp.App/App.razor b/src/Components/test/testassets/ComponentsApp.App/App.razor index 03ebda9b0f..a6a7873965 100644 --- a/src/Components/test/testassets/ComponentsApp.App/App.razor +++ b/src/Components/test/testassets/ComponentsApp.App/App.razor @@ -7,6 +7,6 @@ -@functions{ +@code{ [Parameter] public string Name { get; set; } } diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/Counter.razor b/src/Components/test/testassets/ComponentsApp.App/Pages/Counter.razor index 973af92354..ea87f6be2d 100644 --- a/src/Components/test/testassets/ComponentsApp.App/Pages/Counter.razor +++ b/src/Components/test/testassets/ComponentsApp.App/Pages/Counter.razor @@ -1,12 +1,12 @@ -@page "/counter" +@page "/counter"

    Counter

    Current count: @currentCount

    - + -@functions { +@code { int currentCount = 0; void IncrementCount() diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/Error.razor b/src/Components/test/testassets/ComponentsApp.App/Pages/Error.razor index 35f83bf20d..5bcc5fd85e 100644 --- a/src/Components/test/testassets/ComponentsApp.App/Pages/Error.razor +++ b/src/Components/test/testassets/ComponentsApp.App/Pages/Error.razor @@ -3,13 +3,13 @@

    Error

    @if(ShouldCauseError) { - throw new InvalidOperationException("Exception while rendering"); + throw new InvalidOperationException("Exception while rendering"); } else { - + } -@functions { +@code { public bool ShouldCauseError { get; set; } void CauseError() diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/FetchData.razor b/src/Components/test/testassets/ComponentsApp.App/Pages/FetchData.razor index af9cc8b037..cdc696a7ce 100644 --- a/src/Components/test/testassets/ComponentsApp.App/Pages/FetchData.razor +++ b/src/Components/test/testassets/ComponentsApp.App/Pages/FetchData.razor @@ -43,7 +43,7 @@ else

    } -@functions { +@code { [Parameter] DateTime StartDate { get; set; } WeatherForecast[] forecasts; diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/Greeter.razor b/src/Components/test/testassets/ComponentsApp.App/Pages/Greeter.razor index cb7f5bc192..fd39012d86 100644 --- a/src/Components/test/testassets/ComponentsApp.App/Pages/Greeter.razor +++ b/src/Components/test/testassets/ComponentsApp.App/Pages/Greeter.razor @@ -3,6 +3,6 @@

    Greeter

    Hello @Name

    -@functions { +@code { [CascadingParameter(Name=nameof(Name))] public string Name { get; set; } } diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/Ticker.razor b/src/Components/test/testassets/ComponentsApp.App/Pages/Ticker.razor index 249dfc51e3..2ff15a18ba 100644 --- a/src/Components/test/testassets/ComponentsApp.App/Pages/Ticker.razor +++ b/src/Components/test/testassets/ComponentsApp.App/Pages/Ticker.razor @@ -5,7 +5,7 @@

    Ticker

    @tick

    -@functions { +@code { int tick; private bool _isDisposed; diff --git a/src/Components/test/testassets/ComponentsApp.App/Shared/NavMenu.razor b/src/Components/test/testassets/ComponentsApp.App/Shared/NavMenu.razor index 87ee39f518..178e32d90a 100644 --- a/src/Components/test/testassets/ComponentsApp.App/Shared/NavMenu.razor +++ b/src/Components/test/testassets/ComponentsApp.App/Shared/NavMenu.razor @@ -1,11 +1,11 @@
    Razor Components -
    -
    +
    • @@ -37,15 +37,10 @@ Error
      • -
    • - - Links - -
    -@functions { +@code { bool collapseNavMenu = true; void ToggleNavMenu() diff --git a/src/Components/test/testassets/TestContentPackage/ComponentFromPackage.razor b/src/Components/test/testassets/TestContentPackage/ComponentFromPackage.razor index 5e4ca29480..eb3f60d924 100644 --- a/src/Components/test/testassets/TestContentPackage/ComponentFromPackage.razor +++ b/src/Components/test/testassets/TestContentPackage/ComponentFromPackage.razor @@ -1,10 +1,10 @@ -
    +
    This component, including the CSS and image required to produce its elegant styling, is in an external NuGet package. - +
    -@functions { +@code { string buttonLabel = "Click me"; void ChangeLabel() diff --git a/src/Components/test/testassets/TestServer/Controllers/UserController.cs b/src/Components/test/testassets/TestServer/Controllers/UserController.cs index 16764e4080..d6e289c727 100644 --- a/src/Components/test/testassets/TestServer/Controllers/UserController.cs +++ b/src/Components/test/testassets/TestServer/Controllers/UserController.cs @@ -1,4 +1,6 @@ +using System; using System.Linq; +using System.Security.Claims; using BasicTestApp.AuthTest; using Microsoft.AspNetCore.Mvc; @@ -7,22 +9,28 @@ namespace Components.TestServer.Controllers [Route("api/[controller]")] public class UserController : Controller { + // Servers are not expected to expose everything from the server-side ClaimsPrincipal + // to the client. It's up to the developer to choose what kind of authentication state + // data is needed on the client so it can display suitable options in the UI. + // In this class, we inform the client only about certain roles and certain other claims. + static string[] ExposedRoles = new[] { "IrrelevantRole", "TestRole" }; + // GET api/user [HttpGet] public ClientSideAuthenticationStateData Get() { - // Servers are not expected to expose everything from the server-side ClaimsPrincipal - // to the client. It's up to the developer to choose what kind of authentication state - // data is needed on the client so it can display suitable options in the UI. - return new ClientSideAuthenticationStateData { IsAuthenticated = User.Identity.IsAuthenticated, UserName = User.Identity.Name, ExposedClaims = User.Claims - .Where(c => c.Type == "test-claim") - .ToDictionary(c => c.Type, c => c.Value) + .Where(c => c.Type == "test-claim" || IsExposedRole(c)) + .Select(c => new ExposedClaim { Type = c.Type, Value = c.Value }).ToList() }; } + + private bool IsExposedRole(Claim claim) + => claim.Type == ClaimTypes.Role + && ExposedRoles.Contains(claim.Value); } } diff --git a/src/Components/test/testassets/TestServer/Pages/Authentication.cshtml b/src/Components/test/testassets/TestServer/Pages/Authentication.cshtml index 3f6cbdefd5..165618a019 100644 --- a/src/Components/test/testassets/TestServer/Pages/Authentication.cshtml +++ b/src/Components/test/testassets/TestServer/Pages/Authentication.cshtml @@ -26,6 +26,10 @@ User name:

    +

    + Roles: + +

    @@ -37,7 +41,11 @@

    Authenticated: @User.Identity.IsAuthenticated Username: @User.Identity.Name -

    + Roles: + + @string.Join(", ", User.Claims.Where(c => c.Type == ClaimTypes.Role).Select(c => c.Value).ToArray()) + +

    foreach Sign out @@ -61,6 +69,15 @@ new Claim("test-claim", "Test claim value"), }; + var roles = Request.Query["roles"]; + if (!string.IsNullOrEmpty(roles)) + { + foreach (var role in roles.ToString().Split(',')) + { + claims.Add(new Claim(ClaimTypes.Role, role)); + } + } + await HttpContext.SignInAsync( new ClaimsPrincipal(new ClaimsIdentity(claims, "FakeAuthenticationType"))); diff --git a/src/Components/test/testassets/TestServer/Startup.cs b/src/Components/test/testassets/TestServer/Startup.cs index 26da1af8e0..0075a8dfac 100644 --- a/src/Components/test/testassets/TestServer/Startup.cs +++ b/src/Components/test/testassets/TestServer/Startup.cs @@ -30,6 +30,12 @@ namespace TestServer }); services.AddServerSideBlazor(); services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme).AddCookie(); + + services.AddAuthorization(options => + { + options.AddPolicy("NameMustStartWithB", policy => + policy.RequireAssertion(ctx => ctx.User.Identity.Name?.StartsWith("B") ?? false)); + }); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. diff --git a/src/DefaultBuilder/ref/Microsoft.AspNetCore.csproj b/src/DefaultBuilder/ref/Microsoft.AspNetCore.csproj index 12795e2033..dd42476a01 100644 --- a/src/DefaultBuilder/ref/Microsoft.AspNetCore.csproj +++ b/src/DefaultBuilder/ref/Microsoft.AspNetCore.csproj @@ -17,6 +17,7 @@ + diff --git a/src/DefaultBuilder/ref/Microsoft.AspNetCore.netcoreapp3.0.cs b/src/DefaultBuilder/ref/Microsoft.AspNetCore.netcoreapp3.0.cs index 1737054dc0..e5a76886a4 100644 --- a/src/DefaultBuilder/ref/Microsoft.AspNetCore.netcoreapp3.0.cs +++ b/src/DefaultBuilder/ref/Microsoft.AspNetCore.netcoreapp3.0.cs @@ -3,6 +3,10 @@ namespace Microsoft.AspNetCore { + public static partial class StaticWebAssetsWebHostBuilderExtensions + { + public static Microsoft.AspNetCore.Hosting.IWebHostBuilder UseStaticWebAssets(this Microsoft.AspNetCore.Hosting.IWebHostBuilder builder) { throw null; } + } public static partial class WebHost { public static Microsoft.AspNetCore.Hosting.IWebHostBuilder CreateDefaultBuilder() { throw null; } diff --git a/src/DefaultBuilder/src/Microsoft.AspNetCore.csproj b/src/DefaultBuilder/src/Microsoft.AspNetCore.csproj index d02c88f673..76a27b9a71 100644 --- a/src/DefaultBuilder/src/Microsoft.AspNetCore.csproj +++ b/src/DefaultBuilder/src/Microsoft.AspNetCore.csproj @@ -21,6 +21,7 @@ + diff --git a/src/DefaultBuilder/src/Properties/AssemblyInfo.cs b/src/DefaultBuilder/src/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..97ac339e54 --- /dev/null +++ b/src/DefaultBuilder/src/Properties/AssemblyInfo.cs @@ -0,0 +1,6 @@ +// 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.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/DefaultBuilder/src/StaticWebAssetsFileProvider.cs b/src/DefaultBuilder/src/StaticWebAssetsFileProvider.cs new file mode 100644 index 0000000000..99919f1a1c --- /dev/null +++ b/src/DefaultBuilder/src/StaticWebAssetsFileProvider.cs @@ -0,0 +1,77 @@ +// 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.Runtime.InteropServices; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.FileProviders; +using Microsoft.Extensions.Primitives; + +namespace Microsoft.AspNetCore +{ + // A file provider used for serving static web assets from referenced projects and packages during development. + // The file provider maps folders from referenced projects and packages and prepends a prefix to their relative + // paths. + // At publish time the assets end up in the wwwroot folder of the published app under the prefix indicated here + // as the base path. + // For example, for a referenced project mylibrary with content under <>\wwwroot will expose + // static web assets under _content/mylibrary (this is by convention). The path prefix or base path we apply + // is that (_content/mylibrary). + // when the app gets published, the build pipeline puts the static web assets for mylibrary under + // publish/wwwroot/_content/mylibrary/sample-asset.js + // To allow for the same experience during development, StaticWebAssetsFileProvider maps the contents of + // <>\wwwroot\** to _content/mylibrary/** + internal class StaticWebAssetsFileProvider : IFileProvider + { + private static readonly StringComparison FilePathComparison = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? + StringComparison.OrdinalIgnoreCase : + StringComparison.Ordinal; + + public StaticWebAssetsFileProvider(string pathPrefix, string contentRoot) + { + BasePath = new PathString(pathPrefix.StartsWith("/") ? pathPrefix : "/" + pathPrefix); + InnerProvider = new PhysicalFileProvider(contentRoot); + } + + public PhysicalFileProvider InnerProvider { get; } + + public PathString BasePath { get; } + + /// + public IDirectoryContents GetDirectoryContents(string subpath) + { + if (!StartsWithBasePath(subpath, out var physicalPath)) + { + return NotFoundDirectoryContents.Singleton; + } + else + { + return InnerProvider.GetDirectoryContents(physicalPath); + } + } + + /// + public IFileInfo GetFileInfo(string subpath) + { + if (!StartsWithBasePath(subpath, out var physicalPath)) + { + return new NotFoundFileInfo(subpath); + } + else + { + return InnerProvider.GetFileInfo(physicalPath); + } + } + + /// + public IChangeToken Watch(string filter) + { + return InnerProvider.Watch(filter); + } + + private bool StartsWithBasePath(string subpath, out PathString rest) + { + return new PathString(subpath).StartsWithSegments(BasePath, FilePathComparison, out rest); + } + } +} diff --git a/src/DefaultBuilder/src/StaticWebAssetsLoader.cs b/src/DefaultBuilder/src/StaticWebAssetsLoader.cs new file mode 100644 index 0000000000..05ee714f0c --- /dev/null +++ b/src/DefaultBuilder/src/StaticWebAssetsLoader.cs @@ -0,0 +1,96 @@ +// 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.IO; +using System.Linq; +using System.Reflection; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.FileProviders; + +namespace Microsoft.AspNetCore +{ + internal class StaticWebAssetsLoader + { + internal const string StaticWebAssetsManifestName = "Microsoft.AspNetCore.StaticWebAssets.xml"; + + internal static void UseStaticWebAssets(IWebHostEnvironment environment) + { + using (var manifest = ResolveManifest(environment)) + { + if (manifest != null) + { + UseStaticWebAssetsCore(environment, manifest); + } + } + } + + internal static void UseStaticWebAssetsCore(IWebHostEnvironment environment, Stream manifest) + { + var staticWebAssetsFileProvider = new List(); + var webRootFileProvider = environment.WebRootFileProvider; + + var additionalFiles = StaticWebAssetsReader.Parse(manifest) + .Select(cr => new StaticWebAssetsFileProvider(cr.BasePath, cr.Path)) + .OfType() // Upcast so we can insert on the resulting list. + .ToList(); + + if (additionalFiles.Count == 0) + { + return; + } + else + { + additionalFiles.Insert(0, webRootFileProvider); + environment.WebRootFileProvider = new CompositeFileProvider(additionalFiles); + } + } + + internal static Stream ResolveManifest(IWebHostEnvironment environment) + { + // We plan to remove the embedded file resolution code path in + // a future preview. + Assembly assembly = null; + try + { + assembly = Assembly.Load(environment.ApplicationName); + } + catch (Exception) + { + } + + if (assembly != null && assembly.GetManifestResourceNames().Any(a => a == StaticWebAssetsManifestName)) + { + return assembly.GetManifestResourceStream(StaticWebAssetsManifestName); + } + else + { + // Fallback to physical file as we plan to use a file on disk instead of the embedded resource. + var filePath = Path.Combine(Path.GetDirectoryName(GetAssemblyLocation(assembly)), $"{environment.ApplicationName}.StaticWebAssets.xml"); + if (File.Exists(filePath)) + { + return File.OpenRead(filePath); + } + else + { + // A missing manifest might simply mean that the feature is not enabled, so we simply + // return early. Misconfigurations will be uncommon given that the entire process is automated + // at build time. + return null; + } + } + } + + internal static string GetAssemblyLocation(Assembly assembly) + { + if (Uri.TryCreate(assembly.CodeBase, UriKind.Absolute, out var result) && + result.IsFile && string.IsNullOrWhiteSpace(result.Fragment)) + { + return result.LocalPath; + } + + return assembly.Location; + } + } +} diff --git a/src/DefaultBuilder/src/StaticWebAssetsReader.cs b/src/DefaultBuilder/src/StaticWebAssetsReader.cs new file mode 100644 index 0000000000..82ec626945 --- /dev/null +++ b/src/DefaultBuilder/src/StaticWebAssetsReader.cs @@ -0,0 +1,75 @@ +// 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.IO; +using System.Xml.Linq; + +namespace Microsoft.AspNetCore +{ + internal static class StaticWebAssetsReader + { + private const string ManifestRootElementName = "StaticWebAssets"; + private const string VersionAttributeName = "Version"; + private const string ContentRootElementName = "ContentRoot"; + + internal static IEnumerable Parse(Stream manifest) + { + var document = XDocument.Load(manifest); + if (!string.Equals(document.Root.Name.LocalName, ManifestRootElementName, StringComparison.OrdinalIgnoreCase)) + { + throw new InvalidOperationException($"Invalid manifest format. Manifest root must be '{ManifestRootElementName}'"); + } + + var version = document.Root.Attribute(VersionAttributeName); + if (version == null) + { + throw new InvalidOperationException($"Invalid manifest format. Manifest root element must contain a version '{VersionAttributeName}' attribute"); + } + + if (version.Value != "1.0") + { + throw new InvalidOperationException($"Unknown manifest version. Manifest version must be '1.0'"); + } + + foreach (var element in document.Root.Elements()) + { + if (!string.Equals(element.Name.LocalName, ContentRootElementName, StringComparison.OrdinalIgnoreCase)) + { + throw new InvalidOperationException($"Invalid manifest format. Invalid element '{element.Name.LocalName}'. All {StaticWebAssetsLoader.StaticWebAssetsManifestName} child elements must be '{ContentRootElementName}' elements."); + } + if (!element.IsEmpty) + { + throw new InvalidOperationException($"Invalid manifest format. {ContentRootElementName} can't have content."); + } + + var basePath = ParseRequiredAttribute(element, "BasePath"); + var path = ParseRequiredAttribute(element, "Path"); + yield return new ContentRootMapping(basePath, path); + } + } + + private static string ParseRequiredAttribute(XElement element, string attributeName) + { + var attribute = element.Attribute(attributeName); + if (attribute == null) + { + throw new InvalidOperationException($"Invalid manifest format. Missing {attributeName} attribute in '{ContentRootElementName}' element."); + } + return attribute.Value; + } + + internal readonly struct ContentRootMapping + { + public ContentRootMapping(string basePath, string path) + { + BasePath = basePath; + Path = path; + } + + public string BasePath { get; } + public string Path { get; } + } + } +} diff --git a/src/DefaultBuilder/src/StaticWebAssetsWebHostBuilderExtensions.cs b/src/DefaultBuilder/src/StaticWebAssetsWebHostBuilderExtensions.cs new file mode 100644 index 0000000000..8a754df151 --- /dev/null +++ b/src/DefaultBuilder/src/StaticWebAssetsWebHostBuilderExtensions.cs @@ -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 Microsoft.AspNetCore.Hosting; + +namespace Microsoft.AspNetCore +{ + /// + /// Extensions for configuring static web assets for development. + /// + public static class StaticWebAssetsWebHostBuilderExtensions + { + /// + /// Configures the to use static web assets + /// defined by referenced projects and packages. + /// + /// The . + /// The . + public static IWebHostBuilder UseStaticWebAssets(this IWebHostBuilder builder) + { + builder.ConfigureAppConfiguration((context, configBuilder) => + { + StaticWebAssetsLoader.UseStaticWebAssets(context.HostingEnvironment); + }); + + return builder; + } + } +} diff --git a/src/DefaultBuilder/src/WebHost.cs b/src/DefaultBuilder/src/WebHost.cs index e335931042..5e315dc5d1 100644 --- a/src/DefaultBuilder/src/WebHost.cs +++ b/src/DefaultBuilder/src/WebHost.cs @@ -206,6 +206,13 @@ namespace Microsoft.AspNetCore internal static void ConfigureWebDefaults(IWebHostBuilder builder) { + builder.ConfigureAppConfiguration((ctx, cb) => + { + if (ctx.HostingEnvironment.IsDevelopment()) + { + StaticWebAssetsLoader.UseStaticWebAssets(ctx.HostingEnvironment); + } + }); builder.UseKestrel((builderContext, options) => { options.Configure(builderContext.Configuration.GetSection("Kestrel")); diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/Microsoft.AspNetCore.TestHost.StaticWebAssets.xml b/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/Microsoft.AspNetCore.TestHost.StaticWebAssets.xml new file mode 100644 index 0000000000..f10b7c1a1d --- /dev/null +++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/Microsoft.AspNetCore.TestHost.StaticWebAssets.xml @@ -0,0 +1,3 @@ + + + diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/Microsoft.AspNetCore.Tests.csproj b/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/Microsoft.AspNetCore.Tests.csproj index d23ae11780..6a1ff8c07d 100644 --- a/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/Microsoft.AspNetCore.Tests.csproj +++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/Microsoft.AspNetCore.Tests.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.0 @@ -7,6 +7,8 @@ + + diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/StaticWebAssets/StaticWebAssetsFileProviderTests.cs b/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/StaticWebAssets/StaticWebAssetsFileProviderTests.cs new file mode 100644 index 0000000000..f0066ea305 --- /dev/null +++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/StaticWebAssets/StaticWebAssetsFileProviderTests.cs @@ -0,0 +1,88 @@ +// 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.IO; +using System.Runtime.InteropServices; +using Xunit; + +namespace Microsoft.AspNetCore.Tests +{ + public class StaticWebAssetsFileProviderTests + { + [Fact] + public void StaticWebAssetsFileProvider_ConstructorThrows_WhenPathIsNotFound() + { + // Arrange, Act & Assert + var provider = Assert.Throws(() => new StaticWebAssetsFileProvider("/prefix", "/nonexisting")); + } + + [Fact] + public void StaticWebAssetsFileProvider_Constructor_PrependsPrefixWithSlashIfMissing() + { + // Arrange & Act + var provider = new StaticWebAssetsFileProvider("_content", AppContext.BaseDirectory); + + // Assert + Assert.Equal("/_content", provider.BasePath); + } + + [Fact] + public void StaticWebAssetsFileProvider_Constructor_DoesNotPrependPrefixWithSlashIfPresent() + { + // Arrange & Act + var provider = new StaticWebAssetsFileProvider("/_content", AppContext.BaseDirectory); + + // Assert + Assert.Equal("/_content", provider.BasePath); + } + + [Fact] + public void GetFileInfo_DoesNotMatch_IncompletePrefixSegments() + { + // Arrange + var expectedResult = RuntimeInformation.IsOSPlatform(OSPlatform.Windows); + var provider = new StaticWebAssetsFileProvider( + "_cont", + Path.GetDirectoryName(new Uri(typeof(StaticWebAssetsFileProviderTests).Assembly.CodeBase).LocalPath)); + + // Act + var file = provider.GetFileInfo("/_content/Microsoft.AspNetCore.TestHost.StaticWebAssets.xml"); + + // Assert + Assert.False(file.Exists, "File exists"); + } + + [Fact] + public void GetFileInfo_Prefix_RespectsOsCaseSensitivity() + { + // Arrange + var expectedResult = RuntimeInformation.IsOSPlatform(OSPlatform.Windows); + var provider = new StaticWebAssetsFileProvider( + "_content", + Path.GetDirectoryName(new Uri(typeof(StaticWebAssetsFileProviderTests).Assembly.CodeBase).LocalPath)); + + // Act + var file = provider.GetFileInfo("/_CONTENT/Microsoft.AspNetCore.TestHost.StaticWebAssets.xml"); + + // Assert + Assert.Equal(expectedResult, file.Exists); + } + + [Fact] + public void GetDirectoryContents_Prefix_RespectsOsCaseSensitivity() + { + // Arrange + var expectedResult = RuntimeInformation.IsOSPlatform(OSPlatform.Windows); + var provider = new StaticWebAssetsFileProvider( + "_content", + Path.GetDirectoryName(new Uri(typeof(StaticWebAssetsFileProviderTests).Assembly.CodeBase).LocalPath)); + + // Act + var directory = provider.GetDirectoryContents("/_CONTENT"); + + // Assert + Assert.Equal(expectedResult, directory.Exists); + } + } +} diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/StaticWebAssets/StaticWebAssetsLoaderTests.cs b/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/StaticWebAssets/StaticWebAssetsLoaderTests.cs new file mode 100644 index 0000000000..bed656a259 --- /dev/null +++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/StaticWebAssets/StaticWebAssetsLoaderTests.cs @@ -0,0 +1,108 @@ +// 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.IO; +using System.Linq; +using System.Text; +using Microsoft.AspNetCore.Hosting.Internal; +using Microsoft.Extensions.FileProviders; +using Xunit; + +namespace Microsoft.AspNetCore.Tests +{ + public class StaticWebAssetsLoaderTests + { + [Fact] + public void UseStaticWebAssetsCore_CreatesCompositeRoot_WhenThereAreContentRootsInTheManifest() + { + // Arrange + var manifestContent = @$" + +"; + + var manifest = CreateManifest(manifestContent); + var originalRoot = new NullFileProvider(); + var environment = new HostingEnvironment() + { + WebRootFileProvider = originalRoot + }; + + // Act + StaticWebAssetsLoader.UseStaticWebAssetsCore(environment, manifest); + + // Assert + var composite = Assert.IsType(environment.WebRootFileProvider); + Assert.Equal(2, composite.FileProviders.Count()); + Assert.Equal(originalRoot, composite.FileProviders.First()); + } + + [Fact] + public void UseStaticWebAssetsCore_DoesNothing_WhenManifestDoesNotContainEntries() + { + // Arrange + var manifestContent = @$" +"; + + var manifest = CreateManifest(manifestContent); + var originalRoot = new NullFileProvider(); + var environment = new HostingEnvironment() + { + WebRootFileProvider = originalRoot + }; + + // Act + StaticWebAssetsLoader.UseStaticWebAssetsCore(environment, manifest); + + // Assert + Assert.Equal(originalRoot, environment.WebRootFileProvider); + } + + [Fact] + public void ResolveManifest_FindsEmbeddedManifestProvider() + { + // Arrange + var expectedManifest = @" + + +"; + var originalRoot = new NullFileProvider(); + var environment = new HostingEnvironment() + { + ApplicationName = typeof(StaticWebAssetsReaderTests).Assembly.GetName().Name + }; + + // Act + var manifest = StaticWebAssetsLoader.ResolveManifest(environment); + + // Assert + Assert.Equal(expectedManifest, new StreamReader(manifest).ReadToEnd()); + } + + [Fact] + public void ResolveManifest_ManifestFromFile() + { + // Arrange + var expectedManifest = @" + + +"; + + var environment = new HostingEnvironment() + { + ApplicationName = "Microsoft.AspNetCore.TestHost" + }; + + // Act + var manifest = StaticWebAssetsLoader.ResolveManifest(environment); + + // Assert + Assert.Equal(expectedManifest, new StreamReader(manifest).ReadToEnd()); + } + + private Stream CreateManifest(string manifestContent) + { + return new MemoryStream(Encoding.UTF8.GetBytes(manifestContent)); + } + } +} diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/StaticWebAssets/StaticWebAssetsReaderTests.cs b/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/StaticWebAssets/StaticWebAssetsReaderTests.cs new file mode 100644 index 0000000000..1adffad46c --- /dev/null +++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/StaticWebAssets/StaticWebAssetsReaderTests.cs @@ -0,0 +1,147 @@ +// 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.IO; +using System.Linq; +using System.Text; +using System.Xml; +using Xunit; + +namespace Microsoft.AspNetCore.Tests +{ + public class StaticWebAssetsReaderTests + { + [Fact] + public void ParseManifest_ThrowsFor_EmptyManifest() + { + // Arrange + var manifestContent = @""; + var manifest = CreateManifest(manifestContent); + + // Act & Assert + var exception = Assert.Throws(() => StaticWebAssetsReader.Parse(manifest).ToArray()); + Assert.StartsWith("Root element is missing.", exception.Message); + } + + [Fact] + public void ParseManifest_ThrowsFor_UnknownRootElement() + { + // Arrange + var manifestContent = @""; + var manifest = CreateManifest(manifestContent); + + // Act & Assert + var exception = Assert.Throws(() => StaticWebAssetsReader.Parse(manifest).ToArray()); + Assert.StartsWith("Invalid manifest", exception.Message); + } + + [Fact] + public void ParseManifest_ThrowsFor_MissingVersion() + { + // Arrange + var manifestContent = @""; + var manifest = CreateManifest(manifestContent); + + // Act & Assert + var exception = Assert.Throws(() => StaticWebAssetsReader.Parse(manifest).ToArray()); + Assert.StartsWith("Invalid manifest", exception.Message); + } + + [Fact] + public void ParseManifest_ThrowsFor_UnknownVersion() + { + // Arrange + var manifestContent = @""; + var manifest = CreateManifest(manifestContent); + + // Act & Assert + var exception = Assert.Throws(() => StaticWebAssetsReader.Parse(manifest).ToArray()); + Assert.StartsWith("Unknown manifest version", exception.Message); + } + + [Fact] + public void ParseManifest_ThrowsFor_InvalidStaticWebAssetsChildren() + { + // Arrange + var manifestContent = @" + +"; + var manifest = CreateManifest(manifestContent); + + // Act & Assert + var exception = Assert.Throws(() => StaticWebAssetsReader.Parse(manifest).ToArray()); + Assert.StartsWith("Invalid manifest", exception.Message); + } + + [Fact] + public void ParseManifest_ThrowsFor_MissingBasePath() + { + // Arrange + var manifestContent = @" + +"; + + var manifest = CreateManifest(manifestContent); + + // Act & Assert + var exception = Assert.Throws(() => StaticWebAssetsReader.Parse(manifest).ToArray()); + Assert.StartsWith("Invalid manifest", exception.Message); + } + + [Fact] + public void ParseManifest_ThrowsFor_MissingPath() + { + // Arrange + var manifestContent = @" + +"; + + var manifest = CreateManifest(manifestContent); + + // Act & Assert + var exception = Assert.Throws(() => StaticWebAssetsReader.Parse(manifest).ToArray()); + Assert.StartsWith("Invalid manifest", exception.Message); + } + + [Fact] + public void ParseManifest_ThrowsFor_ChildContentRootContent() + { + // Arrange + var manifestContent = @" + + +"; + + var manifest = CreateManifest(manifestContent); + + // Act & Assert + var exception = Assert.Throws(() => StaticWebAssetsReader.Parse(manifest).ToArray()); + Assert.StartsWith("Invalid manifest", exception.Message); + } + + [Fact] + public void ParseManifest_ParsesManifest_WithSingleItem() + { + // Arrange + var manifestContent = @" + +"; + + var manifest = CreateManifest(manifestContent); + + // Act + var mappings = StaticWebAssetsReader.Parse(manifest).ToArray(); + + // Assert + var mapping = Assert.Single(mappings); + Assert.Equal("/Path", mapping.Path); + Assert.Equal("/BasePath", mapping.BasePath); + } + + private Stream CreateManifest(string manifestContent) + { + return new MemoryStream(Encoding.UTF8.GetBytes(manifestContent)); + } + } +} diff --git a/src/Hosting/Hosting.sln b/src/Hosting/Hosting.sln index 9c6c5d5716..161c24fa1b 100644 --- a/src/Hosting/Hosting.sln +++ b/src/Hosting/Hosting.sln @@ -59,8 +59,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "..\Servers\Kestrel\Transport.Sockets\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", "{28899903-4A65-466C-B8C6-DA5A5CB5DF75}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions", "..\Servers\Kestrel\Transport.Abstractions\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj", "{006042D1-A053-4788-8D58-AB08DBB2E668}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Connections.Abstractions", "..\Servers\Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj", "{962C2A87-DDA7-4D5E-861E-9042DA021F7D}" EndProject Global @@ -169,10 +167,6 @@ Global {28899903-4A65-466C-B8C6-DA5A5CB5DF75}.Debug|Any CPU.Build.0 = Debug|Any CPU {28899903-4A65-466C-B8C6-DA5A5CB5DF75}.Release|Any CPU.ActiveCfg = Release|Any CPU {28899903-4A65-466C-B8C6-DA5A5CB5DF75}.Release|Any CPU.Build.0 = Release|Any CPU - {006042D1-A053-4788-8D58-AB08DBB2E668}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {006042D1-A053-4788-8D58-AB08DBB2E668}.Debug|Any CPU.Build.0 = Debug|Any CPU - {006042D1-A053-4788-8D58-AB08DBB2E668}.Release|Any CPU.ActiveCfg = Release|Any CPU - {006042D1-A053-4788-8D58-AB08DBB2E668}.Release|Any CPU.Build.0 = Release|Any CPU {962C2A87-DDA7-4D5E-861E-9042DA021F7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {962C2A87-DDA7-4D5E-861E-9042DA021F7D}.Debug|Any CPU.Build.0 = Debug|Any CPU {962C2A87-DDA7-4D5E-861E-9042DA021F7D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -197,7 +191,6 @@ Global {02741DAE-CF50-40C7-A717-1DC7182B737C} = {2A533A99-96D8-4A02-8990-BA8F94E70567} {87D20FC7-94AF-4FCF-A25F-221D61A1E2D9} = {2A533A99-96D8-4A02-8990-BA8F94E70567} {28899903-4A65-466C-B8C6-DA5A5CB5DF75} = {2A533A99-96D8-4A02-8990-BA8F94E70567} - {006042D1-A053-4788-8D58-AB08DBB2E668} = {2A533A99-96D8-4A02-8990-BA8F94E70567} {962C2A87-DDA7-4D5E-861E-9042DA021F7D} = {2A533A99-96D8-4A02-8990-BA8F94E70567} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/Hosting/TestHost/src/AsyncStreamWrapper.cs b/src/Hosting/TestHost/src/AsyncStreamWrapper.cs index 4766f8fcf1..705d5a7a0e 100644 --- a/src/Hosting/TestHost/src/AsyncStreamWrapper.cs +++ b/src/Hosting/TestHost/src/AsyncStreamWrapper.cs @@ -116,17 +116,18 @@ namespace Microsoft.AspNetCore.TestHost public override void Close() { - _inner.Close(); + // Don't dispose the inner stream, we don't want to impact the client stream } protected override void Dispose(bool disposing) { - _inner.Dispose(); + // Don't dispose the inner stream, we don't want to impact the client stream } public override ValueTask DisposeAsync() { - return _inner.DisposeAsync(); + // Don't dispose the inner stream, we don't want to impact the client stream + return default; } } } diff --git a/src/Hosting/TestHost/test/TestServerTests.cs b/src/Hosting/TestHost/test/TestServerTests.cs index cc789962c7..2eb474b496 100644 --- a/src/Hosting/TestHost/test/TestServerTests.cs +++ b/src/Hosting/TestHost/test/TestServerTests.cs @@ -3,8 +3,10 @@ using System; using System.Diagnostics; +using System.IO; using System.Net; using System.Net.Http; +using System.Text; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; @@ -18,6 +20,7 @@ using Microsoft.Extensions.DiagnosticAdapter; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Microsoft.Net.Http.Headers; +using Moq; using Xunit; namespace Microsoft.AspNetCore.TestHost @@ -191,6 +194,28 @@ namespace Microsoft.AspNetCore.TestHost Assert.Equal("RequestServices:True", result); } + [Fact] + public async Task DispoingTheRequestBodyDoesNotDisposeClientStreams() + { + var builder = new WebHostBuilder().Configure(app => + { + app.Run(async context => + { + using (var sr = new StreamReader(context.Request.Body)) + { + await context.Response.WriteAsync(await sr.ReadToEndAsync()); + } + }); + }); + var server = new TestServer(builder); + + var stream = new ThrowOnDisposeStream(); + stream.Write(Encoding.ASCII.GetBytes("Hello World")); + var response = await server.CreateClient().PostAsync("/", new StreamContent(stream)); + Assert.True(response.IsSuccessStatusCode); + Assert.Equal("Hello World", await response.Content.ReadAsStringAsync()); + } + public class CustomContainerStartup { public IServiceProvider Services; @@ -662,6 +687,19 @@ namespace Microsoft.AspNetCore.TestHost Assert.Equal("otherhost:5678", responseBody); } + private class ThrowOnDisposeStream : MemoryStream + { + protected override void Dispose(bool disposing) + { + throw new InvalidOperationException("Dispose should not happen!"); + } + + public override ValueTask DisposeAsync() + { + throw new InvalidOperationException("DisposeAsync should not happen!"); + } + } + public class TestDiagnosticListener { public class OnBeginRequestEventData diff --git a/src/Hosting/test/FunctionalTests/ShutdownTests.cs b/src/Hosting/test/FunctionalTests/ShutdownTests.cs index 7e6124e146..82e707487d 100644 --- a/src/Hosting/test/FunctionalTests/ShutdownTests.cs +++ b/src/Hosting/test/FunctionalTests/ShutdownTests.cs @@ -28,7 +28,6 @@ namespace Microsoft.AspNetCore.Hosting.FunctionalTests [ConditionalFact] [OSSkipCondition(OperatingSystems.Windows)] [OSSkipCondition(OperatingSystems.MacOSX)] - [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/1687", FlakyOn.AzP.Linux)] public async Task ShutdownTestRun() { await ExecuteShutdownTest(nameof(ShutdownTestRun), "Run"); diff --git a/src/Http/Authentication.Abstractions/ref/Microsoft.AspNetCore.Authentication.Abstractions.netcoreapp3.0.cs b/src/Http/Authentication.Abstractions/ref/Microsoft.AspNetCore.Authentication.Abstractions.netcoreapp3.0.cs index 07b96e1378..dd9628c89a 100644 --- a/src/Http/Authentication.Abstractions/ref/Microsoft.AspNetCore.Authentication.Abstractions.netcoreapp3.0.cs +++ b/src/Http/Authentication.Abstractions/ref/Microsoft.AspNetCore.Authentication.Abstractions.netcoreapp3.0.cs @@ -51,6 +51,7 @@ namespace Microsoft.AspNetCore.Authentication public string DefaultScheme { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public string DefaultSignInScheme { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public string DefaultSignOutScheme { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool RequireAuthenticatedSignIn { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public System.Collections.Generic.IDictionary SchemeMap { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public System.Collections.Generic.IEnumerable Schemes { get { throw null; } } public void AddScheme(string name, System.Action configureBuilder) { } diff --git a/src/Http/Authentication.Abstractions/src/AuthenticationOptions.cs b/src/Http/Authentication.Abstractions/src/AuthenticationOptions.cs index 2781a35757..2fc213d718 100644 --- a/src/Http/Authentication.Abstractions/src/AuthenticationOptions.cs +++ b/src/Http/Authentication.Abstractions/src/AuthenticationOptions.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; +using System.Security.Claims; using Microsoft.AspNetCore.Http; namespace Microsoft.AspNetCore.Authentication @@ -89,5 +90,10 @@ namespace Microsoft.AspNetCore.Authentication /// Used as the default scheme by . /// public string DefaultForbidScheme { get; set; } + + /// + /// If true, SignIn should throw if attempted with a ClaimsPrincipal.Identity.IsAuthenticated = false. + /// + public bool RequireAuthenticatedSignIn { get; set; } = true; } } diff --git a/src/Http/Authentication.Core/ref/Microsoft.AspNetCore.Authentication.Core.netcoreapp3.0.cs b/src/Http/Authentication.Core/ref/Microsoft.AspNetCore.Authentication.Core.netcoreapp3.0.cs index 26a6b29d96..f12e27bcf2 100644 --- a/src/Http/Authentication.Core/ref/Microsoft.AspNetCore.Authentication.Core.netcoreapp3.0.cs +++ b/src/Http/Authentication.Core/ref/Microsoft.AspNetCore.Authentication.Core.netcoreapp3.0.cs @@ -33,8 +33,9 @@ namespace Microsoft.AspNetCore.Authentication } public partial class AuthenticationService : Microsoft.AspNetCore.Authentication.IAuthenticationService { - public AuthenticationService(Microsoft.AspNetCore.Authentication.IAuthenticationSchemeProvider schemes, Microsoft.AspNetCore.Authentication.IAuthenticationHandlerProvider handlers, Microsoft.AspNetCore.Authentication.IClaimsTransformation transform) { } + public AuthenticationService(Microsoft.AspNetCore.Authentication.IAuthenticationSchemeProvider schemes, Microsoft.AspNetCore.Authentication.IAuthenticationHandlerProvider handlers, Microsoft.AspNetCore.Authentication.IClaimsTransformation transform, Microsoft.Extensions.Options.IOptions options) { } public Microsoft.AspNetCore.Authentication.IAuthenticationHandlerProvider Handlers { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Authentication.AuthenticationOptions Options { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public Microsoft.AspNetCore.Authentication.IAuthenticationSchemeProvider Schemes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public Microsoft.AspNetCore.Authentication.IClaimsTransformation Transform { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } [System.Diagnostics.DebuggerStepThroughAttribute] diff --git a/src/Http/Authentication.Core/src/AuthenticationService.cs b/src/Http/Authentication.Core/src/AuthenticationService.cs index 3e46df2f24..ce6328ae75 100644 --- a/src/Http/Authentication.Core/src/AuthenticationService.cs +++ b/src/Http/Authentication.Core/src/AuthenticationService.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Security.Claims; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Options; namespace Microsoft.AspNetCore.Authentication { @@ -20,11 +21,13 @@ namespace Microsoft.AspNetCore.Authentication /// The . /// The . /// The . - public AuthenticationService(IAuthenticationSchemeProvider schemes, IAuthenticationHandlerProvider handlers, IClaimsTransformation transform) + /// The . + public AuthenticationService(IAuthenticationSchemeProvider schemes, IAuthenticationHandlerProvider handlers, IClaimsTransformation transform, IOptions options) { Schemes = schemes; Handlers = handlers; Transform = transform; + Options = options.Value; } /// @@ -42,6 +45,11 @@ namespace Microsoft.AspNetCore.Authentication /// public IClaimsTransformation Transform { get; } + /// + /// The . + /// + public AuthenticationOptions Options { get; } + /// /// Authenticate for the specified authentication scheme. /// @@ -146,6 +154,18 @@ namespace Microsoft.AspNetCore.Authentication throw new ArgumentNullException(nameof(principal)); } + if (Options.RequireAuthenticatedSignIn) + { + if (principal.Identity == null) + { + throw new InvalidOperationException("SignInAsync when principal.Identity == null is not allowed when AuthenticationOptions.RequireAuthenticatedSignIn is true."); + } + if (!principal.Identity.IsAuthenticated) + { + throw new InvalidOperationException("SignInAsync when principal.Identity.IsAuthenticated is false is not allowed when AuthenticationOptions.RequireAuthenticatedSignIn is true."); + } + } + if (scheme == null) { var defaultScheme = await Schemes.GetDefaultSignInSchemeAsync(); diff --git a/src/Http/Authentication.Core/test/AuthenticationServiceTests.cs b/src/Http/Authentication.Core/test/AuthenticationServiceTests.cs index e21ea40d51..b62db22077 100644 --- a/src/Http/Authentication.Core/test/AuthenticationServiceTests.cs +++ b/src/Http/Authentication.Core/test/AuthenticationServiceTests.cs @@ -57,6 +57,35 @@ namespace Microsoft.AspNetCore.Authentication Assert.Contains("base", ex.Message); } + [Fact] + public async Task CanOnlySignInWithIsAuthenticated() + { + var services = new ServiceCollection().AddOptions().AddAuthenticationCore(o => + { + o.AddScheme("signin", "whatever"); + }).BuildServiceProvider(); + var context = new DefaultHttpContext(); + context.RequestServices = services; + + var ex = await Assert.ThrowsAsync(() => context.SignInAsync("signin", new ClaimsPrincipal(), null)); + await context.SignInAsync("signin", new ClaimsPrincipal(new ClaimsIdentity("whatever")), null); + } + + [Fact] + public async Task CanSignInWithoutIsAuthenticated() + { + var services = new ServiceCollection().AddOptions().AddAuthenticationCore(o => + { + o.AddScheme("signin", "whatever"); + o.RequireAuthenticatedSignIn = false; + }).BuildServiceProvider(); + var context = new DefaultHttpContext(); + context.RequestServices = services; + + await context.SignInAsync("signin", new ClaimsPrincipal(), null); + await context.SignInAsync("signin", new ClaimsPrincipal(new ClaimsIdentity("whatever")), null); + } + [Fact] public async Task CanOnlySignInIfSupported() { @@ -70,12 +99,12 @@ namespace Microsoft.AspNetCore.Authentication var context = new DefaultHttpContext(); context.RequestServices = services; - await context.SignInAsync("uber", new ClaimsPrincipal(), null); - var ex = await Assert.ThrowsAsync(() => context.SignInAsync("base", new ClaimsPrincipal(), null)); + await context.SignInAsync("uber", new ClaimsPrincipal(new ClaimsIdentity("whatever")), null); + var ex = await Assert.ThrowsAsync(() => context.SignInAsync("base", new ClaimsPrincipal(new ClaimsIdentity("whatever")), null)); Assert.Contains("uber", ex.Message); Assert.Contains("signin", ex.Message); - await context.SignInAsync("signin", new ClaimsPrincipal(), null); - ex = await Assert.ThrowsAsync(() => context.SignInAsync("signout", new ClaimsPrincipal(), null)); + await context.SignInAsync("signin", new ClaimsPrincipal(new ClaimsIdentity("whatever")), null); + ex = await Assert.ThrowsAsync(() => context.SignInAsync("signout", new ClaimsPrincipal(new ClaimsIdentity("whatever")), null)); Assert.Contains("uber", ex.Message); Assert.Contains("signin", ex.Message); } @@ -117,7 +146,7 @@ namespace Microsoft.AspNetCore.Authentication await context.ForbidAsync(); var ex = await Assert.ThrowsAsync(() => context.SignOutAsync()); Assert.Contains("cannot be used for SignOutAsync", ex.Message); - ex = await Assert.ThrowsAsync(() => context.SignInAsync(new ClaimsPrincipal())); + ex = await Assert.ThrowsAsync(() => context.SignInAsync(new ClaimsPrincipal(new ClaimsIdentity("whatever")))); Assert.Contains("cannot be used for SignInAsync", ex.Message); } @@ -136,7 +165,7 @@ namespace Microsoft.AspNetCore.Authentication await context.ChallengeAsync(); await context.ForbidAsync(); await context.SignOutAsync(); - await context.SignInAsync(new ClaimsPrincipal()); + await context.SignInAsync(new ClaimsPrincipal(new ClaimsIdentity("whatever"))); } [Fact] @@ -154,7 +183,7 @@ namespace Microsoft.AspNetCore.Authentication await context.ChallengeAsync(); await context.ForbidAsync(); await context.SignOutAsync(); - await context.SignInAsync(new ClaimsPrincipal()); + await context.SignInAsync(new ClaimsPrincipal(new ClaimsIdentity("whatever"))); } [Fact] @@ -172,7 +201,7 @@ namespace Microsoft.AspNetCore.Authentication await context.ChallengeAsync(); await context.ForbidAsync(); await context.SignOutAsync(); - var ex = await Assert.ThrowsAsync(() => context.SignInAsync(new ClaimsPrincipal())); + var ex = await Assert.ThrowsAsync(() => context.SignInAsync(new ClaimsPrincipal(new ClaimsIdentity("whatever")))); Assert.Contains("cannot be used for SignInAsync", ex.Message); } diff --git a/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.netcoreapp3.0.cs b/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.netcoreapp3.0.cs index cae69dd66c..819234838c 100644 --- a/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.netcoreapp3.0.cs +++ b/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.netcoreapp3.0.cs @@ -250,7 +250,7 @@ namespace Microsoft.AspNetCore.Http { protected HttpRequest() { } public abstract System.IO.Stream Body { get; set; } - public abstract System.IO.Pipelines.PipeReader BodyReader { get; set; } + public virtual System.IO.Pipelines.PipeReader BodyReader { get { throw null; } } public abstract long? ContentLength { get; set; } public abstract string ContentType { get; set; } public abstract Microsoft.AspNetCore.Http.IRequestCookieCollection Cookies { get; set; } @@ -274,7 +274,7 @@ namespace Microsoft.AspNetCore.Http { protected HttpResponse() { } public abstract System.IO.Stream Body { get; set; } - public abstract System.IO.Pipelines.PipeWriter BodyWriter { get; set; } + public virtual System.IO.Pipelines.PipeWriter BodyWriter { get { throw null; } } public abstract long? ContentLength { get; set; } public abstract string ContentType { get; set; } public abstract Microsoft.AspNetCore.Http.IResponseCookies Cookies { get; } @@ -290,7 +290,7 @@ namespace Microsoft.AspNetCore.Http public abstract void Redirect(string location, bool permanent); public virtual void RegisterForDispose(System.IDisposable disposable) { } public virtual void RegisterForDisposeAsync(System.IAsyncDisposable disposable) { } - public abstract System.Threading.Tasks.Task StartAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + public virtual System.Threading.Tasks.Task StartAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } } public static partial class HttpResponseWritingExtensions { diff --git a/src/Http/Http.Abstractions/src/HttpRequest.cs b/src/Http/Http.Abstractions/src/HttpRequest.cs index 1163cbf52a..4a6c58b7e0 100644 --- a/src/Http/Http.Abstractions/src/HttpRequest.cs +++ b/src/Http/Http.Abstractions/src/HttpRequest.cs @@ -1,6 +1,7 @@ // 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.IO; using System.IO.Pipelines; using System.Threading; @@ -104,9 +105,9 @@ namespace Microsoft.AspNetCore.Http public abstract Stream Body { get; set; } /// - /// Gets or sets the request body pipe . + /// Gets the request body pipe . /// - public abstract PipeReader BodyReader { get; set; } + public virtual PipeReader BodyReader { get => throw new NotImplementedException(); } /// /// Checks the Content-Type header for form types. diff --git a/src/Http/Http.Abstractions/src/HttpResponse.cs b/src/Http/Http.Abstractions/src/HttpResponse.cs index f38e953771..9df4f095e6 100644 --- a/src/Http/Http.Abstractions/src/HttpResponse.cs +++ b/src/Http/Http.Abstractions/src/HttpResponse.cs @@ -45,9 +45,9 @@ namespace Microsoft.AspNetCore.Http public abstract Stream Body { get; set; } /// - /// Gets or sets the response body pipe + /// Gets the response body pipe /// - public abstract PipeWriter BodyWriter { get; set; } + public virtual PipeWriter BodyWriter { get => throw new NotImplementedException(); } /// /// Gets or sets the value for the Content-Length response header. @@ -129,6 +129,6 @@ namespace Microsoft.AspNetCore.Http /// /// If the isn't set, StartAsync will default to calling HttpResponse.Body.FlushAsync(). /// - public abstract Task StartAsync(CancellationToken cancellationToken = default); + public virtual Task StartAsync(CancellationToken cancellationToken = default) { throw new NotImplementedException(); } } } diff --git a/src/Http/Http.Abstractions/test/HttpResponseWritingExtensionsTests.cs b/src/Http/Http.Abstractions/test/HttpResponseWritingExtensionsTests.cs index 70684be914..0591abdce6 100644 --- a/src/Http/Http.Abstractions/test/HttpResponseWritingExtensionsTests.cs +++ b/src/Http/Http.Abstractions/test/HttpResponseWritingExtensionsTests.cs @@ -3,8 +3,7 @@ using System; using System.IO; -using System.IO.Pipelines; -using System.IO.Pipelines.Tests; +using System.Linq; using System.Text; using System.Threading.Tasks; using Xunit; @@ -36,15 +35,12 @@ namespace Microsoft.AspNetCore.Http [MemberData(nameof(Encodings))] public async Task WritingTextThatRequiresMultipleSegmentsWorks(Encoding encoding) { - // Need to change the StreamPipeWriter with a capped MemoryPool - var memoryPool = new TestMemoryPool(maxBufferSize: 16); var outputStream = new MemoryStream(); - var streamPipeWriter = new StreamPipeWriter(outputStream, minimumSegmentSize: 0, memoryPool); HttpContext context = new DefaultHttpContext(); - context.Response.BodyWriter = streamPipeWriter; + context.Response.Body = outputStream; - var inputString = "昨日すき焼きを食べました"; + var inputString = string.Concat(Enumerable.Repeat("昨日すき焼きを食べました", 1000)); var expected = encoding.GetBytes(inputString); await context.Response.WriteAsync(inputString, encoding); @@ -52,11 +48,8 @@ namespace Microsoft.AspNetCore.Http var actual = new byte[expected.Length]; var length = outputStream.Read(actual); - var res1 = encoding.GetString(actual); - var res2 = encoding.GetString(expected); Assert.Equal(expected.Length, length); Assert.Equal(expected, actual); - streamPipeWriter.Complete(); } [Theory] diff --git a/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.netstandard2.0.cs b/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.netstandard2.0.cs index 8c0f10b5dc..c97e11f219 100644 --- a/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.netstandard2.0.cs +++ b/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.netstandard2.0.cs @@ -246,7 +246,7 @@ namespace Microsoft.AspNetCore.Http.Features } public partial interface IRequestBodyPipeFeature { - System.IO.Pipelines.PipeReader Reader { get; set; } + System.IO.Pipelines.PipeReader Reader { get; } } public partial interface IRequestCookiesFeature { @@ -254,7 +254,7 @@ namespace Microsoft.AspNetCore.Http.Features } public partial interface IResponseBodyPipeFeature { - System.IO.Pipelines.PipeWriter Writer { get; set; } + System.IO.Pipelines.PipeWriter Writer { get; } } public partial interface IResponseCookiesFeature { diff --git a/src/Http/Http.Features/src/IRequestBodyPipeFeature.cs b/src/Http/Http.Features/src/IRequestBodyPipeFeature.cs index 9357edb421..99e109b99d 100644 --- a/src/Http/Http.Features/src/IRequestBodyPipeFeature.cs +++ b/src/Http/Http.Features/src/IRequestBodyPipeFeature.cs @@ -13,6 +13,6 @@ namespace Microsoft.AspNetCore.Http.Features /// /// A representing the request body, if any. /// - PipeReader Reader { get; set; } + PipeReader Reader { get; } } } diff --git a/src/Http/Http.Features/src/IResponseBodyPipeFeature.cs b/src/Http/Http.Features/src/IResponseBodyPipeFeature.cs index 71a55d12b9..45d0e35f0a 100644 --- a/src/Http/Http.Features/src/IResponseBodyPipeFeature.cs +++ b/src/Http/Http.Features/src/IResponseBodyPipeFeature.cs @@ -14,6 +14,6 @@ namespace Microsoft.AspNetCore.Http.Features /// /// A representing the response body, if any. /// - PipeWriter Writer { get; set; } + PipeWriter Writer { get; } } } diff --git a/src/Http/Http/perf/NoopStream.cs b/src/Http/Http/perf/NoopStream.cs deleted file mode 100644 index 9dcfe8408f..0000000000 --- a/src/Http/Http/perf/NoopStream.cs +++ /dev/null @@ -1,70 +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.IO; -using System.Threading; -using System.Threading.Tasks; - -namespace Microsoft.AspNetCore.Http -{ - public class NoopStream : Stream - { - public override bool CanRead => true; - - public override bool CanSeek => throw new NotImplementedException(); - - public override bool CanWrite => true; - - public override long Length => throw new NotImplementedException(); - - public override long Position { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } - - public override void Flush() - { - } - - public override int Read(byte[] buffer, int offset, int count) - { - return 0; - } - - public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - return Task.FromResult(0); - } - - public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default) - { - return new ValueTask(0); - } - - public override long Seek(long offset, SeekOrigin origin) - { - throw new NotImplementedException(); - } - - public override void SetLength(long value) - { - } - - public override void Write(byte[] buffer, int offset, int count) - { - } - - public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - return Task.CompletedTask; - } - - public override ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken = default(CancellationToken)) - { - return default(ValueTask); - } - - public override Task FlushAsync(CancellationToken cancellationToken) - { - return Task.CompletedTask; - } - } -} diff --git a/src/Http/Http/perf/StreamPipeReaderBenchmark.cs b/src/Http/Http/perf/StreamPipeReaderBenchmark.cs deleted file mode 100644 index 2b5ef7c24b..0000000000 --- a/src/Http/Http/perf/StreamPipeReaderBenchmark.cs +++ /dev/null @@ -1,82 +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.IO.Pipelines; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using BenchmarkDotNet.Attributes; - -namespace Microsoft.AspNetCore.Http -{ - public class StreamPipeReaderBenchmark - { - private StreamPipeReader _pipeReaderNoop; - private StreamPipeReader _pipeReaderHelloWorld; - private StreamPipeReader _pipeReaderHelloWorldAync; - - [IterationSetup] - public void Setup() - { - _pipeReaderNoop = new StreamPipeReader(new NoopStream()); - _pipeReaderHelloWorld = new StreamPipeReader(new HelloWorldStream()); - _pipeReaderHelloWorldAync = new StreamPipeReader(new HelloWorldAsyncStream()); - } - - [Benchmark] - public async Task ReadNoop() - { - await _pipeReaderNoop.ReadAsync(); - } - - [Benchmark] - public async Task ReadHelloWorld() - { - var result = await _pipeReaderHelloWorld.ReadAsync(); - _pipeReaderHelloWorld.AdvanceTo(result.Buffer.End); - } - - [Benchmark] - public async Task ReadHelloWorldAsync() - { - var result = await _pipeReaderHelloWorldAync.ReadAsync(); - _pipeReaderHelloWorldAync.AdvanceTo(result.Buffer.End); - } - - private class HelloWorldStream : NoopStream - { - private static byte[] bytes = Encoding.ASCII.GetBytes("Hello World"); - public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - bytes.CopyTo(buffer, 0); - return Task.FromResult(11); - } - - public override ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default) - { - bytes.CopyTo(buffer); - - return new ValueTask(11); - } - } - - private class HelloWorldAsyncStream : NoopStream - { - private static byte[] bytes = Encoding.ASCII.GetBytes("Hello World"); - public override async Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - await Task.Yield(); - bytes.CopyTo(buffer, 0); - return 11; - } - - public override async ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default) - { - await Task.Yield(); - bytes.CopyTo(buffer); - return 11; - } - } - } -} diff --git a/src/Http/Http/perf/StreamPipeWriterBenchmark.cs b/src/Http/Http/perf/StreamPipeWriterBenchmark.cs deleted file mode 100644 index dd7836120d..0000000000 --- a/src/Http/Http/perf/StreamPipeWriterBenchmark.cs +++ /dev/null @@ -1,38 +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.IO; -using System.IO.Pipelines; -using System.Text; -using System.Threading.Tasks; -using BenchmarkDotNet.Attributes; - -namespace Microsoft.AspNetCore.Http -{ - public class StreamPipeWriterBenchmark - { - private Stream _memoryStream; - private StreamPipeWriter _pipeWriter; - private static byte[] _helloWorldBytes = Encoding.ASCII.GetBytes("Hello World"); - private static byte[] _largeWrite = Encoding.ASCII.GetBytes(new string('a', 50000)); - - [IterationSetup] - public void Setup() - { - _memoryStream = new NoopStream(); - _pipeWriter = new StreamPipeWriter(_memoryStream); - } - - [Benchmark] - public async Task WriteHelloWorld() - { - await _pipeWriter.WriteAsync(_helloWorldBytes); - } - - [Benchmark] - public async Task WriteHelloWorldLargeWrite() - { - await _pipeWriter.WriteAsync(_largeWrite); - } - } -} diff --git a/src/Http/Http/ref/Microsoft.AspNetCore.Http.netcoreapp3.0.cs b/src/Http/Http/ref/Microsoft.AspNetCore.Http.netcoreapp3.0.cs index 16ad1810c3..2c299f83d9 100644 --- a/src/Http/Http/ref/Microsoft.AspNetCore.Http.netcoreapp3.0.cs +++ b/src/Http/Http/ref/Microsoft.AspNetCore.Http.netcoreapp3.0.cs @@ -236,7 +236,7 @@ namespace Microsoft.AspNetCore.Http.Features public partial class RequestBodyPipeFeature : Microsoft.AspNetCore.Http.Features.IRequestBodyPipeFeature { public RequestBodyPipeFeature(Microsoft.AspNetCore.Http.HttpContext context) { } - public System.IO.Pipelines.PipeReader Reader { get { throw null; } set { } } + public System.IO.Pipelines.PipeReader Reader { get { throw null; } } } public partial class RequestCookiesFeature : Microsoft.AspNetCore.Http.Features.IRequestCookiesFeature { @@ -254,7 +254,7 @@ namespace Microsoft.AspNetCore.Http.Features public partial class ResponseBodyPipeFeature : Microsoft.AspNetCore.Http.Features.IResponseBodyPipeFeature { public ResponseBodyPipeFeature(Microsoft.AspNetCore.Http.HttpContext context) { } - public System.IO.Pipelines.PipeWriter Writer { get { throw null; } set { } } + public System.IO.Pipelines.PipeWriter Writer { get { throw null; } } } public partial class ResponseCookiesFeature : Microsoft.AspNetCore.Http.Features.IResponseCookiesFeature { @@ -326,7 +326,7 @@ namespace Microsoft.AspNetCore.Http.Internal { public DefaultHttpRequest(Microsoft.AspNetCore.Http.DefaultHttpContext context) { } public override System.IO.Stream Body { get { throw null; } set { } } - public override System.IO.Pipelines.PipeReader BodyReader { get { throw null; } set { } } + public override System.IO.Pipelines.PipeReader BodyReader { get { throw null; } } public override long? ContentLength { get { throw null; } set { } } public override string ContentType { get { throw null; } set { } } public override Microsoft.AspNetCore.Http.IRequestCookieCollection Cookies { get { throw null; } set { } } @@ -353,7 +353,7 @@ namespace Microsoft.AspNetCore.Http.Internal { public DefaultHttpResponse(Microsoft.AspNetCore.Http.DefaultHttpContext context) { } public override System.IO.Stream Body { get { throw null; } set { } } - public override System.IO.Pipelines.PipeWriter BodyWriter { get { throw null; } set { } } + public override System.IO.Pipelines.PipeWriter BodyWriter { get { throw null; } } public override long? ContentLength { get { throw null; } set { } } public override string ContentType { get { throw null; } set { } } public override Microsoft.AspNetCore.Http.IResponseCookies Cookies { get { throw null; } } @@ -492,93 +492,3 @@ namespace Microsoft.Extensions.DependencyInjection public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddHttpContextAccessor(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) { throw null; } } } -namespace System.IO.Pipelines -{ - public partial class ReadOnlyPipeStream : System.IO.Stream - { - public ReadOnlyPipeStream(System.IO.Pipelines.PipeReader pipeReader) { } - public ReadOnlyPipeStream(System.IO.Pipelines.PipeReader pipeReader, bool allowSynchronousIO) { } - public override bool CanRead { get { throw null; } } - public override bool CanSeek { get { throw null; } } - public override bool CanWrite { get { throw null; } } - public System.IO.Pipelines.PipeReader InnerPipeReader { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public override long Length { get { throw null; } } - public override long Position { get { throw null; } set { } } - public override int WriteTimeout { get { throw null; } set { } } - public override System.IAsyncResult BeginRead(byte[] buffer, int offset, int count, System.AsyncCallback callback, object state) { throw null; } - public override System.Threading.Tasks.Task CopyToAsync(System.IO.Stream destination, int bufferSize, System.Threading.CancellationToken cancellationToken) { throw null; } - public override int EndRead(System.IAsyncResult asyncResult) { throw null; } - public override void Flush() { } - public override System.Threading.Tasks.Task FlushAsync(System.Threading.CancellationToken cancellationToken) { throw null; } - public override int Read(byte[] buffer, int offset, int count) { throw null; } - public override System.Threading.Tasks.Task ReadAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } - public override System.Threading.Tasks.ValueTask ReadAsync(System.Memory destination, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override long Seek(long offset, System.IO.SeekOrigin origin) { throw null; } - public override void SetLength(long value) { } - public override void Write(byte[] buffer, int offset, int count) { } - public override System.Threading.Tasks.Task WriteAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } - } - public partial class StreamPipeReader : System.IO.Pipelines.PipeReader, System.IDisposable - { - public StreamPipeReader(System.IO.Stream readingStream) { } - public StreamPipeReader(System.IO.Stream readingStream, System.IO.Pipelines.StreamPipeReaderAdapterOptions options) { } - public System.IO.Stream InnerStream { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public override void AdvanceTo(System.SequencePosition consumed) { } - public override void AdvanceTo(System.SequencePosition consumed, System.SequencePosition examined) { } - public override void CancelPendingRead() { } - public override void Complete(System.Exception exception = null) { } - public void Dispose() { } - public override void OnWriterCompleted(System.Action callback, object state) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.ValueTask ReadAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override bool TryRead(out System.IO.Pipelines.ReadResult result) { throw null; } - } - public partial class StreamPipeReaderAdapterOptions - { - public const int DefaultMinimumReadThreshold = 256; - public const int DefaultMinimumSegmentSize = 4096; - public static System.IO.Pipelines.StreamPipeReaderAdapterOptions DefaultOptions; - public StreamPipeReaderAdapterOptions() { } - public StreamPipeReaderAdapterOptions(int minimumSegmentSize, int minimumReadThreshold, System.Buffers.MemoryPool memoryPool) { } - public System.Buffers.MemoryPool MemoryPool { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int MinimumReadThreshold { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int MinimumSegmentSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class StreamPipeWriter : System.IO.Pipelines.PipeWriter, System.IDisposable - { - public StreamPipeWriter(System.IO.Stream writingStream) { } - public StreamPipeWriter(System.IO.Stream writingStream, int minimumSegmentSize, System.Buffers.MemoryPool pool = null) { } - public System.IO.Stream InnerStream { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public override void Advance(int count) { } - public override void CancelPendingFlush() { } - public override void Complete(System.Exception exception = null) { } - public void Dispose() { } - public override System.Threading.Tasks.ValueTask FlushAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Memory GetMemory(int sizeHint = 0) { throw null; } - public override System.Span GetSpan(int sizeHint = 0) { throw null; } - public override void OnReaderCompleted(System.Action callback, object state) { } - } - public partial class WriteOnlyPipeStream : System.IO.Stream - { - public WriteOnlyPipeStream(System.IO.Pipelines.PipeWriter pipeWriter) { } - public WriteOnlyPipeStream(System.IO.Pipelines.PipeWriter pipeWriter, bool allowSynchronousIO) { } - public override bool CanRead { get { throw null; } } - public override bool CanSeek { get { throw null; } } - public override bool CanWrite { get { throw null; } } - public System.IO.Pipelines.PipeWriter InnerPipeWriter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public override long Length { get { throw null; } } - public override long Position { get { throw null; } set { } } - public override int ReadTimeout { get { throw null; } set { } } - public override System.IAsyncResult BeginWrite(byte[] buffer, int offset, int count, System.AsyncCallback callback, object state) { throw null; } - public override void EndWrite(System.IAsyncResult asyncResult) { } - public override void Flush() { } - public override System.Threading.Tasks.Task FlushAsync(System.Threading.CancellationToken cancellationToken) { throw null; } - public override int Read(byte[] buffer, int offset, int count) { throw null; } - public override System.Threading.Tasks.Task ReadAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } - public override long Seek(long offset, System.IO.SeekOrigin origin) { throw null; } - public override void SetLength(long value) { } - public override void Write(byte[] buffer, int offset, int count) { } - public override System.Threading.Tasks.Task WriteAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } - public override System.Threading.Tasks.ValueTask WriteAsync(System.ReadOnlyMemory source, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } -} diff --git a/src/Http/Http/src/Features/RequestBodyPipeFeature.cs b/src/Http/Http/src/Features/RequestBodyPipeFeature.cs index ee86031fde..61154c5f0a 100644 --- a/src/Http/Http/src/Features/RequestBodyPipeFeature.cs +++ b/src/Http/Http/src/Features/RequestBodyPipeFeature.cs @@ -2,14 +2,16 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.IO; using System.IO.Pipelines; +using System.Threading.Tasks; namespace Microsoft.AspNetCore.Http.Features { public class RequestBodyPipeFeature : IRequestBodyPipeFeature { - private StreamPipeReader _internalPipeReader; - private PipeReader _userSetPipeReader; + private PipeReader _internalPipeReader; + private Stream _streamInstanceWhenWrapped; private HttpContext _context; public RequestBodyPipeFeature(HttpContext context) @@ -25,25 +27,21 @@ namespace Microsoft.AspNetCore.Http.Features { get { - if (_userSetPipeReader != null) - { - return _userSetPipeReader; - } - if (_internalPipeReader == null || - !object.ReferenceEquals(_internalPipeReader.InnerStream, _context.Request.Body)) + !ReferenceEquals(_streamInstanceWhenWrapped, _context.Request.Body)) { - _internalPipeReader = new StreamPipeReader(_context.Request.Body); - _context.Response.RegisterForDispose(_internalPipeReader); + _streamInstanceWhenWrapped = _context.Request.Body; + _internalPipeReader = PipeReader.Create(_context.Request.Body); + + _context.Response.OnCompleted((self) => + { + ((PipeReader)self).Complete(); + return Task.CompletedTask; + }, _internalPipeReader); } return _internalPipeReader; } - set - { - _userSetPipeReader = value ?? throw new ArgumentNullException(nameof(value)); - // TODO set the request body Stream to an adapted pipe https://github.com/aspnet/AspNetCore/issues/3971 - } } } } diff --git a/src/Http/Http/src/Features/ResponseBodyPipeFeature.cs b/src/Http/Http/src/Features/ResponseBodyPipeFeature.cs index 0699679365..2de8c86b9c 100644 --- a/src/Http/Http/src/Features/ResponseBodyPipeFeature.cs +++ b/src/Http/Http/src/Features/ResponseBodyPipeFeature.cs @@ -2,14 +2,16 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.IO; using System.IO.Pipelines; +using System.Threading.Tasks; namespace Microsoft.AspNetCore.Http.Features { public class ResponseBodyPipeFeature : IResponseBodyPipeFeature { - private StreamPipeWriter _internalPipeWriter; - private PipeWriter _userSetPipeWriter; + private PipeWriter _internalPipeWriter; + private Stream _streamInstanceWhenWrapped; private HttpContext _context; public ResponseBodyPipeFeature(HttpContext context) @@ -25,25 +27,21 @@ namespace Microsoft.AspNetCore.Http.Features { get { - if (_userSetPipeWriter != null) - { - return _userSetPipeWriter; - } - if (_internalPipeWriter == null || - !object.ReferenceEquals(_internalPipeWriter.InnerStream, _context.Response.Body)) + !ReferenceEquals(_streamInstanceWhenWrapped, _context.Response.Body)) { - _internalPipeWriter = new StreamPipeWriter(_context.Response.Body); - _context.Response.RegisterForDispose(_internalPipeWriter); + _streamInstanceWhenWrapped = _context.Response.Body; + _internalPipeWriter = PipeWriter.Create(_context.Response.Body); + + _context.Response.OnCompleted((self) => + { + ((PipeWriter)self).Complete(); + return Task.CompletedTask; + }, _internalPipeWriter); } return _internalPipeWriter; } - set - { - _userSetPipeWriter = value ?? throw new ArgumentNullException(nameof(value)); - // TODO set the response body Stream to an adapted pipe https://github.com/aspnet/AspNetCore/issues/3971 - } } } } diff --git a/src/Http/Http/src/Internal/DefaultHttpRequest.cs b/src/Http/Http/src/Internal/DefaultHttpRequest.cs index 964a478510..bc0a4c42dc 100644 --- a/src/Http/Http/src/Internal/DefaultHttpRequest.cs +++ b/src/Http/Http/src/Internal/DefaultHttpRequest.cs @@ -174,7 +174,6 @@ namespace Microsoft.AspNetCore.Http.Internal public override PipeReader BodyReader { get { return RequestBodyPipeFeature.Reader; } - set { RequestBodyPipeFeature.Reader = value; } } struct FeatureInterfaces diff --git a/src/Http/Http/src/Internal/DefaultHttpResponse.cs b/src/Http/Http/src/Internal/DefaultHttpResponse.cs index 068c4ec9bd..19e75c3aa0 100644 --- a/src/Http/Http/src/Internal/DefaultHttpResponse.cs +++ b/src/Http/Http/src/Internal/DefaultHttpResponse.cs @@ -112,7 +112,6 @@ namespace Microsoft.AspNetCore.Http.Internal public override PipeWriter BodyWriter { get { return ResponseBodyPipeFeature.Writer; } - set { ResponseBodyPipeFeature.Writer = value; } } public override void OnStarting(Func callback, object state) diff --git a/src/Http/Http/src/ReadOnlyPipeStream.cs b/src/Http/Http/src/ReadOnlyPipeStream.cs deleted file mode 100644 index 919745bc5d..0000000000 --- a/src/Http/Http/src/ReadOnlyPipeStream.cs +++ /dev/null @@ -1,247 +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.Buffers; -using System.Threading; -using System.Threading.Tasks; - -namespace System.IO.Pipelines -{ - /// - /// Represents a read-only Stream backed by a PipeReader - /// - public class ReadOnlyPipeStream : Stream - { - private bool _allowSynchronousIO = true; - - /// - /// Creates a new ReadOnlyPipeStream - /// - /// The PipeReader to read from. - public ReadOnlyPipeStream(PipeReader pipeReader) : - this(pipeReader, allowSynchronousIO: true) - { - } - - /// - /// Creates a new ReadOnlyPipeStream - /// - /// The PipeReader to read from. - /// Whether synchronous IO is allowed. - public ReadOnlyPipeStream(PipeReader pipeReader, bool allowSynchronousIO) - { - _allowSynchronousIO = allowSynchronousIO; - InnerPipeReader = pipeReader; - } - - /// - public override bool CanSeek => false; - - /// - public override bool CanRead => true; - - /// - public override bool CanWrite => false; - - /// - public override long Length => throw new NotSupportedException(); - - /// - public override long Position - { - get => throw new NotSupportedException(); - set => throw new NotSupportedException(); - } - - /// - public override int WriteTimeout - { - get => throw new NotSupportedException(); - set => throw new NotSupportedException(); - } - - public PipeReader InnerPipeReader { get; } - - /// - public override void Write(byte[] buffer, int offset, int count) - => throw new NotSupportedException(); - - /// - public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - => throw new NotSupportedException(); - - /// - public override void Flush() - { - throw new NotSupportedException(); - } - - /// - public override Task FlushAsync(CancellationToken cancellationToken) - { - throw new NotSupportedException(); - } - - /// - public override long Seek(long offset, SeekOrigin origin) - { - throw new NotSupportedException(); - } - - /// - public override void SetLength(long value) - { - throw new NotSupportedException(); - } - - /// - public override int Read(byte[] buffer, int offset, int count) - { - if (!_allowSynchronousIO) - { - ThrowHelper.ThrowInvalidOperationException_SynchronousReadsDisallowed(); - } - return ReadAsync(buffer, offset, count).GetAwaiter().GetResult(); - } - - /// - public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) - { - var task = ReadAsync(buffer, offset, count, default, state); - if (callback != null) - { - task.ContinueWith(t => callback.Invoke(t)); - } - return task; - } - - /// - public override int EndRead(IAsyncResult asyncResult) - { - return ((Task)asyncResult).GetAwaiter().GetResult(); - } - - private Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken, object state) - { - var tcs = new TaskCompletionSource(state); - var task = ReadAsync(buffer, offset, count, cancellationToken); - task.ContinueWith((task2, state2) => - { - var tcs2 = (TaskCompletionSource)state2; - if (task2.IsCanceled) - { - tcs2.SetCanceled(); - } - else if (task2.IsFaulted) - { - tcs2.SetException(task2.Exception); - } - else - { - tcs2.SetResult(task2.Result); - } - }, tcs, cancellationToken); - return tcs.Task; - } - - /// - public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - return ReadAsyncInternal(new Memory(buffer, offset, count), cancellationToken).AsTask(); - } - - /// - public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default) - { - return ReadAsyncInternal(destination, cancellationToken); - } - - private async ValueTask ReadAsyncInternal(Memory buffer, CancellationToken cancellationToken) - { - while (true) - { - var result = await InnerPipeReader.ReadAsync(cancellationToken); - - if (result.IsCanceled) - { - ThrowHelper.ThrowOperationCanceledException_ReadCanceled(); - } - - var readableBuffer = result.Buffer; - var readableBufferLength = readableBuffer.Length; - - var consumed = readableBuffer.End; - var actual = 0; - try - { - if (readableBufferLength != 0) - { - actual = (int)Math.Min(readableBufferLength, buffer.Length); - - var slice = actual == readableBufferLength ? readableBuffer : readableBuffer.Slice(0, actual); - consumed = slice.End; - slice.CopyTo(buffer.Span); - - return actual; - } - - if (result.IsCompleted) - { - return 0; - } - } - finally - { - InnerPipeReader.AdvanceTo(consumed); - } - } - } - - /// - public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken) - { - if (destination == null) - { - throw new ArgumentNullException(nameof(destination)); - } - - if (bufferSize <= 0) - { - throw new ArgumentOutOfRangeException(nameof(bufferSize)); - } - - return CopyToAsyncInternal(destination, cancellationToken); - } - - private async Task CopyToAsyncInternal(Stream destination, CancellationToken cancellationToken) - { - while (true) - { - var result = await InnerPipeReader.ReadAsync(cancellationToken); - var readableBuffer = result.Buffer; - var readableBufferLength = readableBuffer.Length; - - try - { - if (readableBufferLength != 0) - { - foreach (var memory in readableBuffer) - { - await destination.WriteAsync(memory, cancellationToken); - } - } - - if (result.IsCompleted) - { - return; - } - } - finally - { - InnerPipeReader.AdvanceTo(readableBuffer.End); - } - } - } - } -} diff --git a/src/Http/Http/src/StreamPipeReader.cs b/src/Http/Http/src/StreamPipeReader.cs deleted file mode 100644 index 16e3e0ac32..0000000000 --- a/src/Http/Http/src/StreamPipeReader.cs +++ /dev/null @@ -1,393 +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.Buffers; -using System.Diagnostics; -using System.Runtime.CompilerServices; -using System.Runtime.ExceptionServices; -using System.Threading; -using System.Threading.Tasks; - -namespace System.IO.Pipelines -{ - /// - /// Implements PipeReader using an underlying stream. - /// - public class StreamPipeReader : PipeReader, IDisposable - { - private readonly int _bufferSize; - private readonly int _minimumReadThreshold; - private readonly MemoryPool _pool; - - private CancellationTokenSource _internalTokenSource; - private bool _isReaderCompleted; - private bool _isStreamCompleted; - private ExceptionDispatchInfo _exceptionInfo; - - private BufferSegment _readHead; - private int _readIndex; - - private BufferSegment _readTail; - private long _bufferedBytes; - private bool _examinedEverything; - private object _lock = new object(); - - /// - /// Creates a new StreamPipeReader. - /// - /// The stream to read from. - public StreamPipeReader(Stream readingStream) - : this(readingStream, StreamPipeReaderAdapterOptions.DefaultOptions) - { - } - - /// - /// Creates a new StreamPipeReader. - /// - /// The stream to read from. - /// The options to use. - public StreamPipeReader(Stream readingStream, StreamPipeReaderAdapterOptions options) - { - InnerStream = readingStream ?? throw new ArgumentNullException(nameof(readingStream)); - - if (options == null) - { - throw new ArgumentNullException(nameof(options)); - } - - if (options.MinimumReadThreshold <= 0) - { - throw new ArgumentOutOfRangeException(nameof(options.MinimumReadThreshold)); - } - - _minimumReadThreshold = Math.Min(options.MinimumReadThreshold, options.MinimumSegmentSize); - _pool = options.MemoryPool == MemoryPool.Shared ? null : options.MemoryPool; - _bufferSize = _pool == null ? options.MinimumSegmentSize : Math.Min(options.MinimumSegmentSize, _pool.MaxBufferSize); - } - - /// - /// Gets the inner stream that is being read from. - /// - public Stream InnerStream { get; } - - /// - public override void AdvanceTo(SequencePosition consumed) - { - AdvanceTo(consumed, consumed); - } - - private CancellationTokenSource InternalTokenSource - { - get - { - lock (_lock) - { - if (_internalTokenSource == null) - { - _internalTokenSource = new CancellationTokenSource(); - } - return _internalTokenSource; - } - } - set - { - _internalTokenSource = value; - } - } - - /// - public override void AdvanceTo(SequencePosition consumed, SequencePosition examined) - { - ThrowIfCompleted(); - - if (_readHead == null || _readTail == null) - { - ThrowHelper.ThrowInvalidOperationException_NoDataRead(); - } - - AdvanceTo((BufferSegment)consumed.GetObject(), consumed.GetInteger(), (BufferSegment)examined.GetObject(), examined.GetInteger()); - } - - private void AdvanceTo(BufferSegment consumedSegment, int consumedIndex, BufferSegment examinedSegment, int examinedIndex) - { - if (consumedSegment == null) - { - return; - } - - var returnStart = _readHead; - var returnEnd = consumedSegment; - - var consumedBytes = new ReadOnlySequence(returnStart, _readIndex, consumedSegment, consumedIndex).Length; - - _bufferedBytes -= consumedBytes; - - Debug.Assert(_bufferedBytes >= 0); - - _examinedEverything = false; - - if (examinedSegment == _readTail) - { - // If we examined everything, we force ReadAsync to actually read from the underlying stream - // instead of returning a ReadResult from TryRead. - _examinedEverything = examinedIndex == _readTail.End; - } - - // Three cases here: - // 1. All data is consumed. If so, we reset _readHead and _readTail to _readTail's original memory owner - // SetMemory on a IMemoryOwner will reset the internal Memory to be an empty segment - // 2. A segment is entirely consumed but there is still more data in nextSegments - // We are allowed to remove an extra segment. by setting returnEnd to be the next block. - // 3. We are in the middle of a segment. - // Move _readHead and _readIndex to consumedSegment and index - if (_bufferedBytes == 0) - { - _readTail.SetMemory(_readTail.MemoryOwner); - _readHead = _readTail; - returnEnd = _readTail; - _readIndex = 0; - } - else if (consumedIndex == returnEnd.Length) - { - var nextBlock = returnEnd.NextSegment; - _readHead = nextBlock; - _readIndex = 0; - returnEnd = nextBlock; - } - else - { - _readHead = consumedSegment; - _readIndex = consumedIndex; - } - - // Remove all blocks that are freed (except the last one) - while (returnStart != returnEnd) - { - returnStart.ResetMemory(); - returnStart = returnStart.NextSegment; - } - } - - /// - public override void CancelPendingRead() - { - InternalTokenSource.Cancel(); - } - - /// - public override void Complete(Exception exception = null) - { - if (_isReaderCompleted) - { - return; - } - - _isReaderCompleted = true; - if (exception != null) - { - _exceptionInfo = ExceptionDispatchInfo.Capture(exception); - } - - var segment = _readHead; - while (segment != null) - { - segment.ResetMemory(); - segment = segment.NextSegment; - } - } - - /// - public override void OnWriterCompleted(Action callback, object state) - { - throw new NotSupportedException("OnWriterCompleted is not supported"); - } - - /// - public override async ValueTask ReadAsync(CancellationToken cancellationToken = default) - { - // TODO ReadyAsync needs to throw if there are overlapping reads. - ThrowIfCompleted(); - - // PERF: store InternalTokenSource locally to avoid querying it twice (which acquires a lock) - var tokenSource = InternalTokenSource; - if (TryReadInternal(tokenSource, out var readResult)) - { - return readResult; - } - - if (_isStreamCompleted) - { - return new ReadResult(buffer: default, isCanceled: false, isCompleted: true); - } - - var reg = new CancellationTokenRegistration(); - if (cancellationToken.CanBeCanceled) - { - reg = cancellationToken.Register(state => ((StreamPipeReader)state).Cancel(), this); - } - - using (reg) - { - var isCanceled = false; - try - { - AllocateReadTail(); -#if NETCOREAPP3_0 - var length = await InnerStream.ReadAsync(_readTail.AvailableMemory.Slice(_readTail.End), tokenSource.Token); -#elif NETSTANDARD2_0 - if (!MemoryMarshal.TryGetArray(_readTail.AvailableMemory.Slice(_readTail.End), out var arraySegment)) - { - ThrowHelper.CreateInvalidOperationException_NoArrayFromMemory(); - } - - var length = await _readingStream.ReadAsync(arraySegment.Array, arraySegment.Offset, arraySegment.Count, tokenSource.Token); -#else -#error Target frameworks need to be updated. -#endif - Debug.Assert(length + _readTail.End <= _readTail.AvailableMemory.Length); - - _readTail.End += length; - _bufferedBytes += length; - - if (length == 0) - { - _isStreamCompleted = true; - } - } - catch (OperationCanceledException) - { - ClearCancellationToken(); - - if (cancellationToken.IsCancellationRequested) - { - throw; - } - - isCanceled = true; - } - - return new ReadResult(GetCurrentReadOnlySequence(), isCanceled, IsCompletedOrThrow()); - } - } - - private void ClearCancellationToken() - { - lock (_lock) - { - _internalTokenSource = null; - } - } - - private void ThrowIfCompleted() - { - if (_isReaderCompleted) - { - ThrowHelper.ThrowInvalidOperationException_NoReadingAllowed(); - } - } - - public override bool TryRead(out ReadResult result) - { - ThrowIfCompleted(); - - return TryReadInternal(InternalTokenSource, out result); - } - - private bool TryReadInternal(CancellationTokenSource source, out ReadResult result) - { - var isCancellationRequested = source.IsCancellationRequested; - if (isCancellationRequested || _bufferedBytes > 0 && (!_examinedEverything || _isStreamCompleted)) - { - // If TryRead/ReadAsync are called and cancellation is requested, we need to make sure memory is allocated for the ReadResult, - // otherwise if someone calls advance afterward on the ReadResult, it will throw. - if (isCancellationRequested) - { - AllocateReadTail(); - - ClearCancellationToken(); - } - - result = new ReadResult( - GetCurrentReadOnlySequence(), - isCanceled: isCancellationRequested, - IsCompletedOrThrow()); - return true; - } - - result = new ReadResult(); - return false; - } - - private ReadOnlySequence GetCurrentReadOnlySequence() - { - return new ReadOnlySequence(_readHead, _readIndex, _readTail, _readTail.End); - } - - private void AllocateReadTail() - { - if (_readHead == null) - { - Debug.Assert(_readTail == null); - _readHead = AllocateSegment(); - _readTail = _readHead; - } - else if (_readTail.WritableBytes < _minimumReadThreshold) - { - CreateNewTailSegment(); - } - } - - private void CreateNewTailSegment() - { - BufferSegment nextSegment = AllocateSegment(); - _readTail.SetNext(nextSegment); - _readTail = nextSegment; - } - - private BufferSegment AllocateSegment() - { - var nextSegment = new BufferSegment(); - - if (_pool is null) - { - nextSegment.SetMemory(ArrayPool.Shared.Rent(_bufferSize)); - } - else - { - nextSegment.SetMemory(_pool.Rent(_bufferSize)); - } - - return nextSegment; - } - - private void Cancel() - { - InternalTokenSource.Cancel(); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private bool IsCompletedOrThrow() - { - if (!_isStreamCompleted) - { - return false; - } - if (_exceptionInfo != null) - { - ThrowLatchedException(); - } - return true; - } - - [MethodImpl(MethodImplOptions.NoInlining)] - private void ThrowLatchedException() - { - _exceptionInfo.Throw(); - } - - public void Dispose() - { - Complete(); - } - } -} diff --git a/src/Http/Http/src/StreamPipeReaderOptions.cs b/src/Http/Http/src/StreamPipeReaderOptions.cs deleted file mode 100644 index 2a932e0c39..0000000000 --- a/src/Http/Http/src/StreamPipeReaderOptions.cs +++ /dev/null @@ -1,34 +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.Buffers; -using System.Collections.Generic; -using System.Text; - -namespace System.IO.Pipelines -{ - public class StreamPipeReaderAdapterOptions - { - public static StreamPipeReaderAdapterOptions DefaultOptions = new StreamPipeReaderAdapterOptions(); - public const int DefaultMinimumSegmentSize = 4096; - public const int DefaultMinimumReadThreshold = 256; - - public StreamPipeReaderAdapterOptions() - { - } - - public StreamPipeReaderAdapterOptions(int minimumSegmentSize, int minimumReadThreshold, MemoryPool memoryPool) - { - MinimumSegmentSize = minimumSegmentSize; - MinimumReadThreshold = minimumReadThreshold; - MemoryPool = memoryPool; - } - - public int MinimumSegmentSize { get; set; } = DefaultMinimumSegmentSize; - - public int MinimumReadThreshold { get; set; } = DefaultMinimumReadThreshold; - - public MemoryPool MemoryPool { get; set; } = MemoryPool.Shared; - } -} diff --git a/src/Http/Http/src/StreamPipeWriter.cs b/src/Http/Http/src/StreamPipeWriter.cs deleted file mode 100644 index 087a2b53b6..0000000000 --- a/src/Http/Http/src/StreamPipeWriter.cs +++ /dev/null @@ -1,347 +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.Buffers; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; - -namespace System.IO.Pipelines -{ - /// - /// Implements PipeWriter using a underlying stream. - /// - public class StreamPipeWriter : PipeWriter, IDisposable - { - private readonly int _minimumSegmentSize; - private int _bytesWritten; - - private List _completedSegments; - private Memory _currentSegment; - private object _currentSegmentOwner; - private MemoryPool _pool; - private int _position; - - private CancellationTokenSource _internalTokenSource; - private bool _isCompleted; - private object _lockObject = new object(); - - private CancellationTokenSource InternalTokenSource - { - get - { - lock (_lockObject) - { - if (_internalTokenSource == null) - { - _internalTokenSource = new CancellationTokenSource(); - } - return _internalTokenSource; - } - } - } - - /// - /// Creates a new StreamPipeWrapper - /// - /// The stream to write to - public StreamPipeWriter(Stream writingStream) : this(writingStream, 4096) - { - } - - public StreamPipeWriter(Stream writingStream, int minimumSegmentSize, MemoryPool pool = null) - { - _minimumSegmentSize = minimumSegmentSize; - InnerStream = writingStream; - _pool = pool == MemoryPool.Shared ? null : pool; - } - - /// - /// Gets the inner stream that is being written to. - /// - public Stream InnerStream { get; } - - /// - public override void Advance(int count) - { - if (_currentSegment.IsEmpty) // TODO confirm this - { - throw new InvalidOperationException("No writing operation. Make sure GetMemory() was called."); - } - - if (count >= 0) - { - if (_currentSegment.Length < _position + count) - { - throw new InvalidOperationException("Can't advance past buffer size."); - } - _bytesWritten += count; - _position += count; - } - } - - /// - public override Memory GetMemory(int sizeHint = 0) - { - if (_isCompleted) - { - ThrowHelper.ThrowInvalidOperationException_NoWritingAllowed(); - } - if (sizeHint < 0) - { - ThrowHelper.ThrowArgumentOutOfRangeException(nameof(sizeHint)); - } - - EnsureCapacity(sizeHint); - - return _currentSegment.Slice(_position); - } - - /// - public override Span GetSpan(int sizeHint = 0) - { - if (_isCompleted) - { - ThrowHelper.ThrowInvalidOperationException_NoWritingAllowed(); - } - if (sizeHint < 0) - { - ThrowHelper.ThrowArgumentOutOfRangeException(nameof(sizeHint)); - } - - EnsureCapacity(sizeHint); - - return _currentSegment.Span.Slice(_position); - } - - /// - public override void CancelPendingFlush() - { - Cancel(); - } - - /// - public override void Complete(Exception exception = null) - { - if (_isCompleted) - { - return; - } - - Dispose(); - // We still want to cleanup segments before throwing an exception. - if (_bytesWritten > 0 && exception == null) - { - ThrowHelper.ThrowInvalidOperationException_DataNotAllFlushed(); - } - } - - /// - public override void OnReaderCompleted(Action callback, object state) - { - throw new NotSupportedException("OnReaderCompleted isn't supported in StreamPipeWrapper."); - } - - /// - public override ValueTask FlushAsync(CancellationToken cancellationToken = default) - { - if (_bytesWritten == 0) - { - return new ValueTask(new FlushResult(isCanceled: false, _isCompleted)); - } - - return FlushAsyncInternal(cancellationToken); - } - - private void Cancel() - { - InternalTokenSource.Cancel(); - } - - private async ValueTask FlushAsyncInternal(CancellationToken cancellationToken = default) - { - // Write all completed segments and whatever remains in the current segment - // and flush the result. - var reg = new CancellationTokenRegistration(); - if (cancellationToken.CanBeCanceled) - { - reg = cancellationToken.Register(state => ((StreamPipeWriter)state).Cancel(), this); - } - using (reg) - { - var localToken = InternalTokenSource.Token; - try - { - if (_completedSegments != null && _completedSegments.Count > 0) - { - var count = _completedSegments.Count; - for (var i = 0; i < count; i++) - { - var segment = _completedSegments[0]; -#if NETCOREAPP3_0 - await InnerStream.WriteAsync(segment.Buffer.Slice(0, segment.Length), localToken); -#elif NETSTANDARD2_0 - MemoryMarshal.TryGetArray(segment.Buffer, out var arraySegment); - await InnerStream.WriteAsync(arraySegment.Array, 0, segment.Length, localToken); -#else -#error Target frameworks need to be updated. -#endif - _bytesWritten -= segment.Length; - segment.Return(); - _completedSegments.RemoveAt(0); - } - } - - if (!_currentSegment.IsEmpty) - { -#if NETCOREAPP3_0 - await InnerStream.WriteAsync(_currentSegment.Slice(0, _position), localToken); -#elif NETSTANDARD2_0 - MemoryMarshal.TryGetArray(_currentSegment, out var arraySegment); - await InnerStream.WriteAsync(arraySegment.Array, 0, _position, localToken); -#else -#error Target frameworks need to be updated. -#endif - _bytesWritten -= _position; - _position = 0; - } - - await InnerStream.FlushAsync(localToken); - - return new FlushResult(isCanceled: false, _isCompleted); - } - catch (OperationCanceledException) - { - // Remove the cancellation token such that the next time Flush is called - // A new CTS is created. - lock (_lockObject) - { - _internalTokenSource = null; - } - - if (cancellationToken.IsCancellationRequested) - { - throw; - } - - // Catch any cancellation and translate it into setting isCanceled = true - return new FlushResult(isCanceled: true, _isCompleted); - } - } - } - - private void EnsureCapacity(int sizeHint) - { - // This does the Right Thing. It only subtracts _position from the current segment length if it's non-null. - // If _currentSegment is null, it returns 0. - var remainingSize = _currentSegment.Length - _position; - - // If the sizeHint is 0, any capacity will do - // Otherwise, the buffer must have enough space for the entire size hint, or we need to add a segment. - if ((sizeHint == 0 && remainingSize > 0) || (sizeHint > 0 && remainingSize >= sizeHint)) - { - // We have capacity in the current segment - return; - } - - AddSegment(sizeHint); - } - - private void AddSegment(int sizeHint = 0) - { - if (_currentSegment.Length != 0) - { - // We're adding a segment to the list - if (_completedSegments == null) - { - _completedSegments = new List(); - } - - // Position might be less than the segment length if there wasn't enough space to satisfy the sizeHint when - // GetMemory was called. In that case we'll take the current segment and call it "completed", but need to - // ignore any empty space in it. - _completedSegments.Add(new CompletedBuffer(_currentSegmentOwner, _currentSegment, _position)); - } - - if (_pool is null) - { - _currentSegment = ArrayPool.Shared.Rent(Math.Max(sizeHint, _minimumSegmentSize)); - _currentSegmentOwner = _currentSegment; - } - else if (sizeHint <= _pool.MaxBufferSize) - { - // Get a new buffer using the minimum segment size, unless the size hint is larger than a single segment. - // Also, the size cannot be larger than the MaxBufferSize of the MemoryPool - var owner = _pool.Rent(Math.Clamp(sizeHint, _minimumSegmentSize, _pool.MaxBufferSize)); - _currentSegment = owner.Memory; - _currentSegmentOwner = owner; - } - else - { - _currentSegment = new byte[sizeHint]; - } - - _position = 0; - } - - public void Dispose() - { - if (_isCompleted) - { - return; - } - - _isCompleted = true; - - _internalTokenSource?.Dispose(); - - if (_completedSegments != null) - { - foreach (var segment in _completedSegments) - { - segment.Return(); - } - } - - DisposeOwner(_currentSegmentOwner); - } - - private static void DisposeOwner(object owner) - { - if (owner is IMemoryOwner memoryOwner) - { - memoryOwner.Dispose(); - } - else if (owner is byte[] array) - { - ArrayPool.Shared.Return(array); - } - } - - /// - /// Holds a byte[] from the pool and a size value. Basically a Memory but guaranteed to be backed by an ArrayPool byte[], so that we know we can return it. - /// - private readonly struct CompletedBuffer - { - private readonly object _memoryOwner; - - public Memory Buffer { get; } - public int Length { get; } - - public ReadOnlySpan Span => Buffer.Span; - - public CompletedBuffer(object owner, Memory buffer, int length) - { - _memoryOwner = owner; - - Buffer = buffer; - Length = length; - } - - public void Return() - { - DisposeOwner(_memoryOwner); - } - } - } -} diff --git a/src/Http/Http/src/ThrowHelper.cs b/src/Http/Http/src/ThrowHelper.cs deleted file mode 100644 index 0745b9bf65..0000000000 --- a/src/Http/Http/src/ThrowHelper.cs +++ /dev/null @@ -1,50 +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.Runtime.CompilerServices; - -namespace System.IO.Pipelines -{ - internal static class ThrowHelper - { - public static void ThrowInvalidOperationException_NoReadingAllowed() => throw CreateInvalidOperationException_NoReadingAllowed(); - [MethodImpl(MethodImplOptions.NoInlining)] - public static Exception CreateInvalidOperationException_NoReadingAllowed() => new InvalidOperationException("Reading is not allowed after reader was completed."); - - public static void ThrowInvalidOperationException_NoArrayFromMemory() => throw CreateInvalidOperationException_NoArrayFromMemory(); - [MethodImpl(MethodImplOptions.NoInlining)] - public static Exception CreateInvalidOperationException_NoArrayFromMemory() => new InvalidOperationException("Could not get byte[] from Memory."); - - public static void ThrowInvalidOperationException_NoDataRead() => throw CreateInvalidOperationException_NoDataRead(); - [MethodImpl(MethodImplOptions.NoInlining)] - public static Exception CreateInvalidOperationException_NoDataRead() => new InvalidOperationException("No data has been read into the StreamPipeReader."); - - public static void ThrowInvalidOperationException_SynchronousReadsDisallowed() => throw CreateInvalidOperationException_SynchronousReadsDisallowed(); - [MethodImpl(MethodImplOptions.NoInlining)] - public static Exception CreateInvalidOperationException_SynchronousReadsDisallowed() => new InvalidOperationException("Synchronous operations are disallowed. Call ReadAsync or set allowSynchronousIO to true instead."); - - public static void ThrowInvalidOperationException_SynchronousWritesDisallowed() => throw CreateInvalidOperationException_SynchronousWritesDisallowed(); - [MethodImpl(MethodImplOptions.NoInlining)] - public static Exception CreateInvalidOperationException_SynchronousWritesDisallowed() => new InvalidOperationException("Synchronous operations are disallowed. Call WriteAsync or set allowSynchronousIO to true instead."); - - public static void ThrowInvalidOperationException_SynchronousFlushesDisallowed() => throw CreateInvalidOperationException_SynchronousFlushesDisallowed(); - [MethodImpl(MethodImplOptions.NoInlining)] - public static Exception CreateInvalidOperationException_SynchronousFlushesDisallowed() => new InvalidOperationException("Synchronous operations are disallowed. Call FlushAsync or set allowSynchronousIO to true instead."); - - public static void ThrowInvalidOperationException_DataNotAllFlushed() => throw CreateInvalidOperationException_DataNotAllFlushed(); - [MethodImpl(MethodImplOptions.NoInlining)] - public static Exception CreateInvalidOperationException_DataNotAllFlushed() => new InvalidOperationException("Complete called without flushing the StreamPipeWriter. Call FlushAsync() before calling Complete()."); - - public static void ThrowInvalidOperationException_NoWritingAllowed() => throw CreateInvalidOperationException_NoWritingAllowed(); - [MethodImpl(MethodImplOptions.NoInlining)] - public static Exception CreateInvalidOperationException_NoWritingAllowed() => new InvalidOperationException("Writing is not allowed after writer was completed."); - - public static void ThrowArgumentOutOfRangeException(string argument) => throw CreateArgumentOutOfRangeException(argument); - [MethodImpl(MethodImplOptions.NoInlining)] - public static Exception CreateArgumentOutOfRangeException(string argument) => new ArgumentOutOfRangeException(argument); - - public static void ThrowOperationCanceledException_ReadCanceled() => throw CreateOperationCanceledException_ReadCanceled(); - [MethodImpl(MethodImplOptions.NoInlining)] - public static Exception CreateOperationCanceledException_ReadCanceled() => new OperationCanceledException("Read was canceled on underlying PipeReader."); - } -} diff --git a/src/Http/Http/src/WriteOnlyPipeStream.cs b/src/Http/Http/src/WriteOnlyPipeStream.cs deleted file mode 100644 index 1d8d23328b..0000000000 --- a/src/Http/Http/src/WriteOnlyPipeStream.cs +++ /dev/null @@ -1,169 +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.Threading; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Internal; - -namespace System.IO.Pipelines -{ - /// - /// Represents a WriteOnlyStream backed by a PipeWriter - /// - public class WriteOnlyPipeStream : Stream - { - private bool _allowSynchronousIO = true; - - /// - /// Creates a new WriteOnlyStream - /// - /// The PipeWriter to write to. - public WriteOnlyPipeStream(PipeWriter pipeWriter) : - this(pipeWriter, allowSynchronousIO: true) - { - } - - /// - /// Creates a new WriteOnlyStream - /// - /// The PipeWriter to write to. - /// Whether synchronous IO is allowed. - public WriteOnlyPipeStream(PipeWriter pipeWriter, bool allowSynchronousIO) - { - InnerPipeWriter = pipeWriter; - _allowSynchronousIO = allowSynchronousIO; - } - - /// - public override bool CanSeek => false; - - /// - public override bool CanRead => false; - - /// - public override bool CanWrite => true; - - /// - public override long Length => throw new NotSupportedException(); - - /// - public override long Position - { - get => throw new NotSupportedException(); - set => throw new NotSupportedException(); - } - - /// - public override int ReadTimeout - { - get => throw new NotSupportedException(); - set => throw new NotSupportedException(); - } - - public PipeWriter InnerPipeWriter { get; } - - /// - public override int Read(byte[] buffer, int offset, int count) - => throw new NotSupportedException(); - - /// - public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - => throw new NotSupportedException(); - - /// - public override void Flush() - { - if (!_allowSynchronousIO) - { - ThrowHelper.ThrowInvalidOperationException_SynchronousFlushesDisallowed(); - } - - FlushAsync(default).GetAwaiter().GetResult(); - } - - /// - public override Task FlushAsync(CancellationToken cancellationToken) - { - return InnerPipeWriter.FlushAsync(cancellationToken).GetAsTask(); - } - - /// - public override long Seek(long offset, SeekOrigin origin) - { - throw new NotSupportedException(); - } - - /// - public override void SetLength(long value) - { - throw new NotSupportedException(); - } - - /// - public override void Write(byte[] buffer, int offset, int count) - { - if (!_allowSynchronousIO) - { - ThrowHelper.ThrowInvalidOperationException_SynchronousWritesDisallowed(); - } - WriteAsync(buffer, offset, count, default).GetAwaiter().GetResult(); - } - - /// - public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) - { - var task = WriteAsync(buffer, offset, count, default, state); - if (callback != null) - { - task.ContinueWith(t => callback.Invoke(t)); - } - return task; - } - - /// - public override void EndWrite(IAsyncResult asyncResult) - { - ((Task)asyncResult).GetAwaiter().GetResult(); - } - - private Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken, object state) - { - var tcs = new TaskCompletionSource(state); - var task = WriteAsync(buffer, offset, count, cancellationToken); - task.ContinueWith((task2, state2) => - { - var tcs2 = (TaskCompletionSource)state2; - if (task2.IsCanceled) - { - tcs2.SetCanceled(); - } - else if (task2.IsFaulted) - { - tcs2.SetException(task2.Exception); - } - else - { - tcs2.SetResult(null); - } - }, tcs, cancellationToken); - return tcs.Task; - } - - /// - public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - return WriteAsyncInternal(new ReadOnlyMemory(buffer, offset, count), cancellationToken); - } - - /// - public override ValueTask WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default) - { - return new ValueTask(WriteAsyncInternal(source, cancellationToken)); - } - - private Task WriteAsyncInternal(ReadOnlyMemory source, CancellationToken cancellationToken = default) - { - return InnerPipeWriter.WriteAsync(source, cancellationToken).GetAsTask(); - } - } -} diff --git a/src/Http/Http/test/Features/FormFeatureTests.cs b/src/Http/Http/test/Features/FormFeatureTests.cs index 4dff8b8daf..f57ed454b7 100644 --- a/src/Http/Http/test/Features/FormFeatureTests.cs +++ b/src/Http/Http/test/Features/FormFeatureTests.cs @@ -98,7 +98,9 @@ namespace Microsoft.AspNetCore.Http.Features await pipe.Writer.WriteAsync(formContent); pipe.Writer.Complete(); - context.Request.BodyReader = pipe.Reader; + var mockFeature = new MockRequestBodyPipeFeature(); + mockFeature.Reader = pipe.Reader; + context.Features.Set(mockFeature); IFormFeature formFeature = new FormFeature(context.Request, new FormOptions() { BufferBody = bufferRequest }); context.Features.Set(formFeature); @@ -108,16 +110,21 @@ namespace Microsoft.AspNetCore.Http.Features Assert.Equal("bar", formCollection["foo"]); Assert.Equal("2", formCollection["baz"]); - // Cached + // Cached formFeature = context.Features.Get(); Assert.NotNull(formFeature); Assert.NotNull(formFeature.Form); Assert.Same(formFeature.Form, formCollection); - // Cleanup + // Cleanup await responseFeature.CompleteAsync(); } + private class MockRequestBodyPipeFeature : IRequestBodyPipeFeature + { + public PipeReader Reader { get; set; } + } + private const string MultipartContentType = "multipart/form-data; boundary=WebKitFormBoundary5pDRpGheQXaM8k3T"; private const string MultipartContentTypeWithSpecialCharacters = "multipart/form-data; boundary=\"WebKitFormBoundary/:5pDRpGheQXaM8k3T\""; diff --git a/src/Http/Http/test/Features/RequestBodyPipeFeatureTests.cs b/src/Http/Http/test/Features/RequestBodyPipeFeatureTests.cs index 83ccd7e928..27d74ac8b7 100644 --- a/src/Http/Http/test/Features/RequestBodyPipeFeatureTests.cs +++ b/src/Http/Http/test/Features/RequestBodyPipeFeatureTests.cs @@ -1,7 +1,6 @@ // 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.Buffers; using System.IO; using System.IO.Pipelines; @@ -24,78 +23,7 @@ namespace Microsoft.AspNetCore.Http.Features var pipeBody = feature.Reader; - Assert.True(pipeBody is StreamPipeReader); - Assert.Equal(expectedStream, (pipeBody as StreamPipeReader).InnerStream); - } - - [Fact] - public async Task RequestBodyReadCanWorkWithPipe() - { - var expectedString = "abcdef"; - var feature = InitializeFeatureWithData(expectedString); - - var data = await feature.Reader.ReadAsync(); - Assert.Equal(expectedString, GetStringFromReadResult(data)); - } - - [Fact] - public void RequestBodySetPipeReaderReturnsSameValue() - { - var context = new DefaultHttpContext(); - - var feature = new RequestBodyPipeFeature(context); - - var pipeReader = new Pipe().Reader; - feature.Reader = pipeReader; - - Assert.Equal(pipeReader, feature.Reader); - } - - [Fact] - public void RequestBodySetPipeReadReturnsUserSetValueAlways() - { - var context = new DefaultHttpContext(); - - var feature = new RequestBodyPipeFeature(context); - - var expectedPipeReader = new Pipe().Reader; - feature.Reader = expectedPipeReader; - - // Because the user set the RequestBodyPipe, this will return the user set pipeReader - context.Request.Body = new MemoryStream(); - - Assert.Equal(expectedPipeReader, feature.Reader); - } - - [Fact] - public async Task RequestBodyDoesNotAffectUserSetPipe() - { - var expectedString = "abcdef"; - var feature = InitializeFeatureWithData("hahaha"); - feature.Reader = await GetPipeReaderWithData(expectedString); - - var data = await feature.Reader.ReadAsync(); - Assert.Equal(expectedString, GetStringFromReadResult(data)); - } - - [Fact] - public void RequestBodyGetPipeReaderAfterSettingBodyTwice() - { - var context = new DefaultHttpContext(); - - context.Request.Body = new MemoryStream(); - - var feature = new RequestBodyPipeFeature(context); - - var pipeBody = feature.Reader; - - // Requery the PipeReader after setting the body again. - var expectedStream = new MemoryStream(); - context.Request.Body = expectedStream; - pipeBody = feature.Reader; - - Assert.True(pipeBody is StreamPipeReader); - Assert.Equal(expectedStream, (pipeBody as StreamPipeReader).InnerStream); + Assert.NotNull(pipeBody); } [Fact] @@ -112,23 +40,9 @@ namespace Microsoft.AspNetCore.Http.Features Assert.Equal(expectedString, GetStringFromReadResult(data)); } - private RequestBodyPipeFeature InitializeFeatureWithData(string input) - { - var context = new DefaultHttpContext(); - context.Request.Body = new MemoryStream(Encoding.ASCII.GetBytes(input)); - return new RequestBodyPipeFeature(context); - } - private static string GetStringFromReadResult(ReadResult data) { return Encoding.ASCII.GetString(data.Buffer.ToArray()); } - - private async Task GetPipeReaderWithData(string input) - { - var pipe = new Pipe(); - await pipe.Writer.WriteAsync(Encoding.ASCII.GetBytes(input)); - return pipe.Reader; - } } } diff --git a/src/Http/Http/test/Features/ResponseBodyPipeFeatureTests.cs b/src/Http/Http/test/Features/ResponseBodyPipeFeatureTests.cs index d2f8d67f8b..7dc69080e0 100644 --- a/src/Http/Http/test/Features/ResponseBodyPipeFeatureTests.cs +++ b/src/Http/Http/test/Features/ResponseBodyPipeFeatureTests.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.IO; -using System.IO.Pipelines; using Xunit; namespace Microsoft.AspNetCore.Http.Features @@ -20,37 +19,7 @@ namespace Microsoft.AspNetCore.Http.Features var pipeBody = feature.Writer; - Assert.True(pipeBody is StreamPipeWriter); - Assert.Equal(expectedStream, (pipeBody as StreamPipeWriter).InnerStream); - } - - [Fact] - public void ResponseBodySetPipeReaderReturnsSameValue() - { - var context = new DefaultHttpContext(); - var feature = new ResponseBodyPipeFeature(context); - - var pipeWriter = new Pipe().Writer; - feature.Writer = pipeWriter; - - Assert.Equal(pipeWriter, feature.Writer); - } - - [Fact] - public void ResponseBodyGetPipeWriterAfterSettingBodyTwice() - { - var context = new DefaultHttpContext(); - var expectedStream = new MemoryStream(); - context.Response.Body = new MemoryStream(); - - var feature = new ResponseBodyPipeFeature(context); - - var pipeBody = feature.Writer; - context.Response.Body = expectedStream; - pipeBody = feature.Writer; - - Assert.True(pipeBody is StreamPipeWriter); - Assert.Equal(expectedStream, (pipeBody as StreamPipeWriter).InnerStream); + Assert.NotNull(pipeBody); } } } diff --git a/src/Http/Http/test/FlushResultCancellationTests.cs b/src/Http/Http/test/FlushResultCancellationTests.cs deleted file mode 100644 index 86dfac17c2..0000000000 --- a/src/Http/Http/test/FlushResultCancellationTests.cs +++ /dev/null @@ -1,30 +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.IO.Pipelines; -using System.Runtime.CompilerServices; -using System.Threading; -using System.Threading.Tasks; -using Xunit; - -namespace System.IO.Pipelines.Tests -{ - public class FlushResultCancellationTests : StreamPipeTest - { - [Fact] - public async Task FlushAsyncWithNewCancellationTokenNotAffectedByPrevious() - { - var cancellationTokenSource1 = new CancellationTokenSource(); - PipeWriter buffer = Writer.WriteEmpty(10); - await buffer.FlushAsync(cancellationTokenSource1.Token); - - cancellationTokenSource1.Cancel(); - - var cancellationTokenSource2 = new CancellationTokenSource(); - buffer = Writer.WriteEmpty(10); - - await buffer.FlushAsync(cancellationTokenSource2.Token); - } - } -} diff --git a/src/Http/Http/test/Internal/DefaultHttpRequestTests.cs b/src/Http/Http/test/Internal/DefaultHttpRequestTests.cs index 11b2bd62b1..ead7012fac 100644 --- a/src/Http/Http/test/Internal/DefaultHttpRequestTests.cs +++ b/src/Http/Http/test/Internal/DefaultHttpRequestTests.cs @@ -251,36 +251,6 @@ namespace Microsoft.AspNetCore.Http.Internal Assert.NotNull(bodyPipe); } - [Fact] - public void BodyReader_CanSet() - { - var pipeReader = new Pipe().Reader; - var context = new DefaultHttpContext(); - - context.Request.BodyReader = pipeReader; - - Assert.Equal(pipeReader, context.Request.BodyReader); - } - - [Fact] - public void BodyReader_WrapsStream() - { - var context = new DefaultHttpContext(); - var expectedStream = new MemoryStream(); - context.Request.Body = expectedStream; - - var bodyPipe = context.Request.BodyReader as StreamPipeReader; - - Assert.Equal(expectedStream, bodyPipe.InnerStream); - } - - [Fact] - public void BodyReader_ThrowsWhenSettingNull() - { - var context = new DefaultHttpContext(); - Assert.Throws(() => context.Request.BodyReader = null); - } - private class CustomRouteValuesFeature : IRouteValuesFeature { public RouteValueDictionary RouteValues { get; set; } diff --git a/src/Http/Http/test/Internal/DefaultHttpResponseTests.cs b/src/Http/Http/test/Internal/DefaultHttpResponseTests.cs index e071817754..ccc4540587 100644 --- a/src/Http/Http/test/Internal/DefaultHttpResponseTests.cs +++ b/src/Http/Http/test/Internal/DefaultHttpResponseTests.cs @@ -73,35 +73,6 @@ namespace Microsoft.AspNetCore.Http.Internal Assert.NotNull(bodyPipe); } - [Fact] - public void BodyWriter_CanSet() - { - var response = new DefaultHttpContext(); - var pipeWriter = new Pipe().Writer; - response.Response.BodyWriter = pipeWriter; - - Assert.Equal(pipeWriter, response.Response.BodyWriter); - } - - [Fact] - public void BodyWriter_WrapsStream() - { - var context = new DefaultHttpContext(); - var expectedStream = new MemoryStream(); - context.Response.Body = expectedStream; - - var bodyPipe = context.Response.BodyWriter as StreamPipeWriter; - - Assert.Equal(expectedStream, bodyPipe.InnerStream); - } - - [Fact] - public void BodyWriter_ThrowsWhenSettingNull() - { - var context = new DefaultHttpContext(); - Assert.Throws(() => context.Response.BodyWriter = null); - } - [Fact] public async Task ResponseStart_CallsFeatureIfSet() { diff --git a/src/Http/Http/test/PipeStreamTest.cs b/src/Http/Http/test/PipeStreamTest.cs deleted file mode 100644 index 94b3ded7be..0000000000 --- a/src/Http/Http/test/PipeStreamTest.cs +++ /dev/null @@ -1,85 +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.Buffers; -using System.Text; -using System.Threading.Tasks; - -namespace System.IO.Pipelines.Tests -{ - public class PipeStreamTest : IDisposable - { - public Stream ReadingStream { get; set; } - public Stream WritingStream { get; set; } - - public Pipe Pipe { get; set; } - - public PipeReader Reader => Pipe.Reader; - - public PipeWriter Writer => Pipe.Writer; - - public PipeStreamTest() - { - Pipe = new Pipe(); - ReadingStream = new ReadOnlyPipeStream(Reader); - WritingStream = new WriteOnlyPipeStream(Writer); - } - - public void Dispose() - { - Writer.Complete(); - Reader.Complete(); - } - - public async Task WriteStringToStreamAsync(string input) - { - await WritingStream.WriteAsync(Encoding.ASCII.GetBytes(input)); - } - - public async Task WriteStringToPipeAsync(string input) - { - await Writer.WriteAsync(Encoding.ASCII.GetBytes(input)); - } - - public async Task WriteByteArrayToPipeAsync(byte[] input) - { - await Writer.WriteAsync(input); - } - - public async Task ReadFromPipeAsStringAsync() - { - var readResult = await Reader.ReadAsync(); - var result = Encoding.ASCII.GetString(readResult.Buffer.ToArray()); - Reader.AdvanceTo(readResult.Buffer.End); - return result; - } - - public async Task ReadFromStreamAsStringAsync() - { - var memory = new Memory(new byte[4096]); - var readLength = await ReadingStream.ReadAsync(memory); - var result = Encoding.ASCII.GetString(memory.ToArray(), 0, readLength); - return result; - } - - public async Task ReadFromPipeAsByteArrayAsync() - { - var readResult = await Reader.ReadAsync(); - var result = readResult.Buffer.ToArray(); - Reader.AdvanceTo(readResult.Buffer.End); - return result; - } - - public Task ReadFromStreamAsByteArrayAsync(int size) - { - return ReadFromStreamAsByteArrayAsync(size, ReadingStream); - } - - public async Task ReadFromStreamAsByteArrayAsync(int size, Stream stream) - { - var memory = new Memory(new byte[size]); - var readLength = await stream.ReadAsync(memory); - return memory.Slice(0, readLength).ToArray(); - } - } -} diff --git a/src/Http/Http/test/PipeWriterTests.cs b/src/Http/Http/test/PipeWriterTests.cs deleted file mode 100644 index 714cbbbccb..0000000000 --- a/src/Http/Http/test/PipeWriterTests.cs +++ /dev/null @@ -1,221 +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.Buffers; -using System.Collections.Generic; -using System.IO; -using System.IO.Pipelines; -using System.Linq; -using System.Threading.Tasks; -using Xunit; - -namespace System.IO.Pipelines.Tests -{ - public class PipeWriterTests : StreamPipeTest - { - - [Theory] - [InlineData(3, -1, 0)] - [InlineData(3, 0, -1)] - [InlineData(3, 0, 4)] - [InlineData(3, 4, 0)] - [InlineData(3, -1, -1)] - [InlineData(3, 4, 4)] - public void ThrowsForInvalidParameters(int arrayLength, int offset, int length) - { - var array = new byte[arrayLength]; - for (var i = 0; i < array.Length; i++) - { - array[i] = (byte)(i + 1); - } - - Writer.Write(new Span(array, 0, 0)); - Writer.Write(new Span(array, array.Length, 0)); - - try - { - Writer.Write(new Span(array, offset, length)); - Assert.True(false); - } - catch (Exception ex) - { - Assert.True(ex is ArgumentOutOfRangeException); - } - - Writer.Write(new Span(array, 0, array.Length)); - Assert.Equal(array, Read()); - } - - [Theory] - [InlineData(0, 3)] - [InlineData(1, 2)] - [InlineData(2, 1)] - [InlineData(1, 1)] - public void CanWriteWithOffsetAndLength(int offset, int length) - { - var array = new byte[] { 1, 2, 3 }; - - Writer.Write(new Span(array, offset, length)); - - Assert.Equal(array.Skip(offset).Take(length).ToArray(), Read()); - } - - [Fact] - public void CanWriteIntoHeadlessBuffer() - { - - Writer.Write(new byte[] { 1, 2, 3 }); - Assert.Equal(new byte[] { 1, 2, 3 }, Read()); - } - - [Fact] - public void CanGetNewMemoryWhenSizeTooLarge() - { - var memory = Writer.GetMemory(0); - - var memoryLarge = Writer.GetMemory(10000); - - Assert.NotEqual(memory, memoryLarge); - } - - [Fact] - public void CanGetSameMemoryWhenNoAdvance() - { - var memory = Writer.GetMemory(0); - - var secondMemory = Writer.GetMemory(0); - - Assert.Equal(memory, secondMemory); - } - - [Theory] - [InlineData(0)] - [InlineData(2048)] - public void GetSpanWithZeroSizeHintReturnsMaxBufferSizeOfPool(int sizeHint) - { - var span = Writer.GetSpan(sizeHint); - - Assert.Equal(4096, span.Length); - } - - [Fact] - public void CanGetSameSpanWhenNoAdvance() - { - var span = Writer.GetSpan(0); - - var secondSpan = Writer.GetSpan(0); - - Assert.True(span.SequenceEqual(secondSpan)); - } - - [Theory] - [InlineData(16, 32, 32)] - [InlineData(16, 16, 16)] - [InlineData(64, 32, 64)] - [InlineData(40, 32, 64)] // memory sizes are powers of 2. - public void CheckMinimumSegmentSizeWithGetMemory(int minimumSegmentSize, int getMemorySize, int expectedSize) - { - var writer = new StreamPipeWriter(new MemoryStream(), minimumSegmentSize); - var memory = writer.GetMemory(getMemorySize); - - Assert.Equal(expectedSize, memory.Length); - } - - [Fact] - public void CanWriteMultipleTimes() - { - - Writer.Write(new byte[] { 1 }); - Writer.Write(new byte[] { 2 }); - Writer.Write(new byte[] { 3 }); - - Assert.Equal(new byte[] { 1, 2, 3 }, Read()); - } - - [Fact] - public void CanWriteOverTheBlockLength() - { - Memory memory = Writer.GetMemory(); - - IEnumerable source = Enumerable.Range(0, memory.Length).Select(i => (byte)i); - byte[] expectedBytes = source.Concat(source).Concat(source).ToArray(); - - Writer.Write(expectedBytes); - - Assert.Equal(expectedBytes, Read()); - } - - [Fact] - public void EnsureAllocatesSpan() - { - var span = Writer.GetSpan(10); - - Assert.True(span.Length >= 10); - // 0 byte Flush would not complete the reader so we complete. - Writer.Complete(); - Assert.Equal(new byte[] { }, Read()); - } - - [Fact] - public void SlicesSpanAndAdvancesAfterWrite() - { - int initialLength = Writer.GetSpan(3).Length; - - - Writer.Write(new byte[] { 1, 2, 3 }); - Span span = Writer.GetSpan(); - - Assert.Equal(initialLength - 3, span.Length); - Assert.Equal(new byte[] { 1, 2, 3 }, Read()); - } - - [Theory] - [InlineData(5)] - [InlineData(50)] - [InlineData(500)] - [InlineData(5000)] - [InlineData(50000)] - public async Task WriteLargeDataBinary(int length) - { - var data = new byte[length]; - new Random(length).NextBytes(data); - PipeWriter output = Writer; - output.Write(data); - await output.FlushAsync(); - - var input = Read(); - Assert.Equal(data, input.ToArray()); - } - - [Fact] - public async Task CanWriteNothingToBuffer() - { - Writer.GetMemory(0); - Writer.Advance(0); // doing nothing, the hard way - await Writer.FlushAsync(); - } - - [Fact] - public void EmptyWriteDoesNotThrow() - { - Writer.Write(new byte[0]); - } - - [Fact] - public void ThrowsOnAdvanceOverMemorySize() - { - Memory buffer = Writer.GetMemory(1); - var exception = Assert.Throws(() => Writer.Advance(buffer.Length + 1)); - Assert.Equal("Can't advance past buffer size.", exception.Message); - } - - [Fact] - public void ThrowsOnAdvanceWithNoMemory() - { - PipeWriter buffer = Writer; - var exception = Assert.Throws(() => buffer.Advance(1)); - Assert.Equal("No writing operation. Make sure GetMemory() was called.", exception.Message); - } - } -} diff --git a/src/Http/Http/test/ReadAsyncCancellationTests.cs b/src/Http/Http/test/ReadAsyncCancellationTests.cs deleted file mode 100644 index 84d183c512..0000000000 --- a/src/Http/Http/test/ReadAsyncCancellationTests.cs +++ /dev/null @@ -1,128 +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.Buffers; -using System.IO.Pipelines; -using System.Runtime.CompilerServices; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using Xunit; - -namespace System.IO.Pipelines.Tests -{ - public class ReadAsyncCancellationTests : StreamPipeTest - { - [Fact] - public async Task AdvanceShouldResetStateIfReadCanceled() - { - Reader.CancelPendingRead(); - - var result = await Reader.ReadAsync(); - var buffer = result.Buffer; - Reader.AdvanceTo(buffer.End); - - Assert.False(result.IsCompleted); - Assert.True(result.IsCanceled); - Assert.True(buffer.IsEmpty); - } - - [Fact] - public async Task CancellingBeforeAdvance() - { - Write(Encoding.ASCII.GetBytes("Hello World")); - - var result = await Reader.ReadAsync(); - var buffer = result.Buffer; - - Assert.Equal(11, buffer.Length); - Assert.False(result.IsCanceled); - Assert.True(buffer.IsSingleSegment); - var array = new byte[11]; - buffer.First.Span.CopyTo(array); - Assert.Equal("Hello World", Encoding.ASCII.GetString(array)); - - Reader.CancelPendingRead(); - - Reader.AdvanceTo(buffer.End); - - var awaitable = Reader.ReadAsync(); - - Assert.True(awaitable.IsCompleted); - - result = await awaitable; - - Assert.True(result.IsCanceled); - - Reader.AdvanceTo(result.Buffer.Start, result.Buffer.Start); - } - - [Fact] - public async Task ReadAsyncWithNewCancellationTokenNotAffectedByPrevious() - { - Write(new byte[1]); - - var cancellationTokenSource1 = new CancellationTokenSource(); - var result = await Reader.ReadAsync(cancellationTokenSource1.Token); - Reader.AdvanceTo(result.Buffer.Start); - - cancellationTokenSource1.Cancel(); - var cancellationTokenSource2 = new CancellationTokenSource(); - - // Verifying that ReadAsync does not throw - result = await Reader.ReadAsync(cancellationTokenSource2.Token); - Reader.AdvanceTo(result.Buffer.Start); - } - - [Fact] - public async Task CancellingPendingReadBeforeReadAsync() - { - Reader.CancelPendingRead(); - - ReadResult result = await Reader.ReadAsync(); - ReadOnlySequence buffer = result.Buffer; - Reader.AdvanceTo(buffer.End); - - Assert.False(result.IsCompleted); - Assert.True(result.IsCanceled); - Assert.True(buffer.IsEmpty); - - byte[] bytes = Encoding.ASCII.GetBytes("Hello World"); - Write(bytes); - - result = await Reader.ReadAsync(); - buffer = result.Buffer; - - Assert.Equal(11, buffer.Length); - Assert.False(result.IsCanceled); - Assert.True(buffer.IsSingleSegment); - var array = new byte[11]; - buffer.First.Span.CopyTo(array); - Assert.Equal("Hello World", Encoding.ASCII.GetString(array)); - - Reader.AdvanceTo(buffer.Start, buffer.Start); - } - - [Fact] - public void ReadAsyncCompletedAfterPreCancellation() - { - Reader.CancelPendingRead(); - Write(new byte[] { 1, 2, 3 }); - - ValueTaskAwaiter awaitable = Reader.ReadAsync().GetAwaiter(); - - Assert.True(awaitable.IsCompleted); - - ReadResult result = awaitable.GetResult(); - - Assert.True(result.IsCanceled); - - awaitable = Reader.ReadAsync().GetAwaiter(); - - Assert.True(awaitable.IsCompleted); - - Reader.AdvanceTo(awaitable.GetResult().Buffer.End); - } - } -} diff --git a/src/Http/Http/test/ReadOnlyPipeStreamTests.cs b/src/Http/Http/test/ReadOnlyPipeStreamTests.cs deleted file mode 100644 index f88a935670..0000000000 --- a/src/Http/Http/test/ReadOnlyPipeStreamTests.cs +++ /dev/null @@ -1,186 +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.Buffers; -using System.Threading; -using System.Threading.Tasks; -using Moq; -using Xunit; - -namespace System.IO.Pipelines.Tests -{ - public class ReadOnlyPipeStreamTests : PipeStreamTest - { - [Fact] - public void CanSeekFalse() - { - Assert.False(ReadingStream.CanSeek); - } - - [Fact] - public void CanReadTrue() - { - Assert.True(ReadingStream.CanRead); - } - - [Fact] - public void CanWriteFalse() - { - Assert.False(ReadingStream.CanWrite); - } - - [Fact] - public void LengthThrows() - { - Assert.Throws(() => ReadingStream.Length); - } - - [Fact] - public void PositionThrows() - { - Assert.Throws(() => ReadingStream.Position); - Assert.Throws(() => ReadingStream.Position = 1); - } - - [Fact] - public void SeekThrows() - { - Assert.Throws(() => ReadingStream.Seek(0, SeekOrigin.Begin)); - } - - [Fact] - public void SetLengthThrows() - { - Assert.Throws(() => ReadingStream.SetLength(1)); - } - - [Fact] - public void WriteThrows() - { - Assert.Throws(() => ReadingStream.Write(new byte[1], 0, 1)); - } - - [Fact] - public async Task WriteAsyncThrows() - { - await Assert.ThrowsAsync(async () => await ReadingStream.WriteAsync(new byte[1], 0, 1)); - } - - [Fact] - public void ReadTimeoutThrows() - { - Assert.Throws(() => ReadingStream.WriteTimeout = 1); - Assert.Throws(() => ReadingStream.WriteTimeout); - } - - [Fact] - public async Task ReadAsyncWorks() - { - var expected = "Hello World!"; - - await WriteStringToPipeAsync(expected); - - Assert.Equal(expected, await ReadFromStreamAsStringAsync()); - } - - [Fact] - public async Task BasicLargeRead() - { - var expected = new byte[8000]; - - await WriteByteArrayToPipeAsync(expected); - - Assert.Equal(expected, await ReadFromStreamAsByteArrayAsync(8000)); - } - - [Fact] - public async Task ReadAsyncIsCalledFromCallingRead() - { - var pipeReader = await SetupMockPipeReader(); - var stream = new ReadOnlyPipeStream(pipeReader.Object); - - stream.Read(new byte[1]); - - pipeReader.Verify(m => m.ReadAsync(It.IsAny())); - } - - [Fact] - public async Task ReadAsyncIsCalledFromCallingReadAsync() - { - var pipeReader = await SetupMockPipeReader(); - var stream = new ReadOnlyPipeStream(pipeReader.Object); - - await stream.ReadAsync(new byte[1]); - - pipeReader.Verify(m => m.ReadAsync(It.IsAny())); - } - - [Fact] - public async Task ReadAsyncCancellationTokenIsPassedIntoReadAsync() - { - var pipeReader = await SetupMockPipeReader(); - var stream = new ReadOnlyPipeStream(pipeReader.Object); - var token = new CancellationToken(); - - await stream.ReadAsync(new byte[1], token); - - pipeReader.Verify(m => m.ReadAsync(token)); - } - - [Fact] - public async Task CopyToAsyncWorks() - { - const int expectedSize = 8000; - var expected = new byte[expectedSize]; - - await WriteByteArrayToPipeAsync(expected); - - Writer.Complete(); - var destStream = new MemoryStream(); - - await ReadingStream.CopyToAsync(destStream); - - Assert.Equal(expectedSize, destStream.Length); - } - - [Fact] - public void BlockSyncIOThrows() - { - var readOnlyPipeStream = new ReadOnlyPipeStream(Reader, allowSynchronousIO: false); - Assert.Throws(() => readOnlyPipeStream.Read(new byte[0], 0, 0)); - } - - [Fact] - public void InnerPipeReaderReturnsPipeReader() - { - var readOnlyPipeStream = new ReadOnlyPipeStream(Reader, allowSynchronousIO: false); - Assert.Equal(Reader, readOnlyPipeStream.InnerPipeReader); - } - - [Fact] - public async Task ThrowsOperationCanceledExceptionIfCancelPendingReadWasCalledOnInnerPipeReader() - { - var readOnlyPipeStream = new ReadOnlyPipeStream(Reader); - var readOperation = readOnlyPipeStream.ReadAsync(new byte[1]); - - Assert.False(readOperation.IsCompleted); - - Reader.CancelPendingRead(); - - var ex = await Assert.ThrowsAsync(async () => await readOperation); - - Assert.Equal(ThrowHelper.CreateOperationCanceledException_ReadCanceled().Message, ex.Message); - } - - private async Task> SetupMockPipeReader() - { - await WriteByteArrayToPipeAsync(new byte[1]); - - var pipeReader = new Mock(); - pipeReader - .Setup(m => m.ReadAsync(It.IsAny())) - .Returns(new ValueTask(new ReadResult(new ReadOnlySequence(new byte[1]), false, false))); - return pipeReader; - } - } -} diff --git a/src/Http/Http/test/ReadingAdaptersInteropTests.cs b/src/Http/Http/test/ReadingAdaptersInteropTests.cs deleted file mode 100644 index fad1909b13..0000000000 --- a/src/Http/Http/test/ReadingAdaptersInteropTests.cs +++ /dev/null @@ -1,147 +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.Buffers; -using System.Threading; -using System.Threading.Tasks; -using Xunit; - -namespace System.IO.Pipelines.Tests -{ - public class ReadingAdaptersInteropTests - { - [Fact] - public async Task CheckBasicReadPipeApi() - { - var pipe = new Pipe(); - var readStream = new ReadOnlyPipeStream(pipe.Reader); - var pipeReader = new StreamPipeReader(readStream); - - await pipe.Writer.WriteAsync(new byte[10]); - var res = await pipeReader.ReadAsync(); - Assert.Equal(new byte[10], res.Buffer.ToArray()); - } - - [Fact] - public async Task CheckNestedPipeApi() - { - var pipe = new Pipe(); - var reader = pipe.Reader; - for (var i = 0; i < 3; i++) - { - var readStream = new ReadOnlyPipeStream(reader); - reader = new StreamPipeReader(readStream); - } - - await pipe.Writer.WriteAsync(new byte[10]); - var res = await reader.ReadAsync(); - Assert.Equal(new byte[10], res.Buffer.ToArray()); - } - - [Fact] - public async Task CheckBasicReadStreamApi() - { - var stream = new MemoryStream(); - await stream.WriteAsync(new byte[10]); - stream.Position = 0; - - var pipeReader = new StreamPipeReader(stream); - var readOnlyStream = new ReadOnlyPipeStream(pipeReader); - - var resSize = await readOnlyStream.ReadAsync(new byte[10]); - - Assert.Equal(10, resSize); - } - - [Fact] - public async Task CheckNestedStreamApi() - { - var stream = new MemoryStream(); - await stream.WriteAsync(new byte[10]); - stream.Position = 0; - - Stream readOnlyStream = stream; - for (var i = 0; i < 3; i++) - { - var pipeReader = new StreamPipeReader(readOnlyStream); - readOnlyStream = new ReadOnlyPipeStream(pipeReader); - } - - var resSize = await readOnlyStream.ReadAsync(new byte[10]); - - Assert.Equal(10, resSize); - } - - [Fact] - public async Task ReadsCanBeCanceledViaProvidedCancellationToken() - { - var readOnlyStream = new ReadOnlyPipeStream(new HangingPipeReader()); - var pipeReader = new StreamPipeReader(readOnlyStream); - - var cts = new CancellationTokenSource(1); - await Task.Delay(1); - await Assert.ThrowsAsync(async () => await pipeReader.ReadAsync(cts.Token)); - } - - [Fact] - public async Task ReadCanBeCancelledViaCancelPendingReadWhenReadIsAsync() - { - var readOnlyStream = new ReadOnlyPipeStream(new HangingPipeReader()); - var pipeReader = new StreamPipeReader(readOnlyStream); - - var result = new ReadResult(); - var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var task = Task.Run(async () => - { - var readingTask = pipeReader.ReadAsync(); - tcs.SetResult(0); - result = await readingTask; - }); - await tcs.Task; - pipeReader.CancelPendingRead(); - await task; - - Assert.True(result.IsCanceled); - } - - private class HangingPipeReader : PipeReader - { - public override void AdvanceTo(SequencePosition consumed) - { - throw new NotImplementedException(); - } - - public override void AdvanceTo(SequencePosition consumed, SequencePosition examined) - { - throw new NotImplementedException(); - } - - public override void CancelPendingRead() - { - throw new NotImplementedException(); - } - - public override void Complete(Exception exception = null) - { - throw new NotImplementedException(); - } - - public override void OnWriterCompleted(Action callback, object state) - { - throw new NotImplementedException(); - } - - public override async ValueTask ReadAsync(CancellationToken cancellationToken = default) - { - await Task.Delay(30000, cancellationToken); - return new ReadResult(); - } - - public override bool TryRead(out ReadResult result) - { - result = new ReadResult(); - return false; - } - } - } -} diff --git a/src/Http/Http/test/StreamPipeReaderTests.cs b/src/Http/Http/test/StreamPipeReaderTests.cs deleted file mode 100644 index bf76875001..0000000000 --- a/src/Http/Http/test/StreamPipeReaderTests.cs +++ /dev/null @@ -1,752 +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.Buffers; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.InteropServices; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using Xunit; - -namespace System.IO.Pipelines.Tests -{ - public partial class StreamPipeReaderTests : StreamPipeTest - { - [Fact] - public async Task CanRead() - { - Write(Encoding.ASCII.GetBytes("Hello World")); - var readResult = await Reader.ReadAsync(); - var buffer = readResult.Buffer; - - Assert.Equal(11, buffer.Length); - Assert.True(buffer.IsSingleSegment); - var array = new byte[11]; - buffer.First.Span.CopyTo(array); - Assert.Equal("Hello World", Encoding.ASCII.GetString(array)); - Reader.AdvanceTo(buffer.End); - } - - [Fact] - public async Task CanReadMultipleTimes() - { - Write(Encoding.ASCII.GetBytes(new string('a', 10000))); - var readResult = await Reader.ReadAsync(); - - Assert.Equal(MinimumSegmentSize, readResult.Buffer.Length); - Assert.True(readResult.Buffer.IsSingleSegment); - - Reader.AdvanceTo(readResult.Buffer.Start, readResult.Buffer.End); - - readResult = await Reader.ReadAsync(); - Assert.Equal(MinimumSegmentSize * 2, readResult.Buffer.Length); - Assert.False(readResult.Buffer.IsSingleSegment); - - Reader.AdvanceTo(readResult.Buffer.Start, readResult.Buffer.End); - - readResult = await Reader.ReadAsync(); - Assert.Equal(10000, readResult.Buffer.Length); - Assert.False(readResult.Buffer.IsSingleSegment); - - Reader.AdvanceTo(readResult.Buffer.End); - } - - [Fact] - public async Task ReadWithAdvance() - { - WriteByteArray(9000); - - var readResult = await Reader.ReadAsync(); - Reader.AdvanceTo(readResult.Buffer.End); - - readResult = await Reader.ReadAsync(); - Assert.Equal(MinimumSegmentSize, readResult.Buffer.Length); - Assert.True(readResult.Buffer.IsSingleSegment); - } - - [Fact] - public async Task ReadWithAdvanceDifferentSegmentSize() - { - CreateReader(minimumSegmentSize: 4095); - - WriteByteArray(9000); - - var readResult = await Reader.ReadAsync(); - Reader.AdvanceTo(readResult.Buffer.End); - - readResult = await Reader.ReadAsync(); - Assert.Equal(4095, readResult.Buffer.Length); - Assert.True(readResult.Buffer.IsSingleSegment); - } - - [Fact] - public async Task ReadWithAdvanceSmallSegments() - { - CreateReader(); - - WriteByteArray(128); - - var readResult = await Reader.ReadAsync(); - Reader.AdvanceTo(readResult.Buffer.End); - - readResult = await Reader.ReadAsync(); - Assert.Equal(16, readResult.Buffer.Length); - Assert.True(readResult.Buffer.IsSingleSegment); - } - - [Fact] - public async Task ReadConsumePartialReadAsyncCallsTryRead() - { - Write(Encoding.ASCII.GetBytes(new string('a', 10000))); - - var readResult = await Reader.ReadAsync(); - Reader.AdvanceTo(readResult.Buffer.GetPosition(2048)); - - // Confirm readResults are the same. - var readResult2 = await Reader.ReadAsync(); - - var didRead = Reader.TryRead(out var readResult3); - - Assert.Equal(readResult2, readResult3); - } - - [Fact] - public async Task ReadConsumeEntireTryReadReturnsNothing() - { - Write(Encoding.ASCII.GetBytes(new string('a', 10000))); - - var readResult = await Reader.ReadAsync(); - Reader.AdvanceTo(readResult.Buffer.End); - var didRead = Reader.TryRead(out readResult); - - Assert.False(didRead); - } - - [Fact] - public async Task ReadExaminePartialReadAsyncDoesNotReturnMoreBytes() - { - Write(Encoding.ASCII.GetBytes(new string('a', 10000))); - - var readResult = await Reader.ReadAsync(); - Reader.AdvanceTo(readResult.Buffer.Start, readResult.Buffer.GetPosition(2048)); - - var readResult2 = await Reader.ReadAsync(); - - Assert.Equal(readResult, readResult2); - } - - [Fact] - public async Task ReadExamineEntireReadAsyncReturnsNewData() - { - Write(Encoding.ASCII.GetBytes(new string('a', 10000))); - - var readResult = await Reader.ReadAsync(); - Reader.AdvanceTo(readResult.Buffer.Start, readResult.Buffer.End); - - var readResult2 = await Reader.ReadAsync(); - Assert.NotEqual(readResult, readResult2); - } - - [Fact] - public async Task ReadCanBeCancelledViaProvidedCancellationToken() - { - var pipeReader = new StreamPipeReader(new HangingStream()); - var cts = new CancellationTokenSource(1); - await Task.Delay(1); - await Assert.ThrowsAsync(async () => await pipeReader.ReadAsync(cts.Token)); - } - - [Fact] - public async Task ReadCanBeCanceledViaCancelPendingReadWhenReadIsAsync() - { - var pipeReader = new StreamPipeReader(new HangingStream()); - - var result = new ReadResult(); - var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var task = Task.Run(async () => - { - var readingTask = pipeReader.ReadAsync(); - tcs.SetResult(0); - result = await readingTask; - }); - await tcs.Task; - pipeReader.CancelPendingRead(); - await task; - - Assert.True(result.IsCanceled); - } - - [Fact] - public async Task ReadAsyncReturnsCanceledIfCanceledBeforeRead() - { - Write(Encoding.ASCII.GetBytes(new string('a', 10000))); - - // Make sure state isn't used from before - for (var i = 0; i < 3; i++) - { - Reader.CancelPendingRead(); - var readResultTask = Reader.ReadAsync(); - Assert.True(readResultTask.IsCompleted); - var readResult = readResultTask.GetAwaiter().GetResult(); - Assert.True(readResult.IsCanceled); - readResult = await Reader.ReadAsync(); - Reader.AdvanceTo(readResult.Buffer.End); - } - } - - [Fact] - public async Task ReadAsyncReturnsCanceledInterleaved() - { - Write(new byte[10000]); - - // Cancel and Read interleaved to confirm cancellations are independent - for (var i = 0; i < 3; i++) - { - Reader.CancelPendingRead(); - var readResultTask = Reader.ReadAsync(); - Assert.True(readResultTask.IsCompleted); - var readResult = readResultTask.GetAwaiter().GetResult(); - Assert.True(readResult.IsCanceled); - - readResult = await Reader.ReadAsync(); - Assert.False(readResult.IsCanceled); - } - } - - [Fact] - public async Task AdvanceWithEmptySequencePositionNoop() - { - Write(Encoding.ASCII.GetBytes(new string('a', 10000))); - - var readResult = await Reader.ReadAsync(); - Reader.AdvanceTo(readResult.Buffer.Start); - var readResult2 = await Reader.ReadAsync(); - - Assert.Equal(readResult, readResult2); - } - - [Fact] - public async Task AdvanceToInvalidCursorThrows() - { - Write(new byte[100]); - - var result = await Reader.ReadAsync(); - var buffer = result.Buffer; - - Reader.AdvanceTo(buffer.End); - - Reader.CancelPendingRead(); - result = await Reader.ReadAsync(); - Assert.Throws(() => Reader.AdvanceTo(buffer.End)); - Reader.AdvanceTo(result.Buffer.End); - } - - [Fact] - public void AdvanceWithoutReadingWithValidSequencePosition() - { - var sequencePosition = new SequencePosition(new BufferSegment(), 5); - Assert.Throws(() => Reader.AdvanceTo(sequencePosition)); - } - - [Fact] - public async Task AdvanceMultipleSegments() - { - CreateReader(); - - WriteByteArray(128); - - var result = await Reader.ReadAsync(); - Assert.Equal(16, result.Buffer.Length); - Reader.AdvanceTo(result.Buffer.Start, result.Buffer.End); - - var result2 = await Reader.ReadAsync(); - Assert.Equal(32, result2.Buffer.Length); - Reader.AdvanceTo(result.Buffer.End, result2.Buffer.End); - - var result3 = await Reader.ReadAsync(); - Assert.Equal(32, result3.Buffer.Length); - } - - [Fact] - public async Task AdvanceMultipleSegmentsEdgeCase() - { - CreateReader(); - - WriteByteArray(128); - - var result = await Reader.ReadAsync(); - Reader.AdvanceTo(result.Buffer.Start, result.Buffer.End); - result = await Reader.ReadAsync(); - Reader.AdvanceTo(result.Buffer.Start, result.Buffer.End); - - var result2 = await Reader.ReadAsync(); - Assert.Equal(48, result2.Buffer.Length); - Reader.AdvanceTo(result.Buffer.End, result2.Buffer.End); - - var result3 = await Reader.ReadAsync(); - Assert.Equal(32, result3.Buffer.Length); - } - - [Fact] - public async Task CompleteReaderWithoutAdvanceDoesNotThrow() - { - WriteByteArray(100); - await Reader.ReadAsync(); - Reader.Complete(); - } - - [Fact] - public async Task AdvanceAfterCompleteThrows() - { - WriteByteArray(100); - var buffer = (await Reader.ReadAsync()).Buffer; - - Reader.Complete(); - - var exception = Assert.Throws(() => Reader.AdvanceTo(buffer.End)); - Assert.Equal("Reading is not allowed after reader was completed.", exception.Message); - } - - [Fact] - public async Task ReadBetweenBlocks() - { - var blockSize = 16; - CreateReader(); - - WriteWithoutPosition(Enumerable.Repeat((byte)'a', blockSize - 5).ToArray()); - Write(Encoding.ASCII.GetBytes("Hello World")); - - // ReadAsync will only return one chunk at a time, so Advance/ReadAsync to get two chunks - var result = await Reader.ReadAsync(); - Reader.AdvanceTo(result.Buffer.Start, result.Buffer.End); - result = await Reader.ReadAsync(); - - var buffer = result.Buffer; - Assert.False(buffer.IsSingleSegment); - var helloBuffer = buffer.Slice(blockSize - 5); - Assert.False(helloBuffer.IsSingleSegment); - var memory = new List>(); - foreach (var m in helloBuffer) - { - memory.Add(m); - } - - var spans = memory; - Reader.AdvanceTo(buffer.Start, buffer.Start); - - Assert.Equal(2, memory.Count); - var helloBytes = new byte[spans[0].Length]; - spans[0].Span.CopyTo(helloBytes); - var worldBytes = new byte[spans[1].Length]; - spans[1].Span.CopyTo(worldBytes); - Assert.Equal("Hello", Encoding.ASCII.GetString(helloBytes)); - Assert.Equal(" World", Encoding.ASCII.GetString(worldBytes)); - } - - [Fact] - public async Task ThrowsOnReadAfterCompleteReader() - { - Reader.Complete(); - - await Assert.ThrowsAsync(async () => await Reader.ReadAsync()); - } - - [Fact] - public void TryReadAfterCancelPendingReadReturnsTrue() - { - Reader.CancelPendingRead(); - - var gotData = Reader.TryRead(out var result); - - Assert.True(result.IsCanceled); - - Reader.AdvanceTo(result.Buffer.End); - } - - [Fact] - public void ReadAsyncWithDataReadyReturnsTaskWithValue() - { - WriteByteArray(20); - var task = Reader.ReadAsync(); - Assert.True(IsTaskWithResult(task)); - } - - [Fact] - public async Task ArrayPoolUsedByDefault() - { - WriteByteArray(20); - var reader = new StreamPipeReader(Stream); - var result = await reader.ReadAsync(); - - SequenceMarshal.TryGetReadOnlySequenceSegment( - result.Buffer, - out var startSegment, - out var startIndex, - out var endSegment, - out var endIndex); - - var start = (BufferSegment)startSegment; - var end = (BufferSegment)endSegment; - - Assert.Same(start, end); - Assert.IsType(start.MemoryOwner); - - reader.AdvanceTo(result.Buffer.End); - reader.Complete(); - } - - [Fact] - public void CancelledReadAsyncReturnsTaskWithValue() - { - Reader.CancelPendingRead(); - var task = Reader.ReadAsync(); - Assert.True(IsTaskWithResult(task)); - } - - [Fact] - public async Task AdvancePastMinReadSizeReadAsyncReturnsMoreData() - { - CreateReader(); - - WriteByteArray(32); - var result = await Reader.ReadAsync(); - Assert.Equal(16, result.Buffer.Length); - - Reader.AdvanceTo(result.Buffer.GetPosition(12), result.Buffer.End); - result = await Reader.ReadAsync(); - Assert.Equal(20, result.Buffer.Length); - } - - [Fact] - public async Task ExamineEverythingResetsAfterSuccessfulRead() - { - WriteByteArray(10000); - - var readResult = await Reader.ReadAsync(); - Reader.AdvanceTo(readResult.Buffer.Start, readResult.Buffer.End); - - var readResult2 = await Reader.ReadAsync(); - Reader.AdvanceTo(readResult2.Buffer.GetPosition(2000)); - - var readResult3 = await Reader.ReadAsync(); - Assert.Equal(6192, readResult3.Buffer.Length); - } - - [Fact] - public async Task ReadMultipleTimesAdvanceFreesAppropriately() - { - var pool = new TestMemoryPool(); - CreateReader(memoryPool: pool); - - WriteByteArray(2000); - - for (var i = 0; i < 99; i++) - { - var readResult = await Reader.ReadAsync(); - Reader.AdvanceTo(readResult.Buffer.Start, readResult.Buffer.End); - } - - var result = await Reader.ReadAsync(); - Reader.AdvanceTo(result.Buffer.End); - Assert.Equal(1, pool.GetRentCount()); - } - - [Fact] - public async Task AsyncReadWorks() - { - Stream = new AsyncStream(); - CreateReader(); - - WriteByteArray(2000); - - for (var i = 0; i < 99; i++) - { - var readResult = await Reader.ReadAsync(); - Reader.AdvanceTo(readResult.Buffer.Start, readResult.Buffer.End); - } - - var result = await Reader.ReadAsync(); - Assert.Equal(1600, result.Buffer.Length); - Reader.AdvanceTo(result.Buffer.End); - } - - [Fact] - public async Task ConsumePartialBufferWorks() - { - CreateReader(); - - Write(Encoding.ASCII.GetBytes(new string('a', 8))); - var readResult = await Reader.ReadAsync(); - Reader.AdvanceTo(readResult.Buffer.GetPosition(4), readResult.Buffer.End); - Stream.Position = 0; - - readResult = await Reader.ReadAsync(); - var resultString = Encoding.ASCII.GetString(readResult.Buffer.ToArray()); - Assert.Equal(new string('a', 12), resultString); - Reader.AdvanceTo(readResult.Buffer.End); - } - - [Fact] - public async Task ConsumePartialBufferBetweenMultipleSegmentsWorks() - { - CreateReader(); - - Write(Encoding.ASCII.GetBytes(new string('a', 8))); - var readResult = await Reader.ReadAsync(); - Reader.AdvanceTo(readResult.Buffer.GetPosition(4), readResult.Buffer.End); - Stream.Position = 0; - - readResult = await Reader.ReadAsync(); - Reader.AdvanceTo(readResult.Buffer.Start, readResult.Buffer.End); - Stream.Position = 0; - - readResult = await Reader.ReadAsync(); - var resultString = Encoding.ASCII.GetString(readResult.Buffer.ToArray()); - Assert.Equal(new string('a', 20), resultString); - - Reader.AdvanceTo(readResult.Buffer.End); - } - - [Fact] - public async Task SetMinimumReadThresholdSegmentAdvancesCorrectly() - { - CreateReader(minimumReadThreshold: 8); - - WriteByteArray(9); - var readResult = await Reader.ReadAsync(); - Reader.AdvanceTo(readResult.Buffer.Start, readResult.Buffer.End); - - AppendByteArray(9); - readResult = await Reader.ReadAsync(); - - foreach (var segment in readResult.Buffer) - { - Assert.Equal(9, segment.Length); - } - Assert.False(readResult.Buffer.IsSingleSegment); - } - - [Fact] - public void SetMinimumReadThresholdOfZeroThrows() - { - Assert.Throws(() => new StreamPipeReader(Stream, - new StreamPipeReaderAdapterOptions(minimumSegmentSize: 4096, minimumReadThreshold: 0, new TestMemoryPool()))); - } - - [Fact] - public void SetOptionsToNullThrows() - { - Assert.Throws(() => new StreamPipeReader(Stream, null)); - } - - [Fact] - public async Task UseBothStreamAndPipeToReadConfirmSameSize() - { - Write(new byte[8]); - var buffer = new byte[4]; - - Stream.Read(buffer, 0, buffer.Length); - var readResult = await Reader.ReadAsync(); - - Assert.Equal(buffer, readResult.Buffer.ToArray()); - } - - [Fact] - public async Task UseStreamThenPipeToReadNoBytesLost() - { - CreateReader(minimumSegmentSize: 1, minimumReadThreshold: 1); - - var expectedString = WriteString("abcdef"); - var accumulatedResult = ""; - var buffer = new byte[1]; - - for (var i = 0; i < expectedString.Length / 2; i++) - { - // Read from stream then pipe to guarantee no bytes are lost. - accumulatedResult += ReadFromStreamAsString(buffer); - accumulatedResult += await ReadFromPipeAsString(); - } - - Assert.Equal(expectedString, accumulatedResult); - } - - [Fact] - public async Task UsePipeThenStreamToReadNoBytesLost() - { - CreateReader(minimumSegmentSize: 1, minimumReadThreshold: 1); - - var expectedString = WriteString("abcdef"); - var accumulatedResult = ""; - var buffer = new byte[1]; - - for (var i = 0; i < expectedString.Length / 2; i++) - { - // Read from pipe then stream to guarantee no bytes are lost. - accumulatedResult += await ReadFromPipeAsString(); - accumulatedResult += ReadFromStreamAsString(buffer); - } - - Assert.Equal(expectedString, accumulatedResult); - } - - [Fact] - public async Task UseBothStreamAndPipeToReadWithoutAdvance_StreamIgnoresAdvance() - { - var buffer = new byte[1]; - CreateReader(minimumSegmentSize: 1, minimumReadThreshold: 1); - - WriteString("abc"); - ReadFromStreamAsString(buffer); - var readResult = await Reader.ReadAsync(); - - // No Advance - // Next call to Stream.Read will get the next 4 bytes rather than the bytes already read by the pipe - Assert.Equal("c", ReadFromStreamAsString(buffer)); - } - - [Fact] - public async Task ReadAsyncWithNoDataCompletesReader() - { - var readResult = await Reader.ReadAsync(); - - Assert.True(readResult.IsCompleted); - } - - [Fact] - public async Task ReadAsyncWithEmptyDataCompletesStream() - { - WriteByteArray(0); - - var readResult = await Reader.ReadAsync(); - - Assert.True(readResult.IsCompleted); - } - - [Fact] - public async Task ReadAsyncAfterReceivingCompletedReadResultDoesNotThrow() - { - Stream = new ThrowAfterZeroByteReadStream(); - Reader = new StreamPipeReader(Stream); - var readResult = await Reader.ReadAsync(); - - readResult = await Reader.ReadAsync(); - Assert.True(readResult.Buffer.IsEmpty); - Assert.True(readResult.IsCompleted); - } - - [Fact] - public void InnerStreamReturnsStream() - { - Assert.Equal(Stream, ((StreamPipeReader)Reader).InnerStream); - } - - [Fact] - public async Task BufferingDataPastEndOfStreamCanBeReadAgain() - { - var helloBytes = Encoding.ASCII.GetBytes("Hello World"); - Write(helloBytes); - - var readResult = await Reader.ReadAsync(); - var buffer = readResult.Buffer; - Reader.AdvanceTo(buffer.Start, buffer.End); - - // Make sure IsCompleted is true - readResult = await Reader.ReadAsync(); - buffer = readResult.Buffer; - Reader.AdvanceTo(buffer.Start, buffer.End); - Assert.True(readResult.IsCompleted); - - var value = await ReadFromPipeAsString(); - Assert.Equal("Hello World", value); - } - - private async Task ReadFromPipeAsString() - { - var readResult = await Reader.ReadAsync(); - - var result = Encoding.ASCII.GetString(readResult.Buffer.ToArray()); - Reader.AdvanceTo(readResult.Buffer.End); - return result; - } - - private string ReadFromStreamAsString(byte[] buffer) - { - var res = Stream.Read(buffer, 0, buffer.Length); - return Encoding.ASCII.GetString(buffer); - } - - private string WriteString(string expectedString) - { - Write(Encoding.ASCII.GetBytes(expectedString)); - return expectedString; - } - - private void CreateReader(int minimumSegmentSize = 16, int minimumReadThreshold = 4, MemoryPool memoryPool = null) - { - Reader = new StreamPipeReader(Stream, - new StreamPipeReaderAdapterOptions( - minimumSegmentSize, - minimumReadThreshold, - memoryPool ?? new TestMemoryPool())); - } - - private bool IsTaskWithResult(ValueTask task) - { - return task == new ValueTask(task.Result); - } - - private void WriteByteArray(int size) - { - Write(new byte[size]); - } - - private void AppendByteArray(int size) - { - Append(new byte[size]); - } - - private class AsyncStream : MemoryStream - { - private static byte[] bytes = Encoding.ASCII.GetBytes("Hello World"); - public override async Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - await Task.Yield(); - return await base.ReadAsync(buffer, offset, count, cancellationToken); - } - - // Keeping as this code will eventually be ported to corefx -#if NETCOREAPP3_0 - public override async ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default) - { - await Task.Yield(); - return await base.ReadAsync(buffer, cancellationToken); - } -#endif - } - - private class ThrowAfterZeroByteReadStream : MemoryStream - { - private bool _throwOnNextCallToRead; - public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - return ReadAsync(new Memory(buffer, offset, count)).AsTask(); - } - - public override async ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default) - { - if (_throwOnNextCallToRead) - { - throw new Exception(); - } - var bytes = await base.ReadAsync(destination, cancellationToken); - if (bytes == 0) - { - _throwOnNextCallToRead = true; - } - return bytes; - } - } - } -} diff --git a/src/Http/Http/test/StreamPipeTest.cs b/src/Http/Http/test/StreamPipeTest.cs deleted file mode 100644 index 9c9f1f4b06..0000000000 --- a/src/Http/Http/test/StreamPipeTest.cs +++ /dev/null @@ -1,75 +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.Text; - -namespace System.IO.Pipelines.Tests -{ - public abstract class StreamPipeTest : IDisposable - { - protected const int MaximumSizeHigh = 65; - - protected const int MinimumSegmentSize = 4096; - - public Stream Stream { get; set; } - - public PipeWriter Writer { get; set; } - - public PipeReader Reader { get; set; } - - public TestMemoryPool Pool { get; set; } - - protected StreamPipeTest() - { - Pool = new TestMemoryPool(); - Stream = new MemoryStream(); - Writer = new StreamPipeWriter(Stream, MinimumSegmentSize, Pool); - Reader = new StreamPipeReader(Stream, new StreamPipeReaderAdapterOptions(MinimumSegmentSize, minimumReadThreshold: 256, Pool)); - } - - public void Dispose() - { - Writer.Complete(); - Reader.Complete(); - Pool.Dispose(); - } - - public byte[] Read() - { - Writer.FlushAsync().GetAwaiter().GetResult(); - return ReadWithoutFlush(); - } - - public string ReadAsString() - { - Writer.FlushAsync().GetAwaiter().GetResult(); - return Encoding.ASCII.GetString(ReadWithoutFlush()); - } - - public void Write(byte[] data) - { - Stream.Write(data, 0, data.Length); - Stream.Position = 0; - } - - public void WriteWithoutPosition(byte[] data) - { - Stream.Write(data, 0, data.Length); - } - - public void Append(byte[] data) - { - var originalPosition = Stream.Position; - Stream.Write(data, 0, data.Length); - Stream.Position = originalPosition; - } - - public byte[] ReadWithoutFlush() - { - Stream.Position = 0; - var buffer = new byte[Stream.Length]; - var result = Stream.Read(buffer, 0, (int)Stream.Length); - return buffer; - } - } -} diff --git a/src/Http/Http/test/StreamPipeWriterTests.cs b/src/Http/Http/test/StreamPipeWriterTests.cs deleted file mode 100644 index 43c8166e76..0000000000 --- a/src/Http/Http/test/StreamPipeWriterTests.cs +++ /dev/null @@ -1,556 +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.Buffers; -using System.IO; -using System.IO.Pipelines; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using Xunit; - -namespace System.IO.Pipelines.Tests -{ - public class StreamPipeWriterTests : StreamPipeTest - { - [Fact] - public async Task CanWriteAsyncMultipleTimesIntoSameBlock() - { - await Writer.WriteAsync(new byte[] { 1 }); - await Writer.WriteAsync(new byte[] { 2 }); - await Writer.WriteAsync(new byte[] { 3 }); - - Assert.Equal(new byte[] { 1, 2, 3 }, Read()); - } - - [Theory] - [InlineData(100)] - [InlineData(4000)] - public async Task CanAdvanceWithPartialConsumptionOfFirstSegment(int firstWriteLength) - { - Writer = new StreamPipeWriter(Stream, MinimumSegmentSize, new TestMemoryPool(maxBufferSize: 20000)); - await Writer.WriteAsync(Encoding.ASCII.GetBytes("a")); - - var memory = Writer.GetMemory(firstWriteLength); - Writer.Advance(firstWriteLength); - - memory = Writer.GetMemory(); - Writer.Advance(memory.Length); - - await Writer.FlushAsync(); - - Assert.Equal(firstWriteLength + memory.Length + 1, Read().Length); - } - - [Fact] - public async Task WriteCanBeCancelledViaProvidedCancellationToken() - { - var pipeWriter = new StreamPipeWriter(new HangingStream()); - var cts = new CancellationTokenSource(1); - await Assert.ThrowsAsync(async () => await pipeWriter.WriteAsync(Encoding.ASCII.GetBytes("data"), cts.Token)); - } - - [Fact] - public async Task WriteCanBeCanceledViaCancelPendingFlushWhenFlushIsAsync() - { - var pipeWriter = new StreamPipeWriter(new HangingStream()); - FlushResult flushResult = new FlushResult(); - - var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - - var task = Task.Run(async () => - { - try - { - var writingTask = pipeWriter.WriteAsync(Encoding.ASCII.GetBytes("data")); - tcs.SetResult(0); - flushResult = await writingTask; - } - catch (Exception ex) - { - Console.WriteLine(ex.Message); - throw ex; - } - }); - - await tcs.Task; - - pipeWriter.CancelPendingFlush(); - - await task; - - Assert.True(flushResult.IsCanceled); - } - - [Fact] - public void FlushAsyncCompletedAfterPreCancellation() - { - PipeWriter writableBuffer = Writer.WriteEmpty(1); - - Writer.CancelPendingFlush(); - - ValueTask flushAsync = writableBuffer.FlushAsync(); - - Assert.True(flushAsync.IsCompleted); - - FlushResult flushResult = flushAsync.GetAwaiter().GetResult(); - - Assert.True(flushResult.IsCanceled); - - flushAsync = writableBuffer.FlushAsync(); - - Assert.True(flushAsync.IsCompleted); - } - - [Fact] - public async Task FlushAsyncReturnsCanceledIfCanceledBeforeFlush() - { - await CheckCanceledFlush(); - } - - [Fact] - public async Task FlushAsyncReturnsCanceledIfCanceledBeforeFlushMultipleTimes() - { - for (var i = 0; i < 10; i++) - { - await CheckCanceledFlush(); - } - } - - [Fact] - public async Task FlushAsyncReturnsCanceledInterleaved() - { - for (var i = 0; i < 5; i++) - { - await CheckCanceledFlush(); - await CheckWriteIsNotCanceled(); - } - } - - [Fact] - public async Task CancelPendingFlushBetweenWritesAllDataIsPreserved() - { - Stream = new SingleWriteStream(); - Writer = new StreamPipeWriter(Stream); - FlushResult flushResult = new FlushResult(); - - var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - - var task = Task.Run(async () => - { - try - { - await Writer.WriteAsync(Encoding.ASCII.GetBytes("data")); - - var writingTask = Writer.WriteAsync(Encoding.ASCII.GetBytes(" data")); - tcs.SetResult(0); - flushResult = await writingTask; - } - catch (Exception ex) - { - Console.WriteLine(ex.Message); - throw ex; - } - }); - - await tcs.Task; - - Writer.CancelPendingFlush(); - - await task; - - Assert.True(flushResult.IsCanceled); - - await Writer.WriteAsync(Encoding.ASCII.GetBytes(" more data")); - Assert.Equal(Encoding.ASCII.GetBytes("data data more data"), Read()); - } - - [Fact] - public async Task CancelPendingFlushAfterAllWritesAllDataIsPreserved() - { - Stream = new CannotFlushStream(); - Writer = new StreamPipeWriter(Stream); - FlushResult flushResult = new FlushResult(); - - var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - - var task = Task.Run(async () => - { - try - { - // Create two Segments - // First one will succeed to write, other one will hang. - var writingTask = Writer.WriteAsync(Encoding.ASCII.GetBytes("data")); - tcs.SetResult(0); - flushResult = await writingTask; - } - catch (Exception ex) - { - Console.WriteLine(ex.Message); - throw ex; - } - }); - - await tcs.Task; - - Writer.CancelPendingFlush(); - - await task; - - Assert.True(flushResult.IsCanceled); - } - - [Fact] - public async Task CancelPendingFlushLostOfCancellationsNoDataLost() - { - var writeSize = 16; - var singleWriteStream = new SingleWriteStream(); - Stream = singleWriteStream; - Writer = new StreamPipeWriter(Stream, minimumSegmentSize: writeSize); - - for (var i = 0; i < 10; i++) - { - FlushResult flushResult = new FlushResult(); - var expectedData = Encoding.ASCII.GetBytes(new string('a', writeSize)); - - var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - - var task = Task.Run(async () => - { - try - { - // Create two Segments - // First one will succeed to write, other one will hang. - for (var j = 0; j < 2; j++) - { - Writer.Write(expectedData); - } - - var flushTask = Writer.FlushAsync(); - tcs.SetResult(0); - flushResult = await flushTask; - } - catch (Exception ex) - { - Console.WriteLine(ex.Message); - throw ex; - } - }); - - await tcs.Task; - - Writer.CancelPendingFlush(); - - await task; - - Assert.True(flushResult.IsCanceled); - } - - // Only half of the data was written because every other flush failed. - Assert.Equal(16 * 10, ReadWithoutFlush().Length); - - // Start allowing all writes to make read succeed. - singleWriteStream.AllowAllWrites = true; - - Assert.Equal(16 * 10 * 2, Read().Length); - } - - [Fact] - public async Task UseBothStreamAndPipeToWrite() - { - await WriteStringToPipeWriter("a"); - WriteStringToStream("c"); - - Assert.Equal("ac", ReadAsString()); - } - - [Fact] - public async Task UsePipeThenStreamToWriteMultipleTimes() - { - var expectedString = "abcdef"; - for (var i = 0; i < expectedString.Length; i++) - { - if (i % 2 == 0) - { - WriteStringToStream(expectedString[i].ToString()); - } - else - { - await WriteStringToPipeWriter(expectedString[i].ToString()); - } - } - - Assert.Equal(expectedString, ReadAsString()); - } - - [Fact] - public async Task UseStreamThenPipeToWriteMultipleTimes() - { - var expectedString = "abcdef"; - for (var i = 0; i < expectedString.Length; i++) - { - if (i % 2 == 0) - { - await WriteStringToPipeWriter(expectedString[i].ToString()); - } - else - { - WriteStringToStream(expectedString[i].ToString()); - } - } - - Assert.Equal(expectedString, ReadAsString()); - } - - [Fact] - public void CallCompleteWithoutFlush_ThrowsInvalidOperationException() - { - var memory = Writer.GetMemory(); - Writer.Advance(memory.Length); - var ex = Assert.Throws(() => Writer.Complete()); - Assert.Equal(ThrowHelper.CreateInvalidOperationException_DataNotAllFlushed().Message, ex.Message); - } - - [Fact] - public void CallCompleteWithoutFlushAndException_DoesNotThrowInvalidOperationException() - { - var memory = Writer.GetMemory(); - Writer.Advance(memory.Length); - Writer.Complete(new Exception()); - } - - [Fact] - public void GetMemorySameAsTheMaxPoolSizeUsesThePool() - { - var memory = Writer.GetMemory(Pool.MaxBufferSize); - - Assert.Equal(Pool.MaxBufferSize, memory.Length); - Assert.Equal(1, Pool.GetRentCount()); - } - - [Fact] - public void GetMemoryBiggerThanPoolSizeAllocatesUnpooledArray() - { - var memory = Writer.GetMemory(Pool.MaxBufferSize + 1); - - Assert.Equal(Pool.MaxBufferSize + 1, memory.Length); - Assert.Equal(0, Pool.GetRentCount()); - } - - [Fact] - public void CallComplete_GetMemoryThrows() - { - Writer.Complete(); - Assert.Throws(() => Writer.GetMemory()); - } - - [Fact] - public void CallComplete_GetSpanThrows() - { - Writer.Complete(); - Assert.Throws(() => Writer.GetSpan()); - } - - [Fact] - public void DisposeDoesNotThrowIfUnflushedData() - { - var streamPipeWriter = new StreamPipeWriter(new MemoryStream()); - streamPipeWriter.Write(new byte[1]); - - streamPipeWriter.Dispose(); - } - - [Fact] - public void CompleteAfterDisposeDoesNotThrowIfUnflushedData() - { - var streamPipeWriter = new StreamPipeWriter(new MemoryStream()); - streamPipeWriter.Write(new byte[1]); - - streamPipeWriter.Dispose(); - streamPipeWriter.Complete(); - } - - [Fact] - public void CallGetMemoryWithNegativeSizeHint_ThrowsArgException() - { - Assert.Throws(() => Writer.GetMemory(-1)); - } - - [Fact] - public void CallGetSpanWithNegativeSizeHint_ThrowsArgException() - { - Assert.Throws(() => Writer.GetSpan(-1)); - } - - [Fact] - public async Task GetMemorySlicesCorrectly() - { - var expectedString = "abcdef"; - var memory = Writer.GetMemory(); - - Encoding.ASCII.GetBytes("abc").CopyTo(memory); - Writer.Advance(3); - memory = Writer.GetMemory(); - Encoding.ASCII.GetBytes("def").CopyTo(memory); - Writer.Advance(3); - - await Writer.FlushAsync(); - Assert.Equal(expectedString, ReadAsString()); - } - - [Fact] - public async Task GetSpanSlicesCorrectly() - { - var expectedString = "abcdef"; - - void NonAsyncMethod() - { - var span = Writer.GetSpan(); - - Encoding.ASCII.GetBytes("abc").CopyTo(span); - Writer.Advance(3); - span = Writer.GetSpan(); - Encoding.ASCII.GetBytes("def").CopyTo(span); - Writer.Advance(3); - } - - NonAsyncMethod(); - - await Writer.FlushAsync(); - Assert.Equal(expectedString, ReadAsString()); - } - - [Fact] - public void InnerStreamReturnsStream() - { - Assert.Equal(Stream, ((StreamPipeWriter)Writer).InnerStream); - } - - private void WriteStringToStream(string input) - { - var buffer = Encoding.ASCII.GetBytes(input); - Stream.Write(buffer, 0, buffer.Length); - } - - private async Task WriteStringToPipeWriter(string input) - { - await Writer.WriteAsync(Encoding.ASCII.GetBytes(input)); - } - - private async Task CheckWriteIsNotCanceled() - { - var flushResult = await Writer.WriteAsync(Encoding.ASCII.GetBytes("data")); - Assert.False(flushResult.IsCanceled); - } - - private async Task CheckCanceledFlush() - { - PipeWriter writableBuffer = Writer.WriteEmpty(MaximumSizeHigh); - - Writer.CancelPendingFlush(); - - ValueTask flushAsync = writableBuffer.FlushAsync(); - - Assert.True(flushAsync.IsCompleted); - FlushResult flushResult = flushAsync.GetAwaiter().GetResult(); - Assert.True(flushResult.IsCanceled); - await writableBuffer.FlushAsync(); - } - } - - internal class HangingStream : MemoryStream - { - public HangingStream() - { - } - - public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - await Task.Delay(30000, cancellationToken); - } - - public override async Task FlushAsync(CancellationToken cancellationToken) - { - await Task.Delay(30000, cancellationToken); - } - - public override async Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - await Task.Delay(30000, cancellationToken); - return 0; - } - - // Keeping as this code will eventually be ported to corefx -#if NETCOREAPP3_0 - public override async ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default) - { - await Task.Delay(30000, cancellationToken); - return 0; - } -#endif - } - - internal class SingleWriteStream : MemoryStream - { - private bool _shouldNextWriteFail; - - public bool AllowAllWrites { get; set; } - - // Keeping as this code will eventually be ported to corefx -#if NETCOREAPP3_0 - public override async ValueTask WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default) - { - try - { - if (_shouldNextWriteFail && !AllowAllWrites) - { - await Task.Delay(30000, cancellationToken); - } - else - { - await base.WriteAsync(source, cancellationToken); - } - } - finally - { - _shouldNextWriteFail = !_shouldNextWriteFail; - } - } -#endif - - public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - try - { - if (_shouldNextWriteFail && !AllowAllWrites) - { - await Task.Delay(30000, cancellationToken); - } - await base.WriteAsync(buffer, offset, count, cancellationToken); - } - finally - { - _shouldNextWriteFail = !_shouldNextWriteFail; - } - } - } - - internal class CannotFlushStream : MemoryStream - { - public override async Task FlushAsync(CancellationToken cancellationToken) - { - await Task.Delay(30000, cancellationToken); - } - } - - internal static class TestWriterExtensions - { - public static PipeWriter WriteEmpty(this PipeWriter Writer, int count) - { - Writer.GetSpan(count).Slice(0, count).Fill(0); - Writer.Advance(count); - return Writer; - } - } -} diff --git a/src/Http/Http/test/TestMemoryPool.cs b/src/Http/Http/test/TestMemoryPool.cs deleted file mode 100644 index 5276c16ad3..0000000000 --- a/src/Http/Http/test/TestMemoryPool.cs +++ /dev/null @@ -1,206 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System; -using System.Buffers; -using System.Diagnostics; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Threading; - -namespace System.IO.Pipelines.Tests -{ - public class TestMemoryPool : MemoryPool - { - private MemoryPool _pool; - private int _maxBufferSize; - private bool _disposed; - private int _rentCount; - - public TestMemoryPool(int maxBufferSize = 4096) - { - _pool = new CustomMemoryPool(); - _maxBufferSize = maxBufferSize; - } - - public override IMemoryOwner Rent(int minBufferSize = -1) - { - CheckDisposed(); - _rentCount++; - return new PooledMemory(_pool.Rent(minBufferSize), this); - } - - public int GetRentCount() - { - return _rentCount; - } - - protected override void Dispose(bool disposing) - { - _disposed = true; - } - - public override int MaxBufferSize => _maxBufferSize; - - internal void CheckDisposed() - { - if (_disposed) - { - throw new ObjectDisposedException(nameof(TestMemoryPool)); - } - } - - private class PooledMemory : MemoryManager - { - private IMemoryOwner _owner; - - private readonly TestMemoryPool _pool; - - private int _referenceCount; - - private bool _returned; - - private string _leaser; - - public PooledMemory(IMemoryOwner owner, TestMemoryPool pool) - { - _owner = owner; - _pool = pool; - _leaser = Environment.StackTrace; - _referenceCount = 1; - } - - ~PooledMemory() - { - Debug.Assert(_returned, "Block being garbage collected instead of returned to pool" + Environment.NewLine + _leaser); - } - - protected override void Dispose(bool disposing) - { - _pool._rentCount--; - _pool.CheckDisposed(); - } - - public override MemoryHandle Pin(int elementIndex = 0) - { - _pool.CheckDisposed(); - Interlocked.Increment(ref _referenceCount); - - if (!MemoryMarshal.TryGetArray(_owner.Memory, out ArraySegment segment)) - { - throw new InvalidOperationException(); - } - - unsafe - { - try - { - if ((uint)elementIndex > (uint)segment.Count) - { - throw new ArgumentOutOfRangeException(nameof(elementIndex)); - } - - GCHandle handle = GCHandle.Alloc(segment.Array, GCHandleType.Pinned); - - return new MemoryHandle(Unsafe.Add(((void*)handle.AddrOfPinnedObject()), elementIndex + segment.Offset), handle, this); - } - catch - { - Unpin(); - throw; - } - } - } - - public override void Unpin() - { - _pool.CheckDisposed(); - - int newRefCount = Interlocked.Decrement(ref _referenceCount); - - if (newRefCount < 0) - throw new InvalidOperationException(); - - if (newRefCount == 0) - { - _returned = true; - } - } - - protected override bool TryGetArray(out ArraySegment segment) - { - _pool.CheckDisposed(); - return MemoryMarshal.TryGetArray(_owner.Memory, out segment); - } - - public override Memory Memory - { - get - { - _pool.CheckDisposed(); - return _owner.Memory; - } - } - - public override Span GetSpan() - { - _pool.CheckDisposed(); - return _owner.Memory.Span; - } - } - - private class CustomMemoryPool : MemoryPool - { - public override int MaxBufferSize => int.MaxValue; - - public override IMemoryOwner Rent(int minimumBufferSize = -1) - { - if (minimumBufferSize == -1) - { - minimumBufferSize = 4096; - } - - return new ArrayMemoryPoolBuffer(minimumBufferSize); - } - - protected override void Dispose(bool disposing) - { - throw new NotImplementedException(); - } - - private sealed class ArrayMemoryPoolBuffer : IMemoryOwner - { - private T[] _array; - - public ArrayMemoryPoolBuffer(int size) - { - _array = new T[size]; - } - - public Memory Memory - { - get - { - T[] array = _array; - if (array == null) - { - throw new ObjectDisposedException(nameof(array)); - } - - return new Memory(array); - } - } - - public void Dispose() - { - T[] array = _array; - if (array != null) - { - _array = null; - } - } - } - } - } -} diff --git a/src/Http/Http/test/WriteOnlyPipeStreamTests.cs b/src/Http/Http/test/WriteOnlyPipeStreamTests.cs deleted file mode 100644 index 4f4bbc19e3..0000000000 --- a/src/Http/Http/test/WriteOnlyPipeStreamTests.cs +++ /dev/null @@ -1,206 +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.Threading; -using System.Threading.Tasks; -using Moq; -using Xunit; - -namespace System.IO.Pipelines.Tests -{ - public class WriteOnlyPipeStreamTests : PipeStreamTest - { - [Fact] - public void CanSeekFalse() - { - Assert.False(WritingStream.CanSeek); - } - - [Fact] - public void CanReadFalse() - { - Assert.False(WritingStream.CanRead); - } - - [Fact] - public void CanWriteTrue() - { - Assert.True(WritingStream.CanWrite); - } - - [Fact] - public void LengthThrows() - { - Assert.Throws(() => WritingStream.Length); - } - - [Fact] - public void PositionThrows() - { - Assert.Throws(() => WritingStream.Position); - Assert.Throws(() => WritingStream.Position = 1); - } - - [Fact] - public void SeekThrows() - { - Assert.Throws(() => WritingStream.Seek(0, SeekOrigin.Begin)); - } - - [Fact] - public void SetLengthThrows() - { - Assert.Throws(() => WritingStream.SetLength(1)); - } - - [Fact] - public void ReadThrows() - { - Assert.Throws(() => WritingStream.Read(new byte[1], 0, 1)); - } - - [Fact] - public async Task ReadAsyncThrows() - { - await Assert.ThrowsAsync(async () => await WritingStream.ReadAsync(new byte[1], 0, 1)); - } - - [Fact] - public void ReadTimeoutThrows() - { - Assert.Throws(() => WritingStream.ReadTimeout = 1); - Assert.Throws(() => WritingStream.ReadTimeout); - } - - [Fact] - public async Task WriteAsyncWithReadOnlyMemoryWorks() - { - var expected = "Hello World!"; - - await WriteStringToStreamAsync(expected); - - Assert.Equal(expected, await ReadFromPipeAsStringAsync()); - } - - [Fact] - public async Task WriteAsyncWithArrayWorks() - { - var expected = new byte[1]; - - await WritingStream.WriteAsync(expected, 0, expected.Length); - - Assert.Equal(expected, await ReadFromPipeAsByteArrayAsync()); - } - - [Fact] - public async Task BasicLargeWrite() - { - var expected = new byte[8000]; - - await WritingStream.WriteAsync(expected); - - Assert.Equal(expected, await ReadFromPipeAsByteArrayAsync()); - } - - [Fact] - public void FlushAsyncIsCalledFromCallingFlush() - { - var pipeWriter = new Mock(); - var stream = new WriteOnlyPipeStream(pipeWriter.Object); - - stream.Flush(); - - pipeWriter.Verify(m => m.FlushAsync(default)); - } - - [Fact] - public async Task FlushAsyncIsCalledFromCallingFlushAsync() - { - var pipeWriter = new Mock(); - var stream = new WriteOnlyPipeStream(pipeWriter.Object); - - await stream.FlushAsync(); - - pipeWriter.Verify(m => m.FlushAsync(default)); - } - - [Fact] - public async Task FlushAsyncCancellationTokenIsPassedIntoFlushAsync() - { - var pipeWriter = new Mock(); - var stream = new WriteOnlyPipeStream(pipeWriter.Object); - var token = new CancellationToken(); - - await stream.FlushAsync(token); - - pipeWriter.Verify(m => m.FlushAsync(token)); - } - - [Fact] - public void WriteAsyncIsCalledFromCallingWrite() - { - var pipeWriter = new Mock(); - var stream = new WriteOnlyPipeStream(pipeWriter.Object); - - stream.Write(new byte[1]); - - pipeWriter.Verify(m => m.WriteAsync(It.IsAny>(), It.IsAny())); - } - - [Fact] - public async Task WriteAsyncIsCalledFromCallingWriteAsync() - { - var pipeWriter = new Mock(); - var stream = new WriteOnlyPipeStream(pipeWriter.Object); - - await stream.WriteAsync(new byte[1]); - - pipeWriter.Verify(m => m.WriteAsync(It.IsAny>(), It.IsAny())); - } - - [Fact] - public async Task WriteAsyncCancellationTokenIsPassedIntoWriteAsync() - { - var pipeWriter = new Mock(); - var stream = new WriteOnlyPipeStream(pipeWriter.Object); - var token = new CancellationToken(); - - await stream.WriteAsync(new byte[1], token); - - pipeWriter.Verify(m => m.WriteAsync(It.IsAny>(), token)); - } - - [Fact] - public void WriteAsyncIsCalledFromBeginWrite() - { - var pipeWriter = new Mock(); - var stream = new WriteOnlyPipeStream(pipeWriter.Object); - stream.BeginWrite(new byte[1], 0, 1, null, this); - pipeWriter.Verify(m => m.WriteAsync(It.IsAny>(), It.IsAny())); - } - - [Fact] - public async Task BeginAndEndWriteWork() - { - var expected = new byte[1]; - var asyncResult = WritingStream.BeginWrite(expected, 0, 1, null, this); - WritingStream.EndWrite(asyncResult); - Assert.Equal(expected, await ReadFromPipeAsByteArrayAsync()); - } - - [Fact] - public void BlockSyncIOThrows() - { - var writeOnlyPipeStream = new WriteOnlyPipeStream(Writer, allowSynchronousIO: false); - Assert.Throws(() => writeOnlyPipeStream.Write(new byte[0], 0, 0)); - Assert.Throws(() => writeOnlyPipeStream.Flush()); - } - - [Fact] - public void InnerPipeWriterReturnsPipeWriter() - { - var writeOnlyPipeStream = new WriteOnlyPipeStream(Writer, allowSynchronousIO: false); - Assert.Equal(Writer, writeOnlyPipeStream.InnerPipeWriter); - } - } -} diff --git a/src/Http/Http/test/WritingAdaptersInteropTests.cs b/src/Http/Http/test/WritingAdaptersInteropTests.cs deleted file mode 100644 index 44280961b2..0000000000 --- a/src/Http/Http/test/WritingAdaptersInteropTests.cs +++ /dev/null @@ -1,155 +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.Buffers; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using Xunit; - -namespace System.IO.Pipelines.Tests -{ - public class WritingAdaptersInteropTests : PipeStreamTest - { - [Fact] - public async Task CheckBasicWritePipeApi() - { - var pipe = new Pipe(); - var writeOnlyStream = new WriteOnlyPipeStream(pipe.Writer); - var pipeWriter = new StreamPipeWriter(writeOnlyStream); - await pipeWriter.WriteAsync(new byte[10]); - - var res = await pipe.Reader.ReadAsync(); - Assert.Equal(new byte[10], res.Buffer.ToArray()); - } - - [Fact] - public async Task CheckNestedPipeApi() - { - var pipe = new Pipe(); - var writer = pipe.Writer; - for (var i = 0; i < 3; i++) - { - var writeOnlyStream = new WriteOnlyPipeStream(writer); - writer = new StreamPipeWriter(writeOnlyStream); - } - - await writer.WriteAsync(new byte[10]); - - var res = await pipe.Reader.ReadAsync(); - Assert.Equal(new byte[10], res.Buffer.ToArray()); - } - - [Fact] - public async Task CheckBasicWriteStreamApi() - { - var stream = new MemoryStream(); - var pipeWriter = new StreamPipeWriter(stream); - var writeOnlyStream = new WriteOnlyPipeStream(pipeWriter); - - await writeOnlyStream.WriteAsync(new byte[10]); - - stream.Position = 0; - var res = await ReadFromStreamAsByteArrayAsync(10, stream); - Assert.Equal(new byte[10], res); - } - - [Fact] - public async Task CheckNestedStreamApi() - { - var stream = new MemoryStream(); - Stream writeOnlyStream = stream; - for (var i = 0; i < 3; i++) - { - var pipeWriter = new StreamPipeWriter(writeOnlyStream); - writeOnlyStream = new WriteOnlyPipeStream(pipeWriter); - } - - await writeOnlyStream.WriteAsync(new byte[10]); - - stream.Position = 0; - var res = await ReadFromStreamAsByteArrayAsync(10, stream); - Assert.Equal(new byte[10], res); - } - - [Fact] - public async Task WritesCanBeCanceledViaProvidedCancellationToken() - { - var writeOnlyStream = new WriteOnlyPipeStream(new HangingPipeWriter()); - var pipeWriter = new StreamPipeWriter(writeOnlyStream); - var cts = new CancellationTokenSource(1); - await Assert.ThrowsAsync(async () => await pipeWriter.WriteAsync(new byte[1], cts.Token)); - } - - [Fact] - public async Task WriteCanBeCanceledViaCancelPendingFlushWhenFlushIsAsync() - { - var writeOnlyStream = new WriteOnlyPipeStream(new HangingPipeWriter()); - var pipeWriter = new StreamPipeWriter(writeOnlyStream); - - FlushResult flushResult = new FlushResult(); - var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - - var task = Task.Run(async () => - { - try - { - var writingTask = pipeWriter.WriteAsync(new byte[1]); - tcs.SetResult(0); - flushResult = await writingTask; - } - catch (Exception ex) - { - Console.WriteLine(ex.Message); - throw ex; - } - }); - - await tcs.Task; - - pipeWriter.CancelPendingFlush(); - - await task; - - Assert.True(flushResult.IsCanceled); - } - - private class HangingPipeWriter : PipeWriter - { - public override void Advance(int bytes) - { - } - - public override void CancelPendingFlush() - { - throw new NotImplementedException(); - } - - public override void Complete(Exception exception = null) - { - throw new NotImplementedException(); - } - - public override async ValueTask FlushAsync(CancellationToken cancellationToken = default) - { - await Task.Delay(30000, cancellationToken); - return new FlushResult(); - } - - public override Memory GetMemory(int sizeHint = 0) - { - return new Memory(new byte[4096]); - } - - public override Span GetSpan(int sizeHint = 0) - { - return new Span(new byte[4096]); - } - - public override void OnReaderCompleted(Action callback, object state) - { - throw new NotImplementedException(); - } - } - } -} diff --git a/src/Http/HttpAbstractions.sln b/src/Http/HttpAbstractions.sln index 0bf3b98843..10cac06923 100644 --- a/src/Http/HttpAbstractions.sln +++ b/src/Http/HttpAbstractions.sln @@ -95,8 +95,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Static EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Core", "..\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj", "{83E82469-8225-47AD-9D0F-DFA078D7F930}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions", "..\Servers\Kestrel\Transport.Abstractions\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj", "{58694FAB-BAB7-40F7-9973-C9104F1D376E}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "..\Hosting\Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{94283D65-3BE9-403C-BF34-CFFA3AF89101}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Connections.Abstractions", "..\Servers\Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj", "{AC5D4AF2-F2F8-4A46-8A57-9858806C9A55}" @@ -509,18 +507,6 @@ Global {83E82469-8225-47AD-9D0F-DFA078D7F930}.Release|x64.Build.0 = Release|Any CPU {83E82469-8225-47AD-9D0F-DFA078D7F930}.Release|x86.ActiveCfg = Release|Any CPU {83E82469-8225-47AD-9D0F-DFA078D7F930}.Release|x86.Build.0 = Release|Any CPU - {58694FAB-BAB7-40F7-9973-C9104F1D376E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58694FAB-BAB7-40F7-9973-C9104F1D376E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58694FAB-BAB7-40F7-9973-C9104F1D376E}.Debug|x64.ActiveCfg = Debug|Any CPU - {58694FAB-BAB7-40F7-9973-C9104F1D376E}.Debug|x64.Build.0 = Debug|Any CPU - {58694FAB-BAB7-40F7-9973-C9104F1D376E}.Debug|x86.ActiveCfg = Debug|Any CPU - {58694FAB-BAB7-40F7-9973-C9104F1D376E}.Debug|x86.Build.0 = Debug|Any CPU - {58694FAB-BAB7-40F7-9973-C9104F1D376E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58694FAB-BAB7-40F7-9973-C9104F1D376E}.Release|Any CPU.Build.0 = Release|Any CPU - {58694FAB-BAB7-40F7-9973-C9104F1D376E}.Release|x64.ActiveCfg = Release|Any CPU - {58694FAB-BAB7-40F7-9973-C9104F1D376E}.Release|x64.Build.0 = Release|Any CPU - {58694FAB-BAB7-40F7-9973-C9104F1D376E}.Release|x86.ActiveCfg = Release|Any CPU - {58694FAB-BAB7-40F7-9973-C9104F1D376E}.Release|x86.Build.0 = Release|Any CPU {94283D65-3BE9-403C-BF34-CFFA3AF89101}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {94283D65-3BE9-403C-BF34-CFFA3AF89101}.Debug|Any CPU.Build.0 = Debug|Any CPU {94283D65-3BE9-403C-BF34-CFFA3AF89101}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -656,7 +642,6 @@ Global {716CC743-D9FA-4EF6-8767-152A8E70C52A} = {793FFE24-138A-4C3D-81AB-18D625E36230} {A0C7AE95-BBE7-4F75-9508-F5881C8A456D} = {793FFE24-138A-4C3D-81AB-18D625E36230} {83E82469-8225-47AD-9D0F-DFA078D7F930} = {793FFE24-138A-4C3D-81AB-18D625E36230} - {58694FAB-BAB7-40F7-9973-C9104F1D376E} = {793FFE24-138A-4C3D-81AB-18D625E36230} {94283D65-3BE9-403C-BF34-CFFA3AF89101} = {793FFE24-138A-4C3D-81AB-18D625E36230} {AC5D4AF2-F2F8-4A46-8A57-9858806C9A55} = {793FFE24-138A-4C3D-81AB-18D625E36230} {1FC00795-5157-47CC-A975-31C8E79C3E37} = {793FFE24-138A-4C3D-81AB-18D625E36230} diff --git a/src/Http/Metadata/src/Microsoft.AspNetCore.Metadata.csproj b/src/Http/Metadata/src/Microsoft.AspNetCore.Metadata.csproj index 4c2b8fed22..10a3baad25 100644 --- a/src/Http/Metadata/src/Microsoft.AspNetCore.Metadata.csproj +++ b/src/Http/Metadata/src/Microsoft.AspNetCore.Metadata.csproj @@ -4,6 +4,7 @@ ASP.NET Core metadata. netstandard2.0 true + true $(NoWarn);CS1591 true aspnetcore diff --git a/src/Http/Routing/src/EndpointMiddleware.cs b/src/Http/Routing/src/EndpointMiddleware.cs index 97e56a04e7..a2101c40cd 100644 --- a/src/Http/Routing/src/EndpointMiddleware.cs +++ b/src/Http/Routing/src/EndpointMiddleware.cs @@ -33,25 +33,22 @@ namespace Microsoft.AspNetCore.Routing public Task Invoke(HttpContext httpContext) { - var endpoint = httpContext.Features.Get()?.Endpoint; + var endpoint = httpContext.GetEndpoint(); if (endpoint?.RequestDelegate != null) { - if (_routeOptions.SuppressCheckForUnhandledSecurityMetadata) + if (!_routeOptions.SuppressCheckForUnhandledSecurityMetadata) { - // User opted out of this check. - return Task.CompletedTask; - } + if (endpoint.Metadata.GetMetadata() != null && + !httpContext.Items.ContainsKey(AuthorizationMiddlewareInvokedKey)) + { + ThrowMissingAuthMiddlewareException(endpoint); + } - if (endpoint.Metadata.GetMetadata() != null && - !httpContext.Items.ContainsKey(AuthorizationMiddlewareInvokedKey)) - { - ThrowMissingAuthMiddlewareException(endpoint); - } - - if (endpoint.Metadata.GetMetadata() != null && - !httpContext.Items.ContainsKey(CorsMiddlewareInvokedKey)) - { - ThrowMissingCorsMiddlewareException(endpoint); + if (endpoint.Metadata.GetMetadata() != null && + !httpContext.Items.ContainsKey(CorsMiddlewareInvokedKey)) + { + ThrowMissingCorsMiddlewareException(endpoint); + } } Log.ExecutingEndpoint(_logger, endpoint); diff --git a/src/Http/Routing/test/UnitTests/EndpointMiddlewareTest.cs b/src/Http/Routing/test/UnitTests/EndpointMiddlewareTest.cs index dc7dc3d87c..1467425222 100644 --- a/src/Http/Routing/test/UnitTests/EndpointMiddlewareTest.cs +++ b/src/Http/Routing/test/UnitTests/EndpointMiddlewareTest.cs @@ -25,8 +25,10 @@ namespace Microsoft.AspNetCore.Routing var httpContext = new DefaultHttpContext(); httpContext.RequestServices = new ServiceProvider(); + var calledNext = false; RequestDelegate next = (c) => { + calledNext = true; return Task.CompletedTask; }; @@ -35,7 +37,8 @@ namespace Microsoft.AspNetCore.Routing // Act await middleware.Invoke(httpContext); - // Assert - does not throw + // Assert + Assert.True(calledNext); } [Fact] @@ -46,37 +49,10 @@ namespace Microsoft.AspNetCore.Routing httpContext.RequestServices = new ServiceProvider(); httpContext.SetEndpoint(null); + var calledNext = false; RequestDelegate next = (c) => { - return Task.CompletedTask; - }; - - var middleware = new EndpointMiddleware(NullLogger.Instance, next, RouteOptions); - - // Act - await middleware.Invoke(httpContext); - - // Assert - does not throw - } - - [Fact] - public async Task Invoke_WithEndpoint_InvokesDelegate() - { - // Arrange - var httpContext = new DefaultHttpContext(); - httpContext.RequestServices = new ServiceProvider(); - - var invoked = false; - RequestDelegate endpointFunc = (c) => - { - invoked = true; - return Task.CompletedTask; - }; - - httpContext.SetEndpoint(new Endpoint(endpointFunc, EndpointMetadataCollection.Empty, "Test")); - - RequestDelegate next = (c) => - { + calledNext = true; return Task.CompletedTask; }; @@ -86,7 +62,37 @@ namespace Microsoft.AspNetCore.Routing await middleware.Invoke(httpContext); // Assert - Assert.True(invoked); + Assert.True(calledNext); + } + + [Fact] + public async Task Invoke_WithEndpoint_InvokesDelegate() + { + // Arrange + var httpContext = new DefaultHttpContext(); + httpContext.RequestServices = new ServiceProvider(); + + var calledEndpoint = false; + RequestDelegate endpointFunc = (c) => + { + calledEndpoint = true; + return Task.CompletedTask; + }; + + httpContext.SetEndpoint(new Endpoint(endpointFunc, EndpointMetadataCollection.Empty, "Test")); + + RequestDelegate next = (c) => + { + throw new InvalidTimeZoneException("Should not be called"); + }; + + var middleware = new EndpointMiddleware(NullLogger.Instance, next, RouteOptions); + + // Act + await middleware.Invoke(httpContext); + + // Assert + Assert.True(calledEndpoint); } [Fact] @@ -101,9 +107,14 @@ namespace Microsoft.AspNetCore.Routing RequestServices = new ServiceProvider() }; - httpContext.SetEndpoint(new Endpoint(_ => Task.CompletedTask, new EndpointMetadataCollection(Mock.Of()), "Test")); + RequestDelegate throwIfCalled = (c) => + { + throw new InvalidTimeZoneException("Should not be called"); + }; - var middleware = new EndpointMiddleware(NullLogger.Instance, _ => Task.CompletedTask, RouteOptions); + httpContext.SetEndpoint(new Endpoint(throwIfCalled, new EndpointMetadataCollection(Mock.Of()), "Test")); + + var middleware = new EndpointMiddleware(NullLogger.Instance, throwIfCalled, RouteOptions); // Act & Assert var ex = await Assert.ThrowsAsync(() => middleware.Invoke(httpContext)); @@ -121,16 +132,29 @@ namespace Microsoft.AspNetCore.Routing RequestServices = new ServiceProvider() }; - httpContext.SetEndpoint(new Endpoint(_ => Task.CompletedTask, new EndpointMetadataCollection(Mock.Of()), "Test")); + var calledEndpoint = false; + RequestDelegate endpointFunc = (c) => + { + calledEndpoint = true; + return Task.CompletedTask; + }; + + httpContext.SetEndpoint(new Endpoint(endpointFunc, new EndpointMetadataCollection(Mock.Of()), "Test")); httpContext.Items[EndpointMiddleware.AuthorizationMiddlewareInvokedKey] = true; - var middleware = new EndpointMiddleware(NullLogger.Instance, _ => Task.CompletedTask, RouteOptions); + RequestDelegate next = (c) => + { + throw new InvalidTimeZoneException("Should not be called"); + }; - // Act & Assert + var middleware = new EndpointMiddleware(NullLogger.Instance, next, RouteOptions); + + // Act await middleware.Invoke(httpContext); - // If we got this far, we can sound the everything's OK alarm. + // Assert + Assert.True(calledEndpoint); } [Fact] @@ -142,13 +166,29 @@ namespace Microsoft.AspNetCore.Routing RequestServices = new ServiceProvider() }; - httpContext.SetEndpoint(new Endpoint(_ => Task.CompletedTask, new EndpointMetadataCollection(Mock.Of()), "Test")); + var calledEndpoint = false; + RequestDelegate endpointFunc = (c) => + { + calledEndpoint = true; + return Task.CompletedTask; + }; + + httpContext.SetEndpoint(new Endpoint(endpointFunc, new EndpointMetadataCollection(Mock.Of()), "Test")); var routeOptions = Options.Create(new RouteOptions { SuppressCheckForUnhandledSecurityMetadata = true }); - var middleware = new EndpointMiddleware(NullLogger.Instance, _ => Task.CompletedTask, routeOptions); - // Act & Assert + RequestDelegate next = (c) => + { + throw new InvalidTimeZoneException("Should not be called"); + }; + + var middleware = new EndpointMiddleware(NullLogger.Instance, next, routeOptions); + + // Act await middleware.Invoke(httpContext); + + // Assert + Assert.True(calledEndpoint); } [Fact] @@ -163,9 +203,14 @@ namespace Microsoft.AspNetCore.Routing RequestServices = new ServiceProvider() }; - httpContext.SetEndpoint(new Endpoint(_ => Task.CompletedTask, new EndpointMetadataCollection(Mock.Of()), "Test")); + RequestDelegate throwIfCalled = (c) => + { + throw new InvalidTimeZoneException("Should not be called"); + }; - var middleware = new EndpointMiddleware(NullLogger.Instance, _ => Task.CompletedTask, RouteOptions); + httpContext.SetEndpoint(new Endpoint(throwIfCalled, new EndpointMetadataCollection(Mock.Of()), "Test")); + + var middleware = new EndpointMiddleware(NullLogger.Instance, throwIfCalled, RouteOptions); // Act & Assert var ex = await Assert.ThrowsAsync(() => middleware.Invoke(httpContext)); @@ -183,16 +228,29 @@ namespace Microsoft.AspNetCore.Routing RequestServices = new ServiceProvider() }; - httpContext.SetEndpoint(new Endpoint(_ => Task.CompletedTask, new EndpointMetadataCollection(Mock.Of()), "Test")); + var calledEndpoint = false; + RequestDelegate endpointFunc = (c) => + { + calledEndpoint = true; + return Task.CompletedTask; + }; + + httpContext.SetEndpoint(new Endpoint(endpointFunc, new EndpointMetadataCollection(Mock.Of()), "Test")); httpContext.Items[EndpointMiddleware.CorsMiddlewareInvokedKey] = true; - var middleware = new EndpointMiddleware(NullLogger.Instance, _ => Task.CompletedTask, RouteOptions); + RequestDelegate next = (c) => + { + throw new InvalidTimeZoneException("Should not be called"); + }; - // Act & Assert + var middleware = new EndpointMiddleware(NullLogger.Instance, next, RouteOptions); + + // Act await middleware.Invoke(httpContext); - // If we got this far, we can sound the everything's OK alarm. + // Assert + Assert.True(calledEndpoint); } [Fact] @@ -204,13 +262,29 @@ namespace Microsoft.AspNetCore.Routing RequestServices = new ServiceProvider() }; - httpContext.SetEndpoint(new Endpoint(_ => Task.CompletedTask, new EndpointMetadataCollection(Mock.Of()), "Test")); + var calledEndpoint = false; + RequestDelegate endpointFunc = (c) => + { + calledEndpoint = true; + return Task.CompletedTask; + }; + + httpContext.SetEndpoint(new Endpoint(endpointFunc, new EndpointMetadataCollection(Mock.Of()), "Test")); var routeOptions = Options.Create(new RouteOptions { SuppressCheckForUnhandledSecurityMetadata = true }); - var middleware = new EndpointMiddleware(NullLogger.Instance, _ => Task.CompletedTask, routeOptions); - // Act & Assert + RequestDelegate next = (c) => + { + throw new InvalidTimeZoneException("Should not be called"); + }; + + var middleware = new EndpointMiddleware(NullLogger.Instance, next, routeOptions); + + // Act await middleware.Invoke(httpContext); + + // Assert + Assert.True(calledEndpoint); } private class ServiceProvider : IServiceProvider diff --git a/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.netcoreapp3.0.cs b/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.netcoreapp3.0.cs index 2efe1f5634..a08fa9b444 100644 --- a/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.netcoreapp3.0.cs +++ b/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.netcoreapp3.0.cs @@ -148,12 +148,14 @@ namespace Microsoft.AspNetCore.Identity [System.Diagnostics.DebuggerStepThroughAttribute] public virtual System.Threading.Tasks.Task RememberTwoFactorClientAsync(TUser user) { throw null; } protected virtual System.Threading.Tasks.Task ResetLockout(TUser user) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] public virtual System.Threading.Tasks.Task SignInAsync(TUser user, Microsoft.AspNetCore.Authentication.AuthenticationProperties authenticationProperties, string authenticationMethod = null) { throw null; } public virtual System.Threading.Tasks.Task SignInAsync(TUser user, bool isPersistent, string authenticationMethod = null) { throw null; } [System.Diagnostics.DebuggerStepThroughAttribute] protected virtual System.Threading.Tasks.Task SignInOrTwoFactorAsync(TUser user, bool isPersistent, string loginProvider = null, bool bypassTwoFactor = false) { throw null; } [System.Diagnostics.DebuggerStepThroughAttribute] + public virtual System.Threading.Tasks.Task SignInWithClaimsAsync(TUser user, Microsoft.AspNetCore.Authentication.AuthenticationProperties authenticationProperties, System.Collections.Generic.IEnumerable additionalClaims) { throw null; } + public virtual System.Threading.Tasks.Task SignInWithClaimsAsync(TUser user, bool isPersistent, System.Collections.Generic.IEnumerable additionalClaims) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] public virtual System.Threading.Tasks.Task SignOutAsync() { throw null; } [System.Diagnostics.DebuggerStepThroughAttribute] public virtual System.Threading.Tasks.Task TwoFactorAuthenticatorSignInAsync(string code, bool isPersistent, bool rememberClient) { throw null; } diff --git a/src/Identity/Core/src/SignInManager.cs b/src/Identity/Core/src/SignInManager.cs index 1fa03c3d8a..3435099abc 100644 --- a/src/Identity/Core/src/SignInManager.cs +++ b/src/Identity/Core/src/SignInManager.cs @@ -169,8 +169,19 @@ namespace Microsoft.AspNetCore.Identity public virtual async Task RefreshSignInAsync(TUser user) { var auth = await Context.AuthenticateAsync(IdentityConstants.ApplicationScheme); - var authenticationMethod = auth?.Principal?.FindFirstValue(ClaimTypes.AuthenticationMethod); - await SignInAsync(user, auth?.Properties, authenticationMethod); + var claims = new List(); + var authenticationMethod = auth?.Principal?.FindFirst(ClaimTypes.AuthenticationMethod); + if (authenticationMethod != null) + { + claims.Add(authenticationMethod); + } + var amr = auth?.Principal?.FindFirst("amr"); + if (amr != null) + { + claims.Add(amr); + } + + await SignInWithClaimsAsync(user, auth?.Properties, claims); } /// @@ -181,9 +192,7 @@ namespace Microsoft.AspNetCore.Identity /// Name of the method used to authenticate the user. /// The task object representing the asynchronous operation. public virtual Task SignInAsync(TUser user, bool isPersistent, string authenticationMethod = null) - { - return SignInAsync(user, new AuthenticationProperties { IsPersistent = isPersistent }, authenticationMethod); - } + => SignInAsync(user, new AuthenticationProperties { IsPersistent = isPersistent }, authenticationMethod); /// /// Signs in the specified . @@ -192,13 +201,39 @@ namespace Microsoft.AspNetCore.Identity /// Properties applied to the login and authentication cookie. /// Name of the method used to authenticate the user. /// The task object representing the asynchronous operation. - public virtual async Task SignInAsync(TUser user, AuthenticationProperties authenticationProperties, string authenticationMethod = null) + public virtual Task SignInAsync(TUser user, AuthenticationProperties authenticationProperties, string authenticationMethod = null) { - var userPrincipal = await CreateUserPrincipalAsync(user); - // Review: should we guard against CreateUserPrincipal returning null? + var additionalClaims = new List(); if (authenticationMethod != null) { - userPrincipal.Identities.First().AddClaim(new Claim(ClaimTypes.AuthenticationMethod, authenticationMethod)); + additionalClaims.Add(new Claim(ClaimTypes.AuthenticationMethod, authenticationMethod)); + } + return SignInWithClaimsAsync(user, authenticationProperties, additionalClaims); + } + + /// + /// Signs in the specified . + /// + /// The user to sign-in. + /// Flag indicating whether the sign-in cookie should persist after the browser is closed. + /// Additional claims that will be stored in the cookie. + /// The task object representing the asynchronous operation. + public virtual Task SignInWithClaimsAsync(TUser user, bool isPersistent, IEnumerable additionalClaims) + => SignInWithClaimsAsync(user, new AuthenticationProperties { IsPersistent = isPersistent }, additionalClaims); + + /// + /// Signs in the specified . + /// + /// The user to sign-in. + /// Properties applied to the login and authentication cookie. + /// Additional claims that will be stored in the cookie. + /// The task object representing the asynchronous operation. + public virtual async Task SignInWithClaimsAsync(TUser user, AuthenticationProperties authenticationProperties, IEnumerable additionalClaims) + { + var userPrincipal = await CreateUserPrincipalAsync(user); + foreach (var claim in additionalClaims) + { + userPrincipal.Identities.First().AddClaim(claim); } await Context.SignInAsync(IdentityConstants.ApplicationScheme, userPrincipal, @@ -438,9 +473,13 @@ namespace Microsoft.AspNetCore.Identity // When token is verified correctly, clear the access failed count used for lockout await ResetLockout(user); + var claims = new List(); + claims.Add(new Claim("amr", "mfa")); + // Cleanup external cookie if (twoFactorInfo.LoginProvider != null) { + claims.Add(new Claim(ClaimTypes.AuthenticationMethod, twoFactorInfo.LoginProvider)); await Context.SignOutAsync(IdentityConstants.ExternalScheme); } // Cleanup two factor user id cookie @@ -449,7 +488,7 @@ namespace Microsoft.AspNetCore.Identity { await RememberTwoFactorClientAsync(user); } - await SignInAsync(user, isPersistent, twoFactorInfo.LoginProvider); + await SignInWithClaimsAsync(user, isPersistent, claims); } /// @@ -760,7 +799,14 @@ namespace Microsoft.AspNetCore.Identity { await Context.SignOutAsync(IdentityConstants.ExternalScheme); } - await SignInAsync(user, isPersistent, loginProvider); + if (loginProvider == null) + { + await SignInWithClaimsAsync(user, isPersistent, new Claim[] { new Claim("amr", "pwd") }); + } + else + { + await SignInAsync(user, isPersistent, loginProvider); + } return SignInResult.Success; } diff --git a/src/Identity/EntityFrameworkCore/ref/Microsoft.AspNetCore.Identity.EntityFrameworkCore.netcoreapp3.0.cs b/src/Identity/EntityFrameworkCore/ref/Microsoft.AspNetCore.Identity.EntityFrameworkCore.netcoreapp3.0.cs index 4b173fa883..17b2093144 100644 --- a/src/Identity/EntityFrameworkCore/ref/Microsoft.AspNetCore.Identity.EntityFrameworkCore.netcoreapp3.0.cs +++ b/src/Identity/EntityFrameworkCore/ref/Microsoft.AspNetCore.Identity.EntityFrameworkCore.netcoreapp3.0.cs @@ -22,9 +22,9 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore { protected IdentityDbContext() { } public IdentityDbContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { } - public Microsoft.EntityFrameworkCore.DbSet RoleClaims { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.EntityFrameworkCore.DbSet Roles { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.EntityFrameworkCore.DbSet UserRoles { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public virtual Microsoft.EntityFrameworkCore.DbSet RoleClaims { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public virtual Microsoft.EntityFrameworkCore.DbSet Roles { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public virtual Microsoft.EntityFrameworkCore.DbSet UserRoles { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } protected override void OnModelCreating(Microsoft.EntityFrameworkCore.ModelBuilder builder) { } } public partial class IdentityUserContext : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext where TUser : Microsoft.AspNetCore.Identity.IdentityUser @@ -41,10 +41,10 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore { protected IdentityUserContext() { } public IdentityUserContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { } - public Microsoft.EntityFrameworkCore.DbSet UserClaims { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.EntityFrameworkCore.DbSet UserLogins { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.EntityFrameworkCore.DbSet Users { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.EntityFrameworkCore.DbSet UserTokens { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public virtual Microsoft.EntityFrameworkCore.DbSet UserClaims { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public virtual Microsoft.EntityFrameworkCore.DbSet UserLogins { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public virtual Microsoft.EntityFrameworkCore.DbSet Users { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public virtual Microsoft.EntityFrameworkCore.DbSet UserTokens { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } protected override void OnModelCreating(Microsoft.EntityFrameworkCore.ModelBuilder builder) { } } public partial class RoleStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.RoleStore where TRole : Microsoft.AspNetCore.Identity.IdentityRole diff --git a/src/Identity/EntityFrameworkCore/src/IdentityDbContext.cs b/src/Identity/EntityFrameworkCore/src/IdentityDbContext.cs index 6bd4325a34..e34ad4ee4c 100644 --- a/src/Identity/EntityFrameworkCore/src/IdentityDbContext.cs +++ b/src/Identity/EntityFrameworkCore/src/IdentityDbContext.cs @@ -99,17 +99,17 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore /// /// Gets or sets the of User roles. /// - public DbSet UserRoles { get; set; } + public virtual DbSet UserRoles { get; set; } /// /// Gets or sets the of roles. /// - public DbSet Roles { get; set; } + public virtual DbSet Roles { get; set; } /// /// Gets or sets the of role claims. /// - public DbSet RoleClaims { get; set; } + public virtual DbSet RoleClaims { get; set; } /// /// Configures the schema needed for the identity framework. @@ -152,4 +152,4 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore }); } } -} \ No newline at end of file +} diff --git a/src/Identity/EntityFrameworkCore/src/IdentityUserContext.cs b/src/Identity/EntityFrameworkCore/src/IdentityUserContext.cs index 73d7664a05..cdf0fab621 100644 --- a/src/Identity/EntityFrameworkCore/src/IdentityUserContext.cs +++ b/src/Identity/EntityFrameworkCore/src/IdentityUserContext.cs @@ -79,22 +79,22 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore /// /// Gets or sets the of Users. /// - public DbSet Users { get; set; } + public virtual DbSet Users { get; set; } /// /// Gets or sets the of User claims. /// - public DbSet UserClaims { get; set; } + public virtual DbSet UserClaims { get; set; } /// /// Gets or sets the of User logins. /// - public DbSet UserLogins { get; set; } + public virtual DbSet UserLogins { get; set; } /// /// Gets or sets the of User tokens. /// - public DbSet UserTokens { get; set; } + public virtual DbSet UserTokens { get; set; } private StoreOptions GetStoreOptions() => this.GetService() .Extensions.OfType() @@ -201,4 +201,4 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore }); } } -} \ No newline at end of file +} diff --git a/src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs b/src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs index 9358ee3fce..c66b73f267 100644 --- a/src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs +++ b/src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs @@ -250,6 +250,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore { cancellationToken.ThrowIfCancellationRequested(); ThrowIfDisposed(); + return Users.FirstOrDefaultAsync(u => u.NormalizedUserName == normalizedUserName, cancellationToken); } @@ -311,7 +312,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore throw new ArgumentNullException(nameof(user)); } - return await UserClaims.Where(uc => uc.UserId.Equals(user.Id)).Select(c => c.ToClaim()).ToListAsync(cancellationToken); + // TODO: Fix once EF query works Issue #10668 + return (await UserClaims.Where(uc => uc.UserId.Equals(user.Id)).ToListAsync(cancellationToken)).Select(c => c.ToClaim()).ToList(); } /// @@ -502,7 +504,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore { cancellationToken.ThrowIfCancellationRequested(); ThrowIfDisposed(); - return Users.SingleOrDefaultAsync(u => u.NormalizedEmail == normalizedEmail, cancellationToken); + // TODO: Fix once EF query works Issue #10668 + return Task.FromResult(Users.Where(u => u.NormalizedEmail == normalizedEmail).ToList().SingleOrDefault()); } /// diff --git a/src/Identity/EntityFrameworkCore/src/UserStore.cs b/src/Identity/EntityFrameworkCore/src/UserStore.cs index 28ae320a56..1038297db6 100644 --- a/src/Identity/EntityFrameworkCore/src/UserStore.cs +++ b/src/Identity/EntityFrameworkCore/src/UserStore.cs @@ -251,6 +251,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore { cancellationToken.ThrowIfCancellationRequested(); ThrowIfDisposed(); + return Users.FirstOrDefaultAsync(u => u.NormalizedUserName == normalizedUserName, cancellationToken); } @@ -444,7 +445,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore throw new ArgumentNullException(nameof(user)); } - return await UserClaims.Where(uc => uc.UserId.Equals(user.Id)).Select(c => c.ToClaim()).ToListAsync(cancellationToken); + // TODO: Fix once EF query works Issue #10668 + return (await UserClaims.Where(uc => uc.UserId.Equals(user.Id)).ToListAsync(cancellationToken)).Select(c => c.ToClaim()).ToList(); } /// @@ -635,7 +637,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore { cancellationToken.ThrowIfCancellationRequested(); ThrowIfDisposed(); - return Users.SingleOrDefaultAsync(u => u.NormalizedEmail == normalizedEmail, cancellationToken); + // TODO: Fix once EF query works Issue #10668 + return Task.FromResult(Users.Where(u => u.NormalizedEmail == normalizedEmail).ToList().SingleOrDefault()); } /// diff --git a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryContext.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryContext.cs index 3f8cfe61d3..04d58d31bf 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryContext.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryContext.cs @@ -2,6 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Data.Common; +using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test @@ -9,21 +11,36 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test public class InMemoryContext : InMemoryContext { - public InMemoryContext(DbContextOptions options) : base(options) + private InMemoryContext(DbConnection connection) : base(connection) { } + + public new static InMemoryContext Create(DbConnection connection) + => Initialize(new InMemoryContext(connection)); + + public static TContext Initialize(TContext context) where TContext : DbContext + { + context.Database.EnsureCreated(); + + return context; + } } public class InMemoryContext : IdentityUserContext where TUser : IdentityUser { - public InMemoryContext(DbContextOptions options) : base(options) - { } + private readonly DbConnection _connection; + + private InMemoryContext(DbConnection connection) + { + _connection = connection; + } + + public static InMemoryContext Create(DbConnection connection) + => InMemoryContext.Initialize(new InMemoryContext(connection)); protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) - { - optionsBuilder.UseInMemoryDatabase("ScratchUsers"); - } + => optionsBuilder.UseSqlite(_connection); } public class InMemoryContext : IdentityDbContext @@ -31,16 +48,22 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test where TRole : IdentityRole where TKey : IEquatable { - public InMemoryContext(DbContextOptions options) : base(options) - { } + private readonly DbConnection _connection; + + protected InMemoryContext(DbConnection connection) + { + _connection = connection; + } + + public static InMemoryContext Create(DbConnection connection) + => InMemoryContext.Initialize(new InMemoryContext(connection)); protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) - { - optionsBuilder.UseInMemoryDatabase("Scratch"); - } + => optionsBuilder.UseSqlite(_connection); } - public abstract class InMemoryContext : IdentityDbContext + public abstract class InMemoryContext : + IdentityDbContext where TUser : IdentityUser where TRole : IdentityRole where TKey : IEquatable @@ -50,9 +73,9 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test where TRoleClaim : IdentityRoleClaim where TUserToken : IdentityUserToken { - public InMemoryContext(DbContextOptions options) : base(options) { } - - protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) - => optionsBuilder.UseInMemoryDatabase("Scratch"); + protected InMemoryContext(DbContextOptions options) + : base(options) + { + } } -} \ No newline at end of file +} diff --git a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryDatabaseFixture.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryDatabaseFixture.cs new file mode 100644 index 0000000000..fff7eaa889 --- /dev/null +++ b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryDatabaseFixture.cs @@ -0,0 +1,26 @@ +// 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 Microsoft.Data.Sqlite; + +namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test +{ + public class InMemoryDatabaseFixture : IDisposable + { + private readonly SqliteConnection _connection = new SqliteConnection($"DataSource=:memory:"); + + public InMemoryDatabaseFixture() + { + _connection.Open(); + } + + public SqliteConnection Connection => _connection; + + public void Dispose() + { + _connection.Close(); + _connection.Dispose(); + } + } +} diff --git a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryEFOnlyUsersTest.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryEFOnlyUsersTest.cs index b0366d0c88..e2a074f92b 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryEFOnlyUsersTest.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryEFOnlyUsersTest.cs @@ -6,13 +6,23 @@ using System.Linq.Expressions; using Microsoft.AspNetCore.Identity.Test; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; +using Xunit; namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test { - public class InMemoryEFOnlyUsersTest : UserManagerSpecificationTestBase + public class InMemoryEFOnlyUsersTest + : UserManagerSpecificationTestBase, + IClassFixture { + private readonly InMemoryDatabaseFixture _fixture; + + public InMemoryEFOnlyUsersTest(InMemoryDatabaseFixture fixture) + { + _fixture = fixture; + } + protected override object CreateTestContext() - => new InMemoryContext(new DbContextOptionsBuilder().Options); + => InMemoryContext.Create(_fixture.Connection); protected override void AddUserStore(IServiceCollection services, object context = null) => services.AddSingleton>(new UserStore, IdentityUserRole, IdentityUserLogin, IdentityUserToken, IdentityRoleClaim>((InMemoryContext)context, new IdentityErrorDescriber())); diff --git a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryEFUserStoreTest.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryEFUserStoreTest.cs index 5a4d0fdc20..0c5b39779c 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryEFUserStoreTest.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryEFUserStoreTest.cs @@ -4,18 +4,23 @@ using System; using System.Linq.Expressions; using Microsoft.AspNetCore.Identity.Test; -using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; +using Xunit; namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test { - public class InMemoryEFUserStoreTest : IdentitySpecificationTestBase + public class InMemoryEFUserStoreTest : IdentitySpecificationTestBase, IClassFixture { - protected override object CreateTestContext() + private readonly InMemoryDatabaseFixture _fixture; + + public InMemoryEFUserStoreTest(InMemoryDatabaseFixture fixture) { - return new InMemoryContext(new DbContextOptionsBuilder().Options); + _fixture = fixture; } + protected override object CreateTestContext() + => InMemoryContext.Create(_fixture.Connection); + protected override void AddUserStore(IServiceCollection services, object context = null) { services.AddSingleton>(new UserStore((InMemoryContext)context)); diff --git a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs index 95e5750d41..7c6a73b8a6 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; +using System.Data.Common; using System.Linq; using System.Linq.Expressions; using System.Security.Claims; @@ -16,20 +17,26 @@ using Xunit; namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test { - public class InMemoryEFUserStoreTestWithGenerics : IdentitySpecificationTestBase, IDisposable + public class InMemoryEFUserStoreTestWithGenerics + : IdentitySpecificationTestBase, IClassFixture { + private readonly InMemoryDatabaseFixture _fixture; private readonly InMemoryContextWithGenerics _context; private UserStoreWithGenerics _store; - public InMemoryEFUserStoreTestWithGenerics() + public InMemoryEFUserStoreTestWithGenerics(InMemoryDatabaseFixture fixture) { + _fixture = fixture; + var services = new ServiceCollection(); services.AddHttpContextAccessor(); services.AddDbContext( options => options - .UseInMemoryDatabase("Scratch") + .UseSqlite(_fixture.Connection) .ConfigureWarnings(b => b.Log(CoreEventId.ManyServiceProvidersCreatedWarning))); _context = services.BuildServiceProvider().GetRequiredService(); + + _context.Database.EnsureCreated(); } protected override object CreateTestContext() @@ -83,10 +90,6 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test [Fact] public async Task CanAddRemoveUserClaimWithIssuer() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -115,10 +118,6 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test [Fact] public async Task RemoveClaimWithIssuerOnlyAffectsUser() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); var user2 = CreateTestUser(); @@ -148,10 +147,6 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test [Fact] public async Task CanReplaceUserClaimWithIssuer() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -168,10 +163,6 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test Assert.Equal(claim.Value, newClaim.Value); Assert.Equal(claim.Issuer, newClaim.Issuer); } - - public void Dispose() - { - } } public class ClaimEqualityComparer : IEqualityComparer @@ -324,13 +315,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test public class InMemoryContextWithGenerics : InMemoryContext { - public InMemoryContextWithGenerics(DbContextOptions options) : base(options) + public InMemoryContextWithGenerics(DbContextOptions options) : base(options) { } - - protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) - { - optionsBuilder.UseInMemoryDatabase("Scratch"); - } } #endregion diff --git a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj index 2200102a42..e5ef39b41b 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj +++ b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.0 @@ -14,7 +14,7 @@ - + diff --git a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/RoleStoreTest.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/RoleStoreTest.cs index a356787781..853424f6d4 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/RoleStoreTest.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/RoleStoreTest.cs @@ -4,19 +4,24 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Identity.Test; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.Extensions.DependencyInjection; using Xunit; namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test { - public class RoleStoreTest + public class RoleStoreTest : IClassFixture { + private readonly InMemoryDatabaseFixture _fixture; + + public RoleStoreTest(InMemoryDatabaseFixture fixture) + { + _fixture = fixture; + } + [Fact] public async Task CanCreateUsingAddRoleManager() { - var manager = TestIdentityFactory.CreateRoleManager(); + var manager = TestIdentityFactory.CreateRoleManager(_fixture.Connection); Assert.NotNull(manager); IdentityResultAssert.IsSuccess(await manager.CreateAsync(new IdentityRole("arole"))); } @@ -25,8 +30,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test public async Task CanCreateRoleWithSingletonManager() { var services = TestIdentityFactory.CreateTestServices(); - services.AddEntityFrameworkInMemoryDatabase(); - services.AddSingleton(new InMemoryContext(new DbContextOptionsBuilder().Options)); + services.AddEntityFrameworkSqlite(); + services.AddSingleton(InMemoryContext.Create(_fixture.Connection)); services.AddTransient, RoleStore>(); services.AddSingleton>(); var provider = services.BuildServiceProvider(); @@ -38,7 +43,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test [Fact] public async Task RoleStoreMethodsThrowWhenDisposedTest() { - var store = new RoleStore(new InMemoryContext(new DbContextOptionsBuilder().Options)); + var store = new RoleStore(InMemoryContext.Create(_fixture.Connection)); store.Dispose(); await Assert.ThrowsAsync(async () => await store.FindByIdAsync(null)); await Assert.ThrowsAsync(async () => await store.FindByNameAsync(null)); @@ -54,7 +59,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test public async Task RoleStorePublicNullCheckTest() { Assert.Throws("context", () => new RoleStore(null)); - var store = new RoleStore(new InMemoryContext(new DbContextOptionsBuilder().Options)); + var store = new RoleStore(InMemoryContext.Create(_fixture.Connection)); await Assert.ThrowsAsync("role", async () => await store.GetRoleIdAsync(null)); await Assert.ThrowsAsync("role", async () => await store.GetRoleNameAsync(null)); await Assert.ThrowsAsync("role", async () => await store.SetRoleNameAsync(null, null)); @@ -66,7 +71,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test [Fact] public async Task CanUpdateRoleName() { - var manager = TestIdentityFactory.CreateRoleManager(); + var manager = TestIdentityFactory.CreateRoleManager(_fixture.Connection); var role = new IdentityRole("UpdateRoleName"); IdentityResultAssert.IsSuccess(await manager.CreateAsync(role)); Assert.Null(await manager.FindByNameAsync("New")); diff --git a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/TestIdentityFactory.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/TestIdentityFactory.cs index 565f498251..917ddc4b51 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/TestIdentityFactory.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/TestIdentityFactory.cs @@ -1,25 +1,15 @@ // 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 Microsoft.AspNetCore.Http; -using Microsoft.EntityFrameworkCore; +using Microsoft.Data.Sqlite; using Microsoft.Extensions.DependencyInjection; namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test { public static class TestIdentityFactory { - public static InMemoryContext CreateContext() - { - var services = new ServiceCollection(); - services.AddEntityFrameworkInMemoryDatabase(); - var serviceProvider = services.BuildServiceProvider(); - - var db = new InMemoryContext(new DbContextOptionsBuilder().Options); - db.Database.EnsureCreated(); - - return db; - } + private static InMemoryContext CreateContext(SqliteConnection connection) + => InMemoryContext.Create(connection); public static IServiceCollection CreateTestServices() { @@ -37,9 +27,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test return services.BuildServiceProvider().GetRequiredService>(); } - public static RoleManager CreateRoleManager() - { - return CreateRoleManager(CreateContext()); - } + public static RoleManager CreateRoleManager(SqliteConnection connection) + => CreateRoleManager(CreateContext(connection)); } } diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/CustomPocoTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/CustomPocoTest.cs index e2886d9174..9f34074bdb 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.Test/CustomPocoTest.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.Test/CustomPocoTest.cs @@ -6,19 +6,12 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; using Xunit; namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test { - public class CustomPocoTest : IClassFixture + public class CustomPocoTest { - private readonly ScratchDatabaseFixture _fixture; - - public CustomPocoTest(ScratchDatabaseFixture fixture) - { - _fixture = fixture; - } public class User where TKey : IEquatable { @@ -35,30 +28,17 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test } - public CustomDbContext GetContext() where TKey : IEquatable - { - return DbUtil.Create>(_fixture.ConnectionString); - } - - public CustomDbContext CreateContext(bool delete = false) where TKey : IEquatable - { - var db = GetContext(); - if (delete) - { - db.Database.EnsureDeleted(); - } - db.Database.EnsureCreated(); - return db; - } - [ConditionalFact] [FrameworkSkipCondition(RuntimeFrameworks.Mono)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] public async Task CanUpdateNameGuid() { - using (var db = CreateContext(true)) + using (var db = new CustomDbContext( + new DbContextOptionsBuilder().UseSqlite($"DataSource=D{Guid.NewGuid()}.db").Options)) { + db.Database.EnsureCreated(); + var oldName = Guid.NewGuid().ToString(); var user = new User { UserName = oldName, Id = Guid.NewGuid() }; db.Users.Add(user); @@ -68,6 +48,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test await db.SaveChangesAsync(); Assert.Null(db.Users.SingleOrDefault(u => u.UserName == oldName)); Assert.Equal(user, db.Users.Single(u => u.UserName == newName)); + + db.Database.EnsureDeleted(); } } @@ -77,8 +59,11 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test [OSSkipCondition(OperatingSystems.MacOSX)] public async Task CanUpdateNameString() { - using (var db = CreateContext(true)) + using (var db = new CustomDbContext( + new DbContextOptionsBuilder().UseSqlite($"DataSource=D{Guid.NewGuid()}.db").Options)) { + db.Database.EnsureCreated(); + var oldName = Guid.NewGuid().ToString(); var user = new User { UserName = oldName, Id = Guid.NewGuid().ToString() }; db.Users.Add(user); @@ -88,6 +73,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test await db.SaveChangesAsync(); Assert.Null(db.Users.SingleOrDefault(u => u.UserName == oldName)); Assert.Equal(user, db.Users.Single(u => u.UserName == newName)); + + db.Database.EnsureDeleted(); } } @@ -97,8 +84,11 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test [OSSkipCondition(OperatingSystems.MacOSX)] public async Task CanCreateUserInt() { - using (var db = CreateContext(true)) + using (var db = new CustomDbContext( + new DbContextOptionsBuilder().UseSqlite($"DataSource=D{Guid.NewGuid()}.db").Options)) { + db.Database.EnsureCreated(); + var user = new User(); db.Users.Add(user); await db.SaveChangesAsync(); @@ -106,6 +96,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test await db.SaveChangesAsync(); var fetch = db.Users.First(u => u.UserName == "Boo"); Assert.Equal(user, fetch); + + db.Database.EnsureDeleted(); } } @@ -115,8 +107,11 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test [OSSkipCondition(OperatingSystems.MacOSX)] public async Task CanCreateUserIntViaSet() { - using (var db = CreateContext(true)) + using (var db = new CustomDbContext( + new DbContextOptionsBuilder().UseSqlite($"DataSource=D{Guid.NewGuid()}.db").Options)) { + db.Database.EnsureCreated(); + var user = new User(); var users = db.Set>(); users.Add(user); @@ -125,6 +120,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test await db.SaveChangesAsync(); var fetch = users.First(u => u.UserName == "Boo"); Assert.Equal(user, fetch); + + db.Database.EnsureDeleted(); } } @@ -134,8 +131,11 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test [OSSkipCondition(OperatingSystems.MacOSX)] public async Task CanUpdateNameInt() { - using (var db = CreateContext(true)) + using (var db = new CustomDbContext( + new DbContextOptionsBuilder().UseSqlite($"DataSource=D{Guid.NewGuid()}.db").Options)) { + db.Database.EnsureCreated(); + var oldName = Guid.NewGuid().ToString(); var user = new User { UserName = oldName }; db.Users.Add(user); @@ -145,6 +145,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test await db.SaveChangesAsync(); Assert.Null(db.Users.SingleOrDefault(u => u.UserName == oldName)); Assert.Equal(user, db.Users.Single(u => u.UserName == newName)); + + db.Database.EnsureDeleted(); } } @@ -154,8 +156,11 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test [OSSkipCondition(OperatingSystems.MacOSX)] public async Task CanUpdateNameIntWithSet() { - using (var db = CreateContext(true)) + using (var db = new CustomDbContext( + new DbContextOptionsBuilder().UseSqlite($"DataSource=D{Guid.NewGuid()}.db").Options)) { + db.Database.EnsureCreated(); + var oldName = Guid.NewGuid().ToString(); var user = new User { UserName = oldName }; db.Set>().Add(user); @@ -165,7 +170,9 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test await db.SaveChangesAsync(); Assert.Null(db.Set>().SingleOrDefault(u => u.UserName == oldName)); Assert.Equal(user, db.Set>().Single(u => u.UserName == newName)); + + db.Database.EnsureDeleted(); } } } -} \ No newline at end of file +} diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/DbUtil.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/DbUtil.cs index 0ca87b629d..5dd8195227 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.Test/DbUtil.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.Test/DbUtil.cs @@ -1,76 +1,73 @@ // 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.Data.SqlClient; +using System.Data.Common; using System.Linq; +using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; using Xunit; namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test { public static class DbUtil { - public static IServiceCollection ConfigureDbServices(string connectionString, IServiceCollection services = null) where TContext : DbContext + public static IServiceCollection ConfigureDbServices( + DbConnection connection, + IServiceCollection services = null) where TContext : DbContext { if (services == null) { services = new ServiceCollection(); } + services.AddHttpContextAccessor(); + services.AddDbContext(options => { options .ConfigureWarnings(b => b.Log(CoreEventId.ManyServiceProvidersCreatedWarning)) - .UseSqlServer(connectionString); + .UseSqlite(connection); }); + return services; } - public static TContext Create(string connectionString, IServiceCollection services = null) where TContext : DbContext + public static TContext Create(DbConnection connection, IServiceCollection services = null) where TContext : DbContext { - var serviceProvider = ConfigureDbServices(connectionString, services).BuildServiceProvider(); + var serviceProvider = ConfigureDbServices(connection, services).BuildServiceProvider(); return serviceProvider.GetRequiredService(); } - public static bool VerifyMaxLength(SqlConnection conn, string table, int maxLength, params string[] columns) + public static bool VerifyMaxLength(DbContext context, string table, int maxLength, params string[] columns) { var count = 0; - using ( - var command = - new SqlCommand("SELECT COLUMN_NAME, CHARACTER_MAXIMUM_LENGTH FROM INFORMATION_SCHEMA.COLUMNS where TABLE_NAME=@Table", conn)) + + // TODO: Use new API once EF is updated. Issue #10671 + foreach (var property in context.Model.GetEntityTypes().Single(e => (string)e.FindAnnotation("Relational:TableName")?.Value == table).GetProperties()) { - command.Parameters.Add(new SqlParameter("Table", table)); - using (var reader = command.ExecuteReader()) + // TODO: Use new API once EF is updated. Issue #10671 + if (!columns.Contains((string)property.FindAnnotation("Relational:ColumnName")?.Value ?? property.Name)) { - while (reader.Read()) - { - if (!columns.Contains(reader.GetString(0))) - { - continue; - } - if (reader.GetInt32(1) != maxLength) - { - return false; - } - count++; - } - return count == columns.Length; + continue; } + if (property.GetMaxLength() != maxLength) + { + return false; + } + count++; } + + return count == columns.Length; } - public static bool VerifyColumns(SqlConnection conn, string table, params string[] columns) + public static bool VerifyColumns(SqliteConnection conn, string table, params string[] columns) { var count = 0; - using ( - var command = - new SqlCommand("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS where TABLE_NAME=@Table", conn)) + using (var command = new SqliteCommand("SELECT \"name\" FROM pragma_table_info(@table)", conn)) { - command.Parameters.Add(new SqlParameter("Table", table)); + command.Parameters.Add(new SqliteParameter("table", table)); using (var reader = command.ExecuteReader()) { while (reader.Read()) @@ -86,16 +83,15 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test } } - public static void VerifyIndex(SqlConnection conn, string table, string index, bool isUnique = false) + public static void VerifyIndex(SqliteConnection conn, string table, string index, bool isUnique = false) { - using ( - var command = - new SqlCommand( - "SELECT COUNT(*) FROM sys.indexes where NAME=@Index AND object_id = OBJECT_ID(@Table) AND is_unique = @Unique", conn)) + using (var command = + new SqliteCommand( + "SELECT COUNT(*) FROM pragma_index_list(@table) WHERE \"name\" = @index AND \"unique\" = @unique", conn)) { - command.Parameters.Add(new SqlParameter("Index", index)); - command.Parameters.Add(new SqlParameter("Table", table)); - command.Parameters.Add(new SqlParameter("Unique", isUnique)); + command.Parameters.Add(new SqliteParameter("index", index)); + command.Parameters.Add(new SqliteParameter("table", table)); + command.Parameters.Add(new SqliteParameter("unique", isUnique)); using (var reader = command.ExecuteReader()) { Assert.True(reader.Read()); @@ -103,6 +99,5 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test } } } - } } diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/DefaultPocoTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/DefaultPocoTest.cs index 66d0d41470..98f97df0d4 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.Test/DefaultPocoTest.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.Test/DefaultPocoTest.cs @@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test services .AddSingleton(new ConfigurationBuilder().Build()) .AddDbContext(o => - o.UseSqlServer(fixture.ConnectionString) + o.UseSqlite(fixture.Connection) .ConfigureWarnings(b => b.Log(CoreEventId.ManyServiceProvidersCreatedWarning))) .AddIdentity() .AddEntityFrameworkStores(); @@ -36,9 +36,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test _builder = new ApplicationBuilder(provider); using(var scoped = provider.GetRequiredService().CreateScope()) - using (var db = scoped.ServiceProvider.GetRequiredService()) { - db.Database.EnsureCreated(); + scoped.ServiceProvider.GetRequiredService().Database.EnsureCreated(); } } diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/MaxKeyLengthSchemaTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/MaxKeyLengthSchemaTest.cs index 6cba511459..55d18b1f8c 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.Test/MaxKeyLengthSchemaTest.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.Test/MaxKeyLengthSchemaTest.cs @@ -1,9 +1,9 @@ // 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.Data.SqlClient; using Microsoft.AspNetCore.Builder.Internal; using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.Extensions.Configuration; @@ -23,59 +23,73 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test services .AddSingleton(new ConfigurationBuilder().Build()) - .AddDbContext(o => - o.UseSqlServer(fixture.ConnectionString) + .AddDbContext(o => + o.UseSqlite(fixture.Connection) .ConfigureWarnings(b => b.Log(CoreEventId.ManyServiceProvidersCreatedWarning))) .AddIdentity(o => o.Stores.MaxLengthForKeys = 128) - .AddEntityFrameworkStores(); + .AddEntityFrameworkStores(); services.AddLogging(); - var provider = services.BuildServiceProvider(); - _builder = new ApplicationBuilder(provider); + _builder = new ApplicationBuilder(services.BuildServiceProvider()); - using (var scoped = provider.GetRequiredService().CreateScope()) - using (var db = scoped.ServiceProvider.GetRequiredService()) + using (var scope = _builder.ApplicationServices.GetRequiredService().CreateScope()) { - db.Database.EnsureCreated(); + scope.ServiceProvider.GetRequiredService().Database.EnsureCreated(); } } - [ConditionalFact(Skip = "https://github.com/aspnet/AspNetCore/issues/7925")] + // Need a different context type here since EF model is changing by having MaxLengthForKeys + public class VerstappenDbContext : IdentityDbContext + { + public VerstappenDbContext(DbContextOptions options) + : base(options) + { + } + } + + [ConditionalFact] [FrameworkSkipCondition(RuntimeFrameworks.Mono)] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] public void EnsureDefaultSchema() { - var db = _builder.ApplicationServices.GetRequiredService(); - VerifyDefaultSchema(db); + using (var scope = _builder.ApplicationServices.GetRequiredService().CreateScope()) + { + var db = scope.ServiceProvider.GetRequiredService(); + + VerifyDefaultSchema(db); + } } - private static void VerifyDefaultSchema(IdentityDbContext dbContext) + private static void VerifyDefaultSchema(VerstappenDbContext dbContext) { - var sqlConn = dbContext.Database.GetDbConnection(); + var sqlConn = (SqliteConnection)dbContext.Database.GetDbConnection(); - using (var db = new SqlConnection(sqlConn.ConnectionString)) + try { - db.Open(); - Assert.True(DbUtil.VerifyColumns(db, "AspNetUsers", "Id", "UserName", "Email", "PasswordHash", "SecurityStamp", + sqlConn.Open(); + Assert.True(DbUtil.VerifyColumns(sqlConn, "AspNetUsers", "Id", "UserName", "Email", "PasswordHash", "SecurityStamp", "EmailConfirmed", "PhoneNumber", "PhoneNumberConfirmed", "TwoFactorEnabled", "LockoutEnabled", "LockoutEnd", "AccessFailedCount", "ConcurrencyStamp", "NormalizedUserName", "NormalizedEmail")); - Assert.True(DbUtil.VerifyColumns(db, "AspNetRoles", "Id", "Name", "NormalizedName", "ConcurrencyStamp")); - Assert.True(DbUtil.VerifyColumns(db, "AspNetUserRoles", "UserId", "RoleId")); - Assert.True(DbUtil.VerifyColumns(db, "AspNetUserClaims", "Id", "UserId", "ClaimType", "ClaimValue")); - Assert.True(DbUtil.VerifyColumns(db, "AspNetUserLogins", "UserId", "ProviderKey", "LoginProvider", "ProviderDisplayName")); - Assert.True(DbUtil.VerifyColumns(db, "AspNetUserTokens", "UserId", "LoginProvider", "Name", "Value")); + Assert.True(DbUtil.VerifyColumns(sqlConn, "AspNetRoles", "Id", "Name", "NormalizedName", "ConcurrencyStamp")); + Assert.True(DbUtil.VerifyColumns(sqlConn, "AspNetUserRoles", "UserId", "RoleId")); + Assert.True(DbUtil.VerifyColumns(sqlConn, "AspNetUserClaims", "Id", "UserId", "ClaimType", "ClaimValue")); + Assert.True(DbUtil.VerifyColumns(sqlConn, "AspNetUserLogins", "UserId", "ProviderKey", "LoginProvider", "ProviderDisplayName")); + Assert.True(DbUtil.VerifyColumns(sqlConn, "AspNetUserTokens", "UserId", "LoginProvider", "Name", "Value")); - Assert.True(DbUtil.VerifyMaxLength(db, "AspNetUsers", 256, "UserName", "Email", "NormalizedUserName", "NormalizedEmail")); - Assert.True(DbUtil.VerifyMaxLength(db, "AspNetRoles", 256, "Name", "NormalizedName")); - Assert.True(DbUtil.VerifyMaxLength(db, "AspNetUserLogins", 128, "LoginProvider", "ProviderKey")); - Assert.True(DbUtil.VerifyMaxLength(db, "AspNetUserTokens", 128, "LoginProvider", "Name")); + Assert.True(DbUtil.VerifyMaxLength(dbContext, "AspNetUsers", 256, "UserName", "Email", "NormalizedUserName", "NormalizedEmail")); + Assert.True(DbUtil.VerifyMaxLength(dbContext, "AspNetRoles", 256, "Name", "NormalizedName")); + Assert.True(DbUtil.VerifyMaxLength(dbContext, "AspNetUserLogins", 128, "LoginProvider", "ProviderKey")); + Assert.True(DbUtil.VerifyMaxLength(dbContext, "AspNetUserTokens", 128, "LoginProvider", "Name")); - DbUtil.VerifyIndex(db, "AspNetRoles", "RoleNameIndex", isUnique: true); - DbUtil.VerifyIndex(db, "AspNetUsers", "UserNameIndex", isUnique: true); - DbUtil.VerifyIndex(db, "AspNetUsers", "EmailIndex"); - db.Close(); + DbUtil.VerifyIndex(sqlConn, "AspNetRoles", "RoleNameIndex", isUnique: true); + DbUtil.VerifyIndex(sqlConn, "AspNetUsers", "UserNameIndex", isUnique: true); + DbUtil.VerifyIndex(sqlConn, "AspNetUsers", "EmailIndex"); + } + finally + { + sqlConn.Close(); } } } diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj b/src/Identity/EntityFrameworkCore/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj index 229157c810..d3dffb3d0b 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj +++ b/src/Identity/EntityFrameworkCore/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj @@ -1,8 +1,7 @@ - + netcoreapp3.0 - true true @@ -20,8 +19,7 @@ - - + diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreOnlyUsersTestBase.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreOnlyUsersTestBase.cs index 12aacce182..c0b0c49225 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreOnlyUsersTestBase.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreOnlyUsersTestBase.cs @@ -10,6 +10,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Identity.Test; using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Xunit; @@ -27,11 +28,6 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test _fixture = fixture; } - protected override bool ShouldSkipDbTests() - { - return TestPlatformHelper.IsMono || !TestPlatformHelper.IsWindows; - } - public class TestUserDbContext : IdentityUserContext { public TestUserDbContext(DbContextOptions options) : base(options) { } @@ -54,9 +50,9 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test protected override Expression> UserNameStartsWithPredicate(string userName) => u => u.UserName.StartsWith(userName); - public TestUserDbContext CreateContext() + private TestUserDbContext CreateContext() { - var db = DbUtil.Create(_fixture.ConnectionString); + var db = DbUtil.Create(_fixture.Connection); db.Database.EnsureCreated(); return db; } @@ -89,7 +85,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test { var sqlConn = dbContext.Database.GetDbConnection(); - using (var db = new SqlConnection(sqlConn.ConnectionString)) + using (var db = new SqliteConnection(sqlConn.ConnectionString)) { db.Open(); Assert.True(DbUtil.VerifyColumns(db, "AspNetUsers", "Id", "UserName", "Email", "PasswordHash", "SecurityStamp", @@ -104,7 +100,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test DbUtil.VerifyIndex(db, "AspNetUsers", "UserNameIndex", isUnique: true); DbUtil.VerifyIndex(db, "AspNetUsers", "EmailIndex"); - DbUtil.VerifyMaxLength(db, "AspNetUsers", 256, "UserName", "Email", "NormalizeUserName", "NormalizeEmail"); + DbUtil.VerifyMaxLength(dbContext, "AspNetUsers", 256, "UserName", "Email", "NormalizeUserName", "NormalizeEmail"); db.Close(); } @@ -249,4 +245,4 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test Assert.Equal(2, (await manager.GetRolesAsync(userByEmail)).Count); } } -} \ No newline at end of file +} diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreTestBase.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreTestBase.cs index 3c7ae781a4..d889876dcc 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreTestBase.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreTestBase.cs @@ -10,6 +10,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Identity.Test; using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -58,11 +59,6 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test SetupAddIdentity(services); } - protected override bool ShouldSkipDbTests() - { - return TestPlatformHelper.IsMono || !TestPlatformHelper.IsWindows; - } - public class TestDbContext : IdentityDbContext { public TestDbContext(DbContextOptions options) : base(options) { } } @@ -94,11 +90,11 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test protected override Expression> UserNameStartsWithPredicate(string userName) => u => u.UserName.StartsWith(userName); - public virtual TestDbContext CreateContext() + protected virtual TestDbContext CreateContext() { var services = new ServiceCollection(); SetupAddIdentity(services); - var db = DbUtil.Create(_fixture.ConnectionString, services); + var db = DbUtil.Create(_fixture.Connection, services); db.Database.EnsureCreated(); return db; } @@ -136,7 +132,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test { var sqlConn = dbContext.Database.GetDbConnection(); - using (var db = new SqlConnection(sqlConn.ConnectionString)) + using (var db = new SqliteConnection(sqlConn.ConnectionString)) { db.Open(); Assert.True(DbUtil.VerifyColumns(db, "AspNetUsers", "Id", "UserName", "Email", "PasswordHash", "SecurityStamp", @@ -148,8 +144,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test Assert.True(DbUtil.VerifyColumns(db, "AspNetUserLogins", "UserId", "ProviderKey", "LoginProvider", "ProviderDisplayName")); Assert.True(DbUtil.VerifyColumns(db, "AspNetUserTokens", "UserId", "LoginProvider", "Name", "Value")); - Assert.True(DbUtil.VerifyMaxLength(db, "AspNetUsers", 256, "UserName", "Email", "NormalizedUserName", "NormalizedEmail")); - Assert.True(DbUtil.VerifyMaxLength(db, "AspNetRoles", 256, "Name", "NormalizedName")); + Assert.True(DbUtil.VerifyMaxLength(dbContext, "AspNetUsers", 256, "UserName", "Email", "NormalizedUserName", "NormalizedEmail")); + Assert.True(DbUtil.VerifyMaxLength(dbContext, "AspNetRoles", 256, "Name", "NormalizedName")); DbUtil.VerifyIndex(db, "AspNetRoles", "RoleNameIndex", isUnique: true); DbUtil.VerifyIndex(db, "AspNetUsers", "UserNameIndex", isUnique: true); diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyCustomContextTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyCustomContextTest.cs index 47d1e30d5c..14eb1a77ee 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyCustomContextTest.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyCustomContextTest.cs @@ -69,7 +69,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test services .AddSingleton(new ConfigurationBuilder().Build()) .AddDbContext(o => - o.UseSqlServer(fixture.ConnectionString) + o.UseSqlite(fixture.Connection) .ConfigureWarnings(b => b.Log(CoreEventId.ManyServiceProvidersCreatedWarning))) .AddIdentityCore(o => { }) .AddEntityFrameworkStores(); diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyTest.cs index 8f1ea38881..4fa6c005cb 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyTest.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyTest.cs @@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test services .AddSingleton(new ConfigurationBuilder().Build()) .AddDbContext( - o => o.UseSqlServer(fixture.ConnectionString) + o => o.UseSqlite(fixture.Connection) .ConfigureWarnings(b => b.Log(CoreEventId.ManyServiceProvidersCreatedWarning))) .AddIdentityCore(o => { }) .AddEntityFrameworkStores(); diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreEncryptPersonalDataTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreEncryptPersonalDataTest.cs index 8d8c4c5a26..62ec339141 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreEncryptPersonalDataTest.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreEncryptPersonalDataTest.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Data.Common; using System.Threading.Tasks; using Microsoft.AspNetCore.Identity.Test; +using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Xunit; @@ -75,10 +76,6 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test [Fact] public async Task CanRotateKeysAndStillFind() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var name = Guid.NewGuid().ToString(); var user = CreateTestUser(name); @@ -109,10 +106,10 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test public InkProtector() { } public string Unprotect(string keyId, string data) - => "ink"; + => data?.Substring(4); public string Protect(string keyId, string data) - => "ink"; + => "ink:" + data; } private class CustomUser : IdentityUser @@ -137,8 +134,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test { if (reader.Read()) { - Assert.Equal("Default:ink", reader.GetString(0)); - return reader.GetString(0) == "Default:ink"; + var value = reader.GetString(0); + return value.StartsWith("Default:ink:"); } } } @@ -159,8 +156,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test { if (reader.Read()) { - Assert.Equal("Default:ink", reader.GetString(0)); - return reader.GetString(0) == "Default:ink"; + var value = reader.GetString(0); + return value.StartsWith("Default:ink:"); } } } @@ -171,80 +168,103 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test /// Test. /// /// Task - [Theory(Skip = "https://github.com/aspnet/AspNetCore/issues/7925")] - [InlineData(true)] - [InlineData(false)] - public async Task CustomPersonalDataPropertiesAreProtected(bool protect) - { - if (ShouldSkipDbTests()) - { - return; - } + [Fact] + public Task CustomPersonalDataPropertiesCanBeProtected() + => CustomPersonalDataPropertiesAreProtected(true); - using (var scratch = new ScratchDatabaseFixture()) + /// + /// Test. + /// + /// Task + [Fact] + public Task CustomPersonalDataPropertiesCanBeNotProtected() + => CustomPersonalDataPropertiesAreProtected(false); + + private async Task CustomPersonalDataPropertiesAreProtected(bool protect) + where TContext : DbContext + { + using (var connection = new SqliteConnection($"DataSource=D{Guid.NewGuid()}.db")) { var services = new ServiceCollection().AddLogging(); services.AddIdentity(options => { options.Stores.ProtectPersonalData = protect; }) - .AddEntityFrameworkStores>() + .AddEntityFrameworkStores() .AddPersonalDataProtection(); - var dbOptions = new DbContextOptionsBuilder().UseSqlServer(scratch.ConnectionString) - .UseApplicationServiceProvider(services.BuildServiceProvider()) - .Options; - var dbContext = new IdentityDbContext(dbOptions); - services.AddSingleton(dbContext); - dbContext.Database.EnsureCreated(); + services.AddDbContext(b => b.UseSqlite(connection)); - var sp = services.BuildServiceProvider(); - var manager = sp.GetService>(); + var applicationServiceProvider = services.BuildServiceProvider(); - var guid = Guid.NewGuid().ToString(); - var user = new CustomUser(); - user.Id = guid; - user.UserName = guid; - IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); - user.Email = "test@test.com"; - user.PersonalData1 = "p1"; - user.PersonalData2 = "p2"; - user.NonPersonalData1 = "np1"; - user.NonPersonalData2 = "np2"; - user.SafePersonalData = "safe"; - user.PhoneNumber = "12345678"; - IdentityResultAssert.IsSuccess(await manager.UpdateAsync(user)); + using (var scope = applicationServiceProvider.CreateScope()) + { + var dbContext = scope.ServiceProvider.GetRequiredService(); + dbContext.Database.EnsureCreated(); - IdentityResultAssert.IsSuccess(await manager.ResetAuthenticatorKeyAsync(user)); - IdentityResultAssert.IsSuccess(await manager.SetAuthenticationTokenAsync(user, "loginProvider", "token", "value")); + var manager = scope.ServiceProvider.GetService>(); - var conn = dbContext.Database.GetDbConnection(); - conn.Open(); - if (protect) - { - Assert.True(FindInk(conn, "PhoneNumber", guid)); - Assert.True(FindInk(conn, "Email", guid)); - Assert.True(FindInk(conn, "UserName", guid)); - Assert.True(FindInk(conn, "PersonalData1", guid)); - Assert.True(FindInk(conn, "PersonalData2", guid)); - Assert.True(FindAuthenticatorKeyInk(conn, guid)); - Assert.True(FindTokenInk(conn, guid, "loginProvider", "token")); + var guid = Guid.NewGuid().ToString(); + var user = new CustomUser(); + user.Id = guid; + user.UserName = guid; + IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); + user.Email = "test@test.com"; + user.PersonalData1 = "p1"; + user.PersonalData2 = "p2"; + user.NonPersonalData1 = "np1"; + user.NonPersonalData2 = "np2"; + user.SafePersonalData = "safe"; + user.PhoneNumber = "12345678"; + IdentityResultAssert.IsSuccess(await manager.UpdateAsync(user)); + + IdentityResultAssert.IsSuccess(await manager.ResetAuthenticatorKeyAsync(user)); + IdentityResultAssert.IsSuccess(await manager.SetAuthenticationTokenAsync(user, "loginProvider", "token", "value")); + + connection.Open(); + if (protect) + { + Assert.True(FindInk(connection, "PhoneNumber", guid)); + Assert.True(FindInk(connection, "Email", guid)); + Assert.True(FindInk(connection, "UserName", guid)); + Assert.True(FindInk(connection, "PersonalData1", guid)); + Assert.True(FindInk(connection, "PersonalData2", guid)); + Assert.True(FindAuthenticatorKeyInk(connection, guid)); + Assert.True(FindTokenInk(connection, guid, "loginProvider", "token")); + } + else + { + Assert.False(FindInk(connection, "PhoneNumber", guid)); + Assert.False(FindInk(connection, "Email", guid)); + Assert.False(FindInk(connection, "UserName", guid)); + Assert.False(FindInk(connection, "PersonalData1", guid)); + Assert.False(FindInk(connection, "PersonalData2", guid)); + Assert.False(FindAuthenticatorKeyInk(connection, guid)); + Assert.False(FindTokenInk(connection, guid, "loginProvider", "token")); + } + + Assert.False(FindInk(connection, "NonPersonalData1", guid)); + Assert.False(FindInk(connection, "NonPersonalData2", guid)); + Assert.False(FindInk(connection, "SafePersonalData", guid)); + + connection.Close(); } - else - { - Assert.False(FindInk(conn, "PhoneNumber", guid)); - Assert.False(FindInk(conn, "Email", guid)); - Assert.False(FindInk(conn, "UserName", guid)); - Assert.False(FindInk(conn, "PersonalData1", guid)); - Assert.False(FindInk(conn, "PersonalData2", guid)); - Assert.False(FindAuthenticatorKeyInk(conn, guid)); - Assert.False(FindTokenInk(conn, guid, "loginProvider", "token")); - } - Assert.False(FindInk(conn, "NonPersonalData1", guid)); - Assert.False(FindInk(conn, "NonPersonalData2", guid)); - Assert.False(FindInk(conn, "SafePersonalData", guid)); + } + } - conn.Close(); + private class ProtectedIdentityDbContext : IdentityDbContext + { + public ProtectedIdentityDbContext(DbContextOptions options) + : base(options) + { + } + } + + private class UnprotectedIdentityDbContext : IdentityDbContext + { + public UnprotectedIdentityDbContext(DbContextOptions options) + : base(options) + { } } @@ -260,11 +280,6 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test [Fact] public void ProtectedPersonalDataThrowsOnNonString() { - if (ShouldSkipDbTests()) - { - return; - } - using (var scratch = new ScratchDatabaseFixture()) { var services = new ServiceCollection().AddLogging(); @@ -274,7 +289,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test }) .AddEntityFrameworkStores>() .AddPersonalDataProtection(); - var dbOptions = new DbContextOptionsBuilder().UseSqlServer(scratch.ConnectionString) + var dbOptions = new DbContextOptionsBuilder().UseSqlite(scratch.Connection) .UseApplicationServiceProvider(services.BuildServiceProvider()) .Options; var dbContext = new IdentityDbContext(dbOptions); diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs index d143047a58..21a2c34446 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs @@ -23,9 +23,6 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test _fixture = fixture; } - protected override bool ShouldSkipDbTests() - => TestPlatformHelper.IsMono || !TestPlatformHelper.IsWindows; - public class ApplicationDbContext : IdentityDbContext { public ApplicationDbContext(DbContextOptions options) : base(options) @@ -48,13 +45,9 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test } } - public IdentityDbContext CreateContext(bool delete = false) + private IdentityDbContext CreateContext() { - var db = DbUtil.Create(_fixture.ConnectionString); - if (delete) - { - db.Database.EnsureDeleted(); - } + var db = DbUtil.Create(_fixture.Connection); db.Database.EnsureCreated(); return db; } @@ -64,13 +57,6 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test return CreateContext(); } - public ApplicationDbContext CreateAppContext() - { - var db = DbUtil.Create(_fixture.ConnectionString); - db.Database.EnsureCreated(); - return db; - } - protected override void AddUserStore(IServiceCollection services, object context = null) { services.AddSingleton>(new UserStore((IdentityDbContext)context)); @@ -244,14 +230,17 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test [OSSkipCondition(OperatingSystems.MacOSX)] public async Task ConcurrentUpdatesWillFail() { + var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options; var user = CreateTestUser(); - using (var db = CreateContext()) + using (var db = new IdentityDbContext(options)) { + db.Database.EnsureCreated(); + var manager = CreateManager(db); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); } - using (var db = CreateContext()) - using (var db2 = CreateContext()) + using (var db = new IdentityDbContext(options)) + using (var db2 = new IdentityDbContext(options)) { var manager1 = CreateManager(db); var manager2 = CreateManager(db2); @@ -264,6 +253,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test user2.UserName = Guid.NewGuid().ToString(); IdentityResultAssert.IsSuccess(await manager1.UpdateAsync(user1)); IdentityResultAssert.IsFailure(await manager2.UpdateAsync(user2), new IdentityErrorDescriber().ConcurrencyFailure()); + + db.Database.EnsureDeleted(); } } @@ -273,14 +264,17 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test [OSSkipCondition(OperatingSystems.MacOSX)] public async Task ConcurrentUpdatesWillFailWithDetachedUser() { + var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options; var user = CreateTestUser(); - using (var db = CreateContext()) + using (var db = new IdentityDbContext(options)) { + db.Database.EnsureCreated(); + var manager = CreateManager(db); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); } - using (var db = CreateContext()) - using (var db2 = CreateContext()) + using (var db = new IdentityDbContext(options)) + using (var db2 = new IdentityDbContext(options)) { var manager1 = CreateManager(db); var manager2 = CreateManager(db2); @@ -291,6 +285,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test user2.UserName = Guid.NewGuid().ToString(); IdentityResultAssert.IsSuccess(await manager1.UpdateAsync(user)); IdentityResultAssert.IsFailure(await manager2.UpdateAsync(user2), new IdentityErrorDescriber().ConcurrencyFailure()); + + db.Database.EnsureDeleted(); } } @@ -300,14 +296,17 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test [OSSkipCondition(OperatingSystems.MacOSX)] public async Task DeleteAModifiedUserWillFail() { + var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options; var user = CreateTestUser(); - using (var db = CreateContext()) + using (var db = new IdentityDbContext(options)) { + db.Database.EnsureCreated(); + var manager = CreateManager(db); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); } - using (var db = CreateContext()) - using (var db2 = CreateContext()) + using (var db = new IdentityDbContext(options)) + using (var db2 = new IdentityDbContext(options)) { var manager1 = CreateManager(db); var manager2 = CreateManager(db2); @@ -319,6 +318,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test user1.UserName = Guid.NewGuid().ToString(); IdentityResultAssert.IsSuccess(await manager1.UpdateAsync(user1)); IdentityResultAssert.IsFailure(await manager2.DeleteAsync(user2), new IdentityErrorDescriber().ConcurrencyFailure()); + + db.Database.EnsureDeleted(); } } @@ -328,14 +329,17 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test [OSSkipCondition(OperatingSystems.MacOSX)] public async Task ConcurrentRoleUpdatesWillFail() { + var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options; var role = new IdentityRole(Guid.NewGuid().ToString()); - using (var db = CreateContext()) + using (var db = new IdentityDbContext(options)) { + db.Database.EnsureCreated(); + var manager = CreateRoleManager(db); IdentityResultAssert.IsSuccess(await manager.CreateAsync(role)); } - using (var db = CreateContext()) - using (var db2 = CreateContext()) + using (var db = new IdentityDbContext(options)) + using (var db2 = new IdentityDbContext(options)) { var manager1 = CreateRoleManager(db); var manager2 = CreateRoleManager(db2); @@ -348,6 +352,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test role2.Name = Guid.NewGuid().ToString(); IdentityResultAssert.IsSuccess(await manager1.UpdateAsync(role1)); IdentityResultAssert.IsFailure(await manager2.UpdateAsync(role2), new IdentityErrorDescriber().ConcurrencyFailure()); + + db.Database.EnsureDeleted(); } } @@ -357,14 +363,17 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test [OSSkipCondition(OperatingSystems.MacOSX)] public async Task ConcurrentRoleUpdatesWillFailWithDetachedRole() { + var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options; var role = new IdentityRole(Guid.NewGuid().ToString()); - using (var db = CreateContext()) + using (var db = new IdentityDbContext(options)) { + db.Database.EnsureCreated(); + var manager = CreateRoleManager(db); IdentityResultAssert.IsSuccess(await manager.CreateAsync(role)); } - using (var db = CreateContext()) - using (var db2 = CreateContext()) + using (var db = new IdentityDbContext(options)) + using (var db2 = new IdentityDbContext(options)) { var manager1 = CreateRoleManager(db); var manager2 = CreateRoleManager(db2); @@ -376,6 +385,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test role2.Name = Guid.NewGuid().ToString(); IdentityResultAssert.IsSuccess(await manager1.UpdateAsync(role)); IdentityResultAssert.IsFailure(await manager2.UpdateAsync(role2), new IdentityErrorDescriber().ConcurrencyFailure()); + + db.Database.EnsureDeleted(); } } @@ -385,14 +396,17 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test [OSSkipCondition(OperatingSystems.MacOSX)] public async Task DeleteAModifiedRoleWillFail() { + var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options; var role = new IdentityRole(Guid.NewGuid().ToString()); - using (var db = CreateContext()) + using (var db = new IdentityDbContext(options)) { + db.Database.EnsureCreated(); + var manager = CreateRoleManager(db); IdentityResultAssert.IsSuccess(await manager.CreateAsync(role)); } - using (var db = CreateContext()) - using (var db2 = CreateContext()) + using (var db = new IdentityDbContext(options)) + using (var db2 = new IdentityDbContext(options)) { var manager1 = CreateRoleManager(db); var manager2 = CreateRoleManager(db2); @@ -404,6 +418,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test role1.Name = Guid.NewGuid().ToString(); IdentityResultAssert.IsSuccess(await manager1.UpdateAsync(role1)); IdentityResultAssert.IsFailure(await manager2.DeleteAsync(role2), new IdentityErrorDescriber().ConcurrencyFailure()); + + db.Database.EnsureDeleted(); } } diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreWithGenericsTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreWithGenericsTest.cs index 951e91cabf..8e07a8dc8e 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreWithGenericsTest.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreWithGenericsTest.cs @@ -8,7 +8,6 @@ using System.Linq.Expressions; using System.Security.Claims; using System.Threading.Tasks; using Microsoft.AspNetCore.Identity.Test; -using Microsoft.AspNetCore.Testing; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Xunit; @@ -24,9 +23,9 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test _fixture = fixture; } - public ContextWithGenerics CreateContext() + private ContextWithGenerics CreateContext() { - var db = DbUtil.Create(_fixture.ConnectionString); + var db = DbUtil.Create(_fixture.Connection); db.Database.EnsureCreated(); return db; } @@ -36,11 +35,6 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test return CreateContext(); } - protected override bool ShouldSkipDbTests() - { - return TestPlatformHelper.IsMono || !TestPlatformHelper.IsWindows; - } - protected override void AddUserStore(IServiceCollection services, object context = null) { services.AddSingleton>(new UserStoreWithGenerics((ContextWithGenerics)context, "TestContext")); @@ -104,10 +98,6 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test [Fact] public async Task CanAddRemoveUserClaimWithIssuer() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -136,10 +126,6 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test [Fact] public async Task RemoveClaimWithIssuerOnlyAffectsUser() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); var user2 = CreateTestUser(); @@ -169,10 +155,6 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test [Fact] public async Task CanReplaceUserClaimWithIssuer() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -348,4 +330,4 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test } #endregion -} \ No newline at end of file +} diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/ScratchDatabaseFixture.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/ScratchDatabaseFixture.cs index 6634a81591..39aed8910b 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/ScratchDatabaseFixture.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/ScratchDatabaseFixture.cs @@ -2,28 +2,40 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.Utilities; -using Microsoft.EntityFrameworkCore.Internal; +using System.Data.Common; +using Microsoft.Data.Sqlite; +using Microsoft.EntityFrameworkCore; namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test { public class ScratchDatabaseFixture : IDisposable { - private readonly Lazy _testStore; + private readonly SqliteConnection _connection; public ScratchDatabaseFixture() { - _testStore = new Lazy(() => SqlServerTestStore.CreateScratch()); + _connection = new SqliteConnection($"DataSource=D{Guid.NewGuid()}.db"); + + using (var context = CreateEmptyContext()) + { + context.Database.EnsureDeleted(); + context.Database.EnsureCreated(); + } } - public string ConnectionString => _testStore.Value.Connection.ConnectionString; + private DbContext CreateEmptyContext() + => new DbContext(new DbContextOptionsBuilder().UseSqlite(_connection).Options); + + public DbConnection Connection => _connection; public void Dispose() { - if (_testStore.IsValueCreated) + using (var context = CreateEmptyContext()) { - _testStore.Value.Dispose(); + context.Database.EnsureDeleted(); } + + _connection.Dispose(); } } } diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/SqlServerTestStore.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/SqlServerTestStore.cs deleted file mode 100644 index dab5854282..0000000000 --- a/src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/SqlServerTestStore.cs +++ /dev/null @@ -1,165 +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.Data.Common; -using System.Data.SqlClient; -using System.IO; -using System.Threading; - -namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.Utilities -{ - public class SqlServerTestStore : IDisposable - { - public const int CommandTimeout = 90; - - public static string CreateConnectionString(string name) - { - var connStrBuilder = new SqlConnectionStringBuilder(TestEnvironment.Config["Test:SqlServer:DefaultConnectionString"]) - { - InitialCatalog = name - }; - - return connStrBuilder.ConnectionString; - } - - public static SqlServerTestStore CreateScratch(bool createDatabase = true) - => new SqlServerTestStore(GetScratchDbName()).CreateTransient(createDatabase); - - private SqlConnection _connection; - private readonly string _name; - private bool _deleteDatabase; - - private SqlServerTestStore(string name) - { - _name = name; - } - - private static string GetScratchDbName() - { - string name; - do - { - name = "Scratch_" + Guid.NewGuid(); - } while (DatabaseExists(name) - || DatabaseFilesExist(name)); - - return name; - } - - private static void WaitForExists(SqlConnection connection) - { - var retryCount = 0; - while (true) - { - try - { - connection.Open(); - - connection.Close(); - - return; - } - catch (SqlException e) - { - if (++retryCount >= 30 - || (e.Number != 233 && e.Number != -2 && e.Number != 4060)) - { - throw; - } - - SqlConnection.ClearPool(connection); - - Thread.Sleep(100); - } - } - } - - private SqlServerTestStore CreateTransient(bool createDatabase) - { - _connection = new SqlConnection(CreateConnectionString(_name)); - - if (createDatabase) - { - using (var master = new SqlConnection(CreateConnectionString("master"))) - { - master.Open(); - using (var command = master.CreateCommand()) - { - command.CommandTimeout = CommandTimeout; - command.CommandText = $"{Environment.NewLine}CREATE DATABASE [{_name}]"; - - command.ExecuteNonQuery(); - - WaitForExists(_connection); - } - } - _connection.Open(); - } - - _deleteDatabase = true; - return this; - } - - private static bool DatabaseExists(string name) - { - using (var master = new SqlConnection(CreateConnectionString("master"))) - { - master.Open(); - - using (var command = master.CreateCommand()) - { - command.CommandTimeout = CommandTimeout; - command.CommandText = $@"SELECT COUNT(*) FROM sys.databases WHERE name = N'{name}'"; - - return (int) command.ExecuteScalar() > 0; - } - } - } - - private static bool DatabaseFilesExist(string name) - { - var userFolder = Environment.GetEnvironmentVariable("USERPROFILE") ?? - Environment.GetEnvironmentVariable("HOME"); - return userFolder != null - && (File.Exists(Path.Combine(userFolder, name + ".mdf")) - || File.Exists(Path.Combine(userFolder, name + "_log.ldf"))); - } - - private void DeleteDatabase(string name) - { - using (var master = new SqlConnection(CreateConnectionString("master"))) - { - master.Open(); - - using (var command = master.CreateCommand()) - { - command.CommandTimeout = CommandTimeout; - // Query will take a few seconds if (and only if) there are active connections - - // SET SINGLE_USER will close any open connections that would prevent the drop - command.CommandText - = string.Format(@"IF EXISTS (SELECT * FROM sys.databases WHERE name = N'{0}') - BEGIN - ALTER DATABASE [{0}] SET SINGLE_USER WITH ROLLBACK IMMEDIATE; - DROP DATABASE [{0}]; - END", name); - - command.ExecuteNonQuery(); - } - } - } - - public DbConnection Connection => _connection; - - public void Dispose() - { - _connection.Dispose(); - - if (_deleteDatabase) - { - DeleteDatabase(_name); - } - } - } -} diff --git a/src/Identity/Identity.sln b/src/Identity/Identity.sln index 1c67b9e73d..aa2849dd70 100644 --- a/src/Identity/Identity.sln +++ b/src/Identity/Identity.sln @@ -151,8 +151,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routin EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Core", "..\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj", "{61A59575-D976-486D-979D-AD06373667EE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions", "..\Servers\Kestrel\Transport.Abstractions\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj", "{7D3C1690-E372-4039-9DEC-79DF2C152EE3}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "..\Servers\Kestrel\Transport.Sockets\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", "{4B4E0ED3-60D5-4C26-A6EA-CF43EBC38A52}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebUtilities", "..\Http\WebUtilities\src\Microsoft.AspNetCore.WebUtilities.csproj", "{8AC04CA6-7638-4F46-B31F-ECA93C38826D}" @@ -1027,18 +1025,6 @@ Global {61A59575-D976-486D-979D-AD06373667EE}.Release|x64.Build.0 = Release|Any CPU {61A59575-D976-486D-979D-AD06373667EE}.Release|x86.ActiveCfg = Release|Any CPU {61A59575-D976-486D-979D-AD06373667EE}.Release|x86.Build.0 = Release|Any CPU - {7D3C1690-E372-4039-9DEC-79DF2C152EE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D3C1690-E372-4039-9DEC-79DF2C152EE3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D3C1690-E372-4039-9DEC-79DF2C152EE3}.Debug|x64.ActiveCfg = Debug|Any CPU - {7D3C1690-E372-4039-9DEC-79DF2C152EE3}.Debug|x64.Build.0 = Debug|Any CPU - {7D3C1690-E372-4039-9DEC-79DF2C152EE3}.Debug|x86.ActiveCfg = Debug|Any CPU - {7D3C1690-E372-4039-9DEC-79DF2C152EE3}.Debug|x86.Build.0 = Debug|Any CPU - {7D3C1690-E372-4039-9DEC-79DF2C152EE3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D3C1690-E372-4039-9DEC-79DF2C152EE3}.Release|Any CPU.Build.0 = Release|Any CPU - {7D3C1690-E372-4039-9DEC-79DF2C152EE3}.Release|x64.ActiveCfg = Release|Any CPU - {7D3C1690-E372-4039-9DEC-79DF2C152EE3}.Release|x64.Build.0 = Release|Any CPU - {7D3C1690-E372-4039-9DEC-79DF2C152EE3}.Release|x86.ActiveCfg = Release|Any CPU - {7D3C1690-E372-4039-9DEC-79DF2C152EE3}.Release|x86.Build.0 = Release|Any CPU {4B4E0ED3-60D5-4C26-A6EA-CF43EBC38A52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4B4E0ED3-60D5-4C26-A6EA-CF43EBC38A52}.Debug|Any CPU.Build.0 = Debug|Any CPU {4B4E0ED3-60D5-4C26-A6EA-CF43EBC38A52}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1247,7 +1233,6 @@ Global {2DA624B6-9A98-4219-978F-E90AD4166353} = {22A687BB-5170-4312-97CD-0FECA1C3FE98} {0C5B4770-06C4-4B36-944C-D0CAE012967C} = {22A687BB-5170-4312-97CD-0FECA1C3FE98} {61A59575-D976-486D-979D-AD06373667EE} = {22A687BB-5170-4312-97CD-0FECA1C3FE98} - {7D3C1690-E372-4039-9DEC-79DF2C152EE3} = {22A687BB-5170-4312-97CD-0FECA1C3FE98} {4B4E0ED3-60D5-4C26-A6EA-CF43EBC38A52} = {22A687BB-5170-4312-97CD-0FECA1C3FE98} {8AC04CA6-7638-4F46-B31F-ECA93C38826D} = {22A687BB-5170-4312-97CD-0FECA1C3FE98} {4D32D558-5520-48EE-AA34-ED235772155D} = {22A687BB-5170-4312-97CD-0FECA1C3FE98} diff --git a/src/Identity/Specification.Tests/src/IdentitySpecificationTestBase.cs b/src/Identity/Specification.Tests/src/IdentitySpecificationTestBase.cs index 9d43420682..4e67e26253 100644 --- a/src/Identity/Specification.Tests/src/IdentitySpecificationTestBase.cs +++ b/src/Identity/Specification.Tests/src/IdentitySpecificationTestBase.cs @@ -7,7 +7,6 @@ using System.Linq; using System.Linq.Expressions; using System.Security.Claims; using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Xunit; @@ -129,10 +128,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanCreateRoleTest() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateRoleManager(); var roleName = "create" + Guid.NewGuid().ToString(); var role = CreateTestRole(roleName, useRoleNamePrefixAsRoleName: true); @@ -169,10 +164,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task BadValidatorBlocksCreateRole() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateRoleManager(); manager.RoleValidators.Clear(); manager.RoleValidators.Add(new AlwaysBadValidator()); @@ -189,10 +180,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanChainRoleValidators() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateRoleManager(); manager.RoleValidators.Clear(); manager.RoleValidators.Add(new AlwaysBadValidator()); @@ -211,10 +198,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task BadValidatorBlocksRoleUpdate() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateRoleManager(); var role = CreateTestRole("poorguy"); IdentityResultAssert.IsSuccess(await manager.CreateAsync(role)); @@ -232,10 +215,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanDeleteRole() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateRoleManager(); var roleName = "delete" + Guid.NewGuid().ToString(); var role = CreateTestRole(roleName, useRoleNamePrefixAsRoleName: true); @@ -253,10 +232,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanAddRemoveRoleClaim() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateRoleManager(); var role = CreateTestRole("ClaimsAddRemove"); var roleSafe = CreateTestRole("ClaimsAdd"); @@ -296,10 +271,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanRoleFindById() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateRoleManager(); var role = CreateTestRole("FindByIdAsync"); Assert.Null(await manager.FindByIdAsync(await manager.GetRoleIdAsync(role))); @@ -314,10 +285,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanRoleFindByName() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateRoleManager(); var roleName = "FindByNameAsync" + Guid.NewGuid().ToString(); var role = CreateTestRole(roleName, useRoleNamePrefixAsRoleName: true); @@ -334,10 +301,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanUpdateRoleName() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateRoleManager(); var roleName = "update" + Guid.NewGuid().ToString(); var role = CreateTestRole(roleName, useRoleNamePrefixAsRoleName: true); @@ -357,10 +320,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanQueryableRoles() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateRoleManager(); if (manager.SupportsQueryableRoles) { @@ -384,10 +343,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CreateRoleFailsIfExists() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateRoleManager(); var roleName = "dupeRole" + Guid.NewGuid().ToString(); var role = CreateTestRole(roleName, useRoleNamePrefixAsRoleName: true); @@ -405,10 +360,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanAddUsersToRole() { - if (ShouldSkipDbTests()) - { - return; - } var context = CreateTestContext(); var manager = CreateManager(context); var roleManager = CreateRoleManager(context); @@ -434,11 +385,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanGetRolesForUser() { - if (ShouldSkipDbTests()) - { - return; - } - var context = CreateTestContext(); var userManager = CreateManager(context); var roleManager = CreateRoleManager(context); @@ -477,10 +423,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task RemoveUserFromRoleWithMultipleRoles() { - if (ShouldSkipDbTests()) - { - return; - } var context = CreateTestContext(); var userManager = CreateManager(context); var roleManager = CreateRoleManager(context); @@ -504,10 +446,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanRemoveUsersFromRole() { - if (ShouldSkipDbTests()) - { - return; - } var context = CreateTestContext(); var userManager = CreateManager(context); var roleManager = CreateRoleManager(context); @@ -538,10 +476,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task RemoveUserNotInRoleFails() { - if (ShouldSkipDbTests()) - { - return; - } var context = CreateTestContext(); var userMgr = CreateManager(context); var roleMgr = CreateRoleManager(context); @@ -562,10 +496,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task AddUserToRoleFailsIfAlreadyInRole() { - if (ShouldSkipDbTests()) - { - return; - } var context = CreateTestContext(); var userMgr = CreateManager(context); var roleMgr = CreateRoleManager(context); @@ -587,10 +517,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task AddUserToRolesIgnoresDuplicates() { - if (ShouldSkipDbTests()) - { - return; - } var context = CreateTestContext(); var userMgr = CreateManager(context); var roleMgr = CreateRoleManager(context); @@ -611,10 +537,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanFindRoleByNameWithManager() { - if (ShouldSkipDbTests()) - { - return; - } var roleMgr = CreateRoleManager(); var roleName = "findRoleByNameTest" + Guid.NewGuid().ToString(); var role = CreateTestRole(roleName, useRoleNamePrefixAsRoleName: true); @@ -629,10 +551,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanFindRoleWithManager() { - if (ShouldSkipDbTests()) - { - return; - } var roleMgr = CreateRoleManager(); var roleName = "findRoleTest" + Guid.NewGuid().ToString(); var role = CreateTestRole(roleName, useRoleNamePrefixAsRoleName: true); @@ -647,10 +565,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanGetUsersInRole() { - if (ShouldSkipDbTests()) - { - return; - } var context = CreateTestContext(); var manager = CreateManager(context); var roleManager = CreateRoleManager(context); diff --git a/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs b/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs index b5fe50375a..9b743e4cf9 100644 --- a/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs +++ b/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs @@ -7,7 +7,6 @@ using System.Linq; using System.Linq.Expressions; using System.Security.Claims; using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.DependencyInjection; @@ -72,12 +71,6 @@ namespace Microsoft.AspNetCore.Identity.Test return builder; } - /// - /// If true, tests that require a database will be skipped. - /// - /// - protected virtual bool ShouldSkipDbTests() => false; - /// /// Creates the user manager used for tests. /// @@ -184,10 +177,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task PasswordValidatorWithNoErrorsCanBlockAddPassword() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -203,10 +192,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CreateUserWillSetCreateDateOnlyIfSupported() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -220,10 +205,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanDeleteUser() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -239,10 +220,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanUpdateUserName() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var name = Guid.NewGuid().ToString(); var user = CreateTestUser(name); @@ -262,10 +239,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CheckSetUserNameValidatesUser() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var username = "UpdateAsync" + Guid.NewGuid().ToString(); var newUsername = "New" + Guid.NewGuid().ToString(); @@ -294,10 +267,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task SetUserNameUpdatesSecurityStamp() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var username = "UpdateAsync" + Guid.NewGuid().ToString(); var newUsername = "New" + Guid.NewGuid().ToString(); @@ -316,10 +285,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task ResetAuthenticatorKeyUpdatesSecurityStamp() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var username = "Create" + Guid.NewGuid().ToString(); var user = CreateTestUser(username, useNamePrefixAsUserName: true); @@ -336,10 +301,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CheckSetEmailValidatesUser() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); manager.Options.User.RequireUniqueEmail = true; manager.UserValidators.Add(new UserValidator()); @@ -363,10 +324,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanUpdatePasswordUsingHasher() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser("UpdatePassword"); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user, "password")); @@ -387,10 +344,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanFindById() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -404,10 +357,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task UserValidatorCanBlockCreate() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); manager.UserValidators.Clear(); @@ -423,10 +372,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task UserValidatorCanBlockUpdate() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -443,10 +388,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanChainUserValidators() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); manager.UserValidators.Clear(); var user = CreateTestUser(); @@ -467,10 +408,6 @@ namespace Microsoft.AspNetCore.Identity.Test [InlineData(null)] public async Task UserValidatorBlocksShortEmailsWhenRequiresUniqueEmail(string email) { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); manager.Options.User.RequireUniqueEmail = true; @@ -486,10 +423,6 @@ namespace Microsoft.AspNetCore.Identity.Test [InlineData("bogus")] public async Task UserValidatorBlocksInvalidEmailsWhenRequiresUniqueEmail(string email) { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser("UpdateBlocked", email); manager.Options.User.RequireUniqueEmail = true; @@ -503,10 +436,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task PasswordValidatorCanBlockAddPassword() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -524,10 +453,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanChainPasswordValidators() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); manager.PasswordValidators.Clear(); manager.PasswordValidators.Add(new EmptyBadValidator()); @@ -546,10 +471,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task PasswordValidatorWithNoErrorsCanBlockChangePassword() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user, "password")); @@ -565,10 +486,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task PasswordValidatorWithNoErrorsCanBlockCreateUser() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); manager.PasswordValidators.Clear(); @@ -583,10 +500,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task PasswordValidatorWithNoErrorsCanBlockResetPasswordWithStaticTokenProvider() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); manager.RegisterTokenProvider("Static", new StaticTokenProvider()); manager.Options.Tokens.PasswordResetTokenProvider = "Static"; @@ -611,10 +524,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task PasswordValidatorCanBlockChangePassword() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user, "password")); @@ -632,10 +541,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task PasswordValidatorCanBlockCreateUser() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); manager.PasswordValidators.Clear(); @@ -651,10 +556,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanCreateUserNoPassword() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var username = "CreateUserTest" + Guid.NewGuid(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(CreateTestUser(username, useNamePrefixAsUserName: true))); @@ -674,10 +575,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanCreateUserAddLogin() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); const string provider = "ZzAuth"; const string display = "display"; @@ -700,10 +597,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanCreateUserLoginAndAddPassword() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -727,10 +620,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task AddPasswordFailsIfAlreadyHave() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user, "Password")); @@ -747,10 +636,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanCreateUserAddRemoveLogin() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); var result = await manager.CreateAsync(user); @@ -782,10 +667,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanRemovePassword() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser("CanRemovePassword"); const string password = "password"; @@ -806,10 +687,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanChangePassword() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); const string password = "password"; @@ -830,10 +707,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanAddRemoveUserClaim() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -863,10 +736,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task RemoveClaimOnlyAffectsUser() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); var user2 = CreateTestUser(); @@ -900,10 +769,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanReplaceUserClaim() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -927,10 +792,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task ReplaceUserClaimOnlyAffectsUser() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); var user2 = CreateTestUser(); @@ -964,10 +825,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task ChangePasswordFallsIfPasswordWrong() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user, "password")); @@ -983,10 +840,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task AddDupeUserNameFails() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var username = "AddDupeUserNameFails" + Guid.NewGuid(); var user = CreateTestUser(username, useNamePrefixAsUserName: true); @@ -1002,10 +855,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task AddDupeEmailAllowedByDefault() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(email: "yup@yup.com"); var user2 = CreateTestUser(email: "yup@yup.com"); @@ -1021,10 +870,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task AddDupeEmailFailsWhenUniqueEmailRequired() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); manager.Options.User.RequireUniqueEmail = true; var user = CreateTestUser(email: "FooUser@yup.com"); @@ -1040,10 +885,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task UpdateSecurityStampActuallyChanges() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -1059,10 +900,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task AddDupeLoginFails() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); var login = new UserLoginInfo("Provider", "key", "display"); @@ -1082,10 +919,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanFindByEmail() { - if (ShouldSkipDbTests()) - { - return; - } var email = "foouser@test.com"; var manager = CreateManager(); var user = CreateTestUser(email: email); @@ -1101,11 +934,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async virtual Task CanFindUsersViaUserQuerable() { - if (ShouldSkipDbTests()) - { - return; - } - var mgr = CreateManager(); if (mgr.SupportsQueryableUsers) { @@ -1126,10 +954,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task ConfirmEmailFalseByDefaultTest() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -1166,10 +990,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanResetPasswordWithStaticTokenProvider() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); manager.RegisterTokenProvider("Static", new StaticTokenProvider()); manager.Options.Tokens.PasswordResetTokenProvider = "Static"; @@ -1195,10 +1015,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task PasswordValidatorCanBlockResetPasswordWithStaticTokenProvider() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); manager.RegisterTokenProvider("Static", new StaticTokenProvider()); manager.Options.Tokens.PasswordResetTokenProvider = "Static"; @@ -1225,10 +1041,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task ResetPasswordWithStaticTokenProviderFailsWithWrongToken() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); manager.RegisterTokenProvider("Static", new StaticTokenProvider()); manager.Options.Tokens.PasswordResetTokenProvider = "Static"; @@ -1251,10 +1063,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanGenerateAndVerifyUserTokenWithStaticTokenProvider() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); manager.RegisterTokenProvider("Static", new StaticTokenProvider()); var user = CreateTestUser(); @@ -1283,10 +1091,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanConfirmEmailWithStaticToken() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); manager.RegisterTokenProvider("Static", new StaticTokenProvider()); manager.Options.Tokens.EmailConfirmationTokenProvider = "Static"; @@ -1309,10 +1113,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task ConfirmEmailWithStaticTokenFailsWithWrongToken() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); manager.RegisterTokenProvider("Static", new StaticTokenProvider()); manager.Options.Tokens.EmailConfirmationTokenProvider = "Static"; @@ -1331,10 +1131,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task ConfirmTokenFailsAfterPasswordChange() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(namePrefix: "Test"); Assert.False(await manager.IsEmailConfirmedAsync(user)); @@ -1356,10 +1152,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task SingleFailureLockout() { - if (ShouldSkipDbTests()) - { - return; - } var mgr = CreateManager(); mgr.Options.Lockout.DefaultLockoutTimeSpan = TimeSpan.FromHours(1); mgr.Options.Lockout.MaxFailedAccessAttempts = 0; @@ -1382,10 +1174,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task TwoFailureLockout() { - if (ShouldSkipDbTests()) - { - return; - } var mgr = CreateManager(); mgr.Options.Lockout.DefaultLockoutTimeSpan = TimeSpan.FromHours(1); mgr.Options.Lockout.MaxFailedAccessAttempts = 2; @@ -1411,10 +1199,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task ResetAccessCountPreventsLockout() { - if (ShouldSkipDbTests()) - { - return; - } var mgr = CreateManager(); mgr.Options.Lockout.DefaultLockoutTimeSpan = TimeSpan.FromHours(1); mgr.Options.Lockout.MaxFailedAccessAttempts = 2; @@ -1443,10 +1227,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanEnableLockoutManuallyAndLockout() { - if (ShouldSkipDbTests()) - { - return; - } var mgr = CreateManager(); mgr.Options.Lockout.DefaultLockoutTimeSpan = TimeSpan.FromHours(1); mgr.Options.Lockout.AllowedForNewUsers = false; @@ -1475,10 +1255,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task UserNotLockedOutWithNullDateTimeAndIsSetToNullDate() { - if (ShouldSkipDbTests()) - { - return; - } var mgr = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await mgr.CreateAsync(user)); @@ -1495,10 +1271,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task LockoutFailsIfNotEnabled() { - if (ShouldSkipDbTests()) - { - return; - } var mgr = CreateManager(); mgr.Options.Lockout.AllowedForNewUsers = false; var user = CreateTestUser(); @@ -1517,10 +1289,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task LockoutEndToUtcNowMinus1SecInUserShouldNotBeLockedOut() { - if (ShouldSkipDbTests()) - { - return; - } var mgr = CreateManager(); var user = CreateTestUser(lockoutEnd: DateTimeOffset.UtcNow.AddSeconds(-1)); IdentityResultAssert.IsSuccess(await mgr.CreateAsync(user)); @@ -1535,10 +1303,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task LockoutEndToUtcNowSubOneSecondWithManagerShouldNotBeLockedOut() { - if (ShouldSkipDbTests()) - { - return; - } var mgr = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await mgr.CreateAsync(user)); @@ -1554,10 +1318,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task LockoutEndToUtcNowPlus5ShouldBeLockedOut() { - if (ShouldSkipDbTests()) - { - return; - } var mgr = CreateManager(); var lockoutEnd = DateTimeOffset.UtcNow.AddMinutes(5); var user = CreateTestUser(lockoutEnd: lockoutEnd); @@ -1573,10 +1333,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task UserLockedOutWithDateTimeLocalKindNowPlus30() { - if (ShouldSkipDbTests()) - { - return; - } var mgr = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await mgr.CreateAsync(user)); @@ -1595,10 +1351,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task SetPhoneNumberTest() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(phoneNumber: "123-456-7890"); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -1616,10 +1368,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanChangePhoneNumber() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(phoneNumber: "123-456-7890"); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -1639,10 +1387,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task ChangePhoneNumberTokenIsInt() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(phoneNumber: "123-456-7890"); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -1657,10 +1401,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task ChangePhoneNumberFailsWithWrongToken() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(phoneNumber: "123-456-7890"); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -1693,10 +1433,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task ChangePhoneNumberWithCustomProvider() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); manager.RegisterTokenProvider("Yes", new YesPhoneNumberProvider()); manager.Options.Tokens.ChangePhoneNumberTokenProvider = "Yes"; @@ -1717,10 +1453,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task ChangePhoneNumberFailsWithWrongPhoneNumber() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(phoneNumber: "123-456-7890"); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -1741,10 +1473,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanVerifyPhoneNumber() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -1770,10 +1498,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanChangeEmail() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser("foouser"); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -1796,10 +1520,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanChangeEmailOnlyIfEmailSame() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser("foouser"); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -1824,10 +1544,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanChangeEmailWithDifferentTokenProvider() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(context: null, services: null, configureServices: s => s.Configure( o => o.Tokens.ProviderMap["NewProvider2"] = new TokenProviderDescriptor(typeof(EmailTokenProvider)))); @@ -1853,10 +1569,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task ChangeEmailTokensFailsAfterEmailChanged() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser("foouser"); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -1880,10 +1592,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task ChangeEmailFailsWithWrongToken() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser("foouser"); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -1907,10 +1615,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task ChangeEmailFailsWithEmail() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser("foouser"); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -1936,10 +1640,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/1766", FlakyOn.All)] public async Task EmailFactorFailsAfterSecurityStampChangeTest() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); string factorId = "Email"; //default var user = CreateTestUser("foouser"); @@ -1970,10 +1670,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task EnableTwoFactorChangesSecurityStamp() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -1991,10 +1687,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task GenerateTwoFactorWithUnknownFactorProviderWillThrow() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -2020,10 +1712,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task GetValidTwoFactorTestEmptyWithNoProviders() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -2039,10 +1727,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanGetSetUpdateAndRemoveUserToken() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -2067,10 +1751,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanRedeemRecoveryCodeOnlyOnce() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -2099,10 +1779,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task RecoveryCodesInvalidAfterReplace() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -2131,10 +1807,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanGetValidTwoFactor() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -2175,10 +1847,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task PhoneFactorFailsAfterSecurityStampChangeTest() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var factorId = "Phone"; // default var user = CreateTestUser(phoneNumber: "4251234567"); @@ -2199,10 +1867,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task VerifyTokenFromWrongTokenProviderFails() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(phoneNumber: "4251234567"); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -2219,10 +1883,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task VerifyWithWrongSmsTokenFails() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); var user = CreateTestUser(phoneNumber: "4251234567"); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); @@ -2237,10 +1897,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task NullableDateTimeOperationTest() { - if (ShouldSkipDbTests()) - { - return; - } var userMgr = CreateManager(); var user = CreateTestUser(lockoutEnabled: true); IdentityResultAssert.IsSuccess(await userMgr.CreateAsync(user)); @@ -2263,10 +1919,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Fact] public async Task CanGetUsersWithClaims() { - if (ShouldSkipDbTests()) - { - return; - } var manager = CreateManager(); for (int i = 0; i < 6; i++) diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/EnableAuthenticator.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/EnableAuthenticator.cshtml index b0c518da87..0582c64a83 100644 --- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/EnableAuthenticator.cshtml +++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/EnableAuthenticator.cshtml @@ -13,7 +13,6 @@

  • Download a two-factor authenticator app like Microsoft Authenticator for - Windows Phone, Android and iOS or Google Authenticator for diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/EnableAuthenticator.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/EnableAuthenticator.cshtml index a8811619b8..4fa09d2fd9 100644 --- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/EnableAuthenticator.cshtml +++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/EnableAuthenticator.cshtml @@ -13,7 +13,6 @@

  • Download a two-factor authenticator app like Microsoft Authenticator for - Windows Phone, Android and iOS or Google Authenticator for diff --git a/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj index 10e7db1165..f34b186e0d 100644 --- a/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj +++ b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj @@ -22,6 +22,7 @@ + diff --git a/src/Identity/test/Identity.FunctionalTests/AuthorizationTests.cs b/src/Identity/test/Identity.FunctionalTests/AuthorizationTests.cs index c4a1b43083..3ccc399bfd 100644 --- a/src/Identity/test/Identity.FunctionalTests/AuthorizationTests.cs +++ b/src/Identity/test/Identity.FunctionalTests/AuthorizationTests.cs @@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Identity.FunctionalTests where TStartup : class where TContext : DbContext { - public AuthorizationTests(ServerFactory serverFactory) + protected AuthorizationTests(ServerFactory serverFactory) { ServerFactory = serverFactory; } diff --git a/src/Identity/test/Identity.FunctionalTests/Infrastructure/FunctionalTestsServiceCollectionExtensions.cs b/src/Identity/test/Identity.FunctionalTests/Infrastructure/FunctionalTestsServiceCollectionExtensions.cs index 50f67cad09..9070d6ba14 100644 --- a/src/Identity/test/Identity.FunctionalTests/Infrastructure/FunctionalTestsServiceCollectionExtensions.cs +++ b/src/Identity/test/Identity.FunctionalTests/Infrastructure/FunctionalTestsServiceCollectionExtensions.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.Data.Common; using System.Security.Claims; using System.Threading.Tasks; using Identity.DefaultUI.WebSite; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.AspNetCore.Mvc.Authorization; using Microsoft.EntityFrameworkCore; @@ -18,10 +18,10 @@ namespace Microsoft.AspNetCore.Identity.FunctionalTests { public static class FunctionalTestsServiceCollectionExtensions { - public static IServiceCollection SetupTestDatabase(this IServiceCollection services, string databaseName) where TContext : DbContext => + public static IServiceCollection SetupTestDatabase(this IServiceCollection services, DbConnection connection) where TContext : DbContext => services.AddDbContext(options => options.ConfigureWarnings(b => b.Log(CoreEventId.ManyServiceProvidersCreatedWarning)) - .UseInMemoryDatabase(databaseName, memoryOptions => { })); + .UseSqlite(connection)); public static IServiceCollection SetupTestThirdPartyLogin(this IServiceCollection services) => services.AddAuthentication() diff --git a/src/Identity/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs b/src/Identity/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs index af4a6d9b81..e84840aa68 100644 --- a/src/Identity/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs +++ b/src/Identity/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs @@ -3,19 +3,24 @@ using System; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.AspNetCore.Mvc.Testing; +using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; namespace Microsoft.AspNetCore.Identity.FunctionalTests { - public class ServerFactory: WebApplicationFactory + public class ServerFactory: WebApplicationFactory where TStartup : class where TContext : DbContext { + private readonly SqliteConnection _connection + = new SqliteConnection($"DataSource=:memory:"); + public ServerFactory() { + _connection.Open(); + ClientOptions.AllowAutoRedirect = false; ClientOptions.BaseAddress = new Uri("https://localhost"); } @@ -24,11 +29,30 @@ namespace Microsoft.AspNetCore.Identity.FunctionalTests { base.ConfigureWebHost(builder); builder.UseStartup(); - builder.ConfigureServices(sc => sc.SetupTestDatabase(Guid.NewGuid().ToString()) + + builder.ConfigureServices(sc => + { + sc.SetupTestDatabase(_connection) .AddMvc() // Mark the cookie as essential for right now, as Identity uses it on // several places to pass important data in post-redirect-get flows. - .AddCookieTempDataProvider(o => o.Cookie.IsEssential = true)); + .AddCookieTempDataProvider(o => o.Cookie.IsEssential = true); + }); + } + + public override void EnsureDatabaseCreated() + { + using (var scope = Services.CreateScope()) + { + scope.ServiceProvider.GetService().Database.EnsureCreated(); + } + } + + protected override void Dispose(bool disposing) + { + _connection.Dispose(); + + base.Dispose(disposing); } } } diff --git a/src/Identity/test/Identity.FunctionalTests/LoginTests.cs b/src/Identity/test/Identity.FunctionalTests/LoginTests.cs index dc1124a664..d49255a001 100644 --- a/src/Identity/test/Identity.FunctionalTests/LoginTests.cs +++ b/src/Identity/test/Identity.FunctionalTests/LoginTests.cs @@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Identity.FunctionalTests where TStartup : class where TContext : DbContext { - public LoginTests(ServerFactory serverFactory) + protected LoginTests(ServerFactory serverFactory) { ServerFactory = serverFactory; } @@ -289,6 +289,8 @@ namespace Microsoft.AspNetCore.Identity.FunctionalTests var server = ServerFactory.WithWebHostBuilder(whb => whb.ConfigureServices(ConfigureTestServices)); + ServerFactory.EnsureDatabaseCreated(); + var client = server.CreateClient(); var newClient = server.CreateClient(); @@ -311,6 +313,8 @@ namespace Microsoft.AspNetCore.Identity.FunctionalTests var server = ServerFactory.WithWebHostBuilder(whb => whb.ConfigureServices(ConfigureTestServices)); + ServerFactory.EnsureDatabaseCreated(); + var client = server.CreateClient(); var resetPasswordClient = server.CreateClient(); var newClient = server.CreateClient(); diff --git a/src/Identity/test/Identity.FunctionalTests/ManagementTests.cs b/src/Identity/test/Identity.FunctionalTests/ManagementTests.cs index 6bb5c8e64d..f370d0dec3 100644 --- a/src/Identity/test/Identity.FunctionalTests/ManagementTests.cs +++ b/src/Identity/test/Identity.FunctionalTests/ManagementTests.cs @@ -289,6 +289,8 @@ namespace Microsoft.AspNetCore.Identity.FunctionalTests .WithWebHostBuilder(whb => whb.ConfigureTestServices(ConfigureTestServices)) .CreateClient(); + ServerFactory.EnsureDatabaseCreated(); + var userName = $"{Guid.NewGuid()}@example.com"; var guid = Guid.NewGuid(); var email = userName; diff --git a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj index 3230a236b9..b3ab76bd7d 100644 --- a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj +++ b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/Identity/test/Identity.FunctionalTests/RegistrationTests.cs b/src/Identity/test/Identity.FunctionalTests/RegistrationTests.cs index dc07c17992..e1222ed381 100644 --- a/src/Identity/test/Identity.FunctionalTests/RegistrationTests.cs +++ b/src/Identity/test/Identity.FunctionalTests/RegistrationTests.cs @@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Identity.FunctionalTests where TStartup : class where TContext : DbContext { - public RegistrationTests(ServerFactory serverFactory) + protected RegistrationTests(ServerFactory serverFactory) { ServerFactory = serverFactory; } @@ -31,6 +31,8 @@ namespace Microsoft.AspNetCore.Identity.FunctionalTests .WithWebHostBuilder(whb => whb.ConfigureServices(ConfigureTestServices)) .CreateClient(); + ServerFactory.EnsureDatabaseCreated(); + var userName = $"{Guid.NewGuid()}@example.com"; var password = $"!Test.Password1$"; @@ -49,6 +51,8 @@ namespace Microsoft.AspNetCore.Identity.FunctionalTests var client = server.CreateClient(); var client2 = server.CreateClient(); + ServerFactory.EnsureDatabaseCreated(); + var userName = $"{Guid.NewGuid()}@example.com"; var password = $"!Test.Password1$"; @@ -81,6 +85,8 @@ namespace Microsoft.AspNetCore.Identity.FunctionalTests var client = server.CreateClient(); var client2 = server.CreateClient(); + ServerFactory.EnsureDatabaseCreated(); + var userName = $"{Guid.NewGuid()}@example.com"; var password = $"!Test.Password1$"; @@ -102,6 +108,8 @@ namespace Microsoft.AspNetCore.Identity.FunctionalTests .WithWebHostBuilder(whb => whb.ConfigureServices(ConfigureTestServices)) .CreateClient(); + ServerFactory.EnsureDatabaseCreated(); + var userName = $"{Guid.NewGuid()}@example.com"; var password = $"!Test.Password1$"; @@ -121,6 +129,8 @@ namespace Microsoft.AspNetCore.Identity.FunctionalTests .WithWebHostBuilder(whb => whb.ConfigureServices(ConfigureTestServices)) .CreateClient(); + ServerFactory.EnsureDatabaseCreated(); + var guid = Guid.NewGuid(); var userName = $"{guid}"; var email = $"{guid}@example.com"; @@ -141,6 +151,8 @@ namespace Microsoft.AspNetCore.Identity.FunctionalTests .WithWebHostBuilder(whb => whb.ConfigureServices(ConfigureTestServices)) .CreateClient(); + ServerFactory.EnsureDatabaseCreated(); + var guid = Guid.NewGuid(); var userName = $"{guid}"; var email = $"{guid}@example.com"; @@ -162,6 +174,8 @@ namespace Microsoft.AspNetCore.Identity.FunctionalTests .WithWebHostBuilder(whb => whb.ConfigureServices(ConfigureTestServices)) .CreateClient(); + ServerFactory.EnsureDatabaseCreated(); + var guid = Guid.NewGuid(); var userName = $"{guid}"; var email = $"{guid}@example.com"; diff --git a/src/Identity/test/Identity.Test/SignInManagerTest.cs b/src/Identity/test/Identity.Test/SignInManagerTest.cs index 636df0e3f8..007942d424 100644 --- a/src/Identity/test/Identity.Test/SignInManagerTest.cs +++ b/src/Identity/test/Identity.Test/SignInManagerTest.cs @@ -202,10 +202,9 @@ namespace Microsoft.AspNetCore.Identity.Test manager.Setup(m => m.SupportsUserLockout).Returns(true).Verifiable(); manager.Setup(m => m.IsLockedOutAsync(user)).ReturnsAsync(false).Verifiable(); manager.Setup(m => m.CheckPasswordAsync(user, "password")).ReturnsAsync(true).Verifiable(); - var context = new DefaultHttpContext(); var auth = MockAuth(context); - SetupSignIn(context, auth, user.Id, isPersistent); + SetupSignIn(context, auth, user.Id, isPersistent, loginProvider: null, amr: "pwd"); var helper = SetupSignInManager(manager.Object, context); // Act @@ -229,7 +228,7 @@ namespace Microsoft.AspNetCore.Identity.Test var context = new DefaultHttpContext(); var auth = MockAuth(context); - SetupSignIn(context, auth, user.Id, false); + SetupSignIn(context, auth, user.Id, false, loginProvider: null, amr: "pwd"); var helper = SetupSignInManager(manager.Object, context); // Act @@ -579,7 +578,7 @@ namespace Microsoft.AspNetCore.Identity.Test { CallBase = true }; //signInManager.Setup(s => s.SignInAsync(user, It.Is(p => p.IsPersistent == isPersistent), //externalLogin? loginProvider : null)).Returns(Task.FromResult(0)).Verifiable(); - signInManager.Setup(s => s.SignInAsync(user, It.IsAny(), null)).Returns(Task.FromResult(0)).Verifiable(); + signInManager.Setup(s => s.SignInWithClaimsAsync(user, It.IsAny(), It.IsAny>())).Returns(Task.FromResult(0)).Verifiable(); signInManager.Object.Context = context; // Act @@ -632,6 +631,7 @@ namespace Microsoft.AspNetCore.Identity.Test auth.Setup(a => a.SignInAsync(context, IdentityConstants.ApplicationScheme, It.Is(i => i.FindFirstValue(ClaimTypes.AuthenticationMethod) == loginProvider + && i.FindFirstValue("amr") == "mfa" && i.FindFirstValue(ClaimTypes.NameIdentifier) == user.Id), It.IsAny())).Returns(Task.FromResult(0)).Verifiable(); // REVIEW: restore ability to test is persistent @@ -641,7 +641,7 @@ namespace Microsoft.AspNetCore.Identity.Test } else { - SetupSignIn(context, auth, user.Id); + SetupSignIn(context, auth, user.Id, isPersistent, null, "mfa"); } if (rememberClient) { @@ -864,7 +864,7 @@ namespace Microsoft.AspNetCore.Identity.Test if (confirmed) { manager.Setup(m => m.CheckPasswordAsync(user, "password")).ReturnsAsync(true).Verifiable(); - SetupSignIn(context, auth); + SetupSignIn(context, auth, user.Id, isPersistent: null, loginProvider: null, amr: "pwd"); } var identityOptions = new IdentityOptions(); identityOptions.SignIn.RequireConfirmedEmail = true; @@ -893,13 +893,14 @@ namespace Microsoft.AspNetCore.Identity.Test auth.Verify(); } - private static void SetupSignIn(HttpContext context, Mock auth, string userId = null, bool? isPersistent = null, string loginProvider = null) + private static void SetupSignIn(HttpContext context, Mock auth, string userId = null, bool? isPersistent = null, string loginProvider = null, string amr = null) { auth.Setup(a => a.SignInAsync(context, IdentityConstants.ApplicationScheme, It.Is(id => (userId == null || id.FindFirstValue(ClaimTypes.NameIdentifier) == userId) && - (loginProvider == null || id.FindFirstValue(ClaimTypes.AuthenticationMethod) == loginProvider)), + (loginProvider == null || id.FindFirstValue(ClaimTypes.AuthenticationMethod) == loginProvider) && + (amr == null || id.FindFirstValue("amr") == amr)), It.Is(v => isPersistent == null || v.IsPersistent == isPersistent))).Returns(Task.FromResult(0)).Verifiable(); } @@ -917,7 +918,7 @@ namespace Microsoft.AspNetCore.Identity.Test if (confirmed) { manager.Setup(m => m.CheckPasswordAsync(user, "password")).ReturnsAsync(true).Verifiable(); - SetupSignIn(context, auth); + SetupSignIn(context, auth, user.Id, isPersistent: null, loginProvider: null, amr: "pwd"); } var identityOptions = new IdentityOptions(); diff --git a/src/Identity/test/InMemory.Test/InMemoryUserStoreTest.cs b/src/Identity/test/InMemory.Test/InMemoryUserStoreTest.cs index aa9c992523..ac7a08caa6 100644 --- a/src/Identity/test/InMemory.Test/InMemoryUserStoreTest.cs +++ b/src/Identity/test/InMemory.Test/InMemoryUserStoreTest.cs @@ -4,11 +4,13 @@ using System; using System.Linq.Expressions; using Microsoft.AspNetCore.Identity.Test; +using Microsoft.Data.Sqlite; using Microsoft.Extensions.DependencyInjection; +using Xunit; namespace Microsoft.AspNetCore.Identity.InMemory.Test { - public class InMemoryUserStoreTest : UserManagerSpecificationTestBase + public class InMemoryUserStoreTest : UserManagerSpecificationTestBase, IClassFixture { protected override object CreateTestContext() { @@ -41,5 +43,22 @@ namespace Microsoft.AspNetCore.Identity.InMemory.Test protected override Expression> UserNameEqualsPredicate(string userName) => u => u.UserName == userName; protected override Expression> UserNameStartsWithPredicate(string userName) => u => u.UserName.StartsWith(userName); + + public class Fixture : IDisposable + { + private readonly SqliteConnection _connection + = new SqliteConnection($"DataSource=:memory:"); + + public Fixture() + { + _connection.Open(); + } + + public void Dispose() + { + _connection.Close(); + _connection.Dispose(); + } + } } -} \ No newline at end of file +} diff --git a/src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj b/src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj index 8f4c117c4e..4026796ab7 100644 --- a/src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj +++ b/src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.0 @@ -14,6 +14,7 @@ + diff --git a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj index 2ef50e8c63..6694256075 100644 --- a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj +++ b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj @@ -3,7 +3,7 @@ /usr/share/dotnet/ - $(TargetingPackInstallerBaseName)-$(TargetingPackVersion)-x64.rpm + $(TargetingPackInstallerBaseName)-$(TargetingPackVersion).rpm $(TargetingPackLayoutRoot) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/msiutil.cpp b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/msiutil.cpp index 2a9b65ab37..a25dd4425b 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/msiutil.cpp +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/msiutil.cpp @@ -326,7 +326,7 @@ exit: WCHAR CA_DATA_DELIM[] = { '^', 0 }; // -// BUGBUG - Prefix will barf on this +// BUGBUG - Prefix will not handle this // Can I really trust this data hasn't been tampered with? // WCHAR * @@ -578,4 +578,4 @@ exit: IISLogWrite(SETUP_LOG_SEVERITY_INFORMATION, L"Error in function %s, hr=0x%x", UNITEXT(__FUNCTION__), hr); } return hr; -} \ No newline at end of file +} diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/DatabaseErrorPageMiddlewareTest.cs index bd38a0b981..60449f8ce8 100644 --- a/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/DatabaseErrorPageMiddlewareTest.cs +++ b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/DatabaseErrorPageMiddlewareTest.cs @@ -3,8 +3,6 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; -using System.Diagnostics; using System.Linq; using System.Net; using System.Net.Http; @@ -17,9 +15,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.TestHost; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Internal; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Xunit; @@ -160,8 +156,9 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests { db.SaveChanges(); } - catch (SqlException) + catch (Exception e) { + Assert.Equal("SqlException", e.GetType().Name); } } } @@ -351,17 +348,16 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests }); var server = new TestServer(builder); - var ex = await Assert.ThrowsAsync(async () => + try { - try - { - await server.CreateClient().GetAsync("http://localhost/"); - } - catch (InvalidOperationException exception) when (exception.InnerException != null) - { - throw exception.InnerException; - } - }); + await server.CreateClient().GetAsync("http://localhost/"); + } + catch (Exception exception) + { + Assert.True( + exception.GetType().Name == "SqlException" + || exception.InnerException?.GetType().Name == "SqlException"); + } Assert.Contains(logProvider.Logger.Messages.ToList(), m => m.StartsWith(StringsHelpers.GetResourceString("FormatDatabaseErrorPageMiddleware_ContextNotRegistered", typeof(BloggingContext)))); @@ -406,17 +402,16 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests var server = SetupTestServer(database, logProvider); - var ex = await Assert.ThrowsAsync(async () => + try { - try - { - await server.CreateClient().GetAsync("http://localhost/"); - } - catch (InvalidOperationException exception) when (exception.InnerException != null) - { - throw exception.InnerException; - } - }); + await server.CreateClient().GetAsync("http://localhost/"); + } + catch (Exception exception) + { + Assert.True( + exception.GetType().Name == "SqlException" + || exception.InnerException?.GetType().Name == "SqlException"); + } Assert.Contains(logProvider.Logger.Messages.ToList(), m => m.StartsWith(StringsHelpers.GetResourceString("FormatDatabaseErrorPageMiddleware_Exception"))); diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/SqlServerTestStore.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/SqlServerTestStore.cs index cfdfcf8d07..f77cc7e077 100644 --- a/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/SqlServerTestStore.cs +++ b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/SqlServerTestStore.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Data.SqlClient; using System.Threading; using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.Helpers; using Microsoft.EntityFrameworkCore; @@ -24,13 +23,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests private SqlServerTestStore(string name) { - _connectionString = new SqlConnectionStringBuilder - { - DataSource = @"(localdb)\MSSQLLocalDB", - InitialCatalog = name, - IntegratedSecurity = true, - ConnectTimeout = 600 - }.ConnectionString; + _connectionString = $@"Server=(localdb)\mssqllocaldb;Database={name};Timeout=600"; } public string ConnectionString @@ -57,4 +50,4 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests EnsureDeleted(); } } -} \ No newline at end of file +} diff --git a/src/Middleware/Diagnostics/test/FunctionalTests/DatabaseErrorPageSampleTest.cs b/src/Middleware/Diagnostics/test/FunctionalTests/DatabaseErrorPageSampleTest.cs index acb68868b1..f985dc7360 100644 --- a/src/Middleware/Diagnostics/test/FunctionalTests/DatabaseErrorPageSampleTest.cs +++ b/src/Middleware/Diagnostics/test/FunctionalTests/DatabaseErrorPageSampleTest.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Net; diff --git a/src/Middleware/HeaderPropagation/samples/HeaderPropagationSample/Program.cs b/src/Middleware/HeaderPropagation/samples/HeaderPropagationSample/Program.cs index 648d98e459..63aca35aa6 100644 --- a/src/Middleware/HeaderPropagation/samples/HeaderPropagationSample/Program.cs +++ b/src/Middleware/HeaderPropagation/samples/HeaderPropagationSample/Program.cs @@ -1,4 +1,3 @@ -using System.IO; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; diff --git a/src/Middleware/HeaderPropagation/samples/HeaderPropagationSample/Startup.cs b/src/Middleware/HeaderPropagation/samples/HeaderPropagationSample/Startup.cs index 6787910f19..00138f6efe 100644 --- a/src/Middleware/HeaderPropagation/samples/HeaderPropagationSample/Startup.cs +++ b/src/Middleware/HeaderPropagation/samples/HeaderPropagationSample/Startup.cs @@ -1,10 +1,7 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Net.Http; -using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.HeaderPropagation; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Extensions; diff --git a/src/Middleware/HeaderPropagation/src/DependencyInjection/HeaderPropagationServiceCollectionExtensions.cs b/src/Middleware/HeaderPropagation/src/DependencyInjection/HeaderPropagationServiceCollectionExtensions.cs index b175cd36e9..ab3d60cc0d 100644 --- a/src/Middleware/HeaderPropagation/src/DependencyInjection/HeaderPropagationServiceCollectionExtensions.cs +++ b/src/Middleware/HeaderPropagation/src/DependencyInjection/HeaderPropagationServiceCollectionExtensions.cs @@ -23,7 +23,6 @@ namespace Microsoft.Extensions.DependencyInjection } services.TryAddSingleton(); - services.TryAddTransient(); return services; } diff --git a/src/Middleware/HeaderPropagation/src/HeaderPropagationEntryCollection.cs b/src/Middleware/HeaderPropagation/src/HeaderPropagationEntryCollection.cs index c0d2617674..eac5086275 100644 --- a/src/Middleware/HeaderPropagation/src/HeaderPropagationEntryCollection.cs +++ b/src/Middleware/HeaderPropagation/src/HeaderPropagationEntryCollection.cs @@ -36,7 +36,7 @@ namespace Microsoft.AspNetCore.HeaderPropagation /// The header name to be propagated. /// /// A filter delegate that can be used to transform the header value. - /// . + /// See . /// public void Add(string headerName, Func valueFilter) { @@ -85,7 +85,7 @@ namespace Microsoft.AspNetCore.HeaderPropagation /// /// /// A filter delegate that can be used to transform the header value. - /// . + /// See . /// public void Add( string inboundHeaderName, diff --git a/src/Middleware/HttpOverrides/ref/Microsoft.AspNetCore.HttpOverrides.netcoreapp3.0.cs b/src/Middleware/HttpOverrides/ref/Microsoft.AspNetCore.HttpOverrides.netcoreapp3.0.cs index cb7ee21e14..f21794c54b 100644 --- a/src/Middleware/HttpOverrides/ref/Microsoft.AspNetCore.HttpOverrides.netcoreapp3.0.cs +++ b/src/Middleware/HttpOverrides/ref/Microsoft.AspNetCore.HttpOverrides.netcoreapp3.0.cs @@ -3,6 +3,10 @@ namespace Microsoft.AspNetCore.Builder { + public static partial class CertificateForwardingBuilderExtensions + { + public static Microsoft.AspNetCore.Builder.IApplicationBuilder UseCertificateForwarding(this Microsoft.AspNetCore.Builder.IApplicationBuilder app) { throw null; } + } public static partial class ForwardedHeadersExtensions { public static Microsoft.AspNetCore.Builder.IApplicationBuilder UseForwardedHeaders(this Microsoft.AspNetCore.Builder.IApplicationBuilder builder) { throw null; } @@ -37,6 +41,17 @@ namespace Microsoft.AspNetCore.Builder } namespace Microsoft.AspNetCore.HttpOverrides { + public partial class CertificateForwardingMiddleware + { + public CertificateForwardingMiddleware(Microsoft.AspNetCore.Http.RequestDelegate next, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.Extensions.Options.IOptions options) { } + public System.Threading.Tasks.Task Invoke(Microsoft.AspNetCore.Http.HttpContext httpContext) { throw null; } + } + public partial class CertificateForwardingOptions + { + public System.Func HeaderConverter; + public CertificateForwardingOptions() { } + public string CertificateHeader { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } [System.FlagsAttribute] public enum ForwardedHeaders { @@ -75,3 +90,10 @@ namespace Microsoft.AspNetCore.HttpOverrides public bool Contains(System.Net.IPAddress address) { throw null; } } } +namespace Microsoft.Extensions.DependencyInjection +{ + public static partial class CertificateForwardingServiceExtensions + { + public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddCertificateForwarding(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configure) { throw null; } + } +} diff --git a/src/Middleware/HttpOverrides/src/CertificateForwardingBuilderExtensions.cs b/src/Middleware/HttpOverrides/src/CertificateForwardingBuilderExtensions.cs new file mode 100644 index 0000000000..038b19b637 --- /dev/null +++ b/src/Middleware/HttpOverrides/src/CertificateForwardingBuilderExtensions.cs @@ -0,0 +1,30 @@ +// 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 Microsoft.AspNetCore.HttpOverrides; + +namespace Microsoft.AspNetCore.Builder +{ + ///

    + /// Extension methods for using certificate fowarding. + /// + public static class CertificateForwardingBuilderExtensions + { + /// + /// Adds a middleware to the pipeline that will look for a certificate in a request header + /// decode it, and updates HttpContext.Connection.ClientCertificate. + /// + /// + /// + public static IApplicationBuilder UseCertificateForwarding(this IApplicationBuilder app) + { + if (app == null) + { + throw new ArgumentNullException(nameof(app)); + } + + return app.UseMiddleware(); + } + } +} diff --git a/src/Middleware/HttpOverrides/src/CertificateForwardingFeature.cs b/src/Middleware/HttpOverrides/src/CertificateForwardingFeature.cs new file mode 100644 index 0000000000..a7d284a0cc --- /dev/null +++ b/src/Middleware/HttpOverrides/src/CertificateForwardingFeature.cs @@ -0,0 +1,51 @@ +// 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.Security.Cryptography.X509Certificates; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Primitives; + +namespace Microsoft.AspNetCore.HttpOverrides +{ + internal class CertificateForwardingFeature : ITlsConnectionFeature + { + private ILogger _logger; + private StringValues _header; + private CertificateForwardingOptions _options; + private X509Certificate2 _certificate; + + public CertificateForwardingFeature(ILogger logger, StringValues header, CertificateForwardingOptions options) + { + _logger = logger; + _options = options; + _header = header; + } + + public X509Certificate2 ClientCertificate + { + get + { + if (_certificate == null) + { + try + { + _certificate = _options.HeaderConverter(_header); + } + catch (Exception e) + { + _logger.NoCertificate(e); + } + } + return _certificate; + } + set => _certificate = value; + } + + public Task GetClientCertificateAsync(CancellationToken cancellationToken) + => Task.FromResult(ClientCertificate); + } +} diff --git a/src/Middleware/HttpOverrides/src/CertificateForwardingMiddleware.cs b/src/Middleware/HttpOverrides/src/CertificateForwardingMiddleware.cs new file mode 100644 index 0000000000..77ff282361 --- /dev/null +++ b/src/Middleware/HttpOverrides/src/CertificateForwardingMiddleware.cs @@ -0,0 +1,66 @@ +// 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.Tasks; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; +using Microsoft.Extensions.Primitives; + +namespace Microsoft.AspNetCore.HttpOverrides +{ + /// + /// Middleware that converts a forward header into a client certificate if found. + /// + public class CertificateForwardingMiddleware + { + private readonly RequestDelegate _next; + private readonly CertificateForwardingOptions _options; + private readonly ILogger _logger; + + /// + /// Constructor. + /// + /// + /// + /// + public CertificateForwardingMiddleware( + RequestDelegate next, + ILoggerFactory loggerFactory, + IOptions options) + { + _next = next ?? throw new ArgumentNullException(nameof(next)); + + if (loggerFactory == null) + { + throw new ArgumentNullException(nameof(loggerFactory)); + } + + if (options == null) + { + throw new ArgumentNullException(nameof(options)); + } + + _options = options.Value; + _logger = loggerFactory.CreateLogger(); + } + + /// + /// Looks for the presence of a header in the request, + /// if found, converts this header to a ClientCertificate set on the connection. + /// + /// The . + /// A . + public Task Invoke(HttpContext httpContext) + { + var header = httpContext.Request.Headers[_options.CertificateHeader]; + if (!StringValues.IsNullOrEmpty(header)) + { + httpContext.Features.Set(new CertificateForwardingFeature(_logger, header, _options)); + } + return _next(httpContext); + } + } +} diff --git a/src/Middleware/HttpOverrides/src/CertificateForwardingOptions.cs b/src/Middleware/HttpOverrides/src/CertificateForwardingOptions.cs new file mode 100644 index 0000000000..4dccdda3b1 --- /dev/null +++ b/src/Middleware/HttpOverrides/src/CertificateForwardingOptions.cs @@ -0,0 +1,30 @@ +// 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.Security.Cryptography.X509Certificates; + +namespace Microsoft.AspNetCore.HttpOverrides +{ + /// + /// Used to configure the . + /// + public class CertificateForwardingOptions + { + /// + /// The name of the header containing the client certificate. + /// + /// + /// This defaults to X-Client-Cert + /// + public string CertificateHeader { get; set; } = "X-Client-Cert"; + + /// + /// The function used to convert the header to an instance of . + /// + /// + /// This defaults to a conversion from a base64 encoded string. + /// + public Func HeaderConverter = (headerValue) => new X509Certificate2(Convert.FromBase64String(headerValue)); + } +} diff --git a/src/Middleware/HttpOverrides/src/CertificateForwardingServiceExtensions.cs b/src/Middleware/HttpOverrides/src/CertificateForwardingServiceExtensions.cs new file mode 100644 index 0000000000..ffdd4e403b --- /dev/null +++ b/src/Middleware/HttpOverrides/src/CertificateForwardingServiceExtensions.cs @@ -0,0 +1,38 @@ +// 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 Microsoft.AspNetCore.HttpOverrides; + +namespace Microsoft.Extensions.DependencyInjection +{ + /// + /// Extension methods for using certificate fowarding. + /// + public static class CertificateForwardingServiceExtensions + { + /// + /// Adds certificate forwarding to the specified . + /// + /// The . + /// An action delegate to configure the provided . + /// The so that additional calls can be chained. + public static IServiceCollection AddCertificateForwarding( + this IServiceCollection services, + Action configure) + { + if (services == null) + { + throw new ArgumentNullException(nameof(services)); + } + + if (configure == null) + { + throw new ArgumentNullException(nameof(configure)); + } + + services.AddOptions().Validate(o => !string.IsNullOrEmpty(o.CertificateHeader), "CertificateForwarderOptions.CertificateHeader cannot be null or empty."); + return services.Configure(configure); + } + } +} diff --git a/src/Middleware/HttpOverrides/src/LoggingExtensions.cs b/src/Middleware/HttpOverrides/src/LoggingExtensions.cs new file mode 100644 index 0000000000..27a2dce494 --- /dev/null +++ b/src/Middleware/HttpOverrides/src/LoggingExtensions.cs @@ -0,0 +1,25 @@ +// 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; + +namespace Microsoft.Extensions.Logging +{ + internal static class LoggingExtensions + { + private static Action _noCertificate; + + static LoggingExtensions() + { + _noCertificate = LoggerMessage.Define( + eventId: new EventId(0, "NoCertificate"), + logLevel: LogLevel.Warning, + formatString: "Could not read certificate from header."); + } + + public static void NoCertificate(this ILogger logger, Exception exception) + { + _noCertificate(logger, exception); + } + } +} diff --git a/src/Middleware/HttpOverrides/test/CertificateForwardingTest.cs b/src/Middleware/HttpOverrides/test/CertificateForwardingTest.cs new file mode 100644 index 0000000000..42464ccb98 --- /dev/null +++ b/src/Middleware/HttpOverrides/test/CertificateForwardingTest.cs @@ -0,0 +1,222 @@ +// 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.IO; +using System.Linq; +using System.Net; +using System.Security.Cryptography.X509Certificates; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.TestHost; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Options; +using Microsoft.Net.Http.Headers; +using Xunit; + +namespace Microsoft.AspNetCore.HttpOverrides +{ + public class CertificateForwardingTests + { + [Fact] + public void VerifySettingNullHeaderOptionThrows() + { + var services = new ServiceCollection() + .AddOptions() + .AddCertificateForwarding(o => o.CertificateHeader = null); + var options = services.BuildServiceProvider().GetRequiredService>(); + Assert.Throws(() => options.Value); + } + + [Fact] + public void VerifySettingEmptyHeaderOptionThrows() + { + var services = new ServiceCollection() + .AddOptions() + .AddCertificateForwarding(o => o.CertificateHeader = ""); + var options = services.BuildServiceProvider().GetRequiredService>(); + Assert.Throws(() => options.Value); + } + + [Fact] + public async Task VerifyHeaderIsUsedIfNoCertificateAlreadySet() + { + var builder = new WebHostBuilder() + .ConfigureServices(services => + { + services.AddCertificateForwarding(options => { }); + }) + .Configure(app => + { + app.Use(async (context, next) => + { + Assert.Null(context.Connection.ClientCertificate); + await next(); + }); + app.UseCertificateForwarding(); + app.Use(async (context, next) => + { + Assert.Equal(context.Connection.ClientCertificate, Certificates.SelfSignedValidWithNoEku); + await next(); + }); + }); + var server = new TestServer(builder); + + var context = await server.SendAsync(c => + { + c.Request.Headers["X-Client-Cert"] = Convert.ToBase64String(Certificates.SelfSignedValidWithNoEku.RawData); + }); + } + + [Fact] + public async Task VerifyHeaderOverridesCertificateEvenAlreadySet() + { + var builder = new WebHostBuilder() + .ConfigureServices(services => + { + services.AddCertificateForwarding(options => { }); + }) + .Configure(app => + { + app.Use(async (context, next) => + { + Assert.Null(context.Connection.ClientCertificate); + context.Connection.ClientCertificate = Certificates.SelfSignedNotYetValid; + await next(); + }); + app.UseCertificateForwarding(); + app.Use(async (context, next) => + { + Assert.Equal(context.Connection.ClientCertificate, Certificates.SelfSignedValidWithNoEku); + await next(); + }); + }); + var server = new TestServer(builder); + + var context = await server.SendAsync(c => + { + c.Request.Headers["X-Client-Cert"] = Convert.ToBase64String(Certificates.SelfSignedValidWithNoEku.RawData); + }); + } + + [Fact] + public async Task VerifySettingTheAzureHeaderOnTheForwarderOptionsWorks() + { + var builder = new WebHostBuilder() + .ConfigureServices(services => + { + services.AddCertificateForwarding(options => options.CertificateHeader = "X-ARR-ClientCert"); + }) + .Configure(app => + { + app.Use(async (context, next) => + { + Assert.Null(context.Connection.ClientCertificate); + await next(); + }); + app.UseCertificateForwarding(); + app.Use(async (context, next) => + { + Assert.Equal(context.Connection.ClientCertificate, Certificates.SelfSignedValidWithNoEku); + await next(); + }); + }); + var server = new TestServer(builder); + + var context = await server.SendAsync(c => + { + c.Request.Headers["X-ARR-ClientCert"] = Convert.ToBase64String(Certificates.SelfSignedValidWithNoEku.RawData); + }); + } + + [Fact] + public async Task VerifyACustomHeaderFailsIfTheHeaderIsNotPresent() + { + var builder = new WebHostBuilder() + .ConfigureServices(services => + { + services.AddCertificateForwarding(options => options.CertificateHeader = "some-random-header"); + }) + .Configure(app => + { + app.Use(async (context, next) => + { + Assert.Null(context.Connection.ClientCertificate); + await next(); + }); + app.UseCertificateForwarding(); + app.Use(async (context, next) => + { + Assert.Null(context.Connection.ClientCertificate); + await next(); + }); + }); + var server = new TestServer(builder); + + var context = await server.SendAsync(c => + { + c.Request.Headers["not-the-right-header"] = Convert.ToBase64String(Certificates.SelfSignedValidWithNoEku.RawData); + }); + } + + [Fact] + public async Task VerifyArrHeaderEncodedCertFailsOnBadEncoding() + { + var builder = new WebHostBuilder() + .ConfigureServices(services => + { + services.AddCertificateForwarding(options => { }); + }) + .Configure(app => + { + app.Use(async (context, next) => + { + Assert.Null(context.Connection.ClientCertificate); + await next(); + }); + app.UseCertificateForwarding(); + app.Use(async (context, next) => + { + Assert.Null(context.Connection.ClientCertificate); + await next(); + }); + }); + var server = new TestServer(builder); + + var context = await server.SendAsync(c => + { + c.Request.Headers["X-Client-Cert"] = "OOPS" + Convert.ToBase64String(Certificates.SelfSignedValidWithNoEku.RawData); + }); + } + + private static class Certificates + { + public static X509Certificate2 SelfSignedValidWithClientEku { get; private set; } = + new X509Certificate2(GetFullyQualifiedFilePath("validSelfSignedClientEkuCertificate.cer")); + + public static X509Certificate2 SelfSignedValidWithNoEku { get; private set; } = + new X509Certificate2(GetFullyQualifiedFilePath("validSelfSignedNoEkuCertificate.cer")); + + public static X509Certificate2 SelfSignedValidWithServerEku { get; private set; } = + new X509Certificate2(GetFullyQualifiedFilePath("validSelfSignedServerEkuCertificate.cer")); + + public static X509Certificate2 SelfSignedNotYetValid { get; private set; } = + new X509Certificate2(GetFullyQualifiedFilePath("selfSignedNoEkuCertificateNotValidYet.cer")); + + public static X509Certificate2 SelfSignedExpired { get; private set; } = + new X509Certificate2(GetFullyQualifiedFilePath("selfSignedNoEkuCertificateExpired.cer")); + + private static string GetFullyQualifiedFilePath(string filename) + { + var filePath = Path.Combine(AppContext.BaseDirectory, filename); + if (!File.Exists(filePath)) + { + throw new FileNotFoundException(filePath); + } + return filePath; + } + } + + } +} diff --git a/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj b/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj index da3cde94cb..c5f9652ddc 100644 --- a/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj +++ b/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.0 @@ -8,6 +8,7 @@ + diff --git a/src/Middleware/Middleware.sln b/src/Middleware/Middleware.sln index a02c8c40a8..45b7e7757d 100644 --- a/src/Middleware/Middleware.sln +++ b/src/Middleware/Middleware.sln @@ -213,8 +213,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_dependencies", "_dependenc EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Core", "..\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj", "{85534665-96ED-4C14-BB63-DA9CC5F50DBD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions", "..\Servers\Kestrel\Transport.Abstractions\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj", "{E6D8587C-97DB-4083-9983-8819241E202E}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "..\Servers\Kestrel\Transport.Sockets\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", "{7FF45C00-BAAF-43AD-B0D3-392C04E241E5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Connections.Abstractions", "..\Servers\Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj", "{69A74E57-48B7-43B8-A3D7-874F7B72F271}" @@ -1189,18 +1187,6 @@ Global {85534665-96ED-4C14-BB63-DA9CC5F50DBD}.Release|x64.Build.0 = Release|Any CPU {85534665-96ED-4C14-BB63-DA9CC5F50DBD}.Release|x86.ActiveCfg = Release|Any CPU {85534665-96ED-4C14-BB63-DA9CC5F50DBD}.Release|x86.Build.0 = Release|Any CPU - {E6D8587C-97DB-4083-9983-8819241E202E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6D8587C-97DB-4083-9983-8819241E202E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6D8587C-97DB-4083-9983-8819241E202E}.Debug|x64.ActiveCfg = Debug|Any CPU - {E6D8587C-97DB-4083-9983-8819241E202E}.Debug|x64.Build.0 = Debug|Any CPU - {E6D8587C-97DB-4083-9983-8819241E202E}.Debug|x86.ActiveCfg = Debug|Any CPU - {E6D8587C-97DB-4083-9983-8819241E202E}.Debug|x86.Build.0 = Debug|Any CPU - {E6D8587C-97DB-4083-9983-8819241E202E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6D8587C-97DB-4083-9983-8819241E202E}.Release|Any CPU.Build.0 = Release|Any CPU - {E6D8587C-97DB-4083-9983-8819241E202E}.Release|x64.ActiveCfg = Release|Any CPU - {E6D8587C-97DB-4083-9983-8819241E202E}.Release|x64.Build.0 = Release|Any CPU - {E6D8587C-97DB-4083-9983-8819241E202E}.Release|x86.ActiveCfg = Release|Any CPU - {E6D8587C-97DB-4083-9983-8819241E202E}.Release|x86.Build.0 = Release|Any CPU {7FF45C00-BAAF-43AD-B0D3-392C04E241E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7FF45C00-BAAF-43AD-B0D3-392C04E241E5}.Debug|Any CPU.Build.0 = Debug|Any CPU {7FF45C00-BAAF-43AD-B0D3-392C04E241E5}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1675,7 +1661,6 @@ Global {17B7BFF6-4E72-410C-B690-02741505500A} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0} {260E77CB-800F-4A13-BE92-9CAA097705C2} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0} {85534665-96ED-4C14-BB63-DA9CC5F50DBD} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0} - {E6D8587C-97DB-4083-9983-8819241E202E} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0} {7FF45C00-BAAF-43AD-B0D3-392C04E241E5} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0} {69A74E57-48B7-43B8-A3D7-874F7B72F271} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0} {13BB39CC-E440-4FF0-B37A-1353BA508E42} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0} diff --git a/src/Middleware/NodeServices/test/Microsoft.AspNetCore.NodeServices.Tests.csproj b/src/Middleware/NodeServices/test/Microsoft.AspNetCore.NodeServices.Tests.csproj index 0b8c614e31..7d0bed922f 100644 --- a/src/Middleware/NodeServices/test/Microsoft.AspNetCore.NodeServices.Tests.csproj +++ b/src/Middleware/NodeServices/test/Microsoft.AspNetCore.NodeServices.Tests.csproj @@ -2,19 +2,14 @@ netcoreapp3.0 - - - - false - - - + true + diff --git a/src/Middleware/NodeServices/test/NodeServicesTest.cs b/src/Middleware/NodeServices/test/NodeServicesTest.cs index a5012ea8aa..f851e08d0c 100644 --- a/src/Middleware/NodeServices/test/NodeServicesTest.cs +++ b/src/Middleware/NodeServices/test/NodeServicesTest.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.NodeServices.HostingModels; using Microsoft.Extensions.DependencyInjection; using System; +using System.IO; using System.Threading.Tasks; using Xunit; @@ -115,7 +116,7 @@ namespace Microsoft.AspNetCore.NodeServices } private static string ModulePath(string testModuleName) - => $"../../../js/{testModuleName}"; + => Path.Combine(AppContext.BaseDirectory, "js", testModuleName); public void Dispose() { diff --git a/src/Middleware/RequestThrottling/RequestThrottling.slnf b/src/Middleware/RequestThrottling/RequestThrottling.slnf index d434fbc862..25a80d6b88 100644 --- a/src/Middleware/RequestThrottling/RequestThrottling.slnf +++ b/src/Middleware/RequestThrottling/RequestThrottling.slnf @@ -12,7 +12,6 @@ "..\\Servers\\Connections.Abstractions\\src\\Microsoft.AspNetCore.Connections.Abstractions.csproj", "..\\Servers\\Kestrel\\Core\\src\\Microsoft.AspNetCore.Server.Kestrel.Core.csproj", "..\\Servers\\Kestrel\\Kestrel\\src\\Microsoft.AspNetCore.Server.Kestrel.csproj", - "..\\Servers\\Kestrel\\Transport.Abstractions\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj", "..\\Servers\\Kestrel\\Transport.Sockets\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", "..\\http\\Headers\\src\\Microsoft.Net.Http.Headers.csproj", "..\\http\\http\\src\\Microsoft.AspNetCore.Http.csproj", diff --git a/src/Middleware/RequestThrottling/ref/Microsoft.AspNetCore.RequestThrottling.csproj b/src/Middleware/RequestThrottling/ref/Microsoft.AspNetCore.RequestThrottling.csproj index 0a1bcdd0b9..8e8c1dfce6 100644 --- a/src/Middleware/RequestThrottling/ref/Microsoft.AspNetCore.RequestThrottling.csproj +++ b/src/Middleware/RequestThrottling/ref/Microsoft.AspNetCore.RequestThrottling.csproj @@ -5,6 +5,8 @@ - + + + diff --git a/src/Middleware/RequestThrottling/ref/Microsoft.AspNetCore.RequestThrottling.netcoreapp3.0.cs b/src/Middleware/RequestThrottling/ref/Microsoft.AspNetCore.RequestThrottling.netcoreapp3.0.cs index 618082bc4a..ff97f9feaf 100644 --- a/src/Middleware/RequestThrottling/ref/Microsoft.AspNetCore.RequestThrottling.netcoreapp3.0.cs +++ b/src/Middleware/RequestThrottling/ref/Microsoft.AspNetCore.RequestThrottling.netcoreapp3.0.cs @@ -1,3 +1,25 @@ // 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 Microsoft.AspNetCore.Builder +{ + public static partial class RequestThrottlingExtensions + { + public static Microsoft.AspNetCore.Builder.IApplicationBuilder UseRequestThrottling(this Microsoft.AspNetCore.Builder.IApplicationBuilder app) { throw null; } + } +} +namespace Microsoft.AspNetCore.RequestThrottling +{ + public partial class RequestThrottlingMiddleware + { + public RequestThrottlingMiddleware(Microsoft.AspNetCore.Http.RequestDelegate next, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.Extensions.Options.IOptions options) { } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task Invoke(Microsoft.AspNetCore.Http.HttpContext context) { throw null; } + } + public partial class RequestThrottlingOptions + { + public RequestThrottlingOptions() { } + public int? MaxConcurrentRequests { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int RequestQueueLimit { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } +} diff --git a/src/Middleware/RequestThrottling/sample/RequestThrottlingSample.csproj b/src/Middleware/RequestThrottling/sample/RequestThrottlingSample.csproj index 0f80e6516a..9f49f115c0 100644 --- a/src/Middleware/RequestThrottling/sample/RequestThrottlingSample.csproj +++ b/src/Middleware/RequestThrottling/sample/RequestThrottlingSample.csproj @@ -1,13 +1,13 @@ - + netcoreapp3.0 - + diff --git a/src/Middleware/RequestThrottling/sample/Startup.cs b/src/Middleware/RequestThrottling/sample/Startup.cs index 95a94be56d..958bc019fb 100644 --- a/src/Middleware/RequestThrottling/sample/Startup.cs +++ b/src/Middleware/RequestThrottling/sample/Startup.cs @@ -1,12 +1,12 @@ -using System; -using System.Collections.Generic; +// 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.IO; -using System.Linq; -using System.Net; using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.RequestThrottling; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; @@ -19,13 +19,21 @@ namespace RequestThrottlingSample // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 public void ConfigureServices(IServiceCollection services) { + services.Configure(options => + { + options.MaxConcurrentRequests = 2; + options.RequestQueueLimit = 0; + }); } - public void Configure(IApplicationBuilder app, IWebHostEnvironment environment) + public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { + app.UseRequestThrottling(); + app.Run(async context => { - await context.Response.WriteAsync("Hello world!"); + await context.Response.WriteAsync("Hello Request Throttling! If you refresh this page a bunch, it will 503."); + await Task.Delay(1000); }); } diff --git a/src/Middleware/RequestThrottling/src/Internal/RequestQueue.cs b/src/Middleware/RequestThrottling/src/Internal/RequestQueue.cs new file mode 100644 index 0000000000..6886b24ee4 --- /dev/null +++ b/src/Middleware/RequestThrottling/src/Internal/RequestQueue.cs @@ -0,0 +1,62 @@ +// 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; + +namespace Microsoft.AspNetCore.RequestThrottling.Internal +{ + internal class RequestQueue : IDisposable + { + private readonly int _maxConcurrentRequests; + private readonly int _requestQueueLimit; + private readonly SemaphoreSlim _serverSemaphore; + + private object _totalRequestsLock = new object(); + public int TotalRequests { get; private set; } + + public RequestQueue(int maxConcurrentRequests, int requestQueueLimit) + { + _maxConcurrentRequests = maxConcurrentRequests; + _requestQueueLimit = requestQueueLimit; + _serverSemaphore = new SemaphoreSlim(_maxConcurrentRequests); + } + + public async Task TryEnterQueueAsync() + { + // a return value of 'false' indicates that the request is rejected + // a return value of 'true' indicates that the request may proceed + // _serverSemaphore.Release is *not* called in this method, it is called externally when requests leave the server + + lock (_totalRequestsLock) + { + if (TotalRequests >= _requestQueueLimit + _maxConcurrentRequests) + { + return false; + } + + TotalRequests++; + } + + await _serverSemaphore.WaitAsync(); + + return true; + } + + public void Release() + { + _serverSemaphore.Release(); + + lock (_totalRequestsLock) + { + TotalRequests--; + } + } + + public void Dispose() + { + _serverSemaphore.Dispose(); + } + } +} diff --git a/src/Middleware/RequestThrottling/src/Microsoft.AspNetCore.RequestThrottling.csproj b/src/Middleware/RequestThrottling/src/Microsoft.AspNetCore.RequestThrottling.csproj index 5014e9cec5..0090f373c0 100644 --- a/src/Middleware/RequestThrottling/src/Microsoft.AspNetCore.RequestThrottling.csproj +++ b/src/Middleware/RequestThrottling/src/Microsoft.AspNetCore.RequestThrottling.csproj @@ -1,4 +1,4 @@ - + ASP.NET Core middleware for queuing incoming HTTP requests, to avoid threadpool starvation. @@ -7,4 +7,10 @@ aspnetcore;queue;queuing + + + + + + diff --git a/src/Middleware/RequestThrottling/src/RequestThrottlingExtensions.cs b/src/Middleware/RequestThrottling/src/RequestThrottlingExtensions.cs new file mode 100644 index 0000000000..17968b44d5 --- /dev/null +++ b/src/Middleware/RequestThrottling/src/RequestThrottlingExtensions.cs @@ -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 Microsoft.AspNetCore.RequestThrottling; + +namespace Microsoft.AspNetCore.Builder +{ + /// + /// Extension methods for adding the to an application. + /// + public static class RequestThrottlingExtensions + { + /// + /// Adds the to limit the number of concurrently-executing requests. + /// + /// The . + /// The . + public static IApplicationBuilder UseRequestThrottling(this IApplicationBuilder app) + { + if (app == null) + { + throw new ArgumentNullException(nameof(app)); + } + + return app.UseMiddleware(); + } + } +} diff --git a/src/Middleware/RequestThrottling/src/RequestThrottlingMiddleware.cs b/src/Middleware/RequestThrottling/src/RequestThrottlingMiddleware.cs new file mode 100644 index 0000000000..d96dee1862 --- /dev/null +++ b/src/Middleware/RequestThrottling/src/RequestThrottlingMiddleware.cs @@ -0,0 +1,130 @@ +// 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.Diagnostics; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.RequestThrottling.Internal; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; + +namespace Microsoft.AspNetCore.RequestThrottling +{ + /// + /// Limits the number of concurrent requests allowed in the application. + /// + public class RequestThrottlingMiddleware + { + private readonly RequestQueue _requestQueue; + private readonly RequestDelegate _next; + private readonly ILogger _logger; + + /// + /// Creates a new . + /// + /// The representing the next middleware in the pipeline. + /// The used for logging. + /// The containing the initialization parameters. + public RequestThrottlingMiddleware(RequestDelegate next, ILoggerFactory loggerFactory, IOptions options) + { + if (options.Value.MaxConcurrentRequests == null) + { + throw new ArgumentException("The value of 'options.MaxConcurrentRequests' must be specified.", nameof(options)); + } + if (options.Value.RequestQueueLimit < 0) + { + throw new ArgumentException("The value of 'options.RequestQueueLimit' must be a positive integer.", nameof(options)); + } + + _next = next; + _logger = loggerFactory.CreateLogger(); + _requestQueue = new RequestQueue( + options.Value.MaxConcurrentRequests.Value, + options.Value.RequestQueueLimit); + } + + /// + /// Invokes the logic of the middleware. + /// + /// The . + /// A that completes when the request leaves. + public async Task Invoke(HttpContext context) + { + var waitInQueueTask = _requestQueue.TryEnterQueueAsync(); + if (waitInQueueTask.IsCompletedSuccessfully && !waitInQueueTask.Result) + { + RequestThrottlingLog.RequestRejectedQueueFull(_logger); + context.Response.StatusCode = StatusCodes.Status503ServiceUnavailable; + return; + } + else if (!waitInQueueTask.IsCompletedSuccessfully) + { + RequestThrottlingLog.RequestEnqueued(_logger, ActiveRequestCount); + var result = await waitInQueueTask; + RequestThrottlingLog.RequestDequeued(_logger, ActiveRequestCount); + + Debug.Assert(result); + } + else + { + RequestThrottlingLog.RequestRunImmediately(_logger, ActiveRequestCount); + } + + try + { + await _next(context); + } + finally + { + _requestQueue.Release(); + } + } + + /// + /// The number of requests currently on the server. + /// Cannot exceeed the sum of and />. + /// + internal int ActiveRequestCount + { + get => _requestQueue.TotalRequests; + } + + // TODO :: update log wording to reflect the changes + + private static class RequestThrottlingLog + { + private static readonly Action _requestEnqueued = + LoggerMessage.Define(LogLevel.Debug, new EventId(1, "RequestEnqueued"), "MaxConcurrentRequests limit reached, request has been queued. Current active requests: {ActiveRequests}."); + + private static readonly Action _requestDequeued = + LoggerMessage.Define(LogLevel.Debug, new EventId(2, "RequestDequeued"), "Request dequeued. Current active requests: {ActiveRequests}."); + + private static readonly Action _requestRunImmediately = + LoggerMessage.Define(LogLevel.Debug, new EventId(3, "RequestRunImmediately"), "Below MaxConcurrentRequests limit, running request immediately. Current active requests: {ActiveRequests}"); + + private static readonly Action _requestRejectedQueueFull = + LoggerMessage.Define(LogLevel.Debug, new EventId(4, "RequestRejectedQueueFull"), "Currently at the 'RequestQueueLimit', rejecting this request with a '503 server not availible' error"); + + internal static void RequestEnqueued(ILogger logger, int activeRequests) + { + _requestEnqueued(logger, activeRequests, null); + } + + internal static void RequestDequeued(ILogger logger, int activeRequests) + { + _requestDequeued(logger, activeRequests, null); + } + + internal static void RequestRunImmediately(ILogger logger, int activeRequests) + { + _requestRunImmediately(logger, activeRequests, null); + } + + internal static void RequestRejectedQueueFull(ILogger logger) + { + _requestRejectedQueueFull(logger, null); + } + } + } +} diff --git a/src/Middleware/RequestThrottling/src/RequestThrottlingOptions.cs b/src/Middleware/RequestThrottling/src/RequestThrottlingOptions.cs new file mode 100644 index 0000000000..03b52d4502 --- /dev/null +++ b/src/Middleware/RequestThrottling/src/RequestThrottlingOptions.cs @@ -0,0 +1,26 @@ +// 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 Microsoft.AspNetCore.RequestThrottling; + +namespace Microsoft.AspNetCore.RequestThrottling +{ + /// + /// Specifies options for the . + /// + public class RequestThrottlingOptions + { + /// + /// Maximum number of concurrent requests. Any extras will be queued on the server. + /// This is null by default because the correct value is application specific. This option must be configured by the application. + /// + public int? MaxConcurrentRequests { get; set; } + + /// + /// Maximum number of queued requests before the server starts rejecting connections with '503 Service Unavailible'. + /// Setting this value to 0 will disable the queue; all requests will either immediately enter the server or be rejected. + /// Defaults to 5000 queued requests. + /// + public int RequestQueueLimit { get; set; } = 5000; + } +} diff --git a/src/Middleware/RequestThrottling/src/SemaphoreWrapper.cs b/src/Middleware/RequestThrottling/src/SemaphoreWrapper.cs deleted file mode 100644 index 4c79b94777..0000000000 --- a/src/Middleware/RequestThrottling/src/SemaphoreWrapper.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; - -namespace Microsoft.AspNetCore.RequestThrottling -{ - internal class SemaphoreWrapper : IDisposable - { - private SemaphoreSlim _semaphore; - - public SemaphoreWrapper(int queueLength) - { - _semaphore = new SemaphoreSlim(queueLength); - } - - public Task EnterQueue() - { - return _semaphore.WaitAsync(); - } - - public void LeaveQueue() - { - _semaphore.Release(); - } - - public int Count - { - get => _semaphore.CurrentCount; - } - - public void Dispose() - { - _semaphore.Dispose(); - } - } -} diff --git a/src/Middleware/RequestThrottling/test/Microsoft.AspNetCore.RequestThrottling.Tests.csproj b/src/Middleware/RequestThrottling/test/Microsoft.AspNetCore.RequestThrottling.Tests.csproj index 8c0dd8e989..78b1c88692 100644 --- a/src/Middleware/RequestThrottling/test/Microsoft.AspNetCore.RequestThrottling.Tests.csproj +++ b/src/Middleware/RequestThrottling/test/Microsoft.AspNetCore.RequestThrottling.Tests.csproj @@ -1,10 +1,16 @@ - + netcoreapp3.0 + + + + + + diff --git a/src/Middleware/RequestThrottling/test/MiddlewareTests.cs b/src/Middleware/RequestThrottling/test/MiddlewareTests.cs new file mode 100644 index 0000000000..d5fa7b141c --- /dev/null +++ b/src/Middleware/RequestThrottling/test/MiddlewareTests.cs @@ -0,0 +1,131 @@ +// 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.Tasks; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Internal; +using Xunit; + +namespace Microsoft.AspNetCore.RequestThrottling.Tests +{ + public class MiddlewareTests + { + [Fact] + public async Task RequestsCanEnterIfSpaceAvailible() + { + var middleware = TestUtils.CreateTestMiddleware(maxConcurrentRequests: 1); + var context = new DefaultHttpContext(); + + // a request should go through with no problems + await middleware.Invoke(context).OrTimeout(); + } + + [Fact] + public async Task SemaphoreStatePreservedIfRequestsError() + { + var middleware = TestUtils.CreateTestMiddleware( + maxConcurrentRequests: 1, + next: httpContext => + { + throw new DivideByZeroException(); + }); + + Assert.Equal(0, middleware.ActiveRequestCount); + + await Assert.ThrowsAsync(() => middleware.Invoke(new DefaultHttpContext())); + + Assert.Equal(0, middleware.ActiveRequestCount); + } + + [Fact] + public async Task QueuedRequestsContinueWhenSpaceBecomesAvailible() + { + var blocker = new SyncPoint(); + var firstRequest = true; + + var middleware = TestUtils.CreateTestMiddleware( + maxConcurrentRequests: 1, + next: httpContext => + { + if (firstRequest) + { + firstRequest = false; + return blocker.WaitToContinue(); + } + return Task.CompletedTask; + }); + + // t1 (as the first request) is blocked by the tcs blocker + var t1 = middleware.Invoke(new DefaultHttpContext()); + Assert.Equal(1, middleware.ActiveRequestCount); + + // t2 is blocked from entering the server since t1 already exists there + // note: increasing MaxConcurrentRequests would allow t2 through while t1 is blocked + var t2 = middleware.Invoke(new DefaultHttpContext()); + Assert.Equal(2, middleware.ActiveRequestCount); + + // unblock the first task, and the second should follow + blocker.Continue(); + await t1.OrTimeout(); + await t2.OrTimeout(); + } + + [Fact] + public void InvalidArgumentIfMaxConcurrentRequestsIsNull() + { + var ex = Assert.Throws(() => + { + TestUtils.CreateTestMiddleware(maxConcurrentRequests: null); + }); + Assert.Equal("options", ex.ParamName); + } + + [Fact] + public async void RequestsBlockedIfQueueFull() + { + var middleware = TestUtils.CreateTestMiddleware( + maxConcurrentRequests: 0, + requestQueueLimit: 0, + next: httpContext => + { + // throttle should bounce the request; it should never get here + throw new NotImplementedException(); + }); + + await middleware.Invoke(new DefaultHttpContext()); + } + + [Fact] + public async void FullQueueResultsIn503Error() + { + var middleware = TestUtils.CreateTestMiddleware( + maxConcurrentRequests: 0, + requestQueueLimit: 0); + + var context = new DefaultHttpContext(); + await middleware.Invoke(context); + Assert.Equal(503, context.Response.StatusCode); + } + + [Fact] + public void MultipleRequestsFillUpQueue() + { + var middleware = TestUtils.CreateTestMiddleware( + maxConcurrentRequests: 0, + requestQueueLimit: 10, + next: httpContext => + { + return Task.Delay(TimeSpan.FromSeconds(30)); + }); + + Assert.Equal(0, middleware.ActiveRequestCount); + + var _ = middleware.Invoke(new DefaultHttpContext()); + Assert.Equal(1, middleware.ActiveRequestCount); + + _ = middleware.Invoke(new DefaultHttpContext()); + Assert.Equal(2, middleware.ActiveRequestCount); + } + } +} diff --git a/src/Middleware/RequestThrottling/test/RequestQueueTests.cs b/src/Middleware/RequestThrottling/test/RequestQueueTests.cs new file mode 100644 index 0000000000..d2ae82a2db --- /dev/null +++ b/src/Middleware/RequestThrottling/test/RequestQueueTests.cs @@ -0,0 +1,63 @@ +// 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.Threading.Tasks; +using Microsoft.AspNetCore.RequestThrottling.Internal; +using Xunit; + +namespace Microsoft.AspNetCore.RequestThrottling.Tests +{ + public class RequestQueueTests + { + [Fact] + public async Task LimitsIncomingRequests() + { + using var s = TestUtils.CreateRequestQueue(1); + Assert.Equal(0, s.TotalRequests); + + Assert.True(await s.TryEnterQueueAsync().OrTimeout()); + Assert.Equal(1, s.TotalRequests); + + s.Release(); + Assert.Equal(0, s.TotalRequests); + } + + [Fact] + public void DoesNotWaitIfSpaceAvailible() + { + using var s = TestUtils.CreateRequestQueue(2); + + var t1 = s.TryEnterQueueAsync(); + Assert.True(t1.IsCompleted); + + var t2 = s.TryEnterQueueAsync(); + Assert.True(t2.IsCompleted); + + var t3 = s.TryEnterQueueAsync(); + Assert.False(t3.IsCompleted); + } + + [Fact] + public async Task WaitsIfNoSpaceAvailible() + { + using var s = TestUtils.CreateRequestQueue(1); + Assert.True(await s.TryEnterQueueAsync().OrTimeout()); + + var waitingTask = s.TryEnterQueueAsync(); + Assert.False(waitingTask.IsCompleted); + + s.Release(); + Assert.True(await waitingTask.OrTimeout()); + } + + [Fact] + public async Task IsEncapsulated() + { + using var s1 = TestUtils.CreateRequestQueue(1); + using var s2 = TestUtils.CreateRequestQueue(1); + + Assert.True(await s1.TryEnterQueueAsync().OrTimeout()); + Assert.True(await s2.TryEnterQueueAsync().OrTimeout()); + } + } +} diff --git a/src/Middleware/RequestThrottling/test/SemaphoreWrapperTests.cs b/src/Middleware/RequestThrottling/test/SemaphoreWrapperTests.cs deleted file mode 100644 index b5cdfce18f..0000000000 --- a/src/Middleware/RequestThrottling/test/SemaphoreWrapperTests.cs +++ /dev/null @@ -1,66 +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 Xunit; -using System.Threading; -using System.Threading.Tasks; -using System; -using System.Runtime.CompilerServices; -using Microsoft.AspNetCore.Testing; - -namespace Microsoft.AspNetCore.RequestThrottling.Tests -{ - public class SemaphoreWrapperTests - { - [Fact] - public async Task TracksQueueLength() - { - using var s = new SemaphoreWrapper(1); - Assert.Equal(1, s.Count); - - await s.EnterQueue().OrTimeout(); - Assert.Equal(0, s.Count); - - s.LeaveQueue(); - Assert.Equal(1, s.Count); - } - - [Fact] - public void DoesNotWaitIfSpaceAvailible() - { - using var s = new SemaphoreWrapper(2); - - var t1 = s.EnterQueue(); - Assert.True(t1.IsCompleted); - - var t2 = s.EnterQueue(); - Assert.True(t2.IsCompleted); - - var t3 = s.EnterQueue(); - Assert.False(t3.IsCompleted); - } - - [Fact] - public async Task WaitsIfNoSpaceAvailible() - { - using var s = new SemaphoreWrapper(1); - await s.EnterQueue().OrTimeout(); - - var waitingTask = s.EnterQueue(); - Assert.False(waitingTask.IsCompleted); - - s.LeaveQueue(); - await waitingTask.OrTimeout(); - } - - [Fact] - public async Task IsEncapsulated() - { - using var s1 = new SemaphoreWrapper(1); - using var s2 = new SemaphoreWrapper(1); - - await s1.EnterQueue().OrTimeout(); - await s2.EnterQueue().OrTimeout(); - } - } -} diff --git a/src/Middleware/RequestThrottling/test/TestUtils.cs b/src/Middleware/RequestThrottling/test/TestUtils.cs new file mode 100644 index 0000000000..28e4c9fb14 --- /dev/null +++ b/src/Middleware/RequestThrottling/test/TestUtils.cs @@ -0,0 +1,32 @@ +// 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.Threading.Tasks; +using Microsoft.AspNetCore.RequestThrottling; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging.Abstractions; +using Microsoft.Extensions.Options; +using Microsoft.AspNetCore.RequestThrottling.Internal; + +namespace Microsoft.AspNetCore.RequestThrottling.Tests +{ + public static class TestUtils + { + public static RequestThrottlingMiddleware CreateTestMiddleware(int? maxConcurrentRequests, int requestQueueLimit = 5000, RequestDelegate next = null) + { + var options = new RequestThrottlingOptions + { + MaxConcurrentRequests = maxConcurrentRequests, + RequestQueueLimit = requestQueueLimit + }; + + return new RequestThrottlingMiddleware( + next: next ?? (context => Task.CompletedTask), + loggerFactory: NullLoggerFactory.Instance, + options: Options.Create(options) + ); + } + + internal static RequestQueue CreateRequestQueue(int maxConcurrentRequests) => new RequestQueue(maxConcurrentRequests, 5000); + } +} diff --git a/src/Middleware/ResponseCaching/samples/ResponseCachingSample/Startup.cs b/src/Middleware/ResponseCaching/samples/ResponseCachingSample/Startup.cs index ca2e7fbcf3..6184a36946 100644 --- a/src/Middleware/ResponseCaching/samples/ResponseCachingSample/Startup.cs +++ b/src/Middleware/ResponseCaching/samples/ResponseCachingSample/Startup.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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; diff --git a/src/Middleware/ResponseCaching/src/Internal/CacheEntry/CacheEntryHelpers .cs b/src/Middleware/ResponseCaching/src/Internal/CacheEntry/CacheEntryHelpers.cs similarity index 100% rename from src/Middleware/ResponseCaching/src/Internal/CacheEntry/CacheEntryHelpers .cs rename to src/Middleware/ResponseCaching/src/Internal/CacheEntry/CacheEntryHelpers.cs diff --git a/src/Middleware/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.csproj b/src/Middleware/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.csproj index 9611dfbdaf..ef8199808c 100644 --- a/src/Middleware/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.csproj +++ b/src/Middleware/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.csproj @@ -1,4 +1,4 @@ - + ASP.NET Core middleware for caching HTTP responses on the server. diff --git a/src/MusicStore/MusicStore.sln b/src/MusicStore/MusicStore.sln index cbe1dfc195..45627e95cc 100644 --- a/src/MusicStore/MusicStore.sln +++ b/src/MusicStore/MusicStore.sln @@ -141,8 +141,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{FFA9F547-B412-47D3-AA65-581B51F765A8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions", "..\Servers\Kestrel\Transport.Abstractions\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj", "{658DAA95-3941-448A-AF39-C2826043716D}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "..\Servers\Kestrel\Transport.Sockets\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", "{3F5589F9-5D13-4662-96C6-52367D14061C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{B21EACAA-1EBC-45D3-8831-8A8E7888CD03}" @@ -983,18 +981,6 @@ Global {FFA9F547-B412-47D3-AA65-581B51F765A8}.Release|x64.Build.0 = Release|Any CPU {FFA9F547-B412-47D3-AA65-581B51F765A8}.Release|x86.ActiveCfg = Release|Any CPU {FFA9F547-B412-47D3-AA65-581B51F765A8}.Release|x86.Build.0 = Release|Any CPU - {658DAA95-3941-448A-AF39-C2826043716D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {658DAA95-3941-448A-AF39-C2826043716D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {658DAA95-3941-448A-AF39-C2826043716D}.Debug|x64.ActiveCfg = Debug|Any CPU - {658DAA95-3941-448A-AF39-C2826043716D}.Debug|x64.Build.0 = Debug|Any CPU - {658DAA95-3941-448A-AF39-C2826043716D}.Debug|x86.ActiveCfg = Debug|Any CPU - {658DAA95-3941-448A-AF39-C2826043716D}.Debug|x86.Build.0 = Debug|Any CPU - {658DAA95-3941-448A-AF39-C2826043716D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {658DAA95-3941-448A-AF39-C2826043716D}.Release|Any CPU.Build.0 = Release|Any CPU - {658DAA95-3941-448A-AF39-C2826043716D}.Release|x64.ActiveCfg = Release|Any CPU - {658DAA95-3941-448A-AF39-C2826043716D}.Release|x64.Build.0 = Release|Any CPU - {658DAA95-3941-448A-AF39-C2826043716D}.Release|x86.ActiveCfg = Release|Any CPU - {658DAA95-3941-448A-AF39-C2826043716D}.Release|x86.Build.0 = Release|Any CPU {3F5589F9-5D13-4662-96C6-52367D14061C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3F5589F9-5D13-4662-96C6-52367D14061C}.Debug|Any CPU.Build.0 = Debug|Any CPU {3F5589F9-5D13-4662-96C6-52367D14061C}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1078,7 +1064,6 @@ Global {7A3B24E6-3620-4018-A7BE-DE5B3BB38137} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03} {501E13FC-E3BD-4C03-9AFB-DD39A5260DF0} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03} {FFA9F547-B412-47D3-AA65-581B51F765A8} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03} - {658DAA95-3941-448A-AF39-C2826043716D} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03} {3F5589F9-5D13-4662-96C6-52367D14061C} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/MusicStore/samples/MusicStore/Controllers/StoreController.cs b/src/MusicStore/samples/MusicStore/Controllers/StoreController.cs index dfa2336fe1..718ce85b76 100644 --- a/src/MusicStore/samples/MusicStore/Controllers/StoreController.cs +++ b/src/MusicStore/samples/MusicStore/Controllers/StoreController.cs @@ -36,7 +36,6 @@ namespace MusicStore.Controllers { // Retrieve Genre genre and its Associated associated Albums albums from database var genreModel = await DbContext.Genres - .Include(g => g.Albums) .Where(g => g.Name == genre) .FirstOrDefaultAsync(); @@ -45,6 +44,8 @@ namespace MusicStore.Controllers return NotFound(); } + await DbContext.Entry(genreModel).Collection(g => g.Albums).LoadAsync(); + return View(genreModel); } @@ -83,4 +84,4 @@ namespace MusicStore.Controllers return View(album); } } -} \ No newline at end of file +} diff --git a/src/MusicStore/samples/MusicStore/ForTesting/Mocks/StartupOpenIdConnectTesting.cs b/src/MusicStore/samples/MusicStore/ForTesting/Mocks/StartupOpenIdConnectTesting.cs index bb066895a9..677d93abdd 100644 --- a/src/MusicStore/samples/MusicStore/ForTesting/Mocks/StartupOpenIdConnectTesting.cs +++ b/src/MusicStore/samples/MusicStore/ForTesting/Mocks/StartupOpenIdConnectTesting.cs @@ -3,16 +3,13 @@ using System.Globalization; using Microsoft.AspNetCore.Authentication.OpenIdConnect; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.AspNetCore.Localization; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; using Microsoft.IdentityModel.Protocols.OpenIdConnect; using MusicStore.Components; using MusicStore.Mocks.Common; @@ -47,16 +44,9 @@ namespace MusicStore services.Configure(Configuration.GetSection("AppSettings")); // Add EF services to the services container - if (_platform.UseInMemoryStore) - { - services.AddDbContext(options => - options.UseInMemoryDatabase("Scratch")); - } - else - { - services.AddDbContext(options => - options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"])); - } + // Add EF services to the services container + services.AddDbContext(options => + options.UseSqlite("Data Source=MusicStore.db")); // Add Identity services to the services container services.AddIdentity() diff --git a/src/MusicStore/samples/MusicStore/ForTesting/Mocks/StartupSocialTesting.cs b/src/MusicStore/samples/MusicStore/ForTesting/Mocks/StartupSocialTesting.cs index ba7baefdd2..2bc26bbb51 100644 --- a/src/MusicStore/samples/MusicStore/ForTesting/Mocks/StartupSocialTesting.cs +++ b/src/MusicStore/samples/MusicStore/ForTesting/Mocks/StartupSocialTesting.cs @@ -1,20 +1,15 @@ -using System; using System.Globalization; using Microsoft.AspNetCore.Authentication.OAuth; using Microsoft.AspNetCore.Authentication.Twitter; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.AspNetCore.Localization; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; using MusicStore.Components; using MusicStore.Mocks.Common; using MusicStore.Mocks.Facebook; @@ -50,16 +45,8 @@ namespace MusicStore services.Configure(Configuration.GetSection("AppSettings")); // Add EF services to the services container - if (_platform.UseInMemoryStore) - { - services.AddDbContext(options => - options.UseInMemoryDatabase("Scratch")); - } - else - { - services.AddDbContext(options => - options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"])); - } + services.AddDbContext(options => + options.UseSqlite("Data Source=MusicStore.db")); // Add Identity services to the services container services.AddIdentity() diff --git a/src/MusicStore/samples/MusicStore/Models/Order.cs b/src/MusicStore/samples/MusicStore/Models/Order.cs index 3406b963a8..f1886ff0ae 100644 --- a/src/MusicStore/samples/MusicStore/Models/Order.cs +++ b/src/MusicStore/samples/MusicStore/Models/Order.cs @@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; namespace MusicStore.Models { - //[Bind(Include = "FirstName,LastName,Address,City,State,PostalCode,Country,Phone,Email")] public class Order { [BindNever] @@ -71,4 +70,4 @@ namespace MusicStore.Models [BindNever] public List OrderDetails { get; set; } } -} \ No newline at end of file +} diff --git a/src/MusicStore/samples/MusicStore/Models/ShoppingCart.cs b/src/MusicStore/samples/MusicStore/Models/ShoppingCart.cs index cdc21eb01d..3f159adb1d 100644 --- a/src/MusicStore/samples/MusicStore/Models/ShoppingCart.cs +++ b/src/MusicStore/samples/MusicStore/Models/ShoppingCart.cs @@ -115,17 +115,18 @@ namespace MusicStore.Models .SumAsync(); } - public Task GetTotal() + public async Task GetTotal() { // Multiply album price by count of that album to get // the current price for each of those albums in the cart // sum all album price totals to get the cart total - return _dbContext + return (await _dbContext .CartItems .Where(c => c.CartId == _shoppingCartId) .Select(c => c.Album.Price * c.Count) - .SumAsync(); + .ToListAsync()) + .Sum(); } public async Task CreateOrder(Order order) diff --git a/src/MusicStore/samples/MusicStore/MusicStore.csproj b/src/MusicStore/samples/MusicStore/MusicStore.csproj index d91f54cd3c..989c42a4a6 100644 --- a/src/MusicStore/samples/MusicStore/MusicStore.csproj +++ b/src/MusicStore/samples/MusicStore/MusicStore.csproj @@ -31,8 +31,7 @@ - - + diff --git a/src/MusicStore/samples/MusicStore/Startup.cs b/src/MusicStore/samples/MusicStore/Startup.cs index faf4a05bae..74aa6931b8 100644 --- a/src/MusicStore/samples/MusicStore/Startup.cs +++ b/src/MusicStore/samples/MusicStore/Startup.cs @@ -3,12 +3,10 @@ using System.Runtime.InteropServices; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.AspNetCore.Localization; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; using MusicStore.Components; using MusicStore.Models; @@ -40,16 +38,8 @@ namespace MusicStore services.Configure(Configuration.GetSection("AppSettings")); // Add EF services to the services container - if (_platform.UseInMemoryStore) - { - services.AddDbContext(options => - options.UseInMemoryDatabase("Scratch")); - } - else - { - services.AddDbContext(options => - options.UseSqlServer(Configuration[StoreConfig.ConnectionStringKey.Replace("__", ":")])); - } + services.AddDbContext(options => + options.UseSqlite("Data Source=MusicStore.db")); // Add Identity services to the services container services.AddIdentity() diff --git a/src/MusicStore/samples/MusicStore/StartupNtlmAuthentication.cs b/src/MusicStore/samples/MusicStore/StartupNtlmAuthentication.cs index 5eadf1f8a0..86860af5e5 100644 --- a/src/MusicStore/samples/MusicStore/StartupNtlmAuthentication.cs +++ b/src/MusicStore/samples/MusicStore/StartupNtlmAuthentication.cs @@ -57,7 +57,7 @@ namespace MusicStore // Add EF services to the services container services.AddDbContext(options => - options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"])); + options.UseSqlite("Data Source=MusicStore.db")); // Add Identity services to the services container services.AddIdentity() diff --git a/src/MusicStore/samples/MusicStore/StartupOpenIdConnect.cs b/src/MusicStore/samples/MusicStore/StartupOpenIdConnect.cs index 397ca1f011..e44deae3f7 100644 --- a/src/MusicStore/samples/MusicStore/StartupOpenIdConnect.cs +++ b/src/MusicStore/samples/MusicStore/StartupOpenIdConnect.cs @@ -2,12 +2,10 @@ using System.Globalization; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.AspNetCore.Localization; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; using Microsoft.IdentityModel.Protocols.OpenIdConnect; using MusicStore.Components; using MusicStore.Models; @@ -57,16 +55,8 @@ namespace MusicStore services.Configure(Configuration.GetSection("AppSettings")); // Add EF services to the services container - if (_platform.UseInMemoryStore) - { - services.AddDbContext(options => - options.UseInMemoryDatabase("Scratch")); - } - else - { - services.AddDbContext(options => - options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"])); - } + services.AddDbContext(options => + options.UseSqlite("Data Source=MusicStore.db")); // Add Identity services to the services container services.AddIdentity() diff --git a/src/MusicStore/test/MusicStore.Test/CartSummaryComponentTest.cs b/src/MusicStore/test/MusicStore.Test/CartSummaryComponentTest.cs index c5ba830c80..3ab3265b5e 100644 --- a/src/MusicStore/test/MusicStore.Test/CartSummaryComponentTest.cs +++ b/src/MusicStore/test/MusicStore.Test/CartSummaryComponentTest.cs @@ -1,33 +1,22 @@ -using System; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewComponents; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; using MusicStore.Controllers; using MusicStore.Models; using Xunit; namespace MusicStore.Components { - public class CartSummaryComponentTest + public class CartSummaryComponentTest : IClassFixture { - private readonly IServiceProvider _serviceProvider; + private readonly SqliteInMemoryFixture _fixture; - public CartSummaryComponentTest() + public CartSummaryComponentTest(SqliteInMemoryFixture fixture) { - var efServiceProvider = new ServiceCollection().AddEntityFrameworkInMemoryDatabase().BuildServiceProvider(); - - var services = new ServiceCollection(); - - services - .AddMemoryCache() - .AddLogging() - .AddDbContext(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); - - _serviceProvider = services.BuildServiceProvider(); + _fixture = fixture; + _fixture.CreateDatabase(); } [Fact] @@ -45,7 +34,7 @@ namespace MusicStore.Components viewContext.HttpContext.Session.SetString("Session", cartId); // DbContext initialization - var dbContext = _serviceProvider.GetRequiredService(); + var dbContext = _fixture.Context; PopulateData(dbContext, cartId, albumTitle: "AlbumA", itemCount: 10); // CartSummaryComponent initialization @@ -68,10 +57,20 @@ namespace MusicStore.Components private static void PopulateData(MusicStoreContext context, string cartId, string albumTitle, int itemCount) { - var album = new Album() + var album = new Album { AlbumId = 1, Title = albumTitle, + Artist = new Artist + { + ArtistId = 1, + Name = "Kung Fu Kenny" + }, + Genre = new Genre + { + GenreId = 1, + Name = "Rap" + } }; var cartItems = Enumerable.Range(1, itemCount).Select(n => diff --git a/src/MusicStore/test/MusicStore.Test/CheckoutControllerTest.cs b/src/MusicStore/test/MusicStore.Test/CheckoutControllerTest.cs index e978410877..e93a8943a9 100644 --- a/src/MusicStore/test/MusicStore.Test/CheckoutControllerTest.cs +++ b/src/MusicStore/test/MusicStore.Test/CheckoutControllerTest.cs @@ -6,7 +6,6 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Primitives; @@ -15,29 +14,21 @@ using Xunit; namespace MusicStore.Controllers { - public class CheckoutControllerTest + public class CheckoutControllerTest : IClassFixture { - private readonly IServiceProvider _serviceProvider; + private readonly SqliteInMemoryFixture _fixture; - public CheckoutControllerTest() + public CheckoutControllerTest(SqliteInMemoryFixture fixture) { - var efServiceProvider = new ServiceCollection().AddEntityFrameworkInMemoryDatabase().BuildServiceProvider(); - - var services = new ServiceCollection(); - - services - .AddMemoryCache() - .AddLogging() - .AddDbContext(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); - - _serviceProvider = services.BuildServiceProvider(); + _fixture = fixture; + _fixture.CreateDatabase(); } [Fact] public void AddressAndPayment_ReturnsDefaultView() { // Arrange - var controller = new CheckoutController(_serviceProvider.GetService>()); + var controller = new CheckoutController(_fixture.ServiceProvider.GetService>()); // Act var result = controller.AddressAndPayment(); @@ -54,10 +45,7 @@ namespace MusicStore.Controllers var httpContext = new DefaultHttpContext(); var orderId = 10; - var order = new Order() - { - OrderId = orderId, - }; + var order = CreateOrder(10); // Session initialization var cartId = "CartId_A"; @@ -76,7 +64,7 @@ namespace MusicStore.Controllers httpContext.User = new ClaimsPrincipal(new ClaimsIdentity(claims)); // DbContext initialization - var dbContext = _serviceProvider.GetRequiredService(); + var dbContext = _fixture.Context; var cartItems = CreateTestCartItems( cartId, itemPrice: 10, @@ -85,7 +73,7 @@ namespace MusicStore.Controllers dbContext.AddRange(cartItems); dbContext.SaveChanges(); - var controller = new CheckoutController(_serviceProvider.GetService>()); + var controller = new CheckoutController(_fixture.ServiceProvider.GetService>()); controller.ControllerContext.HttpContext = httpContext; // Act @@ -105,17 +93,17 @@ namespace MusicStore.Controllers { // Arrange var context = new DefaultHttpContext(); - var dbContext = _serviceProvider.GetRequiredService(); + var dbContext = _fixture.Context; // AddressAndPayment action reads the Promo code from FormCollection. context.Request.Form = new FormCollection(new Dictionary()); - var controller = new CheckoutController(_serviceProvider.GetService>()); + var controller = new CheckoutController(_fixture.ServiceProvider.GetService>()); controller.ControllerContext.HttpContext = context; // Do not need actual data for Order; the Order object will be checked for the reference equality. - var order = new Order(); + var order = CreateOrder(); // Act var result = await controller.AddressAndPayment(dbContext, order, CancellationToken.None); @@ -135,12 +123,12 @@ namespace MusicStore.Controllers var context = new DefaultHttpContext(); context.Request.Form = new FormCollection(new Dictionary()); - var dbContext = _serviceProvider.GetRequiredService(); + var dbContext = _fixture.Context; - var controller = new CheckoutController(_serviceProvider.GetService>()); + var controller = new CheckoutController(_fixture.ServiceProvider.GetService>()); controller.ControllerContext.HttpContext = context; - var order = new Order(); + var order = CreateOrder(); // Act var result = await controller.AddressAndPayment(dbContext, order, new CancellationToken(true)); @@ -157,11 +145,11 @@ namespace MusicStore.Controllers public async Task AddressAndPayment_ReturnsOrderIfInvalidOrderModel() { // Arrange - var controller = new CheckoutController(_serviceProvider.GetService>()); + var controller = new CheckoutController(_fixture.ServiceProvider.GetService>()); controller.ModelState.AddModelError("a", "ModelErrorA"); - var dbContext = _serviceProvider.GetRequiredService(); + var dbContext = _fixture.Context; - var order = new Order(); + var order = CreateOrder(); // Act var result = await controller.AddressAndPayment(dbContext, order, CancellationToken.None); @@ -174,6 +162,22 @@ namespace MusicStore.Controllers Assert.Same(order, viewResult.ViewData.Model); } + private Order CreateOrder(int orderId = 100, string userName = "TestUserA") + => new Order + { + OrderId = orderId, + Username = userName, + FirstName = "Macavity", + LastName = "Clark", + Address = "11 Meadow Drive", + City = "Healing", + State = "IA", + PostalCode = "DN37 7RU", + Country = "USK", + Phone = "555 887876", + Email = "mc@sample.com" + }; + [Fact] public async Task Complete_ReturnsOrderIdIfValid() { @@ -187,16 +191,11 @@ namespace MusicStore.Controllers User = new ClaimsPrincipal(new ClaimsIdentity(claims)), }; - var dbContext = - _serviceProvider.GetRequiredService(); - dbContext.Add(new Order() - { - OrderId = orderId, - Username = userName - }); + var dbContext = _fixture.Context; + dbContext.Add(CreateOrder(orderId, userName)); dbContext.SaveChanges(); - var controller = new CheckoutController(_serviceProvider.GetService>()); + var controller = new CheckoutController(_fixture.ServiceProvider.GetService>()); controller.ControllerContext.HttpContext = httpContext; // Act @@ -215,10 +214,9 @@ namespace MusicStore.Controllers { // Arrange var invalidOrderId = 100; - var dbContext = - _serviceProvider.GetRequiredService(); + var dbContext = _fixture.Context; - var controller = new CheckoutController(_serviceProvider.GetService>()); + var controller = new CheckoutController(_fixture.ServiceProvider.GetService>()); controller.ControllerContext.HttpContext = new DefaultHttpContext(); // Act @@ -233,10 +231,21 @@ namespace MusicStore.Controllers private static CartItem[] CreateTestCartItems(string cartId, decimal itemPrice, int numberOfItem) { var albums = Enumerable.Range(1, 10).Select(n => - new Album() + new Album { AlbumId = n, Price = itemPrice, + Title = "Greatest Hits", + Artist = new Artist + { + ArtistId = 1, + Name = "Kung Fu Kenny" + }, + Genre = new Genre + { + GenreId = 1, + Name = "Rap" + } }).ToArray(); var cartItems = Enumerable.Range(1, numberOfItem).Select(n => diff --git a/src/MusicStore/test/MusicStore.Test/GenreMenuComponentTest.cs b/src/MusicStore/test/MusicStore.Test/GenreMenuComponentTest.cs index 30ac743ec0..1a7683d83d 100644 --- a/src/MusicStore/test/MusicStore.Test/GenreMenuComponentTest.cs +++ b/src/MusicStore/test/MusicStore.Test/GenreMenuComponentTest.cs @@ -1,38 +1,27 @@ -using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.ViewComponents; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; using MusicStore.Models; using Xunit; namespace MusicStore.Components { - public class GenreMenuComponentTest + public class GenreMenuComponentTest : IClassFixture { - private readonly IServiceProvider _serviceProvider; + private readonly SqliteInMemoryFixture _fixture; - public GenreMenuComponentTest() + public GenreMenuComponentTest(SqliteInMemoryFixture fixture) { - var efServiceProvider = new ServiceCollection().AddEntityFrameworkInMemoryDatabase().BuildServiceProvider(); - - var services = new ServiceCollection(); - - services - .AddMemoryCache() - .AddLogging() - .AddDbContext(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); - - _serviceProvider = services.BuildServiceProvider(); + _fixture = fixture; + _fixture.CreateDatabase(); } [Fact] public async Task GenreMenuComponent_Returns_NineGenres() { // Arrange - var dbContext = _serviceProvider.GetRequiredService(); + var dbContext = _fixture.Context; var genreMenuComponent = new GenreMenuComponent(dbContext); PopulateData(dbContext); @@ -50,7 +39,7 @@ namespace MusicStore.Components private static void PopulateData(MusicStoreContext context) { - var genres = Enumerable.Range(1, 10).Select(n => new Genre { GenreId = n }); + var genres = Enumerable.Range(1, 10).Select(n => new Genre { GenreId = n, Name = $"G{n}" }); context.AddRange(genres); context.SaveChanges(); diff --git a/src/MusicStore/test/MusicStore.Test/HomeControllerTest.cs b/src/MusicStore/test/MusicStore.Test/HomeControllerTest.cs index 3a12ab8f3a..0197db3c64 100644 --- a/src/MusicStore/test/MusicStore.Test/HomeControllerTest.cs +++ b/src/MusicStore/test/MusicStore.Test/HomeControllerTest.cs @@ -12,22 +12,14 @@ using Xunit; namespace MusicStore.Controllers { - public class HomeControllerTest + public class HomeControllerTest : IClassFixture { - private readonly IServiceProvider _serviceProvider; + private readonly SqliteInMemoryFixture _fixture; - public HomeControllerTest() + public HomeControllerTest(SqliteInMemoryFixture fixture) { - var efServiceProvider = new ServiceCollection().AddEntityFrameworkInMemoryDatabase().BuildServiceProvider(); - - var services = new ServiceCollection(); - - services - .AddMemoryCache() - .AddLogging() - .AddDbContext(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); - - _serviceProvider = services.BuildServiceProvider(); + _fixture = fixture; + _fixture.CreateDatabase(); } [Fact] @@ -50,8 +42,8 @@ namespace MusicStore.Controllers public async Task Index_GetsSixTopAlbums() { // Arrange - var dbContext = _serviceProvider.GetRequiredService(); - var cache = _serviceProvider.GetRequiredService(); + var dbContext = _fixture.Context; + var cache = _fixture.ServiceProvider.GetRequiredService(); var controller = new HomeController(new TestAppSettings()); PopulateData(dbContext); @@ -116,12 +108,13 @@ namespace MusicStore.Controllers }).ToArray(); var albums = Enumerable.Range(1, 10).Select(n => - new Album() + new Album { Artist = artists[n - 1], ArtistId = n, Genre = generes[n - 1], GenreId = n, + Title = "Greatest Hits", }).ToArray(); return albums; diff --git a/src/MusicStore/test/MusicStore.Test/ManageControllerTest.cs b/src/MusicStore/test/MusicStore.Test/ManageControllerTest.cs index 459f91db33..c6a351ca17 100644 --- a/src/MusicStore/test/MusicStore.Test/ManageControllerTest.cs +++ b/src/MusicStore/test/MusicStore.Test/ManageControllerTest.cs @@ -5,9 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using MusicStore.Models; @@ -15,37 +13,14 @@ using Xunit; namespace MusicStore.Controllers { - public class ManageControllerTest + public class ManageControllerTest : IClassFixture { - private readonly IServiceProvider _serviceProvider; + private readonly Fixture _fixture; - public ManageControllerTest() + public ManageControllerTest(Fixture fixture) { - var efServiceProvider = new ServiceCollection().AddEntityFrameworkInMemoryDatabase().BuildServiceProvider(); - - var services = new ServiceCollection(); - services.AddSingleton(new ConfigurationBuilder().Build()); - services.AddOptions(); - services - .AddMemoryCache() - .AddDbContext(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); - - services.AddIdentity() - .AddEntityFrameworkStores(); - - services.AddMvc(); - services.AddSingleton(); - services.AddLogging(); - - // IHttpContextAccessor is required for SignInManager, and UserManager - var context = new DefaultHttpContext(); - services.AddSingleton( - new HttpContextAccessor() - { - HttpContext = context, - }); - - _serviceProvider = services.BuildServiceProvider(); + _fixture = fixture; + _fixture.CreateDatabase(); } [Fact] @@ -56,19 +31,19 @@ namespace MusicStore.Controllers var phone = "abcdefg"; var claims = new List { new Claim(ClaimTypes.NameIdentifier, userId) }; - var userManager = _serviceProvider.GetRequiredService>(); + var userManager = _fixture.ServiceProvider.GetRequiredService>(); var userManagerResult = await userManager.CreateAsync( new ApplicationUser { Id = userId, UserName = "Test", TwoFactorEnabled = true, PhoneNumber = phone }, "Pass@word1"); Assert.True(userManagerResult.Succeeded); - var signInManager = _serviceProvider.GetRequiredService>(); + var signInManager = _fixture.ServiceProvider.GetRequiredService>(); - var httpContext = _serviceProvider.GetRequiredService().HttpContext; + var httpContext = _fixture.ServiceProvider.GetRequiredService().HttpContext; httpContext.User = new ClaimsPrincipal(new ClaimsIdentity(claims)); - httpContext.RequestServices = _serviceProvider; + httpContext.RequestServices = _fixture.ServiceProvider; - var schemeProvider = _serviceProvider.GetRequiredService(); + var schemeProvider = _fixture.ServiceProvider.GetRequiredService(); var controller = new ManageController(userManager, signInManager, schemeProvider); controller.ControllerContext.HttpContext = httpContext; @@ -117,5 +92,34 @@ namespace MusicStore.Controllers } } + public class Fixture : SqliteInMemoryFixture + { + public override IServiceCollection ConfigureServices(IServiceCollection services) + { + services = base.ConfigureServices(services); + + services.AddSingleton(new ConfigurationBuilder().Build()); + services.AddOptions(); + + + services.AddIdentity() + .AddEntityFrameworkStores(); + + services.AddMvc(); + services.AddSingleton(); + services.AddLogging(); + + + // IHttpContextAccessor is required for SignInManager, and UserManager + var context = new DefaultHttpContext(); + services.AddSingleton( + new HttpContextAccessor() + { + HttpContext = context, + }); + + return services; + } + } } } diff --git a/src/MusicStore/test/MusicStore.Test/Models/ShoppingCartTest.cs b/src/MusicStore/test/MusicStore.Test/Models/ShoppingCartTest.cs index 58dd56c9a8..918e516f77 100644 --- a/src/MusicStore/test/MusicStore.Test/Models/ShoppingCartTest.cs +++ b/src/MusicStore/test/MusicStore.Test/Models/ShoppingCartTest.cs @@ -3,62 +3,49 @@ using System; using System.Threading.Tasks; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; using MusicStore.Models; using Xunit; namespace MusicStore.Test { - public class ShoppingCartTest : IClassFixture + public class ShoppingCartTest : IClassFixture { - private readonly ShoppingCartFixture _fixture; + private readonly SqliteInMemoryFixture _fixture; - public ShoppingCartTest(ShoppingCartFixture fixture) + public ShoppingCartTest(SqliteInMemoryFixture fixture) { _fixture = fixture; + _fixture.CreateDatabase(); } [Fact] public async Task ComputesTotal() { var cartId = Guid.NewGuid().ToString(); - using (var db = _fixture.CreateContext()) - { - var a = db.Albums.Add( - new Album + var db = _fixture.Context; + var a = db.Albums.Add( + new Album + { + AlbumId = 1, + Title = "Greatest Hits", + Price = 15.99m, + Artist = new Artist { - Price = 15.99m - }).Entity; + ArtistId = 1, + Name = "Kung Fu Kenny" + }, + Genre = new Genre + { + GenreId = 1, + Name = "Rap" + } + }).Entity; - db.CartItems.Add(new CartItem { Album = a, Count = 2, CartId = cartId }); + db.CartItems.Add(new CartItem { Album = a, Count = 2, CartId = cartId }); - db.SaveChanges(); + db.SaveChanges(); - Assert.Equal(31.98m, await ShoppingCart.GetCart(db, cartId).GetTotal()); - } + Assert.Equal(31.98m, await ShoppingCart.GetCart(db, cartId).GetTotal()); } } - - public class ShoppingCartFixture - { - private readonly IServiceProvider _serviceProvider; - - public ShoppingCartFixture() - { - var efServiceProvider = new ServiceCollection().AddEntityFrameworkInMemoryDatabase().BuildServiceProvider(); - - var services = new ServiceCollection(); - - services - .AddMemoryCache() - .AddLogging() - .AddDbContext(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); - - _serviceProvider = services.BuildServiceProvider(); - } - - public virtual MusicStoreContext CreateContext() - => _serviceProvider.GetRequiredService(); - } } diff --git a/src/MusicStore/test/MusicStore.Test/ShoppingCartControllerTest.cs b/src/MusicStore/test/MusicStore.Test/ShoppingCartControllerTest.cs index 1306b48475..7e4145b46d 100644 --- a/src/MusicStore/test/MusicStore.Test/ShoppingCartControllerTest.cs +++ b/src/MusicStore/test/MusicStore.Test/ShoppingCartControllerTest.cs @@ -7,10 +7,8 @@ using Microsoft.AspNetCore.Antiforgery; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.ObjectPool; using Microsoft.Extensions.Primitives; using MusicStore.Models; using MusicStore.ViewModels; @@ -18,23 +16,14 @@ using Xunit; namespace MusicStore.Controllers { - public class ShoppingCartControllerTest + public class ShoppingCartControllerTest : IClassFixture { - private readonly IServiceProvider _serviceProvider; + private readonly Fixture _fixture; - public ShoppingCartControllerTest() + public ShoppingCartControllerTest(Fixture fixture) { - var efServiceProvider = new ServiceCollection().AddEntityFrameworkInMemoryDatabase().BuildServiceProvider(); - - var services = new ServiceCollection(); - services - .AddMemoryCache() - .AddLogging() - .AddDbContext(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); - - services.AddMvc(); - - _serviceProvider = services.BuildServiceProvider(); + _fixture = fixture; + _fixture.CreateDatabase(); } [Fact] @@ -45,8 +34,8 @@ namespace MusicStore.Controllers httpContext.Session = new TestSession(); var controller = new ShoppingCartController( - _serviceProvider.GetRequiredService(), - _serviceProvider.GetService>()); + _fixture.Context, + _fixture.ServiceProvider.GetService>()); controller.ControllerContext.HttpContext = httpContext; // Act @@ -71,8 +60,8 @@ namespace MusicStore.Controllers httpContext.Session.SetString("Session", "CartId_A"); var controller = new ShoppingCartController( - _serviceProvider.GetRequiredService(), - _serviceProvider.GetService>()); + _fixture.Context, + _fixture.ServiceProvider.GetService>()); controller.ControllerContext.HttpContext = httpContext; // Act @@ -97,7 +86,7 @@ namespace MusicStore.Controllers httpContext.Session = new TestSession(); httpContext.Session.SetString("Session", cartId); - var dbContext = _serviceProvider.GetRequiredService(); + var dbContext = _fixture.Context; var cartItems = CreateTestCartItems( cartId, itemPrice: 10, @@ -108,7 +97,7 @@ namespace MusicStore.Controllers var controller = new ShoppingCartController( dbContext, - _serviceProvider.GetService>()); + _fixture.ServiceProvider.GetService>()); controller.ControllerContext.HttpContext = httpContext; // Act @@ -134,14 +123,14 @@ namespace MusicStore.Controllers httpContext.Session.SetString("Session", "CartId_A"); // Creates the albums of AlbumId = 1 ~ 10. - var dbContext = _serviceProvider.GetRequiredService(); + var dbContext = _fixture.Context; var albums = CreateTestAlbums(itemPrice: 10); dbContext.AddRange(albums); dbContext.SaveChanges(); var controller = new ShoppingCartController( dbContext, - _serviceProvider.GetService>()); + _fixture.ServiceProvider.GetService>()); controller.ControllerContext.HttpContext = httpContext; // Act @@ -172,7 +161,7 @@ namespace MusicStore.Controllers httpContext.Session.SetString("Session", cartId); // DbContext initialization - var dbContext = _serviceProvider.GetRequiredService(); + var dbContext = _fixture.Context; var cartItems = CreateTestCartItems(cartId, unitPrice, numberOfItem); dbContext.AddRange(cartItems.Select(n => n.Album).Distinct()); dbContext.AddRange(cartItems); @@ -183,7 +172,7 @@ namespace MusicStore.Controllers httpContext.Features.Set(serviceProviderFeature); // AntiForgery initialization - serviceProviderFeature.RequestServices = _serviceProvider; + serviceProviderFeature.RequestServices = _fixture.ServiceProvider; var antiForgery = serviceProviderFeature.RequestServices.GetRequiredService(); var tokens = antiForgery.GetTokens(httpContext); @@ -196,7 +185,7 @@ namespace MusicStore.Controllers // Cotroller initialization var controller = new ShoppingCartController( dbContext, - _serviceProvider.GetService>()); + _fixture.ServiceProvider.GetService>()); controller.ControllerContext.HttpContext = httpContext; // Act @@ -207,7 +196,7 @@ namespace MusicStore.Controllers var viewModel = Assert.IsType(jsonResult.Value); Assert.Equal(numberOfItem - 1, viewModel.CartCount); Assert.Equal((numberOfItem - 1) * 10, viewModel.CartTotal); - Assert.Equal(" has been removed from your shopping cart.", viewModel.Message); + Assert.Equal("Greatest Hits has been removed from your shopping cart.", viewModel.Message); var cart = ShoppingCart.GetCart(dbContext, httpContext); Assert.DoesNotContain((await cart.GetCartItems()), c => c.CartItemId == cartItemId); @@ -232,11 +221,34 @@ namespace MusicStore.Controllers private static Album[] CreateTestAlbums(decimal itemPrice) { return Enumerable.Range(1, 10).Select(n => - new Album() + new Album { + Title = "Greatest Hits", AlbumId = n, Price = itemPrice, + Artist = new Artist + { + ArtistId = 1, + Name = "Kung Fu Kenny" + }, + Genre = new Genre + { + GenreId = 1, + Name = "Rap" + } }).ToArray(); } + + public class Fixture : SqliteInMemoryFixture + { + public override IServiceCollection ConfigureServices(IServiceCollection services) + { + services = base.ConfigureServices(services); + + services.AddMvc(); + + return services; + } + } } } diff --git a/src/MusicStore/test/MusicStore.Test/SqliteInMemoryFixture.cs b/src/MusicStore/test/MusicStore.Test/SqliteInMemoryFixture.cs new file mode 100644 index 0000000000..fb2824cfdf --- /dev/null +++ b/src/MusicStore/test/MusicStore.Test/SqliteInMemoryFixture.cs @@ -0,0 +1,52 @@ +using System; +using Microsoft.Data.Sqlite; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; +using MusicStore.Models; + +namespace MusicStore +{ + public class SqliteInMemoryFixture : IDisposable + { + private IServiceScope _serviceScope; + private SqliteConnection _connection; + + public virtual void Dispose() + { + _connection?.Close(); + _connection?.Dispose(); + _serviceScope?.Dispose(); + _serviceScope= null; + } + + public virtual IServiceCollection ConfigureServices(IServiceCollection services) + => services + .AddMemoryCache() + .AddLogging() + .AddDbContext(b => b.UseSqlite(_connection)); + + public virtual IServiceProvider ServiceProvider + { + get + { + if (_serviceScope == null) + { + _serviceScope = ConfigureServices(new ServiceCollection()).BuildServiceProvider().CreateScope(); + } + + return _serviceScope.ServiceProvider; + } + } + + public virtual MusicStoreContext Context + => ServiceProvider.GetRequiredService(); + + public virtual void CreateDatabase() + { + Dispose(); + _connection = new SqliteConnection("Data Source=:memory:"); + _connection.Open(); + Context.Database.EnsureCreated(); + } + } +} diff --git a/src/MusicStore/test/MusicStore.Test/StoreControllerTest.cs b/src/MusicStore/test/MusicStore.Test/StoreControllerTest.cs index e7c278bf12..530930e903 100644 --- a/src/MusicStore/test/MusicStore.Test/StoreControllerTest.cs +++ b/src/MusicStore/test/MusicStore.Test/StoreControllerTest.cs @@ -12,29 +12,21 @@ using Xunit; namespace MusicStore.Controllers { - public class StoreControllerTest + public class StoreControllerTest : IClassFixture { - private readonly IServiceProvider _serviceProvider; + private readonly SqliteInMemoryFixture _fixture; - public StoreControllerTest() + public StoreControllerTest(SqliteInMemoryFixture fixture) { - var efServiceProvider = new ServiceCollection().AddEntityFrameworkInMemoryDatabase().BuildServiceProvider(); - - var services = new ServiceCollection(); - - services - .AddMemoryCache() - .AddLogging() - .AddDbContext(b => b.UseInMemoryDatabase("Scratch").UseInternalServiceProvider(efServiceProvider)); - - _serviceProvider = services.BuildServiceProvider(); + _fixture = fixture; + _fixture.CreateDatabase(); } [Fact] public async Task Index_CreatesViewWithGenres() { // Arrange - var dbContext = _serviceProvider.GetRequiredService(); + var dbContext = _fixture.Context; CreateTestGenres(numberOfGenres: 10, numberOfAlbums: 1, dbContext: dbContext); var controller = new StoreController(dbContext, new TestAppSettings()); @@ -56,7 +48,7 @@ namespace MusicStore.Controllers { // Arrange var controller = new StoreController( - _serviceProvider.GetRequiredService(), + _fixture.Context, new TestAppSettings()); // Act @@ -72,7 +64,7 @@ namespace MusicStore.Controllers // Arrange var genreName = "Genre 1"; - var dbContext = _serviceProvider.GetRequiredService(); + var dbContext = _fixture.Context; CreateTestGenres(numberOfGenres: 3, numberOfAlbums: 3, dbContext: dbContext); var controller = new StoreController(dbContext, new TestAppSettings()); @@ -97,11 +89,11 @@ namespace MusicStore.Controllers // Arrange var albumId = int.MinValue; var controller = new StoreController( - _serviceProvider.GetRequiredService(), + _fixture.Context, new TestAppSettings()); // Act - var result = await controller.Details(_serviceProvider.GetRequiredService(), albumId); + var result = await controller.Details(_fixture.ServiceProvider.GetRequiredService(), albumId); // Assert Assert.IsType(result); @@ -113,10 +105,10 @@ namespace MusicStore.Controllers // Arrange var albumId = 1; - var dbContext = _serviceProvider.GetRequiredService(); + var dbContext = _fixture.Context; var genres = CreateTestGenres(numberOfGenres: 3, numberOfAlbums: 3, dbContext: dbContext); - var cache = _serviceProvider.GetRequiredService(); + var cache = _fixture.ServiceProvider.GetRequiredService(); var controller = new StoreController(dbContext, new TestAppSettings()); @@ -148,31 +140,22 @@ namespace MusicStore.Controllers artist.Name = "Artist1"; var albums = Enumerable.Range(1, numberOfAlbums * numberOfGenres).Select(n => - new Album() + new Album { AlbumId = n, Artist = artist, - ArtistId = artist.ArtistId + ArtistId = artist.ArtistId, + Title = "Greatest Hits", }).ToList(); var generes = Enumerable.Range(1, numberOfGenres).Select(n => - new Genre() + new Genre { Albums = albums.Where(i => i.AlbumId % numberOfGenres == n - 1).ToList(), GenreId = n, Name = "Genre " + n }); - var artis = Enumerable.Range(1, numberOfGenres).Select(n => - new Genre() - { - Albums = albums.Where(i => i.AlbumId % numberOfGenres == n - 1).ToList(), - GenreId = n, - Name = "Genre " + n, - }); - - dbContext.Add(artist); - dbContext.AddRange(albums); dbContext.AddRange(generes); dbContext.SaveChanges(); diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/CSharpIdentifier.cs b/src/Mvc/Extensions.ApiDescription.Client/src/CSharpIdentifier.cs index 33d0b0e9eb..b1ee4f7c0c 100644 --- a/src/Mvc/Extensions.ApiDescription.Client/src/CSharpIdentifier.cs +++ b/src/Mvc/Extensions.ApiDescription.Client/src/CSharpIdentifier.cs @@ -6,7 +6,7 @@ using System.Text; // Copied from // https://github.com/aspnet/AspNetCore-Tooling/blob/master/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CSharpIdentifier.cs -namespace Microsoft.Extensions.ApiDescription.Tasks +namespace Microsoft.Extensions.ApiDescription.Client { internal static class CSharpIdentifier { diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/GetCurrentItems.cs b/src/Mvc/Extensions.ApiDescription.Client/src/GetCurrentItems.cs index 97ea236f2c..975e716d64 100644 --- a/src/Mvc/Extensions.ApiDescription.Client/src/GetCurrentItems.cs +++ b/src/Mvc/Extensions.ApiDescription.Client/src/GetCurrentItems.cs @@ -4,7 +4,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.Extensions.ApiDescription.Tasks +namespace Microsoft.Extensions.ApiDescription.Client { /// /// Restore s from given property value. diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/GetFileReferenceMetadata.cs b/src/Mvc/Extensions.ApiDescription.Client/src/GetFileReferenceMetadata.cs index 73f8d01495..2b0447c590 100644 --- a/src/Mvc/Extensions.ApiDescription.Client/src/GetFileReferenceMetadata.cs +++ b/src/Mvc/Extensions.ApiDescription.Client/src/GetFileReferenceMetadata.cs @@ -7,7 +7,7 @@ using System.IO; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.Extensions.ApiDescription.Tasks +namespace Microsoft.Extensions.ApiDescription.Client { /// /// Adds or corrects ClassName, FirstForGenerator, Namespace, and OutputPath metadata in OpenApiReference items. diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/MetadataSerializer.cs b/src/Mvc/Extensions.ApiDescription.Client/src/MetadataSerializer.cs index 32f7fbf832..eeff4170fc 100644 --- a/src/Mvc/Extensions.ApiDescription.Client/src/MetadataSerializer.cs +++ b/src/Mvc/Extensions.ApiDescription.Client/src/MetadataSerializer.cs @@ -6,7 +6,7 @@ using System.Text; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.Extensions.ApiDescription.Tasks +namespace Microsoft.Extensions.ApiDescription.Client { /// /// Utility methods to serialize and deserialize metadata. diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj b/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj index 2edaf7b68c..2029ac0a25 100644 --- a/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj +++ b/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj @@ -6,21 +6,19 @@ true - Microsoft.Extensions.ApiDescription.Tasks MSBuild tasks and targets for code generation false false - false $(MSBuildProjectName).nuspec $(MSBuildProjectName) Build Tasks;MSBuild;Swagger;Open API;code generation; Web API client true $(ExperimentalPackageVersion) - $(AssemblyName) netstandard2.0;net461 false $(ExperimentalVersionPrefix) $(ExperimentalVersionSuffix) + false diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec b/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec index f04380cfe4..cc49fd1c56 100644 --- a/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec +++ b/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec @@ -19,7 +19,7 @@ - - + + diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/Properties/Resources.Designer.cs b/src/Mvc/Extensions.ApiDescription.Client/src/Properties/Resources.Designer.cs index 3e16c26c41..f1b61f00ac 100644 --- a/src/Mvc/Extensions.ApiDescription.Client/src/Properties/Resources.Designer.cs +++ b/src/Mvc/Extensions.ApiDescription.Client/src/Properties/Resources.Designer.cs @@ -1,5 +1,5 @@ // -namespace Microsoft.Extensions.ApiDescription.Tasks +namespace Microsoft.Extensions.ApiDescription.Client { using System.Globalization; using System.Reflection; @@ -8,7 +8,7 @@ namespace Microsoft.Extensions.ApiDescription.Tasks internal static class Resources { private static readonly ResourceManager _resourceManager - = new ResourceManager("Microsoft.Extensions.ApiDescription.Tasks.Resources", typeof(Resources).GetTypeInfo().Assembly); + = new ResourceManager("Microsoft.Extensions.ApiDescription.Client.Resources", typeof(Resources).GetTypeInfo().Assembly); /// /// Multiple items have OutputPath='{0}'. All OpenApiReference items must have unique OutputPath metadata. diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.props b/src/Mvc/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.props index 5f5640bfd3..dd5e8dd9e8 100644 --- a/src/Mvc/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.props +++ b/src/Mvc/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.props @@ -1,35 +1,60 @@  - <_ApiDescriptionTasksAssemblyTarget - Condition="'$(MSBuildRuntimeType)' == 'Core'">netstandard2.0 - <_ApiDescriptionTasksAssemblyTarget - Condition="'$(MSBuildRuntimeType)' != 'Core'">net461 - <_ApiDescriptionTasksAssemblyPath>$(MSBuildThisFileDirectory)/../tasks/$(_ApiDescriptionTasksAssemblyTarget)/Microsoft.Extensions.ApiDescription.Tasks.dll - <_ApiDescriptionTasksAssemblyTarget /> + <_ApiDescriptionClientAssemblyTarget + Condition="'$(MSBuildRuntimeType)' == 'Core'">netstandard2.0 + <_ApiDescriptionClientAssemblyTarget + Condition="'$(MSBuildRuntimeType)' != 'Core'">net461 + <_ApiDescriptionClientAssemblyPath>$(MSBuildThisFileDirectory)/../tasks/$(_ApiDescriptionClientAssemblyTarget)/Microsoft.Extensions.ApiDescription.Client.dll + <_ApiDescriptionClientAssemblyTarget /> - - + + - + + - true + true - $(BaseIntermediateOutputPath) - $([MSBuild]::EnsureTrailingSlash('$(OpenApiDefaultOutputDirectory)')) + true + + + true + + + $(BaseIntermediateOutputPath) + NSwagCSharp + + - $(OpenApiDefaultGeneratorOptions) + $(OpenApiGenerateCodeOptions) + diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.targets b/src/Mvc/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.targets index bd7006fc36..b10277a696 100644 --- a/src/Mvc/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.targets +++ b/src/Mvc/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.targets @@ -2,21 +2,18 @@ - - _GetMetadataForOpenApiReferences; - _GenerateOpenApiReferenceCode; - _CreateCompileItemsForOpenApiReferences - - + _GenerateErrorsForOldItems; _CreateOpenApiReferenceItemsForOpenApiProjectReferences; - GenerateOpenApiReferenceCode - + _GetMetadataForOpenApiReferences; + _GenerateOpenApiCode; + _CreateCompileItemsForOpenApiReferences + - + + @@ -143,7 +134,18 @@ - + + + + + + + Condition=" '$(OpenApiGenerateCodeOnBuild)' == 'true' AND ('$(TargetFramework)' == '' OR '$(TargetFrameworks)' == '') " + DependsOnTargets="GenerateOpenApiCode" /> diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Client.props b/src/Mvc/Extensions.ApiDescription.Client/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Client.props new file mode 100644 index 0000000000..9ce9d3e259 --- /dev/null +++ b/src/Mvc/Extensions.ApiDescription.Client/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Client.props @@ -0,0 +1,4 @@ + + + + diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Client.targets b/src/Mvc/Extensions.ApiDescription.Client/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Client.targets index d085051f06..b264baa9df 100644 --- a/src/Mvc/Extensions.ApiDescription.Client/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Client.targets +++ b/src/Mvc/Extensions.ApiDescription.Client/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Client.targets @@ -1,9 +1,14 @@  - - + + RemoveProperties="RuntimeIdentifier" /> + + diff --git a/src/Mvc/GetDocumentInsider/src/Commands/CommandBase.cs b/src/Mvc/GetDocumentInsider/src/Commands/CommandBase.cs index ac9a4b1a37..b5eddd978c 100644 --- a/src/Mvc/GetDocumentInsider/src/Commands/CommandBase.cs +++ b/src/Mvc/GetDocumentInsider/src/Commands/CommandBase.cs @@ -32,7 +32,6 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands { } - protected virtual int Execute() - => 0; + protected virtual int Execute() => 0; } } diff --git a/src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommand.cs b/src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommand.cs index 11c381aac6..145db50da6 100644 --- a/src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommand.cs +++ b/src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommand.cs @@ -5,7 +5,7 @@ using System; using System.IO; using System.Linq; using System.Reflection; -#if NETCOREAPP2_0 +#if NETCOREAPP2_1 using System.Runtime.Loader; #endif using Microsoft.DotNet.Cli.CommandLine; @@ -14,45 +14,30 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands { internal class GetDocumentCommand : ProjectCommandBase { - internal const string FallbackDocumentName = "v1"; - internal const string FallbackMethod = "GenerateAsync"; - internal const string FallbackService = "Microsoft.Extensions.ApiDescription.IDocumentProvider"; - - private CommandOption _documentName; - private CommandOption _method; + private CommandOption _fileListPath; private CommandOption _output; - private CommandOption _service; public override void Configure(CommandLineApplication command) { base.Configure(command); - _documentName = command.Option( - "--documentName ", - Resources.FormatDocumentDescription(FallbackDocumentName)); - _method = command.Option("--method ", Resources.FormatMethodDescription(FallbackMethod)); - _output = command.Option("--output ", Resources.OutputDescription); - _service = command.Option("--service ", Resources.FormatServiceDescription(FallbackService)); + _fileListPath = command.Option("--file-list ", Resources.FileListDescription); + _output = command.Option("--output ", Resources.OutputDescription); } protected override void Validate() { base.Validate(); + if (!_fileListPath.HasValue()) + { + throw new CommandException(Resources.FormatMissingOption(_fileListPath.LongName)); + } + if (!_output.HasValue()) { throw new CommandException(Resources.FormatMissingOption(_output.LongName)); } - - if (_method.HasValue() && !_service.HasValue()) - { - throw new CommandException(Resources.FormatMissingOption(_service.LongName)); - } - - if (_service.HasValue() && !_method.HasValue()) - { - throw new CommandException(Resources.FormatMissingOption(_method.LongName)); - } } protected override int Execute() @@ -79,7 +64,7 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands } } -#if NETCOREAPP2_0 +#if NETCOREAPP2_1 AssemblyLoadContext.Default.Resolving += (loadContext, assemblyName) => { var name = assemblyName.Name; @@ -125,7 +110,7 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands return Assembly.LoadFile(assemblyPath); }; #else -#error target frameworks need to be updated. +#error Target frameworks need to be updated. #endif // Now safe to reference the application's code. @@ -135,12 +120,10 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands var context = new GetDocumentCommandContext { AssemblyPath = assemblyPath, - AssemblyDirectory = Path.GetDirectoryName(assemblyPath), AssemblyName = Path.GetFileNameWithoutExtension(assemblyPath), - DocumentName = _documentName.Value(), - Method = _method.Value(), - OutputPath = _output.Value(), - Service = _service.Value(), + FileListPath = _fileListPath.Value(), + OutputDirectory = _output.Value(), + ProjectName = ProjectName.Value(), }; return GetDocumentCommandWorker.Process(context); @@ -148,7 +131,7 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands catch (Exception ex) { Console.Error.WriteLine(ex.ToString()); - return 1; + return 2; } } diff --git a/src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommandContext.cs b/src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommandContext.cs index 0cd0bd7f57..3cf1da50d1 100644 --- a/src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommandContext.cs +++ b/src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommandContext.cs @@ -8,18 +8,14 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands [Serializable] public class GetDocumentCommandContext { - public string AssemblyDirectory { get; set; } - public string AssemblyName { get; set; } public string AssemblyPath { get; set; } - public string DocumentName { get; set; } + public string FileListPath { get; set; } - public string Method { get; set; } + public string OutputDirectory { get; set; } - public string OutputPath { get; set; } - - public string Service { get; set; } + public string ProjectName { get; set; } } } diff --git a/src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommandWorker.cs b/src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommandWorker.cs index fa2ee803dd..2f9a61def0 100644 --- a/src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommandWorker.cs +++ b/src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommandWorker.cs @@ -2,15 +2,36 @@ // 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.IO; using System.Reflection; +using System.Text; using System.Threading.Tasks; -using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; namespace Microsoft.Extensions.ApiDescription.Tool.Commands { internal class GetDocumentCommandWorker { + private const string DefaultDocumentName = "v1"; + private const string DocumentService = "Microsoft.Extensions.ApiDescriptions.IDocumentProvider"; + private const string DotString = "."; + private const string InvalidFilenameString = ".."; + private const string JsonExtension = ".json"; + private const string UnderscoreString = "_"; + private static readonly char[] InvalidFilenameCharacters = Path.GetInvalidFileNameChars(); + private static readonly Encoding UTF8EncodingWithoutBOM + = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false, throwOnInvalidBytes: true); + + private const string GetDocumentsMethodName = "GetDocumentNames"; + private static readonly object[] GetDocumentsArguments = Array.Empty(); + private static readonly Type[] GetDocumentsParameterTypes = Type.EmptyTypes; + private static readonly Type GetDocumentsReturnType = typeof(IEnumerable); + + private const string GenerateMethodName = "GenerateAsync"; + private static readonly Type[] GenerateMethodParameterTypes = new[] { typeof(string), typeof(TextWriter) }; + private static readonly Type GenerateMethodReturnType = typeof(Task); + public static int Process(GetDocumentCommandContext context) { var assemblyName = new AssemblyName(context.AssemblyName); @@ -19,203 +40,251 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands if (entryPointType == null) { Reporter.WriteError(Resources.FormatMissingEntryPoint(context.AssemblyPath)); - return 2; - } - - var services = GetServices(entryPointType, context.AssemblyPath, context.AssemblyName); - if (services == null) - { return 3; } - var success = TryProcess(context, services); - if (!success) + try { - // As part of the aspnet/Mvc#8425 fix, return 4 here. - return 0; + var serviceFactory = HostFactoryResolver.ResolveServiceProviderFactory(assembly); + if (serviceFactory == null) + { + Reporter.WriteError(Resources.FormatMethodsNotFound( + HostFactoryResolver.BuildWebHost, + HostFactoryResolver.CreateHostBuilder, + HostFactoryResolver.CreateWebHostBuilder, + entryPointType)); + + return 4; + } + + var services = serviceFactory(Array.Empty()); + if (services == null) + { + Reporter.WriteError(Resources.FormatServiceProviderNotFound( + typeof(IServiceProvider), + HostFactoryResolver.BuildWebHost, + HostFactoryResolver.CreateHostBuilder, + HostFactoryResolver.CreateWebHostBuilder, + entryPointType)); + + return 5; + } + + var success = GetDocuments(context, services); + if (!success) + { + return 6; + } + } + catch (Exception ex) + { + Reporter.WriteError(ex.ToString()); + return 7; } return 0; } - public static bool TryProcess(GetDocumentCommandContext context, IServiceProvider services) + private static bool GetDocuments(GetDocumentCommandContext context, IServiceProvider services) { - var documentName = string.IsNullOrEmpty(context.DocumentName) ? - GetDocumentCommand.FallbackDocumentName : - context.DocumentName; - var methodName = string.IsNullOrEmpty(context.Method) ? - GetDocumentCommand.FallbackMethod : - context.Method; - var serviceName = string.IsNullOrEmpty(context.Service) ? - GetDocumentCommand.FallbackService : - context.Service; + Type serviceType = null; + foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) + { + serviceType = assembly.GetType(DocumentService, throwOnError: false); + if (serviceType != null) + { + break; + } + } - Reporter.WriteInformation(Resources.FormatUsingDocument(documentName)); - Reporter.WriteInformation(Resources.FormatUsingMethod(methodName)); - Reporter.WriteInformation(Resources.FormatUsingService(serviceName)); + if (serviceType == null) + { + Reporter.WriteError(Resources.FormatServiceTypeNotFound(DocumentService)); + return false; + } + var getDocumentsMethod = GetMethod( + GetDocumentsMethodName, + serviceType, + GetDocumentsParameterTypes, + GetDocumentsReturnType); + if (getDocumentsMethod == null) + { + return false; + } + + var generateMethod = GetMethod( + GenerateMethodName, + serviceType, + GenerateMethodParameterTypes, + GenerateMethodReturnType); + if (generateMethod == null) + { + return false; + } + + var service = services.GetService(serviceType); + if (service == null) + { + Reporter.WriteError(Resources.FormatServiceNotFound(DocumentService)); + return false; + } + + var documentNames = (IEnumerable)InvokeMethod(getDocumentsMethod, service, GetDocumentsArguments); + if (documentNames == null) + { + return false; + } + + // Write out the documents. + Directory.CreateDirectory(context.OutputDirectory); + var filePathList = new List(); + foreach (var documentName in documentNames) + { + var filePath = GetDocument( + documentName, + context.ProjectName, + context.OutputDirectory, + generateMethod, + service); + if (filePath == null) + { + return false; + } + + filePathList.Add(filePath); + } + + // Write out the cache file. + var stream = File.Create(context.FileListPath); + using var writer = new StreamWriter(stream); + writer.WriteLine(string.Join(Environment.NewLine, filePathList)); + + return true; + } + + private static string GetDocument( + string documentName, + string projectName, + string outputDirectory, + MethodInfo generateMethod, + object service) + { + Reporter.WriteInformation(Resources.FormatGeneratingDocument(documentName)); + + using var stream = new MemoryStream(); + using (var writer = new StreamWriter(stream, UTF8EncodingWithoutBOM, bufferSize: 1024, leaveOpen: true)) + { + var arguments = new object[] { documentName, writer }; + using var resultTask = (Task)InvokeMethod(generateMethod, service, arguments); + if (resultTask == null) + { + return null; + } + + var finished = resultTask.Wait(TimeSpan.FromMinutes(1)); + if (!finished) + { + Reporter.WriteError(Resources.FormatMethodTimedOut(GenerateMethodName, DocumentService, 1)); + return null; + } + } + + if (stream.Length == 0L) + { + Reporter.WriteError( + Resources.FormatMethodWroteNoContent(GenerateMethodName, DocumentService, documentName)); + + return null; + } + + var filePath = GetDocumentPath(documentName, projectName, outputDirectory); + Reporter.WriteInformation(Resources.FormatWritingDocument(documentName, filePath)); try { - Type serviceType = null; - foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) - { - serviceType = assembly.GetType(serviceName, throwOnError: false); - if (serviceType != null) - { - break; - } - } - - // As part of the aspnet/Mvc#8425 fix, make all warnings in this method errors unless the file already - // exists. - if (serviceType == null) - { - Reporter.WriteWarning(Resources.FormatServiceTypeNotFound(serviceName)); - return false; - } - - var method = serviceType.GetMethod(methodName, new[] { typeof(string), typeof(TextWriter) }); - if (method == null) - { - Reporter.WriteWarning(Resources.FormatMethodNotFound(methodName, serviceName)); - return false; - } - else if (!typeof(Task).IsAssignableFrom(method.ReturnType)) - { - Reporter.WriteWarning(Resources.FormatMethodReturnTypeUnsupported( - methodName, - serviceName, - method.ReturnType, - typeof(Task))); - return false; - } - - var service = services.GetService(serviceType); - if (service == null) - { - Reporter.WriteWarning(Resources.FormatServiceNotFound(serviceName)); - return false; - } + stream.Position = 0L; // Create the output FileStream last to avoid corrupting an existing file or writing partial data. - var stream = new MemoryStream(); - using (var writer = new StreamWriter(stream)) - { - var resultTask = (Task)method.Invoke(service, new object[] { documentName, writer }); - if (resultTask == null) - { - Reporter.WriteWarning( - Resources.FormatMethodReturnedNull(methodName, serviceName, nameof(Task))); - return false; - } - - var finishedIndex = Task.WaitAny(resultTask, Task.Delay(TimeSpan.FromMinutes(1))); - if (finishedIndex != 0) - { - Reporter.WriteWarning(Resources.FormatMethodTimedOut(methodName, serviceName, 1)); - return false; - } - - writer.Flush(); - if (stream.Length > 0L) - { - stream.Position = 0L; - using (var outStream = File.Create(context.OutputPath)) - { - stream.CopyTo(outStream); - outStream.Flush(); - } - } - } - - return true; + using var outStream = File.Create(filePath); + stream.CopyTo(outStream); } - catch (AggregateException ex) when (ex.InnerException != null) + catch { - foreach (var innerException in ex.Flatten().InnerExceptions) - { - Reporter.WriteWarning(FormatException(innerException)); - } - } - catch (Exception ex) - { - Reporter.WriteWarning(FormatException(ex)); + File.Delete(filePath); + throw; } - File.Delete(context.OutputPath); - - return false; + return filePath; } - // TODO: Use Microsoft.AspNetCore.Hosting.WebHostBuilderFactory.Sources once we have dev feed available. - private static IServiceProvider GetServices(Type entryPointType, string assemblyPath, string assemblyName) + private static string GetDocumentPath(string documentName, string projectName, string outputDirectory) { - var args = new[] { Array.Empty() }; - var methodInfo = entryPointType.GetMethod("BuildWebHost"); - if (methodInfo != null) + string path; + if (string.Equals(DefaultDocumentName, documentName, StringComparison.Ordinal)) { - // BuildWebHost (old style has highest priority) - var parameters = methodInfo.GetParameters(); - if (!methodInfo.IsStatic || - parameters.Length != 1 || - typeof(string[]) != parameters[0].ParameterType || - typeof(IWebHost) != methodInfo.ReturnType) - { - Reporter.WriteError( - "BuildWebHost method found in {assemblyPath} does not have expected signature."); + // Leave default document name out of the filename. + path = projectName + JsonExtension; + } + else + { + // Sanitize the document name because it may contain almost any character, including illegal filename + // characters such as '/' and '?' and the string "..". Do not treat slashes as folder separators. + var sanitizedDocumentName = string.Join( + UnderscoreString, + documentName.Split(InvalidFilenameCharacters)); - return null; + while (sanitizedDocumentName.Contains(InvalidFilenameString)) + { + sanitizedDocumentName = sanitizedDocumentName.Replace(InvalidFilenameString, DotString); } - try - { - var webHost = (IWebHost)methodInfo.Invoke(obj: null, parameters: args); - - return webHost.Services; - } - catch (Exception ex) - { - Reporter.WriteError($"BuildWebHost method threw: {FormatException(ex)}"); - - return null; - } + path = $"{projectName}_{documentName}{JsonExtension}"; } - if ((methodInfo = entryPointType.GetMethod("CreateWebHostBuilder")) != null) + if (!string.IsNullOrEmpty(outputDirectory)) { - // CreateWebHostBuilder - var parameters = methodInfo.GetParameters(); - if (!methodInfo.IsStatic || - parameters.Length != 1 || - typeof(string[]) != parameters[0].ParameterType || - typeof(IWebHostBuilder) != methodInfo.ReturnType) - { - Reporter.WriteError( - "CreateWebHostBuilder method found in {assemblyPath} does not have expected signature."); - - return null; - } - - try - { - var builder = (IWebHostBuilder)methodInfo.Invoke(obj: null, parameters: args); - - return builder.Build().Services; - } - catch (Exception ex) - { - Reporter.WriteError($"CreateWebHostBuilder method threw: {FormatException(ex)}"); - - return null; - } + path = Path.Combine(outputDirectory, path); } - return null; + return path; } - private static string FormatException(Exception exception) + private static MethodInfo GetMethod(string methodName, Type type, Type[] parameterTypes, Type returnType) { - return $"{exception.GetType().FullName}: {exception.Message}"; + var method = type.GetMethod(methodName, parameterTypes); + if (method == null) + { + Reporter.WriteError(Resources.FormatMethodNotFound(methodName, type)); + return null; + } + + if (method.IsStatic) + { + Reporter.WriteError(Resources.FormatMethodIsStatic(methodName, type)); + return null; + } + + if (!returnType.IsAssignableFrom(method.ReturnType)) + { + Reporter.WriteError( + Resources.FormatMethodReturnTypeUnsupported(methodName, type, method.ReturnType, returnType)); + + return null; + } + + return method; + } + + private static object InvokeMethod(MethodInfo method, object instance, object[] arguments) + { + var result = method.Invoke(instance, arguments); + if (result == null) + { + Reporter.WriteError( + Resources.FormatMethodReturnedNull(method.Name, method.DeclaringType, method.ReturnType)); + } + + return result; } } } diff --git a/src/Mvc/GetDocumentInsider/src/Commands/HelpCommandBase.cs b/src/Mvc/GetDocumentInsider/src/Commands/HelpCommandBase.cs index 55e84272ac..bab529d827 100644 --- a/src/Mvc/GetDocumentInsider/src/Commands/HelpCommandBase.cs +++ b/src/Mvc/GetDocumentInsider/src/Commands/HelpCommandBase.cs @@ -9,9 +9,9 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands { public override void Configure(CommandLineApplication command) { - base.Configure(command); - command.HelpOption("-h|--help"); + command.VersionOption("--version", ProductInfo.GetVersion); + base.Configure(command); } } } diff --git a/src/Mvc/GetDocumentInsider/src/Commands/ProjectCommandBase.cs b/src/Mvc/GetDocumentInsider/src/Commands/ProjectCommandBase.cs index 8e60d9603f..f6f3b20945 100644 --- a/src/Mvc/GetDocumentInsider/src/Commands/ProjectCommandBase.cs +++ b/src/Mvc/GetDocumentInsider/src/Commands/ProjectCommandBase.cs @@ -9,13 +9,16 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands { public CommandOption AssemblyPath { get; private set; } + public CommandOption ProjectName { get; private set; } + public CommandOption ToolsDirectory { get; private set; } public override void Configure(CommandLineApplication command) { base.Configure(command); - AssemblyPath = command.Option("-a|--assembly ", Resources.AssemblyDescription); + AssemblyPath = command.Option("--assembly ", Resources.AssemblyDescription); + ProjectName = command.Option("--project ", Resources.ProjectDescription); ToolsDirectory = command.Option("--tools-directory ", Resources.ToolsDirectoryDescription); } @@ -28,6 +31,11 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands throw new CommandException(Resources.FormatMissingOption(AssemblyPath.LongName)); } + if (!ProjectName.HasValue()) + { + throw new CommandException(Resources.FormatMissingOption(ProjectName.LongName)); + } + if (!ToolsDirectory.HasValue()) { throw new CommandException(Resources.FormatMissingOption(ToolsDirectory.LongName)); diff --git a/src/Mvc/GetDocumentInsider/src/GetDocumentInsider.csproj b/src/Mvc/GetDocumentInsider/src/GetDocumentInsider.csproj index 3b09c3a0db..1622b5076c 100644 --- a/src/Mvc/GetDocumentInsider/src/GetDocumentInsider.csproj +++ b/src/Mvc/GetDocumentInsider/src/GetDocumentInsider.csproj @@ -5,7 +5,7 @@ false Exe Microsoft.Extensions.ApiDescription.Tool - netcoreapp2.0;net461 + netcoreapp2.1;net461 false $(ExperimentalVersionPrefix) $(ExperimentalVersionSuffix) @@ -17,10 +17,7 @@ - - - true - + diff --git a/src/Mvc/GetDocumentInsider/src/Program.cs b/src/Mvc/GetDocumentInsider/src/Program.cs index 6d144dc5d5..8f39235b70 100644 --- a/src/Mvc/GetDocumentInsider/src/Program.cs +++ b/src/Mvc/GetDocumentInsider/src/Program.cs @@ -17,9 +17,10 @@ namespace Microsoft.Extensions.ApiDescription.Tool Console.OutputEncoding = Encoding.UTF8; } - var app = new CommandLineApplication(throwOnUnexpectedArg: false) + var app = new CommandLineApplication() { - Name = "GetDocument.Insider" + FullName = Resources.CommandFullName, + Name = Resources.CommandFullName, }; new GetDocumentCommand().Configure(app); diff --git a/src/Mvc/GetDocumentInsider/src/Properties/Resources.Designer.cs b/src/Mvc/GetDocumentInsider/src/Properties/Resources.Designer.cs index 488d4ae93c..9d45bcb911 100644 --- a/src/Mvc/GetDocumentInsider/src/Properties/Resources.Designer.cs +++ b/src/Mvc/GetDocumentInsider/src/Properties/Resources.Designer.cs @@ -11,7 +11,7 @@ namespace Microsoft.Extensions.ApiDescription.Tool = new ResourceManager("Microsoft.Extensions.ApiDescription.Tool.Resources", typeof(Resources).GetTypeInfo().Assembly); /// - /// The assembly to use. + /// The assembly path to use. Required. /// internal static string AssemblyDescription { @@ -19,7 +19,7 @@ namespace Microsoft.Extensions.ApiDescription.Tool } /// - /// The assembly to use. + /// The assembly path to use. Required. /// internal static string FormatAssemblyDescription() => GetString("AssemblyDescription"); @@ -39,7 +39,7 @@ namespace Microsoft.Extensions.ApiDescription.Tool => string.Format(CultureInfo.CurrentCulture, GetString("MissingOption"), p0); /// - /// Do not colorize output. + /// Do not colorize console output. /// internal static string NoColorDescription { @@ -47,13 +47,13 @@ namespace Microsoft.Extensions.ApiDescription.Tool } /// - /// Do not colorize output. + /// Do not colorize console output. /// internal static string FormatNoColorDescription() => GetString("NoColorDescription"); /// - /// The file to write the result to. + /// The directory where the document files should be written. Required. /// internal static string OutputDescription { @@ -61,7 +61,7 @@ namespace Microsoft.Extensions.ApiDescription.Tool } /// - /// The file to write the result to. + /// The directory where the document files should be written. Required. /// internal static string FormatOutputDescription() => GetString("OutputDescription"); @@ -81,7 +81,7 @@ namespace Microsoft.Extensions.ApiDescription.Tool => GetString("PrefixDescription"); /// - /// Show verbose output. + /// Show verbose console output. /// internal static string VerboseDescription { @@ -89,13 +89,13 @@ namespace Microsoft.Extensions.ApiDescription.Tool } /// - /// Show verbose output. + /// Show verbose console output. /// internal static string FormatVerboseDescription() => GetString("VerboseDescription"); /// - /// Location from which inside man was copied (in the .NET Framework case) or loaded. + /// Location from which inside man was copied (in the .NET Framework case) or loaded. Required. /// internal static string ToolsDirectoryDescription { @@ -103,108 +103,24 @@ namespace Microsoft.Extensions.ApiDescription.Tool } /// - /// Location from which inside man was copied (in the .NET Framework case) or loaded. + /// Location from which inside man was copied (in the .NET Framework case) or loaded. Required. /// internal static string FormatToolsDirectoryDescription() => GetString("ToolsDirectoryDescription"); /// - /// The name of the method to invoke on the '--service' instance. Default value '{0}'. + /// Generating document named '{0}'. /// - internal static string MethodDescription + internal static string GeneratingDocument { - get => GetString("MethodDescription"); + get => GetString("GeneratingDocument"); } /// - /// The name of the method to invoke on the '--service' instance. Default value '{0}'. + /// Generating document named '{0}'. /// - internal static string FormatMethodDescription(object p0) - => string.Format(CultureInfo.CurrentCulture, GetString("MethodDescription"), p0); - - /// - /// The qualified name of the service type to retrieve from dependency injection. Default value '{0}'. - /// - internal static string ServiceDescription - { - get => GetString("ServiceDescription"); - } - - /// - /// The qualified name of the service type to retrieve from dependency injection. Default value '{0}'. - /// - internal static string FormatServiceDescription(object p0) - => string.Format(CultureInfo.CurrentCulture, GetString("ServiceDescription"), p0); - - /// - /// The name of the document to pass to the '--method' method. Default value '{0}'. - /// - internal static string DocumentDescription - { - get => GetString("DocumentDescription"); - } - - /// - /// The name of the document to pass to the '--method' method. Default value '{0}'. - /// - internal static string FormatDocumentDescription(object p0) - => string.Format(CultureInfo.CurrentCulture, GetString("DocumentDescription"), p0); - - /// - /// Using document name '{0}'. - /// - internal static string UsingDocument - { - get => GetString("UsingDocument"); - } - - /// - /// Using document name '{0}'. - /// - internal static string FormatUsingDocument(object p0) - => string.Format(CultureInfo.CurrentCulture, GetString("UsingDocument"), p0); - - /// - /// Using method '{0}'. - /// - internal static string UsingMethod - { - get => GetString("UsingMethod"); - } - - /// - /// Using method '{0}'. - /// - internal static string FormatUsingMethod(object p0) - => string.Format(CultureInfo.CurrentCulture, GetString("UsingMethod"), p0); - - /// - /// Using service '{0}'. - /// - internal static string UsingService - { - get => GetString("UsingService"); - } - - /// - /// Using service '{0}'. - /// - internal static string FormatUsingService(object p0) - => string.Format(CultureInfo.CurrentCulture, GetString("UsingService"), p0); - - /// - /// Method '{0}' of service '{1}' failed to generate document '{2}'. - /// - internal static string MethodInvocationFailed - { - get => GetString("MethodInvocationFailed"); - } - - /// - /// Method '{0}' of service '{1}' failed to generate document '{2}'. - /// - internal static string FormatMethodInvocationFailed(object p0, object p1, object p2) - => string.Format(CultureInfo.CurrentCulture, GetString("MethodInvocationFailed"), p0, p1, p2); + internal static string FormatGeneratingDocument(object p0) + => string.Format(CultureInfo.CurrentCulture, GetString("GeneratingDocument"), p0); /// /// Assembly '{0}' does not contain an entry point. @@ -235,7 +151,7 @@ namespace Microsoft.Extensions.ApiDescription.Tool => string.Format(CultureInfo.CurrentCulture, GetString("ServiceTypeNotFound"), p0); /// - /// Unable to find method named '{0}' in '{1}' implementation. + /// Method '{0}' not found in type '{1}' with expected signature. /// internal static string MethodNotFound { @@ -243,13 +159,13 @@ namespace Microsoft.Extensions.ApiDescription.Tool } /// - /// Unable to find method named '{0}' in '{1}' implementation. + /// Method '{0}' not found in type '{1}' with expected signature. /// internal static string FormatMethodNotFound(object p0, object p1) => string.Format(CultureInfo.CurrentCulture, GetString("MethodNotFound"), p0, p1); /// - /// Unable to find service of type '{0}' in dependency injection container. + /// Unable to find service type '{0}' in dependency injection container. /// internal static string ServiceNotFound { @@ -257,13 +173,13 @@ namespace Microsoft.Extensions.ApiDescription.Tool } /// - /// Unable to find service of type '{0}' in dependency injection container. + /// Unable to find service type '{0}' in dependency injection container. /// internal static string FormatServiceNotFound(object p0) => string.Format(CultureInfo.CurrentCulture, GetString("ServiceNotFound"), p0); /// - /// Method '{0}' of service '{1}' returned null. Must return a non-null '{2}'. + /// Method '{0}' of type '{1}' returned null. Must return a non-null '{2}'. /// internal static string MethodReturnedNull { @@ -271,13 +187,13 @@ namespace Microsoft.Extensions.ApiDescription.Tool } /// - /// Method '{0}' of service '{1}' returned null. Must return a non-null '{2}'. + /// Method '{0}' of type '{1}' returned null. Must return a non-null '{2}'. /// internal static string FormatMethodReturnedNull(object p0, object p1, object p2) => string.Format(CultureInfo.CurrentCulture, GetString("MethodReturnedNull"), p0, p1, p2); /// - /// Method '{0}' of service '{1}' has unsupported return type '{2}'. Must return a '{3}'. + /// Method '{0}' of type '{1}' has unsupported return type '{2}'. Must return '{3}'. /// internal static string MethodReturnTypeUnsupported { @@ -285,13 +201,13 @@ namespace Microsoft.Extensions.ApiDescription.Tool } /// - /// Method '{0}' of service '{1}' has unsupported return type '{2}'. Must return a '{3}'. + /// Method '{0}' of type '{1}' has unsupported return type '{2}'. Must return '{3}'. /// internal static string FormatMethodReturnTypeUnsupported(object p0, object p1, object p2, object p3) => string.Format(CultureInfo.CurrentCulture, GetString("MethodReturnTypeUnsupported"), p0, p1, p2, p3); /// - /// Method '{0}' of service '{1}' timed out. Must complete execution within {2} minute. + /// Method '{0}' of type '{1}' timed out. Must complete execution within {2} minute. /// internal static string MethodTimedOut { @@ -299,11 +215,123 @@ namespace Microsoft.Extensions.ApiDescription.Tool } /// - /// Method '{0}' of service '{1}' timed out. Must complete execution within {2} minute. + /// Method '{0}' of type '{1}' timed out. Must complete execution within {2} minute. /// internal static string FormatMethodTimedOut(object p0, object p1, object p2) => string.Format(CultureInfo.CurrentCulture, GetString("MethodTimedOut"), p0, p1, p2); + /// + /// Method '{0}' of type '{1}' is static. Must be an instance method. + /// + internal static string MethodIsStatic + { + get => GetString("MethodIsStatic"); + } + + /// + /// Method '{0}' of type '{1}' is static. Must be an instance method. + /// + internal static string FormatMethodIsStatic(object p0, object p1) + => string.Format(CultureInfo.CurrentCulture, GetString("MethodIsStatic"), p0, p1); + + /// + /// No method '{0}', '{1}' or '{2}' found in type '{3}' with expected signatures. + /// + internal static string MethodsNotFound + { + get => GetString("MethodsNotFound"); + } + + /// + /// No method '{0}', '{1}' or '{2}' found in type '{3}' with expected signatures. + /// + internal static string FormatMethodsNotFound(object p0, object p1, object p2, object p3) + => string.Format(CultureInfo.CurrentCulture, GetString("MethodsNotFound"), p0, p1, p2, p3); + + /// + /// Writing document named '{0}' to '{1}'. + /// + internal static string WritingDocument + { + get => GetString("WritingDocument"); + } + + /// + /// Writing document named '{0}' to '{1}'. + /// + internal static string FormatWritingDocument(object p0, object p1) + => string.Format(CultureInfo.CurrentCulture, GetString("WritingDocument"), p0, p1); + + /// + /// Method '{0}' of type '{1}' wrote no content for document named '{2}'. + /// + internal static string MethodWroteNoContent + { + get => GetString("MethodWroteNoContent"); + } + + /// + /// Method '{0}' of type '{1}' wrote no content for document named '{2}'. + /// + internal static string FormatMethodWroteNoContent(object p0, object p1, object p2) + => string.Format(CultureInfo.CurrentCulture, GetString("MethodWroteNoContent"), p0, p1, p2); + + /// + /// GetDocument.Insider + /// + internal static string CommandFullName + { + get => GetString("CommandFullName"); + } + + /// + /// GetDocument.Insider + /// + internal static string FormatCommandFullName() + => GetString("CommandFullName"); + + /// + /// The path where the list of document files should be written. Required. + /// + internal static string FileListDescription + { + get => GetString("FileListDescription"); + } + + /// + /// The path where the list of document files should be written. Required. + /// + internal static string FormatFileListDescription() + => GetString("FileListDescription"); + + /// + /// The project name to use. Required. + /// + internal static string ProjectDescription + { + get => GetString("ProjectDescription"); + } + + /// + /// The project name to use. Required. + /// + internal static string FormatProjectDescription() + => GetString("ProjectDescription"); + + /// + /// Unable to resolve a non-null '{0}' implementation using method '{1}', '{2}' or '{3}' of type '{4}'. + /// + internal static string ServiceProviderNotFound + { + get => GetString("ServiceProviderNotFound"); + } + + /// + /// Unable to resolve a non-null '{0}' implementation using method '{1}', '{2}' or '{3}' of type '{4}'. + /// + internal static string FormatServiceProviderNotFound(object p0, object p1, object p2, object p3, object p4) + => string.Format(CultureInfo.CurrentCulture, GetString("ServiceProviderNotFound"), p0, p1, p2, p3, p4); + private static string GetString(string name, params string[] formatterNames) { var value = _resourceManager.GetString(name); diff --git a/src/Mvc/GetDocumentInsider/src/Resources.resx b/src/Mvc/GetDocumentInsider/src/Resources.resx index facc644154..a27b1be2b0 100644 --- a/src/Mvc/GetDocumentInsider/src/Resources.resx +++ b/src/Mvc/GetDocumentInsider/src/Resources.resx @@ -118,46 +118,28 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - The assembly to use. + The assembly path to use. Required. Missing required option '--{0}'. - Do not colorize output. + Do not colorize console output. - The file to write the result to. + The directory where the document files should be written. Required. Prefix console output with logging level. - Show verbose output. + Show verbose console output. - Location from which inside man was copied (in the .NET Framework case) or loaded. + Location from which inside man was copied (in the .NET Framework case) or loaded. Required. - - The name of the method to invoke on the '--service' instance. Default value '{0}'. - - - The qualified name of the service type to retrieve from dependency injection. Default value '{0}'. - - - The name of the document to pass to the '--method' method. Default value '{0}'. - - - Using document name '{0}'. - - - Using method '{0}'. - - - Using service '{0}'. - - - Method '{0}' of service '{1}' failed to generate document '{2}'. + + Generating document named '{0}'. Assembly '{0}' does not contain an entry point. @@ -166,18 +148,42 @@ Unable to find service type '{0}' in loaded assemblies. - Unable to find method named '{0}' in '{1}' implementation. + Method '{0}' not found in type '{1}' with expected signature. - Unable to find service of type '{0}' in dependency injection container. + Unable to find service type '{0}' in dependency injection container. - Method '{0}' of service '{1}' returned null. Must return a non-null '{2}'. + Method '{0}' of type '{1}' returned null. Must return a non-null '{2}'. - Method '{0}' of service '{1}' has unsupported return type '{2}'. Must return a '{3}'. + Method '{0}' of type '{1}' has unsupported return type '{2}'. Must return '{3}'. - Method '{0}' of service '{1}' timed out. Must complete execution within {2} minute. + Method '{0}' of type '{1}' timed out. Must complete execution within {2} minute. + + + Method '{0}' of type '{1}' is static. Must be an instance method. + + + No method '{0}', '{1}' or '{2}' found in type '{3}' with expected signatures. + + + Writing document named '{0}' to '{1}'. + + + Method '{0}' of type '{1}' wrote no content for document named '{2}'. + + + GetDocument.Insider + + + The path where the list of document files should be written. Required. + + + The project name to use. Required. + + + Unable to resolve a non-null '{0}' implementation using method '{1}', '{2}' or '{3}' of type '{4}'. \ No newline at end of file diff --git a/src/Mvc/GetDocumentInsider/src/runtimeconfig.template.json b/src/Mvc/GetDocumentInsider/src/runtimeconfig.template.json new file mode 100644 index 0000000000..516c80a388 --- /dev/null +++ b/src/Mvc/GetDocumentInsider/src/runtimeconfig.template.json @@ -0,0 +1,4 @@ +{ + "applyPatches": true, + "rollForwardOnNoCandidateFx": 2 +} diff --git a/src/Mvc/Mvc.Analyzers/src/DiagnosticDescriptors.cs b/src/Mvc/Mvc.Analyzers/src/DiagnosticDescriptors.cs index 8dba4a4a07..c4940b371a 100644 --- a/src/Mvc/Mvc.Analyzers/src/DiagnosticDescriptors.cs +++ b/src/Mvc/Mvc.Analyzers/src/DiagnosticDescriptors.cs @@ -53,7 +53,15 @@ namespace Microsoft.AspNetCore.Mvc.Analyzers isEnabledByDefault: true, helpLinkUri: "https://aka.ms/AA20pbc"); - // MVC1005 reserved for startup + + public static readonly DiagnosticDescriptor MVC1006_FunctionsContainingTagHelpersMustBeAsyncAndReturnTask = + new DiagnosticDescriptor( + "MVC1006", + "Methods containing TagHelpers must be async and return Task.", + "The method contains a TagHelper and therefore must be async and return a Task.", + "Usage", + DiagnosticSeverity.Error, + isEnabledByDefault: true); } } diff --git a/src/Mvc/Mvc.Analyzers/src/SymbolNames.cs b/src/Mvc/Mvc.Analyzers/src/SymbolNames.cs index f8ac74c657..7b08c9082f 100644 --- a/src/Mvc/Mvc.Analyzers/src/SymbolNames.cs +++ b/src/Mvc/Mvc.Analyzers/src/SymbolNames.cs @@ -72,5 +72,11 @@ namespace Microsoft.AspNetCore.Mvc.Analyzers public const string ConfigureServicesMethod = "ConfigureServices"; public const string ConfigureMethod = "Configure"; + + public const string RunAsyncMethodName = "RunAsync"; + + public const string TaskTypeName = "System.Threading.Tasks.Task"; + + public const string TagHelperRunnerTypeName = "Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner"; } } diff --git a/src/Mvc/Mvc.Analyzers/src/TagHelpersInCodeBlocksAnalyzer.cs b/src/Mvc/Mvc.Analyzers/src/TagHelpersInCodeBlocksAnalyzer.cs new file mode 100644 index 0000000000..9cf680f2e4 --- /dev/null +++ b/src/Mvc/Mvc.Analyzers/src/TagHelpersInCodeBlocksAnalyzer.cs @@ -0,0 +1,184 @@ +// 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.Collections.Generic; +using System.Collections.Immutable; +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.Diagnostics; +using Microsoft.CodeAnalysis.Operations; + +namespace Microsoft.AspNetCore.Mvc.Analyzers +{ + [DiagnosticAnalyzer(LanguageNames.CSharp)] + public class TagHelpersInCodeBlocksAnalyzer : DiagnosticAnalyzer + { + public TagHelpersInCodeBlocksAnalyzer() + { + TagHelperInCodeBlockDiagnostic = DiagnosticDescriptors.MVC1006_FunctionsContainingTagHelpersMustBeAsyncAndReturnTask; + SupportedDiagnostics = ImmutableArray.Create(new[] { TagHelperInCodeBlockDiagnostic }); + } + + private DiagnosticDescriptor TagHelperInCodeBlockDiagnostic { get; } + + public override ImmutableArray SupportedDiagnostics { get; } + + public override void Initialize(AnalysisContext context) + { + // Generated Razor code is considered auto generated. By default analyzers skip over auto-generated code unless we say otherwise. + context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics); + context.RegisterCompilationStartAction(context => + { + if (!SymbolCache.TryCreate(context.Compilation, out var symbolCache)) + { + // No-op if we can't find types we care about. + return; + } + + InitializeWorker(context, symbolCache); + }); + } + + private void InitializeWorker(CompilationStartAnalysisContext context, SymbolCache symbolCache) + { + context.RegisterOperationBlockStartAction(startBlockContext => + { + var capturedDiagnosticLocations = new HashSet(); + startBlockContext.RegisterOperationAction(context => + { + var awaitOperation = (IAwaitOperation)context.Operation; + + if (awaitOperation.Operation.Kind != OperationKind.Invocation) + { + return; + } + + var invocationOperation = (IInvocationOperation)awaitOperation.Operation; + + if (!IsTagHelperRunnerRunAsync(invocationOperation.TargetMethod, symbolCache)) + { + return; + } + + var parent = context.Operation.Parent; + while (parent != null && !IsParentMethod(parent)) + { + parent = parent.Parent; + } + + if (parent == null) + { + return; + } + + var methodSymbol = (IMethodSymbol?)(parent switch + { + ILocalFunctionOperation localFunctionOperation => localFunctionOperation.Symbol, + IAnonymousFunctionOperation anonymousFunctionOperation => anonymousFunctionOperation.Symbol, + IMethodBodyOperation methodBodyOperation => startBlockContext.OwningSymbol, + _ => null, + }); + + if (methodSymbol == null) + { + // Unsupported operation type. + return; + } + + if (!methodSymbol.IsAsync || + !symbolCache.TaskType.IsAssignableFrom(methodSymbol.ReturnType)) + { + capturedDiagnosticLocations.Add(parent.Syntax.GetLocation()); + } + + }, OperationKind.Await); + + startBlockContext.RegisterOperationBlockEndAction(context => + { + foreach (var location in capturedDiagnosticLocations) + { + context.ReportDiagnostic( + Diagnostic.Create(TagHelperInCodeBlockDiagnostic, location)); + } + }); + }); + } + + private bool IsTagHelperRunnerRunAsync(IMethodSymbol method, SymbolCache symbolCache) + { + if (method != symbolCache.TagHelperRunnerRunAsyncMethodSymbol) + { + return false; + } + + return true; + } + + private bool IsParentMethod(IOperation operation) + { + if (operation.Kind == OperationKind.LocalFunction) + { + return true; + } + + if (operation.Kind == OperationKind.MethodBody) + { + return true; + } + + if (operation.Kind == OperationKind.AnonymousFunction) + { + return true; + } + + return false; + } + + private readonly struct SymbolCache + { + private SymbolCache( + IMethodSymbol tagHelperRunnerRunAsyncMethodSymbol, + INamedTypeSymbol taskType) + { + TagHelperRunnerRunAsyncMethodSymbol = tagHelperRunnerRunAsyncMethodSymbol; + TaskType = taskType; + } + + public IMethodSymbol TagHelperRunnerRunAsyncMethodSymbol { get; } + + public INamedTypeSymbol TaskType { get; } + + + public static bool TryCreate(Compilation compilation, out SymbolCache symbolCache) + { + symbolCache = default; + + if (!TryGetType(SymbolNames.TagHelperRunnerTypeName, out var tagHelperRunnerType)) + { + return false; + } + + if (!TryGetType(SymbolNames.TaskTypeName, out var taskType)) + { + return false; + } + + var members = tagHelperRunnerType.GetMembers(SymbolNames.RunAsyncMethodName); + if (members.Length == 0) + { + return false; + } + + var tagHelperRunnerRunAsyncMethod = (IMethodSymbol)members[0]; + + symbolCache = new SymbolCache(tagHelperRunnerRunAsyncMethod, taskType); + return true; + + bool TryGetType(string typeName, out INamedTypeSymbol typeSymbol) + { + typeSymbol = compilation.GetTypeByMetadataName(typeName); + return typeSymbol != null && typeSymbol.TypeKind != TypeKind.Error; + } + } + } + } +} diff --git a/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj b/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj index ab2cabb576..1854d54a9d 100644 --- a/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj +++ b/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj @@ -16,6 +16,7 @@ + diff --git a/src/Mvc/Mvc.Analyzers/test/TagHelpersInCodeBlocksAnalyzerTest.cs b/src/Mvc/Mvc.Analyzers/test/TagHelpersInCodeBlocksAnalyzerTest.cs new file mode 100644 index 0000000000..44eea09663 --- /dev/null +++ b/src/Mvc/Mvc.Analyzers/test/TagHelpersInCodeBlocksAnalyzerTest.cs @@ -0,0 +1,93 @@ +// 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.Linq; +using System.Runtime.CompilerServices; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Analyzer.Testing; +using Microsoft.CodeAnalysis; +using Xunit; + +namespace Microsoft.AspNetCore.Mvc.Analyzers +{ + public class TagHelpersInCodeBlocksAnalyzerTest + { + private readonly DiagnosticDescriptor DiagnosticDescriptor = DiagnosticDescriptors.MVC1006_FunctionsContainingTagHelpersMustBeAsyncAndReturnTask; + + private MvcDiagnosticAnalyzerRunner Executor { get; } = new MvcDiagnosticAnalyzerRunner(new TagHelpersInCodeBlocksAnalyzer()); + + [Fact] + public Task DiagnosticsAreReturned_ForUseOfTagHelpersInActions() + => VerifyDefault(ReadTestSource()); + + [Fact] + public Task DiagnosticsAreReturned_ForUseOfTagHelpersInNonAsyncFunc() + => VerifyDefault(ReadTestSource()); + + [Fact] + public Task DiagnosticsAreReturned_ForUseOfTagHelpersInVoidClassMethods() + => VerifyDefault(ReadTestSource()); + + [Fact] + public Task DiagnosticsAreReturned_ForUseOfTagHelpersInVoidDelegates() + => VerifyDefault(ReadTestSource()); + + [Fact] + public Task DiagnosticsAreReturned_ForUseOfTagHelpersInVoidLocalFunctions() + => VerifyDefault(ReadTestSource()); + + [Fact] + public Task NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncClassMethods() + => VerifyNoDiagnosticsAreReturned(ReadTestSource()); + + [Fact] + public Task NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncDelegates() + => VerifyNoDiagnosticsAreReturned(ReadTestSource()); + + [Fact] + public Task NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncFuncs() + => VerifyNoDiagnosticsAreReturned(ReadTestSource()); + + [Fact] + public Task NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncLocalFunctions() + => VerifyNoDiagnosticsAreReturned(ReadTestSource()); + + [Fact] + public Task SingleDiagnosticIsReturned_ForMultipleTagHelpersInVoidMethod() + => VerifyDefault(ReadTestSource()); + + private async Task VerifyNoDiagnosticsAreReturned(TestSource source) + { + // Act + var result = await Executor.GetDiagnosticsAsync(source.Source); + + // Assert + Assert.Empty(result); + } + + private async Task VerifyDefault(TestSource testSource) + { + // Arrange + var expectedLocation = testSource.DefaultMarkerLocation; + + // Act + var result = await Executor.GetDiagnosticsAsync(testSource.Source); + + // Assert + // We want to ignore C# diagnostics because they'll include diagnostics for not awaiting bits correctly. The purpose of this analyzer is to + // improve on those error messages but not remove them. + var filteredDiagnostics = result.Where(diagnostic => diagnostic.Id.StartsWith("MVC")); + Assert.Collection( + filteredDiagnostics, + diagnostic => + { + Assert.Equal(DiagnosticDescriptor.Id, diagnostic.Id); + Assert.Same(DiagnosticDescriptor, diagnostic.Descriptor); + AnalyzerAssert.DiagnosticLocation(expectedLocation, diagnostic.Location); + }); + } + + private static TestSource ReadTestSource([CallerMemberName] string testMethod = "") => + MvcTestSource.Read(nameof(TagHelpersInCodeBlocksAnalyzerTest), testMethod); + } +} diff --git a/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/DiagnosticsAreReturned_ForUseOfTagHelpersInActions.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/DiagnosticsAreReturned_ForUseOfTagHelpersInActions.cs new file mode 100644 index 0000000000..da8f2aba00 --- /dev/null +++ b/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/DiagnosticsAreReturned_ForUseOfTagHelpersInActions.cs @@ -0,0 +1,80 @@ +namespace AspNetCore +{ + #line hidden + using System; + using System.Collections.Generic; + using System.Linq; + using System.Threading.Tasks; + using Microsoft.AspNetCore.Mvc; + using Microsoft.AspNetCore.Mvc.Rendering; + using Microsoft.AspNetCore.Mvc.ViewFeatures; + public class DiagnosticsAreReturned_ForUseOfTagHelpersInActions : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage + { + #line hidden + #pragma warning disable 0169 + private string __tagHelperStringValueBuffer; + #pragma warning restore 0169 + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext; + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner(); + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null; + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager + { + get + { + if (__backed__tagHelperScopeManager == null) + { + __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope); + } + return __backed__tagHelperScopeManager; + } + } + private global::Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper __Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper; + #pragma warning disable 1998 + public async override global::System.Threading.Tasks.Task ExecuteAsync() + { + WriteLiteral("\r\n"); + WriteLiteral("\r\n"); + + Action sometMethod = /*MM*/() => + { + + WriteLiteral(" "); + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("cache", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "d946c1cd0bbc2f1bde41a0f3eb6596ec7dca5c342925", async() => { + WriteLiteral("\r\n

    The current time is "); + Write(DateTime.Now); + + WriteLiteral("

    \r\n "); + } + ); + __Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper); + BeginWriteTagHelperAttribute(); + __tagHelperStringValueBuffer = EndWriteTagHelperAttribute(); + __tagHelperExecutionContext.AddHtmlAttribute("asp-vary-by-user", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized); + await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); + if (!__tagHelperExecutionContext.Output.IsContentModified) + { + await __tagHelperExecutionContext.SetOutputContentAsync(); + } + Write(__tagHelperExecutionContext.Output); + __tagHelperExecutionContext = __tagHelperScopeManager.End(); + WriteLiteral("\r\n"); + }; + + sometMethod(); + + } + #pragma warning restore 1998 + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper Html { get; private set; } + } +} +#pragma warning restore 1591 diff --git a/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/DiagnosticsAreReturned_ForUseOfTagHelpersInNonAsyncFunc.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/DiagnosticsAreReturned_ForUseOfTagHelpersInNonAsyncFunc.cs new file mode 100644 index 0000000000..4b58c585c0 --- /dev/null +++ b/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/DiagnosticsAreReturned_ForUseOfTagHelpersInNonAsyncFunc.cs @@ -0,0 +1,80 @@ +namespace AspNetCore +{ + #line hidden + using System; + using System.Collections.Generic; + using System.Linq; + using System.Threading.Tasks; + using Microsoft.AspNetCore.Mvc; + using Microsoft.AspNetCore.Mvc.Rendering; + using Microsoft.AspNetCore.Mvc.ViewFeatures; + public class DiagnosticsAreReturned_ForUseOfTagHelpersInNonAsyncFunc : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage + { + #line hidden + #pragma warning disable 0169 + private string __tagHelperStringValueBuffer; + #pragma warning restore 0169 + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext; + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner(); + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null; + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager + { + get + { + if (__backed__tagHelperScopeManager == null) + { + __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope); + } + return __backed__tagHelperScopeManager; + } + } + private global::Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper __Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper; + #pragma warning disable 1998 + public async override global::System.Threading.Tasks.Task ExecuteAsync() + { + WriteLiteral("\r\n"); + WriteLiteral("\r\n"); + + Func sometMethod = /*MM*/() => + { + + WriteLiteral(" "); + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("cache", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "452e9bab960ded6307b3903ebf73278bb1b2bec32959", async() => { + WriteLiteral("\r\n

    The current time is "); + Write(DateTime.Now); + + WriteLiteral("

    \r\n "); + } + ); + __Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper); + BeginWriteTagHelperAttribute(); + __tagHelperStringValueBuffer = EndWriteTagHelperAttribute(); + __tagHelperExecutionContext.AddHtmlAttribute("asp-vary-by-user", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized); + await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); + if (!__tagHelperExecutionContext.Output.IsContentModified) + { + await __tagHelperExecutionContext.SetOutputContentAsync(); + } + Write(__tagHelperExecutionContext.Output); + __tagHelperExecutionContext = __tagHelperScopeManager.End(); + WriteLiteral("\r\n"); + }; + + sometMethod(); + + } + #pragma warning restore 1998 + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper Html { get; private set; } + } +} +#pragma warning restore 1591 diff --git a/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/DiagnosticsAreReturned_ForUseOfTagHelpersInVoidClassMethods.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/DiagnosticsAreReturned_ForUseOfTagHelpersInVoidClassMethods.cs new file mode 100644 index 0000000000..9197b31eea --- /dev/null +++ b/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/DiagnosticsAreReturned_ForUseOfTagHelpersInVoidClassMethods.cs @@ -0,0 +1,82 @@ +namespace AspNetCore +{ + #line hidden + using System; + using System.Collections.Generic; + using System.Linq; + using System.Threading.Tasks; + using Microsoft.AspNetCore.Mvc; + using Microsoft.AspNetCore.Mvc.Rendering; + using Microsoft.AspNetCore.Mvc.ViewFeatures; + [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"186d75f4b59675515143af9ff43784abaabd24a9", @"/DiagnosticsAreReturned_ForUseOfTagHelpersInVoidClassMethods.cshtml")] + public class DiagnosticsAreReturned_ForUseOfTagHelpersInVoidClassMethods : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage + { + #line hidden + #pragma warning disable 0169 + private string __tagHelperStringValueBuffer; + #pragma warning restore 0169 + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext; + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner(); + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null; + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager + { + get + { + if (__backed__tagHelperScopeManager == null) + { + __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope); + } + return __backed__tagHelperScopeManager; + } + } + private global::Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper __Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper; + #pragma warning disable 1998 + public async override global::System.Threading.Tasks.Task ExecuteAsync() + { + WriteLiteral("\r\n"); + + SometMethod(); + + WriteLiteral("\r\n"); + } + #pragma warning restore 1998 + + /*MM*/void SometMethod() + { + + WriteLiteral(" "); + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("cache", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "186d75f4b59675515143af9ff43784abaabd24a93243", async() => { + WriteLiteral("\r\n

    The current time is "); + Write(DateTime.Now); + + WriteLiteral("

    \r\n "); + } + ); + __Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper); + BeginWriteTagHelperAttribute(); + __tagHelperStringValueBuffer = EndWriteTagHelperAttribute(); + __tagHelperExecutionContext.AddHtmlAttribute("asp-vary-by-user", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized); + await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); + if (!__tagHelperExecutionContext.Output.IsContentModified) + { + await __tagHelperExecutionContext.SetOutputContentAsync(); + } + Write(__tagHelperExecutionContext.Output); + __tagHelperExecutionContext = __tagHelperScopeManager.End(); + WriteLiteral("\r\n"); + } + + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper Html { get; private set; } + } +} +#pragma warning restore 1591 diff --git a/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/DiagnosticsAreReturned_ForUseOfTagHelpersInVoidDelegates.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/DiagnosticsAreReturned_ForUseOfTagHelpersInVoidDelegates.cs new file mode 100644 index 0000000000..05bbcdca2a --- /dev/null +++ b/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/DiagnosticsAreReturned_ForUseOfTagHelpersInVoidDelegates.cs @@ -0,0 +1,84 @@ +namespace AspNetCore +{ + #line hidden + using System; + using System.Collections.Generic; + using System.Linq; + using System.Threading.Tasks; + using Microsoft.AspNetCore.Mvc; + using Microsoft.AspNetCore.Mvc.Rendering; + using Microsoft.AspNetCore.Mvc.ViewFeatures; + public class DiagnosticsAreReturned_ForUseOfTagHelpersInVoidDelegates : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage + { + #line hidden + #pragma warning disable 0169 + private string __tagHelperStringValueBuffer; + #pragma warning restore 0169 + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext; + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner(); + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null; + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager + { + get + { + if (__backed__tagHelperScopeManager == null) + { + __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope); + } + return __backed__tagHelperScopeManager; + } + } + private global::Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper __Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper; + #pragma warning disable 1998 + public async override global::System.Threading.Tasks.Task ExecuteAsync() + { + WriteLiteral("\r\n"); + WriteLiteral("\r\n"); + + TestDelegate sometMethod = /*MM*/delegate () + { + + WriteLiteral(" "); + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("cache", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "c63f59d4d7a4db461bc9f052a7833885a8d13dcf2972", async() => { + WriteLiteral("\r\n

    The current time is "); + Write(DateTime.Now); + + WriteLiteral("

    \r\n "); + } + ); + __Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper); + BeginWriteTagHelperAttribute(); + __tagHelperStringValueBuffer = EndWriteTagHelperAttribute(); + __tagHelperExecutionContext.AddHtmlAttribute("asp-vary-by-user", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized); + await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); + if (!__tagHelperExecutionContext.Output.IsContentModified) + { + await __tagHelperExecutionContext.SetOutputContentAsync(); + } + Write(__tagHelperExecutionContext.Output); + __tagHelperExecutionContext = __tagHelperScopeManager.End(); + WriteLiteral("\r\n"); + }; + + sometMethod(); + + WriteLiteral("\r\n"); + } + #pragma warning restore 1998 + + delegate void TestDelegate(); + + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper Html { get; private set; } + } +} +#pragma warning restore 1591 diff --git a/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/DiagnosticsAreReturned_ForUseOfTagHelpersInVoidLocalFunctions.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/DiagnosticsAreReturned_ForUseOfTagHelpersInVoidLocalFunctions.cs new file mode 100644 index 0000000000..ecbb70c6fb --- /dev/null +++ b/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/DiagnosticsAreReturned_ForUseOfTagHelpersInVoidLocalFunctions.cs @@ -0,0 +1,79 @@ +namespace AspNetCore +{ + #line hidden + using System; + using System.Collections.Generic; + using System.Linq; + using System.Threading.Tasks; + using Microsoft.AspNetCore.Mvc; + using Microsoft.AspNetCore.Mvc.Rendering; + using Microsoft.AspNetCore.Mvc.ViewFeatures; + public class DiagnosticsAreReturned_ForUseOfTagHelpersInVoidLocalFunctions : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage + { + #line hidden + #pragma warning disable 0169 + private string __tagHelperStringValueBuffer; + #pragma warning restore 0169 + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext; + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner(); + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null; + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager + { + get + { + if (__backed__tagHelperScopeManager == null) + { + __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope); + } + return __backed__tagHelperScopeManager; + } + } + private global::Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper __Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper; + #pragma warning disable 1998 + public async override global::System.Threading.Tasks.Task ExecuteAsync() + { + WriteLiteral("\r\n"); + + /*MM*/void SometMethod() + { + + WriteLiteral(" "); + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("cache", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "5a4c42fadc056422c6be6ab14a6bd877e2fa382d2948", async() => { + WriteLiteral("\r\n

    The current time is "); + Write(DateTime.Now); + + WriteLiteral("

    \r\n "); + } + ); + __Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper); + BeginWriteTagHelperAttribute(); + __tagHelperStringValueBuffer = EndWriteTagHelperAttribute(); + __tagHelperExecutionContext.AddHtmlAttribute("asp-vary-by-user", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized); + await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); + if (!__tagHelperExecutionContext.Output.IsContentModified) + { + await __tagHelperExecutionContext.SetOutputContentAsync(); + } + Write(__tagHelperExecutionContext.Output); + __tagHelperExecutionContext = __tagHelperScopeManager.End(); + WriteLiteral("\r\n"); + } + + SometMethod(); + + } + #pragma warning restore 1998 + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper Html { get; private set; } + } +} +#pragma warning restore 1591 diff --git a/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncClassMethods.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncClassMethods.cs new file mode 100644 index 0000000000..96e5d17d40 --- /dev/null +++ b/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncClassMethods.cs @@ -0,0 +1,81 @@ +namespace AspNetCore +{ + #line hidden + using System; + using System.Collections.Generic; + using System.Linq; + using System.Threading.Tasks; + using Microsoft.AspNetCore.Mvc; + using Microsoft.AspNetCore.Mvc.Rendering; + using Microsoft.AspNetCore.Mvc.ViewFeatures; + public class NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncClassMethods_ : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage + { + #line hidden + #pragma warning disable 0169 + private string __tagHelperStringValueBuffer; + #pragma warning restore 0169 + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext; + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner(); + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null; + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager + { + get + { + if (__backed__tagHelperScopeManager == null) + { + __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope); + } + return __backed__tagHelperScopeManager; + } + } + private global::Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper __Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper; + #pragma warning disable 1998 + public async override global::System.Threading.Tasks.Task ExecuteAsync() + { + WriteLiteral("\r\n"); + + await SometMethod(); + + WriteLiteral("\r\n"); + } + #pragma warning restore 1998 + + /*MM*/async Task SometMethod() + { + + WriteLiteral(" "); + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("cache", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "8a14df240fb31e930618408064cdb1e343ff38f43283", async() => { + WriteLiteral("\r\n

    The current time is "); + Write(DateTime.Now); + + WriteLiteral("

    \r\n "); + } + ); + __Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper); + BeginWriteTagHelperAttribute(); + __tagHelperStringValueBuffer = EndWriteTagHelperAttribute(); + __tagHelperExecutionContext.AddHtmlAttribute("asp-vary-by-user", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized); + await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); + if (!__tagHelperExecutionContext.Output.IsContentModified) + { + await __tagHelperExecutionContext.SetOutputContentAsync(); + } + Write(__tagHelperExecutionContext.Output); + __tagHelperExecutionContext = __tagHelperScopeManager.End(); + WriteLiteral("\r\n"); + } + + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper Html { get; private set; } + } +} +#pragma warning restore 1591 diff --git a/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncDelegates.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncDelegates.cs new file mode 100644 index 0000000000..4088f69d6d --- /dev/null +++ b/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncDelegates.cs @@ -0,0 +1,84 @@ +namespace AspNetCore +{ + #line hidden + using System; + using System.Collections.Generic; + using System.Linq; + using System.Threading.Tasks; + using Microsoft.AspNetCore.Mvc; + using Microsoft.AspNetCore.Mvc.Rendering; + using Microsoft.AspNetCore.Mvc.ViewFeatures; + public class NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncDelegates_ : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage + { + #line hidden + #pragma warning disable 0169 + private string __tagHelperStringValueBuffer; + #pragma warning restore 0169 + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext; + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner(); + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null; + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager + { + get + { + if (__backed__tagHelperScopeManager == null) + { + __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope); + } + return __backed__tagHelperScopeManager; + } + } + private global::Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper __Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper; + #pragma warning disable 1998 + public async override global::System.Threading.Tasks.Task ExecuteAsync() + { + WriteLiteral("\r\n"); + WriteLiteral("\r\n"); + + TestDelegate sometMethod = /*MM*/async delegate () + { + + WriteLiteral(" "); + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("cache", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "028e6be2d2e1a766b4ea9e3949a9e9797bb524083002", async() => { + WriteLiteral("\r\n

    The current time is "); + Write(DateTime.Now); + + WriteLiteral("

    \r\n "); + } + ); + __Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper); + BeginWriteTagHelperAttribute(); + __tagHelperStringValueBuffer = EndWriteTagHelperAttribute(); + __tagHelperExecutionContext.AddHtmlAttribute("asp-vary-by-user", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized); + await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); + if (!__tagHelperExecutionContext.Output.IsContentModified) + { + await __tagHelperExecutionContext.SetOutputContentAsync(); + } + Write(__tagHelperExecutionContext.Output); + __tagHelperExecutionContext = __tagHelperScopeManager.End(); + WriteLiteral("\r\n"); + }; + + await sometMethod(); + + WriteLiteral("\r\n"); + } + #pragma warning restore 1998 + + delegate Task TestDelegate(); + + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper Html { get; private set; } + } +} +#pragma warning restore 1591 diff --git a/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncFuncs.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncFuncs.cs new file mode 100644 index 0000000000..fafb854956 --- /dev/null +++ b/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncFuncs.cs @@ -0,0 +1,81 @@ +namespace AspNetCore +{ + #line hidden + using System; + using System.Collections.Generic; + using System.Linq; + using System.Threading.Tasks; + using Microsoft.AspNetCore.Mvc; + using Microsoft.AspNetCore.Mvc.Rendering; + using Microsoft.AspNetCore.Mvc.ViewFeatures; + [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"9b77957037efb63a0af38698af1c7de6dc41c4be", @"/NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncFuncs.cshtml")] + public class NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncFuncs : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage + { + #line hidden + #pragma warning disable 0169 + private string __tagHelperStringValueBuffer; + #pragma warning restore 0169 + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext; + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner(); + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null; + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager + { + get + { + if (__backed__tagHelperScopeManager == null) + { + __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope); + } + return __backed__tagHelperScopeManager; + } + } + private global::Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper __Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper; + #pragma warning disable 1998 + public async override global::System.Threading.Tasks.Task ExecuteAsync() + { + WriteLiteral("\r\n"); + WriteLiteral("\r\n"); + + Func sometMethod = /*MM*/async () => + { + + WriteLiteral(" "); + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("cache", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "9b77957037efb63a0af38698af1c7de6dc41c4be2965", async() => { + WriteLiteral("\r\n

    The current time is "); + Write(DateTime.Now); + + WriteLiteral("

    \r\n "); + } + ); + __Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper); + BeginWriteTagHelperAttribute(); + __tagHelperStringValueBuffer = EndWriteTagHelperAttribute(); + __tagHelperExecutionContext.AddHtmlAttribute("asp-vary-by-user", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized); + await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); + if (!__tagHelperExecutionContext.Output.IsContentModified) + { + await __tagHelperExecutionContext.SetOutputContentAsync(); + } + Write(__tagHelperExecutionContext.Output); + __tagHelperExecutionContext = __tagHelperScopeManager.End(); + WriteLiteral("\r\n"); + }; + + await sometMethod(); + + } + #pragma warning restore 1998 + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper Html { get; private set; } + } +} +#pragma warning restore 1591 diff --git a/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncLocalFunctions.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncLocalFunctions.cs new file mode 100644 index 0000000000..1c06958dbd --- /dev/null +++ b/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncLocalFunctions.cs @@ -0,0 +1,84 @@ +#pragma checksum "C:\Users\nimullen\Documents\Projects\AnalyzerTest\NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncLocalFunctions..cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "d5d5a28106f24c1bb31f07635157a3503dfdcb2d" +// +#pragma warning disable 1591 +[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncLocalFunctions_), @"mvc.1.0.view", @"/NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncLocalFunctions..cshtml")] +namespace AspNetCore +{ + #line hidden + using System; + using System.Collections.Generic; + using System.Linq; + using System.Threading.Tasks; + using Microsoft.AspNetCore.Mvc; + using Microsoft.AspNetCore.Mvc.Rendering; + using Microsoft.AspNetCore.Mvc.ViewFeatures; + [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"d5d5a28106f24c1bb31f07635157a3503dfdcb2d", @"/NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncLocalFunctions..cshtml")] + public class NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncLocalFunctions_ : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage + { + #line hidden + #pragma warning disable 0169 + private string __tagHelperStringValueBuffer; + #pragma warning restore 0169 + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext; + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner(); + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null; + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager + { + get + { + if (__backed__tagHelperScopeManager == null) + { + __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope); + } + return __backed__tagHelperScopeManager; + } + } + private global::Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper __Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper; + #pragma warning disable 1998 + public async override global::System.Threading.Tasks.Task ExecuteAsync() + { + WriteLiteral("\r\n"); + + /*MM*/async Task SometMethod() + { + + WriteLiteral(" "); + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("cache", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "d5d5a28106f24c1bb31f07635157a3503dfdcb2d2978", async() => { + WriteLiteral("\r\n

    The current time is "); + Write(DateTime.Now); + + WriteLiteral("

    \r\n "); + } + ); + __Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper); + BeginWriteTagHelperAttribute(); + __tagHelperStringValueBuffer = EndWriteTagHelperAttribute(); + __tagHelperExecutionContext.AddHtmlAttribute("asp-vary-by-user", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized); + await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); + if (!__tagHelperExecutionContext.Output.IsContentModified) + { + await __tagHelperExecutionContext.SetOutputContentAsync(); + } + Write(__tagHelperExecutionContext.Output); + __tagHelperExecutionContext = __tagHelperScopeManager.End(); + WriteLiteral("\r\n"); + } + + await SometMethod(); + + } + #pragma warning restore 1998 + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper Html { get; private set; } + } +} +#pragma warning restore 1591 diff --git a/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/SingleDiagnosticIsReturned_ForMultipleTagHelpersInVoidMethod.cs b/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/SingleDiagnosticIsReturned_ForMultipleTagHelpersInVoidMethod.cs new file mode 100644 index 0000000000..bd589eba68 --- /dev/null +++ b/src/Mvc/Mvc.Analyzers/test/TestFiles/TagHelpersInCodeBlocksAnalyzerTest/SingleDiagnosticIsReturned_ForMultipleTagHelpersInVoidMethod.cs @@ -0,0 +1,123 @@ +namespace AspNetCore +{ + #line hidden + using System; + using System.Collections.Generic; + using System.Linq; + using System.Threading.Tasks; + using Microsoft.AspNetCore.Mvc; + using Microsoft.AspNetCore.Mvc.Rendering; + using Microsoft.AspNetCore.Mvc.ViewFeatures; + public class SingleDiagnosticIsReturned_ForMultipleTagHelpersInVoidMethod : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage + { + #line hidden + #pragma warning disable 0169 + private string __tagHelperStringValueBuffer; + #pragma warning restore 0169 + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext; + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner(); + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null; + private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager + { + get + { + if (__backed__tagHelperScopeManager == null) + { + __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope); + } + return __backed__tagHelperScopeManager; + } + } + private global::Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper __Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper; + #pragma warning disable 1998 + public async override global::System.Threading.Tasks.Task ExecuteAsync() + { + WriteLiteral("\r\n"); + + SometMethod(); + + WriteLiteral("\r\n"); + } + #pragma warning restore 1998 + + /*MM*/void SometMethod() + { + + WriteLiteral(" "); + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("cache", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "a49ad3383d0802d134e8f9ec401bad4c2f47d14d3250", async() => { + WriteLiteral("\r\n

    The current time is "); + Write(DateTime.Now); + + WriteLiteral("

    \r\n "); + } + ); + __Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper); + BeginWriteTagHelperAttribute(); + __tagHelperStringValueBuffer = EndWriteTagHelperAttribute(); + __tagHelperExecutionContext.AddHtmlAttribute("asp-vary-by-user", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized); + await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); + if (!__tagHelperExecutionContext.Output.IsContentModified) + { + await __tagHelperExecutionContext.SetOutputContentAsync(); + } + Write(__tagHelperExecutionContext.Output); + __tagHelperExecutionContext = __tagHelperScopeManager.End(); + WriteLiteral("\r\n"); + WriteLiteral(" "); + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("cache", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "a49ad3383d0802d134e8f9ec401bad4c2f47d14d4821", async() => { + WriteLiteral("\r\n

    The current time is "); + Write(DateTime.Now); + + WriteLiteral("

    \r\n "); + } + ); + __Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper); + BeginWriteTagHelperAttribute(); + __tagHelperStringValueBuffer = EndWriteTagHelperAttribute(); + __tagHelperExecutionContext.AddHtmlAttribute("asp-vary-by-user", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized); + await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); + if (!__tagHelperExecutionContext.Output.IsContentModified) + { + await __tagHelperExecutionContext.SetOutputContentAsync(); + } + Write(__tagHelperExecutionContext.Output); + __tagHelperExecutionContext = __tagHelperScopeManager.End(); + WriteLiteral("\r\n"); + WriteLiteral(" "); + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("cache", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "a49ad3383d0802d134e8f9ec401bad4c2f47d14d6392", async() => { + WriteLiteral("\r\n

    The current time is "); + Write(DateTime.Now); + + WriteLiteral("

    \r\n "); + } + ); + __Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__Microsoft_AspNetCore_Mvc_TagHelpers_CacheTagHelper); + BeginWriteTagHelperAttribute(); + __tagHelperStringValueBuffer = EndWriteTagHelperAttribute(); + __tagHelperExecutionContext.AddHtmlAttribute("asp-vary-by-user", Html.Raw(__tagHelperStringValueBuffer), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.Minimized); + await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); + if (!__tagHelperExecutionContext.Output.IsContentModified) + { + await __tagHelperExecutionContext.SetOutputContentAsync(); + } + Write(__tagHelperExecutionContext.Output); + __tagHelperExecutionContext = __tagHelperScopeManager.End(); + WriteLiteral("\r\n"); + } + + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; } + [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute] + public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper Html { get; private set; } + } +} +#pragma warning restore 1591 diff --git a/src/Mvc/Mvc.Components.Prerendering/test/HtmlHelperComponentPrerenderingExtensionsTests.cs b/src/Mvc/Mvc.Components.Prerendering/test/HtmlHelperComponentPrerenderingExtensionsTests.cs index 533cd19c7e..3b69925b91 100644 --- a/src/Mvc/Mvc.Components.Prerendering/test/HtmlHelperComponentPrerenderingExtensionsTests.cs +++ b/src/Mvc/Mvc.Components.Prerendering/test/HtmlHelperComponentPrerenderingExtensionsTests.cs @@ -7,9 +7,11 @@ using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.RenderTree; using Microsoft.AspNetCore.Html; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.Extensions.DependencyInjection; using Microsoft.JSInterop; +using Microsoft.Net.Http.Headers; using Moq; using Xunit; @@ -122,7 +124,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures } [Fact] - public async Task UriHelperRedirect_ThrowsInvalidOperationException() + public async Task UriHelperRedirect_ThrowsInvalidOperationException_WhenResponseHasAlreadyStarted() { // Arrange var ctx = new DefaultHttpContext(); @@ -131,7 +133,9 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures ctx.Request.PathBase = "/base"; ctx.Request.Path = "/path"; ctx.Request.QueryString = new QueryString("?query=value"); - + var responseMock = new Mock(); + responseMock.Setup(r => r.HasStarted).Returns(true); + ctx.Features.Set(responseMock.Object); var helper = CreateHelper(ctx); var writer = new StringWriter(); @@ -141,13 +145,62 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures RedirectUri = "http://localhost/redirect" })); - Assert.Equal("Navigation commands can not be issued at this time. This is because the component is being " + - "prerendered and the page has not yet loaded in the browser or because the circuit is currently disconnected. " + - "Components must wrap any navigation calls in conditional logic to ensure those navigation calls are not " + - "attempted during prerendering or while the client is disconnected.", + Assert.Equal("A navigation command was attempted during prerendering after the server already started sending the response. " + + "Navigation commands can not be issued during server-side prerendering after the response from the server has started. Applications must buffer the" + + "reponse and avoid using features like FlushAsync() before all components on the page have been rendered to prevent failed navigation commands.", exception.Message); } + [Fact] + public async Task HtmlHelper_Redirects_WhenComponentNavigates() + { + // Arrange + var ctx = new DefaultHttpContext(); + ctx.Request.Scheme = "http"; + ctx.Request.Host = new HostString("localhost"); + ctx.Request.PathBase = "/base"; + ctx.Request.Path = "/path"; + ctx.Request.QueryString = new QueryString("?query=value"); + var helper = CreateHelper(ctx); + + // Act + await helper.RenderComponentAsync(new + { + RedirectUri = "http://localhost/redirect" + }); + + // Assert + Assert.Equal(302, ctx.Response.StatusCode); + Assert.Equal("http://localhost/redirect", ctx.Response.Headers[HeaderNames.Location]); + } + + [Fact] + public async Task HtmlHelper_AvoidsRendering_WhenNavigationHasHappened() + { + // Arrange + var ctx = new DefaultHttpContext(); + ctx.Request.Scheme = "http"; + ctx.Request.Host = new HostString("localhost"); + ctx.Request.PathBase = "/base"; + ctx.Request.Path = "/path"; + ctx.Request.QueryString = new QueryString("?query=value"); + var helper = CreateHelper(ctx); + var stringWriter = new StringWriter(); + + await helper.RenderComponentAsync(new + { + RedirectUri = "http://localhost/redirect" + }); + + // Act + var result = await helper.RenderComponentAsync(new { Name = "George" }); + + // Assert + Assert.NotNull(result); + result.WriteTo(stringWriter, HtmlEncoder.Default); + Assert.Equal("", stringWriter.ToString()); + } + [Fact] public async Task CanRender_AsyncComponent() { @@ -432,6 +485,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures { var services = new ServiceCollection(); services.AddLogging(); + services.AddDataProtection(); services.AddSingleton(HtmlEncoder.Default); configureServices = configureServices ?? (s => s.AddServerSideBlazor()); configureServices?.Invoke(services); diff --git a/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.netcoreapp3.0.cs b/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.netcoreapp3.0.cs index 54a8699f3f..de22f01d28 100644 --- a/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.netcoreapp3.0.cs +++ b/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.netcoreapp3.0.cs @@ -814,6 +814,11 @@ namespace Microsoft.AspNetCore.Mvc public partial interface IRequestSizePolicy : Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata { } + public partial class JsonOptions + { + public JsonOptions() { } + public System.Text.Json.Serialization.JsonSerializerOptions JsonSerializerOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } public partial class JsonResult : Microsoft.AspNetCore.Mvc.ActionResult, Microsoft.AspNetCore.Mvc.IActionResult, Microsoft.AspNetCore.Mvc.Infrastructure.IStatusCodeActionResult { public JsonResult(object value) { } @@ -881,9 +886,9 @@ namespace Microsoft.AspNetCore.Mvc public bool RequireHttpsPermanent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public bool RespectBrowserAcceptHeader { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public bool ReturnHttpNotAcceptable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Text.Json.Serialization.JsonSerializerOptions SerializerOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public int? SslPort { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public bool SuppressAsyncSuffixInActionNames { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool SuppressImplicitRequiredAttributeForNonNullableReferenceTypes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public bool SuppressInputFormatterBuffering { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public bool SuppressOutputFormatterBuffering { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public bool ValidateComplexTypesIfChildValidationFails { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } @@ -1871,7 +1876,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters } public partial class SystemTextJsonInputFormatter : Microsoft.AspNetCore.Mvc.Formatters.TextInputFormatter, Microsoft.AspNetCore.Mvc.Formatters.IInputFormatterExceptionPolicy { - public SystemTextJsonInputFormatter(Microsoft.AspNetCore.Mvc.MvcOptions options) { } + public SystemTextJsonInputFormatter(Microsoft.AspNetCore.Mvc.JsonOptions options) { } Microsoft.AspNetCore.Mvc.Formatters.InputFormatterExceptionPolicy Microsoft.AspNetCore.Mvc.Formatters.IInputFormatterExceptionPolicy.ExceptionPolicy { get { throw null; } } public System.Text.Json.Serialization.JsonSerializerOptions SerializerOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } [System.Diagnostics.DebuggerStepThroughAttribute] @@ -1879,7 +1884,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters } public partial class SystemTextJsonOutputFormatter : Microsoft.AspNetCore.Mvc.Formatters.TextOutputFormatter { - public SystemTextJsonOutputFormatter(Microsoft.AspNetCore.Mvc.MvcOptions options) { } + public SystemTextJsonOutputFormatter(Microsoft.AspNetCore.Mvc.JsonOptions options) { } public System.Text.Json.Serialization.JsonSerializerOptions SerializerOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } [System.Diagnostics.DebuggerStepThroughAttribute] public sealed override System.Threading.Tasks.Task WriteResponseBodyAsync(Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext context, System.Text.Encoding selectedEncoding) { throw null; } @@ -2817,6 +2822,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata public ValidationMetadataProviderContext(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity key, Microsoft.AspNetCore.Mvc.ModelBinding.ModelAttributes attributes) { } public System.Collections.Generic.IReadOnlyList Attributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity Key { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.IReadOnlyList ParameterAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public System.Collections.Generic.IReadOnlyList PropertyAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public System.Collections.Generic.IReadOnlyList TypeAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ValidationMetadata ValidationMetadata { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } @@ -3024,6 +3030,7 @@ namespace Microsoft.Extensions.DependencyInjection public static Microsoft.Extensions.DependencyInjection.IMvcBuilder AddApplicationPart(this Microsoft.Extensions.DependencyInjection.IMvcBuilder builder, System.Reflection.Assembly assembly) { throw null; } public static Microsoft.Extensions.DependencyInjection.IMvcBuilder AddControllersAsServices(this Microsoft.Extensions.DependencyInjection.IMvcBuilder builder) { throw null; } public static Microsoft.Extensions.DependencyInjection.IMvcBuilder AddFormatterMappings(this Microsoft.Extensions.DependencyInjection.IMvcBuilder builder, System.Action setupAction) { throw null; } + public static Microsoft.Extensions.DependencyInjection.IMvcBuilder AddJsonOptions(this Microsoft.Extensions.DependencyInjection.IMvcBuilder builder, System.Action configure) { throw null; } public static Microsoft.Extensions.DependencyInjection.IMvcBuilder AddMvcOptions(this Microsoft.Extensions.DependencyInjection.IMvcBuilder builder, System.Action setupAction) { throw null; } public static Microsoft.Extensions.DependencyInjection.IMvcBuilder ConfigureApiBehaviorOptions(this Microsoft.Extensions.DependencyInjection.IMvcBuilder builder, System.Action setupAction) { throw null; } public static Microsoft.Extensions.DependencyInjection.IMvcBuilder ConfigureApplicationPartManager(this Microsoft.Extensions.DependencyInjection.IMvcBuilder builder, System.Action setupAction) { throw null; } @@ -3037,6 +3044,7 @@ namespace Microsoft.Extensions.DependencyInjection public static Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder AddControllersAsServices(this Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder builder) { throw null; } public static Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder AddFormatterMappings(this Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder builder) { throw null; } public static Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder AddFormatterMappings(this Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder builder, System.Action setupAction) { throw null; } + public static Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder AddJsonOptions(this Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder builder, System.Action configure) { throw null; } public static Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder AddMvcOptions(this Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder builder, System.Action setupAction) { throw null; } public static Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder ConfigureApiBehaviorOptions(this Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder builder, System.Action setupAction) { throw null; } public static Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder ConfigureApplicationPartManager(this Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder builder, System.Action setupAction) { throw null; } diff --git a/src/Mvc/Mvc.Core/src/ApplicationModels/DefaultApplicationModelProvider.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/DefaultApplicationModelProvider.cs index 6abac4e65a..3171c8f1ab 100644 --- a/src/Mvc/Mvc.Core/src/ApplicationModels/DefaultApplicationModelProvider.cs +++ b/src/Mvc/Mvc.Core/src/ApplicationModels/DefaultApplicationModelProvider.cs @@ -565,6 +565,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationModels if (!(routeProvider is IActionHttpMethodProvider)) { createSelectorForSilentRouteProviders = false; + break; } } diff --git a/src/Mvc/Mvc.Core/src/DependencyInjection/MvcCoreMvcBuilderExtensions.cs b/src/Mvc/Mvc.Core/src/DependencyInjection/MvcCoreMvcBuilderExtensions.cs index 74cbeadb21..3d0181a571 100644 --- a/src/Mvc/Mvc.Core/src/DependencyInjection/MvcCoreMvcBuilderExtensions.cs +++ b/src/Mvc/Mvc.Core/src/DependencyInjection/MvcCoreMvcBuilderExtensions.cs @@ -42,6 +42,30 @@ namespace Microsoft.Extensions.DependencyInjection return builder; } + /// + /// Configures for the specified . + /// + /// The . + /// An to configure the . + /// The . + public static IMvcBuilder AddJsonOptions( + this IMvcBuilder builder, + Action configure) + { + if (builder == null) + { + throw new ArgumentNullException(nameof(builder)); + } + + if (configure == null) + { + throw new ArgumentNullException(nameof(configure)); + } + + builder.Services.Configure(configure); + return builder; + } + /// /// Configures for the specified . /// diff --git a/src/Mvc/Mvc.Core/src/DependencyInjection/MvcCoreMvcCoreBuilderExtensions.cs b/src/Mvc/Mvc.Core/src/DependencyInjection/MvcCoreMvcCoreBuilderExtensions.cs index 7dd460b8c4..76244cb0aa 100644 --- a/src/Mvc/Mvc.Core/src/DependencyInjection/MvcCoreMvcCoreBuilderExtensions.cs +++ b/src/Mvc/Mvc.Core/src/DependencyInjection/MvcCoreMvcCoreBuilderExtensions.cs @@ -44,6 +44,30 @@ namespace Microsoft.Extensions.DependencyInjection return builder; } + /// + /// Configures for the specified . + /// + /// The . + /// An to configure the . + /// The . + public static IMvcCoreBuilder AddJsonOptions( + this IMvcCoreBuilder builder, + Action configure) + { + if (builder == null) + { + throw new ArgumentNullException(nameof(builder)); + } + + if (configure == null) + { + throw new ArgumentNullException(nameof(configure)); + } + + builder.Services.Configure(configure); + return builder; + } + /// /// Adds services to support . /// diff --git a/src/Mvc/Mvc.Core/src/Formatters/SystemTextJsonInputFormatter.cs b/src/Mvc/Mvc.Core/src/Formatters/SystemTextJsonInputFormatter.cs index a99775da12..e2b2756246 100644 --- a/src/Mvc/Mvc.Core/src/Formatters/SystemTextJsonInputFormatter.cs +++ b/src/Mvc/Mvc.Core/src/Formatters/SystemTextJsonInputFormatter.cs @@ -19,10 +19,10 @@ namespace Microsoft.AspNetCore.Mvc.Formatters /// /// Initializes a new instance of . /// - /// The . - public SystemTextJsonInputFormatter(MvcOptions options) + /// The . + public SystemTextJsonInputFormatter(JsonOptions options) { - SerializerOptions = options.SerializerOptions; + SerializerOptions = options.JsonSerializerOptions; SupportedEncodings.Add(UTF8EncodingWithoutBOM); SupportedEncodings.Add(UTF16EncodingLittleEndian); diff --git a/src/Mvc/Mvc.Core/src/Formatters/SystemTextJsonOutputFormatter.cs b/src/Mvc/Mvc.Core/src/Formatters/SystemTextJsonOutputFormatter.cs index b39ab6ded6..0ff0ce7065 100644 --- a/src/Mvc/Mvc.Core/src/Formatters/SystemTextJsonOutputFormatter.cs +++ b/src/Mvc/Mvc.Core/src/Formatters/SystemTextJsonOutputFormatter.cs @@ -20,10 +20,10 @@ namespace Microsoft.AspNetCore.Mvc.Formatters /// /// Initializes a new instance. /// - /// The . - public SystemTextJsonOutputFormatter(MvcOptions options) + /// The . + public SystemTextJsonOutputFormatter(JsonOptions options) { - SerializerOptions = options.SerializerOptions; + SerializerOptions = options.JsonSerializerOptions; SupportedEncodings.Add(Encoding.UTF8); SupportedEncodings.Add(Encoding.Unicode); diff --git a/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvoker.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvoker.cs index 28510c2d5b..ee0b0a2e1f 100644 --- a/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvoker.cs +++ b/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvoker.cs @@ -21,8 +21,8 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure private Dictionary _arguments; - private ActionExecutingContext _actionExecutingContext; - private ActionExecutedContext _actionExecutedContext; + private ActionExecutingContextSealed _actionExecutingContext; + private ActionExecutedContextSealed _actionExecutedContext; internal ControllerActionInvoker( ILogger logger, @@ -85,7 +85,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure { if (_actionExecutingContext == null) { - _actionExecutingContext = new ActionExecutingContext(_controllerContext, _filters, _arguments, _instance); + _actionExecutingContext = new ActionExecutingContextSealed(_controllerContext, _filters, _arguments, _instance); } state = current.FilterAsync; @@ -95,7 +95,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure { if (_actionExecutingContext == null) { - _actionExecutingContext = new ActionExecutingContext(_controllerContext, _filters, _arguments, _instance); + _actionExecutingContext = new ActionExecutingContextSealed(_controllerContext, _filters, _arguments, _instance); } state = current.Filter; @@ -143,7 +143,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure // If we get here then the filter didn't call 'next' indicating a short circuit. _logger.ActionFilterShortCircuited(filter); - _actionExecutedContext = new ActionExecutedContext( + _actionExecutedContext = new ActionExecutedContextSealed( _controllerContext, _filters, _instance) @@ -189,7 +189,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure // Short-circuited by setting a result. _logger.ActionFilterShortCircuited(filter); - _actionExecutedContext = new ActionExecutedContext( + _actionExecutedContext = new ActionExecutedContextSealed( _actionExecutingContext, _filters, _instance) @@ -255,7 +255,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure { if (_actionExecutedContext == null) { - _actionExecutedContext = new ActionExecutedContext(_controllerContext, _filters, _instance) + _actionExecutedContext = new ActionExecutedContextSealed(_controllerContext, _filters, _instance) { Result = _result, }; @@ -301,7 +301,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure } catch (Exception exception) { - _actionExecutedContext = new ActionExecutedContext(_controllerContext, _filters, _instance) + _actionExecutedContext = new ActionExecutedContextSealed(_controllerContext, _filters, _instance) { ExceptionDispatchInfo = ExceptionDispatchInfo.Capture(exception), }; @@ -323,7 +323,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure } catch (Exception exception) { - invoker._actionExecutedContext = new ActionExecutedContext(invoker._controllerContext, invoker._filters, invoker._instance) + invoker._actionExecutedContext = new ActionExecutedContextSealed(invoker._controllerContext, invoker._filters, invoker._instance) { ExceptionDispatchInfo = ExceptionDispatchInfo.Capture(exception), }; @@ -349,7 +349,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure } Debug.Assert(_actionExecutedContext != null); - return Task.FromResult(_actionExecutedContext); + return Task.FromResult(_actionExecutedContext); static async Task Awaited(ControllerActionInvoker invoker, Task task) { @@ -485,7 +485,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure } } - private static void Rethrow(ActionExecutedContext context) + private static void Rethrow(ActionExecutedContextSealed context) { if (context == null) { @@ -567,5 +567,15 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure ActionInside, ActionEnd, } + + private sealed class ActionExecutingContextSealed : ActionExecutingContext + { + public ActionExecutingContextSealed(ActionContext actionContext, IList filters, IDictionary actionArguments, object controller) : base(actionContext, filters, actionArguments, controller) { } + } + + private sealed class ActionExecutedContextSealed : ActionExecutedContext + { + public ActionExecutedContextSealed(ActionContext actionContext, IList filters, object controller) : base(actionContext, filters, controller) { } + } } } diff --git a/src/Mvc/Mvc.Core/src/Infrastructure/MvcCoreMvcOptionsSetup.cs b/src/Mvc/Mvc.Core/src/Infrastructure/MvcCoreMvcOptionsSetup.cs index d856b684b8..b94ff39557 100644 --- a/src/Mvc/Mvc.Core/src/Infrastructure/MvcCoreMvcOptionsSetup.cs +++ b/src/Mvc/Mvc.Core/src/Infrastructure/MvcCoreMvcOptionsSetup.cs @@ -25,21 +25,33 @@ namespace Microsoft.AspNetCore.Mvc { private readonly IHttpRequestStreamReaderFactory _readerFactory; private readonly ILoggerFactory _loggerFactory; + private readonly IOptions _jsonOptions; public MvcCoreMvcOptionsSetup(IHttpRequestStreamReaderFactory readerFactory) - : this(readerFactory, NullLoggerFactory.Instance) + : this(readerFactory, NullLoggerFactory.Instance, Options.Create(new JsonOptions())) { } - public MvcCoreMvcOptionsSetup(IHttpRequestStreamReaderFactory readerFactory, ILoggerFactory loggerFactory) + public MvcCoreMvcOptionsSetup(IHttpRequestStreamReaderFactory readerFactory, ILoggerFactory loggerFactory, IOptions jsonOptions) { if (readerFactory == null) { throw new ArgumentNullException(nameof(readerFactory)); } + if (loggerFactory == null) + { + throw new ArgumentNullException(nameof(loggerFactory)); + } + + if (jsonOptions == null) + { + throw new ArgumentNullException(nameof(jsonOptions)); + } + _readerFactory = readerFactory; _loggerFactory = loggerFactory; + _jsonOptions = jsonOptions; } public void Configure(MvcOptions options) @@ -66,13 +78,13 @@ namespace Microsoft.AspNetCore.Mvc options.Filters.Add(new UnsupportedContentTypeFilter()); // Set up default input formatters. - options.InputFormatters.Add(new SystemTextJsonInputFormatter(options)); + options.InputFormatters.Add(new SystemTextJsonInputFormatter(_jsonOptions.Value)); // Set up default output formatters. options.OutputFormatters.Add(new HttpNoContentOutputFormatter()); options.OutputFormatters.Add(new StringOutputFormatter()); options.OutputFormatters.Add(new StreamOutputFormatter()); - options.OutputFormatters.Add(new SystemTextJsonOutputFormatter(options)); + options.OutputFormatters.Add(new SystemTextJsonOutputFormatter(_jsonOptions.Value)); // Set up ValueProviders options.ValueProviderFactories.Add(new FormValueProviderFactory()); diff --git a/src/Mvc/Mvc.Core/src/Infrastructure/ResourceInvoker.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ResourceInvoker.cs index 6379295394..7be49bfda6 100644 --- a/src/Mvc/Mvc.Core/src/Infrastructure/ResourceInvoker.cs +++ b/src/Mvc/Mvc.Core/src/Infrastructure/ResourceInvoker.cs @@ -14,6 +14,7 @@ using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Mvc.Infrastructure { +#nullable enable internal abstract class ResourceInvoker { protected readonly DiagnosticListener _diagnosticListener; @@ -24,18 +25,18 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure protected readonly IFilterMetadata[] _filters; protected readonly IList _valueProviderFactories; - private AuthorizationFilterContextSealed _authorizationContext; - private ResourceExecutingContextSealed _resourceExecutingContext; - private ResourceExecutedContextSealed _resourceExecutedContext; - private ExceptionContextSealed _exceptionContext; - private ResultExecutingContextSealed _resultExecutingContext; - private ResultExecutedContextSealed _resultExecutedContext; + private AuthorizationFilterContextSealed? _authorizationContext; + private ResourceExecutingContextSealed? _resourceExecutingContext; + private ResourceExecutedContextSealed? _resourceExecutedContext; + private ExceptionContextSealed? _exceptionContext; + private ResultExecutingContextSealed? _resultExecutingContext; + private ResultExecutedContextSealed? _resultExecutedContext; // Do not make this readonly, it's mutable. We don't want to make a copy. // https://blogs.msdn.microsoft.com/ericlippert/2008/05/14/mutating-readonly-structs/ protected FilterCursor _cursor; - protected IActionResult _result; - protected object _instance; + protected IActionResult? _result; + protected object? _instance; public ResourceInvoker( DiagnosticListener diagnosticListener, @@ -67,7 +68,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure _actionContextAccessor.ActionContext = _actionContext; var scope = _logger.ActionScope(_actionContext.ActionDescriptor); - Task task = null; + Task task; try { task = InvokeFilterPipelineAsync(); @@ -77,13 +78,12 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure return Awaited(this, Task.FromException(exception), scope); } - Debug.Assert(task != null); if (!task.IsCompletedSuccessfully) { return Awaited(this, task, scope); } - Exception releaseException = null; + Exception? releaseException = null; try { ReleaseResources(); @@ -93,10 +93,10 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure releaseException = exception; } - Exception scopeException = null; + Exception? scopeException = null; try { - scope.Dispose(); + scope?.Dispose(); } catch (Exception exception) { @@ -120,7 +120,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure return Task.FromException(scopeException); } - static async Task Awaited(ResourceInvoker invoker, Task task, IDisposable scope) + static async Task Awaited(ResourceInvoker invoker, Task task, IDisposable? scope) { try { @@ -135,7 +135,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure } finally { - scope.Dispose(); + scope?.Dispose(); } } @@ -204,7 +204,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure // The `state` is used for internal state handling during transitions between states. In practice this // means storing a filter instance in `state` and then retrieving it in the next state. - var state = (object)null; + var state = (object?)null; // `isCompleted` will be set to true when we've reached a terminal state. var isCompleted = false; @@ -228,7 +228,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure return Task.FromException(ex); } - static async Task Awaited(ResourceInvoker invoker, Task lastTask, State next, Scope scope, object state, bool isCompleted) + static async Task Awaited(ResourceInvoker invoker, Task lastTask, State next, Scope scope, object? state, bool isCompleted) { await lastTask; @@ -269,7 +269,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure } } - private Task Next(ref State next, ref Scope scope, ref object state, ref bool isCompleted) + private Task Next(ref State next, ref Scope scope, ref object? state, ref bool isCompleted) { switch (next) { @@ -868,7 +868,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure } Debug.Assert(scope == Scope.Invoker); - Rethrow(_resourceExecutedContext); + Rethrow(_resourceExecutedContext!); goto case State.InvokeEnd; } @@ -929,7 +929,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure { var scope = Scope.Resource; var next = State.ResourceNext; - var state = (object)null; + var state = (object?)null; var isCompleted = false; while (!isCompleted) @@ -943,7 +943,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure } catch (Exception exception) { - _resourceExecutedContext = new ResourceExecutedContextSealed(_resourceExecutingContext, _filters) + _resourceExecutedContext = new ResourceExecutedContextSealed(_resourceExecutingContext!, _filters) { ExceptionDispatchInfo = ExceptionDispatchInfo.Capture(exception), }; @@ -952,7 +952,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure Debug.Assert(_resourceExecutedContext != null); return Task.CompletedTask; - static async Task Awaited(ResourceInvoker invoker, Task lastTask, State next, Scope scope, object state, bool isCompleted) + static async Task Awaited(ResourceInvoker invoker, Task lastTask, State next, Scope scope, object? state, bool isCompleted) { try { @@ -965,7 +965,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure } catch (Exception exception) { - invoker._resourceExecutedContext = new ResourceExecutedContextSealed(invoker._resourceExecutingContext, invoker._filters) + invoker._resourceExecutedContext = new ResourceExecutedContextSealed(invoker._resourceExecutingContext!, invoker._filters) { ExceptionDispatchInfo = ExceptionDispatchInfo.Capture(exception), }; @@ -980,7 +980,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure try { var next = State.ExceptionNext; - var state = (object)null; + var state = (object?)null; var scope = Scope.Exception; var isCompleted = false; @@ -1002,7 +1002,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure return Task.FromException(ex); } - static async Task Awaited(ResourceInvoker invoker, Task lastTask, State next, Scope scope, object state, bool isCompleted) + static async Task Awaited(ResourceInvoker invoker, Task lastTask, State next, Scope scope, object? state, bool isCompleted) { try { @@ -1029,7 +1029,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure { var next = State.ResultBegin; var scope = Scope.Invoker; - var state = (object)null; + var state = (object?)null; var isCompleted = false; while (!isCompleted) @@ -1050,7 +1050,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure return Task.FromException(ex); } - static async Task Awaited(ResourceInvoker invoker, Task lastTask, State next, Scope scope, object state, bool isCompleted) + static async Task Awaited(ResourceInvoker invoker, Task lastTask, State next, Scope scope, object? state, bool isCompleted) { await lastTask; @@ -1067,7 +1067,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure { var next = State.ResultBegin; var scope = Scope.Invoker; - var state = (object)null; + var state = (object?)null; var isCompleted = false; while (!isCompleted) @@ -1088,7 +1088,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure return Task.FromException(ex); } - static async Task Awaited(ResourceInvoker invoker, Task lastTask, State next, Scope scope, object state, bool isCompleted) + static async Task Awaited(ResourceInvoker invoker, Task lastTask, State next, Scope scope, object? state, bool isCompleted) { await lastTask; @@ -1099,7 +1099,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure } } - private Task ResultNext(ref State next, ref Scope scope, ref object state, ref bool isCompleted) + private Task ResultNext(ref State next, ref Scope scope, ref object? state, ref bool isCompleted) where TFilter : class, IResultFilter where TFilterAsync : class, IAsyncResultFilter { @@ -1122,7 +1122,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure { if (_resultExecutingContext == null) { - _resultExecutingContext = new ResultExecutingContextSealed(_actionContext, _filters, _result, _instance); + _resultExecutingContext = new ResultExecutingContextSealed(_actionContext, _filters, _result!, _instance!); } state = current.FilterAsync; @@ -1132,7 +1132,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure { if (_resultExecutingContext == null) { - _resultExecutingContext = new ResultExecutingContextSealed(_actionContext, _filters, _result, _instance); + _resultExecutingContext = new ResultExecutingContextSealed(_actionContext, _filters, _result!, _instance!); } state = current.Filter; @@ -1186,7 +1186,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure _actionContext, _filters, resultExecutingContext.Result, - _instance) + _instance!) { Canceled = true, }; @@ -1232,7 +1232,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure resultExecutingContext, _filters, resultExecutingContext.Result, - _instance) + _instance!) { Canceled = true, }; @@ -1309,13 +1309,13 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure { if (_resultExecutedContext == null) { - _resultExecutedContext = new ResultExecutedContextSealed(_actionContext, _filters, result, _instance); + _resultExecutedContext = new ResultExecutedContextSealed(_actionContext, _filters, result!, _instance!); } return Task.CompletedTask; } - Rethrow(_resultExecutedContext); + Rethrow(_resultExecutedContext!); return Task.CompletedTask; } @@ -1331,7 +1331,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure try { var next = State.ResultNext; - var state = (object)null; + var state = (object?)null; var scope = Scope.Result; var isCompleted = false; while (!isCompleted) @@ -1345,7 +1345,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure } catch (Exception exception) { - _resultExecutedContext = new ResultExecutedContextSealed(_actionContext, _filters, _result, _instance) + _resultExecutedContext = new ResultExecutedContextSealed(_actionContext, _filters, _result!, _instance!) { ExceptionDispatchInfo = ExceptionDispatchInfo.Capture(exception), }; @@ -1355,7 +1355,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure return Task.CompletedTask; - static async Task Awaited(ResourceInvoker invoker, Task lastTask, State next, Scope scope, object state, bool isCompleted) + static async Task Awaited(ResourceInvoker invoker, Task lastTask, State next, Scope scope, object? state, bool isCompleted) { try { @@ -1368,7 +1368,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure } catch (Exception exception) { - invoker._resultExecutedContext = new ResultExecutedContextSealed(invoker._actionContext, invoker._filters, invoker._result, invoker._instance) + invoker._resultExecutedContext = new ResultExecutedContextSealed(invoker._actionContext, invoker._filters, invoker._result!, invoker._instance!) { ExceptionDispatchInfo = ExceptionDispatchInfo.Capture(exception), }; @@ -1589,4 +1589,5 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure public AuthorizationFilterContextSealed(ActionContext actionContext, IList filters) : base(actionContext, filters) { } } } +#nullable restore } diff --git a/src/Mvc/Mvc.Core/src/Infrastructure/SystemTextJsonResultExecutor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/SystemTextJsonResultExecutor.cs index c3e0e5f9dd..6706b30db0 100644 --- a/src/Mvc/Mvc.Core/src/Infrastructure/SystemTextJsonResultExecutor.cs +++ b/src/Mvc/Mvc.Core/src/Infrastructure/SystemTextJsonResultExecutor.cs @@ -23,14 +23,14 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure Encoding = Encoding.UTF8 }.ToString(); - private readonly MvcOptions _mvcOptions; + private readonly JsonOptions _options; private readonly ILogger _logger; public SystemTextJsonResultExecutor( - IOptions mvcOptions, + IOptions options, ILogger logger) { - _mvcOptions = mvcOptions.Value; + _options = options.Value; _logger = logger; } @@ -100,7 +100,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure var serializerSettings = result.SerializerSettings; if (serializerSettings == null) { - return _mvcOptions.SerializerOptions; + return _options.JsonSerializerOptions; } else { diff --git a/src/Mvc/Mvc.Core/src/JsonOptions.cs b/src/Mvc/Mvc.Core/src/JsonOptions.cs new file mode 100644 index 0000000000..86768039e3 --- /dev/null +++ b/src/Mvc/Mvc.Core/src/JsonOptions.cs @@ -0,0 +1,31 @@ +// 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.Text.Json.Serialization; +using Microsoft.AspNetCore.Mvc.Formatters; + +namespace Microsoft.AspNetCore.Mvc +{ + public class JsonOptions + { + /// + /// Gets the used by and + /// . + /// + public JsonSerializerOptions JsonSerializerOptions { get; } = new JsonSerializerOptions + { + // Limit the object graph we'll consume to a fixed depth. This prevents stackoverflow exceptions + // from deserialization errors that might occur from deeply nested objects. + // This value is the same for model binding and Json.Net's serialization. + MaxDepth = MvcOptions.DefaultMaxModelBindingRecursionDepth, + + // We're using case-insensitive because there's a TON of code that there that does uses JSON.NET's default + // settings (preserve case) - including the WebAPIClient. This worked when we were using JSON.NET + camel casing + // because JSON.NET is case-insensitive by default. + PropertyNameCaseInsensitive = true, + + // Use camel casing for properties + PropertyNamingPolicy = JsonNamingPolicy.CamelCase, + }; + } +} diff --git a/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/ValidationMetadataProviderContext.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/ValidationMetadataProviderContext.cs index 84cfdd76bf..dde77f5bd0 100644 --- a/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/ValidationMetadataProviderContext.cs +++ b/src/Mvc/Mvc.Core/src/ModelBinding/Metadata/ValidationMetadataProviderContext.cs @@ -27,6 +27,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata Key = key; Attributes = attributes.Attributes; + ParameterAttributes = attributes.ParameterAttributes; PropertyAttributes = attributes.PropertyAttributes; TypeAttributes = attributes.TypeAttributes; @@ -43,6 +44,11 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata /// public ModelMetadataIdentity Key { get; } + /// + /// Gets the parameter attributes. + /// + public IReadOnlyList ParameterAttributes { get; } + /// /// Gets the property attributes. /// diff --git a/src/Mvc/Mvc.Core/src/MvcCoreLoggerExtensions.cs b/src/Mvc/Mvc.Core/src/MvcCoreLoggerExtensions.cs index 165d3ab90c..26534c1712 100644 --- a/src/Mvc/Mvc.Core/src/MvcCoreLoggerExtensions.cs +++ b/src/Mvc/Mvc.Core/src/MvcCoreLoggerExtensions.cs @@ -695,10 +695,12 @@ namespace Microsoft.AspNetCore.Mvc _selectingFirstCanWriteFormatter(logger, null); } - public static IDisposable ActionScope(this ILogger logger, ActionDescriptor action) +#nullable enable + public static IDisposable? ActionScope(this ILogger logger, ActionDescriptor action) { return logger.BeginScope(new ActionLogScope(action)); } +#nullable restore public static void ExecutingAction(this ILogger logger, ActionDescriptor action) { diff --git a/src/Mvc/Mvc.Core/src/MvcOptions.cs b/src/Mvc/Mvc.Core/src/MvcOptions.cs index d3add19c02..2cb5f9fa72 100644 --- a/src/Mvc/Mvc.Core/src/MvcOptions.cs +++ b/src/Mvc/Mvc.Core/src/MvcOptions.cs @@ -4,8 +4,7 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Text.Json; -using System.Text.Json.Serialization; +using System.ComponentModel.DataAnnotations; using Microsoft.AspNetCore.Mvc.ApplicationModels; using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; @@ -102,6 +101,30 @@ namespace Microsoft.AspNetCore.Mvc /// public FormatterCollection InputFormatters { get; } + /// + /// Gets or sets a value that detemines if the inference of for + /// for properties and parameters of non-nullable reference types is suppressed. If false + /// (the default), then all non-nullable reference types will behave as-if [Required] has + /// been applied. If true, this behavior will be suppressed; nullable reference types and + /// non-nullable reference types will behave the same for the purposes of validation. + /// + /// + /// + /// This option controls whether MVC model binding and validation treats nullable and non-nullable + /// reference types differently. + /// + /// + /// By default, MVC will treat a non-nullable reference type parameters and properties as-if + /// [Required] has been applied, resulting in validation errors when no value was bound. + /// + /// + /// MVC does not support non-nullable reference type annotations on type arguments and type parameter + /// contraints. The framework will not infer any validation attributes for generic-typed properties + /// or collection elements. + /// + /// + public bool SuppressImplicitRequiredAttributeForNonNullableReferenceTypes { get; set; } + /// /// Gets or sets a value that determines if buffering is disabled for input formatters that /// synchronously read from the HTTP request body. @@ -336,21 +359,6 @@ namespace Microsoft.AspNetCore.Mvc } } - /// - /// Gets the used by and - /// . - /// - public JsonSerializerOptions SerializerOptions { get; } = new JsonSerializerOptions - { - // Limit the object graph we'll consume to a fixed depth. This prevents stackoverflow exceptions - // from deserialization errors that might occur from deeply nested objects. - // This value is the same for model binding and Json.Net's serialization. - MaxDepth = DefaultMaxModelBindingRecursionDepth, - - // Use camel casing for properties - PropertyNamingPolicy = JsonNamingPolicy.CamelCase, - }; - IEnumerator IEnumerable.GetEnumerator() => _switches.GetEnumerator(); IEnumerator IEnumerable.GetEnumerator() => _switches.GetEnumerator(); diff --git a/src/Mvc/Mvc.Core/test/CreatedAtActionResultTests.cs b/src/Mvc/Mvc.Core/test/CreatedAtActionResultTests.cs index 0088dadf49..cad29a3043 100644 --- a/src/Mvc/Mvc.Core/test/CreatedAtActionResultTests.cs +++ b/src/Mvc/Mvc.Core/test/CreatedAtActionResultTests.cs @@ -91,7 +91,7 @@ namespace Microsoft.AspNetCore.Mvc { var options = Options.Create(new MvcOptions()); options.Value.OutputFormatters.Add(new StringOutputFormatter()); - options.Value.OutputFormatters.Add(new SystemTextJsonOutputFormatter(new MvcOptions())); + options.Value.OutputFormatters.Add(new SystemTextJsonOutputFormatter(new JsonOptions())); var services = new ServiceCollection(); services.AddSingleton>(new ObjectResultExecutor( diff --git a/src/Mvc/Mvc.Core/test/CreatedAtRouteResultTests.cs b/src/Mvc/Mvc.Core/test/CreatedAtRouteResultTests.cs index 8299923176..65410977a0 100644 --- a/src/Mvc/Mvc.Core/test/CreatedAtRouteResultTests.cs +++ b/src/Mvc/Mvc.Core/test/CreatedAtRouteResultTests.cs @@ -104,7 +104,7 @@ namespace Microsoft.AspNetCore.Mvc { var options = Options.Create(new MvcOptions()); options.Value.OutputFormatters.Add(new StringOutputFormatter()); - options.Value.OutputFormatters.Add(new SystemTextJsonOutputFormatter(new MvcOptions())); + options.Value.OutputFormatters.Add(new SystemTextJsonOutputFormatter(new JsonOptions())); var services = new ServiceCollection(); services.AddSingleton>(new ObjectResultExecutor( diff --git a/src/Mvc/Mvc.Core/test/CreatedResultTests.cs b/src/Mvc/Mvc.Core/test/CreatedResultTests.cs index 8d984ec7be..6d3eefc85b 100644 --- a/src/Mvc/Mvc.Core/test/CreatedResultTests.cs +++ b/src/Mvc/Mvc.Core/test/CreatedResultTests.cs @@ -92,7 +92,7 @@ namespace Microsoft.AspNetCore.Mvc { var options = Options.Create(new MvcOptions()); options.Value.OutputFormatters.Add(new StringOutputFormatter()); - options.Value.OutputFormatters.Add(new SystemTextJsonOutputFormatter(new MvcOptions())); + options.Value.OutputFormatters.Add(new SystemTextJsonOutputFormatter(new JsonOptions())); var services = new ServiceCollection(); services.AddSingleton>(new ObjectResultExecutor( diff --git a/src/Mvc/Mvc.Core/test/Formatters/FormatFilterTest.cs b/src/Mvc/Mvc.Core/test/Formatters/FormatFilterTest.cs index bb8da19ae2..fea2967990 100644 --- a/src/Mvc/Mvc.Core/test/Formatters/FormatFilterTest.cs +++ b/src/Mvc/Mvc.Core/test/Formatters/FormatFilterTest.cs @@ -465,7 +465,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters // Set up default output formatters. MvcOptions.OutputFormatters.Add(new HttpNoContentOutputFormatter()); MvcOptions.OutputFormatters.Add(new StringOutputFormatter()); - MvcOptions.OutputFormatters.Add(new SystemTextJsonOutputFormatter(new MvcOptions())); + MvcOptions.OutputFormatters.Add(new SystemTextJsonOutputFormatter(new JsonOptions())); // Set up default mapping for json extensions to content type MvcOptions.FormatterMappings.SetMediaTypeMappingForFormat( diff --git a/src/Mvc/Mvc.Core/test/Formatters/SystemTextJsonInputFormatterTest.cs b/src/Mvc/Mvc.Core/test/Formatters/SystemTextJsonInputFormatterTest.cs index 020c357961..8cea7ff821 100644 --- a/src/Mvc/Mvc.Core/test/Formatters/SystemTextJsonInputFormatterTest.cs +++ b/src/Mvc/Mvc.Core/test/Formatters/SystemTextJsonInputFormatterTest.cs @@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters protected override TextInputFormatter GetInputFormatter() { - return new SystemTextJsonInputFormatter(new MvcOptions()); + return new SystemTextJsonInputFormatter(new JsonOptions()); } } } diff --git a/src/Mvc/Mvc.Core/test/Formatters/SystemTextJsonOutputFormatterTest.cs b/src/Mvc/Mvc.Core/test/Formatters/SystemTextJsonOutputFormatterTest.cs index edd5d64f2c..0a3d90e18b 100644 --- a/src/Mvc/Mvc.Core/test/Formatters/SystemTextJsonOutputFormatterTest.cs +++ b/src/Mvc/Mvc.Core/test/Formatters/SystemTextJsonOutputFormatterTest.cs @@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters { protected override TextOutputFormatter GetOutputFormatter() { - return new SystemTextJsonOutputFormatter(new MvcOptions()); + return new SystemTextJsonOutputFormatter(new JsonOptions()); } [Theory] diff --git a/src/Mvc/Mvc.Core/test/HttpNotFoundObjectResultTest.cs b/src/Mvc/Mvc.Core/test/HttpNotFoundObjectResultTest.cs index 58d6abb3f1..498a12c57a 100644 --- a/src/Mvc/Mvc.Core/test/HttpNotFoundObjectResultTest.cs +++ b/src/Mvc/Mvc.Core/test/HttpNotFoundObjectResultTest.cs @@ -69,7 +69,7 @@ namespace Microsoft.AspNetCore.Mvc { var options = Options.Create(new MvcOptions()); options.Value.OutputFormatters.Add(new StringOutputFormatter()); - options.Value.OutputFormatters.Add(new SystemTextJsonOutputFormatter(new MvcOptions())); + options.Value.OutputFormatters.Add(new SystemTextJsonOutputFormatter(new JsonOptions())); var services = new ServiceCollection(); services.AddSingleton>(new ObjectResultExecutor( diff --git a/src/Mvc/Mvc.Core/test/HttpOkObjectResultTest.cs b/src/Mvc/Mvc.Core/test/HttpOkObjectResultTest.cs index 0c29f4d541..13f5572c4e 100644 --- a/src/Mvc/Mvc.Core/test/HttpOkObjectResultTest.cs +++ b/src/Mvc/Mvc.Core/test/HttpOkObjectResultTest.cs @@ -70,7 +70,7 @@ namespace Microsoft.AspNetCore.Mvc { var options = Options.Create(new MvcOptions()); options.Value.OutputFormatters.Add(new StringOutputFormatter()); - options.Value.OutputFormatters.Add(new SystemTextJsonOutputFormatter(new MvcOptions())); + options.Value.OutputFormatters.Add(new SystemTextJsonOutputFormatter(new JsonOptions())); var services = new ServiceCollection(); services.AddSingleton>(new ObjectResultExecutor( diff --git a/src/Mvc/Mvc.Core/test/Infrastructure/SystemTextJsonResultExecutorTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/SystemTextJsonResultExecutorTest.cs index 3467dc72a6..062d5d1227 100644 --- a/src/Mvc/Mvc.Core/test/Infrastructure/SystemTextJsonResultExecutorTest.cs +++ b/src/Mvc/Mvc.Core/test/Infrastructure/SystemTextJsonResultExecutorTest.cs @@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure { protected override IActionResultExecutor CreateExecutor(ILoggerFactory loggerFactory) { - return new SystemTextJsonResultExecutor(Options.Create(new MvcOptions()), loggerFactory.CreateLogger()); + return new SystemTextJsonResultExecutor(Options.Create(new JsonOptions()), loggerFactory.CreateLogger()); } protected override object GetIndentedSettings() diff --git a/src/Mvc/Mvc.Core/test/ModelBinding/EnumerableValueProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/EnumerableValueProviderTest.cs index 6d586a80d9..582dd6017d 100644 --- a/src/Mvc/Mvc.Core/test/ModelBinding/EnumerableValueProviderTest.cs +++ b/src/Mvc/Mvc.Core/test/ModelBinding/EnumerableValueProviderTest.cs @@ -219,7 +219,6 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding // Assert Assert.Equal(new[] { null, null, "value" }, result.Values); - Assert.Equal(",,value", (string)result); } [Fact] diff --git a/src/Mvc/Mvc.DataAnnotations/src/DataAnnotationsMetadataProvider.cs b/src/Mvc/Mvc.DataAnnotations/src/DataAnnotationsMetadataProvider.cs index 9ffa816a5b..1299d6f778 100644 --- a/src/Mvc/Mvc.DataAnnotations/src/DataAnnotationsMetadataProvider.cs +++ b/src/Mvc/Mvc.DataAnnotations/src/DataAnnotationsMetadataProvider.cs @@ -23,11 +23,17 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations IDisplayMetadataProvider, IValidationMetadataProvider { + // The [Nullable] attribute is synthesized by the compiler. It's best to just compare the type name. + private const string NullableAttributeFullTypeName = "System.Runtime.CompilerServices.NullableAttribute"; + private const string NullableFlagsFieldName = "NullableFlags"; + private readonly IStringLocalizerFactory _stringLocalizerFactory; + private readonly MvcOptions _options; private readonly MvcDataAnnotationsLocalizationOptions _localizationOptions; public DataAnnotationsMetadataProvider( - IOptions options, + MvcOptions options, + IOptions localizationOptions, IStringLocalizerFactory stringLocalizerFactory) { if (options == null) @@ -35,7 +41,13 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations throw new ArgumentNullException(nameof(options)); } - _localizationOptions = options.Value; + if (localizationOptions == null) + { + throw new ArgumentNullException(nameof(localizationOptions)); + } + + _options = options; + _localizationOptions = localizationOptions.Value; _stringLocalizerFactory = stringLocalizerFactory; } @@ -328,6 +340,29 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations // RequiredAttribute marks a property as required by validation - this means that it // must have a non-null value on the model during validation. var requiredAttribute = attributes.OfType().FirstOrDefault(); + + // For non-nullable reference types, treat them as-if they had an implicit [Required]. + // This allows the developer to specify [Required] to customize the error message, so + // if they already have [Required] then there's no need for us to do this check. + if (!_options.SuppressImplicitRequiredAttributeForNonNullableReferenceTypes && + requiredAttribute == null && + !context.Key.ModelType.IsValueType && + + // Look specifically at attributes on the property/parameter. [Nullable] on + // the type has a different meaning. + IsNonNullable(context.ParameterAttributes ?? context.PropertyAttributes ?? Array.Empty())) + { + // Since this behavior specifically relates to non-null-ness, we will use the non-default + // option to tolerate empty/whitespace strings. empty/whitespace INPUT will still result in + // a validation error by default because we convert empty/whitespace strings to null + // unless you say otherwise. + requiredAttribute = new RequiredAttribute() + { + AllowEmptyStrings = true, + }; + attributes.Add(requiredAttribute); + } + if (requiredAttribute != null) { context.ValidationMetadata.IsRequired = true; @@ -380,5 +415,35 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations return string.Empty; } + + // Internal for testing + internal static bool IsNonNullable(IEnumerable attributes) + { + // [Nullable] is compiler synthesized, comparing by name. + var nullableAttribute = attributes + .Where(a => string.Equals(a.GetType().FullName, NullableAttributeFullTypeName, StringComparison.Ordinal)) + .FirstOrDefault(); + if (nullableAttribute == null) + { + return false; + } + + // We don't handle cases where generics and NNRT are used. This runs into a + // fundamental limitation of ModelMetadata - we use a single Type and Property/Parameter + // to look up the metadata. However when generics are involved and NNRT is in use + // the distance between the [Nullable] and member we're looking at is potentially + // unbounded. + // + // See: https://github.com/dotnet/roslyn/blob/master/docs/features/nullable-reference-types.md#annotations + if (nullableAttribute.GetType().GetField(NullableFlagsFieldName) is FieldInfo field && + field.GetValue(nullableAttribute) is byte[] flags && + flags.Length >= 0 && + flags[0] == 1) // First element is the property/parameter type. + { + return true; + } + + return false; + } } } diff --git a/src/Mvc/Mvc.DataAnnotations/src/DependencyInjection/MvcDataAnnotationsMvcOptionsSetup.cs b/src/Mvc/Mvc.DataAnnotations/src/DependencyInjection/MvcDataAnnotationsMvcOptionsSetup.cs index f43d3cca66..1de8755e97 100644 --- a/src/Mvc/Mvc.DataAnnotations/src/DependencyInjection/MvcDataAnnotationsMvcOptionsSetup.cs +++ b/src/Mvc/Mvc.DataAnnotations/src/DependencyInjection/MvcDataAnnotationsMvcOptionsSetup.cs @@ -53,6 +53,7 @@ namespace Microsoft.Extensions.DependencyInjection } options.ModelMetadataDetailsProviders.Add(new DataAnnotationsMetadataProvider( + options, _dataAnnotationLocalizationOptions, _stringLocalizerFactory)); diff --git a/src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsMetadataProviderTest.cs b/src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsMetadataProviderTest.cs index 58516c4b6b..e3fa20042a 100644 --- a/src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsMetadataProviderTest.cs +++ b/src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsMetadataProviderTest.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Globalization; +using System.Linq; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata; using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; @@ -90,9 +91,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations object expected) { // Arrange - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory: null); + var provider = CreateProvider(); var key = ModelMetadataIdentity.ForType(typeof(string)); var context = new DisplayMetadataProviderContext(key, GetModelAttributes(new object[] { attribute })); @@ -109,9 +108,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations public void CreateDisplayMetadata_FindsDisplayFormat_FromDataType() { // Arrange - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory: null); + var provider = CreateProvider(); var dataType = new DataTypeAttribute(DataType.Currency); var displayFormat = dataType.DisplayFormat; // Non-null for DataType.Currency. @@ -131,9 +128,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations public void CreateDisplayMetadata_FindsDisplayFormat_OverridingDataType() { // Arrange - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory: null); + var provider = CreateProvider(); var dataType = new DataTypeAttribute(DataType.Time); // Has a non-null DisplayFormat. var displayFormat = new DisplayFormatAttribute() // But these values override the values from DataType @@ -156,9 +151,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations public void CreateBindingMetadata_EditableAttributeFalse_SetsReadOnlyTrue() { // Arrange - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory: null); + var provider = CreateProvider(); var editable = new EditableAttribute(allowEdit: false); @@ -177,9 +170,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations public void CreateBindingMetadata_EditableAttributeTrue_SetsReadOnlyFalse() { // Arrange - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory: null); + var provider = CreateProvider(); var editable = new EditableAttribute(allowEdit: true); @@ -198,11 +189,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations public void CreateDisplayMetadata_DisplayAttribute_OverridesDisplayNameAttribute() { // Arrange - var localizationOptions = Options.Create(new MvcDataAnnotationsLocalizationOptions()); - - var provider = new DataAnnotationsMetadataProvider( - localizationOptions, - stringLocalizerFactory: null); + var provider = CreateProvider(); var displayName = new DisplayNameAttribute("DisplayNameAttributeValue"); var display = new DisplayAttribute() @@ -225,11 +212,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations public void CreateDisplayMetadata_DisplayAttribute_OverridesDisplayNameAttribute_IfNameEmpty() { // Arrange - var localizationOptions = Options.Create(new MvcDataAnnotationsLocalizationOptions()); - - var provider = new DataAnnotationsMetadataProvider( - localizationOptions, - stringLocalizerFactory: null); + var provider = CreateProvider(); var displayName = new DisplayNameAttribute("DisplayNameAttributeValue"); var display = new DisplayAttribute() @@ -252,11 +235,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations public void CreateDisplayMetadata_DisplayAttribute_DoesNotOverrideDisplayNameAttribute_IfNameNull() { // Arrange - var localizationOptions = Options.Create(new MvcDataAnnotationsLocalizationOptions()); - - var provider = new DataAnnotationsMetadataProvider( - localizationOptions, - stringLocalizerFactory: null); + var provider = CreateProvider(); var displayName = new DisplayNameAttribute("DisplayNameAttributeValue"); var display = new DisplayAttribute() @@ -289,15 +268,13 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations .Setup(s => s.Create(typeof(EmptyClass))) .Returns(() => sharedLocalizer.Object); - var localizationOptions = Options.Create(new MvcDataAnnotationsLocalizationOptions()); - localizationOptions.Value.DataAnnotationLocalizerProvider = (type, stringLocalizerFactory) => + var localizationOptions = new MvcDataAnnotationsLocalizationOptions(); + localizationOptions.DataAnnotationLocalizerProvider = (type, stringLocalizerFactory) => { return stringLocalizerFactory.Create(typeof(EmptyClass)); }; - var provider = new DataAnnotationsMetadataProvider( - localizationOptions, - stringLocalizerFactory: stringLocalizerFactoryMock.Object); + var provider = CreateProvider(options: null, localizationOptions, stringLocalizerFactoryMock.Object); var displayName = new DisplayNameAttribute("DisplayNameValue"); @@ -329,15 +306,13 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations .Setup(s => s.Create(typeof(EmptyClass))) .Returns(() => sharedLocalizer.Object); - var localizationOptions = Options.Create(new MvcDataAnnotationsLocalizationOptions()); - localizationOptions.Value.DataAnnotationLocalizerProvider = (type, stringLocalizerFactory) => + var localizationOptions = new MvcDataAnnotationsLocalizationOptions(); + localizationOptions.DataAnnotationLocalizerProvider = (type, stringLocalizerFactory) => { return stringLocalizerFactory.Create(typeof(EmptyClass)); }; - var provider = new DataAnnotationsMetadataProvider( - localizationOptions, - stringLocalizerFactory: stringLocalizerFactoryMock.Object); + var provider = CreateProvider(options: null, localizationOptions, stringLocalizerFactoryMock.Object); var displayName = new DisplayNameAttribute("DisplayNameValue"); @@ -363,15 +338,15 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations .Setup(s => s.Create(typeof(EmptyClass))) .Returns(() => sharedLocalizer.Object); - var options = Options.Create(new MvcDataAnnotationsLocalizationOptions()); + var localizationOptions = new MvcDataAnnotationsLocalizationOptions(); var dataAnnotationLocalizerProviderWasUsed = false; - options.Value.DataAnnotationLocalizerProvider = (type, stringLocalizerFactory) => + localizationOptions.DataAnnotationLocalizerProvider = (type, stringLocalizerFactory) => { dataAnnotationLocalizerProviderWasUsed = true; return stringLocalizerFactory.Create(typeof(EmptyClass)); }; - var provider = new DataAnnotationsMetadataProvider(options, stringLocalizerFactoryMock.Object); + var provider = CreateProvider(options: null, localizationOptions, stringLocalizerFactoryMock.Object); var display = new DisplayAttribute() { @@ -395,9 +370,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations public void CreateDisplayMetadata_DisplayAttribute_NameFromResources_NullLocalizer() { // Arrange - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory: null); + var provider = CreateProvider(); var display = new DisplayAttribute() { @@ -432,9 +405,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations stringLocalizerFactory .Setup(s => s.Create(It.IsAny())) .Returns(() => stringLocalizer.Object); - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory.Object); + var provider = CreateProvider(stringLocalizerFactory: stringLocalizerFactory.Object); var display = new DisplayAttribute() { @@ -469,9 +440,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations stringLocalizerFactory .Setup(s => s.Create(It.IsAny())) .Returns(() => stringLocalizer.Object); - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory.Object); + var provider = CreateProvider(stringLocalizerFactory: stringLocalizerFactory.Object); var display = new DisplayAttribute() { @@ -500,9 +469,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations public void CreateDisplayMetadata_DisplayAttribute_DescriptionFromResources_NullLocalizer() { // Arrange - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory: null); + var provider = CreateProvider(); var display = new DisplayAttribute() { @@ -537,9 +504,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations stringLocalizerFactory .Setup(s => s.Create(It.IsAny())) .Returns(() => stringLocalizer.Object); - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory.Object); + var provider = CreateProvider(stringLocalizerFactory: stringLocalizerFactory.Object); var display = new DisplayAttribute() { @@ -568,9 +533,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations public void CreateDisplayMetadata_DisplayAttribute_PromptFromResources_NullLocalizer() { // Arrange - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory: null); + var provider = CreateProvider(); var display = new DisplayAttribute() { @@ -613,13 +576,13 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations stringLocalizerFactoryMock .Setup(f => f.Create(It.IsAny())) .Returns(stringLocalizer.Object); - var options = Options.Create(new MvcDataAnnotationsLocalizationOptions()); - options.Value.DataAnnotationLocalizerProvider = (type, stringLocalizerFactory) => + var localizationOptions = new MvcDataAnnotationsLocalizationOptions(); + localizationOptions.DataAnnotationLocalizerProvider = (type, stringLocalizerFactory) => { return stringLocalizerFactory.Create(type); }; - var provider = new DataAnnotationsMetadataProvider(options, stringLocalizerFactoryMock.Object); + var provider = CreateProvider(options: null, localizationOptions, stringLocalizerFactoryMock.Object); var display = new DisplayAttribute() { @@ -671,9 +634,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations public void CreateDisplayMetadata_IsEnum_ReflectsModelType(Type type, bool expectedIsEnum) { // Arrange - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory: null); + var provider = CreateProvider(); var key = ModelMetadataIdentity.ForType(type); var attributes = new object[0]; @@ -707,9 +668,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations public void CreateDisplayMetadata_IsFlagsEnum_ReflectsModelType(Type type, bool expectedIsFlagsEnum) { // Arrange - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory: null); + var provider = CreateProvider(); var key = ModelMetadataIdentity.ForType(type); var attributes = new object[0]; @@ -841,9 +800,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations IReadOnlyDictionary expectedDictionary) { // Arrange - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory: null); + var provider = CreateProvider(); var key = ModelMetadataIdentity.ForType(type); var attributes = new object[0]; @@ -887,9 +844,9 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations .Setup(f => f.Create(It.IsAny())) .Returns(stringLocalizer.Object); - var options = Options.Create(new MvcDataAnnotationsLocalizationOptions()); - options.Value.DataAnnotationLocalizerProvider = (modelType, stringLocalizerFactory) => stringLocalizerFactory.Create(modelType); - var provider = new DataAnnotationsMetadataProvider(options, stringLocalizerFactoryMock.Object); + var localizationOptions = new MvcDataAnnotationsLocalizationOptions(); + localizationOptions.DataAnnotationLocalizerProvider = (modelType, stringLocalizerFactory) => stringLocalizerFactory.Create(modelType); + var provider = CreateProvider(options: null, localizationOptions, stringLocalizerFactoryMock.Object); // Act provider.CreateDisplayMetadata(context); @@ -1021,9 +978,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations IEnumerable> expectedKeyValuePairs) { // Arrange - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory: null); + var provider = CreateProvider(); var key = ModelMetadataIdentity.ForType(type); var attributes = new object[0]; @@ -1051,9 +1006,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations new KeyValuePair(new EnumGroupAndName(string.Empty, nameof(EnumWithDisplayOrder.Null)), "3"), }; - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory: null); + var provider = CreateProvider(); var key = ModelMetadataIdentity.ForType(typeof(EnumWithDisplayOrder)); var attributes = new object[0]; @@ -1153,9 +1106,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations public void CreateValidationMetadata_RequiredAttribute_SetsIsRequiredToTrue() { // Arrange - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory: null); + var provider = CreateProvider(); var required = new RequiredAttribute(); @@ -1177,9 +1128,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations public void CreateValidationMetadata_NoRequiredAttribute_IsRequiredLeftAlone(bool? initialValue) { // Arrange - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory: null); + var provider = CreateProvider(); var attributes = new Attribute[] { }; var key = ModelMetadataIdentity.ForProperty(typeof(int), "Length", typeof(string)); @@ -1193,13 +1142,83 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations Assert.Equal(initialValue, context.ValidationMetadata.IsRequired); } + [Fact] + public void CreateValidationMetadata_InfersRequiredAttribute_NoNonNullableProperty() + { + // Arrange + var provider = CreateProvider(); + + var attributes = ModelAttributes.GetAttributesForProperty( + typeof(NullableReferenceTypes), + typeof(NullableReferenceTypes).GetProperty(nameof(NullableReferenceTypes.NonNullableReferenceType))); + var key = ModelMetadataIdentity.ForProperty( + typeof(NullableReferenceTypes), + nameof(NullableReferenceTypes.NonNullableReferenceType), typeof(string)); + var context = new ValidationMetadataProviderContext(key, attributes); + + // Act + provider.CreateValidationMetadata(context); + + // Assert + Assert.True(context.ValidationMetadata.IsRequired); + var attribute = Assert.Single(context.ValidationMetadata.ValidatorMetadata, m => m is RequiredAttribute); + Assert.True(((RequiredAttribute)attribute).AllowEmptyStrings); // non-Default for [Required] + } + + [Fact] + public void CreateValidationMetadata_InfersRequiredAttribute_NoNonNullableProperty_PrefersExistingRequiredAttribute() + { + // Arrange + var provider = CreateProvider(); + + var attributes = ModelAttributes.GetAttributesForProperty( + typeof(NullableReferenceTypes), + typeof(NullableReferenceTypes).GetProperty(nameof(NullableReferenceTypes.NonNullableReferenceTypeWithRequired))); + var key = ModelMetadataIdentity.ForProperty( + typeof(NullableReferenceTypes), + nameof(NullableReferenceTypes.NonNullableReferenceTypeWithRequired), typeof(string)); + var context = new ValidationMetadataProviderContext(key, attributes); + + // Act + provider.CreateValidationMetadata(context); + + // Assert + Assert.True(context.ValidationMetadata.IsRequired); + var attribute = Assert.Single(context.ValidationMetadata.ValidatorMetadata, m => m is RequiredAttribute a); + Assert.Equal("Test", ((RequiredAttribute)attribute).ErrorMessage); + Assert.False(((RequiredAttribute)attribute).AllowEmptyStrings); // Default for [Required] + } + + [Fact] + public void CreateValidationMetadata_SuppressRequiredInference_Noops() + { + // Arrange + var provider = CreateProvider(options: new MvcOptions() + { + SuppressImplicitRequiredAttributeForNonNullableReferenceTypes = true, + }); + + var attributes = ModelAttributes.GetAttributesForProperty( + typeof(NullableReferenceTypes), + typeof(NullableReferenceTypes).GetProperty(nameof(NullableReferenceTypes.NonNullableReferenceType))); + var key = ModelMetadataIdentity.ForProperty( + typeof(NullableReferenceTypes), + nameof(NullableReferenceTypes.NonNullableReferenceType), typeof(string)); + var context = new ValidationMetadataProviderContext(key, attributes); + + // Act + provider.CreateValidationMetadata(context); + + // Assert + Assert.Null(context.ValidationMetadata.IsRequired); + Assert.DoesNotContain(context.ValidationMetadata.ValidatorMetadata, m => m is RequiredAttribute); + } + [Fact] public void CreateValidationMetadata_WillAddValidationAttributes_From_ValidationProviderAttribute() { // Arrange - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory: null); + var provider = CreateProvider(); var validationProviderAttribute = new FooCompositeValidationAttribute( attributes: new List { @@ -1232,9 +1251,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations public void CreateBindingMetadata_RequiredAttribute_IsBindingRequiredLeftAlone(bool initialValue) { // Arrange - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory: null); + var provider = CreateProvider(); var attributes = new Attribute[] { new RequiredAttribute() }; var key = ModelMetadataIdentity.ForProperty(typeof(int), "Length", typeof(string)); @@ -1255,9 +1272,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations public void CreateBindingDetails_NoEditableAttribute_IsReadOnlyLeftAlone(bool? initialValue) { // Arrange - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory: null); + var provider = CreateProvider(); var attributes = new Attribute[] { }; var key = ModelMetadataIdentity.ForProperty(typeof(int), "Length", typeof(string)); @@ -1275,9 +1290,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations public void CreateValidationDetails_ValidatableObject_ReturnsObject() { // Arrange - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory: null); + var provider = CreateProvider(); var attribute = new TestValidationAttribute(); var attributes = new Attribute[] { attribute }; @@ -1296,9 +1309,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations public void CreateValidationDetails_ValidatableObject_AlreadyInContext_Ignores() { // Arrange - var provider = new DataAnnotationsMetadataProvider( - Options.Create(new MvcDataAnnotationsLocalizationOptions()), - stringLocalizerFactory: null); + var provider = CreateProvider(); var attribute = new TestValidationAttribute(); var attributes = new Attribute[] { attribute }; @@ -1314,6 +1325,64 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations Assert.Same(attribute, validatorMetadata); } + [Fact] + public void IsNonNullable_FindsNonNullableProperty() + { + // Arrange + var type = typeof(NullableReferenceTypes); + var property = type.GetProperty(nameof(NullableReferenceTypes.NonNullableReferenceType)); + + // Act + var result = DataAnnotationsMetadataProvider.IsNonNullable(property.GetCustomAttributes(inherit: true)); + + // Assert + Assert.True(result); + } + + [Fact] + public void IsNonNullable_FindsNullableProperty() + { + // Arrange + var type = typeof(NullableReferenceTypes); + var property = type.GetProperty(nameof(NullableReferenceTypes.NullableReferenceType)); + + // Act + var result = DataAnnotationsMetadataProvider.IsNonNullable(property.GetCustomAttributes(inherit: true)); + + // Assert + Assert.False(result); + } + + [Fact] + public void IsNonNullable_FindsNonNullableParameter() + { + // Arrange + var type = typeof(NullableReferenceTypes); + var method = type.GetMethod(nameof(NullableReferenceTypes.Method)); + var parameter = method.GetParameters().Where(p => p.Name == "nonNullableParameter").Single(); + + // Act + var result = DataAnnotationsMetadataProvider.IsNonNullable(parameter.GetCustomAttributes(inherit: true)); + + // Assert + Assert.True(result); + } + + [Fact] + public void IsNonNullable_FindsNullableParameter() + { + // Arrange + var type = typeof(NullableReferenceTypes); + var method = type.GetMethod(nameof(NullableReferenceTypes.Method)); + var parameter = method.GetParameters().Where(p => p.Name == "nullableParameter").Single(); + + // Act + var result = DataAnnotationsMetadataProvider.IsNonNullable(parameter.GetCustomAttributes(inherit: true)); + + // Assert + Assert.False(result); + } + private IEnumerable> GetLocalizedEnumGroupedDisplayNamesAndValues( bool useStringLocalizer) { @@ -1328,6 +1397,17 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations return context.DisplayMetadata.EnumGroupedDisplayNamesAndValues; } + private DataAnnotationsMetadataProvider CreateProvider( + MvcOptions options = null, + MvcDataAnnotationsLocalizationOptions localizationOptions = null, + IStringLocalizerFactory stringLocalizerFactory = null) + { + return new DataAnnotationsMetadataProvider( + options ?? new MvcOptions(), + Options.Create(localizationOptions ?? new MvcDataAnnotationsLocalizationOptions()), + stringLocalizerFactory); + } + private DataAnnotationsMetadataProvider CreateIStringLocalizerProvider(bool useStringLocalizer) { var stringLocalizer = new Mock(MockBehavior.Strict); @@ -1343,12 +1423,10 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations .Setup(factory => factory.Create(typeof(EnumWithLocalizedDisplayNames))) .Returns(stringLocalizer.Object); - var options = Options.Create(new MvcDataAnnotationsLocalizationOptions()); - options.Value.DataAnnotationLocalizerProvider = (modelType, localizerFactory) => localizerFactory.Create(modelType); + var localizationOptions = new MvcDataAnnotationsLocalizationOptions(); + localizationOptions.DataAnnotationLocalizerProvider = (modelType, localizerFactory) => localizerFactory.Create(modelType); - return new DataAnnotationsMetadataProvider( - options, - useStringLocalizer ? stringLocalizerFactory.Object : null); + return CreateProvider(options: null, localizationOptions, useStringLocalizer ? stringLocalizerFactory.Object : null); } private ModelAttributes GetModelAttributes(IEnumerable typeAttributes) @@ -1532,5 +1610,21 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations return _attributes; } } + +#nullable enable + private class NullableReferenceTypes + { + public string NonNullableReferenceType { get; set; } = default!; + + [Required(ErrorMessage = "Test")] + public string NonNullableReferenceTypeWithRequired { get; set; } = default!; + + public string? NullableReferenceType { get; set; } = default!; + + public void Method(string nonNullableParameter, string? nullableParameter) + { + } + } +#nullable restore } } diff --git a/src/Mvc/Mvc.DataAnnotations/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj b/src/Mvc/Mvc.DataAnnotations/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj index e841d748dd..c205a676cd 100644 --- a/src/Mvc/Mvc.DataAnnotations/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj +++ b/src/Mvc/Mvc.DataAnnotations/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj @@ -2,6 +2,7 @@ netcoreapp3.0 + false diff --git a/src/Mvc/Mvc.DataAnnotations/test/ModelMetadataProviderTest.cs b/src/Mvc/Mvc.DataAnnotations/test/ModelMetadataProviderTest.cs index a103fefb96..2a40de238d 100644 --- a/src/Mvc/Mvc.DataAnnotations/test/ModelMetadataProviderTest.cs +++ b/src/Mvc/Mvc.DataAnnotations/test/ModelMetadataProviderTest.cs @@ -1052,6 +1052,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations { new DefaultBindingMetadataProvider(), new DataAnnotationsMetadataProvider( + new MvcOptions(), Options.Create(new MvcDataAnnotationsLocalizationOptions()), stringLocalizerFactory: null), }), diff --git a/src/Mvc/Mvc.Localization/test/HtmlLocalizerTest.cs b/src/Mvc/Mvc.Localization/test/HtmlLocalizerTest.cs index 6a6a4ba6a4..64dcfd9c31 100644 --- a/src/Mvc/Mvc.Localization/test/HtmlLocalizerTest.cs +++ b/src/Mvc/Mvc.Localization/test/HtmlLocalizerTest.cs @@ -60,21 +60,21 @@ namespace Microsoft.AspNetCore.Mvc.Localization.Test yield return new object[] { "Bonjour {0} {{{{ }}", new object[] { "test" }, "Bonjour HtmlEncode[[test]] {{ }" }; yield return new object[] { "Bonjour {{0}}", new object[] { "{0}" }, "Bonjour {0}" }; yield return new object[] { "Bonjour {0:x}", new object[] { 10 }, "Bonjour HtmlEncode[[a]]" }; - yield return new object[] { "Bonjour {0:x}}}", new object[] { 10 }, "Bonjour HtmlEncode[[x}]]" }; + yield return new object[] { "Bonjour {0:x}}}", new object[] { 10 }, "Bonjour HtmlEncode[[a]]}" }; yield return new object[] { "Bonjour {{0:x}}", new object[] { 10 }, "Bonjour {0:x}" }; - yield return new object[] { "{{ Bonjour {{{0:x}}}", new object[] { 10 }, "{ Bonjour {HtmlEncode[[x}]]" }; - yield return new object[] { "}} Bonjour {{{0:x}}}", new object[] { 10 }, "} Bonjour {HtmlEncode[[x}]]" }; + yield return new object[] { "{{ Bonjour {{{0:x}}}", new object[] { 10 }, "{ Bonjour {HtmlEncode[[a]]}" }; + yield return new object[] { "}} Bonjour {{{0:x}}}", new object[] { 10 }, "} Bonjour {HtmlEncode[[a]]}" }; yield return new object[] { "}} Bonjour", new object[] { }, "} Bonjour" }; yield return new object[] { "{{ {0} }}", new object[] { 10 }, "{ HtmlEncode[[10]] }" }; yield return new object[] { "Bonjour {{{0:x}}} {1:yyyy}", new object[] { 10, new DateTime(2015, 10, 10) }, - "Bonjour {HtmlEncode[[x}]] HtmlEncode[[2015]]" + "Bonjour {HtmlEncode[[a]]} HtmlEncode[[2015]]" }; yield return new object[] { "Bonjour {{{0:x}}} Bienvenue {{1:yyyy}}", new object[] { 10, new DateTime(2015, 10, 10) }, - "Bonjour {HtmlEncode[[x}]] Bienvenue {1:yyyy}" + "Bonjour {HtmlEncode[[a]]} Bienvenue {1:yyyy}" }; yield return new object[] { // padding happens after encoding "Bonjour {0,6} Bienvenue {{1:yyyy}}", @@ -86,11 +86,11 @@ namespace Microsoft.AspNetCore.Mvc.Localization.Test new object[] { 10, new DateTime(2015, 10, 10) }, "Bonjour HtmlEncode[[10]] Bienvenue {1:yyyy}" }; - yield return new object[] { "{0:{{000}}}", new object[] { 10 }, "HtmlEncode[[{010}]]" }; + yield return new object[] { "{0:000}", new object[] { 10 }, "HtmlEncode[[010]]" }; yield return new object[] { - "Bonjour {0:'{{characters that should be escaped}}b'###'b'}", + "Bonjour {0:'characters that should be escaped b'###'b'}", new object[] { 10 }, - "Bonjour HtmlEncode[[{characters that should be escaped}b10b]]" + "Bonjour HtmlEncode[[characters that should be escaped b10b]]" }; } } diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/build/netcoreapp3.0/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.targets b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/build/netcoreapp3.0/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.targets index 506e12c735..f12a646391 100644 --- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/build/netcoreapp3.0/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.targets +++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/build/netcoreapp3.0/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.targets @@ -5,5 +5,10 @@ true + + + $(RazorUpToDateReloadFileTypes.Replace('.cshtml', '')) + + false diff --git a/src/Mvc/Mvc.Testing/ref/Microsoft.AspNetCore.Mvc.Testing.netcoreapp3.0.cs b/src/Mvc/Mvc.Testing/ref/Microsoft.AspNetCore.Mvc.Testing.netcoreapp3.0.cs index 069eae8180..01c33165e6 100644 --- a/src/Mvc/Mvc.Testing/ref/Microsoft.AspNetCore.Mvc.Testing.netcoreapp3.0.cs +++ b/src/Mvc/Mvc.Testing/ref/Microsoft.AspNetCore.Mvc.Testing.netcoreapp3.0.cs @@ -39,6 +39,7 @@ namespace Microsoft.AspNetCore.Mvc.Testing protected virtual Microsoft.AspNetCore.Hosting.IWebHostBuilder CreateWebHostBuilder() { throw null; } public void Dispose() { } protected virtual void Dispose(bool disposing) { } + public virtual void EnsureDatabaseCreated() { } ~WebApplicationFactory() { } protected virtual System.Collections.Generic.IEnumerable GetTestAssemblies() { throw null; } public Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory WithWebHostBuilder(System.Action configuration) { throw null; } diff --git a/src/Mvc/Mvc.Testing/src/WebApplicationFactory.cs b/src/Mvc/Mvc.Testing/src/WebApplicationFactory.cs index d9d9072cb9..43e8b90f9a 100644 --- a/src/Mvc/Mvc.Testing/src/WebApplicationFactory.cs +++ b/src/Mvc/Mvc.Testing/src/WebApplicationFactory.cs @@ -162,6 +162,12 @@ namespace Microsoft.AspNetCore.Mvc.Testing SetContentRoot(builder); _configuration(builder); _server = CreateServer(builder); + + EnsureDatabaseCreated(); + } + + public virtual void EnsureDatabaseCreated() + { } private void SetContentRoot(IWebHostBuilder builder) diff --git a/src/Mvc/Mvc.ViewFeatures/src/Infrastructure/HttpUriHelper.cs b/src/Mvc/Mvc.ViewFeatures/src/Infrastructure/HttpUriHelper.cs index ccb5e0f37d..8551f41310 100644 --- a/src/Mvc/Mvc.ViewFeatures/src/Infrastructure/HttpUriHelper.cs +++ b/src/Mvc/Mvc.ViewFeatures/src/Infrastructure/HttpUriHelper.cs @@ -10,10 +10,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures { protected override void NavigateToCore(string uri, bool forceLoad) { - // For now throw as we don't have a good way of aborting the request from here. - throw new InvalidOperationException("Navigation commands can not be issued during server-side prerendering because the page has not yet loaded in the browser" + - "Components must wrap any navigation commands in conditional logic to ensure those navigation calls are not " + - "attempted during prerendering."); + throw new NavigationException(uri); } } } diff --git a/src/Mvc/Mvc.ViewFeatures/src/MvcViewFeaturesLoggerExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/MvcViewFeaturesLoggerExtensions.cs index a7e9a492fd..635c3e315d 100644 --- a/src/Mvc/Mvc.ViewFeatures/src/MvcViewFeaturesLoggerExtensions.cs +++ b/src/Mvc/Mvc.ViewFeatures/src/MvcViewFeaturesLoggerExtensions.cs @@ -122,10 +122,12 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures "Skipping the execution of current filter as its not the most effective filter implementing the policy {FilterPolicy}."); } - public static IDisposable ViewComponentScope(this ILogger logger, ViewComponentContext context) +#nullable enable + public static IDisposable? ViewComponentScope(this ILogger logger, ViewComponentContext context) { return logger.BeginScope(new ViewComponentLogScope(context.ViewComponentDescriptor)); } +#nullable restore public static void ViewComponentExecuting( this ILogger logger, diff --git a/src/Mvc/Mvc.ViewFeatures/src/RazorComponents/StaticComponentRenderer.cs b/src/Mvc/Mvc.ViewFeatures/src/RazorComponents/StaticComponentRenderer.cs index 5d63d0def7..f3084ad5be 100644 --- a/src/Mvc/Mvc.ViewFeatures/src/RazorComponents/StaticComponentRenderer.cs +++ b/src/Mvc/Mvc.ViewFeatures/src/RazorComponents/StaticComponentRenderer.cs @@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Rendering; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Extensions; +using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.DependencyInjection; namespace Microsoft.AspNetCore.Mvc.ViewFeatures.RazorComponents @@ -33,9 +34,30 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.RazorComponents InitializeUriHelper(httpContext); using (var htmlRenderer = new HtmlRenderer(httpContext.RequestServices, _encoder.Encode, dispatcher)) { - var result = await dispatcher.InvokeAsync(() => htmlRenderer.RenderComponentAsync( - componentType, - parameters)); + ComponentRenderedText result = default; + try + { + result = await dispatcher.InvokeAsync(() => htmlRenderer.RenderComponentAsync( + componentType, + parameters)); + } + catch (NavigationException navigationException) + { + // Navigation was attempted during prerendering. + if (httpContext.Response.HasStarted) + { + // We can't perform a redirect as the server already started sending the response. + // This is considered an application error as the developer should buffer the response until + // all components have rendered. + throw new InvalidOperationException("A navigation command was attempted during prerendering after the server already started sending the response. " + + "Navigation commands can not be issued during server-side prerendering after the response from the server has started. Applications must buffer the" + + "reponse and avoid using features like FlushAsync() before all components on the page have been rendered to prevent failed navigation commands.", navigationException); + } + + httpContext.Response.Redirect(navigationException.Location); + return Array.Empty(); + } + return result.Tokens; } } diff --git a/src/Mvc/Mvc.ViewFeatures/src/RazorComponents/UnsupportedJavaScriptRuntime.cs b/src/Mvc/Mvc.ViewFeatures/src/RazorComponents/UnsupportedJavaScriptRuntime.cs index 540a2dcb9e..c8093ea464 100644 --- a/src/Mvc/Mvc.ViewFeatures/src/RazorComponents/UnsupportedJavaScriptRuntime.cs +++ b/src/Mvc/Mvc.ViewFeatures/src/RazorComponents/UnsupportedJavaScriptRuntime.cs @@ -13,10 +13,5 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures { throw new InvalidOperationException("JavaScript interop calls cannot be issued during server-side prerendering, because the page has not yet loaded in the browser. Prerendered components must wrap any JavaScript interop calls in conditional logic to ensure those interop calls are not attempted during prerendering."); } - - public void UntrackObjectRef(DotNetObjectRef dotNetObjectRef) - { - throw new InvalidOperationException("JavaScript interop calls cannot be issued during server-side prerendering, because the page has not yet loaded in the browser. Prerendered components must wrap any JavaScript interop calls in conditional logic to ensure those interop calls are not attempted during prerendering."); - } } } diff --git a/src/Mvc/Mvc.ViewFeatures/src/Rendering/SystemTextJsonHelper.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/SystemTextJsonHelper.cs index cff4844c77..8524da0f94 100644 --- a/src/Mvc/Mvc.ViewFeatures/src/Rendering/SystemTextJsonHelper.cs +++ b/src/Mvc/Mvc.ViewFeatures/src/Rendering/SystemTextJsonHelper.cs @@ -10,11 +10,11 @@ namespace Microsoft.AspNetCore.Mvc.Rendering { internal class SystemTextJsonHelper : IJsonHelper { - private readonly MvcOptions _mvcOptions; + private readonly JsonOptions _options; - public SystemTextJsonHelper(IOptions mvcOptions) + public SystemTextJsonHelper(IOptions options) { - _mvcOptions = mvcOptions.Value; + _options = options.Value; } /// @@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Mvc.Rendering { // JsonSerializer always encodes non-ASCII chars, so we do not need // to do anything special with the SerializerOptions - var json = JsonSerializer.ToString(value, _mvcOptions.SerializerOptions); + var json = JsonSerializer.ToString(value, _options.JsonSerializerOptions); return new HtmlString(json); } } diff --git a/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/DefaultViewComponentInvoker.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/DefaultViewComponentInvoker.cs index a7f6fa6617..3fced5a0c9 100644 --- a/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/DefaultViewComponentInvoker.cs +++ b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/DefaultViewComponentInvoker.cs @@ -93,6 +93,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewComponents await result.ExecuteAsync(context); } +#nullable enable private async Task InvokeAsyncCore(ObjectMethodExecutor executor, ViewComponentContext context) { var component = _viewComponentFactory.CreateViewComponent(context); @@ -168,6 +169,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewComponents return viewComponentResult; } } +#nullable restore private static IViewComponentResult CoerceToViewComponentResult(object value) { diff --git a/src/Mvc/Mvc.ViewFeatures/test/HtmlHelperComponentExtensionsTests.cs b/src/Mvc/Mvc.ViewFeatures/test/HtmlHelperComponentExtensionsTests.cs index 7ab98690aa..f2cfc99b7e 100644 --- a/src/Mvc/Mvc.ViewFeatures/test/HtmlHelperComponentExtensionsTests.cs +++ b/src/Mvc/Mvc.ViewFeatures/test/HtmlHelperComponentExtensionsTests.cs @@ -9,10 +9,12 @@ using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.RenderTree; using Microsoft.AspNetCore.Components.Server; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewFeatures.RazorComponents; using Microsoft.Extensions.DependencyInjection; using Microsoft.JSInterop; +using Microsoft.Net.Http.Headers; using Moq; using Xunit; @@ -107,7 +109,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Test } [Fact] - public async Task UriHelperRedirect_ThrowsInvalidOperationException() + public async Task UriHelperRedirect_ThrowsInvalidOperationException_WhenResponseHasAlreadyStarted() { // Arrange var ctx = new DefaultHttpContext(); @@ -116,7 +118,9 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Test ctx.Request.PathBase = "/base"; ctx.Request.Path = "/path"; ctx.Request.QueryString = new QueryString("?query=value"); - + var responseMock = new Mock(); + responseMock.Setup(r => r.HasStarted).Returns(true); + ctx.Features.Set(responseMock.Object); var helper = CreateHelper(ctx); var writer = new StringWriter(); @@ -125,13 +129,36 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Test { RedirectUri = "http://localhost/redirect" })); - - Assert.Equal("Navigation commands can not be issued during server-side prerendering because the page has not yet loaded in the browser" + - "Components must wrap any navigation commands in conditional logic to ensure those navigation calls are not " + - "attempted during prerendering.", + + Assert.Equal("A navigation command was attempted during prerendering after the server already started sending the response. " + + "Navigation commands can not be issued during server-side prerendering after the response from the server has started. Applications must buffer the" + + "reponse and avoid using features like FlushAsync() before all components on the page have been rendered to prevent failed navigation commands.", exception.Message); } + [Fact] + public async Task HtmlHelper_Redirects_WhenComponentNavigates() + { + // Arrange + var ctx = new DefaultHttpContext(); + ctx.Request.Scheme = "http"; + ctx.Request.Host = new HostString("localhost"); + ctx.Request.PathBase = "/base"; + ctx.Request.Path = "/path"; + ctx.Request.QueryString = new QueryString("?query=value"); + var helper = CreateHelper(ctx); + + // Act + await helper.RenderStaticComponentAsync(new + { + RedirectUri = "http://localhost/redirect" + }); + + // Assert + Assert.Equal(302, ctx.Response.StatusCode); + Assert.Equal("http://localhost/redirect", ctx.Response.Headers[HeaderNames.Location]); + } + [Fact] public async Task CanRender_AsyncComponent() { diff --git a/src/Mvc/Mvc.ViewFeatures/test/Rendering/SystemTextJsonHelperTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/SystemTextJsonHelperTest.cs index 4c07e933fd..4550976a40 100644 --- a/src/Mvc/Mvc.ViewFeatures/test/Rendering/SystemTextJsonHelperTest.cs +++ b/src/Mvc/Mvc.ViewFeatures/test/Rendering/SystemTextJsonHelperTest.cs @@ -1,8 +1,6 @@ - -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Text.Json.Serialization; using Microsoft.Extensions.Options; @@ -12,8 +10,8 @@ namespace Microsoft.AspNetCore.Mvc.Rendering { protected override IJsonHelper GetJsonHelper() { - var mvcOptions = new MvcOptions { SerializerOptions = { PropertyNamingPolicy = JsonNamingPolicy.CamelCase } }; - return new SystemTextJsonHelper(Options.Create(mvcOptions)); + var options = new JsonOptions() { JsonSerializerOptions = { PropertyNamingPolicy = JsonNamingPolicy.CamelCase } }; + return new SystemTextJsonHelper(Options.Create(options)); } } } diff --git a/src/Mvc/Mvc.sln b/src/Mvc/Mvc.sln index 14972548a3..eddac1812b 100644 --- a/src/Mvc/Mvc.sln +++ b/src/Mvc/Mvc.sln @@ -167,8 +167,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authen EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Features", "..\Http\Http.Features\src\Microsoft.AspNetCore.Http.Features.csproj", "{C72560B4-C9AC-49EA-B202-89BCD3826EB8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions", "..\Servers\Kestrel\Transport.Abstractions\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj", "{DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor", "..\Razor\Razor\src\Microsoft.AspNetCore.Razor.csproj", "{12D0BEB8-A1C6-4712-8368-83BC65428CA8}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection", "..\DataProtection\DataProtection\src\Microsoft.AspNetCore.DataProtection.csproj", "{CC355676-B7EF-4A0E-9659-BCB50127E850}" @@ -1155,18 +1153,6 @@ Global {C72560B4-C9AC-49EA-B202-89BCD3826EB8}.Release|Mixed Platforms.Build.0 = Release|Any CPU {C72560B4-C9AC-49EA-B202-89BCD3826EB8}.Release|x86.ActiveCfg = Release|Any CPU {C72560B4-C9AC-49EA-B202-89BCD3826EB8}.Release|x86.Build.0 = Release|Any CPU - {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Debug|x86.ActiveCfg = Debug|Any CPU - {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Debug|x86.Build.0 = Debug|Any CPU - {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Release|Any CPU.Build.0 = Release|Any CPU - {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Release|x86.ActiveCfg = Release|Any CPU - {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Release|x86.Build.0 = Release|Any CPU {12D0BEB8-A1C6-4712-8368-83BC65428CA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {12D0BEB8-A1C6-4712-8368-83BC65428CA8}.Debug|Any CPU.Build.0 = Debug|Any CPU {12D0BEB8-A1C6-4712-8368-83BC65428CA8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -1913,7 +1899,6 @@ Global {7DBA484B-BA85-4768-9002-68F49C2D9A86} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} {60FC5D94-2FE1-47B4-BDBA-72611BFD7C90} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} {C72560B4-C9AC-49EA-B202-89BCD3826EB8} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} - {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} {12D0BEB8-A1C6-4712-8368-83BC65428CA8} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} {CC355676-B7EF-4A0E-9659-BCB50127E850} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} {D4ED031D-12F4-4522-BDDA-1D36E0E75D8C} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} diff --git a/src/Mvc/dotnet-getdocument/src/Commands/InvokeCommand.cs b/src/Mvc/dotnet-getdocument/src/Commands/InvokeCommand.cs index 359b173235..52df8b1ae5 100644 --- a/src/Mvc/dotnet-getdocument/src/Commands/InvokeCommand.cs +++ b/src/Mvc/dotnet-getdocument/src/Commands/InvokeCommand.cs @@ -16,155 +16,123 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands { private const string InsideManName = "GetDocument.Insider"; + private readonly ProjectOptions _projectOptions = new ProjectOptions(); private IList _args; - private CommandOption _configuration; - private CommandOption _output; - private CommandOption _project; - private CommandOption _projectExtensionsPath; - private CommandOption _runtime; - private CommandOption _targetFramework; public override void Configure(CommandLineApplication command) { - var options = new ProjectOptions(); - options.Configure(command); - - _configuration = options.Configuration; - _project = options.Project; - _projectExtensionsPath = options.ProjectExtensionsPath; - _runtime = options.Runtime; - _targetFramework = options.TargetFramework; - - _output = command.Option("--output ", Resources.OutputDescription); - command.VersionOption("--version", ProductInfo.GetVersion); - _args = command.RemainingArguments; - base.Configure(command); + + _projectOptions.Configure(command); + _args = command.RemainingArguments; + } + + protected override void Validate() + { + base.Validate(); + _projectOptions.Validate(); } protected override int Execute() { - var projectFile = FindProjects( - _project.Value(), - Resources.NoProject, - Resources.MultipleProjects); - Reporter.WriteVerbose(Resources.FormatUsingProject(projectFile)); - - var project = Project.FromFile( - projectFile, - _projectExtensionsPath.Value(), - _targetFramework.Value(), - _configuration.Value(), - _runtime.Value()); - if (!File.Exists(project.TargetPath)) - { - throw new CommandException(Resources.MustBuild); - } - var thisPath = Path.GetFullPath(Path.GetDirectoryName(typeof(InvokeCommand).Assembly.Location)); + var projectName = _projectOptions.ProjectName.Value(); + var assemblyPath = _projectOptions.AssemblyPath.Value(); + var targetDirectory = Path.GetDirectoryName(assemblyPath); + string executable = null; var cleanupExecutable = false; try { string toolsDirectory; var args = new List(); - var targetFramework = new FrameworkName(project.TargetFrameworkMoniker); + var targetFramework = new FrameworkName(_projectOptions.TargetFramework.Value()); switch (targetFramework.Identifier) { case ".NETFramework": cleanupExecutable = true; - executable = Path.Combine(project.OutputPath, InsideManName + ".exe"); toolsDirectory = Path.Combine( thisPath, - project.PlatformTarget == "x86" ? "net461-x86" : "net461"); + _projectOptions.Platform.Value() == "x86" ? "net461-x86" : "net461"); var executableSource = Path.Combine(toolsDirectory, InsideManName + ".exe"); + executable = Path.Combine(targetDirectory, InsideManName + ".exe"); File.Copy(executableSource, executable, overwrite: true); - if (!string.IsNullOrEmpty(project.ConfigPath)) + var configPath = assemblyPath + ".config"; + if (File.Exists(configPath)) { - File.Copy(project.ConfigPath, executable + ".config", overwrite: true); + File.Copy(configPath, executable + ".config", overwrite: true); } break; case ".NETCoreApp": - executable = "dotnet"; - toolsDirectory = Path.Combine(thisPath, "netcoreapp2.0"); - - if (targetFramework.Version < new Version(2, 0)) + if (targetFramework.Version < new Version(2, 1)) { - throw new CommandException( - Resources.FormatNETCoreApp1Project(project.ProjectName, targetFramework.Version)); + throw new CommandException(Resources.FormatOldNETCoreAppProject( + projectName, + targetFramework.Version)); } + executable = "dotnet"; + toolsDirectory = Path.Combine(thisPath, "netcoreapp2.1"); + args.Add("exec"); args.Add("--depsFile"); - args.Add(project.ProjectDepsFilePath); + args.Add(Path.ChangeExtension(assemblyPath, ".deps.json")); - if (!string.IsNullOrEmpty(project.ProjectAssetsFile)) + var projectAssetsFile = _projectOptions.AssetsFile.Value(); + if (!string.IsNullOrEmpty(projectAssetsFile) && File.Exists(projectAssetsFile)) { - using (var reader = new JsonTextReader(File.OpenText(project.ProjectAssetsFile))) - { - var projectAssets = JToken.ReadFrom(reader); - var packageFolders = projectAssets["packageFolders"] - .Children() - .Select(p => p.Name); + using var reader = new JsonTextReader(File.OpenText(projectAssetsFile)); + var projectAssets = JToken.ReadFrom(reader); + var packageFolders = projectAssets["packageFolders"] + .Children() + .Select(p => p.Name); - foreach (var packageFolder in packageFolders) - { - args.Add("--additionalProbingPath"); - args.Add(packageFolder.TrimEnd(Path.DirectorySeparatorChar)); - } + foreach (var packageFolder in packageFolders) + { + args.Add("--additionalProbingPath"); + args.Add(packageFolder.TrimEnd(Path.DirectorySeparatorChar)); } } - if (File.Exists(project.ProjectRuntimeConfigFilePath)) + var runtimeConfigPath = Path.ChangeExtension(assemblyPath, ".runtimeconfig.json"); + if (File.Exists(runtimeConfigPath)) { args.Add("--runtimeConfig"); - args.Add(project.ProjectRuntimeConfigFilePath); + args.Add(runtimeConfigPath); } - else if (!string.IsNullOrEmpty(project.RuntimeFrameworkVersion)) + else { - args.Add("--fx-version"); - args.Add(project.RuntimeFrameworkVersion); + var runtimeFrameworkVersion = _projectOptions.RuntimeFrameworkVersion.Value(); + if (!string.IsNullOrEmpty(runtimeFrameworkVersion)) + { + args.Add("--fx-version"); + args.Add(runtimeFrameworkVersion); + } } args.Add(Path.Combine(toolsDirectory, InsideManName + ".dll")); break; case ".NETStandard": - throw new CommandException(Resources.FormatNETStandardProject(project.ProjectName)); + throw new CommandException(Resources.FormatNETStandardProject(projectName)); default: throw new CommandException( - Resources.FormatUnsupportedFramework(project.ProjectName, targetFramework.Identifier)); + Resources.FormatUnsupportedFramework(projectName, targetFramework.Identifier)); } args.AddRange(_args); args.Add("--assembly"); - args.Add(project.TargetPath); + args.Add(assemblyPath); + args.Add("--project"); + args.Add(projectName); args.Add("--tools-directory"); args.Add(toolsDirectory); - if (!(args.Contains("--method") || string.IsNullOrEmpty(project.DefaultMethod))) - { - args.Add("--method"); - args.Add(project.DefaultMethod); - } - - if (!(args.Contains("--service") || string.IsNullOrEmpty(project.DefaultService))) - { - args.Add("--service"); - args.Add(project.DefaultService); - } - - if (_output.HasValue()) - { - args.Add("--output"); - args.Add(Path.GetFullPath(_output.Value())); - } - if (Reporter.IsVerbose) { args.Add("--verbose"); @@ -180,7 +148,7 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands args.Add("--prefix-output"); } - return Exe.Run(executable, args, project.ProjectDirectory); + return Exe.Run(executable, args); } finally { @@ -205,44 +173,5 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands } } } - - private static string FindProjects( - string path, - string errorWhenNoProject, - string errorWhenMultipleProjects) - { - var specified = true; - if (path == null) - { - specified = false; - path = Directory.GetCurrentDirectory(); - } - else if (!Directory.Exists(path)) // It's not a directory - { - return path; - } - - var projectFiles = Directory - .EnumerateFiles(path, "*.*proj", SearchOption.TopDirectoryOnly) - .Where(f => !string.Equals(Path.GetExtension(f), ".xproj", StringComparison.OrdinalIgnoreCase)) - .Take(2) - .ToList(); - if (projectFiles.Count == 0) - { - throw new CommandException( - specified - ? Resources.FormatNoProjectInDirectory(path) - : errorWhenNoProject); - } - if (projectFiles.Count != 1) - { - throw new CommandException( - specified - ? Resources.FormatMultipleProjectsInDirectory(path) - : errorWhenMultipleProjects); - } - - return projectFiles[0]; - } } } diff --git a/src/Mvc/dotnet-getdocument/src/Exe.cs b/src/Mvc/dotnet-getdocument/src/Exe.cs index bc17eee130..68df26cc31 100644 --- a/src/Mvc/dotnet-getdocument/src/Exe.cs +++ b/src/Mvc/dotnet-getdocument/src/Exe.cs @@ -79,37 +79,37 @@ namespace Microsoft.Extensions.ApiDescription.Tool builder.Append("\""); - var pendingBackslashs = 0; + var pendingBackslashes = 0; for (var j = 0; j < args[i].Length; j++) { switch (args[i][j]) { case '\"': - if (pendingBackslashs != 0) + if (pendingBackslashes != 0) { - builder.Append('\\', pendingBackslashs * 2); - pendingBackslashs = 0; + builder.Append('\\', pendingBackslashes * 2); + pendingBackslashes = 0; } builder.Append("\\\""); break; case '\\': - pendingBackslashs++; + pendingBackslashes++; break; default: - if (pendingBackslashs != 0) + if (pendingBackslashes != 0) { - if (pendingBackslashs == 1) + if (pendingBackslashes == 1) { builder.Append("\\"); } else { - builder.Append('\\', pendingBackslashs * 2); + builder.Append('\\', pendingBackslashes * 2); } - pendingBackslashs = 0; + pendingBackslashes = 0; } builder.Append(args[i][j]); @@ -117,9 +117,9 @@ namespace Microsoft.Extensions.ApiDescription.Tool } } - if (pendingBackslashs != 0) + if (pendingBackslashes != 0) { - builder.Append('\\', pendingBackslashs * 2); + builder.Append('\\', pendingBackslashes * 2); } builder.Append("\""); diff --git a/src/Mvc/dotnet-getdocument/src/Program.cs b/src/Mvc/dotnet-getdocument/src/Program.cs index 94958f2840..cef1648689 100644 --- a/src/Mvc/dotnet-getdocument/src/Program.cs +++ b/src/Mvc/dotnet-getdocument/src/Program.cs @@ -14,6 +14,7 @@ namespace Microsoft.Extensions.ApiDescription.Tool var app = new CommandLineApplication(throwOnUnexpectedArg: false) { FullName = Resources.CommandFullName, + Name = Resources.CommandFullName, }; new InvokeCommand().Configure(app); diff --git a/src/Mvc/dotnet-getdocument/src/Project.cs b/src/Mvc/dotnet-getdocument/src/Project.cs deleted file mode 100644 index db9734e532..0000000000 --- a/src/Mvc/dotnet-getdocument/src/Project.cs +++ /dev/null @@ -1,252 +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.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using IODirectory = System.IO.Directory; - -namespace Microsoft.Extensions.ApiDescription.Tool -{ - internal class Project - { - private const string ResourceFilename = "ServiceProjectReferenceMetadata.targets"; - private const string MSBuildResourceName = "Microsoft.Extensions.ApiDescription.Tool." + ResourceFilename; - - private Project() - { - } - - public string AssemblyName { get; private set; } - - public string ConfigPath { get; private set; } - - public string Configuration { get; private set; } - - public string DefaultDocumentName { get; private set; } - - public string DefaultMethod { get; private set; } - - public string DefaultService { get; private set; } - - public string OutputPath { get; private set; } - - public string Platform { get; private set; } - - public string PlatformTarget { get; private set; } - - public string ProjectAssetsFile { get; private set; } - - public string ProjectDepsFilePath { get; private set; } - - public string ProjectDirectory { get; private set; } - - public string ProjectExtensionsPath { get; private set; } - - public string ProjectName { get; private set; } - - public string ProjectRuntimeConfigFilePath { get; private set; } - - public string RuntimeFrameworkVersion { get; private set; } - - public string RuntimeIdentifier { get; private set; } - - public string TargetFramework { get; private set; } - - public string TargetFrameworkMoniker { get; private set; } - - public string TargetPath { get; private set; } - - public static Project FromFile( - string projectFile, - string buildExtensionsDirectory, - string framework = null, - string configuration = null, - string runtime = null) - { - if (string.IsNullOrEmpty(projectFile)) - { - throw new ArgumentNullException(nameof(projectFile)); - } - - if (string.IsNullOrEmpty(buildExtensionsDirectory)) - { - buildExtensionsDirectory = Path.Combine(Path.GetDirectoryName(projectFile), "obj"); - } - - IODirectory.CreateDirectory(buildExtensionsDirectory); - - var assembly = typeof(Project).Assembly; - var targetsPath = Path.Combine( - buildExtensionsDirectory, - $"{Path.GetFileName(projectFile)}.{ResourceFilename}"); - using (var input = assembly.GetManifestResourceStream(MSBuildResourceName)) - { - using (var output = File.OpenWrite(targetsPath)) - { - // NB: Copy always in case it changes - Reporter.WriteVerbose(Resources.FormatWritingFile(targetsPath)); - input.CopyTo(output); - - output.Flush(); - } - } - - IDictionary metadata; - var metadataPath = Path.GetTempFileName(); - try - { - var args = new List - { - "msbuild", - "/target:WriteServiceProjectReferenceMetadata", - "/verbosity:quiet", - "/nologo", - "/nodeReuse:false", - $"/property:ServiceProjectReferenceMetadataPath={metadataPath}", - projectFile, - }; - - if (!string.IsNullOrEmpty(framework)) - { - args.Add($"/property:TargetFramework={framework}"); - } - - if (!string.IsNullOrEmpty(configuration)) - { - args.Add($"/property:Configuration={configuration}"); - } - - if (!string.IsNullOrEmpty(runtime)) - { - args.Add($"/property:RuntimeIdentifier={runtime}"); - } - - var exitCode = Exe.Run("dotnet", args); - if (exitCode != 0) - { - throw new CommandException(Resources.GetMetadataFailed); - } - - metadata = File - .ReadLines(metadataPath) - .Select(l => l.Split(new[] { ':' }, 2)) - .ToDictionary(s => s[0], s => s[1].TrimStart()); - } - finally - { - // Ignore errors about in-use files. Should still be marked for delete after process cleanup. - try - { - File.Delete(metadataPath); - } - catch (UnauthorizedAccessException) - { - } - - try - { - File.Delete(targetsPath); - } - catch (UnauthorizedAccessException) - { - } - } - - var project = new Project - { - DefaultDocumentName = metadata[nameof(DefaultDocumentName)], - DefaultMethod = metadata[nameof(DefaultMethod)], - DefaultService = metadata[nameof(DefaultService)], - - AssemblyName = metadata[nameof(AssemblyName)], - Configuration = metadata[nameof(Configuration)], - OutputPath = metadata[nameof(OutputPath)], - Platform = metadata[nameof(Platform)], - PlatformTarget = metadata[nameof(PlatformTarget)] ?? metadata[nameof(Platform)], - ProjectAssetsFile = metadata[nameof(ProjectAssetsFile)], - ProjectDepsFilePath = metadata[nameof(ProjectDepsFilePath)], - ProjectDirectory = metadata[nameof(ProjectDirectory)], - ProjectExtensionsPath = metadata[nameof(ProjectExtensionsPath)], - ProjectName = metadata[nameof(ProjectName)], - ProjectRuntimeConfigFilePath = metadata[nameof(ProjectRuntimeConfigFilePath)], - RuntimeFrameworkVersion = metadata[nameof(RuntimeFrameworkVersion)], - RuntimeIdentifier = metadata[nameof(RuntimeIdentifier)], - TargetFramework = metadata[nameof(TargetFramework)], - TargetFrameworkMoniker = metadata[nameof(TargetFrameworkMoniker)], - TargetPath = metadata[nameof(TargetPath)], - }; - - if (string.IsNullOrEmpty(project.OutputPath)) - { - throw new CommandException( - Resources.FormatGetMetadataValueFailed(nameof(OutputPath), nameof(OutputPath))); - } - - if (string.IsNullOrEmpty(project.ProjectDirectory)) - { - throw new CommandException( - Resources.FormatGetMetadataValueFailed(nameof(ProjectDirectory), "MSBuildProjectDirectory")); - } - - if (string.IsNullOrEmpty(project.TargetPath)) - { - throw new CommandException( - Resources.FormatGetMetadataValueFailed(nameof(TargetPath), nameof(TargetPath))); - } - - if (!Path.IsPathRooted(project.ProjectDirectory)) - { - project.OutputPath = Path.GetFullPath( - Path.Combine(IODirectory.GetCurrentDirectory(), project.ProjectDirectory)); - } - - if (!Path.IsPathRooted(project.OutputPath)) - { - project.OutputPath = Path.GetFullPath(Path.Combine(project.ProjectDirectory, project.OutputPath)); - } - - if (!Path.IsPathRooted(project.ProjectExtensionsPath)) - { - project.ProjectExtensionsPath = Path.GetFullPath( - Path.Combine(project.ProjectDirectory, project.ProjectExtensionsPath)); - } - - if (!Path.IsPathRooted(project.TargetPath)) - { - project.TargetPath = Path.GetFullPath(Path.Combine(project.OutputPath, project.TargetPath)); - } - - // Some document generation tools support non-ASP.NET Core projects. Any of the remaining properties may - // thus be null empty. - var configPath = $"{project.TargetPath}.config"; - if (File.Exists(configPath)) - { - project.ConfigPath = configPath; - } - - if (!(string.IsNullOrEmpty(project.ProjectAssetsFile) || Path.IsPathRooted(project.ProjectAssetsFile))) - { - project.ProjectAssetsFile = Path.GetFullPath( - Path.Combine(project.ProjectDirectory, project.ProjectAssetsFile)); - } - - if (!(string.IsNullOrEmpty(project.ProjectDepsFilePath) || Path.IsPathRooted(project.ProjectDepsFilePath))) - { - project.ProjectDepsFilePath = Path.GetFullPath( - Path.Combine(project.ProjectDirectory, project.ProjectDepsFilePath)); - } - - if (!(string.IsNullOrEmpty(project.ProjectRuntimeConfigFilePath) || - Path.IsPathRooted(project.ProjectRuntimeConfigFilePath))) - { - project.ProjectRuntimeConfigFilePath = Path.GetFullPath( - Path.Combine(project.OutputPath, project.ProjectRuntimeConfigFilePath)); - } - - return project; - } - } -} diff --git a/src/Mvc/dotnet-getdocument/src/ProjectOptions.cs b/src/Mvc/dotnet-getdocument/src/ProjectOptions.cs index c235c2191a..84b32968e9 100644 --- a/src/Mvc/dotnet-getdocument/src/ProjectOptions.cs +++ b/src/Mvc/dotnet-getdocument/src/ProjectOptions.cs @@ -7,25 +7,44 @@ namespace Microsoft.Extensions.ApiDescription.Tool { internal class ProjectOptions { - public CommandOption Configuration { get; private set; } + public CommandOption AssemblyPath { get; private set; } - public CommandOption Project { get; private set; } + public CommandOption AssetsFile { get; private set; } - public CommandOption ProjectExtensionsPath { get; private set; } + public CommandOption Platform { get; private set; } - public CommandOption Runtime { get; private set; } + public CommandOption ProjectName { get; private set; } + + public CommandOption RuntimeFrameworkVersion { get; private set; } public CommandOption TargetFramework { get; private set; } public void Configure(CommandLineApplication command) { - Configuration = command.Option("--configuration ", Resources.ConfigurationDescription); - Project = command.Option("-p|--project ", Resources.ProjectDescription); - ProjectExtensionsPath = command.Option( - "--projectExtensionsPath ", - Resources.ProjectExtensionsPathDescription); - Runtime = command.Option("--runtime ", Resources.RuntimeDescription); + AssemblyPath = command.Option("--assembly ", Resources.AssemblyDescription); + AssetsFile = command.Option("--assets-file ", Resources.AssetsFileDescription); TargetFramework = command.Option("--framework ", Resources.TargetFrameworkDescription); + Platform = command.Option("--platform ", Resources.PlatformDescription); + ProjectName = command.Option("--project ", Resources.ProjectDescription); + RuntimeFrameworkVersion = command.Option("--runtime ", Resources.RuntimeDescription); + } + + public void Validate() + { + if (!AssemblyPath.HasValue()) + { + throw new CommandException(Resources.FormatMissingOption(AssemblyPath.LongName)); + } + + if (!ProjectName.HasValue()) + { + throw new CommandException(Resources.FormatMissingOption(ProjectName.LongName)); + } + + if (!TargetFramework.HasValue()) + { + throw new CommandException(Resources.FormatMissingOption(TargetFramework.LongName)); + } } } } diff --git a/src/Mvc/dotnet-getdocument/src/Properties/Resources.Designer.cs b/src/Mvc/dotnet-getdocument/src/Properties/Resources.Designer.cs index 28501e7880..49baad030b 100644 --- a/src/Mvc/dotnet-getdocument/src/Properties/Resources.Designer.cs +++ b/src/Mvc/dotnet-getdocument/src/Properties/Resources.Designer.cs @@ -10,20 +10,6 @@ namespace Microsoft.Extensions.ApiDescription.Tool private static readonly ResourceManager _resourceManager = new ResourceManager("Microsoft.Extensions.ApiDescription.Tool.Resources", typeof(Resources).GetTypeInfo().Assembly); - /// - /// The configuration to use. - /// - internal static string ConfigurationDescription - { - get => GetString("ConfigurationDescription"); - } - - /// - /// The configuration to use. - /// - internal static string FormatConfigurationDescription() - => GetString("ConfigurationDescription"); - /// /// dotnet-getdocument /// @@ -39,7 +25,7 @@ namespace Microsoft.Extensions.ApiDescription.Tool => GetString("CommandFullName"); /// - /// The target framework. + /// The target framework to use. Required. /// internal static string TargetFrameworkDescription { @@ -47,69 +33,27 @@ namespace Microsoft.Extensions.ApiDescription.Tool } /// - /// The target framework. + /// The target framework to use. Required. /// internal static string FormatTargetFrameworkDescription() => GetString("TargetFrameworkDescription"); /// - /// Unable to retrieve project metadata. If you are using custom BaseIntermediateOutputPath or MSBuildProjectExtensionsPath values, use the --projectExtensionsPath option. + /// Project '{0}' targets framework '.NETCoreApp' version '{1}'. This version of the dotnet-getdocument tool only supports version 2.1 or higher. /// - internal static string GetMetadataFailed + internal static string OldNETCoreAppProject { - get => GetString("GetMetadataFailed"); + get => GetString("OldNETCoreAppProject"); } /// - /// Unable to retrieve project metadata. If you are using custom BaseIntermediateOutputPath or MSBuildProjectExtensionsPath values, use the --projectExtensionsPath option. + /// Project '{0}' targets framework '.NETCoreApp' version '{1}'. This version of the dotnet-getdocument tool only supports version 2.1 or higher. /// - internal static string FormatGetMetadataFailed() - => GetString("GetMetadataFailed"); + internal static string FormatOldNETCoreAppProject(object p0, object p1) + => string.Format(CultureInfo.CurrentCulture, GetString("OldNETCoreAppProject"), p0, p1); /// - /// More than one project was found in the current working directory. Use the --project option. - /// - internal static string MultipleProjects - { - get => GetString("MultipleProjects"); - } - - /// - /// More than one project was found in the current working directory. Use the --project option. - /// - internal static string FormatMultipleProjects() - => GetString("MultipleProjects"); - - /// - /// More than one project was found in directory '{0}'. Specify one using its file name. - /// - internal static string MultipleProjectsInDirectory - { - get => GetString("MultipleProjectsInDirectory"); - } - - /// - /// More than one project was found in directory '{0}'. Specify one using its file name. - /// - internal static string FormatMultipleProjectsInDirectory(object p0) - => string.Format(CultureInfo.CurrentCulture, GetString("MultipleProjectsInDirectory"), p0); - - /// - /// Project '{0}' targets framework '.NETCoreApp' version '{1}'. This version of the dotnet-getdocument tool only supports version 2.0 or higher. - /// - internal static string NETCoreApp1Project - { - get => GetString("NETCoreApp1Project"); - } - - /// - /// Project '{0}' targets framework '.NETCoreApp' version '{1}'. This version of the dotnet-getdocument tool only supports version 2.0 or higher. - /// - internal static string FormatNETCoreApp1Project(object p0, object p1) - => string.Format(CultureInfo.CurrentCulture, GetString("NETCoreApp1Project"), p0, p1); - - /// - /// Project '{0}' targets framework '.NETStandard'. There is no runtime associated with this framework, and projects targeting it cannot be executed directly. To use the dotnet-getdocument tool with this project, add an executable project targeting .NET Core or .NET Framework that references this project and specify it using the --project option; or, update this project to target .NET Core and / or .NET Framework. + /// Project '{0}' targets framework '.NETStandard'. There is no runtime associated with this framework and projects targeting it cannot be executed directly. To use the dotnet-getdocument tool with this project, update this project to target .NET Core and / or .NET Framework. /// internal static string NETStandardProject { @@ -117,13 +61,13 @@ namespace Microsoft.Extensions.ApiDescription.Tool } /// - /// Project '{0}' targets framework '.NETStandard'. There is no runtime associated with this framework, and projects targeting it cannot be executed directly. To use the dotnet-getdocument tool with this project, add an executable project targeting .NET Core or .NET Framework that references this project and specify it using the --project option; or, update this project to target .NET Core and / or .NET Framework. + /// Project '{0}' targets framework '.NETStandard'. There is no runtime associated with this framework and projects targeting it cannot be executed directly. To use the dotnet-getdocument tool with this project, update this project to target .NET Core and / or .NET Framework. /// internal static string FormatNETStandardProject(object p0) => string.Format(CultureInfo.CurrentCulture, GetString("NETStandardProject"), p0); /// - /// Do not colorize output. + /// Do not colorize console output. /// internal static string NoColorDescription { @@ -131,41 +75,13 @@ namespace Microsoft.Extensions.ApiDescription.Tool } /// - /// Do not colorize output. + /// Do not colorize console output. /// internal static string FormatNoColorDescription() => GetString("NoColorDescription"); /// - /// No project was found. Change the current working directory or use the --project option. - /// - internal static string NoProject - { - get => GetString("NoProject"); - } - - /// - /// No project was found. Change the current working directory or use the --project option. - /// - internal static string FormatNoProject() - => GetString("NoProject"); - - /// - /// No project was found in directory '{0}'. - /// - internal static string NoProjectInDirectory - { - get => GetString("NoProjectInDirectory"); - } - - /// - /// No project was found in directory '{0}'. - /// - internal static string FormatNoProjectInDirectory(object p0) - => string.Format(CultureInfo.CurrentCulture, GetString("NoProjectInDirectory"), p0); - - /// - /// Prefix output with level. + /// Prefix console output with logging level. /// internal static string PrefixDescription { @@ -173,13 +89,13 @@ namespace Microsoft.Extensions.ApiDescription.Tool } /// - /// Prefix output with level. + /// Prefix console output with logging level. /// internal static string FormatPrefixDescription() => GetString("PrefixDescription"); /// - /// The project to use. + /// The project name. Required. /// internal static string ProjectDescription { @@ -187,25 +103,11 @@ namespace Microsoft.Extensions.ApiDescription.Tool } /// - /// The project to use. + /// The project name. Required. /// internal static string FormatProjectDescription() => GetString("ProjectDescription"); - /// - /// The MSBuild project extensions path. Defaults to "obj". - /// - internal static string ProjectExtensionsPathDescription - { - get => GetString("ProjectExtensionsPathDescription"); - } - - /// - /// The MSBuild project extensions path. Defaults to "obj". - /// - internal static string FormatProjectExtensionsPathDescription() - => GetString("ProjectExtensionsPathDescription"); - /// /// The runtime identifier to use. /// @@ -234,20 +136,6 @@ namespace Microsoft.Extensions.ApiDescription.Tool internal static string FormatUnsupportedFramework(object p0, object p1) => string.Format(CultureInfo.CurrentCulture, GetString("UnsupportedFramework"), p0, p1); - /// - /// Using project '{0}'. - /// - internal static string UsingProject - { - get => GetString("UsingProject"); - } - - /// - /// Using project '{0}'. - /// - internal static string FormatUsingProject(object p0) - => string.Format(CultureInfo.CurrentCulture, GetString("UsingProject"), p0); - /// /// Show verbose output. /// @@ -263,60 +151,60 @@ namespace Microsoft.Extensions.ApiDescription.Tool => GetString("VerboseDescription"); /// - /// Writing '{0}'... + /// The project assets file to use. /// - internal static string WritingFile + internal static string AssetsFileDescription { - get => GetString("WritingFile"); + get => GetString("AssetsFileDescription"); } /// - /// Writing '{0}'... + /// The project assets file to use. /// - internal static string FormatWritingFile(object p0) - => string.Format(CultureInfo.CurrentCulture, GetString("WritingFile"), p0); + internal static string FormatAssetsFileDescription() + => GetString("AssetsFileDescription"); /// - /// Project output not found. Project must be up-to-date when using this tool. + /// Missing required option '--{0}'. /// - internal static string MustBuild + internal static string MissingOption { - get => GetString("MustBuild"); + get => GetString("MissingOption"); } /// - /// Project output not found. Project must be up-to-date when using this tool. + /// Missing required option '--{0}'. /// - internal static string FormatMustBuild() - => GetString("MustBuild"); + internal static string FormatMissingOption(object p0) + => string.Format(CultureInfo.CurrentCulture, GetString("MissingOption"), p0); /// - /// The file to write the result to. + /// The platform to use. /// - internal static string OutputDescription + internal static string PlatformDescription { - get => GetString("OutputDescription"); + get => GetString("PlatformDescription"); } /// - /// The file to write the result to. + /// The platform to use. /// - internal static string FormatOutputDescription() - => GetString("OutputDescription"); + internal static string FormatPlatformDescription() + => GetString("PlatformDescription"); /// - /// Unable to retrieve '{0}' project metadata. Ensure '$({1})' is set. + /// The assembly path to use. Required. /// - internal static string GetMetadataValueFailed + internal static string AssemblyDescription { - get => GetString("GetMetadataValueFailed"); + get => GetString("AssemblyDescription"); } /// - /// Unable to retrieve '{0}' project metadata. Ensure '$({1})' is set. + /// The assembly path to use. Required. /// - internal static string FormatGetMetadataValueFailed(object p0, object p1) - => string.Format(CultureInfo.CurrentCulture, GetString("GetMetadataValueFailed"), p0, p1); + internal static string FormatAssemblyDescription() + => GetString("AssemblyDescription"); private static string GetString(string name, params string[] formatterNames) { diff --git a/src/Mvc/dotnet-getdocument/src/Resources.resx b/src/Mvc/dotnet-getdocument/src/Resources.resx index d87157fff2..08f92d0397 100644 --- a/src/Mvc/dotnet-getdocument/src/Resources.resx +++ b/src/Mvc/dotnet-getdocument/src/Resources.resx @@ -117,47 +117,26 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - The configuration to use. - dotnet-getdocument - The target framework. + The target framework to use. Required. - - Unable to retrieve project metadata. If you are using custom BaseIntermediateOutputPath or MSBuildProjectExtensionsPath values, use the --projectExtensionsPath option. - - - More than one project was found in the current working directory. Use the --project option. - - - More than one project was found in directory '{0}'. Specify one using its file name. - - - Project '{0}' targets framework '.NETCoreApp' version '{1}'. This version of the dotnet-getdocument tool only supports version 2.0 or higher. + + Project '{0}' targets framework '.NETCoreApp' version '{1}'. This version of the dotnet-getdocument tool only supports version 2.1 or higher. - Project '{0}' targets framework '.NETStandard'. There is no runtime associated with this framework, and projects targeting it cannot be executed directly. To use the dotnet-getdocument tool with this project, add an executable project targeting .NET Core or .NET Framework that references this project and specify it using the --project option; or, update this project to target .NET Core and / or .NET Framework. + Project '{0}' targets framework '.NETStandard'. There is no runtime associated with this framework and projects targeting it cannot be executed directly. To use the dotnet-getdocument tool with this project, update this project to target .NET Core and / or .NET Framework. - Do not colorize output. - - - No project was found. Change the current working directory or use the --project option. - - - No project was found in directory '{0}'. + Do not colorize console output. - Prefix output with level. + Prefix console output with logging level. - The project to use. - - - The MSBuild project extensions path. Defaults to "obj". + The project name. Required. The runtime identifier to use. @@ -165,22 +144,19 @@ Project '{0}' targets framework '{1}'. The dotnet-getdocument tool does not support this framework. - - Using project '{0}'. - Show verbose output. - - Writing '{0}'... + + The project assets file to use. - - Project output not found. Project must be up-to-date when using this tool. + + Missing required option '--{0}'. - - The file to write the result to. + + The platform to use. - - Unable to retrieve '{0}' project metadata. Ensure '$({1})' is set. + + The assembly path to use. Required. - + \ No newline at end of file diff --git a/src/Mvc/dotnet-getdocument/src/ServiceProjectReferenceMetadata.targets b/src/Mvc/dotnet-getdocument/src/ServiceProjectReferenceMetadata.targets deleted file mode 100644 index 177d950c9e..0000000000 --- a/src/Mvc/dotnet-getdocument/src/ServiceProjectReferenceMetadata.targets +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mvc/dotnet-getdocument/src/dotnet-getdocument.csproj b/src/Mvc/dotnet-getdocument/src/dotnet-getdocument.csproj index 1991b3e2df..6a2f526179 100644 --- a/src/Mvc/dotnet-getdocument/src/dotnet-getdocument.csproj +++ b/src/Mvc/dotnet-getdocument/src/dotnet-getdocument.csproj @@ -22,8 +22,6 @@ - - diff --git a/src/Mvc/dotnet-getdocument/src/runtimeconfig.template.json b/src/Mvc/dotnet-getdocument/src/runtimeconfig.template.json new file mode 100644 index 0000000000..516c80a388 --- /dev/null +++ b/src/Mvc/dotnet-getdocument/src/runtimeconfig.template.json @@ -0,0 +1,4 @@ +{ + "applyPatches": true, + "rollForwardOnNoCandidateFx": 2 +} diff --git a/src/Mvc/mvc.slnf b/src/Mvc/mvc.slnf deleted file mode 100644 index 79d4fb7df0..0000000000 --- a/src/Mvc/mvc.slnf +++ /dev/null @@ -1,73 +0,0 @@ -{ - "solution": { - "path": "Mvc.sln", - "projects": [ - "test\\WebSites\\BasicWebSite\\BasicWebSite.csproj", - "test\\WebSites\\RoutingWebSite\\Mvc.RoutingWebSite.csproj", - "test\\WebSites\\RazorWebSite\\RazorWebSite.csproj", - "test\\WebSites\\FormatterWebSite\\FormatterWebSite.csproj", - "test\\WebSites\\ApiExplorerWebSite\\ApiExplorerWebSite.csproj", - "test\\WebSites\\VersioningWebSite\\VersioningWebSite.csproj", - "test\\WebSites\\TagHelpersWebSite\\TagHelpersWebSite.csproj", - "test\\WebSites\\FilesWebSite\\FilesWebSite.csproj", - "test\\WebSites\\ApplicationModelWebSite\\ApplicationModelWebSite.csproj", - "test\\WebSites\\HtmlGenerationWebSite\\HtmlGenerationWebSite.csproj", - "test\\WebSites\\ErrorPageMiddlewareWebSite\\ErrorPageMiddlewareWebSite.csproj", - "test\\WebSites\\XmlFormattersWebSite\\XmlFormattersWebSite.csproj", - "test\\WebSites\\ControllersFromServicesWebSite\\ControllersFromServicesWebSite.csproj", - "test\\WebSites\\ControllersFromServicesClassLibrary\\ControllersFromServicesClassLibrary.csproj", - "test\\WebSites\\CorsWebSite\\CorsWebSite.csproj", - "samples\\MvcSandbox\\MvcSandbox.csproj", - "test\\WebSites\\SimpleWebSite\\SimpleWebSite.csproj", - "test\\WebSites\\SecurityWebSite\\SecurityWebSite.csproj", - "test\\WebSites\\RazorPagesWebSite\\RazorPagesWebSite.csproj", - "benchmarks\\Microsoft.AspNetCore.Mvc.Performance\\Microsoft.AspNetCore.Mvc.Performance.csproj", - "test\\WebSites\\RazorBuildWebSite\\RazorBuildWebSite.csproj", - "test\\WebSites\\RazorBuildWebSite.Views\\RazorBuildWebSite.Views.csproj", - "Mvc.Analyzers\\src\\Microsoft.AspNetCore.Mvc.Analyzers.csproj", - "Mvc.Analyzers\\test\\Mvc.Analyzers.Test.csproj", - "test\\WebSites\\RazorPagesClassLibrary\\RazorPagesClassLibrary.csproj", - "shared\\Mvc.Views.TestCommon\\Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj", - "Mvc.Api.Analyzers\\test\\Mvc.Api.Analyzers.Test.csproj", - "Mvc.Api.Analyzers\\src\\Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj", - "test\\WebSites\\GenericHostWebSite\\GenericHostWebSite.csproj", - "Mvc\\src\\Microsoft.AspNetCore.Mvc.csproj", - "Mvc\\test\\Microsoft.AspNetCore.Mvc.Test.csproj", - "Mvc.Abstractions\\src\\Microsoft.AspNetCore.Mvc.Abstractions.csproj", - "Mvc.Abstractions\\test\\Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj", - "Mvc.ApiExplorer\\src\\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj", - "Mvc.ApiExplorer\\test\\Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj", - "Mvc.Core\\src\\Microsoft.AspNetCore.Mvc.Core.csproj", - "Mvc.Core\\test\\Microsoft.AspNetCore.Mvc.Core.Test.csproj", - "Mvc.Cors\\src\\Microsoft.AspNetCore.Mvc.Cors.csproj", - "Mvc.Cors\\test\\Microsoft.AspNetCore.Mvc.Cors.Test.csproj", - "Mvc.DataAnnotations\\src\\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj", - "Mvc.DataAnnotations\\test\\Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj", - "Mvc.Formatters.Json\\src\\Microsoft.AspNetCore.Mvc.Formatters.Json.csproj", - "Mvc.Formatters.Xml\\src\\Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj", - "Mvc.Formatters.Xml\\test\\Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj", - "Mvc.Localization\\src\\Microsoft.AspNetCore.Mvc.Localization.csproj", - "Mvc.Localization\\test\\Microsoft.AspNetCore.Mvc.Localization.Test.csproj", - "Mvc.Razor\\src\\Microsoft.AspNetCore.Mvc.Razor.csproj", - "Mvc.Razor\\test\\Microsoft.AspNetCore.Mvc.Razor.Test.csproj", - "Mvc.RazorPages\\src\\Microsoft.AspNetCore.Mvc.RazorPages.csproj", - "Mvc.RazorPages\\test\\Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj", - "Mvc.TagHelpers\\src\\Microsoft.AspNetCore.Mvc.TagHelpers.csproj", - "Mvc.TagHelpers\\test\\Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj", - "Mvc.ViewFeatures\\src\\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj", - "Mvc.ViewFeatures\\test\\Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj", - "test\\Mvc.FunctionalTests\\Microsoft.AspNetCore.Mvc.FunctionalTests.csproj", - "test\\Mvc.IntegrationTests\\Microsoft.AspNetCore.Mvc.IntegrationTests.csproj", - "shared\\Mvc.TestDiagnosticListener\\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj", - "Mvc.Testing\\src\\Microsoft.AspNetCore.Mvc.Testing.csproj", - "shared\\Mvc.Core.TestCommon\\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj", - "Mvc.NewtonsoftJson\\src\\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj", - "Mvc.NewtonsoftJson\\test\\Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj", - "Mvc.Razor.RuntimeCompilation\\src\\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj", - "Mvc.Razor.RuntimeCompilation\\test\\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj", - "test\\WebSites\\RazorBuildWebSite.PrecompiledViews\\RazorBuildWebSite.PrecompiledViews.csproj", - "Mvc.Components.Prerendering\\src\\Microsoft.AspNetCore.Mvc.Components.Prerendering.csproj", - "Mvc.Components.Prerendering\\test\\Microsoft.AspNetCore.Mvc.Components.Prerendering.Test.csproj" - ] - } -} \ No newline at end of file diff --git a/src/Mvc/samples/MvcSandbox/Startup.cs b/src/Mvc/samples/MvcSandbox/Startup.cs index c1bc81b7bc..26848d96d7 100644 --- a/src/Mvc/samples/MvcSandbox/Startup.cs +++ b/src/Mvc/samples/MvcSandbox/Startup.cs @@ -109,7 +109,6 @@ namespace MvcSandbox factory .AddConsole() .AddDebug(); - factory.SetMinimumLevel(LogLevel.Trace); }) .UseIISIntegration() .UseKestrel() diff --git a/src/Mvc/shared/Mvc.Core.TestCommon/TestModelMetadataProvider.cs b/src/Mvc/shared/Mvc.Core.TestCommon/TestModelMetadataProvider.cs index d72bc80148..d284e4197d 100644 --- a/src/Mvc/shared/Mvc.Core.TestCommon/TestModelMetadataProvider.cs +++ b/src/Mvc/shared/Mvc.Core.TestCommon/TestModelMetadataProvider.cs @@ -17,10 +17,10 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding { private static DataAnnotationsMetadataProvider CreateDefaultDataAnnotationsProvider(IStringLocalizerFactory stringLocalizerFactory) { - var options = Options.Create(new MvcDataAnnotationsLocalizationOptions()); - options.Value.DataAnnotationLocalizerProvider = (modelType, localizerFactory) => localizerFactory.Create(modelType); + var localizationOptions = Options.Create(new MvcDataAnnotationsLocalizationOptions()); + localizationOptions.Value.DataAnnotationLocalizerProvider = (modelType, localizerFactory) => localizerFactory.Create(modelType); - return new DataAnnotationsMetadataProvider(options, stringLocalizerFactory); + return new DataAnnotationsMetadataProvider(new MvcOptions(), localizationOptions, stringLocalizerFactory); } // Creates a provider with all the defaults - includes data annotations @@ -50,6 +50,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding new DefaultBindingMetadataProvider(), new DefaultValidationMetadataProvider(), new DataAnnotationsMetadataProvider( + new MvcOptions(), Options.Create(new MvcDataAnnotationsLocalizationOptions()), stringLocalizerFactory: null), new DataMemberRequiredBindingMetadataProvider(), @@ -92,6 +93,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding new DefaultBindingMetadataProvider(), new DefaultValidationMetadataProvider(), new DataAnnotationsMetadataProvider( + new MvcOptions(), Options.Create(new MvcDataAnnotationsLocalizationOptions()), stringLocalizerFactory: null), detailsProvider diff --git a/src/Mvc/test/Mvc.FunctionalTests/AuthMiddlewareAndFilterTestBase.cs b/src/Mvc/test/Mvc.FunctionalTests/AuthMiddlewareAndFilterTestBase.cs index 7f4c205109..148a2fd3ab 100644 --- a/src/Mvc/test/Mvc.FunctionalTests/AuthMiddlewareAndFilterTestBase.cs +++ b/src/Mvc/test/Mvc.FunctionalTests/AuthMiddlewareAndFilterTestBase.cs @@ -66,7 +66,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests request.Headers.Add("Cookie", authCookie); response = await Client.SendAsync(request); - await AssertAuthorizeResponse(response); + await AssertForbiddenResponse(response); authCookie = await GetAuthCookieAsync("LoginClaimAB"); request = new HttpRequestMessage(HttpMethod.Get, action); @@ -243,7 +243,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests request.Headers.Add("Cookie", authCookie); response = await Client.SendAsync(request); - await AssertAuthorizeResponse(response); + await AssertForbiddenResponse(response); authCookie = await GetAuthCookieAsync("LoginClaimAB"); request = new HttpRequestMessage(HttpMethod.Get, url); @@ -259,6 +259,12 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests Assert.Equal("/Account/Login", response.Headers.Location.LocalPath); } + private async Task AssertForbiddenResponse(HttpResponseMessage response) + { + await response.AssertStatusCodeAsync(HttpStatusCode.Redirect); + Assert.Equal("/Account/AccessDenied", response.Headers.Location.LocalPath); + } + private async Task GetAuthCookieAsync(string action) { var response = await Client.PostAsync($"Login/{action}", null); diff --git a/src/Mvc/test/Mvc.FunctionalTests/ComponentRenderingFunctionalTests.cs b/src/Mvc/test/Mvc.FunctionalTests/ComponentRenderingFunctionalTests.cs index ac096853f6..1d3eb95d7d 100644 --- a/src/Mvc/test/Mvc.FunctionalTests/ComponentRenderingFunctionalTests.cs +++ b/src/Mvc/test/Mvc.FunctionalTests/ComponentRenderingFunctionalTests.cs @@ -74,6 +74,37 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests AssertComponent("\nRouter component\n

    Routed successfully

    ", "Routing", content); } + [Fact] + public async Task Redirects_Navigation_Component() + { + // Arrange & Act + var fixture = Factory.WithWebHostBuilder(builder => builder.ConfigureServices(services => services.AddServerSideBlazor())); + fixture.ClientOptions.AllowAutoRedirect = false; + var client = CreateClient(fixture); + + var response = await client.GetAsync("http://localhost/components/Navigation"); + + // Assert + await response.AssertStatusCodeAsync(HttpStatusCode.Redirect); + Assert.Equal("/navigation-redirect", response.Headers.Location.ToString()); + } + + [Fact] + public async Task Redirects_Navigation_ComponentInteractive() + { + // Arrange & Act + var fixture = Factory.WithWebHostBuilder(builder => builder.ConfigureServices(services => services.AddServerSideBlazor())); + fixture.ClientOptions.AllowAutoRedirect = false; + var client = CreateClient(fixture); + + var response = await client.GetAsync("http://localhost/components/Navigation/false"); + + // Assert + // Assert + await response.AssertStatusCodeAsync(HttpStatusCode.Redirect); + Assert.Equal("/navigation-redirect", response.Headers.Location.ToString()); + } + [Fact] public async Task Renders_RoutingComponent_UsingRazorComponents_Prerenderer() { @@ -224,7 +255,8 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests { } - private HttpClient CreateClient(WebApplicationFactory fixture) + private HttpClient CreateClient( + WebApplicationFactory fixture) { var loopHandler = new LoopHttpHandler(); diff --git a/src/Mvc/test/Mvc.FunctionalTests/JsonInputFormatterTestBase.cs b/src/Mvc/test/Mvc.FunctionalTests/JsonInputFormatterTestBase.cs index ceeb88fd48..347bca0e25 100644 --- a/src/Mvc/test/Mvc.FunctionalTests/JsonInputFormatterTestBase.cs +++ b/src/Mvc/test/Mvc.FunctionalTests/JsonInputFormatterTestBase.cs @@ -8,6 +8,7 @@ using System.Net.Http; using System.Text; using System.Text.Json.Serialization; using System.Threading.Tasks; +using FormatterWebSite.Controllers; using Microsoft.AspNetCore.Hosting; using Xunit; @@ -98,6 +99,28 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests Assert.Equal(expected, responseBody); } + [Fact] + public async Task JsonInputFormatter_RoundtripsPocoModel() + { + // Arrange + var expected = new JsonFormatterController.SimpleModel() + { + Id = 18, + Name = "James", + StreetName = "JnK", + }; + + // Act + var response = await Client.PostAsJsonAsync("http://localhost/JsonFormatter/RoundtripSimpleModel/", expected); + var actual = await response.Content.ReadAsAsync(); + + // Assert + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.Equal(expected.Id, actual.Id); + Assert.Equal(expected.Name, actual.Name); + Assert.Equal(expected.StreetName, actual.StreetName); + } + [Fact] public async Task JsonInputFormatter_Returns415UnsupportedMediaType_ForEmptyContentType() { diff --git a/src/Mvc/test/Mvc.FunctionalTests/NonNullableReferenceTypesTest.cs b/src/Mvc/test/Mvc.FunctionalTests/NonNullableReferenceTypesTest.cs new file mode 100644 index 0000000000..e22462ce34 --- /dev/null +++ b/src/Mvc/test/Mvc.FunctionalTests/NonNullableReferenceTypesTest.cs @@ -0,0 +1,110 @@ +// 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.Net; +using System.Net.Http; +using System.Net.Http.Headers; +using System.Reflection; +using System.Threading.Tasks; +using AngleSharp.Dom.Html; +using AngleSharp.Parser.Html; +using BasicWebSite.Models; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using Xunit; + +namespace Microsoft.AspNetCore.Mvc.FunctionalTests +{ + public class NonNullableReferenceTypesTest : IClassFixture> + { + public NonNullableReferenceTypesTest(MvcTestFixture fixture) + { + Client = fixture.CreateDefaultClient(); + } + + private HttpClient Client { get; set; } + + [Fact] + public async Task CanUseNonNullableReferenceType_WithController_OmitData_ValidationErrors() + { + // Arrange + var parser = new HtmlParser(); + + // Act 1 + var response = await Client.GetAsync("http://localhost/NonNullable"); + + // Assert 1 + await response.AssertStatusCodeAsync(HttpStatusCode.OK); + var content = await response.Content.ReadAsStringAsync(); + + var document = parser.Parse(content); + var errors = document.QuerySelectorAll("#errors > ul > li"); + var li = Assert.Single(errors); + Assert.Empty(li.TextContent); + + var cookieToken = AntiforgeryTestHelper.RetrieveAntiforgeryCookie(response); + var formToken = document.RetrieveAntiforgeryToken(); + + var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/NonNullable"); + request.Headers.Add("Cookie", cookieToken.Key + "=" + cookieToken.Value); + request.Content = new FormUrlEncodedContent(new[] + { + new KeyValuePair("__RequestVerificationToken", formToken), + }); + + // Act 2 + response = await Client.SendAsync(request); + + // Assert 2 + // + // OK means there were validation errors. + await response.AssertStatusCodeAsync(HttpStatusCode.OK); + content = await response.Content.ReadAsStringAsync(); + + document = parser.Parse(content); + errors = errors = document.QuerySelectorAll("#errors > ul > li"); + Assert.Equal(2, errors.Length); // Not validating BCL error messages + } + + [Fact] + public async Task CanUseNonNullableReferenceType_WithController_SubmitData_NoError() + { + // Arrange + var parser = new HtmlParser(); + + // Act 1 + var response = await Client.GetAsync("http://localhost/NonNullable"); + + // Assert 1 + await response.AssertStatusCodeAsync(HttpStatusCode.OK); + var content = await response.Content.ReadAsStringAsync(); + + var document = parser.Parse(content); + var errors = document.QuerySelectorAll("#errors > ul > li"); + var li = Assert.Single(errors); + Assert.Empty(li.TextContent); + + var cookieToken = AntiforgeryTestHelper.RetrieveAntiforgeryCookie(response); + var formToken = document.RetrieveAntiforgeryToken(); + + var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/NonNullable"); + request.Headers.Add("Cookie", cookieToken.Key + "=" + cookieToken.Value); + request.Content = new FormUrlEncodedContent(new[] + { + new KeyValuePair("__RequestVerificationToken", formToken), + new KeyValuePair("Name", "Pranav"), + new KeyValuePair("description", "Meme") + }); + + // Act 2 + response = await Client.SendAsync(request); + + // Assert 2 + // + // Redirect means there were no validation errors. + await response.AssertStatusCodeAsync(HttpStatusCode.Redirect); + } + } +} diff --git a/src/Mvc/test/Mvc.IntegrationTests/ComplexTypeModelBinderIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/ComplexTypeModelBinderIntegrationTest.cs index 7d58c007ef..19d65e864c 100644 --- a/src/Mvc/test/Mvc.IntegrationTests/ComplexTypeModelBinderIntegrationTest.cs +++ b/src/Mvc/test/Mvc.IntegrationTests/ComplexTypeModelBinderIntegrationTest.cs @@ -1715,7 +1715,7 @@ namespace Microsoft.AspNetCore.Mvc.IntegrationTests private class Order8 { - public string Name { get; set; } + public string Name { get; set; } = default!; public KeyValuePair ProductId { get; set; } } @@ -1869,13 +1869,15 @@ namespace Microsoft.AspNetCore.Mvc.IntegrationTests Assert.Equal("bill", model.Name); Assert.Equal(default, model.ProductId); - Assert.Single(modelState); - Assert.Equal(0, modelState.ErrorCount); - Assert.True(modelState.IsValid); + Assert.Equal(1, modelState.ErrorCount); + Assert.False(modelState.IsValid); var entry = Assert.Single(modelState, e => e.Key == "parameter.Name").Value; Assert.Equal("bill", entry.AttemptedValue); Assert.Equal("bill", entry.RawValue); + + entry = Assert.Single(modelState, e => e.Key == "parameter.ProductId.Key").Value; + Assert.Single(entry.Errors); } [Fact] @@ -1916,9 +1918,11 @@ namespace Microsoft.AspNetCore.Mvc.IntegrationTests Assert.Null(model.Name); Assert.Equal(default, model.ProductId); - Assert.Empty(modelState); - Assert.Equal(0, modelState.ErrorCount); - Assert.True(modelState.IsValid); + Assert.Equal(1, modelState.ErrorCount); + Assert.False(modelState.IsValid); + + var entry = Assert.Single(modelState, e => e.Key == "ProductId.Key").Value; + Assert.Single(entry.Errors); } private class Car4 diff --git a/src/Mvc/test/Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs index 42b6b827f9..974cce8bf0 100644 --- a/src/Mvc/test/Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs +++ b/src/Mvc/test/Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs @@ -337,9 +337,11 @@ namespace Microsoft.AspNetCore.Mvc.IntegrationTests Assert.Equal(new KeyValuePair(), modelBindingResult.Model); - Assert.Empty(modelState); - Assert.Equal(0, modelState.ErrorCount); - Assert.True(modelState.IsValid); + Assert.Equal(1, modelState.ErrorCount); + Assert.False(modelState.IsValid); + + var entry = Assert.Single(modelState, kvp => kvp.Key == "Key").Value; + Assert.Single(entry.Errors); } private class Person @@ -500,9 +502,14 @@ namespace Microsoft.AspNetCore.Mvc.IntegrationTests Assert.Equal(new KeyValuePair(), modelBindingResult.Model); - Assert.Empty(modelState); - Assert.Equal(0, modelState.ErrorCount); - Assert.True(modelState.IsValid); + Assert.Equal(2, modelState.ErrorCount); + Assert.False(modelState.IsValid); + + var entry = Assert.Single(modelState, kvp => kvp.Key == "Key").Value; + Assert.Single(entry.Errors); + + entry = Assert.Single(modelState, kvp => kvp.Key == "Value").Value; + Assert.Single(entry.Errors); } [Fact] diff --git a/src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj b/src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj index 3cd3ac71e5..0e33905acc 100644 --- a/src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj +++ b/src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj @@ -2,6 +2,7 @@ netcoreapp3.0 + false diff --git a/src/Mvc/test/Mvc.IntegrationTests/NullableReferenceTypeIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/NullableReferenceTypeIntegrationTest.cs new file mode 100644 index 0000000000..5fd7a89e89 --- /dev/null +++ b/src/Mvc/test/Mvc.IntegrationTests/NullableReferenceTypeIntegrationTest.cs @@ -0,0 +1,212 @@ +// 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.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.IO; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Internal; +using Microsoft.AspNetCore.Mvc.Abstractions; +using Microsoft.AspNetCore.Mvc.ModelBinding; +using Microsoft.Extensions.Primitives; +using Xunit; + +namespace Microsoft.AspNetCore.Mvc.IntegrationTests +{ + public class NullableReferenceTypeIntegrationTest + { +#nullable enable + private class Person1 + { + public string FirstName { get; set; } = default!; + } +#nullable restore + + [Fact] + public async Task BindProperty_WithNonNullableReferenceType_NoData_ValidationError() + { + // Arrange + var parameterBinder = ModelBindingTestHelper.GetParameterBinder(); + var parameter = new ParameterDescriptor() + { + Name = "Parameter1", + BindingInfo = new BindingInfo(), + ParameterType = typeof(Person1) + }; + + var testContext = ModelBindingTestHelper.GetTestContext(); + var modelState = testContext.ModelState; + + // Act + var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext); + + // Assert + + // ModelBindingResult + Assert.True(modelBindingResult.IsModelSet); + + // Model + var boundPerson = Assert.IsType(modelBindingResult.Model); + Assert.Null(boundPerson.FirstName); + + // ModelState + Assert.False(modelState.IsValid); + Assert.Collection( + modelState.OrderBy(kvp => kvp.Key), + kvp => + { + Assert.Equal("FirstName", kvp.Key); + Assert.Equal(ModelValidationState.Invalid, kvp.Value.ValidationState); + + // Not validating framework error message. + Assert.Single(kvp.Value.Errors); + }); + } + +#nullable enable + private class Person2 + { + public string? FirstName { get; set; } + } +#nullable restore + + [Fact] + public async Task BindProperty_WithNullableReferenceType_NoData_NoValidationError() + { + // Arrange + var parameterBinder = ModelBindingTestHelper.GetParameterBinder(); + var parameter = new ParameterDescriptor() + { + Name = "Parameter1", + BindingInfo = new BindingInfo(), + ParameterType = typeof(Person2) + }; + + var testContext = ModelBindingTestHelper.GetTestContext(); + var modelState = testContext.ModelState; + + // Act + var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext); + + // Assert + + // ModelBindingResult + Assert.True(modelBindingResult.IsModelSet); + + // Model + var boundPerson = Assert.IsType(modelBindingResult.Model); + Assert.Null(boundPerson.FirstName); + + // ModelState + Assert.True(modelState.IsValid); + } + +#nullable enable + private class Person3 + { + [Required(ErrorMessage = "Test")] + public string FirstName { get; set; } = default!; + } +#nullable restore + + [Fact] + public async Task BindProperty_WithNonNullableReferenceType_NoData_ValidationError_CustomMessage() + { + // Arrange + var parameterBinder = ModelBindingTestHelper.GetParameterBinder(); + var parameter = new ParameterDescriptor() + { + Name = "Parameter1", + BindingInfo = new BindingInfo(), + ParameterType = typeof(Person3) + }; + + var testContext = ModelBindingTestHelper.GetTestContext(); + var modelState = testContext.ModelState; + + // Act + var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext); + + // Assert + + // ModelBindingResult + Assert.True(modelBindingResult.IsModelSet); + + // Model + var boundPerson = Assert.IsType(modelBindingResult.Model); + Assert.Null(boundPerson.FirstName); + + // ModelState + Assert.False(modelState.IsValid); + Assert.Collection( + modelState.OrderBy(kvp => kvp.Key), + kvp => + { + Assert.Equal("FirstName", kvp.Key); + Assert.Equal(ModelValidationState.Invalid, kvp.Value.ValidationState); + + var error = Assert.Single(kvp.Value.Errors); + Assert.Equal("Test", error.ErrorMessage); + }); + } + +#nullable enable + private void NonNullableParameter(string param1) + { + } +#nullable restore + + [Fact] + public async Task BindParameter_WithNonNullableReferenceType_NoData_ValidationError() + { + // Arrange + var parameterBinder = ModelBindingTestHelper.GetParameterBinder(); + var parameter = new ParameterDescriptor() + { + Name = "param1", + BindingInfo = new BindingInfo(), + ParameterType = typeof(string) + }; + + var method = GetType().GetMethod(nameof(NonNullableParameter), BindingFlags.NonPublic | BindingFlags.Instance); + var parameterInfo = method.GetParameters().Single(); + var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider(); + var modelMetadata = modelMetadataProvider.GetMetadataForParameter(parameterInfo); + + var testContext = ModelBindingTestHelper.GetTestContext(); + var modelState = testContext.ModelState; + + // Act + var modelBindingResult = await parameterBinder.BindModelAsync( + parameter, + testContext, + modelMetadataProvider, + modelMetadata); + + // Assert + + // ModelBindingResult + Assert.False(modelBindingResult.IsModelSet); + + // Model + Assert.Null(modelBindingResult.Model); + + // ModelState + Assert.False(modelState.IsValid); + Assert.Collection( + modelState.OrderBy(kvp => kvp.Key), + kvp => + { + Assert.Equal("param1", kvp.Key); + Assert.Equal(ModelValidationState.Invalid, kvp.Value.ValidationState); + + // Not validating framework error message. + Assert.Single(kvp.Value.Errors); + }); + } + } +} \ No newline at end of file diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/NonNullableController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/NonNullableController.cs new file mode 100644 index 0000000000..b5f3d6c3ac --- /dev/null +++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/NonNullableController.cs @@ -0,0 +1,33 @@ +// 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. + +#nullable enable +using BasicWebSite.Models; +using Microsoft.AspNetCore.Mvc; + +namespace BasicWebSite.Controllers +{ + public class NonNullableController : Controller + { + public ActionResult Index() + { + return View(); + } + + [HttpPost] + public ActionResult Index(NonNullablePerson person, string description) + { + if (ModelState.IsValid) + { + return RedirectToAction(); + } + + return View(person); + } + + public class NonNullablePerson + { + public string Name { get; set; } = default!; + } + } +} diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/RazorComponentsController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/RazorComponentsController.cs index 2234bf7ba6..fd82753b6c 100644 --- a/src/Mvc/test/WebSites/BasicWebSite/Controllers/RazorComponentsController.cs +++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/RazorComponentsController.cs @@ -70,6 +70,12 @@ namespace BasicWebSite.Controllers return Ok(_weatherData); } + [HttpGet("/components/Navigation/{staticPrerender=true}")] + public IActionResult Navigation(bool staticPrerender) + { + return View(staticPrerender); + } + private class WeatherRow { public string DateFormatted { get; internal set; } diff --git a/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/FetchData.razor b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/FetchData.razor index 79f6d6937c..3ed6d5d979 100644 --- a/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/FetchData.razor +++ b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/FetchData.razor @@ -35,7 +35,7 @@ else } -@functions { +@code { [Parameter] DateTime StartDate { get; set; } WeatherForecast[] forecasts; diff --git a/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/NavigationComponent.razor b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/NavigationComponent.razor new file mode 100644 index 0000000000..0e9259d691 --- /dev/null +++ b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/NavigationComponent.razor @@ -0,0 +1,9 @@ +@inject IUriHelper Helper + +@functions{ + + protected override void OnInit() + { + Helper.NavigateTo("/navigation-redirect"); + } +} \ No newline at end of file diff --git a/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/Throws.razor b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/Throws.razor index 3291fba732..2bfe1d7c4d 100644 --- a/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/Throws.razor +++ b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/Throws.razor @@ -1,7 +1,7 @@ @page "/components/throws" - + @* This is expected to throw and result in a 500 *@ -@functions { +@code { protected override async Task OnInitAsync() { await base.OnInitAsync(); diff --git a/src/Mvc/test/WebSites/BasicWebSite/Startup.cs b/src/Mvc/test/WebSites/BasicWebSite/Startup.cs index 7e5236d53b..3d93826f2c 100644 --- a/src/Mvc/test/WebSites/BasicWebSite/Startup.cs +++ b/src/Mvc/test/WebSites/BasicWebSite/Startup.cs @@ -13,8 +13,6 @@ namespace BasicWebSite // Set up application services public void ConfigureServices(IServiceCollection services) { - services.AddRouting(); - services.AddMvc() .SetCompatibilityVersion(CompatibilityVersion.Latest) .AddNewtonsoftJson() diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/NonNullable/Index.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/NonNullable/Index.cshtml new file mode 100644 index 0000000000..518b1504b2 --- /dev/null +++ b/src/Mvc/test/WebSites/BasicWebSite/Views/NonNullable/Index.cshtml @@ -0,0 +1,10 @@ +@model BasicWebSite.Controllers.NonNullableController.NonNullablePerson +@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers" + +
    + + +

    Name:

    + + + \ No newline at end of file diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/RazorComponents/Navigation.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/RazorComponents/Navigation.cshtml new file mode 100644 index 0000000000..292ad7c7dc --- /dev/null +++ b/src/Mvc/test/WebSites/BasicWebSite/Views/RazorComponents/Navigation.cshtml @@ -0,0 +1,13 @@ +@using BasicWebSite.RazorComponents; +@model bool; +

    Navigation components

    + \ No newline at end of file diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs index 0ebaf0c324..1e848590ae 100644 --- a/src/Mvc/test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs +++ b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs @@ -64,5 +64,20 @@ namespace FormatterWebSite.Controllers return Content(value.ToString()); } + + [HttpPost] + public ActionResult RoundtripSimpleModel([FromBody] SimpleModel model) + { + return model; + } + + public class SimpleModel + { + public int Id { get; set; } + + public string Name { get; set; } + + public string StreetName { get; set; } + } } } \ No newline at end of file diff --git a/src/Mvc/test/WebSites/SecurityWebSite/Controllers/LoginController.cs b/src/Mvc/test/WebSites/SecurityWebSite/Controllers/LoginController.cs index e5b80fc48d..044cc39d49 100644 --- a/src/Mvc/test/WebSites/SecurityWebSite/Controllers/LoginController.cs +++ b/src/Mvc/test/WebSites/SecurityWebSite/Controllers/LoginController.cs @@ -24,7 +24,7 @@ namespace SecurityWebSite.Controllers [HttpPost] public async Task LoginClaimA() { - var identity = new ClaimsIdentity(new[] { new Claim("ClaimA", "Value") }); + var identity = new ClaimsIdentity(new[] { new Claim("ClaimA", "Value") }, CookieAuthenticationDefaults.AuthenticationScheme); await HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, new ClaimsPrincipal(identity)); return Ok(); } @@ -32,7 +32,7 @@ namespace SecurityWebSite.Controllers [HttpPost] public async Task LoginClaimAB() { - var identity = new ClaimsIdentity(new[] { new Claim("ClaimA", "Value"), new Claim("ClaimB", "Value") }); + var identity = new ClaimsIdentity(new[] { new Claim("ClaimA", "Value"), new Claim("ClaimB", "Value") }, CookieAuthenticationDefaults.AuthenticationScheme); await HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, new ClaimsPrincipal(identity)); return Ok(); } diff --git a/src/ProjectTemplates/ProjectTemplates.sln b/src/ProjectTemplates/ProjectTemplates.sln index a1f50a1097..49579d6fc1 100644 --- a/src/ProjectTemplates/ProjectTemplates.sln +++ b/src/ProjectTemplates/ProjectTemplates.sln @@ -79,8 +79,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{B3928FBE-FCC1-4174-A581-53369D1B40E3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions", "..\Servers\Kestrel\Transport.Abstractions\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj", "{CF55C43C-C96A-4AF1-9F52-974CB4C992E6}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "..\Servers\Kestrel\Transport.Sockets\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", "{B711B31D-727E-4142-BE50-50FA8AAC2EF5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Cookies", "..\Security\Authentication\Cookies\src\Microsoft.AspNetCore.Authentication.Cookies.csproj", "{50896EEB-D3FD-4D2E-BD46-F42E3333C7CF}" @@ -647,18 +645,6 @@ Global {B3928FBE-FCC1-4174-A581-53369D1B40E3}.Release|x64.Build.0 = Release|Any CPU {B3928FBE-FCC1-4174-A581-53369D1B40E3}.Release|x86.ActiveCfg = Release|Any CPU {B3928FBE-FCC1-4174-A581-53369D1B40E3}.Release|x86.Build.0 = Release|Any CPU - {CF55C43C-C96A-4AF1-9F52-974CB4C992E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF55C43C-C96A-4AF1-9F52-974CB4C992E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF55C43C-C96A-4AF1-9F52-974CB4C992E6}.Debug|x64.ActiveCfg = Debug|Any CPU - {CF55C43C-C96A-4AF1-9F52-974CB4C992E6}.Debug|x64.Build.0 = Debug|Any CPU - {CF55C43C-C96A-4AF1-9F52-974CB4C992E6}.Debug|x86.ActiveCfg = Debug|Any CPU - {CF55C43C-C96A-4AF1-9F52-974CB4C992E6}.Debug|x86.Build.0 = Debug|Any CPU - {CF55C43C-C96A-4AF1-9F52-974CB4C992E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF55C43C-C96A-4AF1-9F52-974CB4C992E6}.Release|Any CPU.Build.0 = Release|Any CPU - {CF55C43C-C96A-4AF1-9F52-974CB4C992E6}.Release|x64.ActiveCfg = Release|Any CPU - {CF55C43C-C96A-4AF1-9F52-974CB4C992E6}.Release|x64.Build.0 = Release|Any CPU - {CF55C43C-C96A-4AF1-9F52-974CB4C992E6}.Release|x86.ActiveCfg = Release|Any CPU - {CF55C43C-C96A-4AF1-9F52-974CB4C992E6}.Release|x86.Build.0 = Release|Any CPU {B711B31D-727E-4142-BE50-50FA8AAC2EF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B711B31D-727E-4142-BE50-50FA8AAC2EF5}.Debug|Any CPU.Build.0 = Debug|Any CPU {B711B31D-727E-4142-BE50-50FA8AAC2EF5}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1285,7 +1271,6 @@ Global {571FBBC8-F6E1-4DCE-8D56-A84E2EB6A013} = {D64F966A-B33B-4554-BA8C-A1AF91265996} {063276D5-D247-4C6D-A2DA-8707017A6244} = {D64F966A-B33B-4554-BA8C-A1AF91265996} {B3928FBE-FCC1-4174-A581-53369D1B40E3} = {D64F966A-B33B-4554-BA8C-A1AF91265996} - {CF55C43C-C96A-4AF1-9F52-974CB4C992E6} = {D64F966A-B33B-4554-BA8C-A1AF91265996} {B711B31D-727E-4142-BE50-50FA8AAC2EF5} = {D64F966A-B33B-4554-BA8C-A1AF91265996} {50896EEB-D3FD-4D2E-BD46-F42E3333C7CF} = {D64F966A-B33B-4554-BA8C-A1AF91265996} {A76543B7-5E29-452E-B1BF-24A9323AE031} = {D64F966A-B33B-4554-BA8C-A1AF91265996} diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/RazorComponent/Component1.razor b/src/ProjectTemplates/Web.ItemTemplates/content/RazorComponent/Component1.razor index 68d4749c0d..bc0a14eec4 100644 --- a/src/ProjectTemplates/Web.ItemTemplates/content/RazorComponent/Component1.razor +++ b/src/ProjectTemplates/Web.ItemTemplates/content/RazorComponent/Component1.razor @@ -1,5 +1,5 @@

    Component1

    -@functions { +@code { } diff --git a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj index c138d59d9f..d32b7e75d4 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj +++ b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj @@ -32,7 +32,6 @@ -     diff --git a/src/ProjectTemplates/Web.ProjectTemplates/RazorComponentsWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/RazorComponentsWeb-CSharp.csproj.in index a5d1fdc23a..5218e835bd 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/RazorComponentsWeb-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/RazorComponentsWeb-CSharp.csproj.in @@ -3,8 +3,30 @@ netcoreapp3.0 7.3 + aspnet-RazorComponentsWeb_CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502 + 0 + 1 True RazorComponentsWeb_CSharp + + + + + + + + + + + + + + + + + + + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in index 1b8a5103ff..3e14a0a1e0 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in @@ -22,7 +22,6 @@ - diff --git a/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in index c6fbbb7bf0..563b2c2927 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in @@ -22,7 +22,6 @@ - diff --git a/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in b/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in index 40c54ea3be..4192478d05 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in @@ -14,7 +14,6 @@ - diff --git a/src/ProjectTemplates/Web.ProjectTemplates/WebApi-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/WebApi-CSharp.csproj.in index bc72c6f34f..e146f8753d 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/WebApi-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/WebApi-CSharp.csproj.in @@ -12,7 +12,6 @@ - diff --git a/src/ProjectTemplates/Web.ProjectTemplates/WebApi-FSharp.fsproj.in b/src/ProjectTemplates/Web.ProjectTemplates/WebApi-FSharp.fsproj.in index 9e07584065..c6017dc6c8 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/WebApi-FSharp.fsproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/WebApi-FSharp.fsproj.in @@ -12,8 +12,4 @@ - - - - diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/.template.config/dotnetcli.host.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/.template.config/dotnetcli.host.json index 79c2dc39e3..2473827568 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/.template.config/dotnetcli.host.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/.template.config/dotnetcli.host.json @@ -1,6 +1,49 @@ { "$schema": "http://json.schemastore.org/dotnetcli.host", "symbolInfo": { + "UseLocalDB": { + "longName": "use-local-db" + }, + "AADInstance": { + "longName": "aad-instance", + "shortName": "" + }, + "AAdB2CInstance": { + "longName": "aad-b2c-instance", + "shortName": "" + }, + "SignUpSignInPolicyId": { + "longName": "susi-policy-id", + "shortName": "ssp" + }, + "ResetPasswordPolicyId": { + "longName": "reset-password-policy-id", + "shortName": "rp" + }, + "EditProfilePolicyId": { + "longName": "edit-profile-policy-id", + "shortName": "ep" + }, + "OrgReadAccess": { + "longName": "org-read-access", + "shortName": "r" + }, + "ClientId": { + "longName": "client-id", + "shortName": "" + }, + "CallbackPath": { + "longName": "callback-path", + "shortName": "" + }, + "Domain": { + "longName": "domain", + "shortName": "" + }, + "TenantId": { + "longName": "tenant-id", + "shortName": "" + }, "Framework": { "longName": "framework" }, @@ -18,12 +61,15 @@ "longName": "exclude-launch-settings", "shortName": "" }, + "UserSecretsId": { + "isHidden": true + }, "NoHttps": { "longName": "no-https", "shortName": "" } }, "usageExamples": [ - "" + "--auth Individual" ] } diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/.template.config/template.json index 5e1f178915..106e9fcc39 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/.template.config/template.json @@ -12,25 +12,174 @@ "precedence": "5000", "identity": "Microsoft.Web.RazorComponents.CSharp.3.0", "shortName": "blazorserverside", + "thirdPartyNotices": "https://aka.ms/aspnetcore-template-3pn-210", "tags": { "language": "C#", "type": "project" }, "sourceName": "RazorComponentsWeb-CSharp", "preferNameDirectory": true, + "guids": [ + "09732173-2cef-46b7-83db-1334bcb079d3", // Tenant ID + "53bc9b9d-9d6a-45d4-8429-2a2761773502" // Client ID + ], "sources": [ { "modifiers": [ + { + "condition": "(!IndividualLocalAuth || UseLocalDB)", + "exclude": [ + "app.db" + ] + }, + { + "condition": "(!IndividualLocalAuth)", + "exclude": [ + "Data/SqlLite/**", + "Data/SqlServer/**", + "Data/ApplicationDbContext.cs", + "Areas/**" + ] + }, { "condition": "(ExcludeLaunchSettings)", "exclude": [ "Properties/launchSettings.json" ] + }, + { + "condition": "(IndividualLocalAuth && UseLocalDB)", + "rename": { + "Data/SqlServer/": "Data/Migrations/" + }, + "exclude": [ + "Data/SqlLite/**" + ] + }, + { + "condition": "(IndividualLocalAuth && !UseLocalDB)", + "rename": { + "Data/SqlLite/": "Data/Migrations/" + }, + "exclude": [ + "Data/SqlServer/**" + ] + }, + { + "condition": "(NoAuth)", + "exclude": [ + "Shared/LoginDisplay.razor" + ] } ] } ], "symbols": { + "auth": { + "type": "parameter", + "datatype": "choice", + "choices": [ + { + "choice": "None", + "description": "No authentication" + }, + { + "choice": "Individual", + "description": "Individual authentication" + }, + { + "choice": "IndividualB2C", + "description": "Individual authentication with Azure AD B2C" + }, + { + "choice": "SingleOrg", + "description": "Organizational authentication for a single tenant" + }, + { + "choice": "MultiOrg", + "description": "Organizational authentication for multiple tenants" + }, + { + "choice": "Windows", + "description": "Windows authentication" + } + ], + "defaultValue": "None", + "description": "The type of authentication to use" + }, + "AAdB2CInstance": { + "type": "parameter", + "datatype": "string", + "defaultValue": "https://login.microsoftonline.com/tfp/", + "replaces": "https:////login.microsoftonline.com/tfp/", + "description": "The Azure Active Directory B2C instance to connect to (use with IndividualB2C auth)." + }, + "SignUpSignInPolicyId": { + "type": "parameter", + "datatype": "string", + "defaultValue": "", + "replaces": "MySignUpSignInPolicyId", + "description": "The sign-in and sign-up policy ID for this project (use with IndividualB2C auth)." + }, + "ResetPasswordPolicyId": { + "type": "parameter", + "datatype": "string", + "defaultValue": "", + "replaces": "MyResetPasswordPolicyId", + "description": "The reset password policy ID for this project (use with IndividualB2C auth)." + }, + "EditProfilePolicyId": { + "type": "parameter", + "datatype": "string", + "defaultValue": "", + "replaces": "MyEditProfilePolicyId", + "description": "The edit profile policy ID for this project (use with IndividualB2C auth)." + }, + "AADInstance": { + "type": "parameter", + "datatype": "string", + "defaultValue": "https://login.microsoftonline.com/", + "replaces": "https:////login.microsoftonline.com/", + "description": "The Azure Active Directory instance to connect to (use with SingleOrg or MultiOrg auth)." + }, + "ClientId": { + "type": "parameter", + "datatype": "string", + "replaces": "11111111-1111-1111-11111111111111111", + "description": "The Client ID for this project (use with IndividualB2C, SingleOrg or MultiOrg auth)." + }, + "Domain": { + "type": "parameter", + "datatype": "string", + "replaces": "qualified.domain.name", + "description": "The domain for the directory tenant (use with SingleOrg or IndividualB2C auth)." + }, + "TenantId": { + "type": "parameter", + "datatype": "string", + "replaces": "22222222-2222-2222-2222-222222222222", + "description": "The TenantId ID of the directory to connect to (use with SingleOrg auth)." + }, + "CallbackPath": { + "type": "parameter", + "datatype": "string", + "replaces": "/signin-oidc", + "defaultValue": "/signin-oidc", + "description": "The request path within the application's base path of the redirect URI (use with SingleOrg or IndividualB2C auth)." + }, + "OrgReadAccess": { + "type": "parameter", + "datatype": "bool", + "defaultValue": "false", + "description": "Whether or not to allow this application read access to the directory (only applies to SingleOrg or MultiOrg auth)." + }, + "UserSecretsId": { + "type": "parameter", + "datatype": "string", + "replaces": "aspnet-RazorComponentsWeb-CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502", + "defaultValue": "aspnet-RazorComponentsWeb-CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502", + "description": "The ID to use for secrets (use with OrgReadAccess or Individual auth)." + }, "ExcludeLaunchSettings": { "type": "parameter", "datatype": "bool", @@ -77,6 +226,54 @@ }, "replaces": "44300" }, + "OrganizationalAuth": { + "type": "computed", + "value": "(auth == \"SingleOrg\" || auth == \"MultiOrg\")" + }, + "WindowsAuth": { + "type": "computed", + "value": "(auth == \"Windows\")" + }, + "MultiOrgAuth": { + "type": "computed", + "value": "(auth == \"MultiOrg\")" + }, + "SingleOrgAuth": { + "type": "computed", + "value": "(auth == \"SingleOrg\")" + }, + "IndividualLocalAuth": { + "type": "computed", + "value": "(auth == \"Individual\")" + }, + "IndividualAuth": { + "type": "computed", + "value": "(auth == \"Individual\" || auth == \"IndividualB2C\")" + }, + "IndividualB2CAuth": { + "type": "computed", + "value": "(auth == \"IndividualB2C\")" + }, + "NoAuth": { + "type": "computed", + "value": "(!(IndividualAuth || OrganizationalAuth || WindowsAuth))" + }, + "RequiresHttps": { + "type": "computed", + "value": "(OrganizationalAuth || IndividualAuth || !NoHttps)" + }, + "NoHttps": { + "type": "parameter", + "datatype": "bool", + "defaultValue": "false", + "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth." + }, + "UseLocalDB": { + "type": "parameter", + "datatype": "bool", + "defaultValue": "false", + "description": "Whether to use LocalDB instead of SQLite. This option only applies if --auth Individual or --auth IndividualB2C is specified." + }, "Framework": { "type": "parameter", "description": "The target framework for the project.", @@ -103,16 +300,6 @@ "datatype": "bool", "description": "If specified, skips the automatic restore of the project on create.", "defaultValue": "false" - }, - "RequiresHttps": { - "type": "computed", - "value": "(!NoHttps)" - }, - "NoHttps": { - "type": "parameter", - "datatype": "bool", - "defaultValue": "false", - "description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth." } }, "primaryOutputs": [ diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/.template.config/vs-2017.3.host.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/.template.config/vs-2017.3.host.json index d7c0347fe3..a41e7e76d7 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/.template.config/vs-2017.3.host.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/.template.config/vs-2017.3.host.json @@ -16,6 +16,38 @@ "uiFilters": [ "oneaspnet" ], + "usesOidc": true, + "supportedAuthentications": [ + { + "auth": "None", + "authenticationType": "NoAuth", + "allowUnsecured": true + }, + { + "auth": "Individual", + "authenticationType": "IndividualAuth", + "b2cAuthenticationOptions": "CloudExisting" + }, + { + "auth": "Individual", + "authenticationType": "IndividualAuth", + "b2cAuthenticationOptions": "Local" + }, + { + "auth": "SingleOrg", + "authenticationType": "OrgAuth", + "orgAuthenticationOptions": "SSO" + }, + { + "auth": "MultiOrg", + "authenticationType": "OrgAuth", + "orgAuthenticationOptions": "MultiOrg" + }, + { + "auth": "Windows", + "authenticationType": "WindowsAuth" + } + ], "ports": [ { "name": "HttpPort", @@ -27,6 +59,7 @@ } ], "excludeLaunchSettings": false, + "azureReplyUrlPortName": "HttpsPort", "minFullFrameworkVersion": "4.6.1", "disableHttpsSymbol": "NoHttps" } diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/App.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/App.razor index 03eee81cef..844a2b2455 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/App.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/App.razor @@ -1,5 +1,8 @@ -@* - The Router component displays whichever component has a @page - directive matching the current URI. -*@ - + + + +

    Page not found

    +

    Sorry, there's nothing at this address.

    +     +     +     diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Areas/Identity/Pages/Account/LogOut.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Areas/Identity/Pages/Account/LogOut.cshtml new file mode 100644 index 0000000000..4ea81fc052 --- /dev/null +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Areas/Identity/Pages/Account/LogOut.cshtml @@ -0,0 +1,14 @@ +@page +@using Microsoft.AspNetCore.Identity +@inject SignInManager SignInManager +@functions { + public async Task OnGet() + { + if (SignInManager.IsSignedIn(User)) + { + await SignInManager.SignOutAsync(); + } + + return Redirect("~/"); + } +} diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Areas/Identity/Pages/Shared/_LoginPartial.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Areas/Identity/Pages/Shared/_LoginPartial.cshtml new file mode 100644 index 0000000000..e55bafe6a7 --- /dev/null +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Areas/Identity/Pages/Shared/_LoginPartial.cshtml @@ -0,0 +1,25 @@ +@using Microsoft.AspNetCore.Identity +@inject SignInManager SignInManager +@inject UserManager UserManager +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers + + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Data/ApplicationDbContext.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Data/ApplicationDbContext.cs new file mode 100644 index 0000000000..6a343d68c3 --- /dev/null +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Data/ApplicationDbContext.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Text; +using Microsoft.AspNetCore.Identity.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; + +namespace RazorComponentsWeb_CSharp.Data +{ + public class ApplicationDbContext : IdentityDbContext + { + public ApplicationDbContext(DbContextOptions options) + : base(options) + { + } + } +} diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Data/SqlLite/00000000000000_CreateIdentitySchema.Designer.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Data/SqlLite/00000000000000_CreateIdentitySchema.Designer.cs new file mode 100644 index 0000000000..7366f582d3 --- /dev/null +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Data/SqlLite/00000000000000_CreateIdentitySchema.Designer.cs @@ -0,0 +1,229 @@ +// +using System; +using RazorComponentsWeb_CSharp.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +namespace RazorComponentsWeb_CSharp.Data.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("00000000000000_CreateIdentitySchema")] + partial class CreateIdentitySchema + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "2.2.0-preview1"); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("Name") + .HasMaxLength(256); + + b.Property("NormalizedName") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasName("RoleNameIndex"); + + b.ToTable("AspNetRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("RoleId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AccessFailedCount"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("Email") + .HasMaxLength(256); + + b.Property("EmailConfirmed"); + + b.Property("LockoutEnabled"); + + b.Property("LockoutEnd"); + + b.Property("NormalizedEmail") + .HasMaxLength(256); + + b.Property("NormalizedUserName") + .HasMaxLength(256); + + b.Property("PasswordHash"); + + b.Property("PhoneNumber"); + + b.Property("PhoneNumberConfirmed"); + + b.Property("SecurityStamp"); + + b.Property("TwoFactorEnabled"); + + b.Property("UserName") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasName("UserNameIndex"); + + b.ToTable("AspNetUsers"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasMaxLength(128); + + b.Property("ProviderKey") + .HasMaxLength(128); + + b.Property("ProviderDisplayName"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId"); + + b.Property("RoleId"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId"); + + b.Property("LoginProvider") + .HasMaxLength(128); + + b.Property("Name") + .HasMaxLength(128); + + b.Property("Value"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole") + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole") + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Data/SqlLite/00000000000000_CreateIdentitySchema.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Data/SqlLite/00000000000000_CreateIdentitySchema.cs new file mode 100644 index 0000000000..3fb498bc9a --- /dev/null +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Data/SqlLite/00000000000000_CreateIdentitySchema.cs @@ -0,0 +1,217 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace RazorComponentsWeb_CSharp.Data.Migrations +{ + public partial class CreateIdentitySchema : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "AspNetRoles", + columns: table => new + { + Id = table.Column(nullable: false), + Name = table.Column(maxLength: 256, nullable: true), + NormalizedName = table.Column(maxLength: 256, nullable: true), + ConcurrencyStamp = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetRoles", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AspNetUsers", + columns: table => new + { + Id = table.Column(nullable: false), + UserName = table.Column(maxLength: 256, nullable: true), + NormalizedUserName = table.Column(maxLength: 256, nullable: true), + Email = table.Column(maxLength: 256, nullable: true), + NormalizedEmail = table.Column(maxLength: 256, nullable: true), + EmailConfirmed = table.Column(nullable: false), + PasswordHash = table.Column(nullable: true), + SecurityStamp = table.Column(nullable: true), + ConcurrencyStamp = table.Column(nullable: true), + PhoneNumber = table.Column(nullable: true), + PhoneNumberConfirmed = table.Column(nullable: false), + TwoFactorEnabled = table.Column(nullable: false), + LockoutEnd = table.Column(nullable: true), + LockoutEnabled = table.Column(nullable: false), + AccessFailedCount = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUsers", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AspNetRoleClaims", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + RoleId = table.Column(nullable: false), + ClaimType = table.Column(nullable: true), + ClaimValue = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetRoleClaims", x => x.Id); + table.ForeignKey( + name: "FK_AspNetRoleClaims_AspNetRoles_RoleId", + column: x => x.RoleId, + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AspNetUserClaims", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + UserId = table.Column(nullable: false), + ClaimType = table.Column(nullable: true), + ClaimValue = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserClaims", x => x.Id); + table.ForeignKey( + name: "FK_AspNetUserClaims_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AspNetUserLogins", + columns: table => new + { + LoginProvider = table.Column(maxLength: 128, nullable: false), + ProviderKey = table.Column(maxLength: 128, nullable: false), + ProviderDisplayName = table.Column(nullable: true), + UserId = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserLogins", x => new { x.LoginProvider, x.ProviderKey }); + table.ForeignKey( + name: "FK_AspNetUserLogins_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AspNetUserRoles", + columns: table => new + { + UserId = table.Column(nullable: false), + RoleId = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserRoles", x => new { x.UserId, x.RoleId }); + table.ForeignKey( + name: "FK_AspNetUserRoles_AspNetRoles_RoleId", + column: x => x.RoleId, + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_AspNetUserRoles_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AspNetUserTokens", + columns: table => new + { + UserId = table.Column(nullable: false), + LoginProvider = table.Column(maxLength: 128, nullable: false), + Name = table.Column(maxLength: 128, nullable: false), + Value = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserTokens", x => new { x.UserId, x.LoginProvider, x.Name }); + table.ForeignKey( + name: "FK_AspNetUserTokens_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_AspNetRoleClaims_RoleId", + table: "AspNetRoleClaims", + column: "RoleId"); + + migrationBuilder.CreateIndex( + name: "RoleNameIndex", + table: "AspNetRoles", + column: "NormalizedName", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_AspNetUserClaims_UserId", + table: "AspNetUserClaims", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "IX_AspNetUserLogins_UserId", + table: "AspNetUserLogins", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "IX_AspNetUserRoles_RoleId", + table: "AspNetUserRoles", + column: "RoleId"); + + migrationBuilder.CreateIndex( + name: "EmailIndex", + table: "AspNetUsers", + column: "NormalizedEmail"); + + migrationBuilder.CreateIndex( + name: "UserNameIndex", + table: "AspNetUsers", + column: "NormalizedUserName", + unique: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "AspNetRoleClaims"); + + migrationBuilder.DropTable( + name: "AspNetUserClaims"); + + migrationBuilder.DropTable( + name: "AspNetUserLogins"); + + migrationBuilder.DropTable( + name: "AspNetUserRoles"); + + migrationBuilder.DropTable( + name: "AspNetUserTokens"); + + migrationBuilder.DropTable( + name: "AspNetRoles"); + + migrationBuilder.DropTable( + name: "AspNetUsers"); + } + } +} diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Data/SqlLite/ApplicationDbContextModelSnapshot.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Data/SqlLite/ApplicationDbContextModelSnapshot.cs new file mode 100644 index 0000000000..b3309a77ea --- /dev/null +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Data/SqlLite/ApplicationDbContextModelSnapshot.cs @@ -0,0 +1,227 @@ +// +using System; +using RazorComponentsWeb_CSharp.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +namespace RazorComponentsWeb_CSharp.Data.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + partial class ApplicationDbContextModelSnapshot : ModelSnapshot + { + protected override void BuildModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "2.2.0-preview1"); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("Name") + .HasMaxLength(256); + + b.Property("NormalizedName") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasName("RoleNameIndex"); + + b.ToTable("AspNetRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("RoleId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AccessFailedCount"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("Email") + .HasMaxLength(256); + + b.Property("EmailConfirmed"); + + b.Property("LockoutEnabled"); + + b.Property("LockoutEnd"); + + b.Property("NormalizedEmail") + .HasMaxLength(256); + + b.Property("NormalizedUserName") + .HasMaxLength(256); + + b.Property("PasswordHash"); + + b.Property("PhoneNumber"); + + b.Property("PhoneNumberConfirmed"); + + b.Property("SecurityStamp"); + + b.Property("TwoFactorEnabled"); + + b.Property("UserName") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasName("UserNameIndex"); + + b.ToTable("AspNetUsers"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasMaxLength(128); + + b.Property("ProviderKey") + .HasMaxLength(128); + + b.Property("ProviderDisplayName"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId"); + + b.Property("RoleId"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId"); + + b.Property("LoginProvider") + .HasMaxLength(128); + + b.Property("Name") + .HasMaxLength(128); + + b.Property("Value"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole") + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole") + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Data/SqlServer/00000000000000_CreateIdentitySchema.Designer.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Data/SqlServer/00000000000000_CreateIdentitySchema.Designer.cs new file mode 100644 index 0000000000..784684d257 --- /dev/null +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Data/SqlServer/00000000000000_CreateIdentitySchema.Designer.cs @@ -0,0 +1,236 @@ +// +using System; +using RazorComponentsWeb_CSharp.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +namespace RazorComponentsWeb_CSharp.Data.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("00000000000000_CreateIdentitySchema")] + partial class CreateIdentitySchema + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "2.2.0-preview1") + .HasAnnotation("Relational:MaxIdentifierLength", 128) + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("Name") + .HasMaxLength(256); + + b.Property("NormalizedName") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasName("RoleNameIndex") + .HasFilter("[NormalizedName] IS NOT NULL"); + + b.ToTable("AspNetRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("RoleId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AccessFailedCount"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("Email") + .HasMaxLength(256); + + b.Property("EmailConfirmed"); + + b.Property("LockoutEnabled"); + + b.Property("LockoutEnd"); + + b.Property("NormalizedEmail") + .HasMaxLength(256); + + b.Property("NormalizedUserName") + .HasMaxLength(256); + + b.Property("PasswordHash"); + + b.Property("PhoneNumber"); + + b.Property("PhoneNumberConfirmed"); + + b.Property("SecurityStamp"); + + b.Property("TwoFactorEnabled"); + + b.Property("UserName") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasName("UserNameIndex") + .HasFilter("[NormalizedUserName] IS NOT NULL"); + + b.ToTable("AspNetUsers"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasMaxLength(128); + + b.Property("ProviderKey") + .HasMaxLength(128); + + b.Property("ProviderDisplayName"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId"); + + b.Property("RoleId"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId"); + + b.Property("LoginProvider") + .HasMaxLength(128); + + b.Property("Name") + .HasMaxLength(128); + + b.Property("Value"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole") + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole") + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Data/SqlServer/00000000000000_CreateIdentitySchema.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Data/SqlServer/00000000000000_CreateIdentitySchema.cs new file mode 100644 index 0000000000..d7cf2c926d --- /dev/null +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Data/SqlServer/00000000000000_CreateIdentitySchema.cs @@ -0,0 +1,220 @@ +using System; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace RazorComponentsWeb_CSharp.Data.Migrations +{ + public partial class CreateIdentitySchema : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "AspNetRoles", + columns: table => new + { + Id = table.Column(nullable: false), + Name = table.Column(maxLength: 256, nullable: true), + NormalizedName = table.Column(maxLength: 256, nullable: true), + ConcurrencyStamp = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetRoles", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AspNetUsers", + columns: table => new + { + Id = table.Column(nullable: false), + UserName = table.Column(maxLength: 256, nullable: true), + NormalizedUserName = table.Column(maxLength: 256, nullable: true), + Email = table.Column(maxLength: 256, nullable: true), + NormalizedEmail = table.Column(maxLength: 256, nullable: true), + EmailConfirmed = table.Column(nullable: false), + PasswordHash = table.Column(nullable: true), + SecurityStamp = table.Column(nullable: true), + ConcurrencyStamp = table.Column(nullable: true), + PhoneNumber = table.Column(nullable: true), + PhoneNumberConfirmed = table.Column(nullable: false), + TwoFactorEnabled = table.Column(nullable: false), + LockoutEnd = table.Column(nullable: true), + LockoutEnabled = table.Column(nullable: false), + AccessFailedCount = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUsers", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AspNetRoleClaims", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn), + RoleId = table.Column(nullable: false), + ClaimType = table.Column(nullable: true), + ClaimValue = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetRoleClaims", x => x.Id); + table.ForeignKey( + name: "FK_AspNetRoleClaims_AspNetRoles_RoleId", + column: x => x.RoleId, + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AspNetUserClaims", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn), + UserId = table.Column(nullable: false), + ClaimType = table.Column(nullable: true), + ClaimValue = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserClaims", x => x.Id); + table.ForeignKey( + name: "FK_AspNetUserClaims_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AspNetUserLogins", + columns: table => new + { + LoginProvider = table.Column(maxLength: 128, nullable: false), + ProviderKey = table.Column(maxLength: 128, nullable: false), + ProviderDisplayName = table.Column(nullable: true), + UserId = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserLogins", x => new { x.LoginProvider, x.ProviderKey }); + table.ForeignKey( + name: "FK_AspNetUserLogins_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AspNetUserRoles", + columns: table => new + { + UserId = table.Column(nullable: false), + RoleId = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserRoles", x => new { x.UserId, x.RoleId }); + table.ForeignKey( + name: "FK_AspNetUserRoles_AspNetRoles_RoleId", + column: x => x.RoleId, + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_AspNetUserRoles_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AspNetUserTokens", + columns: table => new + { + UserId = table.Column(nullable: false), + LoginProvider = table.Column(maxLength: 128, nullable: false), + Name = table.Column(maxLength: 128, nullable: false), + Value = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserTokens", x => new { x.UserId, x.LoginProvider, x.Name }); + table.ForeignKey( + name: "FK_AspNetUserTokens_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_AspNetRoleClaims_RoleId", + table: "AspNetRoleClaims", + column: "RoleId"); + + migrationBuilder.CreateIndex( + name: "RoleNameIndex", + table: "AspNetRoles", + column: "NormalizedName", + unique: true, + filter: "[NormalizedName] IS NOT NULL"); + + migrationBuilder.CreateIndex( + name: "IX_AspNetUserClaims_UserId", + table: "AspNetUserClaims", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "IX_AspNetUserLogins_UserId", + table: "AspNetUserLogins", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "IX_AspNetUserRoles_RoleId", + table: "AspNetUserRoles", + column: "RoleId"); + + migrationBuilder.CreateIndex( + name: "EmailIndex", + table: "AspNetUsers", + column: "NormalizedEmail"); + + migrationBuilder.CreateIndex( + name: "UserNameIndex", + table: "AspNetUsers", + column: "NormalizedUserName", + unique: true, + filter: "[NormalizedUserName] IS NOT NULL"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "AspNetRoleClaims"); + + migrationBuilder.DropTable( + name: "AspNetUserClaims"); + + migrationBuilder.DropTable( + name: "AspNetUserLogins"); + + migrationBuilder.DropTable( + name: "AspNetUserRoles"); + + migrationBuilder.DropTable( + name: "AspNetUserTokens"); + + migrationBuilder.DropTable( + name: "AspNetRoles"); + + migrationBuilder.DropTable( + name: "AspNetUsers"); + } + } +} diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Data/SqlServer/ApplicationDbContextModelSnapshot.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Data/SqlServer/ApplicationDbContextModelSnapshot.cs new file mode 100644 index 0000000000..2f6c07f6ae --- /dev/null +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Data/SqlServer/ApplicationDbContextModelSnapshot.cs @@ -0,0 +1,234 @@ +// +using System; +using RazorComponentsWeb_CSharp.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +namespace RazorComponentsWeb_CSharp.Data.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + partial class ApplicationDbContextModelSnapshot : ModelSnapshot + { + protected override void BuildModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "2.2.0-preview1") + .HasAnnotation("Relational:MaxIdentifierLength", 128) + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("Name") + .HasMaxLength(256); + + b.Property("NormalizedName") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasName("RoleNameIndex") + .HasFilter("[NormalizedName] IS NOT NULL"); + + b.ToTable("AspNetRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("RoleId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AccessFailedCount"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("Email") + .HasMaxLength(256); + + b.Property("EmailConfirmed"); + + b.Property("LockoutEnabled"); + + b.Property("LockoutEnd"); + + b.Property("NormalizedEmail") + .HasMaxLength(256); + + b.Property("NormalizedUserName") + .HasMaxLength(256); + + b.Property("PasswordHash"); + + b.Property("PhoneNumber"); + + b.Property("PhoneNumberConfirmed"); + + b.Property("SecurityStamp"); + + b.Property("TwoFactorEnabled"); + + b.Property("UserName") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasName("UserNameIndex") + .HasFilter("[NormalizedUserName] IS NOT NULL"); + + b.ToTable("AspNetUsers"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasMaxLength(128); + + b.Property("ProviderKey") + .HasMaxLength(128); + + b.Property("ProviderDisplayName"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId"); + + b.Property("RoleId"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId"); + + b.Property("LoginProvider") + .HasMaxLength(128); + + b.Property("Name") + .HasMaxLength(128); + + b.Property("Value"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole") + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole") + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/Counter.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/Counter.razor index e7244066a2..ea87f6be2d 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/Counter.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/Counter.razor @@ -4,9 +4,9 @@

    Current count: @currentCount

    - + -@functions { +@code { int currentCount = 0; void IncrementCount() diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/FetchData.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/FetchData.razor index 3b24942890..25e30159f4 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/FetchData.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/FetchData.razor @@ -35,7 +35,7 @@ else } -@functions { +@code { WeatherForecast[] forecasts; protected override async Task OnInitAsync() diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/LoginDisplay.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/LoginDisplay.razor new file mode 100644 index 0000000000..daa24cbb86 --- /dev/null +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/LoginDisplay.razor @@ -0,0 +1,57 @@ +@*#if (IndividualLocalAuth) + + + Hello, @context.User.Identity.Name! + Log out + + + Register + Log in + + +#elseif (IndividualB2CAuth) +@using Microsoft.AspNetCore.Authentication.AzureADB2C.UI +@using Microsoft.Extensions.Options +@inject IOptionsMonitor AzureADB2COptions + + + + @if (canEditProfile) + { + Hello, @context.User.Identity.Name! + } + else + { + Hello, @context.User.Identity.Name! + } + Log out + + + Log in + + + +@code { + bool canEditProfile; + + protected override void OnInit() + { + var options = AzureADB2COptions.Get(AzureADB2CDefaults.AuthenticationScheme); + canEditProfile = !string.IsNullOrEmpty(options.EditProfilePolicyId); + } +} +#elseif (OrganizationalAuth) + + + Hello, @context.User.Identity.Name! + Log out + + + Log in + + +#elseif (WindowsAuth) + + Hello, @context.User.Identity.Name! + +#endif*@ diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/MainLayout.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/MainLayout.razor index 97e764d353..e2c2d6500e 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/MainLayout.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/MainLayout.razor @@ -6,7 +6,10 @@
    - About +@*#if (!NoAuth) + +#endif*@ + About
    diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/NavMenu.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/NavMenu.razor index 34fc7d3f7c..e64d6b2c21 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/NavMenu.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/NavMenu.razor @@ -1,11 +1,11 @@
    RazorComponentsWeb-CSharp -
    -
    +
    • @@ -25,7 +25,7 @@
    -@functions { +@code { bool collapseNavMenu = true; string NavMenuCssClass => collapseNavMenu ? "collapse" : null; diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Startup.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Startup.cs index ae6a05a3bb..ff517870d6 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Startup.cs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Startup.cs @@ -2,24 +2,124 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +#if (OrganizationalAuth || IndividualB2CAuth) +using Microsoft.AspNetCore.Authentication; +#endif +#if (OrganizationalAuth) +using Microsoft.AspNetCore.Authentication.AzureAD.UI; +#if (MultiOrgAuth) +using Microsoft.AspNetCore.Authentication.OpenIdConnect; +#endif +using Microsoft.AspNetCore.Authorization; +#endif +#if (IndividualB2CAuth) +using Microsoft.AspNetCore.Authentication.AzureADB2C.UI; +#endif using Microsoft.AspNetCore.Builder; +#if (IndividualLocalAuth) +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Identity.UI; +#endif using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; #if (RequiresHttps) using Microsoft.AspNetCore.HttpsPolicy; #endif +#if (OrganizationalAuth) +using Microsoft.AspNetCore.Mvc.Authorization; +#endif +#if (IndividualLocalAuth) +using Microsoft.EntityFrameworkCore; +#endif +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +#if(MultiOrgAuth) +using Microsoft.IdentityModel.Tokens; +#endif using RazorComponentsWeb_CSharp.Data; namespace RazorComponentsWeb_CSharp { public class Startup { + public Startup(IConfiguration configuration) + { + Configuration = configuration; + } + + public IConfiguration Configuration { get; } + // This method gets called by the runtime. Use this method to add services to the container. // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 public void ConfigureServices(IServiceCollection services) { +#if (IndividualLocalAuth) + services.AddDbContext(options => +#if (UseLocalDB) + options.UseSqlServer( + Configuration.GetConnectionString("DefaultConnection"))); +#else + options.UseSqlite( + Configuration.GetConnectionString("DefaultConnection"))); +#endif + services.AddDefaultIdentity() + .AddEntityFrameworkStores(); +#elif (OrganizationalAuth) + services.AddAuthentication(AzureADDefaults.AuthenticationScheme) + .AddAzureAD(options => Configuration.Bind("AzureAd", options)); +#if (MultiOrgAuth) + + services.Configure(AzureADDefaults.OpenIdScheme, options => + { + options.TokenValidationParameters = new TokenValidationParameters + { + // Instead of using the default validation (validating against a single issuer value, as we do in + // line of business apps), we inject our own multitenant validation logic + ValidateIssuer = false, + + // If the app is meant to be accessed by entire organizations, add your issuer validation logic here. + //IssuerValidator = (issuer, securityToken, validationParameters) => { + // if (myIssuerValidationLogic(issuer)) return issuer; + //} + }; + + options.Events = new OpenIdConnectEvents + { + OnTicketReceived = context => + { + // If your authentication logic is based on users then add your logic here + return Task.CompletedTask; + }, + OnAuthenticationFailed = context => + { + context.Response.Redirect("/Error"); + context.HandleResponse(); // Suppress the exception + return Task.CompletedTask; + }, + // If your application needs to authenticate single users, add your user validation below. + //OnTokenValidated = context => + //{ + // return myUserValidationLogic(context.Ticket.Principal); + //} + }; + }); +#endif + +#elif (IndividualB2CAuth) + services.AddAuthentication(AzureADB2CDefaults.AuthenticationScheme) + .AddAzureADB2C(options => Configuration.Bind("AzureAdB2C", options)); + +#endif +#if (OrganizationalAuth) + services.AddControllersWithViews(options => + { + var policy = new AuthorizationPolicyBuilder() + .RequireAuthenticatedUser() + .Build(); + options.Filters.Add(new AuthorizeFilter(policy)); + }); + +#endif services.AddRazorPages(); services.AddServerSideBlazor(); services.AddSingleton(); @@ -31,25 +131,37 @@ namespace RazorComponentsWeb_CSharp if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); +#if (IndividualLocalAuth) + app.UseDatabaseErrorPage(); +#endif } -#if (RequiresHttps) else { + app.UseExceptionHandler("/Home/Error"); +#if (RequiresHttps) // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. app.UseHsts(); } -#endif -#if (RequiresHttps) app.UseHttpsRedirection(); +#else + } #endif app.UseStaticFiles(); app.UseRouting(); +#if (OrganizationalAuth || IndividualAuth) + app.UseAuthentication(); + app.UseAuthorization(); + +#endif app.UseEndpoints(endpoints => { +#if (OrganizationalAuth || IndividualAuth) + endpoints.MapControllers(); +#endif endpoints.MapBlazorHub(); endpoints.MapFallbackToPage("/_Host"); }); diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/app.db b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/app.db new file mode 100644 index 0000000000..ec163057f1 Binary files /dev/null and b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/app.db differ diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/appsettings.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/appsettings.json index d9d9a9bff6..a1b1d1c212 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/appsettings.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/appsettings.json @@ -1,4 +1,36 @@ { +////#if (IndividualB2CAuth) +// "AzureAdB2C": { +// "Instance": "https:////login.microsoftonline.com/tfp/", +// "ClientId": "11111111-1111-1111-11111111111111111", +// "CallbackPath": "/signin-oidc", +// "Domain": "qualified.domain.name", +// "SignUpSignInPolicyId": "MySignUpSignInPolicyId", +// "ResetPasswordPolicyId": "MyResetPasswordPolicyId", +// "EditProfilePolicyId": "MyEditProfilePolicyId" +// }, +////#elseif (OrganizationalAuth) +// "AzureAd": { +//#if (MultiOrgAuth) +// "Instance": "https:////login.microsoftonline.com/common", +//#elseif (SingleOrgAuth) +// "Instance": "https:////login.microsoftonline.com/", +// "Domain": "qualified.domain.name", +// "TenantId": "22222222-2222-2222-2222-222222222222", +//#endif +// "ClientId": "11111111-1111-1111-11111111111111111", +// "CallbackPath": "/signin-oidc" +// }, +//#endif +////#if (IndividualLocalAuth) +// "ConnectionStrings": { +////#if (UseLocalDB) +// "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=aspnet-RazorComponentsWeb-CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502;Trusted_Connection=True;MultipleActiveResultSets=true" +////#else +// "DefaultConnection": "DataSource=app.db" +//#endif +// }, +//#endif "Logging": { "LogLevel": { "Default": "Information", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/wwwroot/css/site.css b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/wwwroot/css/site.css index 222f33c61d..546810a185 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/wwwroot/css/site.css +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/wwwroot/css/site.css @@ -27,8 +27,13 @@ app { .main .top-row { background-color: #e6e6e6; border-bottom: 1px solid #d6d5d5; + justify-content: flex-end; } + .main .top-row > a { + margin-left: 1.5rem; + } + .sidebar { background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%); } diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Startup.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Startup.cs index 0b58b5b6b0..ea58c1f885 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Startup.cs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Startup.cs @@ -121,11 +121,9 @@ namespace Company.WebApplication1 .RequireAuthenticatedUser() .Build(); options.Filters.Add(new AuthorizeFilter(policy)); - }) - .AddNewtonsoftJson(); + }); #else - services.AddRazorPages() - .AddNewtonsoftJson(); + services.AddRazorPages(); #endif } diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Startup.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Startup.cs index e546c74fc2..0638b76cab 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Startup.cs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Startup.cs @@ -121,11 +121,9 @@ namespace Company.WebApplication1 .RequireAuthenticatedUser() .Build(); options.Filters.Add(new AuthorizeFilter(policy)); - }) - .AddNewtonsoftJson(); + }); #else - services.AddControllersWithViews() - .AddNewtonsoftJson(); + services.AddControllersWithViews(); #endif services.AddRazorPages(); } diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Startup.fs b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Startup.fs index 91d078759a..607ec13b55 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Startup.fs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Startup.fs @@ -22,7 +22,7 @@ type Startup private () = // This method gets called by the runtime. Use this method to add services to the container. member this.ConfigureServices(services: IServiceCollection) = // Add framework services. - services.AddControllersWithViews().AddNewtonsoftJson().AddRazorRuntimeCompilation() |> ignore + services.AddControllersWithViews().AddRazorRuntimeCompilation() |> ignore services.AddRazorPages() |> ignore // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Startup.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Startup.cs index 55f0049079..aeee9aa54b 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Startup.cs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Startup.cs @@ -43,8 +43,7 @@ namespace Company.WebApplication1 services.AddAuthentication(AzureADB2CDefaults.BearerAuthenticationScheme) .AddAzureADB2CBearer(options => Configuration.Bind("AzureAdB2C", options)); #endif - services.AddControllers() - .AddNewtonsoftJson(); + services.AddControllers(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/Startup.fs b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/Startup.fs index 3df5e59353..d1611219ff 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/Startup.fs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/Startup.fs @@ -22,7 +22,7 @@ type Startup private () = // This method gets called by the runtime. Use this method to add services to the container. member this.ConfigureServices(services: IServiceCollection) = // Add framework services. - services.AddControllers().AddNewtonsoftJson() |> ignore + services.AddControllers() |> ignore // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. member this.Configure(app: IApplicationBuilder, env: IWebHostEnvironment) = diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in index 082a437cb8..bd29440fcf 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in @@ -15,7 +15,6 @@ - diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj index ff584492e7..5929c7cf68 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj @@ -22,7 +22,6 @@ - diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/React-CSharp.csproj.in b/src/ProjectTemplates/Web.Spa.ProjectTemplates/React-CSharp.csproj.in index 5b930ebba1..dc4897f498 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/React-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/React-CSharp.csproj.in @@ -12,7 +12,6 @@ - diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in b/src/ProjectTemplates/Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in index eee417f529..71a0a80686 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in @@ -12,7 +12,6 @@ - diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Startup.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Startup.cs index c00c010cb7..b5d6e749b9 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Startup.cs +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Startup.cs @@ -53,8 +53,7 @@ namespace Company.WebApplication1 services.AddAuthentication() .AddIdentityServerJwt(); #endif - services.AddMvc(options => options.EnableEndpointRouting = false) - .AddNewtonsoftJson(); + services.AddMvc(options => options.EnableEndpointRouting = false); // In production, the Angular files will be served from this directory services.AddSpaStaticFiles(configuration => diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Startup.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Startup.cs index c49c59d497..2303f02e1b 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Startup.cs +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Startup.cs @@ -53,8 +53,7 @@ namespace Company.WebApplication1 services.AddAuthentication() .AddIdentityServerJwt(); #endif - services.AddMvc(options => options.EnableEndpointRouting = false) - .AddNewtonsoftJson(); + services.AddMvc(options => options.EnableEndpointRouting = false); // In production, the React files will be served from this directory services.AddSpaStaticFiles(configuration => diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Startup.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Startup.cs index f0e7cf2f43..620d39f9af 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Startup.cs +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Startup.cs @@ -23,8 +23,7 @@ namespace Company.WebApplication1 // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { - services.AddMvc(options => options.EnableEndpointRouting = false) - .AddNewtonsoftJson(); + services.AddMvc(options => options.EnableEndpointRouting = false); // In production, the React files will be served from this directory services.AddSpaStaticFiles(configuration => diff --git a/src/ProjectTemplates/test/RazorComponentsTemplateTest.cs b/src/ProjectTemplates/test/RazorComponentsTemplateTest.cs index 9477d08134..b8c8e34ace 100644 --- a/src/ProjectTemplates/test/RazorComponentsTemplateTest.cs +++ b/src/ProjectTemplates/test/RazorComponentsTemplateTest.cs @@ -27,9 +27,9 @@ namespace Templates.Test [Fact] [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2407", FlakyOn.AzP.Windows)] - public async Task RazorComponentsTemplateWorks() + public async Task RazorComponentsTemplateWorks_NoAuth() { - Project = await ProjectFactory.GetOrCreateProject("blazorserverside", Output); + Project = await ProjectFactory.GetOrCreateProject("blazorserversidenoauth", Output); var createResult = await Project.RunDotNetNewAsync("blazorserverside"); Assert.True(0 == createResult.ExitCode, ErrorMessages.GetFailedProcessMessage("create/restore", Project, createResult)); @@ -73,6 +73,56 @@ namespace Templates.Test } } + [Theory] + [InlineData(true)] + [InlineData(false)] + [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2407", FlakyOn.AzP.Windows)] + public async Task RazorComponentsTemplateWorks_IndividualAuth(bool useLocalDB) + { + Project = await ProjectFactory.GetOrCreateProject("blazorserversideindividual" + (useLocalDB ? "uld" : ""), Output); + + var createResult = await Project.RunDotNetNewAsync("blazorserverside", auth: "Individual", useLocalDB: useLocalDB); + Assert.True(0 == createResult.ExitCode, ErrorMessages.GetFailedProcessMessage("create/restore", Project, createResult)); + + var publishResult = await Project.RunDotNetPublishAsync(); + Assert.True(0 == publishResult.ExitCode, ErrorMessages.GetFailedProcessMessage("publish", Project, publishResult)); + + // Run dotnet build after publish. The reason is that one uses Config = Debug and the other uses Config = Release + // The output from publish will go into bin/Release/netcoreapp3.0/publish and won't be affected by calling build + // later, while the opposite is not true. + + var buildResult = await Project.RunDotNetBuildAsync(); + Assert.True(0 == buildResult.ExitCode, ErrorMessages.GetFailedProcessMessage("build", Project, buildResult)); + + using (var aspNetProcess = Project.StartBuiltProjectAsync()) + { + Assert.False( + aspNetProcess.Process.HasExited, + ErrorMessages.GetFailedProcessMessageOrEmpty("Run built project", Project, aspNetProcess.Process)); + + await aspNetProcess.AssertStatusCode("/", HttpStatusCode.OK, "text/html"); + if (BrowserFixture.IsHostAutomationSupported()) + { + aspNetProcess.VisitInBrowser(Browser); + TestBasicNavigation(); + } + } + + using (var aspNetProcess = Project.StartPublishedProjectAsync()) + { + Assert.False( + aspNetProcess.Process.HasExited, + ErrorMessages.GetFailedProcessMessageOrEmpty("Run published project", Project, aspNetProcess.Process)); + + await aspNetProcess.AssertStatusCode("/", HttpStatusCode.OK, "text/html"); + if (BrowserFixture.IsHostAutomationSupported()) + { + aspNetProcess.VisitInBrowser(Browser); + TestBasicNavigation(); + } + } + } + private void TestBasicNavigation() { // Give components.server enough time to load so that it can replace diff --git a/src/ProjectTemplates/test/template-baselines.json b/src/ProjectTemplates/test/template-baselines.json index 24b5f0f88a..a6e919620c 100644 --- a/src/ProjectTemplates/test/template-baselines.json +++ b/src/ProjectTemplates/test/template-baselines.json @@ -889,39 +889,226 @@ } }, "razorcomponents": { - "None": { + "Individual": { "Template": "blazorserverside", - "Arguments": "new blazorserverside", + "Arguments": "new blazorserverside -au Individual", "Files": [ - "Pages/_Imports.razor", - "Pages/Counter.razor", - "Pages/FetchData.razor", - "Pages/_Host.cshtml", - "Pages/Index.razor", - "Shared/MainLayout.razor", - "Shared/NavMenu.razor", - "_Imports.razor", + "app.db", "App.razor", - "Properties/launchSettings.json", + "appsettings.Development.json", + "appsettings.json", + "Program.cs", + "Startup.cs", + "_Imports.razor", + "Areas/Identity/Pages/Account/LogOut.cshtml", + "Areas/Identity/Pages/Shared/_LoginPartial.cshtml", + "Data/ApplicationDbContext.cs", "Data/WeatherForecast.cs", "Data/WeatherForecastService.cs", + "Data/Migrations/00000000000000_CreateIdentitySchema.cs", + "Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs", + "Data/Migrations/ApplicationDbContextModelSnapshot.cs", + "Pages/Counter.razor", + "Pages/FetchData.razor", + "Pages/Index.razor", + "Pages/_Host.cshtml", + "Pages/_Imports.razor", + "Properties/launchSettings.json", + "Shared/LoginDisplay.razor", + "Shared/MainLayout.razor", + "Shared/NavMenu.razor", "wwwroot/favicon.ico", + "wwwroot/css/site.css", "wwwroot/css/bootstrap/bootstrap.min.css", "wwwroot/css/bootstrap/bootstrap.min.css.map", + "wwwroot/css/open-iconic/FONT-LICENSE", + "wwwroot/css/open-iconic/ICON-LICENSE", + "wwwroot/css/open-iconic/README.md", "wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css", "wwwroot/css/open-iconic/font/fonts/open-iconic.eot", "wwwroot/css/open-iconic/font/fonts/open-iconic.otf", "wwwroot/css/open-iconic/font/fonts/open-iconic.svg", "wwwroot/css/open-iconic/font/fonts/open-iconic.ttf", - "wwwroot/css/open-iconic/font/fonts/open-iconic.woff", - "wwwroot/css/open-iconic/FONT-LICENSE", - "wwwroot/css/open-iconic/ICON-LICENSE", - "wwwroot/css/open-iconic/README.md", - "wwwroot/css/site.css", + "wwwroot/css/open-iconic/font/fonts/open-iconic.woff" + ] + }, + "IndividualB2C": { + "Template": "blazorserverside", + "Arguments": "new blazorserverside -au IndividualB2C", + "Files": [ + "App.razor", "appsettings.Development.json", "appsettings.json", "Program.cs", - "Startup.cs" + "Startup.cs", + "_Imports.razor", + "Data/WeatherForecast.cs", + "Data/WeatherForecastService.cs", + "Pages/Counter.razor", + "Pages/FetchData.razor", + "Pages/Index.razor", + "Pages/_Host.cshtml", + "Pages/_Imports.razor", + "Properties/launchSettings.json", + "Shared/LoginDisplay.razor", + "Shared/MainLayout.razor", + "Shared/NavMenu.razor", + "wwwroot/favicon.ico", + "wwwroot/css/site.css", + "wwwroot/css/bootstrap/bootstrap.min.css", + "wwwroot/css/bootstrap/bootstrap.min.css.map", + "wwwroot/css/open-iconic/FONT-LICENSE", + "wwwroot/css/open-iconic/ICON-LICENSE", + "wwwroot/css/open-iconic/README.md", + "wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css", + "wwwroot/css/open-iconic/font/fonts/open-iconic.eot", + "wwwroot/css/open-iconic/font/fonts/open-iconic.otf", + "wwwroot/css/open-iconic/font/fonts/open-iconic.svg", + "wwwroot/css/open-iconic/font/fonts/open-iconic.ttf", + "wwwroot/css/open-iconic/font/fonts/open-iconic.woff" + ] + }, + "MultiOrg": { + "Template": "blazorserverside", + "Arguments": "new blazorserverside -au MultiOrg", + "Files": [ + "App.razor", + "appsettings.Development.json", + "appsettings.json", + "Program.cs", + "Startup.cs", + "_Imports.razor", + "Data/WeatherForecast.cs", + "Data/WeatherForecastService.cs", + "Pages/Counter.razor", + "Pages/FetchData.razor", + "Pages/Index.razor", + "Pages/_Host.cshtml", + "Pages/_Imports.razor", + "Properties/launchSettings.json", + "Shared/LoginDisplay.razor", + "Shared/MainLayout.razor", + "Shared/NavMenu.razor", + "wwwroot/favicon.ico", + "wwwroot/css/site.css", + "wwwroot/css/bootstrap/bootstrap.min.css", + "wwwroot/css/bootstrap/bootstrap.min.css.map", + "wwwroot/css/open-iconic/FONT-LICENSE", + "wwwroot/css/open-iconic/ICON-LICENSE", + "wwwroot/css/open-iconic/README.md", + "wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css", + "wwwroot/css/open-iconic/font/fonts/open-iconic.eot", + "wwwroot/css/open-iconic/font/fonts/open-iconic.otf", + "wwwroot/css/open-iconic/font/fonts/open-iconic.svg", + "wwwroot/css/open-iconic/font/fonts/open-iconic.ttf", + "wwwroot/css/open-iconic/font/fonts/open-iconic.woff" + ] + }, + "None": { + "Template": "blazorserverside", + "Arguments": "new blazorserverside", + "Files": [ + "App.razor", + "appsettings.Development.json", + "appsettings.json", + "Program.cs", + "Startup.cs", + "_Imports.razor", + "Data/WeatherForecast.cs", + "Data/WeatherForecastService.cs", + "Pages/Counter.razor", + "Pages/FetchData.razor", + "Pages/Index.razor", + "Pages/_Host.cshtml", + "Pages/_Imports.razor", + "Properties/launchSettings.json", + "Shared/MainLayout.razor", + "Shared/NavMenu.razor", + "wwwroot/favicon.ico", + "wwwroot/css/site.css", + "wwwroot/css/bootstrap/bootstrap.min.css", + "wwwroot/css/bootstrap/bootstrap.min.css.map", + "wwwroot/css/open-iconic/FONT-LICENSE", + "wwwroot/css/open-iconic/ICON-LICENSE", + "wwwroot/css/open-iconic/README.md", + "wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css", + "wwwroot/css/open-iconic/font/fonts/open-iconic.eot", + "wwwroot/css/open-iconic/font/fonts/open-iconic.otf", + "wwwroot/css/open-iconic/font/fonts/open-iconic.svg", + "wwwroot/css/open-iconic/font/fonts/open-iconic.ttf", + "wwwroot/css/open-iconic/font/fonts/open-iconic.woff" + ] + }, + "SingleOrg": { + "Template": "blazorserverside", + "Arguments": "new blazorserverside -au SingleOrg", + "Files": [ + "App.razor", + "appsettings.Development.json", + "appsettings.json", + "Program.cs", + "Startup.cs", + "_Imports.razor", + "Data/WeatherForecast.cs", + "Data/WeatherForecastService.cs", + "Pages/Counter.razor", + "Pages/FetchData.razor", + "Pages/Index.razor", + "Pages/_Host.cshtml", + "Pages/_Imports.razor", + "Properties/launchSettings.json", + "Shared/LoginDisplay.razor", + "Shared/MainLayout.razor", + "Shared/NavMenu.razor", + "wwwroot/favicon.ico", + "wwwroot/css/site.css", + "wwwroot/css/bootstrap/bootstrap.min.css", + "wwwroot/css/bootstrap/bootstrap.min.css.map", + "wwwroot/css/open-iconic/FONT-LICENSE", + "wwwroot/css/open-iconic/ICON-LICENSE", + "wwwroot/css/open-iconic/README.md", + "wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css", + "wwwroot/css/open-iconic/font/fonts/open-iconic.eot", + "wwwroot/css/open-iconic/font/fonts/open-iconic.otf", + "wwwroot/css/open-iconic/font/fonts/open-iconic.svg", + "wwwroot/css/open-iconic/font/fonts/open-iconic.ttf", + "wwwroot/css/open-iconic/font/fonts/open-iconic.woff" + ] + }, + "Windows": { + "Template": "blazorserverside", + "Arguments": "new blazorserverside -au Windows", + "Files": [ + "App.razor", + "appsettings.Development.json", + "appsettings.json", + "Program.cs", + "Startup.cs", + "_Imports.razor", + "Data/WeatherForecast.cs", + "Data/WeatherForecastService.cs", + "Pages/Counter.razor", + "Pages/FetchData.razor", + "Pages/Index.razor", + "Pages/_Host.cshtml", + "Pages/_Imports.razor", + "Properties/launchSettings.json", + "Shared/LoginDisplay.razor", + "Shared/MainLayout.razor", + "Shared/NavMenu.razor", + "wwwroot/favicon.ico", + "wwwroot/css/site.css", + "wwwroot/css/bootstrap/bootstrap.min.css", + "wwwroot/css/bootstrap/bootstrap.min.css.map", + "wwwroot/css/open-iconic/FONT-LICENSE", + "wwwroot/css/open-iconic/ICON-LICENSE", + "wwwroot/css/open-iconic/README.md", + "wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css", + "wwwroot/css/open-iconic/font/fonts/open-iconic.eot", + "wwwroot/css/open-iconic/font/fonts/open-iconic.otf", + "wwwroot/css/open-iconic/font/fonts/open-iconic.svg", + "wwwroot/css/open-iconic/font/fonts/open-iconic.ttf", + "wwwroot/css/open-iconic/font/fonts/open-iconic.woff" ] } }, diff --git a/src/Servers/Kestrel/Transport.Abstractions/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj b/src/Security/Authentication/Certificate/ref/Microsoft.AspNetCore.Authentication.Certificate.csproj similarity index 51% rename from src/Servers/Kestrel/Transport.Abstractions/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj rename to src/Security/Authentication/Certificate/ref/Microsoft.AspNetCore.Authentication.Certificate.csproj index ea00244772..3cf6d51079 100644 --- a/src/Servers/Kestrel/Transport.Abstractions/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj +++ b/src/Security/Authentication/Certificate/ref/Microsoft.AspNetCore.Authentication.Certificate.csproj @@ -4,8 +4,7 @@ netcoreapp3.0 - - - + + diff --git a/src/Security/Authentication/Certificate/ref/Microsoft.AspNetCore.Authentication.Certificate.netcoreapp3.0.cs b/src/Security/Authentication/Certificate/ref/Microsoft.AspNetCore.Authentication.Certificate.netcoreapp3.0.cs new file mode 100644 index 0000000000..7fa9e147ab --- /dev/null +++ b/src/Security/Authentication/Certificate/ref/Microsoft.AspNetCore.Authentication.Certificate.netcoreapp3.0.cs @@ -0,0 +1,59 @@ +// 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 Microsoft.AspNetCore.Authentication.Certificate +{ + public static partial class CertificateAuthenticationDefaults + { + public const string AuthenticationScheme = "Certificate"; + } + public partial class CertificateAuthenticationEvents + { + public CertificateAuthenticationEvents() { } + public System.Func OnAuthenticationFailed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Func OnCertificateValidated { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public virtual System.Threading.Tasks.Task AuthenticationFailed(Microsoft.AspNetCore.Authentication.Certificate.CertificateAuthenticationFailedContext context) { throw null; } + public virtual System.Threading.Tasks.Task CertificateValidated(Microsoft.AspNetCore.Authentication.Certificate.CertificateValidatedContext context) { throw null; } + } + public partial class CertificateAuthenticationFailedContext : Microsoft.AspNetCore.Authentication.ResultContext + { + public CertificateAuthenticationFailedContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.Certificate.CertificateAuthenticationOptions options) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.Certificate.CertificateAuthenticationOptions)) { } + public System.Exception Exception { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + public partial class CertificateAuthenticationOptions : Microsoft.AspNetCore.Authentication.AuthenticationSchemeOptions + { + public CertificateAuthenticationOptions() { } + public Microsoft.AspNetCore.Authentication.Certificate.CertificateTypes AllowedCertificateTypes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public new Microsoft.AspNetCore.Authentication.Certificate.CertificateAuthenticationEvents Events { get { throw null; } set { } } + public System.Security.Cryptography.X509Certificates.X509RevocationFlag RevocationFlag { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Security.Cryptography.X509Certificates.X509RevocationMode RevocationMode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool ValidateCertificateUse { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool ValidateValidityPeriod { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + [System.FlagsAttribute] + public enum CertificateTypes + { + Chained = 1, + SelfSigned = 2, + All = 3, + } + public partial class CertificateValidatedContext : Microsoft.AspNetCore.Authentication.ResultContext + { + public CertificateValidatedContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.Certificate.CertificateAuthenticationOptions options) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.Certificate.CertificateAuthenticationOptions)) { } + public System.Security.Cryptography.X509Certificates.X509Certificate2 ClientCertificate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + public static partial class X509Certificate2Extensions + { + public static bool IsSelfSigned(this System.Security.Cryptography.X509Certificates.X509Certificate2 certificate) { throw null; } + } +} +namespace Microsoft.Extensions.DependencyInjection +{ + public static partial class CertificateAuthenticationAppBuilderExtensions + { + public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddCertificate(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder) { throw null; } + public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddCertificate(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, System.Action configureOptions) { throw null; } + public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddCertificate(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string authenticationScheme) { throw null; } + public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddCertificate(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string authenticationScheme, System.Action configureOptions) { throw null; } + } +} diff --git a/src/Security/Authentication/Certificate/samples/Certificate.Sample/Certificate.Sample.csproj b/src/Security/Authentication/Certificate/samples/Certificate.Sample/Certificate.Sample.csproj new file mode 100644 index 0000000000..2f085e5c41 --- /dev/null +++ b/src/Security/Authentication/Certificate/samples/Certificate.Sample/Certificate.Sample.csproj @@ -0,0 +1,21 @@ + + + + netcoreapp3.0 + OutOfProcess + + + + + + + + + + + + + + + + diff --git a/src/Security/Authentication/Certificate/samples/Certificate.Sample/Controllers/HomeController.cs b/src/Security/Authentication/Certificate/samples/Certificate.Sample/Controllers/HomeController.cs new file mode 100644 index 0000000000..60be48074b --- /dev/null +++ b/src/Security/Authentication/Certificate/samples/Certificate.Sample/Controllers/HomeController.cs @@ -0,0 +1,12 @@ +using Microsoft.AspNetCore.Mvc; + +namespace Certificate.Sample.Controllers +{ + public class HomeController : Controller + { + public IActionResult Index() + { + return View(); + } + } +} diff --git a/src/Security/Authentication/Certificate/samples/Certificate.Sample/Program.cs b/src/Security/Authentication/Certificate/samples/Certificate.Sample/Program.cs new file mode 100644 index 0000000000..1c4a2d2958 --- /dev/null +++ b/src/Security/Authentication/Certificate/samples/Certificate.Sample/Program.cs @@ -0,0 +1,26 @@ +using Microsoft.AspNetCore; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Server.Kestrel.Https; + +namespace Certificate.Sample +{ + public class Program + { + public static void Main(string[] args) + { + BuildWebHost(args).Run(); + } + + public static IWebHost BuildWebHost(string[] args) + => WebHost.CreateDefaultBuilder(args) + .UseStartup() + .ConfigureKestrel(options => + { + options.ConfigureHttpsDefaults(opt => + { + opt.ClientCertificateMode = ClientCertificateMode.RequireCertificate; + }); + }) + .Build(); + } +} diff --git a/src/Security/Authentication/Certificate/samples/Certificate.Sample/Properties/launchSettings.json b/src/Security/Authentication/Certificate/samples/Certificate.Sample/Properties/launchSettings.json new file mode 100644 index 0000000000..e796cb6c7e --- /dev/null +++ b/src/Security/Authentication/Certificate/samples/Certificate.Sample/Properties/launchSettings.json @@ -0,0 +1,20 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "https://localhost:44331/", + "sslPort": 44331 + } + }, + "profiles": { + "Certificate.Sample": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:5001/" + } + } +} diff --git a/src/Security/Authentication/Certificate/samples/Certificate.Sample/Startup.cs b/src/Security/Authentication/Certificate/samples/Certificate.Sample/Startup.cs new file mode 100644 index 0000000000..14e2702e07 --- /dev/null +++ b/src/Security/Authentication/Certificate/samples/Certificate.Sample/Startup.cs @@ -0,0 +1,61 @@ +using System.Security.Claims; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authentication.Certificate; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc.Authorization; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; + +namespace Certificate.Sample +{ + public class Startup + { + // This method gets called by the runtime. Use this method to add services to the container. + // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 + public void ConfigureServices(IServiceCollection services) + { + services.AddAuthentication(CertificateAuthenticationDefaults.AuthenticationScheme) + .AddCertificate(options => + { + options.Events = new CertificateAuthenticationEvents + { + OnCertificateValidated = context => + { + var claims = new[] + { + new Claim(ClaimTypes.NameIdentifier, context.ClientCertificate.Subject, ClaimValueTypes.String, context.Options.ClaimsIssuer), + new Claim(ClaimTypes.Name, context.ClientCertificate.Subject, ClaimValueTypes.String, context.Options.ClaimsIssuer) + }; + + context.Principal = new ClaimsPrincipal(new ClaimsIdentity(claims, context.Scheme.Name)); + context.Success(); + + return Task.CompletedTask; + } + }; + }); + + services.AddAuthorization(); + + services.AddMvc(config => { }); + } + + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) + { + app.UseRouting(); + + app.UseStatusCodePages(); + + app.UseAuthentication(); + app.UseAuthorization(); + + app.UseEndpoints(endpoints => + { + endpoints.MapDefaultControllerRoute(); + }); + } + } +} diff --git a/src/Security/Authentication/Certificate/samples/Certificate.Sample/Views/Home/Index.cshtml b/src/Security/Authentication/Certificate/samples/Certificate.Sample/Views/Home/Index.cshtml new file mode 100644 index 0000000000..5247bfe9c6 --- /dev/null +++ b/src/Security/Authentication/Certificate/samples/Certificate.Sample/Views/Home/Index.cshtml @@ -0,0 +1 @@ +

    Hello @User.Identity.Name

    \ No newline at end of file diff --git a/src/Security/Authentication/Certificate/src/CertificateAuthenticationDefaults.cs b/src/Security/Authentication/Certificate/src/CertificateAuthenticationDefaults.cs new file mode 100644 index 0000000000..d085dd3b70 --- /dev/null +++ b/src/Security/Authentication/Certificate/src/CertificateAuthenticationDefaults.cs @@ -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 Microsoft.AspNetCore.Authentication.Certificate +{ + /// + /// Default values related to certificate authentication middleware + /// + public static class CertificateAuthenticationDefaults + { + /// + /// The default value used for CertificateAuthenticationOptions.AuthenticationScheme + /// + public const string AuthenticationScheme = "Certificate"; + } +} diff --git a/src/Security/Authentication/Certificate/src/CertificateAuthenticationExtensions.cs b/src/Security/Authentication/Certificate/src/CertificateAuthenticationExtensions.cs new file mode 100644 index 0000000000..d49f2c274b --- /dev/null +++ b/src/Security/Authentication/Certificate/src/CertificateAuthenticationExtensions.cs @@ -0,0 +1,55 @@ +// 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 Microsoft.AspNetCore.Authentication; + +using Microsoft.AspNetCore.Authentication.Certificate; + +namespace Microsoft.Extensions.DependencyInjection +{ + /// + /// Extension methods to add Certificate authentication capabilities to an HTTP application pipeline. + /// + public static class CertificateAuthenticationAppBuilderExtensions + { + /// + /// Adds certificate authentication. + /// + /// The . + /// The . + public static AuthenticationBuilder AddCertificate(this AuthenticationBuilder builder) + => builder.AddCertificate(CertificateAuthenticationDefaults.AuthenticationScheme); + + /// + /// Adds certificate authentication. + /// + /// The . + /// + /// The . + public static AuthenticationBuilder AddCertificate(this AuthenticationBuilder builder, string authenticationScheme) + => builder.AddCertificate(authenticationScheme, configureOptions: null); + + /// + /// Adds certificate authentication. + /// + /// The . + /// + /// The . + public static AuthenticationBuilder AddCertificate(this AuthenticationBuilder builder, Action configureOptions) + => builder.AddCertificate(CertificateAuthenticationDefaults.AuthenticationScheme, configureOptions); + + /// + /// Adds certificate authentication. + /// + /// The . + /// + /// + /// The . + public static AuthenticationBuilder AddCertificate( + this AuthenticationBuilder builder, + string authenticationScheme, + Action configureOptions) + => builder.AddScheme(authenticationScheme, configureOptions); + } +} diff --git a/src/Security/Authentication/Certificate/src/CertificateAuthenticationHandler.cs b/src/Security/Authentication/Certificate/src/CertificateAuthenticationHandler.cs new file mode 100644 index 0000000000..68a7abdde0 --- /dev/null +++ b/src/Security/Authentication/Certificate/src/CertificateAuthenticationHandler.cs @@ -0,0 +1,235 @@ +// 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.Security.Claims; +using System.Security.Cryptography; +using System.Security.Cryptography.X509Certificates; +using System.Text.Encodings.Web; +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; + +namespace Microsoft.AspNetCore.Authentication.Certificate +{ + internal class CertificateAuthenticationHandler : AuthenticationHandler + { + private static readonly Oid ClientCertificateOid = new Oid("1.3.6.1.5.5.7.3.2"); + + public CertificateAuthenticationHandler( + IOptionsMonitor options, + ILoggerFactory logger, + UrlEncoder encoder, + ISystemClock clock) : base(options, logger, encoder, clock) + { + } + + /// + /// The handler calls methods on the events which give the application control at certain points where processing is occurring. + /// If it is not provided a default instance is supplied which does nothing when the methods are called. + /// + protected new CertificateAuthenticationEvents Events + { + get { return (CertificateAuthenticationEvents)base.Events; } + set { base.Events = value; } + } + + /// + /// Creates a new instance of the events instance. + /// + /// A new instance of the events instance. + protected override Task CreateEventsAsync() => Task.FromResult(new CertificateAuthenticationEvents()); + + protected override async Task HandleAuthenticateAsync() + { + // You only get client certificates over HTTPS + if (!Context.Request.IsHttps) + { + return AuthenticateResult.NoResult(); + } + + try + { + var clientCertificate = await Context.Connection.GetClientCertificateAsync(); + + // This should never be the case, as cert authentication happens long before ASP.NET kicks in. + if (clientCertificate == null) + { + Logger.NoCertificate(); + return AuthenticateResult.NoResult(); + } + + // If we have a self signed cert, and they're not allowed, exit early and not bother with + // any other validations. + if (clientCertificate.IsSelfSigned() && + !Options.AllowedCertificateTypes.HasFlag(CertificateTypes.SelfSigned)) + { + Logger.CertificateRejected("Self signed", clientCertificate.Subject); + return AuthenticateResult.Fail("Options do not allow self signed certificates."); + } + + // If we have a chained cert, and they're not allowed, exit early and not bother with + // any other validations. + if (!clientCertificate.IsSelfSigned() && + !Options.AllowedCertificateTypes.HasFlag(CertificateTypes.Chained)) + { + Logger.CertificateRejected("Chained", clientCertificate.Subject); + return AuthenticateResult.Fail("Options do not allow chained certificates."); + } + + var chainPolicy = BuildChainPolicy(clientCertificate); + var chain = new X509Chain + { + ChainPolicy = chainPolicy + }; + + var certificateIsValid = chain.Build(clientCertificate); + if (!certificateIsValid) + { + var chainErrors = new List(); + foreach (var validationFailure in chain.ChainStatus) + { + chainErrors.Add($"{validationFailure.Status} {validationFailure.StatusInformation}"); + } + Logger.CertificateFailedValidation(clientCertificate.Subject, chainErrors); + return AuthenticateResult.Fail("Client certificate failed validation."); + } + + var certificateValidatedContext = new CertificateValidatedContext(Context, Scheme, Options) + { + ClientCertificate = clientCertificate, + Principal = CreatePrincipal(clientCertificate) + }; + + await Events.CertificateValidated(certificateValidatedContext); + + if (certificateValidatedContext.Result != null) + { + return certificateValidatedContext.Result; + } + + certificateValidatedContext.Success(); + return certificateValidatedContext.Result; + } + catch (Exception ex) + { + var authenticationFailedContext = new CertificateAuthenticationFailedContext(Context, Scheme, Options) + { + Exception = ex + }; + + await Events.AuthenticationFailed(authenticationFailedContext); + + if (authenticationFailedContext.Result != null) + { + return authenticationFailedContext.Result; + } + + throw; + } + } + + protected override Task HandleChallengeAsync(AuthenticationProperties properties) + { + // Certificate authentication takes place at the connection level. We can't prompt once we're in + // user code, so the best thing to do is Forbid, not Challenge. + return HandleForbiddenAsync(properties); + } + + private X509ChainPolicy BuildChainPolicy(X509Certificate2 certificate) + { + // Now build the chain validation options. + X509RevocationFlag revocationFlag = Options.RevocationFlag; + X509RevocationMode revocationMode = Options.RevocationMode; + + if (certificate.IsSelfSigned()) + { + // Turn off chain validation, because we have a self signed certificate. + revocationFlag = X509RevocationFlag.EntireChain; + revocationMode = X509RevocationMode.NoCheck; + } + + var chainPolicy = new X509ChainPolicy + { + RevocationFlag = revocationFlag, + RevocationMode = revocationMode, + }; + + if (Options.ValidateCertificateUse) + { + chainPolicy.ApplicationPolicy.Add(ClientCertificateOid); + } + + if (certificate.IsSelfSigned()) + { + chainPolicy.VerificationFlags |= X509VerificationFlags.AllowUnknownCertificateAuthority; + chainPolicy.VerificationFlags |= X509VerificationFlags.IgnoreEndRevocationUnknown; + chainPolicy.ExtraStore.Add(certificate); + } + + if (!Options.ValidateValidityPeriod) + { + chainPolicy.VerificationFlags |= X509VerificationFlags.IgnoreNotTimeValid; + } + + return chainPolicy; + } + + private ClaimsPrincipal CreatePrincipal(X509Certificate2 certificate) + { + var claims = new List(); + + var issuer = certificate.Issuer; + claims.Add(new Claim("issuer", issuer, ClaimValueTypes.String, Options.ClaimsIssuer)); + + var thumbprint = certificate.Thumbprint; + claims.Add(new Claim(ClaimTypes.Thumbprint, thumbprint, ClaimValueTypes.Base64Binary, Options.ClaimsIssuer)); + + var value = certificate.SubjectName.Name; + if (!string.IsNullOrWhiteSpace(value)) + { + claims.Add(new Claim(ClaimTypes.X500DistinguishedName, value, ClaimValueTypes.String, Options.ClaimsIssuer)); + } + + value = certificate.SerialNumber; + if (!string.IsNullOrWhiteSpace(value)) + { + claims.Add(new Claim(ClaimTypes.SerialNumber, value, ClaimValueTypes.String, Options.ClaimsIssuer)); + } + + value = certificate.GetNameInfo(X509NameType.DnsName, false); + if (!string.IsNullOrWhiteSpace(value)) + { + claims.Add(new Claim(ClaimTypes.Dns, value, ClaimValueTypes.String, Options.ClaimsIssuer)); + } + + value = certificate.GetNameInfo(X509NameType.SimpleName, false); + if (!string.IsNullOrWhiteSpace(value)) + { + claims.Add(new Claim(ClaimTypes.Name, value, ClaimValueTypes.String, Options.ClaimsIssuer)); + } + + value = certificate.GetNameInfo(X509NameType.EmailName, false); + if (!string.IsNullOrWhiteSpace(value)) + { + claims.Add(new Claim(ClaimTypes.Email, value, ClaimValueTypes.String, Options.ClaimsIssuer)); + } + + value = certificate.GetNameInfo(X509NameType.UpnName, false); + if (!string.IsNullOrWhiteSpace(value)) + { + claims.Add(new Claim(ClaimTypes.Upn, value, ClaimValueTypes.String, Options.ClaimsIssuer)); + } + + value = certificate.GetNameInfo(X509NameType.UrlName, false); + if (!string.IsNullOrWhiteSpace(value)) + { + claims.Add(new Claim(ClaimTypes.Uri, value, ClaimValueTypes.String, Options.ClaimsIssuer)); + } + + var identity = new ClaimsIdentity(claims, CertificateAuthenticationDefaults.AuthenticationScheme); + return new ClaimsPrincipal(identity); + } + } +} diff --git a/src/Security/Authentication/Certificate/src/CertificateAuthenticationOptions.cs b/src/Security/Authentication/Certificate/src/CertificateAuthenticationOptions.cs new file mode 100644 index 0000000000..1b8eebfa6f --- /dev/null +++ b/src/Security/Authentication/Certificate/src/CertificateAuthenticationOptions.cs @@ -0,0 +1,53 @@ +// 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.Security.Cryptography.X509Certificates; + +namespace Microsoft.AspNetCore.Authentication.Certificate +{ + /// + /// Options used to configure certificate authentication. + /// + public class CertificateAuthenticationOptions : AuthenticationSchemeOptions + { + /// + /// Value indicating the types of certificates accepted by the authentication middleware. + /// + public CertificateTypes AllowedCertificateTypes { get; set; } = CertificateTypes.Chained; + + /// + /// Flag indicating whether the client certificate must be suitable for client + /// authentication, either via the Client Authentication EKU, or having no EKUs + /// at all. If the certificate chains to a root CA all certificates in the chain must be validate + /// for the client authentication EKU. + /// + public bool ValidateCertificateUse { get; set; } = true; + + /// + /// Flag indicating whether the client certificate validity period should be checked. + /// + public bool ValidateValidityPeriod { get; set; } = true; + + /// + /// Specifies which X509 certificates in the chain should be checked for revocation. + /// + public X509RevocationFlag RevocationFlag { get; set; } = X509RevocationFlag.ExcludeRoot; + + /// + /// Specifies conditions under which verification of certificates in the X509 chain should be conducted. + /// + public X509RevocationMode RevocationMode { get; set; } = X509RevocationMode.Online; + + /// + /// The object provided by the application to process events raised by the certificate authentication middleware. + /// The application may implement the interface fully, or it may create an instance of CertificateAuthenticationEvents + /// and assign delegates only to the events it wants to process. + /// + public new CertificateAuthenticationEvents Events + { + get { return (CertificateAuthenticationEvents)base.Events; } + + set { base.Events = value; } + } + } +} diff --git a/src/Security/Authentication/Certificate/src/CertificateTypes.cs b/src/Security/Authentication/Certificate/src/CertificateTypes.cs new file mode 100644 index 0000000000..ab238ce3e6 --- /dev/null +++ b/src/Security/Authentication/Certificate/src/CertificateTypes.cs @@ -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; + +namespace Microsoft.AspNetCore.Authentication.Certificate +{ + /// + /// Enum representing certificate types. + /// + [Flags] + public enum CertificateTypes + { + /// + /// Chained certificates. + /// + Chained = 1, + + /// + /// SelfSigned certificates. + /// + SelfSigned = 2, + + /// + /// All certificates. + /// + All = Chained | SelfSigned + } +} diff --git a/src/Security/Authentication/Certificate/src/Events/CertificateAuthenticationEvents.cs b/src/Security/Authentication/Certificate/src/Events/CertificateAuthenticationEvents.cs new file mode 100644 index 0000000000..bf6e559e5f --- /dev/null +++ b/src/Security/Authentication/Certificate/src/Events/CertificateAuthenticationEvents.cs @@ -0,0 +1,45 @@ +// 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.Tasks; + +namespace Microsoft.AspNetCore.Authentication.Certificate +{ + /// + /// This default implementation of the IBasicAuthenticationEvents may be used if the + /// application only needs to override a few of the interface methods. + /// This may be used as a base class or may be instantiated directly. + /// + public class CertificateAuthenticationEvents + { + /// + /// A delegate assigned to this property will be invoked when the authentication fails. + /// + public Func OnAuthenticationFailed { get; set; } = context => Task.CompletedTask; + + /// + /// A delegate assigned to this property will be invoked when a certificate has passed basic validation, but where custom validation may be needed. + /// + /// + /// You must provide a delegate for this property for authentication to occur. + /// In your delegate you should construct an authentication principal from the user details, + /// attach it to the context.Principal property and finally call context.Success(); + /// + public Func OnCertificateValidated { get; set; } = context => Task.CompletedTask; + + /// + /// Invoked when a certificate fails authentication. + /// + /// + /// + public virtual Task AuthenticationFailed(CertificateAuthenticationFailedContext context) => OnAuthenticationFailed(context); + + /// + /// Invoked after a certificate has been validated + /// + /// + /// + public virtual Task CertificateValidated(CertificateValidatedContext context) => OnCertificateValidated(context); + } +} diff --git a/src/Security/Authentication/Certificate/src/Events/CertificateAuthenticationFailedContext.cs b/src/Security/Authentication/Certificate/src/Events/CertificateAuthenticationFailedContext.cs new file mode 100644 index 0000000000..9742a149c2 --- /dev/null +++ b/src/Security/Authentication/Certificate/src/Events/CertificateAuthenticationFailedContext.cs @@ -0,0 +1,33 @@ +// 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 Microsoft.AspNetCore.Http; + +namespace Microsoft.AspNetCore.Authentication.Certificate +{ + /// + /// Context used when a failure occurs. + /// + public class CertificateAuthenticationFailedContext : ResultContext + { + /// + /// Constructor. + /// + /// + /// + /// + public CertificateAuthenticationFailedContext( + HttpContext context, + AuthenticationScheme scheme, + CertificateAuthenticationOptions options) + : base(context, scheme, options) + { + } + + /// + /// The exception. + /// + public Exception Exception { get; set; } + } +} diff --git a/src/Security/Authentication/Certificate/src/Events/CertificateValidatedContext.cs b/src/Security/Authentication/Certificate/src/Events/CertificateValidatedContext.cs new file mode 100644 index 0000000000..9a3870b3bd --- /dev/null +++ b/src/Security/Authentication/Certificate/src/Events/CertificateValidatedContext.cs @@ -0,0 +1,33 @@ +// 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.Security.Cryptography.X509Certificates; +using Microsoft.AspNetCore.Http; + +namespace Microsoft.AspNetCore.Authentication.Certificate +{ + /// + /// Context used when certificates are being validated. + /// + public class CertificateValidatedContext : ResultContext + { + /// + /// Creates a new instance of . + /// + /// The HttpContext the validate context applies too. + /// The scheme used when the Certificate Authentication handler was registered. + /// The . + public CertificateValidatedContext( + HttpContext context, + AuthenticationScheme scheme, + CertificateAuthenticationOptions options) + : base(context, scheme, options) + { + } + + /// + /// The certificate to validate. + /// + public X509Certificate2 ClientCertificate { get; set; } + } +} diff --git a/src/Security/Authentication/Certificate/src/LoggingExtensions.cs b/src/Security/Authentication/Certificate/src/LoggingExtensions.cs new file mode 100644 index 0000000000..2219a349b6 --- /dev/null +++ b/src/Security/Authentication/Certificate/src/LoggingExtensions.cs @@ -0,0 +1,48 @@ +// 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; + +namespace Microsoft.Extensions.Logging +{ + internal static class LoggingExtensions + { + private static Action _noCertificate; + private static Action _certRejected; + private static Action _certFailedValidation; + + static LoggingExtensions() + { + _noCertificate = LoggerMessage.Define( + eventId: new EventId(0, "NoCertificate"), + logLevel: LogLevel.Debug, + formatString: "No client certificate found."); + + _certRejected = LoggerMessage.Define( + eventId: new EventId(1, "CertificateRejected"), + logLevel: LogLevel.Warning, + formatString: "{CertificateType} certificate rejected, subject was {Subject}."); + + _certFailedValidation = LoggerMessage.Define( + eventId: new EventId(2, "CertificateFailedValidation"), + logLevel: LogLevel.Warning, + formatString: "Certificate validation failed, subject was {Subject}." + Environment.NewLine + "{ChainErrors}"); + } + + public static void NoCertificate(this ILogger logger) + { + _noCertificate(logger, null); + } + + public static void CertificateRejected(this ILogger logger, string certificateType, string subject) + { + _certRejected(logger, certificateType, subject, null); + } + + public static void CertificateFailedValidation(this ILogger logger, string subject, IEnumerable chainedErrors) + { + _certFailedValidation(logger, subject, String.Join(Environment.NewLine, chainedErrors), null); + } + } +} diff --git a/src/Security/Authentication/Certificate/src/Microsoft.AspNetCore.Authentication.Certificate.csproj b/src/Security/Authentication/Certificate/src/Microsoft.AspNetCore.Authentication.Certificate.csproj new file mode 100644 index 0000000000..1795d68877 --- /dev/null +++ b/src/Security/Authentication/Certificate/src/Microsoft.AspNetCore.Authentication.Certificate.csproj @@ -0,0 +1,16 @@ + + + + ASP.NET Core middleware that enables an application to support certificate authentication. + netcoreapp3.0 + $(DefineConstants);SECURITY + true + aspnetcore;authentication;security;x509;certificate + true + + + + + + + diff --git a/src/Security/Authentication/Certificate/src/README-IISConfig.png b/src/Security/Authentication/Certificate/src/README-IISConfig.png new file mode 100644 index 0000000000..3af15e9d06 Binary files /dev/null and b/src/Security/Authentication/Certificate/src/README-IISConfig.png differ diff --git a/src/Security/Authentication/Certificate/src/README.md b/src/Security/Authentication/Certificate/src/README.md new file mode 100644 index 0000000000..542131fdf1 --- /dev/null +++ b/src/Security/Authentication/Certificate/src/README.md @@ -0,0 +1,234 @@ +# Microsoft.AspNetCore.Authentication.Certificate + +This project sort of contains an implementation of [Certificate Authentication](https://tools.ietf.org/html/rfc5246#section-7.4.4) for ASP.NET Core. +Certificate authentication happens at the TLS level, long before it ever gets to ASP.NET Core, so, more accurately this is an authentication handler +that validates the certificate and then gives you an event where you can resolve that certificate to a ClaimsPrincipal. + +You **must** [configure your host](#hostConfiguration) for certificate authentication, be it IIS, Kestrel, Azure Web Applications or whatever else you're using. + +## Getting started + +First acquire an HTTPS certificate, apply it and then [configure your host](#hostConfiguration) to require certificates. + +In your web application add a reference to the package, then in the `ConfigureServices` method in `startup.cs` call +`app.AddAuthentication(CertificateAuthenticationDefaults.AuthenticationScheme).UseCertificateAuthentication(...);` with your options, +providing a delegate for `OnValidateCertificate` to validate the client certificate sent with requests and turn that information +into an `ClaimsPrincipal`, set it on the `context.Principal` property and call `context.Success()`. + +If you change your scheme name in the options for the authentication handler you need to change the scheme name in +`AddAuthentication()` to ensure it's used on every request which ends in an endpoint that requires authorization. + +If authentication fails this handler will return a `403 (Forbidden)` response rather a `401 (Unauthorized)` as you +might expect - this is because the authentication should happen during the initial TLS connection - by the time it +reaches the handler it's too late, and there's no way to actually upgrade the connection from an anonymous connection +to one with a certificate. + +You must also add `app.UseAuthentication();` in the `Configure` method, otherwise nothing will ever get called. + +For example; + +```c# +public void ConfigureServices(IServiceCollection services) +{ + services.AddAuthentication(CertificateAuthenticationDefaults.AuthenticationScheme) + .AddCertificate(); + // All the other service configuration. +} + +public void Configure(IApplicationBuilder app, IHostingEnvironment env) +{ + app.UseAuthentication(); + + // All the other app configuration. +} +``` + +In the sample above you can see the default way to add certificate authentication. The handler will construct a user principal using the common certificate properties for you. + +## Configuring Certificate Validation + +The `CertificateAuthenticationOptions` handler has some built in validations that are the minimium validations you should perform on +a certificate. Each of these settings are turned on by default. + +### ValidateCertificateChain + +This check validates that the issuer for the certificate is trusted by the application host OS. If +you are going to accept self-signed certificates you must disable this check. + +### ValidateCertificateUse + +This check validates that the certificate presented by the client has the Client Authentication +extended key use, or no EKUs at all (as the specifications say if no EKU is specified then all EKUs +are valid). + +### ValidateValidityPeriod + +This check validates that the certificate is within its validity period. As the handler runs on every +request this ensures that a certificate that was valid when it was presented has not expired during +its current session. + +### RevocationFlag + +A flag which specifies which certificates in the chain are checked for revocation. + +Revocation checks are only performed when the certificate is chained to a root certificate. + +### RevocationMode + +A flag which specifies how revocation checks are performed. +Specifying an on-line check can result in a long delay while the certificate authority is contacted. + +Revocation checks are only performed when the certificate is chained to a root certificate. + +### Can I configure my application to require a certificate only on certain paths? + +Not possible, remember the certificate exchange is done that the start of the HTTPS conversation, +it's done by the host, not the application. Kestrel, IIS, Azure Web Apps don't have any configuration for +this sort of thing. + +# Handler events + +The handler has two events, `OnAuthenticationFailed()`, which is called if an exception happens during authentication and allows you to react, and `OnValidateCertificate()` which is +called after certificate has been validated, passed validation, abut before the default principal has been created. This allows you to perform your own validation, for example +checking if the certificate is one your services knows about, and to construct your own principal. For example, + +```c# +services.AddAuthentication(CertificateAuthenticationDefaults.AuthenticationScheme) + .AddCertificate(options => + { + options.Events = new CertificateAuthenticationEvents + { + OnValidateCertificate = context => + { + var claims = new[] + { + new Claim(ClaimTypes.NameIdentifier, context.ClientCertificate.Subject, ClaimValueTypes.String, context.Options.ClaimsIssuer), + new Claim(ClaimTypes.Name, context.ClientCertificate.Subject, ClaimValueTypes.String, context.Options.ClaimsIssuer) + }; + + context.Principal = new ClaimsPrincipal(new ClaimsIdentity(claims, context.Scheme.Name)); + context.Success(); + + return Task.CompletedTask; + } + }; + }); +``` + +If you find the inbound certificate doesn't meet your extra validation call `context.Fail("failure Reason")` with a failure reason. + +For real functionality you will probably want to call a service registered in DI which talks to a database or other type of +user store. You can grab your service by using the context passed into your delegates, like so + +```c# +services.AddAuthentication(CertificateAuthenticationDefaults.AuthenticationScheme) + .AddCertificate(options => + { + options.Events = new CertificateAuthenticationEvents + { + OnCertificateValidated = context => + { + var validationService = + context.HttpContext.RequestServices.GetService(); + + if (validationService.ValidateCertificate(context.ClientCertificate)) + { + var claims = new[] + { + new Claim(ClaimTypes.NameIdentifier, context.ClientCertificate.Subject, ClaimValueTypes.String, context.Options.ClaimsIssuer), + new Claim(ClaimTypes.Name, context.ClientCertificate.Subject, ClaimValueTypes.String, context.Options.ClaimsIssuer) + }; + + context.Principal = new ClaimsPrincipal(new ClaimsIdentity(claims, context.Scheme.Name)); + context.Success(); + } + + return Task.CompletedTask; + } + }; + }); +``` +Note that conceptually the validation of the certification is an authorization concern, and putting a check on, for example, an issuer or thumbprint in an authorization policy rather +than inside OnCertificateValidated() is perfectly acceptable. + +## Configuring your host to require certificates + +### Kestrel + +In program.cs configure `UseKestrel()` as follows. + +```c# +public static IWebHost BuildWebHost(string[] args) + => WebHost.CreateDefaultBuilder(args) + .UseStartup() + .ConfigureKestrel(options => + { + options.ConfigureHttpsDefaults(opt => + { + opt.ClientCertificateMode = ClientCertificateMode.RequireCertificate; + }); + }) + .Build(); +``` +You must set the `ClientCertificateValidation` delegate to `CertificateValidator.DisableChannelValidation` in order to stop Kestrel using the default OS certificate validation routine and, +instead, letting the authentication handler perform the validation. + +### IIS + +In the IIS Manager + +1. Select your Site in the Connections tab. +2. Double click the SSL Settings in the Features View window. +3. Check the `Require SSL` Check Box and select the `Require` radio button under Client Certificates. + +![Client Certificate Settings in IIS](README-IISConfig.png "Client Certificate Settings in IIS") + +### Azure + +See the [Azure documentation](https://docs.microsoft.com/en-us/azure/app-service/app-service-web-configure-tls-mutual-auth) +to configure Azure Web Apps then add the following to your application startup method, `Configure(IApplicationBuilder app)` add the +following line before the call to `app.UseAuthentication();` + +```c# +app.UseCertificateHeaderForwarding(); +``` + +### Random custom web proxies + +If you're using a proxy which isn't IIS or Azure's Web Apps Application Request Routing you will need to configure your proxy +to forward the certificate it received in an HTTP header. +In your application startup method, `Configure(IApplicationBuilder app)`, add the +following line before the call to `app.UseAuthentication();` + +```c# +app.UseCertificateForwarding(); +``` + +You will also need to configure the Certificate Forwarding middleware to specify the header name. +In your service configuration method, `ConfigureServices(IServiceCollection services)` add +the following code to configure the header the forwarding middleware will build a certificate from; + +```c# +services.AddCertificateForwarding(options => +{ + options.CertificateHeader = "YOUR_CUSTOM_HEADER_NAME"; +}); +``` + +Finally, if your proxy is doing something weird to pass the header on, rather than base 64 encoding it +(looking at you nginx (╯°□°）╯︵ ┻━┻) you can override the converter option to be a func that will +perform the optional conversion, for example + +```c# +services.AddCertificateForwarding(options => +{ + options.CertificateHeader = "YOUR_CUSTOM_HEADER_NAME"; + options.HeaderConverter = (headerValue) => + { + var clientCertificate = + /* some weird conversion logic to create an X509Certificate2 */ + return clientCertificate; + } +}); +``` + diff --git a/src/Security/Authentication/Certificate/src/X509CertificateExtensions.cs b/src/Security/Authentication/Certificate/src/X509CertificateExtensions.cs new file mode 100644 index 0000000000..de8f0d3df2 --- /dev/null +++ b/src/Security/Authentication/Certificate/src/X509CertificateExtensions.cs @@ -0,0 +1,27 @@ +// 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.Linq; +using System.Security.Cryptography.X509Certificates; + +namespace Microsoft.AspNetCore.Authentication.Certificate +{ + /// + /// Extension methods for . + /// + public static class X509Certificate2Extensions + { + /// + /// Determines if the certificate is self signed. + /// + /// The . + /// True if the certificate is self signed. + public static bool IsSelfSigned(this X509Certificate2 certificate) + { + Span subject = certificate.SubjectName.RawData; + Span issuer = certificate.IssuerName.RawData; + return subject.SequenceEqual(issuer); + } + } +} diff --git a/src/Security/Authentication/test/CertificateTests.cs b/src/Security/Authentication/test/CertificateTests.cs new file mode 100644 index 0000000000..a5a2d0294d --- /dev/null +++ b/src/Security/Authentication/test/CertificateTests.cs @@ -0,0 +1,628 @@ +// Copyright (c) Barry Dorrans. 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.IO; +using System.Linq; +using System.Net; +using System.Security.Claims; +using System.Security.Cryptography.X509Certificates; +using System.Threading.Tasks; +using System.Xml.Linq; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.TestHost; +using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Extensions.DependencyInjection; +using Xunit; + +namespace Microsoft.AspNetCore.Authentication.Certificate.Test +{ + public class ClientCertificateAuthenticationTests + { + + [Fact] + public async Task VerifySchemeDefaults() + { + var services = new ServiceCollection(); + services.AddAuthentication().AddCertificate(); + var sp = services.BuildServiceProvider(); + var schemeProvider = sp.GetRequiredService(); + var scheme = await schemeProvider.GetSchemeAsync(CertificateAuthenticationDefaults.AuthenticationScheme); + Assert.NotNull(scheme); + Assert.Equal("CertificateAuthenticationHandler", scheme.HandlerType.Name); + Assert.Null(scheme.DisplayName); + } + + [Fact] + public void VerifyIsSelfSignedExtensionMethod() + { + Assert.True(Certificates.SelfSignedValidWithNoEku.IsSelfSigned()); + } + + [Fact] + public async Task VerifyValidSelfSignedWithClientEkuAuthenticates() + { + var server = CreateServer( + new CertificateAuthenticationOptions + { + AllowedCertificateTypes = CertificateTypes.SelfSigned, + Events = sucessfulValidationEvents + }, + Certificates.SelfSignedValidWithClientEku); + + var response = await server.CreateClient().GetAsync("https://example.com/"); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + + [Fact] + public async Task VerifyValidSelfSignedWithNoEkuAuthenticates() + { + var server = CreateServer( + new CertificateAuthenticationOptions + { + AllowedCertificateTypes = CertificateTypes.SelfSigned, + Events = sucessfulValidationEvents + }, + Certificates.SelfSignedValidWithNoEku); + + var response = await server.CreateClient().GetAsync("https://example.com/"); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + + [Fact] + public async Task VerifyValidSelfSignedWithClientEkuFailsWhenSelfSignedCertsNotAllowed() + { + var server = CreateServer( + new CertificateAuthenticationOptions + { + AllowedCertificateTypes = CertificateTypes.Chained + }, + Certificates.SelfSignedValidWithClientEku); + + var response = await server.CreateClient().GetAsync("https://example.com/"); + Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); + } + + [Fact] + public async Task VerifyValidSelfSignedWithNoEkuFailsWhenSelfSignedCertsNotAllowed() + { + var server = CreateServer( + new CertificateAuthenticationOptions + { + AllowedCertificateTypes = CertificateTypes.Chained, + Events = sucessfulValidationEvents + }, + Certificates.SelfSignedValidWithNoEku); + + var response = await server.CreateClient().GetAsync("https://example.com/"); + Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); + } + + [Fact] + public async Task VerifyValidSelfSignedWithServerFailsEvenIfSelfSignedCertsAreAllowed() + { + var server = CreateServer( + new CertificateAuthenticationOptions + { + AllowedCertificateTypes = CertificateTypes.SelfSigned, + Events = sucessfulValidationEvents + }, + Certificates.SelfSignedValidWithServerEku); + + var response = await server.CreateClient().GetAsync("https://example.com/"); + Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); + } + + [Fact] + public async Task VerifyValidSelfSignedWithServerPassesWhenSelfSignedCertsAreAllowedAndPurposeValidationIsOff() + { + var server = CreateServer( + new CertificateAuthenticationOptions + { + AllowedCertificateTypes = CertificateTypes.SelfSigned, + ValidateCertificateUse = false, + Events = sucessfulValidationEvents + }, + Certificates.SelfSignedValidWithServerEku); + + var response = await server.CreateClient().GetAsync("https://example.com/"); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + + [Fact] + public async Task VerifyValidSelfSignedWithServerFailsPurposeValidationIsOffButSelfSignedCertsAreNotAllowed() + { + var server = CreateServer( + new CertificateAuthenticationOptions + { + AllowedCertificateTypes = CertificateTypes.Chained, + ValidateCertificateUse = false, + Events = sucessfulValidationEvents + }, + Certificates.SelfSignedValidWithServerEku); + + var response = await server.CreateClient().GetAsync("https://example.com/"); + Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); + } + + [Fact] + public async Task VerifyExpiredSelfSignedFails() + { + var server = CreateServer( + new CertificateAuthenticationOptions + { + AllowedCertificateTypes = CertificateTypes.SelfSigned, + ValidateCertificateUse = false, + Events = sucessfulValidationEvents + }, + Certificates.SelfSignedExpired); + + var response = await server.CreateClient().GetAsync("https://example.com/"); + Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); + } + + [Fact] + public async Task VerifyExpiredSelfSignedPassesIfDateRangeValidationIsDisabled() + { + var server = CreateServer( + new CertificateAuthenticationOptions + { + AllowedCertificateTypes = CertificateTypes.SelfSigned, + ValidateValidityPeriod = false, + Events = sucessfulValidationEvents + }, + Certificates.SelfSignedExpired); + + var response = await server.CreateClient().GetAsync("https://example.com/"); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + + [Fact] + public async Task VerifyNotYetValidSelfSignedFails() + { + var server = CreateServer( + new CertificateAuthenticationOptions + { + AllowedCertificateTypes = CertificateTypes.SelfSigned, + ValidateCertificateUse = false, + Events = sucessfulValidationEvents + }, + Certificates.SelfSignedNotYetValid); + + var response = await server.CreateClient().GetAsync("https://example.com/"); + Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); + } + + [Fact] + public async Task VerifyNotYetValidSelfSignedPassesIfDateRangeValidationIsDisabled() + { + var server = CreateServer( + new CertificateAuthenticationOptions + { + AllowedCertificateTypes = CertificateTypes.SelfSigned, + ValidateValidityPeriod = false, + Events = sucessfulValidationEvents + }, + Certificates.SelfSignedNotYetValid); + + var response = await server.CreateClient().GetAsync("https://example.com/"); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + + [Fact] + public async Task VerifyFailingInTheValidationEventReturnsForbidden() + { + var server = CreateServer( + new CertificateAuthenticationOptions + { + ValidateCertificateUse = false, + Events = failedValidationEvents + }, + Certificates.SelfSignedValidWithServerEku); + + var response = await server.CreateClient().GetAsync("https://example.com/"); + Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); + } + + [Fact] + public async Task DoingNothingInTheValidationEventReturnsOK() + { + var server = CreateServer( + new CertificateAuthenticationOptions + { + AllowedCertificateTypes = CertificateTypes.SelfSigned, + ValidateCertificateUse = false, + Events = unprocessedValidationEvents + }, + Certificates.SelfSignedValidWithServerEku); + + var response = await server.CreateClient().GetAsync("https://example.com/"); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + + [Fact] + public async Task VerifyNotSendingACertificateEndsUpInForbidden() + { + var server = CreateServer( + new CertificateAuthenticationOptions + { + Events = sucessfulValidationEvents + }); + + var response = await server.CreateClient().GetAsync("https://example.com/"); + Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); + } + + [Fact] + public async Task VerifyHeaderIsUsedIfCertIsNotPresent() + { + var server = CreateServer( + new CertificateAuthenticationOptions + { + AllowedCertificateTypes = CertificateTypes.SelfSigned, + Events = sucessfulValidationEvents + }, + wireUpHeaderMiddleware : true); + + var client = server.CreateClient(); + client.DefaultRequestHeaders.Add("X-Client-Cert", Convert.ToBase64String(Certificates.SelfSignedValidWithNoEku.RawData)); + var response = await client.GetAsync("https://example.com/"); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + + [Fact] + public async Task VerifyHeaderEncodedCertFailsOnBadEncoding() + { + var server = CreateServer( + new CertificateAuthenticationOptions + { + Events = sucessfulValidationEvents + }, + wireUpHeaderMiddleware: true); + + var client = server.CreateClient(); + client.DefaultRequestHeaders.Add("X-Client-Cert", "OOPS" + Convert.ToBase64String(Certificates.SelfSignedValidWithNoEku.RawData)); + var response = await client.GetAsync("https://example.com/"); + Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); + } + + [Fact] + public async Task VerifySettingTheAzureHeaderOnTheForwarderOptionsWorks() + { + var server = CreateServer( + new CertificateAuthenticationOptions + { + AllowedCertificateTypes = CertificateTypes.SelfSigned, + Events = sucessfulValidationEvents + }, + wireUpHeaderMiddleware: true, + headerName: "X-ARR-ClientCert"); + + var client = server.CreateClient(); + client.DefaultRequestHeaders.Add("X-ARR-ClientCert", Convert.ToBase64String(Certificates.SelfSignedValidWithNoEku.RawData)); + var response = await client.GetAsync("https://example.com/"); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + + [Fact] + public async Task VerifyACustomHeaderFailsIfTheHeaderIsNotPresent() + { + var server = CreateServer( + new CertificateAuthenticationOptions + { + Events = sucessfulValidationEvents + }, + wireUpHeaderMiddleware: true, + headerName: "X-ARR-ClientCert"); + + var client = server.CreateClient(); + client.DefaultRequestHeaders.Add("random-Weird-header", Convert.ToBase64String(Certificates.SelfSignedValidWithNoEku.RawData)); + var response = await client.GetAsync("https://example.com/"); + Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); + } + + [Fact] + public async Task VerifyNoEventWireupWithAValidCertificateCreatesADefaultUser() + { + var server = CreateServer( + new CertificateAuthenticationOptions + { + AllowedCertificateTypes = CertificateTypes.SelfSigned + }, + Certificates.SelfSignedValidWithNoEku); + + var response = await server.CreateClient().GetAsync("https://example.com/"); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + + XElement responseAsXml = null; + if (response.Content != null && + response.Content.Headers.ContentType != null && + response.Content.Headers.ContentType.MediaType == "text/xml") + { + var responseContent = await response.Content.ReadAsStringAsync(); + responseAsXml = XElement.Parse(responseContent); + } + + Assert.NotNull(responseAsXml); + + // There should always be an Issuer and a Thumbprint. + var actual = responseAsXml.Elements("claim").Where(claim => claim.Attribute("Type").Value == "issuer"); + Assert.Single(actual); + Assert.Equal(Certificates.SelfSignedValidWithNoEku.Issuer, actual.First().Value); + + actual = responseAsXml.Elements("claim").Where(claim => claim.Attribute("Type").Value == ClaimTypes.Thumbprint); + Assert.Single(actual); + Assert.Equal(Certificates.SelfSignedValidWithNoEku.Thumbprint, actual.First().Value); + + // Now the optional ones + if (!string.IsNullOrEmpty(Certificates.SelfSignedValidWithNoEku.SubjectName.Name)) + { + actual = responseAsXml.Elements("claim").Where(claim => claim.Attribute("Type").Value == ClaimTypes.X500DistinguishedName); + if (actual.Count() > 0) + { + Assert.Single(actual); + Assert.Equal(Certificates.SelfSignedValidWithNoEku.SubjectName.Name, actual.First().Value); + } + } + + if (!string.IsNullOrEmpty(Certificates.SelfSignedValidWithNoEku.SerialNumber)) + { + actual = responseAsXml.Elements("claim").Where(claim => claim.Attribute("Type").Value == ClaimTypes.SerialNumber); + if (actual.Count() > 0) + { + Assert.Single(actual); + Assert.Equal(Certificates.SelfSignedValidWithNoEku.SerialNumber, actual.First().Value); + } + } + + if (!string.IsNullOrEmpty(Certificates.SelfSignedValidWithNoEku.GetNameInfo(X509NameType.DnsName, false))) + { + actual = responseAsXml.Elements("claim").Where(claim => claim.Attribute("Type").Value == ClaimTypes.Dns); + if (actual.Count() > 0) + { + Assert.Single(actual); + Assert.Equal(Certificates.SelfSignedValidWithNoEku.GetNameInfo(X509NameType.DnsName, false), actual.First().Value); + } + } + + if (!string.IsNullOrEmpty(Certificates.SelfSignedValidWithNoEku.GetNameInfo(X509NameType.EmailName, false))) + { + actual = responseAsXml.Elements("claim").Where(claim => claim.Attribute("Type").Value == ClaimTypes.Email); + if (actual.Count() > 0) + { + Assert.Single(actual); + Assert.Equal(Certificates.SelfSignedValidWithNoEku.GetNameInfo(X509NameType.EmailName, false), actual.First().Value); + } + } + + if (!string.IsNullOrEmpty(Certificates.SelfSignedValidWithNoEku.GetNameInfo(X509NameType.SimpleName, false))) + { + actual = responseAsXml.Elements("claim").Where(claim => claim.Attribute("Type").Value == ClaimTypes.Name); + if (actual.Count() > 0) + { + Assert.Single(actual); + Assert.Equal(Certificates.SelfSignedValidWithNoEku.GetNameInfo(X509NameType.SimpleName, false), actual.First().Value); + } + } + + if (!string.IsNullOrEmpty(Certificates.SelfSignedValidWithNoEku.GetNameInfo(X509NameType.UpnName, false))) + { + actual = responseAsXml.Elements("claim").Where(claim => claim.Attribute("Type").Value == ClaimTypes.Upn); + if (actual.Count() > 0) + { + Assert.Single(actual); + Assert.Equal(Certificates.SelfSignedValidWithNoEku.GetNameInfo(X509NameType.UpnName, false), actual.First().Value); + } + } + + if (!string.IsNullOrEmpty(Certificates.SelfSignedValidWithNoEku.GetNameInfo(X509NameType.UrlName, false))) + { + actual = responseAsXml.Elements("claim").Where(claim => claim.Attribute("Type").Value == ClaimTypes.Uri); + if (actual.Count() > 0) + { + Assert.Single(actual); + Assert.Equal(Certificates.SelfSignedValidWithNoEku.GetNameInfo(X509NameType.UrlName, false), actual.First().Value); + } + } + } + + [Fact] + public async Task VerifyValidationEventPrincipalIsPropogated() + { + const string Expected = "John Doe"; + + var server = CreateServer( + new CertificateAuthenticationOptions + { + AllowedCertificateTypes = CertificateTypes.SelfSigned, + Events = new CertificateAuthenticationEvents + { + OnCertificateValidated = context => + { + // Make sure we get the validated principal + Assert.NotNull(context.Principal); + var claims = new[] + { + new Claim(ClaimTypes.Name, Expected, ClaimValueTypes.String, context.Options.ClaimsIssuer) + }; + + context.Principal = new ClaimsPrincipal(new ClaimsIdentity(claims, context.Scheme.Name)); + context.Success(); + return Task.CompletedTask; + } + } + }, + Certificates.SelfSignedValidWithNoEku); + + var response = await server.CreateClient().GetAsync("https://example.com/"); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + + XElement responseAsXml = null; + if (response.Content != null && + response.Content.Headers.ContentType != null && + response.Content.Headers.ContentType.MediaType == "text/xml") + { + var responseContent = await response.Content.ReadAsStringAsync(); + responseAsXml = XElement.Parse(responseContent); + } + + Assert.NotNull(responseAsXml); + var actual = responseAsXml.Elements("claim").Where(claim => claim.Attribute("Type").Value == ClaimTypes.Name); + Assert.Single(actual); + Assert.Equal(Expected, actual.First().Value); + Assert.Single(responseAsXml.Elements("claim")); + } + + private static TestServer CreateServer( + CertificateAuthenticationOptions configureOptions, + X509Certificate2 clientCertificate = null, + Func handler = null, + Uri baseAddress = null, + bool wireUpHeaderMiddleware = false, + string headerName = "") + { + var builder = new WebHostBuilder() + .Configure(app => + { + app.Use((context, next) => + { + if (clientCertificate != null) + { + context.Connection.ClientCertificate = clientCertificate; + } + return next(); + }); + + + if (wireUpHeaderMiddleware) + { + app.UseCertificateForwarding(); + } + + app.UseAuthentication(); + + app.Use(async (context, next) => + { + var request = context.Request; + var response = context.Response; + + var authenticationResult = await context.AuthenticateAsync(); + + if (authenticationResult.Succeeded) + { + response.StatusCode = (int)HttpStatusCode.OK; + response.ContentType = "text/xml"; + + await response.WriteAsync(""); + foreach (Claim claim in context.User.Claims) + { + await response.WriteAsync($"{claim.Value}"); + } + await response.WriteAsync(""); + } + else + { + await context.ChallengeAsync(); + } + }); + }) + .ConfigureServices(services => + { + if (configureOptions != null) + { + services.AddAuthentication(CertificateAuthenticationDefaults.AuthenticationScheme).AddCertificate(options => + { + options.AllowedCertificateTypes = configureOptions.AllowedCertificateTypes; + options.Events = configureOptions.Events; + options.ValidateCertificateUse = configureOptions.ValidateCertificateUse; + options.RevocationFlag = options.RevocationFlag; + options.RevocationMode = options.RevocationMode; + options.ValidateValidityPeriod = configureOptions.ValidateValidityPeriod; + }); + } + else + { + services.AddAuthentication(CertificateAuthenticationDefaults.AuthenticationScheme).AddCertificate(); + } + + if (wireUpHeaderMiddleware && !string.IsNullOrEmpty(headerName)) + { + services.AddCertificateForwarding(options => + { + options.CertificateHeader = headerName; + }); + } + }); + + var server = new TestServer(builder) + { + BaseAddress = baseAddress + }; + + return server; + } + + private CertificateAuthenticationEvents sucessfulValidationEvents = new CertificateAuthenticationEvents() + { + OnCertificateValidated = context => + { + var claims = new[] + { + new Claim(ClaimTypes.NameIdentifier, context.ClientCertificate.Subject, ClaimValueTypes.String, context.Options.ClaimsIssuer), + new Claim(ClaimTypes.Name, context.ClientCertificate.Subject, ClaimValueTypes.String, context.Options.ClaimsIssuer) + }; + + context.Principal = new ClaimsPrincipal(new ClaimsIdentity(claims, context.Scheme.Name)); + context.Success(); + return Task.CompletedTask; + } + }; + + private CertificateAuthenticationEvents failedValidationEvents = new CertificateAuthenticationEvents() + { + OnCertificateValidated = context => + { + context.Fail("Not validated"); + return Task.CompletedTask; + } + }; + + private CertificateAuthenticationEvents unprocessedValidationEvents = new CertificateAuthenticationEvents() + { + OnCertificateValidated = context => + { + return Task.CompletedTask; + } + }; + + private static class Certificates + { + public static X509Certificate2 SelfSignedValidWithClientEku { get; private set; } = + new X509Certificate2(GetFullyQualifiedFilePath("validSelfSignedClientEkuCertificate.cer")); + + public static X509Certificate2 SelfSignedValidWithNoEku { get; private set; } = + new X509Certificate2(GetFullyQualifiedFilePath("validSelfSignedNoEkuCertificate.cer")); + + public static X509Certificate2 SelfSignedValidWithServerEku { get; private set; } = + new X509Certificate2(GetFullyQualifiedFilePath("validSelfSignedServerEkuCertificate.cer")); + + public static X509Certificate2 SelfSignedNotYetValid { get; private set; } = + new X509Certificate2(GetFullyQualifiedFilePath("selfSignedNoEkuCertificateNotValidYet.cer")); + + public static X509Certificate2 SelfSignedExpired { get; private set; } = + new X509Certificate2(GetFullyQualifiedFilePath("selfSignedNoEkuCertificateExpired.cer")); + + private static string GetFullyQualifiedFilePath(string filename) + { + var filePath = Path.Combine(AppContext.BaseDirectory, filename); + if (!File.Exists(filePath)) + { + throw new FileNotFoundException(filePath); + } + return filePath; + } + } + } +} diff --git a/src/Security/Authentication/test/CookieTests.cs b/src/Security/Authentication/test/CookieTests.cs index 4a72567844..7e66070b48 100644 --- a/src/Security/Authentication/test/CookieTests.cs +++ b/src/Security/Authentication/test/CookieTests.cs @@ -1001,7 +1001,7 @@ namespace Microsoft.AspNetCore.Authentication.Cookies .Configure(app => { app.UseAuthentication(); - app.Run(context => context.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, new ClaimsPrincipal(new ClaimsIdentity()))); + app.Run(context => context.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, new ClaimsPrincipal(new ClaimsIdentity("whatever")))); }) .ConfigureServices(services => { @@ -1024,7 +1024,7 @@ namespace Microsoft.AspNetCore.Authentication.Cookies .Configure(app => { app.UseAuthentication(); - app.Run(context => context.SignInAsync("Cookie1", new ClaimsPrincipal(new ClaimsIdentity()))); + app.Run(context => context.SignInAsync("Cookie1", new ClaimsPrincipal(new ClaimsIdentity("whatever")))); }) .ConfigureServices(services => { @@ -1048,7 +1048,7 @@ namespace Microsoft.AspNetCore.Authentication.Cookies { app.UseAuthentication(); app.Map("/notlogin", signoutApp => signoutApp.Run(context => context.SignInAsync("Cookies", - new ClaimsPrincipal()))); + new ClaimsPrincipal(new ClaimsIdentity("whatever"))))); }) .ConfigureServices(services => services.AddAuthentication().AddCookie(o => o.LoginPath = new PathString("/login"))); var server = new TestServer(builder); @@ -1065,7 +1065,7 @@ namespace Microsoft.AspNetCore.Authentication.Cookies .Configure(app => { app.UseAuthentication(); - app.Map("/login", signoutApp => signoutApp.Run(context => context.SignInAsync("Cookies", new ClaimsPrincipal()))); + app.Map("/login", signoutApp => signoutApp.Run(context => context.SignInAsync("Cookies", new ClaimsPrincipal(new ClaimsIdentity("whatever"))))); }) .ConfigureServices(services => services.AddAuthentication().AddCookie(o => o.LoginPath = new PathString("/login"))); diff --git a/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj b/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj index f575bfa0cf..fd033a9169 100644 --- a/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj +++ b/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj @@ -22,6 +22,10 @@ PreserveNewest + + PreserveNewest + PreserveNewest + @@ -34,6 +38,7 @@ + @@ -42,6 +47,7 @@ + diff --git a/src/Security/Authentication/test/PolicyTests.cs b/src/Security/Authentication/test/PolicyTests.cs index 60e6c41be6..77d764e14b 100644 --- a/src/Security/Authentication/test/PolicyTests.cs +++ b/src/Security/Authentication/test/PolicyTests.cs @@ -101,7 +101,7 @@ namespace Microsoft.AspNetCore.Authentication Assert.Equal(1, handler1.SignOutCount); Assert.Equal(0, handler2.SignOutCount); - await context.SignInAsync("forward", new ClaimsPrincipal()); + await context.SignInAsync("forward", new ClaimsPrincipal(new ClaimsIdentity("whatever"))); Assert.Equal(1, handler1.SignInCount); Assert.Equal(0, handler2.SignInCount); } @@ -156,7 +156,7 @@ namespace Microsoft.AspNetCore.Authentication Assert.Equal(1, handler1.SignOutCount); Assert.Equal(0, handler2.SignOutCount); - await context.SignInAsync("forward", new ClaimsPrincipal()); + await context.SignInAsync("forward", new ClaimsPrincipal(new ClaimsIdentity("whatever"))); Assert.Equal(1, handler1.SignInCount); Assert.Equal(0, handler2.SignInCount); } @@ -216,7 +216,7 @@ namespace Microsoft.AspNetCore.Authentication Assert.Equal(1, handler1.SignOutCount); Assert.Equal(0, handler2.SignOutCount); - await context.SignInAsync("forward", new ClaimsPrincipal()); + await context.SignInAsync("forward", new ClaimsPrincipal(new ClaimsIdentity("whatever"))); Assert.Equal(1, handler1.SignInCount); Assert.Equal(0, handler2.SignInCount); } @@ -268,7 +268,7 @@ namespace Microsoft.AspNetCore.Authentication Assert.Equal(1, handler1.SignOutCount); Assert.Equal(0, handler2.SignOutCount); - await context.SignInAsync("forward", new ClaimsPrincipal()); + await context.SignInAsync("forward", new ClaimsPrincipal(new ClaimsIdentity("whatever"))); Assert.Equal(1, handler1.SignInCount); Assert.Equal(0, handler2.SignInCount); } @@ -325,7 +325,7 @@ namespace Microsoft.AspNetCore.Authentication Assert.Equal(1, handler1.SignOutCount); Assert.Equal(0, handler2.SignOutCount); - await context.SignInAsync("forward", new ClaimsPrincipal()); + await context.SignInAsync("forward", new ClaimsPrincipal(new ClaimsIdentity("whatever"))); Assert.Equal(0, handler1.SignInCount); Assert.Equal(1, handler2.SignInCount); } diff --git a/src/Security/Authentication/test/SharedAuthenticationTests.cs b/src/Security/Authentication/test/SharedAuthenticationTests.cs index 4590c4915d..36956f8374 100644 --- a/src/Security/Authentication/test/SharedAuthenticationTests.cs +++ b/src/Security/Authentication/test/SharedAuthenticationTests.cs @@ -70,7 +70,7 @@ namespace Microsoft.AspNetCore.Authentication if (SupportsSignIn) { - await context.SignInAsync(new ClaimsPrincipal()); + await context.SignInAsync(new ClaimsPrincipal(new ClaimsIdentity("whatever"))); Assert.Equal(1, forwardDefault.SignInCount); } else @@ -107,7 +107,7 @@ namespace Microsoft.AspNetCore.Authentication var context = new DefaultHttpContext(); context.RequestServices = sp; - await context.SignInAsync(new ClaimsPrincipal()); + await context.SignInAsync(new ClaimsPrincipal(new ClaimsIdentity("whatever"))); Assert.Equal(1, specific.SignInCount); Assert.Equal(0, specific.AuthenticateCount); Assert.Equal(0, specific.ForbidCount); @@ -330,7 +330,7 @@ namespace Microsoft.AspNetCore.Authentication if (SupportsSignIn) { - await context.SignInAsync(new ClaimsPrincipal()); + await context.SignInAsync(new ClaimsPrincipal(new ClaimsIdentity("whatever"))); Assert.Equal(1, selector.SignInCount); } else @@ -399,7 +399,7 @@ namespace Microsoft.AspNetCore.Authentication if (SupportsSignIn) { - await context.SignInAsync(new ClaimsPrincipal()); + await context.SignInAsync(new ClaimsPrincipal(new ClaimsIdentity("whatever"))); Assert.Equal(1, forwardDefault.SignInCount); } else @@ -473,7 +473,7 @@ namespace Microsoft.AspNetCore.Authentication if (SupportsSignIn) { - await context.SignInAsync(new ClaimsPrincipal()); + await context.SignInAsync(new ClaimsPrincipal(new ClaimsIdentity("whatever"))); Assert.Equal(1, specific.SignInCount); } else diff --git a/src/Security/Authentication/test/TestCertificates/selfSignedNoEkuCertificateExpired.cer b/src/Security/Authentication/test/TestCertificates/selfSignedNoEkuCertificateExpired.cer new file mode 100644 index 0000000000..81b6326d6f Binary files /dev/null and b/src/Security/Authentication/test/TestCertificates/selfSignedNoEkuCertificateExpired.cer differ diff --git a/src/Security/Authentication/test/TestCertificates/selfSignedNoEkuCertificateNotValidYet.cer b/src/Security/Authentication/test/TestCertificates/selfSignedNoEkuCertificateNotValidYet.cer new file mode 100644 index 0000000000..9c8cf9d71b Binary files /dev/null and b/src/Security/Authentication/test/TestCertificates/selfSignedNoEkuCertificateNotValidYet.cer differ diff --git a/src/Security/Authentication/test/TestCertificates/validSelfSignedClientEkuCertificate.cer b/src/Security/Authentication/test/TestCertificates/validSelfSignedClientEkuCertificate.cer new file mode 100644 index 0000000000..db4bb5b90a Binary files /dev/null and b/src/Security/Authentication/test/TestCertificates/validSelfSignedClientEkuCertificate.cer differ diff --git a/src/Security/Authentication/test/TestCertificates/validSelfSignedNoEkuCertificate.cer b/src/Security/Authentication/test/TestCertificates/validSelfSignedNoEkuCertificate.cer new file mode 100644 index 0000000000..2be2a46d79 Binary files /dev/null and b/src/Security/Authentication/test/TestCertificates/validSelfSignedNoEkuCertificate.cer differ diff --git a/src/Security/Authentication/test/TestCertificates/validSelfSignedServerEkuCertificate.cer b/src/Security/Authentication/test/TestCertificates/validSelfSignedServerEkuCertificate.cer new file mode 100644 index 0000000000..823000d4a1 Binary files /dev/null and b/src/Security/Authentication/test/TestCertificates/validSelfSignedServerEkuCertificate.cer differ diff --git a/src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj b/src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj index ca6b8ce526..6e17562a94 100644 --- a/src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj +++ b/src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj @@ -7,6 +7,7 @@ Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute Microsoft.AspNetCore.Authorization.AuthorizeAttribute netstandard2.0 true + true $(NoWarn);CS1591 true aspnetcore;authorization diff --git a/src/Security/Security.sln b/src/Security/Security.sln index 0e10f4be5e..3f0a69751e 100644 --- a/src/Security/Security.sln +++ b/src/Security/Security.sln @@ -118,8 +118,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Http.Headers" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Core", "..\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj", "{ADA1E8D3-C13C-4747-8B4D-F4278E7CDFEC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions", "..\Servers\Kestrel\Transport.Abstractions\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj", "{19F39424-5F0F-42BF-BE04-40B20398C255}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "..\Servers\Kestrel\Transport.Sockets\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", "{F59ECA2C-146A-4708-B2C4-296F452C1AF3}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Connections.Abstractions", "..\Servers\Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj", "{54F2FA08-8E1C-4FC1-A5CF-51D742E29EF7}" @@ -153,6 +151,13 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\Mvc\src\Microsoft.AspNetCore.Mvc.csproj", "{27B5D7B5-75A6-4BE6-BD09-597044D06970}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core", "..\Mvc\Mvc.Core\src\Microsoft.AspNetCore.Mvc.Core.csproj", "{553F8C79-13AF-4993-99C1-D70F2143AD8E}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Certificate", "Certificate", "{4DF524BF-D9A9-46F2-882C-68C48FF5FF33}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Certificate", "Authentication\Certificate\src\Microsoft.AspNetCore.Authentication.Certificate.csproj", "{2B88E3EA-6FBE-4690-A56E-0744FFAC9870}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Certificate.Sample", "Authentication\Certificate\samples\Certificate.Sample\Certificate.Sample.csproj", "{11F3B44F-DE5F-42C4-8EC9-1AA51FB89158}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HeaderPropagation", "..\Middleware\HeaderPropagation\ref\Microsoft.AspNetCore.HeaderPropagation.csproj", "{9F9CBDD0-C8B3-4E79-B2B3-9ADE4AE08AEA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -332,10 +337,6 @@ Global {ADA1E8D3-C13C-4747-8B4D-F4278E7CDFEC}.Debug|Any CPU.Build.0 = Debug|Any CPU {ADA1E8D3-C13C-4747-8B4D-F4278E7CDFEC}.Release|Any CPU.ActiveCfg = Release|Any CPU {ADA1E8D3-C13C-4747-8B4D-F4278E7CDFEC}.Release|Any CPU.Build.0 = Release|Any CPU - {19F39424-5F0F-42BF-BE04-40B20398C255}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19F39424-5F0F-42BF-BE04-40B20398C255}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19F39424-5F0F-42BF-BE04-40B20398C255}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19F39424-5F0F-42BF-BE04-40B20398C255}.Release|Any CPU.Build.0 = Release|Any CPU {F59ECA2C-146A-4708-B2C4-296F452C1AF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F59ECA2C-146A-4708-B2C4-296F452C1AF3}.Debug|Any CPU.Build.0 = Debug|Any CPU {F59ECA2C-146A-4708-B2C4-296F452C1AF3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -400,6 +401,18 @@ Global {553F8C79-13AF-4993-99C1-D70F2143AD8E}.Debug|Any CPU.Build.0 = Debug|Any CPU {553F8C79-13AF-4993-99C1-D70F2143AD8E}.Release|Any CPU.ActiveCfg = Release|Any CPU {553F8C79-13AF-4993-99C1-D70F2143AD8E}.Release|Any CPU.Build.0 = Release|Any CPU + {2B88E3EA-6FBE-4690-A56E-0744FFAC9870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2B88E3EA-6FBE-4690-A56E-0744FFAC9870}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2B88E3EA-6FBE-4690-A56E-0744FFAC9870}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2B88E3EA-6FBE-4690-A56E-0744FFAC9870}.Release|Any CPU.Build.0 = Release|Any CPU + {11F3B44F-DE5F-42C4-8EC9-1AA51FB89158}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {11F3B44F-DE5F-42C4-8EC9-1AA51FB89158}.Debug|Any CPU.Build.0 = Debug|Any CPU + {11F3B44F-DE5F-42C4-8EC9-1AA51FB89158}.Release|Any CPU.ActiveCfg = Release|Any CPU + {11F3B44F-DE5F-42C4-8EC9-1AA51FB89158}.Release|Any CPU.Build.0 = Release|Any CPU + {9F9CBDD0-C8B3-4E79-B2B3-9ADE4AE08AEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9F9CBDD0-C8B3-4E79-B2B3-9ADE4AE08AEA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9F9CBDD0-C8B3-4E79-B2B3-9ADE4AE08AEA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9F9CBDD0-C8B3-4E79-B2B3-9ADE4AE08AEA}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -458,7 +471,6 @@ Global {A8293483-BA7A-40D3-A45C-0708EFB8F998} = {A3766414-EB5C-40F7-B031-121804ED5D0A} {52175871-7DF6-4B40-ADCB-4101E8D3D1A2} = {A3766414-EB5C-40F7-B031-121804ED5D0A} {ADA1E8D3-C13C-4747-8B4D-F4278E7CDFEC} = {A3766414-EB5C-40F7-B031-121804ED5D0A} - {19F39424-5F0F-42BF-BE04-40B20398C255} = {A3766414-EB5C-40F7-B031-121804ED5D0A} {F59ECA2C-146A-4708-B2C4-296F452C1AF3} = {A3766414-EB5C-40F7-B031-121804ED5D0A} {54F2FA08-8E1C-4FC1-A5CF-51D742E29EF7} = {A3766414-EB5C-40F7-B031-121804ED5D0A} {88803B55-E0C0-4216-9033-50709F9B726A} = {A3766414-EB5C-40F7-B031-121804ED5D0A} @@ -476,6 +488,10 @@ Global {8771B5C8-4B96-4A40-A3FC-8CC7E16D7A82} = {A482E4FD-51C2-4061-8357-1E4757D6CF27} {27B5D7B5-75A6-4BE6-BD09-597044D06970} = {A3766414-EB5C-40F7-B031-121804ED5D0A} {553F8C79-13AF-4993-99C1-D70F2143AD8E} = {A3766414-EB5C-40F7-B031-121804ED5D0A} + {4DF524BF-D9A9-46F2-882C-68C48FF5FF33} = {79C549BA-2932-450A-B87D-635879361343} + {2B88E3EA-6FBE-4690-A56E-0744FFAC9870} = {4DF524BF-D9A9-46F2-882C-68C48FF5FF33} + {11F3B44F-DE5F-42C4-8EC9-1AA51FB89158} = {4DF524BF-D9A9-46F2-882C-68C48FF5FF33} + {9F9CBDD0-C8B3-4E79-B2B3-9ADE4AE08AEA} = {A3766414-EB5C-40F7-B031-121804ED5D0A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {ABF8089E-43D0-4010-84A7-7A9DCFE49357} diff --git a/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.netstandard2.0.cs b/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.netstandard2.0.cs index 1189ad64cf..bb446f937d 100644 --- a/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.netstandard2.0.cs +++ b/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.netstandard2.0.cs @@ -30,12 +30,16 @@ namespace Microsoft.AspNetCore.Connections public abstract partial class ConnectionContext { protected ConnectionContext() { } + public virtual System.Threading.CancellationToken ConnectionClosed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public abstract string ConnectionId { get; set; } public abstract Microsoft.AspNetCore.Http.Features.IFeatureCollection Features { get; } public abstract System.Collections.Generic.IDictionary Items { get; set; } + public virtual System.Net.EndPoint LocalEndPoint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public virtual System.Net.EndPoint RemoteEndPoint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public abstract System.IO.Pipelines.IDuplexPipe Transport { get; set; } public virtual void Abort() { } public virtual void Abort(Microsoft.AspNetCore.Connections.ConnectionAbortedException abortReason) { } + public virtual System.Threading.Tasks.ValueTask DisposeAsync() { throw null; } } public delegate System.Threading.Tasks.Task ConnectionDelegate(Microsoft.AspNetCore.Connections.ConnectionContext connection); public abstract partial class ConnectionHandler @@ -70,20 +74,35 @@ namespace Microsoft.AspNetCore.Connections public ConnectionResetException(string message) { } public ConnectionResetException(string message, System.Exception inner) { } } - public partial class DefaultConnectionContext : Microsoft.AspNetCore.Connections.ConnectionContext, Microsoft.AspNetCore.Connections.Features.IConnectionIdFeature, Microsoft.AspNetCore.Connections.Features.IConnectionItemsFeature, Microsoft.AspNetCore.Connections.Features.IConnectionLifetimeFeature, Microsoft.AspNetCore.Connections.Features.IConnectionTransportFeature, Microsoft.AspNetCore.Connections.Features.IConnectionUserFeature, System.IDisposable + public partial class DefaultConnectionContext : Microsoft.AspNetCore.Connections.ConnectionContext, Microsoft.AspNetCore.Connections.Features.IConnectionEndPointFeature, Microsoft.AspNetCore.Connections.Features.IConnectionIdFeature, Microsoft.AspNetCore.Connections.Features.IConnectionItemsFeature, Microsoft.AspNetCore.Connections.Features.IConnectionLifetimeFeature, Microsoft.AspNetCore.Connections.Features.IConnectionTransportFeature, Microsoft.AspNetCore.Connections.Features.IConnectionUserFeature, System.IDisposable { public DefaultConnectionContext() { } public DefaultConnectionContext(string id) { } public DefaultConnectionContext(string id, System.IO.Pipelines.IDuplexPipe transport, System.IO.Pipelines.IDuplexPipe application) { } public System.IO.Pipelines.IDuplexPipe Application { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Threading.CancellationToken ConnectionClosed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public override System.Threading.CancellationToken ConnectionClosed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public override string ConnectionId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public override Microsoft.AspNetCore.Http.Features.IFeatureCollection Features { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public override System.Collections.Generic.IDictionary Items { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public override System.Net.EndPoint LocalEndPoint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public override System.Net.EndPoint RemoteEndPoint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public override System.IO.Pipelines.IDuplexPipe Transport { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public System.Security.Claims.ClaimsPrincipal User { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public override void Abort(Microsoft.AspNetCore.Connections.ConnectionAbortedException abortReason) { } public void Dispose() { } + public override System.Threading.Tasks.ValueTask DisposeAsync() { throw null; } + } + public partial class FileHandleEndPoint : System.Net.EndPoint + { + public FileHandleEndPoint(ulong fileHandle, Microsoft.AspNetCore.Connections.FileHandleType fileHandleType) { } + public ulong FileHandle { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Connections.FileHandleType FileHandleType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + public enum FileHandleType + { + Auto = 0, + Tcp = 1, + Pipe = 2, } public partial interface IConnectionBuilder { @@ -91,12 +110,49 @@ namespace Microsoft.AspNetCore.Connections Microsoft.AspNetCore.Connections.ConnectionDelegate Build(); Microsoft.AspNetCore.Connections.IConnectionBuilder Use(System.Func middleware); } + public partial interface IConnectionListener + { + System.Net.EndPoint EndPoint { get; } + System.Threading.Tasks.ValueTask AcceptAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + System.Threading.Tasks.ValueTask DisposeAsync(); + System.Threading.Tasks.ValueTask UnbindAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + } + public partial interface IConnectionListenerFactory + { + System.Threading.Tasks.ValueTask BindAsync(System.Net.EndPoint endpoint, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + } [System.FlagsAttribute] public enum TransferFormat { Binary = 1, Text = 2, } + public abstract partial class TransportConnection : Microsoft.AspNetCore.Connections.ConnectionContext, Microsoft.AspNetCore.Connections.Features.IConnectionIdFeature, Microsoft.AspNetCore.Connections.Features.IConnectionItemsFeature, Microsoft.AspNetCore.Connections.Features.IConnectionLifetimeFeature, Microsoft.AspNetCore.Connections.Features.IConnectionTransportFeature, Microsoft.AspNetCore.Connections.Features.IMemoryPoolFeature, Microsoft.AspNetCore.Http.Features.IFeatureCollection, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + { + public TransportConnection() { } + public System.IO.Pipelines.IDuplexPipe Application { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public override System.Threading.CancellationToken ConnectionClosed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public override string ConnectionId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public override Microsoft.AspNetCore.Http.Features.IFeatureCollection Features { get { throw null; } } + public override System.Collections.Generic.IDictionary Items { get { throw null; } set { } } + public override System.Net.EndPoint LocalEndPoint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public virtual System.Buffers.MemoryPool MemoryPool { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + System.Collections.Generic.IDictionary Microsoft.AspNetCore.Connections.Features.IConnectionItemsFeature.Items { get { throw null; } set { } } + System.Threading.CancellationToken Microsoft.AspNetCore.Connections.Features.IConnectionLifetimeFeature.ConnectionClosed { get { throw null; } set { } } + System.IO.Pipelines.IDuplexPipe Microsoft.AspNetCore.Connections.Features.IConnectionTransportFeature.Transport { get { throw null; } set { } } + System.Buffers.MemoryPool Microsoft.AspNetCore.Connections.Features.IMemoryPoolFeature.MemoryPool { get { throw null; } } + bool Microsoft.AspNetCore.Http.Features.IFeatureCollection.IsReadOnly { get { throw null; } } + object Microsoft.AspNetCore.Http.Features.IFeatureCollection.this[System.Type key] { get { throw null; } set { } } + int Microsoft.AspNetCore.Http.Features.IFeatureCollection.Revision { get { throw null; } } + public override System.Net.EndPoint RemoteEndPoint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public override System.IO.Pipelines.IDuplexPipe Transport { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public override void Abort(Microsoft.AspNetCore.Connections.ConnectionAbortedException abortReason) { } + void Microsoft.AspNetCore.Connections.Features.IConnectionLifetimeFeature.Abort() { } + TFeature Microsoft.AspNetCore.Http.Features.IFeatureCollection.Get() { throw null; } + void Microsoft.AspNetCore.Http.Features.IFeatureCollection.Set(TFeature feature) { } + System.Collections.Generic.IEnumerator> System.Collections.Generic.IEnumerable>.GetEnumerator() { throw null; } + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } + } } namespace Microsoft.AspNetCore.Connections.Features { @@ -104,6 +160,11 @@ namespace Microsoft.AspNetCore.Connections.Features { void OnCompleted(System.Func callback, object state); } + public partial interface IConnectionEndPointFeature + { + System.Net.EndPoint LocalEndPoint { get; set; } + System.Net.EndPoint RemoteEndPoint { get; set; } + } public partial interface IConnectionHeartbeatFeature { void OnHeartbeat(System.Action action, object state); diff --git a/src/Servers/Connections.Abstractions/src/ConnectionContext.cs b/src/Servers/Connections.Abstractions/src/ConnectionContext.cs index a709a5f891..cecf3513c7 100644 --- a/src/Servers/Connections.Abstractions/src/ConnectionContext.cs +++ b/src/Servers/Connections.Abstractions/src/ConnectionContext.cs @@ -3,6 +3,9 @@ using System.Collections.Generic; using System.IO.Pipelines; +using System.Net; +using System.Threading; +using System.Threading.Tasks; using Microsoft.AspNetCore.Connections.Features; using Microsoft.AspNetCore.Http.Features; @@ -18,6 +21,12 @@ namespace Microsoft.AspNetCore.Connections public abstract IDuplexPipe Transport { get; set; } + public virtual CancellationToken ConnectionClosed { get; set; } + + public virtual EndPoint LocalEndPoint { get; set; } + + public virtual EndPoint RemoteEndPoint { get; set; } + public virtual void Abort(ConnectionAbortedException abortReason) { // We expect this to be overridden, but this helps maintain back compat @@ -27,5 +36,10 @@ namespace Microsoft.AspNetCore.Connections } public virtual void Abort() => Abort(new ConnectionAbortedException("The connection was aborted by the application via ConnectionContext.Abort().")); + + public virtual ValueTask DisposeAsync() + { + return default; + } } } diff --git a/src/Servers/Connections.Abstractions/src/ConnectionDelegate.cs b/src/Servers/Connections.Abstractions/src/ConnectionDelegate.cs index f0d64d1587..dff0384f60 100644 --- a/src/Servers/Connections.Abstractions/src/ConnectionDelegate.cs +++ b/src/Servers/Connections.Abstractions/src/ConnectionDelegate.cs @@ -1,4 +1,7 @@ -using System.Threading.Tasks; +// 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.Threading.Tasks; namespace Microsoft.AspNetCore.Connections { diff --git a/src/Servers/Connections.Abstractions/src/DefaultConnectionContext.cs b/src/Servers/Connections.Abstractions/src/DefaultConnectionContext.cs index fab7c929e2..81a56478ba 100644 --- a/src/Servers/Connections.Abstractions/src/DefaultConnectionContext.cs +++ b/src/Servers/Connections.Abstractions/src/DefaultConnectionContext.cs @@ -4,8 +4,10 @@ using System; using System.Collections.Generic; using System.IO.Pipelines; +using System.Net; using System.Security.Claims; using System.Threading; +using System.Threading.Tasks; using Microsoft.AspNetCore.Connections.Features; using Microsoft.AspNetCore.Http.Features; @@ -17,7 +19,8 @@ namespace Microsoft.AspNetCore.Connections IConnectionItemsFeature, IConnectionTransportFeature, IConnectionUserFeature, - IConnectionLifetimeFeature + IConnectionLifetimeFeature, + IConnectionEndPointFeature { private CancellationTokenSource _connectionClosedTokenSource = new CancellationTokenSource(); @@ -42,6 +45,7 @@ namespace Microsoft.AspNetCore.Connections Features.Set(this); Features.Set(this); Features.Set(this); + Features.Set(this); } public DefaultConnectionContext(string id, IDuplexPipe transport, IDuplexPipe application) @@ -63,7 +67,9 @@ namespace Microsoft.AspNetCore.Connections public override IDuplexPipe Transport { get; set; } - public CancellationToken ConnectionClosed { get; set; } + public override CancellationToken ConnectionClosed { get; set; } + public override EndPoint LocalEndPoint { get; set; } + public override EndPoint RemoteEndPoint { get; set; } public override void Abort(ConnectionAbortedException abortReason) { @@ -74,5 +80,11 @@ namespace Microsoft.AspNetCore.Connections { _connectionClosedTokenSource.Dispose(); } + + public override ValueTask DisposeAsync() + { + _connectionClosedTokenSource.Dispose(); + return base.DisposeAsync(); + } } } diff --git a/src/Servers/Connections.Abstractions/src/Features/IConnectionEndpointFeature.cs b/src/Servers/Connections.Abstractions/src/Features/IConnectionEndpointFeature.cs new file mode 100644 index 0000000000..7c44146ede --- /dev/null +++ b/src/Servers/Connections.Abstractions/src/Features/IConnectionEndpointFeature.cs @@ -0,0 +1,13 @@ +// 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.Net; + +namespace Microsoft.AspNetCore.Connections.Features +{ + public interface IConnectionEndPointFeature + { + EndPoint LocalEndPoint { get; set; } + EndPoint RemoteEndPoint { get; set; } + } +} diff --git a/src/Servers/Connections.Abstractions/src/Features/IConnectionUserFeature.cs b/src/Servers/Connections.Abstractions/src/Features/IConnectionUserFeature.cs index 3efb362fc7..7698693a54 100644 --- a/src/Servers/Connections.Abstractions/src/Features/IConnectionUserFeature.cs +++ b/src/Servers/Connections.Abstractions/src/Features/IConnectionUserFeature.cs @@ -1,3 +1,6 @@ +// 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.Security.Claims; namespace Microsoft.AspNetCore.Connections.Features @@ -6,4 +9,4 @@ namespace Microsoft.AspNetCore.Connections.Features { ClaimsPrincipal User { get; set; } } -} \ No newline at end of file +} diff --git a/src/Servers/Connections.Abstractions/src/FileHandleEndPoint.cs b/src/Servers/Connections.Abstractions/src/FileHandleEndPoint.cs new file mode 100644 index 0000000000..41f4d50812 --- /dev/null +++ b/src/Servers/Connections.Abstractions/src/FileHandleEndPoint.cs @@ -0,0 +1,30 @@ +// 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.Net; + +namespace Microsoft.AspNetCore.Connections +{ + public class FileHandleEndPoint : EndPoint + { + public FileHandleEndPoint(ulong fileHandle, FileHandleType fileHandleType) + { + FileHandle = fileHandle; + FileHandleType = fileHandleType; + + switch (fileHandleType) + { + case FileHandleType.Auto: + case FileHandleType.Tcp: + case FileHandleType.Pipe: + break; + default: + throw new NotSupportedException(); + } + } + + public ulong FileHandle { get; } + public FileHandleType FileHandleType { get; } + } +} diff --git a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/FileHandleType.cs b/src/Servers/Connections.Abstractions/src/FileHandleType.cs similarity index 52% rename from src/Servers/Kestrel/Transport.Abstractions/src/Internal/FileHandleType.cs rename to src/Servers/Connections.Abstractions/src/FileHandleType.cs index bb70e4ec34..f16935e044 100644 --- a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/FileHandleType.cs +++ b/src/Servers/Connections.Abstractions/src/FileHandleType.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal +namespace Microsoft.AspNetCore.Connections { /// - /// Enumerates the types. + /// Enumerates the types. /// public enum FileHandleType { diff --git a/src/Servers/Connections.Abstractions/src/IConnectionBuilder.cs b/src/Servers/Connections.Abstractions/src/IConnectionBuilder.cs index 4825748292..5fe3ec25a0 100644 --- a/src/Servers/Connections.Abstractions/src/IConnectionBuilder.cs +++ b/src/Servers/Connections.Abstractions/src/IConnectionBuilder.cs @@ -1,4 +1,7 @@ -using System; +// 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; namespace Microsoft.AspNetCore.Connections { diff --git a/src/Servers/Connections.Abstractions/src/IConnectionListener.cs b/src/Servers/Connections.Abstractions/src/IConnectionListener.cs new file mode 100644 index 0000000000..c9d0564447 --- /dev/null +++ b/src/Servers/Connections.Abstractions/src/IConnectionListener.cs @@ -0,0 +1,20 @@ +// 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.Net; +using System.Threading; +using System.Threading.Tasks; + +namespace Microsoft.AspNetCore.Connections +{ + public interface IConnectionListener + { + EndPoint EndPoint { get; } + + ValueTask AcceptAsync(CancellationToken cancellationToken = default); + + ValueTask UnbindAsync(CancellationToken cancellationToken = default); + + ValueTask DisposeAsync(); + } +} diff --git a/src/Servers/Connections.Abstractions/src/IConnectionListenerFactory.cs b/src/Servers/Connections.Abstractions/src/IConnectionListenerFactory.cs new file mode 100644 index 0000000000..b28724e1dd --- /dev/null +++ b/src/Servers/Connections.Abstractions/src/IConnectionListenerFactory.cs @@ -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. + +using System; +using System.Collections.Generic; +using System.Net; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Microsoft.AspNetCore.Connections +{ + public interface IConnectionListenerFactory + { + ValueTask BindAsync(EndPoint endpoint, CancellationToken cancellationToken = default); + } +} diff --git a/src/Servers/Connections.Abstractions/src/TransportConnection.FeatureCollection.cs b/src/Servers/Connections.Abstractions/src/TransportConnection.FeatureCollection.cs new file mode 100644 index 0000000000..fc5443ecfc --- /dev/null +++ b/src/Servers/Connections.Abstractions/src/TransportConnection.FeatureCollection.cs @@ -0,0 +1,44 @@ +// 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.Buffers; +using System.Collections.Generic; +using System.IO.Pipelines; +using System.Threading; +using Microsoft.AspNetCore.Connections.Features; + +namespace Microsoft.AspNetCore.Connections +{ + public partial class TransportConnection : IConnectionIdFeature, + IConnectionTransportFeature, + IConnectionItemsFeature, + IMemoryPoolFeature, + IConnectionLifetimeFeature + { + // NOTE: When feature interfaces are added to or removed from this TransportConnection class implementation, + // then the list of `features` in the generated code project MUST also be updated. + // See also: tools/CodeGenerator/TransportConnectionFeatureCollection.cs + + MemoryPool IMemoryPoolFeature.MemoryPool => MemoryPool; + + IDuplexPipe IConnectionTransportFeature.Transport + { + get => Transport; + set => Transport = value; + } + + IDictionary IConnectionItemsFeature.Items + { + get => Items; + set => Items = value; + } + + CancellationToken IConnectionLifetimeFeature.ConnectionClosed + { + get => ConnectionClosed; + set => ConnectionClosed = value; + } + + void IConnectionLifetimeFeature.Abort() => Abort(new ConnectionAbortedException("The connection was aborted by the application via IConnectionLifetimeFeature.Abort().")); + } +} diff --git a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/TransportConnection.Generated.cs b/src/Servers/Connections.Abstractions/src/TransportConnection.Generated.cs similarity index 54% rename from src/Servers/Kestrel/Transport.Abstractions/src/Internal/TransportConnection.Generated.cs rename to src/Servers/Connections.Abstractions/src/TransportConnection.Generated.cs index b5d0122ffb..eb6f2ba253 100644 --- a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/TransportConnection.Generated.cs +++ b/src/Servers/Connections.Abstractions/src/TransportConnection.Generated.cs @@ -8,33 +8,21 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Connections.Features; using Microsoft.AspNetCore.Http.Features; -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal +namespace Microsoft.AspNetCore.Connections { public partial class TransportConnection : IFeatureCollection { - private static readonly Type IHttpConnectionFeatureType = typeof(IHttpConnectionFeature); private static readonly Type IConnectionIdFeatureType = typeof(IConnectionIdFeature); private static readonly Type IConnectionTransportFeatureType = typeof(IConnectionTransportFeature); private static readonly Type IConnectionItemsFeatureType = typeof(IConnectionItemsFeature); private static readonly Type IMemoryPoolFeatureType = typeof(IMemoryPoolFeature); - private static readonly Type IApplicationTransportFeatureType = typeof(IApplicationTransportFeature); - private static readonly Type ITransportSchedulerFeatureType = typeof(ITransportSchedulerFeature); private static readonly Type IConnectionLifetimeFeatureType = typeof(IConnectionLifetimeFeature); - private static readonly Type IConnectionHeartbeatFeatureType = typeof(IConnectionHeartbeatFeature); - private static readonly Type IConnectionLifetimeNotificationFeatureType = typeof(IConnectionLifetimeNotificationFeature); - private static readonly Type IConnectionCompleteFeatureType = typeof(IConnectionCompleteFeature); - private object _currentIHttpConnectionFeature; private object _currentIConnectionIdFeature; private object _currentIConnectionTransportFeature; private object _currentIConnectionItemsFeature; private object _currentIMemoryPoolFeature; - private object _currentIApplicationTransportFeature; - private object _currentITransportSchedulerFeature; private object _currentIConnectionLifetimeFeature; - private object _currentIConnectionHeartbeatFeature; - private object _currentIConnectionLifetimeNotificationFeature; - private object _currentIConnectionCompleteFeature; private int _featureRevision; @@ -42,17 +30,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal private void FastReset() { - _currentIHttpConnectionFeature = this; _currentIConnectionIdFeature = this; _currentIConnectionTransportFeature = this; _currentIConnectionItemsFeature = this; _currentIMemoryPoolFeature = this; - _currentIApplicationTransportFeature = this; - _currentITransportSchedulerFeature = this; _currentIConnectionLifetimeFeature = this; - _currentIConnectionHeartbeatFeature = this; - _currentIConnectionLifetimeNotificationFeature = this; - _currentIConnectionCompleteFeature = this; } @@ -108,11 +90,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal get { object feature = null; - if (key == IHttpConnectionFeatureType) - { - feature = _currentIHttpConnectionFeature; - } - else if (key == IConnectionIdFeatureType) + if (key == IConnectionIdFeatureType) { feature = _currentIConnectionIdFeature; } @@ -128,30 +106,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal { feature = _currentIMemoryPoolFeature; } - else if (key == IApplicationTransportFeatureType) - { - feature = _currentIApplicationTransportFeature; - } - else if (key == ITransportSchedulerFeatureType) - { - feature = _currentITransportSchedulerFeature; - } else if (key == IConnectionLifetimeFeatureType) { feature = _currentIConnectionLifetimeFeature; } - else if (key == IConnectionHeartbeatFeatureType) - { - feature = _currentIConnectionHeartbeatFeature; - } - else if (key == IConnectionLifetimeNotificationFeatureType) - { - feature = _currentIConnectionLifetimeNotificationFeature; - } - else if (key == IConnectionCompleteFeatureType) - { - feature = _currentIConnectionCompleteFeature; - } else if (MaybeExtra != null) { feature = ExtraFeatureGet(key); @@ -164,11 +122,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal { _featureRevision++; - if (key == IHttpConnectionFeatureType) - { - _currentIHttpConnectionFeature = value; - } - else if (key == IConnectionIdFeatureType) + if (key == IConnectionIdFeatureType) { _currentIConnectionIdFeature = value; } @@ -184,30 +138,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal { _currentIMemoryPoolFeature = value; } - else if (key == IApplicationTransportFeatureType) - { - _currentIApplicationTransportFeature = value; - } - else if (key == ITransportSchedulerFeatureType) - { - _currentITransportSchedulerFeature = value; - } else if (key == IConnectionLifetimeFeatureType) { _currentIConnectionLifetimeFeature = value; } - else if (key == IConnectionHeartbeatFeatureType) - { - _currentIConnectionHeartbeatFeature = value; - } - else if (key == IConnectionLifetimeNotificationFeatureType) - { - _currentIConnectionLifetimeNotificationFeature = value; - } - else if (key == IConnectionCompleteFeatureType) - { - _currentIConnectionCompleteFeature = value; - } else { ExtraFeatureSet(key, value); @@ -218,11 +152,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal TFeature IFeatureCollection.Get() { TFeature feature = default; - if (typeof(TFeature) == typeof(IHttpConnectionFeature)) - { - feature = (TFeature)_currentIHttpConnectionFeature; - } - else if (typeof(TFeature) == typeof(IConnectionIdFeature)) + if (typeof(TFeature) == typeof(IConnectionIdFeature)) { feature = (TFeature)_currentIConnectionIdFeature; } @@ -238,30 +168,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal { feature = (TFeature)_currentIMemoryPoolFeature; } - else if (typeof(TFeature) == typeof(IApplicationTransportFeature)) - { - feature = (TFeature)_currentIApplicationTransportFeature; - } - else if (typeof(TFeature) == typeof(ITransportSchedulerFeature)) - { - feature = (TFeature)_currentITransportSchedulerFeature; - } else if (typeof(TFeature) == typeof(IConnectionLifetimeFeature)) { feature = (TFeature)_currentIConnectionLifetimeFeature; } - else if (typeof(TFeature) == typeof(IConnectionHeartbeatFeature)) - { - feature = (TFeature)_currentIConnectionHeartbeatFeature; - } - else if (typeof(TFeature) == typeof(IConnectionLifetimeNotificationFeature)) - { - feature = (TFeature)_currentIConnectionLifetimeNotificationFeature; - } - else if (typeof(TFeature) == typeof(IConnectionCompleteFeature)) - { - feature = (TFeature)_currentIConnectionCompleteFeature; - } else if (MaybeExtra != null) { feature = (TFeature)(ExtraFeatureGet(typeof(TFeature))); @@ -273,11 +183,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal void IFeatureCollection.Set(TFeature feature) { _featureRevision++; - if (typeof(TFeature) == typeof(IHttpConnectionFeature)) - { - _currentIHttpConnectionFeature = feature; - } - else if (typeof(TFeature) == typeof(IConnectionIdFeature)) + if (typeof(TFeature) == typeof(IConnectionIdFeature)) { _currentIConnectionIdFeature = feature; } @@ -293,30 +199,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal { _currentIMemoryPoolFeature = feature; } - else if (typeof(TFeature) == typeof(IApplicationTransportFeature)) - { - _currentIApplicationTransportFeature = feature; - } - else if (typeof(TFeature) == typeof(ITransportSchedulerFeature)) - { - _currentITransportSchedulerFeature = feature; - } else if (typeof(TFeature) == typeof(IConnectionLifetimeFeature)) { _currentIConnectionLifetimeFeature = feature; } - else if (typeof(TFeature) == typeof(IConnectionHeartbeatFeature)) - { - _currentIConnectionHeartbeatFeature = feature; - } - else if (typeof(TFeature) == typeof(IConnectionLifetimeNotificationFeature)) - { - _currentIConnectionLifetimeNotificationFeature = feature; - } - else if (typeof(TFeature) == typeof(IConnectionCompleteFeature)) - { - _currentIConnectionCompleteFeature = feature; - } else { ExtraFeatureSet(typeof(TFeature), feature); @@ -325,10 +211,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal private IEnumerable> FastEnumerable() { - if (_currentIHttpConnectionFeature != null) - { - yield return new KeyValuePair(IHttpConnectionFeatureType, _currentIHttpConnectionFeature); - } if (_currentIConnectionIdFeature != null) { yield return new KeyValuePair(IConnectionIdFeatureType, _currentIConnectionIdFeature); @@ -345,30 +227,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal { yield return new KeyValuePair(IMemoryPoolFeatureType, _currentIMemoryPoolFeature); } - if (_currentIApplicationTransportFeature != null) - { - yield return new KeyValuePair(IApplicationTransportFeatureType, _currentIApplicationTransportFeature); - } - if (_currentITransportSchedulerFeature != null) - { - yield return new KeyValuePair(ITransportSchedulerFeatureType, _currentITransportSchedulerFeature); - } if (_currentIConnectionLifetimeFeature != null) { yield return new KeyValuePair(IConnectionLifetimeFeatureType, _currentIConnectionLifetimeFeature); } - if (_currentIConnectionHeartbeatFeature != null) - { - yield return new KeyValuePair(IConnectionHeartbeatFeatureType, _currentIConnectionHeartbeatFeature); - } - if (_currentIConnectionLifetimeNotificationFeature != null) - { - yield return new KeyValuePair(IConnectionLifetimeNotificationFeatureType, _currentIConnectionLifetimeNotificationFeature); - } - if (_currentIConnectionCompleteFeature != null) - { - yield return new KeyValuePair(IConnectionCompleteFeatureType, _currentIConnectionCompleteFeature); - } if (MaybeExtra != null) { diff --git a/src/Servers/Connections.Abstractions/src/TransportConnection.cs b/src/Servers/Connections.Abstractions/src/TransportConnection.cs new file mode 100644 index 0000000000..4cef0363c9 --- /dev/null +++ b/src/Servers/Connections.Abstractions/src/TransportConnection.cs @@ -0,0 +1,62 @@ +// 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.Buffers; +using System.Collections.Generic; +using System.IO.Pipelines; +using System.Net; +using System.Threading; +using Microsoft.AspNetCore.Http.Features; + +namespace Microsoft.AspNetCore.Connections +{ + public abstract partial class TransportConnection : ConnectionContext + { + private IDictionary _items; + + public TransportConnection() + { + FastReset(); + } + + public override EndPoint LocalEndPoint { get; set; } + public override EndPoint RemoteEndPoint { get; set; } + + public override string ConnectionId { get; set; } + + public override IFeatureCollection Features => this; + + public virtual MemoryPool MemoryPool { get; } + + public override IDuplexPipe Transport { get; set; } + + public IDuplexPipe Application { get; set; } + + public override IDictionary Items + { + get + { + // Lazily allocate connection metadata + return _items ?? (_items = new ConnectionItems()); + } + set + { + _items = value; + } + } + + public override CancellationToken ConnectionClosed { get; set; } + + // DO NOT remove this override to ConnectionContext.Abort. Doing so would cause + // any TransportConnection that does not override Abort or calls base.Abort + // to stack overflow when IConnectionLifetimeFeature.Abort() is called. + // That said, all derived types should override this method should override + // this implementation of Abort because canceling pending output reads is not + // sufficient to abort the connection if there is backpressure. + public override void Abort(ConnectionAbortedException abortReason) + { + Application.Input.CancelPendingRead(); + } + } +} diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index d53a438f03..db33b281cd 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -233,8 +233,6 @@ - - @@ -249,7 +247,6 @@ - diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp index 8491edc5a4..cb4893196f 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp @@ -28,7 +28,10 @@ HandlerResolver::HandlerResolver(HMODULE hModule, const IHttpServer &pServer) } HRESULT -HandlerResolver::LoadRequestHandlerAssembly(const IHttpApplication &pApplication, const ShimOptions& pConfiguration, std::unique_ptr& pApplicationFactory) +HandlerResolver::LoadRequestHandlerAssembly(const IHttpApplication &pApplication, + const ShimOptions& pConfiguration, + std::unique_ptr& pApplicationFactory, + ErrorContext& errorContext) { HRESULT hr = S_OK; PCWSTR pstrHandlerDllName = nullptr; @@ -53,6 +56,7 @@ HandlerResolver::LoadRequestHandlerAssembly(const IHttpApplication &pApplication { if (pConfiguration.QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) { + errorContext.generalErrorType = "ANCM In-Process Handler Load Failure"; std::unique_ptr options; RETURN_IF_FAILED(HostFxrResolutionResult::Create( @@ -66,12 +70,12 @@ HandlerResolver::LoadRequestHandlerAssembly(const IHttpApplication &pApplication auto redirectionOutput = std::make_shared(); - hr = FindNativeAssemblyFromHostfxr(*options, pstrHandlerDllName, handlerDllPath, pApplication, pConfiguration, redirectionOutput); + hr = FindNativeAssemblyFromHostfxr(*options, pstrHandlerDllName, handlerDllPath, pApplication, pConfiguration, redirectionOutput, errorContext); + + auto output = redirectionOutput->GetOutput(); if (FAILED_LOG(hr)) { - auto output = redirectionOutput->GetOutput(); - EventLog::Error( ASPNETCORE_EVENT_GENERAL_ERROR, ASPNETCORE_EVENT_INPROCESS_RH_ERROR_MSG, @@ -81,12 +85,20 @@ HandlerResolver::LoadRequestHandlerAssembly(const IHttpApplication &pApplication } else { + errorContext.generalErrorType = "ANCM Out-Of-Process Handler Load Failure"; + if (FAILED_LOG(hr = FindNativeAssemblyFromGlobalLocation(pConfiguration, pstrHandlerDllName, handlerDllPath))) { + auto handlerName = handlerDllPath.empty() ? s_pwzAspnetcoreOutOfProcessRequestHandlerName : handlerDllPath.c_str(); EventLog::Error( ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING, ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG, - handlerDllPath.empty() ? s_pwzAspnetcoreOutOfProcessRequestHandlerName : handlerDllPath.c_str()); + handlerName); + + errorContext.detailedErrorContent = to_multi_byte_string(format(ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG, handlerName), CP_UTF8); + errorContext.statusCode = 500i16; + errorContext.subStatusCode = 36i16; + errorContext.errorReason = "The out of process request handler, aspnetcorev2_outofprocess.dll, could not be found next to the aspnetcorev2.dll."; return hr; } @@ -96,6 +108,7 @@ HandlerResolver::LoadRequestHandlerAssembly(const IHttpApplication &pApplication hRequestHandlerDll = LoadLibrary(handlerDllPath.c_str()); RETURN_LAST_ERROR_IF_NULL(hRequestHandlerDll); + if (preventUnload) { // Pin module in memory @@ -111,7 +124,7 @@ HandlerResolver::LoadRequestHandlerAssembly(const IHttpApplication &pApplication } HRESULT -HandlerResolver::GetApplicationFactory(const IHttpApplication &pApplication, std::unique_ptr& pApplicationFactory, const ShimOptions& options) +HandlerResolver::GetApplicationFactory(const IHttpApplication& pApplication, std::unique_ptr& pApplicationFactory, const ShimOptions& options, ErrorContext& errorContext) { SRWExclusiveLock lock(m_requestHandlerLoadLock); if (m_loadedApplicationHostingModel != HOSTING_UNKNOWN) @@ -119,6 +132,12 @@ HandlerResolver::GetApplicationFactory(const IHttpApplication &pApplication, std // Mixed hosting models if (m_loadedApplicationHostingModel != options.QueryHostingModel()) { + errorContext.detailedErrorContent = to_multi_byte_string(format(ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR_MSG, pApplication.GetApplicationId(), options.QueryHostingModel()), CP_UTF8); + errorContext.statusCode = 500i16; + errorContext.subStatusCode = 34i16; + errorContext.generalErrorType = "ANCM Mixed Hosting Models Not Supported"; + errorContext.errorReason = "Select a different application pool to create another application."; + EventLog::Error( ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR, ASPNETCORE_EVENT_MIXED_HOSTING_MODEL_ERROR_MSG, @@ -130,6 +149,13 @@ HandlerResolver::GetApplicationFactory(const IHttpApplication &pApplication, std // Multiple in-process apps if (m_loadedApplicationHostingModel == HOSTING_IN_PROCESS && m_loadedApplicationId != pApplication.GetApplicationId()) { + errorContext.detailedErrorContent = to_multi_byte_string(format(ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP_MSG, pApplication.GetApplicationId()), CP_UTF8); + + errorContext.statusCode = 500i16; + errorContext.subStatusCode = 35i16; + errorContext.generalErrorType = "ANCM Multiple In-Process Applications in same Process"; + errorContext.errorReason = "Select a different application pool to create another in-process application."; + EventLog::Error( ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP, ASPNETCORE_EVENT_DUPLICATED_INPROCESS_APP_MSG, @@ -141,7 +167,7 @@ HandlerResolver::GetApplicationFactory(const IHttpApplication &pApplication, std m_loadedApplicationHostingModel = options.QueryHostingModel(); m_loadedApplicationId = pApplication.GetApplicationId(); - RETURN_IF_FAILED(LoadRequestHandlerAssembly(pApplication, options, pApplicationFactory)); + RETURN_IF_FAILED(LoadRequestHandlerAssembly(pApplication, options, pApplicationFactory, errorContext)); return S_OK; } @@ -181,7 +207,7 @@ HandlerResolver::FindNativeAssemblyFromGlobalLocation( } catch (...) { - EventLog::Info( + EventLog::Info( ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING, ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG, pstrHandlerDllName); @@ -204,7 +230,8 @@ HandlerResolver::FindNativeAssemblyFromHostfxr( std::wstring& handlerDllPath, const IHttpApplication &pApplication, const ShimOptions& pConfiguration, - std::shared_ptr stringRedirectionOutput + std::shared_ptr stringRedirectionOutput, + ErrorContext& errorContext ) try { @@ -214,14 +241,25 @@ try DWORD dwBufferSize = s_initialGetNativeSearchDirectoriesBufferSize; DWORD dwRequiredBufferSize = 0; - m_hHostFxrDll.Load(hostfxrOptions.GetHostFxrLocation()); - + try + { + m_hHostFxrDll.Load(hostfxrOptions.GetHostFxrLocation()); + } + catch (...) + { + errorContext.detailedErrorContent = "Could not load hostfxr.dll."; + errorContext.statusCode = 500i16; + errorContext.subStatusCode = 32i16; + errorContext.generalErrorType = "ANCM Failed to Load dll"; + errorContext.errorReason = "The application was likely published for a different bitness than w3wp.exe/iisexpress.exe is running as."; + throw; + } { auto redirectionOutput = LoggingHelpers::CreateOutputs( pConfiguration.QueryStdoutLogEnabled(), pConfiguration.QueryStdoutLogFile(), pApplication.GetApplicationPhysicalPath(), - std::move(stringRedirectionOutput) + stringRedirectionOutput ); StandardStreamRedirection stdOutRedirection(*redirectionOutput.get(), m_pServer.IsCommandLineLaunch()); @@ -256,7 +294,16 @@ try else { // If hostfxr didn't set the required buffer size, something in the app is misconfigured - // Ex: Framework not found. + // This like almost always is framework not found. + auto output = to_multi_byte_string(stringRedirectionOutput->GetOutput(), CP_UTF8); + errorContext.detailedErrorContent.resize(output.length()); + memcpy(&errorContext.detailedErrorContent[0], output.c_str(), output.length()); + + errorContext.statusCode = 500i16; + errorContext.subStatusCode = 31i16; + errorContext.generalErrorType = "ANCM Failed to Find Native Dependencies"; + errorContext.errorReason = "The specified version of Microsoft.NetCore.App or Microsoft.AspNetCore.App was not found."; + EventLog::Error( ASPNETCORE_EVENT_GENERAL_ERROR, ASPNETCORE_EVENT_HOSTFXR_FAILURE_MSG @@ -296,6 +343,16 @@ try if (!fFound) { + // This only occurs if the request handler isn't referenced by the app, which rarely happens if they are targeting the shared framework. + errorContext.statusCode = 500i16; + errorContext.subStatusCode = 33i16; + errorContext.generalErrorType = "ANCM Request Handler Load Failure"; + errorContext.detailedErrorContent = to_multi_byte_string(format(ASPNETCORE_EVENT_INPROCESS_RH_REFERENCE_MSG, handlerDllPath.empty() + ? s_pwzAspnetcoreInProcessRequestHandlerName + : handlerDllPath.c_str()), + CP_UTF8); + errorContext.errorReason = "Make sure Microsoft.AspNetCore.App is referenced by your application."; + EventLog::Error( ASPNETCORE_EVENT_GENERAL_ERROR, ASPNETCORE_EVENT_INPROCESS_RH_REFERENCE_MSG, diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h index faa81855c3..9ab017bb50 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.h @@ -16,11 +16,11 @@ class HandlerResolver { public: HandlerResolver(HMODULE hModule, const IHttpServer &pServer); - HRESULT GetApplicationFactory(const IHttpApplication &pApplication, std::unique_ptr& pApplicationFactory, const ShimOptions& options); + HRESULT GetApplicationFactory(const IHttpApplication &pApplication, std::unique_ptr& pApplicationFactory, const ShimOptions& options, ErrorContext& errorContext); void ResetHostingModel(); private: - HRESULT LoadRequestHandlerAssembly(const IHttpApplication &pApplication, const ShimOptions& pConfiguration, std::unique_ptr& pApplicationFactory); + HRESULT LoadRequestHandlerAssembly(const IHttpApplication &pApplication, const ShimOptions& pConfiguration, std::unique_ptr& pApplicationFactory, ErrorContext& errorContext); HRESULT FindNativeAssemblyFromGlobalLocation(const ShimOptions& pConfiguration, PCWSTR libraryName, std::wstring& handlerDllPath); HRESULT FindNativeAssemblyFromHostfxr( const HostFxrResolutionResult& hostfxrOptions, @@ -28,7 +28,8 @@ private: std::wstring& handlerDllPath, const IHttpApplication &pApplication, const ShimOptions& pConfiguration, - std::shared_ptr stringRedirectionOutput); + std::shared_ptr stringRedirectionOutput, + ErrorContext& errorContext); HMODULE m_hModule; const IHttpServer &m_pServer; diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm index a8c9d7fe1f..a9e6d96c75 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm @@ -2,7 +2,7 @@ - HTTP Error 500.0 - ANCM In-Process Handler Load Failure + HTTP Error %d.%d - %s -

    HTTP Error 500.0 - ANCM In-Process Handler Load Failure

    +

    HTTP Error %d.%d - %s

    -

    Common causes of this issue:

    + %s -
      -
    • The specified version of Microsoft.NetCore.App or Microsoft.AspNetCore.App was not found.
      • -
    • The in process request handler, Microsoft.AspNetCore.Server.IIS, was not referenced in the application.
      • -
    • ANCM could not find dotnet.
      • -
    + %s

    Troubleshooting steps:

    diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm index 1194cf4025..b15ed7dccb 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm @@ -2,7 +2,7 @@ - HTTP Error 500.0 - ANCM Out-Of-Process Handler Load Failure + HTTP Error %d.%d - %s -

    HTTP Error 500.0 - ANCM Out-Of-Process Handler Load Failure

    +

    HTTP Error %d.%d - %s

    -

    Common causes of this issue:

    -
      -
    • The out of process request handler, aspnetcorev2_outofprocess.dll, could not be found next to the aspnetcorev2.dll.
      • -
    • Could not read configuration correctly. Check the application's associated web.config.
      • -
    + %s + + %s

    Troubleshooting steps:

      diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp index cb7f1488d7..208d4a1eaa 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp @@ -5,6 +5,7 @@ #include "StringHelpers.h" #include "ConfigurationLoadException.h" +#include "Environment.h" #define CS_ASPNETCORE_HANDLER_VERSION L"handlerVersion" @@ -41,4 +42,22 @@ ShimOptions::ShimOptions(const ConfigurationSource &configurationSource) : m_fStdoutLogEnabled = section->GetRequiredBool(CS_ASPNETCORE_STDOUT_LOG_ENABLED); m_struStdoutLogFile = section->GetRequiredString(CS_ASPNETCORE_STDOUT_LOG_FILE); m_fDisableStartupPage = section->GetRequiredBool(CS_ASPNETCORE_DISABLE_START_UP_ERROR_PAGE); + + auto environmentVariables = section->GetMap(CS_ASPNETCORE_ENVIRONMENT_VARIABLES); + + // Indexing into environment variable map will add a default entry if none is present + // This is okay here as we throw away the map shortly after. + // Process set environment variables are prioritized over web config variables. + const auto detailedErrors = Environment::GetEnvironmentVariableValue(CS_ASPNETCORE_DETAILEDERRORS) + .value_or(environmentVariables[CS_ASPNETCORE_DETAILEDERRORS]); + const auto aspnetCoreEnvironment = Environment::GetEnvironmentVariableValue(CS_ASPNETCORE_ENVIRONMENT) + .value_or(environmentVariables[CS_ASPNETCORE_ENVIRONMENT]); + const auto dotnetEnvironment = Environment::GetEnvironmentVariableValue(CS_DOTNET_ENVIRONMENT) + .value_or(environmentVariables[CS_DOTNET_ENVIRONMENT]); + + auto detailedErrorsEnabled = equals_ignore_case(L"1", detailedErrors) || equals_ignore_case(L"true", detailedErrors); + auto aspnetCoreEnvironmentEnabled = equals_ignore_case(L"Development", aspnetCoreEnvironment); + auto dotnetEnvironmentEnabled = equals_ignore_case(L"Development", dotnetEnvironment); + + m_fShowDetailedErrors = detailedErrorsEnabled || aspnetCoreEnvironmentEnabled || dotnetEnvironmentEnabled; } diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.h b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.h index 3cfb47169e..5d1c04f8ab 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.h @@ -59,6 +59,12 @@ public: return m_fDisableStartupPage; } + bool + QueryShowDetailedErrors() const noexcept + { + return m_fShowDetailedErrors; + } + ShimOptions(const ConfigurationSource &configurationSource); private: @@ -69,4 +75,5 @@ private: std::wstring m_struStdoutLogFile; bool m_fStdoutLogEnabled; bool m_fDisableStartupPage; + bool m_fShowDetailedErrors; }; diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp index 317a8a5d4b..a0a6bfeb3b 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp @@ -15,6 +15,7 @@ #include "WebConfigConfigurationSource.h" #include "ConfigurationLoadException.h" #include "resource.h" +#include "file_utility.h" extern HINSTANCE g_hServerModule; @@ -86,23 +87,39 @@ APPLICATION_INFO::CreateApplication(IHttpContext& pHttpContext) const WebConfigConfigurationSource configurationSource(m_pServer.GetAdminManager(), pHttpApplication); ShimOptions options(configurationSource); - const auto hr = TryCreateApplication(pHttpContext, options); + ErrorContext errorContext; + errorContext.statusCode = 500i16; + errorContext.subStatusCode = 0i16; + + const auto hr = TryCreateApplication(pHttpContext, options, errorContext); if (FAILED_LOG(hr)) { - // Log the failure and update application info to not try again EventLog::Error( ASPNETCORE_EVENT_ADD_APPLICATION_ERROR, ASPNETCORE_EVENT_ADD_APPLICATION_ERROR_MSG, pHttpApplication.GetApplicationId(), hr); + auto page = options.QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS ? IN_PROCESS_SHIM_STATIC_HTML : OUT_OF_PROCESS_SHIM_STATIC_HTML; + std::string responseContent; + if (options.QueryShowDetailedErrors()) + { + responseContent = FILE_UTILITY::GetHtml(g_hServerModule, page, errorContext.statusCode, errorContext.subStatusCode, errorContext.generalErrorType, errorContext.errorReason, errorContext.detailedErrorContent); + } + else + { + responseContent = FILE_UTILITY::GetHtml(g_hServerModule, page, errorContext.statusCode, errorContext.subStatusCode, errorContext.generalErrorType, errorContext.errorReason); + } + m_pApplication = make_application( pHttpApplication, hr, - g_hServerModule, options.QueryDisableStartupPage(), - options.QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS ? IN_PROCESS_SHIM_STATIC_HTML : OUT_OF_PROCESS_SHIM_STATIC_HTML); + responseContent, + errorContext.statusCode, + errorContext.subStatusCode, + "Internal Server Error"); } return S_OK; } @@ -124,14 +141,18 @@ APPLICATION_INFO::CreateApplication(IHttpContext& pHttpContext) m_pApplication = make_application( pHttpApplication, E_FAIL, - g_hServerModule); + false /* disableStartupPage */, + "" /* responseContent */, + 500i16 /* statusCode */, + 0i16 /* subStatusCode */, + "Internal Server Error"); return S_OK; } } HRESULT -APPLICATION_INFO::TryCreateApplication(IHttpContext& pHttpContext, const ShimOptions& options) +APPLICATION_INFO::TryCreateApplication(IHttpContext& pHttpContext, const ShimOptions& options, ErrorContext& error) { const auto startupEvent = Environment::GetEnvironmentVariableValue(L"ASPNETCORE_STARTUP_SUSPEND_EVENT"); if (startupEvent.has_value()) @@ -157,7 +178,7 @@ APPLICATION_INFO::TryCreateApplication(IHttpContext& pHttpContext, const ShimOpt } } - RETURN_IF_FAILED(m_handlerResolver.GetApplicationFactory(*pHttpContext.GetApplication(), m_pApplicationFactory, options)); + RETURN_IF_FAILED(m_handlerResolver.GetApplicationFactory(*pHttpContext.GetApplication(), m_pApplicationFactory, options, error)); LOG_INFO(L"Creating handler application"); IAPPLICATION * newApplication; diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.h b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.h index 252d4e0d2d..f90b0588d9 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.h @@ -77,7 +77,7 @@ private: CreateApplication(IHttpContext& pHttpContext); HRESULT - TryCreateApplication(IHttpContext& pHttpContext, const ShimOptions& options); + TryCreateApplication(IHttpContext& pHttpContext, const ShimOptions& options, ErrorContext& error); IHttpServer &m_pServer; HandlerResolver &m_handlerResolver; diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index fc02995961..8816dafbda 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -196,6 +196,7 @@ + @@ -220,11 +221,11 @@ + - @@ -249,6 +250,7 @@ + @@ -277,4 +279,4 @@ - + \ No newline at end of file diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h index 3eab02bc7c..ae02dd3faa 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h @@ -29,6 +29,10 @@ #define CS_ASPNETCORE_DISABLE_START_UP_ERROR_PAGE L"disableStartUpErrorPage" #define CS_ENABLED L"enabled" #define CS_ASPNETCORE_HANDLER_CALL_STARTUP_HOOK L"callStartupHook" +#define CS_ASPNETCORE_HANDLER_STACK_SIZE L"stackSize" +#define CS_ASPNETCORE_DETAILEDERRORS L"ASPNETCORE_DETAILEDERRORS" +#define CS_ASPNETCORE_ENVIRONMENT L"ASPNETCORE_ENVIRONMENT" +#define CS_DOTNET_ENVIRONMENT L"DOTNET_ENVIRONMENT" class ConfigurationSection: NonCopyable { diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.cpp index be6484e16b..fb63cdb20c 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.cpp @@ -45,6 +45,13 @@ Environment::GetEnvironmentVariableValue(const std::wstring & str) throw std::system_error(GetLastError(), std::system_category(), "GetEnvironmentVariableW"); } + else if (requestedSize == 1) + { + // String just contains a nullcharacter, return nothing + // GetEnvironmentVariableW has inconsistent behavior when returning size for an empty + // environment variable. + return std::nullopt; + } std::wstring expandedStr; do @@ -53,6 +60,10 @@ Environment::GetEnvironmentVariableValue(const std::wstring & str) requestedSize = GetEnvironmentVariableW(str.c_str(), expandedStr.data(), requestedSize); if (requestedSize == 0) { + if (GetLastError() == ERROR_ENVVAR_NOT_FOUND) + { + return std::nullopt; + } throw std::system_error(GetLastError(), std::system_category(), "ExpandEnvironmentStringsW"); } } while (expandedStr.size() != requestedSize + 1); diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxr.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxr.h index 990963b6e7..85cae5b1ba 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxr.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxr.h @@ -12,6 +12,16 @@ typedef INT(*hostfxr_main_fn) (DWORD argc, CONST PCWSTR argv[]); typedef void(*corehost_error_writer_fn) (const WCHAR* message); typedef corehost_error_writer_fn(*corehost_set_error_writer_fn) (corehost_error_writer_fn error_writer); +struct ErrorContext +{ + // TODO consider adding HRESULT here + std::string detailedErrorContent; + USHORT statusCode; + USHORT subStatusCode; + std::string generalErrorType; + std::string errorReason; +}; + class HostFxrErrorRedirector: NonCopyable { public: diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp similarity index 100% rename from src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.cpp rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.cpp diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h similarity index 100% rename from src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/PollingAppOfflineApplication.h rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/PollingAppOfflineApplication.h diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ServerErrorApplication.h similarity index 58% rename from src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h rename to src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ServerErrorApplication.h index b5b86aa20c..6cb0cd9342 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ServerErrorApplication.h @@ -9,16 +9,13 @@ class ServerErrorApplication : public PollingAppOfflineApplication { public: - ServerErrorApplication(const IHttpApplication& pApplication, HRESULT hr, HINSTANCE moduleInstance) - : ServerErrorApplication(pApplication, hr, moduleInstance, true /* disableStartupPage*/, 0 /* page */) - { - } - - ServerErrorApplication(const IHttpApplication& pApplication, HRESULT hr, HINSTANCE moduleInstance, bool disableStartupPage, int page) + ServerErrorApplication(const IHttpApplication& pApplication, HRESULT hr, bool disableStartupPage, const std::string& responseContent, USHORT status, USHORT substatus, const std::string& statusText) : m_HR(hr), m_disableStartupPage(disableStartupPage), - m_page(page), - m_moduleInstance(moduleInstance), + m_responseContent(responseContent), + m_statusCode(status), + m_subStatusCode(substatus), + m_statusText(statusText), PollingAppOfflineApplication(pApplication, PollingAppOfflineApplicationMode::StopWhenAdded) { } @@ -27,8 +24,8 @@ public: HRESULT CreateHandler(IHttpContext *pHttpContext, IREQUEST_HANDLER ** pRequestHandler) override { - auto handler = std::make_unique(*pHttpContext, 500ui16, 0ui16, "Internal Server Error", m_HR, m_moduleInstance, m_disableStartupPage, m_page); - *pRequestHandler = handler.release(); + *pRequestHandler = std::make_unique(*pHttpContext, m_statusCode, m_subStatusCode, m_statusText, m_HR, m_disableStartupPage, m_responseContent).release(); + return S_OK; } @@ -36,6 +33,8 @@ public: private: HRESULT m_HR; bool m_disableStartupPage; - int m_page; - HINSTANCE m_moduleInstance; + std::string m_responseContent; + USHORT m_statusCode; + USHORT m_subStatusCode; + std::string m_statusText; }; diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h index 3296c68c11..77d94230b2 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h @@ -9,44 +9,36 @@ class ServerErrorHandler : public REQUEST_HANDLER { public: - ServerErrorHandler(IHttpContext& pContext, USHORT statusCode, USHORT subStatusCode, const std::string& statusText, HRESULT hr, HINSTANCE module, bool disableStartupPage, int page) noexcept - : ServerErrorHandler(pContext, statusCode, subStatusCode, statusText, hr, module, disableStartupPage, page, std::vector()) - { - } - - ServerErrorHandler(IHttpContext& pContext, USHORT statusCode, USHORT subStatusCode, const std::string& statusText, HRESULT hr, HINSTANCE module, bool disableStartupPage, int page, const std::vector& content) noexcept + ServerErrorHandler(IHttpContext& pContext, USHORT statusCode, USHORT subStatusCode, const std::string& statusText, HRESULT hr, bool disableStartupPage, std::string& responseContent) noexcept : REQUEST_HANDLER(pContext), - m_pContext(pContext), m_HR(hr), m_disableStartupPage(disableStartupPage), m_statusCode(statusCode), m_subStatusCode(subStatusCode), m_statusText(std::move(statusText)), - m_page(page), - m_ExceptionInfoContent(content), - m_moduleInstance(module) + m_ExceptionInfoContent(responseContent) { } REQUEST_NOTIFICATION_STATUS ExecuteRequestHandler() override { - WriteStaticResponse(m_pContext, m_HR, m_disableStartupPage); + WriteResponse(); return RQ_NOTIFICATION_FINISH_REQUEST; } private: - void WriteStaticResponse(IHttpContext& pContext, HRESULT hr, bool disableStartupErrorPage) + void WriteResponse() { - if (disableStartupErrorPage) + if (m_disableStartupPage) { - pContext.GetResponse()->SetStatus(m_statusCode, m_statusText.c_str(), m_subStatusCode, E_FAIL); + m_pHttpContext.GetResponse()->SetStatus(m_statusCode, m_statusText.c_str(), m_subStatusCode, E_FAIL); return; } HTTP_DATA_CHUNK dataChunk = {}; - IHttpResponse* pResponse = pContext.GetResponse(); - pResponse->SetStatus(m_statusCode, m_statusText.c_str(), m_subStatusCode, hr, nullptr, true); + IHttpResponse* pResponse = m_pHttpContext.GetResponse(); + pResponse->SetStatus(m_statusCode, m_statusText.c_str(), m_subStatusCode, m_HR, nullptr, true); pResponse->SetHeader("Content-Type", "text/html", (USHORT)strlen("text/html"), @@ -54,62 +46,16 @@ private: ); dataChunk.DataChunkType = HttpDataChunkFromMemory; - if (m_ExceptionInfoContent.size() > 0) - { - dataChunk.FromMemory.pBuffer = &m_ExceptionInfoContent[0]; - dataChunk.FromMemory.BufferLength = static_cast(m_ExceptionInfoContent.size()); - } - else - { - static std::string s_html500Page = GetHtml(m_moduleInstance, m_page); - dataChunk.FromMemory.pBuffer = s_html500Page.data(); - dataChunk.FromMemory.BufferLength = static_cast(s_html500Page.size()); - } - + dataChunk.FromMemory.pBuffer = m_ExceptionInfoContent.data(); + dataChunk.FromMemory.BufferLength = static_cast(m_ExceptionInfoContent.size()); + pResponse->WriteEntityChunkByReference(&dataChunk); } - std::string - GetHtml(HMODULE module, int page) - { - try - { - HRSRC rc = nullptr; - HGLOBAL rcData = nullptr; - std::string data; - const char* pTempData = nullptr; - - THROW_LAST_ERROR_IF_NULL(rc = FindResource(module, MAKEINTRESOURCE(page), RT_HTML)); - THROW_LAST_ERROR_IF_NULL(rcData = LoadResource(module, rc)); - auto const size = SizeofResource(module, rc); - THROW_LAST_ERROR_IF(size == 0); - THROW_LAST_ERROR_IF_NULL(pTempData = static_cast(LockResource(rcData))); - data = std::string(pTempData, size); - - auto additionalErrorLink = Environment::GetEnvironmentVariableValue(L"ANCM_ADDITIONAL_ERROR_PAGE_LINK"); - std::string additionalHtml; - - if (additionalErrorLink.has_value()) - { - additionalHtml = format(" %S and ", additionalErrorLink->c_str(), additionalErrorLink->c_str()); - } - - return format(data, additionalHtml.c_str()); - } - catch (...) - { - OBSERVE_CAUGHT_EXCEPTION(); - return ""; - } - } - - IHttpContext& m_pContext; HRESULT m_HR; bool m_disableStartupPage; - int m_page; - HINSTANCE m_moduleInstance; USHORT m_statusCode; USHORT m_subStatusCode; std::string m_statusText; - std::vector m_ExceptionInfoContent; + std::string& m_ExceptionInfoContent; }; diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/file_utility.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/file_utility.cpp index 2831eac64d..b2c7adce61 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/file_utility.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/file_utility.cpp @@ -6,6 +6,7 @@ #include #include "debugutil.h" #include "exceptions.h" +#include "Environment.h" HRESULT FILE_UTILITY::IsPathUnc( @@ -167,3 +168,53 @@ Finished: return hr; } +std::string FILE_UTILITY::GetHtml(HMODULE module, int page, USHORT statusCode, USHORT subStatusCode, const std::string& specificReasonPhrase, const std::string& solution) +{ + return GetHtml(module, page, statusCode, subStatusCode, specificReasonPhrase, solution, std::string()); +} + +std::string +FILE_UTILITY::GetHtml(HMODULE module, int page, USHORT statusCode, USHORT subStatusCode, const std::string& specificReasonPhrase, const std::string& errorReason, const std::string& specificError) +{ + try + { + HRSRC rc = nullptr; + HGLOBAL rcData = nullptr; + std::string data; + const char* pTempData = nullptr; + + THROW_LAST_ERROR_IF_NULL(rc = FindResource(module, MAKEINTRESOURCE(page), RT_HTML)); + THROW_LAST_ERROR_IF_NULL(rcData = LoadResource(module, rc)); + auto const size = SizeofResource(module, rc); + THROW_LAST_ERROR_IF(size == 0); + THROW_LAST_ERROR_IF_NULL(pTempData = static_cast(LockResource(rcData))); + data = std::string(pTempData, size); + + auto additionalErrorLink = Environment::GetEnvironmentVariableValue(L"ANCM_ADDITIONAL_ERROR_PAGE_LINK"); + std::string additionalHtml; + + if (additionalErrorLink.has_value()) + { + additionalHtml = format(" %S and ", additionalErrorLink->c_str(), additionalErrorLink->c_str()); + } + + std::string formattedError; + if (!specificError.empty()) + { + formattedError = format("

      Specific error detected by ANCM:

      %s

      ", specificError.c_str()); + } + + std::string formattedErrorReason; + if (!errorReason.empty()) + { + formattedErrorReason = format("

      Common solutions to this issue:

      %s", errorReason.c_str()); + } + + return format(data, statusCode, subStatusCode, specificReasonPhrase.c_str(), statusCode, subStatusCode, specificReasonPhrase.c_str(), formattedErrorReason.c_str(), formattedError.c_str(), additionalHtml.c_str()); + } + catch (...) + { + OBSERVE_CAUGHT_EXCEPTION(); + return ""; + } +} diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/file_utility.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/file_utility.h index 686e810cbe..fc3ce8935b 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/file_utility.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/file_utility.h @@ -28,7 +28,11 @@ public: static std::string - GetHtml(HMODULE module, int page); + GetHtml(HMODULE module, int page, USHORT statusCode, USHORT subStatusCode, const std::string& speicificReasonPhrase, const std::string& solution); + + static + std::string + GetHtml(HMODULE module, int page, USHORT statusCode, USHORT subStatusCode, const std::string& speicificReasonPhrase, const std::string& solution, const std::string& error); private: static diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/requesthandler.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/requesthandler.h index 6274efc07e..1c78fcd0ca 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/requesthandler.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/requesthandler.h @@ -75,7 +75,7 @@ public: { } -private: +protected: IHttpContext& m_pHttpContext; mutable LONG m_cRefs = 1; }; diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/resources.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/resources.h index 04ee2e0944..9535d1c0cb 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/resources.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/resources.h @@ -43,7 +43,7 @@ #define ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION_MSG L"Application '%s' with physical root '%s' hit unexpected managed exception, exception code = '0x%x'. Please check the stderr logs for more information." #define ASPNETCORE_EVENT_INPROCESS_THREAD_EXCEPTION_STDOUT_MSG L"Application '%s' with physical root '%s' hit unexpected managed exception, exception code = '0x%x'. First 30KB characters of captured stdout and stderr logs:\r\n%s" #define ASPNETCORE_EVENT_INPROCESS_RH_ERROR_MSG L"Could not find 'aspnetcorev2_inprocess.dll'. Exception message:\r\n%s" -#define ASPNETCORE_EVENT_INPROCESS_RH_REFERENCE_MSG L"Could not find the assembly '%s' referenced for the in-process application. Please confirm the Microsoft.AspNetCore.Server.IIS package is referenced in your application." +#define ASPNETCORE_EVENT_INPROCESS_RH_REFERENCE_MSG L"Could not find the assembly '%s' referenced for the in-process application. Please confirm the Microsoft.AspNetCore.Server.IIS or Microsoft.AspNetCore.App is referenced in your application." #define ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG L"Could not find the assembly '%s' for out-of-process application. Please confirm the assembly is installed correctly for IIS or IISExpress." #define ASPNETCORE_EVENT_INPROCESS_START_SUCCESS_MSG L"Application '%s' started successfully." #define ASPNETCORE_EVENT_INPROCESS_START_ERROR_MSG L"Application '%s' failed to start. Exception message:\r\n%s" diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp index d0e264e0f8..01ec10f6f6 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp @@ -59,6 +59,7 @@ InProcessOptions::InProcessOptions(const ConfigurationSource &configurationSourc const auto handlerSettings = aspNetCoreSection->GetKeyValuePairs(CS_ASPNETCORE_HANDLER_SETTINGS); m_fSetCurrentDirectory = equals_ignore_case(find_element(handlerSettings, CS_ASPNETCORE_HANDLER_SET_CURRENT_DIRECTORY).value_or(L"true"), L"true"); m_fCallStartupHook = equals_ignore_case(find_element(handlerSettings, CS_ASPNETCORE_HANDLER_CALL_STARTUP_HOOK).value_or(L"true"), L"true"); + m_strStackSize = find_element(handlerSettings, CS_ASPNETCORE_HANDLER_STACK_SIZE).value_or(L"1048576"); m_dwStartupTimeLimitInMS = aspNetCoreSection->GetRequiredLong(CS_ASPNETCORE_PROCESS_STARTUP_TIME_LIMIT) * 1000; m_dwShutdownTimeLimitInMS = aspNetCoreSection->GetRequiredLong(CS_ASPNETCORE_PROCESS_SHUTDOWN_TIME_LIMIT) * 1000; diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h index 6cb8fcceef..61a79664b2 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.h @@ -112,6 +112,12 @@ public: return m_bindingInformation; } + std::wstring + QueryStackSize() const + { + return m_strStackSize; + } + InProcessOptions(const ConfigurationSource &configurationSource, IHttpSite* pSite); static @@ -125,6 +131,7 @@ private: std::wstring m_strArguments; std::wstring m_strProcessPath; std::wstring m_struStdoutLogFile; + std::wstring m_strStackSize; bool m_fStdoutLogEnabled; bool m_fDisableStartUpErrorPage; bool m_fSetCurrentDirectory; diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm index 59d6b0dacb..8783b58adb 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm @@ -2,7 +2,7 @@ - HTTP Error 500.30 - ANCM In-Process Start Failure + HTTP Error %d.%d - %s -

      HTTP Error 500.30 - ANCM In-Process Start Failure

      +

      HTTP Error %d.%d - %s

      -

      Common causes of this issue:

      -
        -
      • The application failed to start
        • -
      • The application started but then stopped
        • -
      • The application started but threw an exception during startup
        • -
      + %s + + %s

      Troubleshooting steps:

        diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h index 6db5fee164..d3e50e620f 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h @@ -13,15 +13,18 @@ public: StartupExceptionApplication( IHttpServer& pServer, IHttpApplication& pApplication, - HINSTANCE moduleInstance, BOOL disableLogs, HRESULT hr, - std::vector&& errorPageContent - ) + const std::string& errorPageContent, + USHORT statusCode, + USHORT subStatusCode, + const std::string& statusText) : m_disableLogs(disableLogs), m_HR(hr), - m_moduleInstance(moduleInstance), - m_errorPageContent(std::move(errorPageContent)), + m_error(errorPageContent), + m_statusCode(statusCode), + m_subStatusCode(subStatusCode), + m_statusText(std::move(statusText)), InProcessApplicationBase(pServer, pApplication) { } @@ -30,15 +33,17 @@ public: HRESULT CreateHandler(IHttpContext* pHttpContext, IREQUEST_HANDLER** pRequestHandler) { - *pRequestHandler = new ServerErrorHandler(*pHttpContext, 500, 30, "Internal Server Error", m_HR, m_moduleInstance, m_disableLogs, IN_PROCESS_RH_STATIC_HTML, m_errorPageContent); + *pRequestHandler = new ServerErrorHandler(*pHttpContext, m_statusCode, m_subStatusCode, m_statusText, m_HR, m_disableLogs, m_error); return S_OK; } private: - std::vector m_errorPageContent; + std::string m_error; BOOL m_disableLogs; HRESULT m_HR; - HINSTANCE m_moduleInstance; + USHORT m_statusCode; + USHORT m_subStatusCode; + std::string m_statusText; }; diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp index 710bbee754..fe7f9d10a0 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp @@ -17,6 +17,7 @@ #include "WebConfigConfigurationSource.h" #include "ConfigurationLoadException.h" #include "StartupExceptionApplication.h" +#include "file_utility.h" DECLARE_DEBUG_PRINT_OBJECT("aspnetcorev2_inprocess.dll"); @@ -28,7 +29,7 @@ HINSTANCE g_hWinHttpModule; HINSTANCE g_hAspNetCoreModule; HANDLE g_hEventLog = NULL; bool g_fInProcessApplicationCreated = false; -std::vector g_errorPageContent; +std::string g_errorPageContent; HINSTANCE g_hServerModule; HRESULT @@ -120,7 +121,14 @@ CreateApplication( g_fInProcessApplicationCreated = true; std::unique_ptr inProcessApplication; - if (!FAILED_LOG(hr = IN_PROCESS_APPLICATION::Start(*pServer, pSite, *pHttpApplication, pParameters, nParameters, inProcessApplication))) + + ErrorContext errorContext; + errorContext.statusCode = 500; + errorContext.subStatusCode = 30; + errorContext.generalErrorType = "ANCM In-Process Start Failure"; + errorContext.errorReason = "
        • The application failed to start
        • The application started but then stopped
        • The application started but threw an exception during startup
        "; + + if (!FAILED_LOG(hr = IN_PROCESS_APPLICATION::Start(*pServer, pSite, *pHttpApplication, pParameters, nParameters, inProcessApplication, errorContext))) { *ppApplication = inProcessApplication.release(); } @@ -129,7 +137,24 @@ CreateApplication( std::unique_ptr options; THROW_IF_FAILED(InProcessOptions::Create(*pServer, pSite, *pHttpApplication, options)); // Set the currently running application to a fake application that returns startup exceptions. - auto pErrorApplication = std::make_unique(*pServer, *pHttpApplication, g_hServerModule, options->QueryDisableStartUpErrorPage(), hr, std::move(g_errorPageContent)); + auto content = !g_errorPageContent.empty() ? + g_errorPageContent : + FILE_UTILITY::GetHtml(g_hServerModule, + IN_PROCESS_RH_STATIC_HTML, + errorContext.statusCode, + errorContext.subStatusCode, + errorContext.generalErrorType, + errorContext.errorReason, + ""); + + auto pErrorApplication = std::make_unique(*pServer, + *pHttpApplication, + options->QueryDisableStartUpErrorPage(), + hr, + content, + errorContext.statusCode, + errorContext.subStatusCode, + "Internal Server Error"); RETURN_IF_FAILED(pErrorApplication->StartMonitoringAppOffline()); *ppApplication = pErrorApplication.release(); diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index afb60a8892..f261436690 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -130,7 +130,7 @@ IN_PROCESS_APPLICATION::SetCallbackHandles( } HRESULT -IN_PROCESS_APPLICATION::LoadManagedApplication() +IN_PROCESS_APPLICATION::LoadManagedApplication(ErrorContext& errorContext) { THROW_LAST_ERROR_IF_NULL(m_pInitializeEvent = CreateEvent( nullptr, // default security attributes @@ -157,11 +157,17 @@ IN_PROCESS_APPLICATION::LoadManagedApplication() // Wait for shutdown request const auto waitResult = WaitForMultipleObjects(2, waitHandles, FALSE, m_pConfig->QueryStartupTimeLimitInMS()); + THROW_LAST_ERROR_IF(waitResult == WAIT_FAILED); if (waitResult == WAIT_TIMEOUT) { // If server wasn't initialized in time shut application down without waiting for CLR thread to exit + errorContext.statusCode = 500; + errorContext.subStatusCode = 37; + errorContext.generalErrorType = "ANCM Failed to Start Within Startup Time Limit"; + errorContext.errorReason = format("ANCM failed to start after %d milliseconds", m_pConfig->QueryStartupTimeLimitInMS()); + m_waitForShutdown = false; StopClr(); throw InvalidOperationException(format(L"Managed server didn't initialize after %u ms.", m_pConfig->QueryStartupTimeLimitInMS())); @@ -253,6 +259,7 @@ IN_PROCESS_APPLICATION::ExecuteApplication() // Used to make .NET Runtime always log to event log when there is an unhandled exception. LOG_LAST_ERROR_IF(!SetEnvironmentVariable(L"COMPlus_UseEntryPointFilter", L"1")); + LOG_LAST_ERROR_IF(!SetEnvironmentVariable(L"COMPlus_DefaultStackSize", m_pConfig->QueryStackSize().c_str())); bool clrThreadExited; { @@ -379,7 +386,8 @@ HRESULT IN_PROCESS_APPLICATION::Start( IHttpApplication& pHttpApplication, APPLICATION_PARAMETER* pParameters, DWORD nParameters, - std::unique_ptr& application) + std::unique_ptr& application, + ErrorContext& errorContext) { try { @@ -387,7 +395,7 @@ HRESULT IN_PROCESS_APPLICATION::Start( THROW_IF_FAILED(InProcessOptions::Create(pServer, pSite, pHttpApplication, options)); application = std::unique_ptr( new IN_PROCESS_APPLICATION(pServer, pHttpApplication, std::move(options), pParameters, nParameters)); - THROW_IF_FAILED(application->LoadManagedApplication()); + THROW_IF_FAILED(application->LoadManagedApplication(errorContext)); return S_OK; } catch (InvalidOperationException& ex) diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h index 9f28db3889..0f3ae289b9 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h @@ -58,7 +58,7 @@ public: ExecuteApplication(); HRESULT - LoadManagedApplication(); + LoadManagedApplication(ErrorContext& errorContext); void QueueStop(); @@ -115,7 +115,8 @@ public: IHttpApplication& pHttpApplication, APPLICATION_PARAMETER* pParameters, DWORD nParameters, - std::unique_ptr& application); + std::unique_ptr& application, + ErrorContext& errorContext); private: struct ExecuteClrContext: std::enable_shared_from_this diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp index e52ec8c8e4..a7bcaa3675 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp @@ -7,7 +7,7 @@ #include "EventLog.h" extern bool g_fInProcessApplicationCreated; -extern std::vector g_errorPageContent; +extern std::string g_errorPageContent; extern IHttpServer* g_pHttpServer; // diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm index e7d2f04e7c..bedf0a8dce 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRhStaticHtml.htm @@ -2,7 +2,7 @@ - HTTP Error 502.5 - ANCM Out-Of-Process Startup Failure + HTTP Error %d.%d - %s -

        HTTP Error 502.5 - ANCM Out-Of-Process Startup Failure

        +

        HTTP Error %d.%d - %s

        -

        Common causes of this issue:

        + %s -
          -
        • The application process failed to start
          • -
        • The application process started but then stopped
          • -
        • The application process started but failed to listen on the configured port
          • -
        + %s -

        Troubleshooting steps:

        +

        Troubleshooting steps:

        • Check the system event log for error messages
          • diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp index 551d10c9f9..4fbf2abf40 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp @@ -4,8 +4,10 @@ #include "forwardinghandler.h" #include "url_utility.h" #include "exceptions.h" +#include "ServerErrorApplication.h" #include "ServerErrorHandler.h" #include "resource.h" +#include "file_utility.h" // Just to be aware of the FORWARDING_HANDLER object size. C_ASSERT(sizeof(FORWARDING_HANDLER) <= 632); @@ -302,7 +304,21 @@ Failure: } else if (fFailedToStartKestrel && !m_pApplication->QueryConfig()->QueryDisableStartUpErrorPage()) { - ServerErrorHandler handler(*m_pW3Context, 502, 5, "Bad Gateway", hr, g_hOutOfProcessRHModule, m_pApplication->QueryConfig()->QueryDisableStartUpErrorPage(), OUT_OF_PROCESS_RH_STATIC_HTML); + static std::string htmlResponse = FILE_UTILITY::GetHtml(g_hOutOfProcessRHModule, + OUT_OF_PROCESS_RH_STATIC_HTML, + 502, + 5, + "ANCM Out-Of-Process Startup Failure", + "
          • The application process failed to start
          • The application process started but then stopped
          • The application process started but failed to listen on the configured port
          "); + + ServerErrorHandler handler(*m_pW3Context, + 502, + 5, + "Bad Gateway", + hr, + m_pApplication->QueryConfig()->QueryDisableStartUpErrorPage(), + htmlResponse); + handler.ExecuteRequestHandler(); } else diff --git a/src/Servers/IIS/AspNetCoreModuleV2/ref/Microsoft.AspNetCore.ANCMSymbols.csproj b/src/Servers/IIS/AspNetCoreModuleV2/ref/Microsoft.AspNetCore.ANCMSymbols.csproj new file mode 100644 index 0000000000..36c3a47a9a --- /dev/null +++ b/src/Servers/IIS/AspNetCoreModuleV2/ref/Microsoft.AspNetCore.ANCMSymbols.csproj @@ -0,0 +1,10 @@ + + + + netcoreapp3.0 + + + + + + diff --git a/src/Servers/IIS/AspNetCoreModuleV2/ref/Microsoft.AspNetCore.ANCMSymbols.netcoreapp3.0.cs b/src/Servers/IIS/AspNetCoreModuleV2/ref/Microsoft.AspNetCore.ANCMSymbols.netcoreapp3.0.cs new file mode 100644 index 0000000000..618082bc4a --- /dev/null +++ b/src/Servers/IIS/AspNetCoreModuleV2/ref/Microsoft.AspNetCore.ANCMSymbols.netcoreapp3.0.cs @@ -0,0 +1,3 @@ +// 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. + diff --git a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj index bf679ddbd2..44c1a66221 100644 --- a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj +++ b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj @@ -28,12 +28,6 @@ False - - False - - - False - diff --git a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/PlaintextBenchmark.cs b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/PlaintextBenchmark.cs index be6c8d9da3..32ed007c73 100644 --- a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/PlaintextBenchmark.cs +++ b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/PlaintextBenchmark.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; using BenchmarkDotNet.Attributes; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Server.IIS.Performance diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/AppOfflineTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/AppOfflineTests.cs index dc6d470fc6..b63c2ff2ec 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/AppOfflineTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/AppOfflineTests.cs @@ -8,7 +8,7 @@ using System.Net.Http; using System.Net.Sockets; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; -using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing.xunit; diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/BasicAuthTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/BasicAuthTests.cs index c921a4e3dc..fbe47f4df7 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/BasicAuthTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/BasicAuthTests.cs @@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [Collection(PublishedSitesCollection.Name)] public class BasicAuthTests : IISFunctionalTestBase diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateFixture.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateFixture.cs index 40b6f2265e..7e41664f86 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateFixture.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateFixture.cs @@ -6,7 +6,7 @@ using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { public class ClientCertificateFixture : IDisposable { diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateTests.cs index 8cdd0f102c..3ce31f90f6 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateTests.cs @@ -6,7 +6,7 @@ using System.Net.Http; using System.Security.Cryptography.X509Certificates; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; -using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.Common; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientDisconnectStress.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientDisconnectStress.cs index 9deeae3f92..6d1f30e386 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientDisconnectStress.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientDisconnectStress.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [Collection(PublishedSitesCollection.Name)] public class ClientDisconnectStressTests: FunctionalTestsBase diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/CommonStartupTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/CommonStartupTests.cs index a7c98be57e..6f2ba0d609 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/CommonStartupTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/CommonStartupTests.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [Collection(PublishedSitesCollection.Name)] public class CommonStartupTests : IISFunctionalTestBase diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/CompressionTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/CompressionTests.cs index 262d3ff59c..4727058341 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/CompressionTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/CompressionTests.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [Collection(PublishedSitesCollection.Name)] public class CompressionTests : IISFunctionalTestBase diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ConfigurationChangeTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ConfigurationChangeTests.cs index 2332bfa9f3..e26445110b 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ConfigurationChangeTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ConfigurationChangeTests.cs @@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [Collection(PublishedSitesCollection.Name)] public class ConfigurationChangeTests : IISFunctionalTestBase @@ -72,11 +72,9 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests .SetAttributeValue("hostingModel", "inprocess")); // Have to retry here to allow ANCM to receive notification and react to it - // Verify that inprocess application was created and tried to start - await deploymentResult.HttpClient.RetryRequestAsync("/HelloWorld", r => r.StatusCode == HttpStatusCode.InternalServerError); - - StopServer(); - EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.CouldNotFindHandler(), Logger); + // Verify that inprocess application was created and started, checking the server + // header to see that it is running inprocess + await deploymentResult.HttpClient.RetryRequestAsync("/HelloWorld", r => r.Headers.Server.ToString().StartsWith("Microsoft")); } [ConditionalTheory] diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/FixtureLoggedTest.cs similarity index 92% rename from src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/FixtureLoggedTest.cs index 705af2b213..a8aaea4f2c 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FixtureLoggedTest.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/FixtureLoggedTest.cs @@ -5,7 +5,7 @@ using System.Reflection; using Microsoft.Extensions.Logging.Testing; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { public class FixtureLoggedTest: LoggedTest { diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs index 7a5158f9bf..c56ea32047 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs @@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [Collection(PublishedSitesCollection.Name)] public class HttpsTests : IISFunctionalTestBase diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs index 6e2d1bc752..409e403872 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess { [Collection(IISTestSiteCollection.Name)] public class ClientDisconnectTests: FixtureLoggedTest diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/CompressionTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/CompressionTests.cs index 09b1ecc077..e5ace9fb3c 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/CompressionTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/CompressionTests.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess { [Collection(IISCompressionSiteCollection.Name)] public class CompressionModuleTests : FixtureLoggedTest diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs index b738155ea6..2fb0c53a9a 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess { [Collection(PublishedSitesCollection.Name)] diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs index 12086a3ab9..474d662481 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess { [Collection(PublishedSitesCollection.Name)] public class ErrorPagesTests : IISFunctionalTestBase diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EventLogTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EventLogTests.cs index a138cd659a..461cc9a344 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EventLogTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EventLogTests.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess { [Collection(PublishedSitesCollection.Name)] public class EventLogTests : IISFunctionalTestBase diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs index 696a47e420..badbe2d5f0 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess { [Collection(IISTestSiteCollection.Name)] public class FeatureCollectionTest diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FrebTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FrebTests.cs index b94baa4baa..eb4dc7cbac 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FrebTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FrebTests.cs @@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess { [Collection(PublishedSitesCollection.Name)] public class FrebTests : LogFileTestBase diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs index 04dc8bd393..42c4f2d076 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess { [Collection(IISTestSiteCollection.Name)] public class HelloWorldInProcessTests: FixtureLoggedTest diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs index 3c2df6cb84..3a5f1e81f5 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess { [Collection(IISTestSiteCollection.Name)] public class HostingEnvironmentTests: FixtureLoggedTest diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs index 95c05308bd..270dff4d50 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess { [Collection(IISTestSiteCollection.Name)] public class InvalidReadWriteOperationTests diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs index 40db2cfdb8..ce0491fe6a 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess { [Collection(IISTestSiteCollection.Name)] public class LargeResponseBodyTests diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs index 926e81ad45..cd322b4cfa 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess { [Collection(PublishedSitesCollection.Name)] public class LogPipeTests : IISFunctionalTestBase diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/MaxRequestBodySizeTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/MaxRequestBodySizeTests.cs index f14574e172..79a60814e1 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/MaxRequestBodySizeTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/MaxRequestBodySizeTests.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess { [Collection(PublishedSitesCollection.Name)] public class MaxRequestBodySizeTests : IISFunctionalTestBase diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs index a779f73585..ccce64873e 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Net.Http.Headers; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess { [Collection(IISTestSiteCollection.Name)] public class ResponseHeaders diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs index c39e155e77..7a29f027bc 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess { [Collection(IISTestSiteCollection.Name)] public class ResponseInvalidOrderingTest diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs index d18c4c7f09..a7091b3094 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess { [Collection(IISTestSiteCollection.Name)] public class ServerVariablesTest diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ShutdownTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ShutdownTests.cs index d4e9c9f7cb..398d0bfb25 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ShutdownTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ShutdownTests.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess { [Collection(PublishedSitesCollection.Name)] public class ShutdownTests : IISFunctionalTestBase diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs index bd468820a2..f7d6390e6d 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess { [Collection(PublishedSitesCollection.Name)] public class StartupExceptionTests : LogFileTestBase diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs index 009ecd8319..62b9ea0d1f 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs @@ -7,6 +7,7 @@ using System.Diagnostics; using System.IO; using System.Linq; using System.Net; +using System.Net.Http; using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; @@ -19,7 +20,7 @@ using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Win32; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess { [Collection(PublishedSitesCollection.Name)] public class StartupTests : IISFunctionalTestBase @@ -268,11 +269,60 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Path.Combine(deploymentResult.ContentRoot, "aspnetcorev2_inprocess.dll"), Path.Combine(deploymentResult.ContentRoot, "hostfxr.dll"), true); - await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult); + + if (DeployerSelector.HasNewShim) + { + await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult, "HTTP Error 500.32 - ANCM Failed to Load dll"); + } + else + { + await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult); + } EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessHostfxrInvalid(deploymentResult), Logger); } + [ConditionalFact] + public async Task PublishWithWrongBitness() + { + var deploymentParameters = Fixture.GetBaseDeploymentParameters(Fixture.InProcessTestSite); + + if (deploymentParameters.ServerType == ServerType.IISExpress) + { + // TODO skip conditions for IISExpress + return; + } + + deploymentParameters.ApplicationType = ApplicationType.Standalone; + deploymentParameters.AddServerConfigAction(element => + { + element.RequiredElement("system.applicationHost").RequiredElement("applicationPools").RequiredElement("add").SetAttributeValue("enable32BitAppOnWin64", "true"); + }); + + // Change ANCM dll to 32 bit + deploymentParameters.AddServerConfigAction( + element => + { + var ancmElement = element + .RequiredElement("system.webServer") + .RequiredElement("globalModules") + .Elements("add") + .FirstOrDefault(e => e.Attribute("name").Value == "AspNetCoreModuleV2"); + + ancmElement.SetAttributeValue("image", ancmElement.Attribute("image").Value.Replace("x64", "x86")); + }); + var deploymentResult = await DeployAsync(deploymentParameters); + + if (DeployerSelector.HasNewShim) + { + await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult, "500.32 - ANCM Failed to Load dll"); + } + else + { + await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult, "500.0 - ANCM In-Process Handler Load Failure"); + } + } + [ConditionalFact] [RequiresNewShim] public async Task RemoveHostfxrFromApp_InProcessHostfxrLoadFailure() @@ -283,7 +333,15 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests // We don't distinguish between load failure types so making dll empty should be enough File.WriteAllText(Path.Combine(deploymentResult.ContentRoot, "hostfxr.dll"), ""); - await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult); + + if (DeployerSelector.HasNewShim) + { + await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult, "HTTP Error 500.32 - ANCM Failed to Load dll"); + } + else + { + await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult); + } EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessHostfxrUnableToLoad(deploymentResult), Logger); } @@ -295,11 +353,41 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); Helpers.ModifyFrameworkVersionInRuntimeConfig(deploymentResult); - await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult); + if (DeployerSelector.HasNewShim) + { + await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult, "HTTP Error 500.31 - ANCM Failed to Find Native Dependencies"); + } + else + { + await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult); + } EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessFailedToFindNativeDependencies(deploymentResult), Logger); } + [ConditionalFact] + public async Task TargedDifferenceSharedFramework_FailedToFindNativeDependenciesErrorInResponse() + { + var deploymentParameters = Fixture.GetBaseDeploymentParameters(Fixture.InProcessTestSite); + deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_DETAILEDERRORS"] = "TRUE"; + var deploymentResult = await DeployAsync(deploymentParameters); + + Helpers.ModifyFrameworkVersionInRuntimeConfig(deploymentResult); + if (DeployerSelector.HasNewShim) + { + var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); + + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + var responseContent = await response.Content.ReadAsStringAsync(); + Assert.Contains("HTTP Error 500.31 - ANCM Failed to Find Native Dependencies", responseContent); + Assert.Contains("The specified framework 'Microsoft.NETCore.App', version '2.9.9'", responseContent); + } + else + { + await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult); + } + } + [ConditionalFact] public async Task RemoveInProcessReference_FailedToFindRequestHandler() { @@ -309,20 +397,28 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests File.Delete(Path.Combine(deploymentResult.ContentRoot, "aspnetcorev2_inprocess.dll")); - await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult); - - if (DeployerSelector.IsForwardsCompatibilityTest) + if (DeployerSelector.HasNewShim && DeployerSelector.HasNewHandler) { + await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult, "HTTP Error 500.33 - ANCM Request Handler Load Failure "); + + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessFailedToFindRequestHandler(deploymentResult), Logger); + } + else if (DeployerSelector.HasNewShim) + { + // Forwards compat tests fail earlier due to a error with the M.AspNetCore.Server.IIS package. + await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult, "HTTP Error 500.31 - ANCM Failed to Find Native Dependencies"); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessFailedToFindNativeDependencies(deploymentResult), Logger); } else { + await AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessFailedToFindRequestHandler(deploymentResult), Logger); } } [ConditionalFact] - [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/1772", FlakyOn.All)] public async Task StartupTimeoutIsApplied() { // From what I can tell, this failure is due to ungraceful shutdown. @@ -340,11 +436,17 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var response = await deploymentResult.HttpClient.GetAsync("/"); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); - StopServer(); + StopServer(gracefulShutdown: false); EventLogHelpers.VerifyEventLogEvents(deploymentResult, EventLogHelpers.InProcessFailedToStart(deploymentResult, "Managed server didn't initialize after 1000 ms.") ); + + if (DeployerSelector.HasNewHandler) + { + var responseContent = await response.Content.ReadAsStringAsync(); + Assert.Contains("ANCM Failed to Start Within Startup Time Limit", responseContent); + } } } @@ -588,7 +690,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests deploymentParameters.TransformArguments((a, _) => $"{a} Throw"); // Deployment parameters by default set ASPNETCORE_DETAILEDERRORS to true - deploymentParameters.EnvironmentVariables["ASPNETCORE_DETAILEDERRORS"] = ""; + deploymentParameters.EnvironmentVariables.Remove("ASPNETCORE_DETAILEDERRORS"); deploymentParameters.EnvironmentVariables[environmentVariable] = value; var deploymentResult = await DeployAsync(deploymentParameters); @@ -604,6 +706,30 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests VerifyDotnetRuntimeEventLog(deploymentResult); } + [ConditionalFact] + [RequiresNewHandler] + public async Task ExceptionIsLoggedToEventLogAndPutInResponseWhenDeveloperExceptionPageIsEnabledViaWebConfig() + { + var deploymentParameters = Fixture.GetBaseDeploymentParameters(); + deploymentParameters.TransformArguments((a, _) => $"{a} Throw"); + + // Deployment parameters by default set ASPNETCORE_DETAILEDERRORS to true + deploymentParameters.EnvironmentVariables.Remove("ASPNETCORE_DETAILEDERRORS"); + deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_DETAILEDERRORS"] = "TRUE"; + + var deploymentResult = await DeployAsync(deploymentParameters); + var result = await deploymentResult.HttpClient.GetAsync("/"); + Assert.False(result.IsSuccessStatusCode); + + var content = await result.Content.ReadAsStringAsync(); + Assert.Contains("InvalidOperationException", content); + Assert.Contains("TestSite.Program.Main", content); + + StopServer(); + + VerifyDotnetRuntimeEventLog(deploymentResult); + } + [ConditionalTheory] [RequiresIIS(IISCapability.PoolEnvironmentVariables)] [RequiresNewHandler] @@ -622,6 +748,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Contains("InvalidOperationException", content); Assert.Contains("TestSite.Program.Main", content); Assert.Contains("From Configure", content); + Assert.DoesNotContain("ANCM In-Process Start Failure", content); StopServer(); @@ -673,6 +800,28 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests VerifyDotnetRuntimeEventLog(deploymentResult); } + [ConditionalFact] + [RequiresNewHandler] + public async Task StackOverflowIsAvoidedBySettingLargerStack() + { + var deploymentParameters = Fixture.GetBaseDeploymentParameters(); + var deploymentResult = await DeployAsync(deploymentParameters); + var result = await deploymentResult.HttpClient.GetAsync("/StackSize"); + Assert.True(result.IsSuccessStatusCode); + } + + [ConditionalFact] + [RequiresNewHandler] + public async Task StackOverflowCanBeSetBySettingLargerStackViaHandlerSetting() + { + var deploymentParameters = Fixture.GetBaseDeploymentParameters(); + deploymentParameters.HandlerSettings["stackSize"] = "10000000"; + + var deploymentResult = await DeployAsync(deploymentParameters); + var result = await deploymentResult.HttpClient.GetAsync("/StackSizeLarge"); + Assert.True(result.IsSuccessStatusCode); + } + private static void VerifyDotnetRuntimeEventLog(IISDeploymentResult deploymentResult) { var entries = GetEventLogsFromDotnetRuntime(deploymentResult); @@ -728,11 +877,23 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests }); } - private async Task AssertSiteFailsToStartWithInProcessStaticContent(IISDeploymentResult deploymentResult) + private Task AssertSiteFailsToStartWithInProcessStaticContent(IISDeploymentResult deploymentResult) { - var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); + return AssertSiteFailsToStartWithInProcessStaticContent(deploymentResult, "HTTP Error 500.0 - ANCM In-Process Handler Load Failure"); + } + + private async Task AssertSiteFailsToStartWithInProcessStaticContent(IISDeploymentResult deploymentResult, string error) + { + HttpResponseMessage response = null; + + // Make sure strings aren't freed. + for (var i = 0; i < 2; i++) + { + response = await deploymentResult.HttpClient.GetAsync("/HelloWorld"); + } + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); - Assert.Contains("HTTP Error 500.0 - ANCM In-Process Handler Load Failure", await response.Content.ReadAsStringAsync()); + Assert.Contains(error, await response.Content.ReadAsStringAsync()); StopServer(); } } diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs index ae8bf44217..d1cb8eac4f 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess { [Collection(IISTestSiteCollection.Name)] public class SynchronousReadAndWriteTests: FixtureLoggedTest diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/LogFileTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/LogFileTests.cs index 2e640536b4..26f3ec6812 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/LogFileTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/LogFileTests.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [Collection(PublishedSitesCollection.Name)] public class LoggingTests : LogFileTestBase @@ -224,7 +224,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public async Task CaptureLogsForOutOfProcessWhenProcessFailsToStart() { var deploymentParameters = Fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess); - deploymentParameters.TransformArguments((a, _) => $"{a} ConsoleWrite"); + deploymentParameters.TransformArguments((a, _) => $"{a} ConsoleWriteSingle"); var deploymentResult = await DeployAsync(deploymentParameters); var response = await deploymentResult.HttpClient.GetAsync("Test"); diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/MultiApplicationTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/MultiApplicationTests.cs index 87d9c73dd0..50b19b5061 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/MultiApplicationTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/MultiApplicationTests.cs @@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [Collection(PublishedSitesCollection.Name)] public class MultiApplicationTests : IISFunctionalTestBase @@ -47,6 +47,12 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal(200, (int)result1.StatusCode); Assert.Equal(500, (int)result2.StatusCode); StopServer(); + + if (DeployerSelector.HasNewShim) + { + Assert.Contains("500.35 - ANCM Multiple In-Process Applications in same Process", await result2.Content.ReadAsStringAsync()); + } + EventLogHelpers.VerifyEventLogEvent(result, EventLogHelpers.OnlyOneAppPerAppPool(), Logger); } @@ -68,6 +74,12 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal(200, (int)result1.StatusCode); Assert.Equal(500, (int)result2.StatusCode); StopServer(); + + if (DeployerSelector.HasNewShim) + { + Assert.Contains("500.34 - ANCM Mixed Hosting Models Not Supported", await result2.Content.ReadAsStringAsync()); + } + EventLogHelpers.VerifyEventLogEvent(result, "Mixed hosting model is not supported.", Logger); } diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs index 7a0ef3d7b4..060e63370f 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs @@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.OutOfProcess { [Collection(PublishedSitesCollection.Name)] public class AspNetCorePortTests : IISFunctionalTestBase diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs index e4cdcc1c07..a7f0c1b753 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs @@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.OutOfProcess { [Collection(PublishedSitesCollection.Name)] public class GlobalVersionTests : IISFunctionalTestBase @@ -241,7 +241,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests foreach (FileInfo fileInfo in source.GetFiles()) { var destFileName = Path.Combine(target.FullName, fileInfo.Name); - fileInfo.CopyTo(destFileName); + fileInfo.CopyTo(destFileName, overwrite: true); } } diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs index b648c82059..09cc1099e7 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.OutOfProcess { [Collection(PublishedSitesCollection.Name)] public class HelloWorldTests : IISFunctionalTestBase @@ -66,7 +66,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal("null", responseText); - Assert.Equal(deploymentResult.ContentRoot, await deploymentResult.HttpClient.GetStringAsync("/ContentRootPath")); + // Trailing slash + Assert.StartsWith(deploymentResult.ContentRoot, await deploymentResult.HttpClient.GetStringAsync("/ContentRootPath")); Assert.Equal(deploymentResult.ContentRoot + "\\wwwroot", await deploymentResult.HttpClient.GetStringAsync("/WebRootPath")); var expectedDll = "aspnetcorev2.dll"; Assert.Contains(deploymentResult.HostProcess.Modules.OfType(), m => m.FileName.Contains(expectedDll)); diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/PublishedApplicationPublisher.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/PublishedApplicationPublisher.cs index d9aac2dac5..8bf370e640 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/PublishedApplicationPublisher.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/PublishedApplicationPublisher.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { public class PublishedApplicationPublisher: ApplicationPublisher { diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/PublishedSitesFixture.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/PublishedSitesFixture.cs index 097d7e8ccb..2e03292ca4 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/PublishedSitesFixture.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/PublishedSitesFixture.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { /// /// This type just maps collection names to available fixtures @@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public class PublishedSitesFixture : IDisposable { public PublishedApplicationPublisher InProcessTestSite { get; } = new PublishedApplicationPublisher(Helpers.GetInProcessTestSitesName()); - public PublishedApplicationPublisher OutOfProcessTestSite { get; } = new PublishedApplicationPublisher(Helpers.GetOutOfProcessTestSitesName()); + public PublishedApplicationPublisher OutOfProcessTestSite { get; } = new PublishedApplicationPublisher(Helpers.GetInProcessTestSitesName()); public void Dispose() { diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequiresNewHandler.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequiresNewHandler.cs index e768df3bb6..051c995e5a 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequiresNewHandler.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequiresNewHandler.cs @@ -4,7 +4,7 @@ using System; using Microsoft.AspNetCore.Testing.xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] public sealed class RequiresNewHandlerAttribute : Attribute, ITestCondition diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequiresNewShim.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequiresNewShim.cs index 3f9b5cae8b..fa1c2c993f 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequiresNewShim.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequiresNewShim.cs @@ -4,7 +4,7 @@ using System; using Microsoft.AspNetCore.Testing.xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] public sealed class RequiresNewShimAttribute : Attribute, ITestCondition diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ServerAbortTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ServerAbortTests.cs index 1e3603aef4..d4c5a3c615 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ServerAbortTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ServerAbortTests.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [Collection(PublishedSitesCollection.Name)] public class ServerAbortOutOfProcessTests : IISFunctionalTestBase diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs index 649a3984f9..56f99a1784 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs @@ -5,7 +5,7 @@ using System; using System.Security.Principal; using Microsoft.AspNetCore.Testing.xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] public sealed class SkipIfNotAdminAttribute : Attribute, ITestCondition diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/SkipVSTSAttribute.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/SkipVSTSAttribute.cs index 58a9347148..b29b253056 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/SkipVSTSAttribute.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/SkipVSTSAttribute.cs @@ -5,7 +5,7 @@ using System; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] public sealed class SkipInVSTSAttribute : Attribute, ITestCondition diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs index d2a94632c4..0e714414d0 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.Extensions.Logging; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { public class EventLogHelpers { @@ -259,7 +259,15 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static string InProcessFailedToFindRequestHandler(IISDeploymentResult deploymentResult) { - return "Could not find the assembly '(.*)' referenced for the in-process application. Please confirm the Microsoft.AspNetCore.Server.IIS package is referenced in your application."; + if (DeployerSelector.HasNewShim) + { + return "Could not find the assembly '(.*)' referenced for the in-process application. Please confirm the Microsoft.AspNetCore.Server.IIS or Microsoft.AspNetCore.App is referenced in your application."; + + } + else + { + return "Could not find the assembly '(.*)' referenced for the in-process application. Please confirm the Microsoft.AspNetCore.Server.IIS package is referenced in your application."; + } } public static string CouldNotStartStdoutFileRedirection(string file, IISDeploymentResult deploymentResult) diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs index f57aa0ebec..e15863c0fb 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs @@ -4,7 +4,7 @@ using System; using System.IO; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.Extensions.Logging.Testing; using Xunit.Abstractions; diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/Helpers.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/Helpers.cs index 0c299af7b4..a790d38b26 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -16,7 +16,7 @@ using Microsoft.Extensions.Logging; using Newtonsoft.Json; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { public static class Helpers { @@ -28,8 +28,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests return DeployerSelector.IsForwardsCompatibilityTest ? "InProcessForwardsCompatWebSite" : "InProcessWebSite"; } - public static string GetOutOfProcessTestSitesName() => "OutOfProcessWebSite"; - public static async Task AssertStarts(this IISDeploymentResult deploymentResult, string path = "/HelloWorld") { var response = await deploymentResult.HttpClient.GetAsync(path); diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISCapability.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISCapability.cs index 612b61d442..735af7ceef 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISCapability.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISCapability.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [Flags] public enum IISCapability diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs index 2c424943f3..3ba41fdc58 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISCompressionSiteCollection.cs @@ -3,7 +3,7 @@ using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [CollectionDefinition(Name)] public class IISCompressionSiteCollection : ICollectionFixture diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs index 3aff68d11b..c963538913 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISCompressionSiteFixture.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { public class IISCompressionSiteFixture : IISTestSiteFixture { diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs index 79766f68ca..d143d2ad82 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs @@ -5,7 +5,7 @@ using System; using System.IO; using System.Net; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.Extensions.Logging; diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs index 8d53affc98..88f0710e48 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs @@ -3,7 +3,7 @@ using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { /// /// This type just maps collection names to available fixtures diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs index 01d5b2b525..b4fe5ee552 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { public class IISTestSiteFixture : IDisposable { diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs index 774b74eb15..1b376ee366 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/LogFileTestBase.cs @@ -3,7 +3,7 @@ using System; using System.IO; -using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Xunit.Abstractions; diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs index d2749db547..a082a61c92 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs @@ -5,7 +5,7 @@ using System; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] public sealed class RequiresEnvironmentVariableAttribute : Attribute, ITestCondition diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs index 6cdd725392..e88406e88e 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs @@ -5,7 +5,7 @@ using System; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] public sealed class SkipIfDebugAttribute : Attribute, ITestCondition diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs index 5037436499..ec89251779 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [Collection(PublishedSitesCollection.Name)] public class WindowsAuthTests : IISFunctionalTestBase diff --git a/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs b/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs index 807e01389b..1aa826c128 100644 --- a/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs +++ b/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Testing.xunit; using Xunit; using Xunit.Sdk; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [Collection(IISTestSiteCollection.Name)] public class BackwardsCompatibilityTests : FixtureLoggedTest diff --git a/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs b/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs index 18ee47d427..bdbcad2780 100644 --- a/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs +++ b/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/DeployerSelector.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { public static class DeployerSelector { diff --git a/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj index 77024081bb..6b92406b14 100644 --- a/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj @@ -22,9 +22,6 @@ False - - False - diff --git a/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs b/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs index 2addfc912c..c53da1c67f 100644 --- a/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs +++ b/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/DeployerSelector.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { public static class DeployerSelector { diff --git a/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs b/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs index 02b247ac4b..fdb3aef561 100644 --- a/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs +++ b/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Testing.xunit; using Xunit; using Xunit.Sdk; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [Collection(IISTestSiteCollection.Name)] public class ForwardsCompatibilityTests : FixtureLoggedTest diff --git a/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj index edd20b3aa9..e8e19b55af 100644 --- a/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj @@ -16,9 +16,6 @@ False - - False - diff --git a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/DeployerSelector.cs b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/DeployerSelector.cs index 1451a0c34c..6f15410e55 100644 --- a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/DeployerSelector.cs +++ b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/DeployerSelector.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { public static class DeployerSelector { diff --git a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj index 4cc4457514..f95e32bb3e 100644 --- a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj @@ -18,9 +18,6 @@ False - - False - diff --git a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/ApplicationInitializationTests.cs b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/ApplicationInitializationTests.cs index 12b853799d..33abf9e22e 100644 --- a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/ApplicationInitializationTests.cs +++ b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/ApplicationInitializationTests.cs @@ -7,14 +7,14 @@ using System.ServiceProcess; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; -using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace IIS.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [Collection(PublishedSitesCollection.Name)] public class ApplicationInitializationTests : IISFunctionalTestBase diff --git a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs index a8a47e7c68..1d59259189 100644 --- a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs +++ b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs @@ -1,18 +1,15 @@ // 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.IO; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; -using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; -using Newtonsoft.Json; using Xunit; -namespace IIS.FunctionalTests.Inprocess +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [Collection(PublishedSitesCollection.Name)] public class StdOutRedirectionTests : LogFileTestBase diff --git a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/MofFileTests.cs b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/MofFileTests.cs deleted file mode 100644 index df0e867854..0000000000 --- a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/MofFileTests.cs +++ /dev/null @@ -1,31 +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.Diagnostics; -using System.IO; -using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; -using Microsoft.AspNetCore.Testing; -using Microsoft.AspNetCore.Testing.xunit; -using Xunit; - -namespace IIS.FunctionalTests -{ - public class MofFileTests - { - [ConditionalFact] - [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - [RequiresIIS(IISCapability.TracingModule)] - [SkipOnHelix("https://github.com/aspnet/AspNetCore-Internal/issues/2222")] - public void CheckMofFile() - { -// This test code needs to be updated to support distributed testing. -// See https://github.com/aspnet/AspNetCore-Internal/issues/2222 -#pragma warning disable 0618 - var path = Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"), "aspnetcoremodulev2", "aspnetcore", "ancm.mof"); -#pragma warning restore 0618 - var process = Process.Start("mofcomp.exe", path); - process.WaitForExit(); - Assert.Equal(0, process.ExitCode); - } - } -} diff --git a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs index b26f48a815..863fe8564c 100644 --- a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs +++ b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/Properties/AssemblyInfo.cs @@ -1,7 +1,7 @@ // 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 Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests; using Microsoft.Extensions.Logging.Testing; using Xunit; diff --git a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs index 4f00a17531..395ddc3a37 100644 --- a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs +++ b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs @@ -10,7 +10,7 @@ using System.Xml.Linq; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Win32; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] public sealed class RequiresIISAttribute : Attribute, ITestCondition diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/ClientDisconnectTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/ClientDisconnectTests.cs index 16586947a1..a1dbc0f28e 100644 --- a/src/Servers/IIS/IIS/test/IIS.Tests/ClientDisconnectTests.cs +++ b/src/Servers/IIS/IIS/test/IIS.Tests/ClientDisconnectTests.cs @@ -13,7 +13,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [SkipIfHostableWebCoreNotAvailable] [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")] diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/ConnectionIdFeatureTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/ConnectionIdFeatureTests.cs index 27688b5e58..74773e1067 100644 --- a/src/Servers/IIS/IIS/test/IIS.Tests/ConnectionIdFeatureTests.cs +++ b/src/Servers/IIS/IIS/test/IIS.Tests/ConnectionIdFeatureTests.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [SkipIfHostableWebCoreNotAvailable] [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")] diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/HttpBodyControlFeatureTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/HttpBodyControlFeatureTests.cs index 8ac359a21b..68f357be0f 100644 --- a/src/Servers/IIS/IIS/test/IIS.Tests/HttpBodyControlFeatureTests.cs +++ b/src/Servers/IIS/IIS/test/IIS.Tests/HttpBodyControlFeatureTests.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [SkipIfHostableWebCoreNotAvailable] [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")] diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/MaxRequestBodySizeTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/MaxRequestBodySizeTests.cs index f70d47e198..1b34f9a371 100644 --- a/src/Servers/IIS/IIS/test/IIS.Tests/MaxRequestBodySizeTests.cs +++ b/src/Servers/IIS/IIS/test/IIS.Tests/MaxRequestBodySizeTests.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.IIS; -using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging.Testing; using Xunit; diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/ResponseAbortTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/ResponseAbortTests.cs index 3cbdc2c219..e467dd1c6c 100644 --- a/src/Servers/IIS/IIS/test/IIS.Tests/ResponseAbortTests.cs +++ b/src/Servers/IIS/IIS/test/IIS.Tests/ResponseAbortTests.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [SkipIfHostableWebCoreNotAvailable] [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")] diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/StrictTestServerTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/StrictTestServerTests.cs index c8f62beedb..e1564b8cfe 100644 --- a/src/Servers/IIS/IIS/test/IIS.Tests/StrictTestServerTests.cs +++ b/src/Servers/IIS/IIS/test/IIS.Tests/StrictTestServerTests.cs @@ -6,7 +6,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { public class StrictTestServerTests: LoggedTest { diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/TestServerTest.cs b/src/Servers/IIS/IIS/test/IIS.Tests/TestServerTest.cs index 40b538ea52..37254c7248 100644 --- a/src/Servers/IIS/IIS/test/IIS.Tests/TestServerTest.cs +++ b/src/Servers/IIS/IIS/test/IIS.Tests/TestServerTest.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging.Testing; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [SkipIfHostableWebCoreNotAvailable] [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, "https://github.com/aspnet/IISIntegration/issues/866")] diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs b/src/Servers/IIS/IIS/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs index b63743f106..2f2e694167 100644 --- a/src/Servers/IIS/IIS/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs +++ b/src/Servers/IIS/IIS/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs @@ -5,7 +5,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Testing.xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] public sealed class SkipIfHostableWebCoreNotAvailableAttribute : Attribute, ITestCondition diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/Utilities/TestServer.cs b/src/Servers/IIS/IIS/test/IIS.Tests/Utilities/TestServer.cs index ebd99721d1..d688fd7413 100644 --- a/src/Servers/IIS/IIS/test/IIS.Tests/Utilities/TestServer.cs +++ b/src/Servers/IIS/IIS/test/IIS.Tests/Utilities/TestServer.cs @@ -21,7 +21,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { public class TestServer: IDisposable, IStartup { diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/DeployerSelector.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/DeployerSelector.cs index f91b27009f..4150eea6bc 100644 --- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/DeployerSelector.cs +++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/DeployerSelector.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { public static class DeployerSelector { diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj index 97fb951acb..1ddfecfad5 100644 --- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj @@ -19,9 +19,6 @@ False - - False - diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/AppOfflineIISExpressTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/AppOfflineIISExpressTests.cs index 5b7af505cd..9c8d065ee0 100644 --- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/AppOfflineIISExpressTests.cs +++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/AppOfflineIISExpressTests.cs @@ -3,12 +3,12 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; -using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace IISExpress.FunctionalTests.Inprocess +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess { [Collection(PublishedSitesCollection.Name)] public class AppOfflineIISExpressTests : IISFunctionalTestBase diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs index 95fed4d462..ac6e702fca 100644 --- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs +++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess { [Collection(PublishedSitesCollection.Name)] public class AuthenticationTests : IISFunctionalTestBase diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/IISExpressShutdownTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/IISExpressShutdownTests.cs index 912aecf293..0aa5b2fedf 100644 --- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/IISExpressShutdownTests.cs +++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/IISExpressShutdownTests.cs @@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [Collection(PublishedSitesCollection.Name)] public class IISExpressShutdownTests : IISFunctionalTestBase diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs index 826001c96d..f69b205b3d 100644 --- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs +++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [Collection(IISTestSiteCollection.Name)] [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, SkipReason = "No supported on this platform")] diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs index 9b9a7e8dba..471096e166 100644 --- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs +++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [Collection(PublishedSitesCollection.Name)] public class MultipleAppTests : IISFunctionalTestBase diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs index 65a10d1521..e3d04768ef 100644 --- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs +++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Testing.xunit; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [Collection(PublishedSitesCollection.Name)] public class NtlmAuthenticationTests : IISFunctionalTestBase diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs index b26f48a815..863fe8564c 100644 --- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs +++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/Properties/AssemblyInfo.cs @@ -1,7 +1,7 @@ // 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 Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests; +using Microsoft.AspNetCore.Server.IIS.FunctionalTests; using Microsoft.Extensions.Logging.Testing; using Xunit; diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs index 2e0a68b9f7..958e86dd11 100644 --- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs +++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs @@ -5,7 +5,7 @@ using System; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] public sealed class RequiresIISAttribute : Attribute, ITestCondition diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs index 7c036c1815..9a1d0208bc 100644 --- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs +++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests +namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests { [Collection(PublishedSitesCollection.Name)] public class UpgradeFeatureDetectionTests : IISFunctionalTestBase diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessForwardsCompatWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessForwardsCompatWebSite.csproj index 2ac833a487..341df1f26b 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessForwardsCompatWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessForwardsCompatWebSite.csproj @@ -12,20 +12,16 @@ - + - - - - @@ -34,8 +30,10 @@ - + + + diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj index 3faf04f7e4..8c80a84b62 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj @@ -10,7 +10,6 @@ - @@ -22,6 +21,8 @@ + + diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Program.cs b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Program.cs index db543f266f..4b9889a141 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Program.cs +++ b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Program.cs @@ -85,6 +85,13 @@ namespace TestSite Console.BackgroundColor = ConsoleColor.Blue; Console.WriteLine("彡⾔"); break; + case "ConsoleWriteSingle": + Console.WriteLine("Wow!"); + return 0; + case "ConsoleWrite30Kb": + // Write over 30kb to make sure logs are truncated. + Console.WriteLine(new string('a', 40000)); + return 0; case "OverriddenServer": { var host = new WebHostBuilder() @@ -172,7 +179,9 @@ namespace TestSite factory.AddConsole(); factory.AddFilter("Console", level => level >= LogLevel.Information); }) + .UseKestrel() .UseIIS() + .UseIISIntegration() .UseStartup() .Build(); diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs index 110ac5e625..1825ac7a1d 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs +++ b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs @@ -2,9 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Diagnostics; using System.IO; using System.Linq; using System.Net; +using System.Runtime.InteropServices; +using System.Security.Principal; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -12,10 +15,13 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.Server; +using Microsoft.AspNetCore.Hosting.Server.Features; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.IISIntegration.FunctionalTests; using Microsoft.AspNetCore.Server.IIS; +using Microsoft.AspNetCore.Server.IISIntegration; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Primitives; @@ -29,6 +35,132 @@ namespace TestSite { TestStartup.Register(app, this); } + + public void ConfigureServices(IServiceCollection serviceCollection) + { + serviceCollection.AddResponseCompression(); + } + + private async Task ContentRootPath(HttpContext ctx) => await ctx.Response.WriteAsync(ctx.RequestServices.GetService().ContentRootPath); + + private async Task WebRootPath(HttpContext ctx) => await ctx.Response.WriteAsync(ctx.RequestServices.GetService().WebRootPath); + + private async Task CurrentDirectory(HttpContext ctx) => await ctx.Response.WriteAsync(Environment.CurrentDirectory); + + private async Task BaseDirectory(HttpContext ctx) => await ctx.Response.WriteAsync(AppContext.BaseDirectory); + + private async Task ASPNETCORE_IIS_PHYSICAL_PATH(HttpContext ctx) => await ctx.Response.WriteAsync(Environment.GetEnvironmentVariable("ASPNETCORE_IIS_PHYSICAL_PATH")); + + private async Task ServerAddresses(HttpContext ctx) + { + var serverAddresses = ctx.RequestServices.GetService().Features.Get(); + await ctx.Response.WriteAsync(string.Join(",", serverAddresses.Addresses)); + } + + private async Task ConsoleWrite(HttpContext ctx) + { + Console.WriteLine("TEST MESSAGE"); + + await ctx.Response.WriteAsync("Hello World"); + } + + private async Task ConsoleErrorWrite(HttpContext ctx) + { + Console.Error.WriteLine("TEST MESSAGE"); + + await ctx.Response.WriteAsync("Hello World"); + } + + public async Task Auth(HttpContext ctx) + { + var authProvider = ctx.RequestServices.GetService(); + var authScheme = (await authProvider.GetAllSchemesAsync()).SingleOrDefault(); + + await ctx.Response.WriteAsync(authScheme?.Name ?? "null"); + if (ctx.User.Identity.Name != null) + { + await ctx.Response.WriteAsync(":" + ctx.User.Identity.Name); + } + } + + public async Task GetClientCert(HttpContext context) + { + var clientCert = context.Connection.ClientCertificate; + await context.Response.WriteAsync(clientCert != null ? $"Enabled;{clientCert.GetCertHashString()}" : "Disabled"); + } + + private static int _waitingRequestCount; + + public Task WaitForAbort(HttpContext context) + { + Interlocked.Increment(ref _waitingRequestCount); + try + { + context.RequestAborted.WaitHandle.WaitOne(); + return Task.CompletedTask; + } + finally + { + Interlocked.Decrement(ref _waitingRequestCount); + } + } + + public Task Abort(HttpContext context) + { + context.Abort(); + return Task.CompletedTask; + } + + public async Task WaitingRequestCount(HttpContext context) + { + await context.Response.WriteAsync(_waitingRequestCount.ToString()); + } + + public Task CreateFile(HttpContext context) + { + var hostingEnv = context.RequestServices.GetService(); + + if (context.Connection.LocalIpAddress == null || context.Connection.RemoteIpAddress == null) + { + throw new Exception("Failed to set local and remote ip addresses"); + } + + File.WriteAllText(System.IO.Path.Combine(hostingEnv.ContentRootPath, "Started.txt"), ""); + return Task.CompletedTask; + } + + public Task OverrideServer(HttpContext context) + { + context.Response.Headers["Server"] = "MyServer/7.8"; + return Task.CompletedTask; + } + + public void CompressedData(IApplicationBuilder builder) + { + builder.UseResponseCompression(); + // write random bytes to check that compressed data is passed through + builder.Run( + async context => + { + context.Response.ContentType = "text/html"; + await context.Response.Body.WriteAsync(new byte[100], 0, 100); + }); + } + + [DllImport("kernel32.dll")] + static extern uint GetDllDirectory(uint nBufferLength, [Out] StringBuilder lpBuffer); + + private async Task DllDirectory(HttpContext context) + { + var builder = new StringBuilder(1024); + GetDllDirectory(1024, builder); + await context.Response.WriteAsync(builder.ToString()); + } + + private async Task GetEnvironmentVariable(HttpContext ctx) + { + await ctx.Response.WriteAsync(Environment.GetEnvironmentVariable(ctx.Request.Query["name"].ToString())); + } private async Task ServerVariable(HttpContext ctx) { @@ -447,18 +579,6 @@ namespace TestSite await ctx.Request.Body.CopyToAsync(ctx.Response.Body); } - private async Task UpgradeFeatureDetection(HttpContext ctx) - { - if (ctx.Features.Get() != null) - { - await ctx.Response.WriteAsync("Enabled"); - } - else - { - await ctx.Response.WriteAsync("Disabled"); - } - } - private async Task TestReadOffsetWorks(HttpContext ctx) { var buffer = new byte[11]; @@ -645,7 +765,7 @@ namespace TestSite private async Task LargeResponseFile(HttpContext ctx) { - var tempFile = Path.GetTempFileName(); + var tempFile = System.IO.Path.GetTempFileName(); var fileContent = new string('a', 200000); var fileStream = File.OpenWrite(tempFile); @@ -696,6 +816,29 @@ namespace TestSite await server.StopAsync(cts.Token); } + private async Task StackSize(HttpContext ctx) + { + // This would normally stackoverflow if we didn't increase the stack size per thread. + RecursiveFunction(10000); + await ctx.Response.WriteAsync("Hello World"); + } + + private async Task StackSizeLarge(HttpContext ctx) + { + // This would normally stackoverflow if we didn't increase the stack size per thread. + RecursiveFunction(30000); + await ctx.Response.WriteAsync("Hello World"); + } + + private void RecursiveFunction(int i) + { + if (i == 0) + { + return; + } + RecursiveFunction(i - 1); + } + private async Task GetServerVariableStress(HttpContext ctx) { // This test simulates the scenario where native Flush call is being @@ -719,5 +862,73 @@ namespace TestSite public Task HttpsHelloWorld(HttpContext ctx) => ctx.Response.WriteAsync("Scheme:" + ctx.Request.Scheme + "; Original:" + ctx.Request.Headers["x-original-proto"]); + + public Task Path(HttpContext ctx) => ctx.Response.WriteAsync(ctx.Request.Path.Value); + + public Task Query(HttpContext ctx) => ctx.Response.WriteAsync(ctx.Request.QueryString.Value); + + public Task BodyLimit(HttpContext ctx) => ctx.Response.WriteAsync(ctx.Features.Get()?.MaxRequestBodySize?.ToString() ?? "null"); + + public Task Anonymous(HttpContext context) => context.Response.WriteAsync("Anonymous?" + !context.User.Identity.IsAuthenticated); + + public Task Restricted(HttpContext context) + { + if (context.User.Identity.IsAuthenticated) + { + Assert.IsType(context.User); + return context.Response.WriteAsync(context.User.Identity.AuthenticationType); + } + else + { + return context.ChallengeAsync(IISDefaults.AuthenticationScheme); + } + } + + public Task Forbidden(HttpContext context) => context.ForbidAsync(IISDefaults.AuthenticationScheme); + + public Task RestrictedNTLM(HttpContext context) + { + if (string.Equals("NTLM", context.User.Identity.AuthenticationType, StringComparison.Ordinal)) + { + return context.Response.WriteAsync("NTLM"); + } + else + { + return context.ChallengeAsync(IISDefaults.AuthenticationScheme); + } + } + + public Task UpgradeFeatureDetection(HttpContext context) => + context.Response.WriteAsync(context.Features.Get() != null? "Enabled": "Disabled"); + + public Task CheckRequestHandlerVersion(HttpContext context) + { + // We need to check if the aspnetcorev2_outofprocess dll is loaded by iisexpress.exe + // As they aren't in the same process, we will try to delete the file and expect a file + // in use error + try + { + File.Delete(context.Request.Headers["ANCMRHPath"]); + } + catch(UnauthorizedAccessException) + { + // TODO calling delete on the file will succeed when running with IIS + return context.Response.WriteAsync("Hello World"); + } + + return context.Response.WriteAsync(context.Request.Headers["ANCMRHPath"]); + } + + private async Task ProcessId(HttpContext context) + { + await context.Response.WriteAsync(Process.GetCurrentProcess().Id.ToString()); + } + + public async Task HTTPS_PORT(HttpContext context) + { + var httpsPort = context.RequestServices.GetService().GetValue("HTTPS_PORT"); + + await context.Response.WriteAsync(httpsPort.HasValue ? httpsPort.Value.ToString() : "NOVALUE"); + } } } diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/web.config b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/web.config index 352ab4021b..00012eeb29 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/web.config +++ b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/web.config @@ -4,7 +4,7 @@ - + diff --git a/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj deleted file mode 100644 index da8ee2740e..0000000000 --- a/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - netcoreapp3.0 - OutOfProcess - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/Program.cs b/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/Program.cs deleted file mode 100644 index b626839f62..0000000000 --- a/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/Program.cs +++ /dev/null @@ -1,55 +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.Diagnostics; -using System.IO; -using System.Linq; -using System.Threading; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Logging; - -namespace TestSite -{ - public static class Program - { - public static int Main(string[] args) - { - var mode = args.FirstOrDefault(); - - switch (mode) - { - case "CreateFile": - File.WriteAllText(args[1], ""); - return StartServer(); - case "ConsoleWrite": - Console.WriteLine("Wow!"); - return 0; - case "ConsoleWrite30Kb": - // Write over 30kb to make sure logs are truncated. - Console.WriteLine(new string('a', 40000)); - return 0; - } - - return StartServer(); - } - - private static int StartServer() - { - var host = new WebHostBuilder() - .ConfigureLogging( - (_, factory) => { - factory.AddConsole(); - factory.AddFilter("Console", level => level >= LogLevel.Information); - }) - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() - .UseStartup() - .UseKestrel() - .Build(); - - host.Run(); - return 0; - } - } -} diff --git a/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/Startup.cs b/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/Startup.cs deleted file mode 100644 index 394f248eb4..0000000000 --- a/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/Startup.cs +++ /dev/null @@ -1,101 +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.Diagnostics; -using System.IO; -using System.Security.Principal; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.IISIntegration.FunctionalTests; -using Microsoft.AspNetCore.Server.IISIntegration; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Xunit; - -namespace TestSite -{ - public partial class Startup - { - public void Configure(IApplicationBuilder app) - { - TestStartup.Register(app, this); - } - - public Task Path(HttpContext ctx) => ctx.Response.WriteAsync(ctx.Request.Path.Value); - - public Task Query(HttpContext ctx) => ctx.Response.WriteAsync(ctx.Request.QueryString.Value); - - public Task BodyLimit(HttpContext ctx) => ctx.Response.WriteAsync(ctx.Features.Get()?.MaxRequestBodySize?.ToString() ?? "null"); - - public Task HelloWorld(HttpContext ctx) => ctx.Response.WriteAsync("Hello World"); - - public Task HttpsHelloWorld(HttpContext ctx) => - ctx.Response.WriteAsync("Scheme:" + ctx.Request.Scheme + "; Original:" + ctx.Request.Headers["x-original-proto"]); - - public Task Anonymous(HttpContext context) => context.Response.WriteAsync("Anonymous?" + !context.User.Identity.IsAuthenticated); - - public Task Restricted(HttpContext context) - { - if (context.User.Identity.IsAuthenticated) - { - Assert.IsType(context.User); - return context.Response.WriteAsync(context.User.Identity.AuthenticationType); - } - else - { - return context.ChallengeAsync(IISDefaults.AuthenticationScheme); - } - } - - public Task Forbidden(HttpContext context) => context.ForbidAsync(IISDefaults.AuthenticationScheme); - - public Task RestrictedNTLM(HttpContext context) - { - if (string.Equals("NTLM", context.User.Identity.AuthenticationType, StringComparison.Ordinal)) - { - return context.Response.WriteAsync("NTLM"); - } - else - { - return context.ChallengeAsync(IISDefaults.AuthenticationScheme); - } - } - - public Task UpgradeFeatureDetection(HttpContext context) => - context.Response.WriteAsync(context.Features.Get() != null? "Enabled": "Disabled"); - - public Task CheckRequestHandlerVersion(HttpContext context) - { - // We need to check if the aspnetcorev2_outofprocess dll is loaded by iisexpress.exe - // As they aren't in the same process, we will try to delete the file and expect a file - // in use error - try - { - File.Delete(context.Request.Headers["ANCMRHPath"]); - } - catch(UnauthorizedAccessException) - { - // TODO calling delete on the file will succeed when running with IIS - return context.Response.WriteAsync("Hello World"); - } - - return context.Response.WriteAsync(context.Request.Headers["ANCMRHPath"]); - } - - private async Task ProcessId(HttpContext context) - { - await context.Response.WriteAsync(Process.GetCurrentProcess().Id.ToString()); - } - - public async Task HTTPS_PORT(HttpContext context) - { - var httpsPort = context.RequestServices.GetService().GetValue("HTTPS_PORT"); - - await context.Response.WriteAsync(httpsPort.HasValue ? httpsPort.Value.ToString() : "NOVALUE"); - } - } -} diff --git a/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/wwwroot/static.txt b/src/Servers/IIS/IIS/test/testassets/OutOfProcessWebSite/wwwroot/static.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/Servers/IIS/IIS/test/testassets/StressTestWebSite/Program.cs b/src/Servers/IIS/IIS/test/testassets/StressTestWebSite/Program.cs deleted file mode 100644 index e8e5392c2c..0000000000 --- a/src/Servers/IIS/IIS/test/testassets/StressTestWebSite/Program.cs +++ /dev/null @@ -1,26 +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 Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Logging; - -namespace ANCMStressTestApp -{ - public class Program - { - public static void Main(string[] args) - { - var host = new WebHostBuilder() - .ConfigureLogging((_, factory) => - { - factory.AddConsole(); - }) - .UseKestrel() - .UseIISIntegration() - .UseStartup() - .Build(); - - host.Run(); - } - } -} diff --git a/src/Servers/IIS/IIS/test/testassets/StressTestWebSite/Startup.cs b/src/Servers/IIS/IIS/test/testassets/StressTestWebSite/Startup.cs deleted file mode 100644 index 3045906c5f..0000000000 --- a/src/Servers/IIS/IIS/test/testassets/StressTestWebSite/Startup.cs +++ /dev/null @@ -1,233 +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.IO; -using System.Linq; -using System.Threading.Tasks; -using System.Threading; -using System.Text; -using System.Net.WebSockets; -using Microsoft.AspNetCore.Server.IIS.FunctionalTests; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Features; -using Microsoft.Net.Http.Headers; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Primitives; -using Microsoft.Extensions.Hosting; - -namespace ANCMStressTestApp -{ - public class Startup - { - // This method gets called by the runtime. Use this method to add services to the container. - // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 - public void ConfigureServices(IServiceCollection services) - { - } - - public void Configure(IApplicationBuilder app) - { - app.Map("/HelloWorld", HelloWorld); - app.Map("/ConnectionClose", ConnectionClose); - app.Map("/EchoPostData", EchoPostData); - app.Map("/LargeResponseBody", LargeResponseBody); - app.Map("/ResponseHeaders", ResponseHeaders); - app.Map("/EnvironmentVariables", EnvironmentVariables); - app.Map("/RequestInformation", RequestInformation); - app.Map("/WebSocket", WebSockets); - - app.Run(async context => - { - await context.Response.WriteAsync("Default Page"); - }); - } - - private void HelloWorld(IApplicationBuilder app) - { - app.Run(async context => - { - await context.Response.WriteAsync("Hello World"); - }); - } - - private void ConnectionClose(IApplicationBuilder app) - { - app.Run(async context => - { - context.Response.Headers[HeaderNames.Connection] = "close"; - await context.Response.WriteAsync("Connnection Close"); - await context.Response.Body.FlushAsync(); - }); - } - - private void EchoPostData(IApplicationBuilder app) - { - app.Run(async context => - { - string responseBody = string.Empty; - - if (string.Equals(context.Request.Method, "POST", StringComparison.OrdinalIgnoreCase)) - { - using (StreamReader reader = new StreamReader(context.Request.Body, Encoding.UTF8)) - { - responseBody = await reader.ReadToEndAsync(); - } - } - else - { - responseBody = "NoAction"; - } - - await context.Response.WriteAsync(responseBody); - }); - } - - private void LargeResponseBody(IApplicationBuilder app) - { - app.Run(async context => - { - if (int.TryParse(context.Request.Query["length"], out var length)) - { - await context.Response.WriteAsync(new string('a', length)); - } - }); - } - - private void ResponseHeaders(IApplicationBuilder app) - { - app.Run(async context => - { - context.Response.Headers["UnknownHeader"] = "test123=foo"; - context.Response.ContentType = "text/plain"; - context.Response.Headers["MultiHeader"] = new StringValues(new string[] { "1", "2" }); - await context.Response.WriteAsync("Request Complete"); - }); - } - - private void EnvironmentVariables(IApplicationBuilder app) - { - app.Run(async context => - { - context.Response.ContentType = "text/plain"; - await context.Response.WriteAsync("Environment Variables:" + Environment.NewLine); - var vars = Environment.GetEnvironmentVariables(); - foreach (var key in vars.Keys.Cast().OrderBy(key => key, StringComparer.OrdinalIgnoreCase)) - { - var value = vars[key]; - await context.Response.WriteAsync(key + ": " + value + Environment.NewLine); - } - await context.Response.WriteAsync(Environment.NewLine); - }); - } - - private void RequestInformation(IApplicationBuilder app) - { - app.Run(async context => - { - context.Response.ContentType = "text/plain"; - - await context.Response.WriteAsync("Address:" + Environment.NewLine); - await context.Response.WriteAsync("Scheme: " + context.Request.Scheme + Environment.NewLine); - await context.Response.WriteAsync("Host: " + context.Request.Headers["Host"] + Environment.NewLine); - await context.Response.WriteAsync("PathBase: " + context.Request.PathBase.Value + Environment.NewLine); - await context.Response.WriteAsync("Path: " + context.Request.Path.Value + Environment.NewLine); - await context.Response.WriteAsync("Query: " + context.Request.QueryString.Value + Environment.NewLine); - await context.Response.WriteAsync(Environment.NewLine); - - await context.Response.WriteAsync("Connection:" + Environment.NewLine); - await context.Response.WriteAsync("RemoteIp: " + context.Connection.RemoteIpAddress + Environment.NewLine); - await context.Response.WriteAsync("RemotePort: " + context.Connection.RemotePort + Environment.NewLine); - await context.Response.WriteAsync("LocalIp: " + context.Connection.LocalIpAddress + Environment.NewLine); - await context.Response.WriteAsync("LocalPort: " + context.Connection.LocalPort + Environment.NewLine); - await context.Response.WriteAsync(Environment.NewLine); - - await context.Response.WriteAsync("Headers:" + Environment.NewLine); - foreach (var header in context.Request.Headers) - { - await context.Response.WriteAsync(header.Key + ": " + header.Value + Environment.NewLine); - } - await context.Response.WriteAsync(Environment.NewLine); - }); - } - - private void WebSockets(IApplicationBuilder app) - { - app.Run(async context => - { - var upgradeFeature = context.Features.Get(); - - // Generate WebSocket response headers - string key = context.Request.Headers[Constants.Headers.SecWebSocketKey].ToString(); - var responseHeaders = HandshakeHelpers.GenerateResponseHeaders(key); - foreach (var headerPair in responseHeaders) - { - context.Response.Headers[headerPair.Key] = headerPair.Value; - } - - // Upgrade the connection - Stream opaqueTransport = await upgradeFeature.UpgradeAsync(); - - // Get the WebSocket object - var ws = WebSocket.CreateFromStream(opaqueTransport, isServer: true, subProtocol: null, keepAliveInterval: TimeSpan.FromMinutes(2)); - - var appLifetime = app.ApplicationServices.GetRequiredService(); - - await Echo(ws, appLifetime.ApplicationStopping); - }); - } - - private async Task Echo(WebSocket webSocket, CancellationToken token) - { - try - { - var buffer = new byte[1024 * 4]; - var result = await webSocket.ReceiveAsync(new ArraySegment(buffer), token); - bool closeFromServer = false; - string closeFromServerCmd = "CloseFromServer"; - int closeFromServerLength = closeFromServerCmd.Length; - - while (!result.CloseStatus.HasValue && !token.IsCancellationRequested && !closeFromServer) - { - if (result.Count == closeFromServerLength && - Encoding.ASCII.GetString(buffer).Substring(0, result.Count) == closeFromServerCmd) - { - // The client sent "CloseFromServer" text message to request the server to close (a test scenario). - closeFromServer = true; - } - else - { - await webSocket.SendAsync(new ArraySegment(buffer, 0, result.Count), result.MessageType, result.EndOfMessage, token); - result = await webSocket.ReceiveAsync(new ArraySegment(buffer), token); - } - } - - if (result.CloseStatus.HasValue) - { - // Client-initiated close handshake - await webSocket.CloseAsync(result.CloseStatus.Value, result.CloseStatusDescription, CancellationToken.None); - } - else - { - // Server-initiated close handshake due to either of the two conditions: - // (1) The applicaton host is performing a graceful shutdown. - // (2) The client sent "CloseFromServer" text message to request the server to close (a test scenario). - await webSocket.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, closeFromServerCmd, CancellationToken.None); - - // The server has sent the Close frame. - // Stop sending but keep receiving until we get the Close frame from the client. - while (!result.CloseStatus.HasValue) - { - result = await webSocket.ReceiveAsync(new ArraySegment(buffer), CancellationToken.None); - } - } - } - catch (Exception e) - { - Console.WriteLine("{0} Exception caught!", e); - } - } - } -} diff --git a/src/Servers/IIS/IIS/test/testassets/StressTestWebSite/StressTestWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/StressTestWebSite/StressTestWebSite.csproj deleted file mode 100644 index bc3b3de218..0000000000 --- a/src/Servers/IIS/IIS/test/testassets/StressTestWebSite/StressTestWebSite.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - netcoreapp3.0 - true - - - - - - - - - - - - - - - - - diff --git a/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj b/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj index 77237de91f..6d17b83b83 100644 --- a/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj +++ b/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj @@ -3,7 +3,7 @@ Exe netcoreapp3.0 - win-x64;win-x86;linux-x64;osx-x64 + win-x64;linux-x64;osx-x64 diff --git a/src/Servers/IIS/IIS/test/testassets/shared/SharedStartup/Startup.shared.cs b/src/Servers/IIS/IIS/test/testassets/shared/SharedStartup/Startup.shared.cs index 63afe25ac9..fa38d21a09 100644 --- a/src/Servers/IIS/IIS/test/testassets/shared/SharedStartup/Startup.shared.cs +++ b/src/Servers/IIS/IIS/test/testassets/shared/SharedStartup/Startup.shared.cs @@ -22,130 +22,6 @@ namespace TestSite { public partial class Startup { - public void ConfigureServices(IServiceCollection serviceCollection) - { - serviceCollection.AddResponseCompression(); - } - private async Task ContentRootPath(HttpContext ctx) => await ctx.Response.WriteAsync(ctx.RequestServices.GetService().ContentRootPath); - - private async Task WebRootPath(HttpContext ctx) => await ctx.Response.WriteAsync(ctx.RequestServices.GetService().WebRootPath); - - private async Task CurrentDirectory(HttpContext ctx) => await ctx.Response.WriteAsync(Environment.CurrentDirectory); - - private async Task BaseDirectory(HttpContext ctx) => await ctx.Response.WriteAsync(AppContext.BaseDirectory); - - private async Task ASPNETCORE_IIS_PHYSICAL_PATH(HttpContext ctx) => await ctx.Response.WriteAsync(Environment.GetEnvironmentVariable("ASPNETCORE_IIS_PHYSICAL_PATH")); - - private async Task ServerAddresses(HttpContext ctx) - { - var serverAddresses = ctx.RequestServices.GetService().Features.Get(); - await ctx.Response.WriteAsync(string.Join(",", serverAddresses.Addresses)); - } - - private async Task ConsoleWrite(HttpContext ctx) - { - Console.WriteLine("TEST MESSAGE"); - - await ctx.Response.WriteAsync("Hello World"); - } - - private async Task ConsoleErrorWrite(HttpContext ctx) - { - Console.Error.WriteLine("TEST MESSAGE"); - - await ctx.Response.WriteAsync("Hello World"); - } - - public async Task Auth(HttpContext ctx) - { - var authProvider = ctx.RequestServices.GetService(); - var authScheme = (await authProvider.GetAllSchemesAsync()).SingleOrDefault(); - - await ctx.Response.WriteAsync(authScheme?.Name ?? "null"); - if (ctx.User.Identity.Name != null) - { - await ctx.Response.WriteAsync(":" + ctx.User.Identity.Name); - } - } - - public async Task GetClientCert(HttpContext context) - { - var clientCert = context.Connection.ClientCertificate; - await context.Response.WriteAsync(clientCert != null ? $"Enabled;{clientCert.GetCertHashString()}" : "Disabled"); - } - - private static int _waitingRequestCount; - - public Task WaitForAbort(HttpContext context) - { - Interlocked.Increment(ref _waitingRequestCount); - try - { - context.RequestAborted.WaitHandle.WaitOne(); - return Task.CompletedTask; - } - finally - { - Interlocked.Decrement(ref _waitingRequestCount); - } - } - - public Task Abort(HttpContext context) - { - context.Abort(); - return Task.CompletedTask; - } - - public async Task WaitingRequestCount(HttpContext context) - { - await context.Response.WriteAsync(_waitingRequestCount.ToString()); - } - - public Task CreateFile(HttpContext context) - { - var hostingEnv = context.RequestServices.GetService(); - - if (context.Connection.LocalIpAddress == null || context.Connection.RemoteIpAddress == null) - { - throw new Exception("Failed to set local and remote ip addresses"); - } - - File.WriteAllText(System.IO.Path.Combine(hostingEnv.ContentRootPath, "Started.txt"), ""); - return Task.CompletedTask; - } - - public Task OverrideServer(HttpContext context) - { - context.Response.Headers["Server"] = "MyServer/7.8"; - return Task.CompletedTask; - } - - public void CompressedData(IApplicationBuilder builder) - { - builder.UseResponseCompression(); - // write random bytes to check that compressed data is passed through - builder.Run( - async context => - { - context.Response.ContentType = "text/html"; - await context.Response.Body.WriteAsync(new byte[100], 0, 100); - }); - } - - [DllImport("kernel32.dll")] - static extern uint GetDllDirectory(uint nBufferLength, [Out] StringBuilder lpBuffer); - - private async Task DllDirectory(HttpContext context) - { - var builder = new StringBuilder(1024); - GetDllDirectory(1024, builder); - await context.Response.WriteAsync(builder.ToString()); - } - - private async Task GetEnvironmentVariable(HttpContext ctx) - { - await ctx.Response.WriteAsync(Environment.GetEnvironmentVariable(ctx.Request.Query["name"].ToString())); - } } } diff --git a/src/Servers/IIS/IISIntegration.sln b/src/Servers/IIS/IISIntegration.sln index b108c88420..1e41537e31 100644 --- a/src/Servers/IIS/IISIntegration.sln +++ b/src/Servers/IIS/IISIntegration.sln @@ -71,10 +71,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestTasks", "IIS\test\testa EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InProcessWebSite", "IIS\test\testassets\InProcessWebSite\InProcessWebSite.csproj", "{E685D546-FDCD-4A4C-9183-728C308A9A9E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcessWebSite", "IIS\test\testassets\OutOfProcessWebSite\OutOfProcessWebSite.csproj", "{CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StressTestWebSite", "IIS\test\testassets\StressTestWebSite\StressTestWebSite.csproj", "{7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IIS", "IIS", "{8446E0D1-F421-4FD2-8B49-9183CCABD9D3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IntegrationTesting.IIS", "IntegrationTesting.IIS", "{E4A4ED67-4802-41B9-8CC4-319BA94217C5}" @@ -125,8 +121,8 @@ Global {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x64.Build.0 = Debug|Any CPU {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x86.ActiveCfg = Debug|Any CPU {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Debug|x86.Build.0 = Debug|Any CPU - {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|Any CPU.Build.0 = Debug|Any CPU + {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|Any CPU.Build.0 = Release|Any CPU {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x64.ActiveCfg = Release|Any CPU {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x64.Build.0 = Release|Any CPU {8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x86.ActiveCfg = Release|Any CPU @@ -137,8 +133,8 @@ Global {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x64.Build.0 = Debug|Any CPU {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x86.ActiveCfg = Debug|Any CPU {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x86.Build.0 = Debug|Any CPU - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|Any CPU.Build.0 = Debug|Any CPU + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|Any CPU.Build.0 = Release|Any CPU {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|x64.ActiveCfg = Release|Any CPU {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|x64.Build.0 = Release|Any CPU {4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Release|x86.ActiveCfg = Release|Any CPU @@ -149,8 +145,8 @@ Global {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|x64.Build.0 = Debug|x64 {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|x86.ActiveCfg = Debug|x86 {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Debug|x86.Build.0 = Debug|x86 - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|Any CPU.ActiveCfg = Debug|x64 - {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|Any CPU.Build.0 = Debug|x64 + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|Any CPU.ActiveCfg = Release|x64 + {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|Any CPU.Build.0 = Release|x64 {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x64.ActiveCfg = Release|x64 {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x64.Build.0 = Release|x64 {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x86.ActiveCfg = Release|x86 @@ -161,8 +157,8 @@ Global {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x64.Build.0 = Debug|Any CPU {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x86.ActiveCfg = Debug|Any CPU {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x86.Build.0 = Debug|Any CPU - {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|Any CPU.Build.0 = Debug|Any CPU + {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|Any CPU.ActiveCfg = Release|Any CPU + {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|Any CPU.Build.0 = Release|Any CPU {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x64.ActiveCfg = Release|Any CPU {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x64.Build.0 = Release|Any CPU {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x86.ActiveCfg = Release|Any CPU @@ -172,7 +168,7 @@ Global {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x64.Build.0 = Debug|x64 {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x86.ActiveCfg = Debug|Win32 {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x86.Build.0 = Debug|Win32 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|Any CPU.ActiveCfg = Debug|Win32 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|Any CPU.ActiveCfg = Release|Win32 {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x64.ActiveCfg = Release|x64 {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x64.Build.0 = Release|x64 {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x86.ActiveCfg = Release|Win32 @@ -182,7 +178,7 @@ Global {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x64.Build.0 = Debug|x64 {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x86.ActiveCfg = Debug|Win32 {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x86.Build.0 = Debug|Win32 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|Any CPU.ActiveCfg = Debug|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|Any CPU.ActiveCfg = Release|Win32 {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x64.ActiveCfg = Release|x64 {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x64.Build.0 = Release|x64 {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x86.ActiveCfg = Release|Win32 @@ -192,7 +188,7 @@ Global {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x64.Build.0 = Debug|x64 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x86.ActiveCfg = Debug|Win32 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x86.Build.0 = Debug|Win32 - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|Any CPU.ActiveCfg = Debug|Win32 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|Any CPU.ActiveCfg = Release|Win32 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x64.ActiveCfg = Release|x64 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x64.Build.0 = Release|x64 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.ActiveCfg = Release|Win32 @@ -203,8 +199,8 @@ Global {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x64.Build.0 = Debug|Any CPU {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x86.ActiveCfg = Debug|Any CPU {48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x86.Build.0 = Debug|Any CPU - {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|Any CPU.Build.0 = Debug|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|Any CPU.Build.0 = Release|Any CPU {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x64.ActiveCfg = Release|Any CPU {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x64.Build.0 = Release|Any CPU {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x86.ActiveCfg = Release|Any CPU @@ -214,7 +210,7 @@ Global {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.Build.0 = Debug|x64 {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.ActiveCfg = Debug|Win32 {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.Build.0 = Debug|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|Any CPU.ActiveCfg = Debug|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|Any CPU.ActiveCfg = Release|Win32 {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.ActiveCfg = Release|x64 {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.Build.0 = Release|x64 {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.ActiveCfg = Release|Win32 @@ -224,7 +220,7 @@ Global {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x64.Build.0 = Debug|x64 {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x86.ActiveCfg = Debug|Win32 {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x86.Build.0 = Debug|Win32 - {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|Any CPU.ActiveCfg = Debug|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|Any CPU.ActiveCfg = Release|Win32 {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x64.ActiveCfg = Release|x64 {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x64.Build.0 = Release|x64 {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.ActiveCfg = Release|Win32 @@ -234,7 +230,7 @@ Global {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x64.Build.0 = Debug|x64 {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x86.ActiveCfg = Debug|Win32 {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x86.Build.0 = Debug|Win32 - {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|Any CPU.ActiveCfg = Debug|Win32 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|Any CPU.ActiveCfg = Release|Win32 {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x64.ActiveCfg = Release|x64 {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x64.Build.0 = Release|x64 {1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.ActiveCfg = Release|Win32 @@ -245,20 +241,20 @@ Global {D182103F-8405-4647-B158-C36F598657EF}.Debug|x64.Build.0 = Debug|Any CPU {D182103F-8405-4647-B158-C36F598657EF}.Debug|x86.ActiveCfg = Debug|Any CPU {D182103F-8405-4647-B158-C36F598657EF}.Debug|x86.Build.0 = Debug|Any CPU - {D182103F-8405-4647-B158-C36F598657EF}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {D182103F-8405-4647-B158-C36F598657EF}.Release|Any CPU.Build.0 = Debug|Any CPU + {D182103F-8405-4647-B158-C36F598657EF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D182103F-8405-4647-B158-C36F598657EF}.Release|Any CPU.Build.0 = Release|Any CPU {D182103F-8405-4647-B158-C36F598657EF}.Release|x64.ActiveCfg = Release|Any CPU {D182103F-8405-4647-B158-C36F598657EF}.Release|x64.Build.0 = Release|Any CPU {D182103F-8405-4647-B158-C36F598657EF}.Release|x86.ActiveCfg = Release|Any CPU {D182103F-8405-4647-B158-C36F598657EF}.Release|x86.Build.0 = Release|Any CPU - {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|Any CPU.ActiveCfg = Debug|x86 - {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|Any CPU.Build.0 = Debug|x86 + {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|Any CPU.ActiveCfg = Debug|x64 + {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|Any CPU.Build.0 = Debug|x64 {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|x64.ActiveCfg = Debug|x64 {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|x64.Build.0 = Debug|x64 {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|x86.ActiveCfg = Debug|x86 {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Debug|x86.Build.0 = Debug|x86 - {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|Any CPU.ActiveCfg = Debug|x86 - {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|Any CPU.Build.0 = Debug|x86 + {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|Any CPU.ActiveCfg = Release|x64 + {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|Any CPU.Build.0 = Release|x64 {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|x64.ActiveCfg = Release|x64 {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|x64.Build.0 = Release|x64 {C0310D84-BC2F-4B2E-870E-D35044DB3E3E}.Release|x86.ActiveCfg = Release|x86 @@ -269,8 +265,8 @@ Global {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Debug|x64.Build.0 = Debug|Any CPU {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Debug|x86.ActiveCfg = Debug|Any CPU {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Debug|x86.Build.0 = Debug|Any CPU - {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|Any CPU.Build.0 = Debug|Any CPU + {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|Any CPU.Build.0 = Release|Any CPU {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|x64.ActiveCfg = Release|Any CPU {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|x64.Build.0 = Release|Any CPU {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|x86.ActiveCfg = Release|Any CPU @@ -281,8 +277,8 @@ Global {582B07BC-73F4-4689-8557-B039298BD82C}.Debug|x64.Build.0 = Debug|Any CPU {582B07BC-73F4-4689-8557-B039298BD82C}.Debug|x86.ActiveCfg = Debug|Any CPU {582B07BC-73F4-4689-8557-B039298BD82C}.Debug|x86.Build.0 = Debug|Any CPU - {582B07BC-73F4-4689-8557-B039298BD82C}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {582B07BC-73F4-4689-8557-B039298BD82C}.Release|Any CPU.Build.0 = Debug|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Release|Any CPU.Build.0 = Release|Any CPU {582B07BC-73F4-4689-8557-B039298BD82C}.Release|x64.ActiveCfg = Release|Any CPU {582B07BC-73F4-4689-8557-B039298BD82C}.Release|x64.Build.0 = Release|Any CPU {582B07BC-73F4-4689-8557-B039298BD82C}.Release|x86.ActiveCfg = Release|Any CPU @@ -293,8 +289,8 @@ Global {D1EA5D99-28FD-4197-81DE-17098846B38B}.Debug|x64.Build.0 = Debug|Any CPU {D1EA5D99-28FD-4197-81DE-17098846B38B}.Debug|x86.ActiveCfg = Debug|Any CPU {D1EA5D99-28FD-4197-81DE-17098846B38B}.Debug|x86.Build.0 = Debug|Any CPU - {D1EA5D99-28FD-4197-81DE-17098846B38B}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {D1EA5D99-28FD-4197-81DE-17098846B38B}.Release|Any CPU.Build.0 = Debug|Any CPU + {D1EA5D99-28FD-4197-81DE-17098846B38B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D1EA5D99-28FD-4197-81DE-17098846B38B}.Release|Any CPU.Build.0 = Release|Any CPU {D1EA5D99-28FD-4197-81DE-17098846B38B}.Release|x64.ActiveCfg = Release|Any CPU {D1EA5D99-28FD-4197-81DE-17098846B38B}.Release|x64.Build.0 = Release|Any CPU {D1EA5D99-28FD-4197-81DE-17098846B38B}.Release|x86.ActiveCfg = Release|Any CPU @@ -305,50 +301,32 @@ Global {2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Debug|x64.Build.0 = Debug|Any CPU {2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Debug|x86.ActiveCfg = Debug|Any CPU {2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Debug|x86.Build.0 = Debug|Any CPU - {2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Release|Any CPU.Build.0 = Debug|Any CPU + {2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Release|Any CPU.Build.0 = Release|Any CPU {2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Release|x64.ActiveCfg = Release|Any CPU {2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Release|x64.Build.0 = Release|Any CPU {2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Release|x86.ActiveCfg = Release|Any CPU {2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Release|x86.Build.0 = Release|Any CPU - {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Debug|Any CPU.ActiveCfg = Debug|x86 + {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Debug|Any CPU.ActiveCfg = Debug|x64 + {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Debug|Any CPU.Build.0 = Debug|x64 {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Debug|x64.ActiveCfg = Debug|x64 {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Debug|x64.Build.0 = Debug|x64 {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Debug|x86.ActiveCfg = Debug|x86 {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Debug|x86.Build.0 = Debug|x86 - {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Release|Any CPU.ActiveCfg = Debug|x86 + {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Release|Any CPU.ActiveCfg = Release|x64 + {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Release|Any CPU.Build.0 = Release|x64 {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Release|x64.ActiveCfg = Release|x64 {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Release|x64.Build.0 = Release|x64 {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Release|x86.ActiveCfg = Release|x86 {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Release|x86.Build.0 = Release|x86 - {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Debug|Any CPU.ActiveCfg = Debug|x86 - {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Debug|x64.ActiveCfg = Debug|x64 - {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Debug|x64.Build.0 = Debug|x64 - {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Debug|x86.ActiveCfg = Debug|x86 - {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Debug|x86.Build.0 = Debug|x86 - {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Release|Any CPU.ActiveCfg = Debug|x86 - {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Release|x64.ActiveCfg = Release|x64 - {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Release|x64.Build.0 = Release|x64 - {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Release|x86.ActiveCfg = Release|x86 - {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Release|x86.Build.0 = Release|x86 - {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Debug|Any CPU.ActiveCfg = Debug|x86 - {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Debug|x64.ActiveCfg = Debug|x64 - {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Debug|x64.Build.0 = Debug|x64 - {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Debug|x86.ActiveCfg = Debug|x86 - {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Debug|x86.Build.0 = Debug|x86 - {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|Any CPU.ActiveCfg = Debug|x86 - {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|x64.ActiveCfg = Release|x64 - {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|x64.Build.0 = Release|x64 - {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|x86.ActiveCfg = Release|x86 - {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|x86.Build.0 = Release|x86 {BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Debug|Any CPU.Build.0 = Debug|Any CPU {BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Debug|x64.ActiveCfg = Debug|Any CPU {BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Debug|x64.Build.0 = Debug|Any CPU {BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Debug|x86.ActiveCfg = Debug|Any CPU {BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Debug|x86.Build.0 = Debug|Any CPU - {BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Release|Any CPU.Build.0 = Debug|Any CPU + {BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Release|Any CPU.Build.0 = Release|Any CPU {BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Release|x64.ActiveCfg = Release|Any CPU {BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Release|x64.Build.0 = Release|Any CPU {BACB6E5C-A4DB-4513-B9DD-8FEC752585F0}.Release|x86.ActiveCfg = Release|Any CPU @@ -359,8 +337,8 @@ Global {01452FA1-65C9-4A38-A544-E55E63B93357}.Debug|x64.Build.0 = Debug|Any CPU {01452FA1-65C9-4A38-A544-E55E63B93357}.Debug|x86.ActiveCfg = Debug|Any CPU {01452FA1-65C9-4A38-A544-E55E63B93357}.Debug|x86.Build.0 = Debug|Any CPU - {01452FA1-65C9-4A38-A544-E55E63B93357}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {01452FA1-65C9-4A38-A544-E55E63B93357}.Release|Any CPU.Build.0 = Debug|Any CPU + {01452FA1-65C9-4A38-A544-E55E63B93357}.Release|Any CPU.ActiveCfg = Release|Any CPU + {01452FA1-65C9-4A38-A544-E55E63B93357}.Release|Any CPU.Build.0 = Release|Any CPU {01452FA1-65C9-4A38-A544-E55E63B93357}.Release|x64.ActiveCfg = Release|Any CPU {01452FA1-65C9-4A38-A544-E55E63B93357}.Release|x64.Build.0 = Release|Any CPU {01452FA1-65C9-4A38-A544-E55E63B93357}.Release|x86.ActiveCfg = Release|Any CPU @@ -370,7 +348,7 @@ Global {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.Build.0 = Debug|x64 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x86.ActiveCfg = Debug|Win32 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x86.Build.0 = Debug|Win32 - {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|Any CPU.ActiveCfg = Debug|Win32 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|Any CPU.ActiveCfg = Release|Win32 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x64.ActiveCfg = Release|x64 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x64.Build.0 = Release|x64 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x86.ActiveCfg = Release|Win32 @@ -381,8 +359,8 @@ Global {2C720685-FBE2-4450-9A01-CAA327D3485A}.Debug|x64.Build.0 = Debug|Any CPU {2C720685-FBE2-4450-9A01-CAA327D3485A}.Debug|x86.ActiveCfg = Debug|Any CPU {2C720685-FBE2-4450-9A01-CAA327D3485A}.Debug|x86.Build.0 = Debug|Any CPU - {2C720685-FBE2-4450-9A01-CAA327D3485A}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {2C720685-FBE2-4450-9A01-CAA327D3485A}.Release|Any CPU.Build.0 = Debug|Any CPU + {2C720685-FBE2-4450-9A01-CAA327D3485A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2C720685-FBE2-4450-9A01-CAA327D3485A}.Release|Any CPU.Build.0 = Release|Any CPU {2C720685-FBE2-4450-9A01-CAA327D3485A}.Release|x64.ActiveCfg = Release|Any CPU {2C720685-FBE2-4450-9A01-CAA327D3485A}.Release|x64.Build.0 = Release|Any CPU {2C720685-FBE2-4450-9A01-CAA327D3485A}.Release|x86.ActiveCfg = Release|Any CPU @@ -392,7 +370,7 @@ Global {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.Build.0 = Debug|x64 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x86.ActiveCfg = Debug|Win32 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x86.Build.0 = Debug|Win32 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|Any CPU.ActiveCfg = Debug|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|Any CPU.ActiveCfg = Release|Win32 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x64.ActiveCfg = Release|x64 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x64.Build.0 = Release|x64 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x86.ActiveCfg = Release|Win32 @@ -420,8 +398,6 @@ Global {D1EA5D99-28FD-4197-81DE-17098846B38B} = {11AEFF49-1076-4D7B-9F9A-98AC68B5193A} {2DD1269D-131C-4531-BB0D-7BE0EF8E56D0} = {E93D0704-4E09-4266-82BA-29E14CADE422} {E685D546-FDCD-4A4C-9183-728C308A9A9E} = {E93D0704-4E09-4266-82BA-29E14CADE422} - {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70} = {E93D0704-4E09-4266-82BA-29E14CADE422} - {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE} = {E93D0704-4E09-4266-82BA-29E14CADE422} {8FD4E4F7-C4A2-4934-88DA-67209AB12017} = {8446E0D1-F421-4FD2-8B49-9183CCABD9D3} {8E03138E-100D-46C7-ADCE-DAC054135825} = {8446E0D1-F421-4FD2-8B49-9183CCABD9D3} {11AEFF49-1076-4D7B-9F9A-98AC68B5193A} = {8446E0D1-F421-4FD2-8B49-9183CCABD9D3} diff --git a/src/Servers/IIS/IntegrationTesting.IIS/src/IISDeploymentParameters.cs b/src/Servers/IIS/IntegrationTesting.IIS/src/IISDeploymentParameters.cs index 04d4dfa7ce..b57a68eff1 100644 --- a/src/Servers/IIS/IntegrationTesting.IIS/src/IISDeploymentParameters.cs +++ b/src/Servers/IIS/IntegrationTesting.IIS/src/IISDeploymentParameters.cs @@ -47,6 +47,5 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS public IDictionary WebConfigBasedEnvironmentVariables { get; set; } = new Dictionary(); public IDictionary HandlerSettings { get; set; } = new Dictionary(); - } } diff --git a/src/Servers/Kestrel.sln b/src/Servers/Kestrel.sln index 9a561e27a1..9ccb23c4c1 100644 --- a/src/Servers/Kestrel.sln +++ b/src/Servers/Kestrel.sln @@ -37,8 +37,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{0256853E EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeGenerator", "Kestrel\tools\CodeGenerator\CodeGenerator.csproj", "{3615A580-A595-4B64-A8C7-FD361E712BEA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions", "Kestrel\Transport.Abstractions\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj", "{FB1A66FE-1CB9-4121-A9F7-1A1459D3C9CC}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv", "Kestrel\Transport.Libuv\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj", "{551F655B-F33C-4CD6-851F-4DFB89FA96A0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests", "Kestrel\Transport.Libuv\test\Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.csproj", "{6716895A-A00E-4BAC-92DF-4F8C859BC51E}" @@ -262,18 +260,6 @@ Global {3615A580-A595-4B64-A8C7-FD361E712BEA}.Release|x64.Build.0 = Release|Any CPU {3615A580-A595-4B64-A8C7-FD361E712BEA}.Release|x86.ActiveCfg = Release|Any CPU {3615A580-A595-4B64-A8C7-FD361E712BEA}.Release|x86.Build.0 = Release|Any CPU - {FB1A66FE-1CB9-4121-A9F7-1A1459D3C9CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB1A66FE-1CB9-4121-A9F7-1A1459D3C9CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB1A66FE-1CB9-4121-A9F7-1A1459D3C9CC}.Debug|x64.ActiveCfg = Debug|Any CPU - {FB1A66FE-1CB9-4121-A9F7-1A1459D3C9CC}.Debug|x64.Build.0 = Debug|Any CPU - {FB1A66FE-1CB9-4121-A9F7-1A1459D3C9CC}.Debug|x86.ActiveCfg = Debug|Any CPU - {FB1A66FE-1CB9-4121-A9F7-1A1459D3C9CC}.Debug|x86.Build.0 = Debug|Any CPU - {FB1A66FE-1CB9-4121-A9F7-1A1459D3C9CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB1A66FE-1CB9-4121-A9F7-1A1459D3C9CC}.Release|Any CPU.Build.0 = Release|Any CPU - {FB1A66FE-1CB9-4121-A9F7-1A1459D3C9CC}.Release|x64.ActiveCfg = Release|Any CPU - {FB1A66FE-1CB9-4121-A9F7-1A1459D3C9CC}.Release|x64.Build.0 = Release|Any CPU - {FB1A66FE-1CB9-4121-A9F7-1A1459D3C9CC}.Release|x86.ActiveCfg = Release|Any CPU - {FB1A66FE-1CB9-4121-A9F7-1A1459D3C9CC}.Release|x86.Build.0 = Release|Any CPU {551F655B-F33C-4CD6-851F-4DFB89FA96A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {551F655B-F33C-4CD6-851F-4DFB89FA96A0}.Debug|Any CPU.Build.0 = Debug|Any CPU {551F655B-F33C-4CD6-851F-4DFB89FA96A0}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -485,7 +471,6 @@ Global {3CCA24C1-04AC-48C0-A60A-D43FE7479529} = {0968A626-BA09-4B0D-B45F-855CD0F16F6C} {28DD5565-0546-48B0-973A-B27E1C9AD032} = {0968A626-BA09-4B0D-B45F-855CD0F16F6C} {3615A580-A595-4B64-A8C7-FD361E712BEA} = {0256853E-1FDA-45C6-9641-87306D378508} - {FB1A66FE-1CB9-4121-A9F7-1A1459D3C9CC} = {2B456D08-F72B-4EB8-B663-B6D78FC04BF8} {551F655B-F33C-4CD6-851F-4DFB89FA96A0} = {2B456D08-F72B-4EB8-B663-B6D78FC04BF8} {6716895A-A00E-4BAC-92DF-4F8C859BC51E} = {0968A626-BA09-4B0D-B45F-855CD0F16F6C} {C0AB577F-0227-45E6-A3AC-E7ABEFC4ED60} = {2B456D08-F72B-4EB8-B663-B6D78FC04BF8} diff --git a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj index a7e5f1b75a..367e32ffec 100644 --- a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj +++ b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp3.0.cs b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp3.0.cs index 1c23c2dc98..8891d7feb7 100644 --- a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp3.0.cs +++ b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp3.0.cs @@ -87,7 +87,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core } public partial class KestrelServer : Microsoft.AspNetCore.Hosting.Server.IServer, System.IDisposable { - public KestrelServer(Microsoft.Extensions.Options.IOptions options, Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.ITransportFactory transportFactory, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public KestrelServer(Microsoft.Extensions.Options.IOptions options, Microsoft.AspNetCore.Connections.IConnectionListenerFactory transportFactory, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } public Microsoft.AspNetCore.Http.Features.IFeatureCollection Features { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions Options { get { throw null; } } public void Dispose() { } @@ -118,7 +118,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core public KestrelServerOptions() { } public bool AddServerHeader { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public bool AllowSynchronousIO { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.SchedulingMode ApplicationSchedulingMode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public System.IServiceProvider ApplicationServices { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader ConfigurationLoader { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public bool DisableStringReuse { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } @@ -140,19 +139,17 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core public void ListenUnixSocket(string socketPath) { } public void ListenUnixSocket(string socketPath, System.Action configure) { } } - public partial class ListenOptions : Microsoft.AspNetCore.Connections.IConnectionBuilder, Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.IEndPointInformation + public partial class ListenOptions : Microsoft.AspNetCore.Connections.IConnectionBuilder { internal ListenOptions() { } public System.IServiceProvider ApplicationServices { get { throw null; } } public System.Collections.Generic.List ConnectionAdapters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public ulong FileHandle { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.FileHandleType HandleType { get { throw null; } set { } } - public System.Net.IPEndPoint IPEndPoint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Net.EndPoint EndPoint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public ulong FileHandle { get { throw null; } } + public System.Net.IPEndPoint IPEndPoint { get { throw null; } } public Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions KestrelServerOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool NoDelay { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols Protocols { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string SocketPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.ListenType Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string SocketPath { get { throw null; } } public Microsoft.AspNetCore.Connections.ConnectionDelegate Build() { throw null; } public override string ToString() { throw null; } public Microsoft.AspNetCore.Connections.IConnectionBuilder Use(System.Func middleware) { throw null; } diff --git a/src/Servers/Kestrel/Core/src/Adapter/Internal/AdaptedPipeline.cs b/src/Servers/Kestrel/Core/src/Adapter/Internal/AdaptedPipeline.cs index 8d9a35b456..8043ca28fe 100644 --- a/src/Servers/Kestrel/Core/src/Adapter/Internal/AdaptedPipeline.cs +++ b/src/Servers/Kestrel/Core/src/Adapter/Internal/AdaptedPipeline.cs @@ -6,26 +6,27 @@ using System.IO; using System.IO.Pipelines; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Adapter.Internal { internal class AdaptedPipeline : IDuplexPipe { - private static readonly int MinAllocBufferSize = KestrelMemoryPool.MinimumSegmentSize / 2; + private readonly int _minAllocBufferSize; private readonly IDuplexPipe _transport; public AdaptedPipeline(IDuplexPipe transport, Pipe inputPipe, Pipe outputPipe, - IKestrelTrace log) + IKestrelTrace log, + int minAllocBufferSize) { _transport = transport; Input = inputPipe; Output = outputPipe; Log = log; + _minAllocBufferSize = minAllocBufferSize; } public Pipe Input { get; } @@ -115,7 +116,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Adapter.Internal while (true) { - var outputBuffer = Input.Writer.GetMemory(MinAllocBufferSize); + var outputBuffer = Input.Writer.GetMemory(_minAllocBufferSize); var bytesRead = await stream.ReadAsync(outputBuffer); Input.Writer.Advance(bytesRead); diff --git a/src/Servers/Kestrel/Core/src/AnyIPListenOptions.cs b/src/Servers/Kestrel/Core/src/AnyIPListenOptions.cs index e2319b4977..555dc4af1d 100644 --- a/src/Servers/Kestrel/Core/src/AnyIPListenOptions.cs +++ b/src/Servers/Kestrel/Core/src/AnyIPListenOptions.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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; @@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core context.Logger.LogDebug(CoreStrings.FormatFallbackToIPv4Any(IPEndPoint.Port)); // for machines that do not support IPv6 - IPEndPoint = new IPEndPoint(IPAddress.Any, IPEndPoint.Port); + EndPoint = new IPEndPoint(IPAddress.Any, IPEndPoint.Port); await base.BindAsync(context).ConfigureAwait(false); } } diff --git a/src/Servers/Kestrel/Core/src/Internal/ConnectionDispatcher.cs b/src/Servers/Kestrel/Core/src/Internal/ConnectionDispatcher.cs index 0c0cca1573..4e354d8113 100644 --- a/src/Servers/Kestrel/Core/src/Internal/ConnectionDispatcher.cs +++ b/src/Servers/Kestrel/Core/src/Internal/ConnectionDispatcher.cs @@ -2,23 +2,21 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Buffers; -using System.IO.Pipelines; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal { - internal class ConnectionDispatcher : IConnectionDispatcher + internal class ConnectionDispatcher { private static long _lastConnectionId = long.MinValue; private readonly ServiceContext _serviceContext; private readonly ConnectionDelegate _connectionDelegate; + private readonly TaskCompletionSource _acceptLoopTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); public ConnectionDispatcher(ServiceContext serviceContext, ConnectionDelegate connectionDelegate) { @@ -28,26 +26,47 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal private IKestrelTrace Log => _serviceContext.Log; - public Task OnConnection(TransportConnection connection) + public Task StartAcceptingConnections(IConnectionListener listener) { - // REVIEW: Unfortunately, we still need to use the service context to create the pipes since the settings - // for the scheduler and limits are specified here - var inputOptions = GetInputPipeOptions(_serviceContext, connection.MemoryPool, connection.InputWriterScheduler); - var outputOptions = GetOutputPipeOptions(_serviceContext, connection.MemoryPool, connection.OutputReaderScheduler); - - var pair = DuplexPipe.CreateConnectionPair(inputOptions, outputOptions); - - // Set the transport and connection id - connection.ConnectionId = CorrelationIdGenerator.GetNextId(); - connection.Transport = pair.Transport; - - // This *must* be set before returning from OnConnection - connection.Application = pair.Application; - - return Execute(new KestrelConnection(connection)); + ThreadPool.UnsafeQueueUserWorkItem(StartAcceptingConnectionsCore, listener, preferLocal: false); + return _acceptLoopTcs.Task; } - private async Task Execute(KestrelConnection connection) + private void StartAcceptingConnectionsCore(IConnectionListener listener) + { + // REVIEW: Multiple accept loops in parallel? + _ = AcceptConnectionsAsync(); + + async Task AcceptConnectionsAsync() + { + try + { + while (true) + { + var connection = await listener.AcceptAsync(); + + if (connection == null) + { + // We're done listening + break; + } + + _ = Execute(new KestrelConnection(connection, _serviceContext.Log)); + } + } + catch (Exception ex) + { + // REVIEW: If the accept loop ends should this trigger a server shutdown? It will manifest as a hang + Log.LogCritical(0, ex, "The connection listener failed to accept any new connections."); + } + finally + { + _acceptLoopTcs.TrySetResult(null); + } + } + } + + internal async Task Execute(KestrelConnection connection) { var id = Interlocked.Increment(ref _lastConnectionId); var connectionContext = connection.TransportConnection; @@ -69,25 +88,19 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal { Log.LogCritical(0, ex, $"{nameof(ConnectionDispatcher)}.{nameof(Execute)}() {connectionContext.ConnectionId}"); } - finally - { - // Complete the transport PipeReader and PipeWriter after calling into application code - connectionContext.Transport.Input.Complete(); - connectionContext.Transport.Output.Complete(); - } - - // Wait for the transport to close - await CancellationTokenAsTask(connectionContext.ConnectionClosed); } } finally { - await connectionContext.CompleteAsync(); + await connection.FireOnCompletedAsync(); Log.ConnectionStop(connectionContext.ConnectionId); KestrelEventSource.Log.ConnectionStop(connectionContext); - connection.Complete(); + // Dispose the transport connection, this needs to happen before removing it from the + // connection manager so that we only signal completion of this connection after the transport + // is properly torn down. + await connection.TransportConnection.DisposeAsync(); _serviceContext.ConnectionManager.RemoveConnection(id); } @@ -102,55 +115,5 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal return null; } - - private static Task CancellationTokenAsTask(CancellationToken token) - { - if (token.IsCancellationRequested) - { - return Task.CompletedTask; - } - - // Transports already dispatch prior to tripping ConnectionClosed - // since application code can register to this token. - var tcs = new TaskCompletionSource(); - token.Register(state => ((TaskCompletionSource)state).SetResult(null), tcs); - return tcs.Task; - } - - // Internal for testing - internal static PipeOptions GetInputPipeOptions(ServiceContext serviceContext, MemoryPool memoryPool, PipeScheduler writerScheduler) => new PipeOptions - ( - pool: memoryPool, - readerScheduler: serviceContext.Scheduler, - writerScheduler: writerScheduler, - pauseWriterThreshold: serviceContext.ServerOptions.Limits.MaxRequestBufferSize ?? 0, - resumeWriterThreshold: serviceContext.ServerOptions.Limits.MaxRequestBufferSize ?? 0, - useSynchronizationContext: false, - minimumSegmentSize: KestrelMemoryPool.MinimumSegmentSize - ); - - internal static PipeOptions GetOutputPipeOptions(ServiceContext serviceContext, MemoryPool memoryPool, PipeScheduler readerScheduler) => new PipeOptions - ( - pool: memoryPool, - readerScheduler: readerScheduler, - writerScheduler: serviceContext.Scheduler, - pauseWriterThreshold: GetOutputResponseBufferSize(serviceContext), - resumeWriterThreshold: GetOutputResponseBufferSize(serviceContext), - useSynchronizationContext: false, - minimumSegmentSize: KestrelMemoryPool.MinimumSegmentSize - ); - - private static long GetOutputResponseBufferSize(ServiceContext serviceContext) - { - var bufferSize = serviceContext.ServerOptions.Limits.MaxResponseBufferSize; - if (bufferSize == 0) - { - // 0 = no buffering so we need to configure the pipe so the writer waits on the reader directly - return 1; - } - - // null means that we have no back pressure - return bufferSize ?? 0; - } } } diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/Http1ChunkedEncodingMessageBody.cs b/src/Servers/Kestrel/Core/src/Internal/Http/Http1ChunkedEncodingMessageBody.cs index 7c1327cd73..db9e78aa2f 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/Http1ChunkedEncodingMessageBody.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/Http1ChunkedEncodingMessageBody.cs @@ -9,7 +9,6 @@ using System.IO.Pipelines; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { @@ -546,7 +545,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http pauseWriterThreshold: 1, resumeWriterThreshold: 1, useSynchronizationContext: false, - minimumSegmentSize: KestrelMemoryPool.MinimumSegmentSize + minimumSegmentSize: context.MemoryPool.GetMinimumSegmentSize() )); } } diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.FeatureCollection.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.FeatureCollection.cs index 11fcadc074..82b1ebfe6b 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.FeatureCollection.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.FeatureCollection.cs @@ -13,7 +13,6 @@ using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Server.Kestrel.Core.Features; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.Net.Http.Headers; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http @@ -99,39 +98,28 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http Stream IHttpRequestFeature.Body { - get - { - return RequestBody; - } - set - { - RequestBody = value; - var requestPipeReader = new StreamPipeReader(RequestBody, new StreamPipeReaderAdapterOptions( - minimumSegmentSize: KestrelMemoryPool.MinimumSegmentSize, - minimumReadThreshold: KestrelMemoryPool.MinimumSegmentSize / 4, - _context.MemoryPool)); - RequestBodyPipeReader = requestPipeReader; - - // The StreamPipeWrapper needs to be disposed as it hold onto blocks of memory - if (_wrapperObjectsToDispose == null) - { - _wrapperObjectsToDispose = new List(); - } - _wrapperObjectsToDispose.Add(requestPipeReader); - } + get => RequestBody; + set => RequestBody = value; } PipeReader IRequestBodyPipeFeature.Reader { get { + if (!ReferenceEquals(_requestStreamInternal, RequestBody)) + { + _requestStreamInternal = RequestBody; + RequestBodyPipeReader = PipeReader.Create(RequestBody, new StreamPipeReaderOptions(_context.MemoryPool, _context.MemoryPool.GetMinimumSegmentSize(), _context.MemoryPool.GetMinimumAllocSize())); + + OnCompleted((self) => + { + ((PipeReader)self).Complete(); + return Task.CompletedTask; + }, RequestBodyPipeReader); + } + return RequestBodyPipeReader; } - set - { - RequestBodyPipeReader = value; - RequestBody = new ReadOnlyPipeStream(RequestBodyPipeReader); - } } bool IHttpRequestTrailersFeature.Available => RequestTrailersAvailable; @@ -242,37 +230,29 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } } + Stream IHttpResponseFeature.Body + { + get => ResponseBody; + set => ResponseBody = value; + } + PipeWriter IResponseBodyPipeFeature.Writer { get { - return ResponsePipeWriter; - } - set - { - ResponsePipeWriter = value; - ResponseBody = new WriteOnlyPipeStream(ResponsePipeWriter); - } - } - - Stream IHttpResponseFeature.Body - { - get - { - return ResponseBody; - } - set - { - ResponseBody = value; - var responsePipeWriter = new StreamPipeWriter(ResponseBody, minimumSegmentSize: KestrelMemoryPool.MinimumSegmentSize, _context.MemoryPool); - ResponsePipeWriter = responsePipeWriter; - - // The StreamPipeWrapper needs to be disposed as it hold onto blocks of memory - if (_wrapperObjectsToDispose == null) + if (!ReferenceEquals(_responseStreamInternal, ResponseBody)) { - _wrapperObjectsToDispose = new List(); + _responseStreamInternal = ResponseBody; + ResponseBodyPipeWriter = PipeWriter.Create(ResponseBody, new StreamPipeWriterOptions(_context.MemoryPool)); + + OnCompleted((self) => + { + ((PipeWriter)self).Complete(); + return Task.CompletedTask; + }, ResponseBodyPipeWriter); } - _wrapperObjectsToDispose.Add(responsePipeWriter); + + return ResponseBodyPipeWriter; } } diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs index ea8e77cd3b..41a4f2e6aa 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs @@ -70,8 +70,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http protected string _methodText = null; private string _scheme = null; - - private List _wrapperObjectsToDispose; + private Stream _requestStreamInternal; + private Stream _responseStreamInternal; public HttpProtocol(HttpConnectionContext context) { @@ -245,7 +245,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http public IHeaderDictionary ResponseHeaders { get; set; } public Stream ResponseBody { get; set; } - public PipeWriter ResponsePipeWriter { get; set; } + public PipeWriter ResponseBodyPipeWriter { get; set; } public CancellationToken RequestAborted { @@ -317,7 +317,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http bodyControl = new BodyControl(bodyControl: this, this); } - (RequestBody, ResponseBody, RequestBodyPipeReader, ResponsePipeWriter) = bodyControl.Start(messageBody); + (RequestBody, ResponseBody, RequestBodyPipeReader, ResponseBodyPipeWriter) = bodyControl.Start(messageBody); + _requestStreamInternal = RequestBody; + _responseStreamInternal = ResponseBody; } public void StopBodies() => bodyControl.Stop(); @@ -400,14 +402,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http localAbortCts?.Dispose(); - if (_wrapperObjectsToDispose != null) - { - foreach (var disposable in _wrapperObjectsToDispose) - { - disposable.Dispose(); - } - } - Output?.Reset(); _requestHeadersParsed = 0; diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpRequestStream.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpRequestStream.cs index 10daf49dbb..d84dfd6b90 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpRequestStream.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpRequestStream.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Buffers; using System.IO; using System.IO.Pipelines; using System.Threading; @@ -11,26 +12,45 @@ using Microsoft.AspNetCore.Http.Features; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { - internal sealed class HttpRequestStream : ReadOnlyPipeStream + internal sealed class HttpRequestStream : Stream { private HttpRequestPipeReader _pipeReader; private readonly IHttpBodyControlFeature _bodyControl; public HttpRequestStream(IHttpBodyControlFeature bodyControl, HttpRequestPipeReader pipeReader) - : base (pipeReader) { _bodyControl = bodyControl; _pipeReader = pipeReader; } - public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + public override bool CanSeek => false; + + public override bool CanRead => true; + + public override bool CanWrite => false; + + public override long Length => throw new NotSupportedException(); + + public override long Position { - return ReadAsyncInternal(new Memory(buffer, offset, count), cancellationToken).AsTask(); + get => throw new NotSupportedException(); + set => throw new NotSupportedException(); + } + + public override int WriteTimeout + { + get => throw new NotSupportedException(); + set => throw new NotSupportedException(); } public override ValueTask ReadAsync(Memory destination, CancellationToken cancellationToken = default) { - return ReadAsyncInternal(destination, cancellationToken); + return ReadAsyncWrapper(destination, cancellationToken); + } + + public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + { + return ReadAsyncWrapper(new Memory(buffer, offset, count), cancellationToken).AsTask(); } public override int Read(byte[] buffer, int offset, int count) @@ -43,16 +63,21 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return ReadAsync(buffer, offset, count).GetAwaiter().GetResult(); } - private ValueTask ReadAsyncInternal(Memory buffer, CancellationToken cancellationToken) + public override void Write(byte[] buffer, int offset, int count) + => throw new NotSupportedException(); + + public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + => throw new NotSupportedException(); + + + public override long Seek(long offset, SeekOrigin origin) { - try - { - return base.ReadAsync(buffer, cancellationToken); - } - catch (ConnectionAbortedException ex) - { - throw new TaskCanceledException("The request was aborted", ex); - } + throw new NotSupportedException(); + } + + public override void SetLength(long value) + { + throw new NotSupportedException(); } public override void Flush() @@ -63,5 +88,144 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { return Task.CompletedTask; } + + public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) + { + var task = ReadAsync(buffer, offset, count, default, state); + if (callback != null) + { + task.ContinueWith(t => callback.Invoke(t)); + } + return task; + } + + /// + public override int EndRead(IAsyncResult asyncResult) + { + return ((Task)asyncResult).GetAwaiter().GetResult(); + } + + private Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken, object state) + { + var tcs = new TaskCompletionSource(state); + var task = ReadAsync(buffer, offset, count, cancellationToken); + task.ContinueWith((task2, state2) => + { + var tcs2 = (TaskCompletionSource)state2; + if (task2.IsCanceled) + { + tcs2.SetCanceled(); + } + else if (task2.IsFaulted) + { + tcs2.SetException(task2.Exception); + } + else + { + tcs2.SetResult(task2.Result); + } + }, tcs, cancellationToken); + return tcs.Task; + } + + private ValueTask ReadAsyncWrapper(Memory destination, CancellationToken cancellationToken) + { + try + { + return ReadAsyncInternal(destination, cancellationToken); + } + catch (ConnectionAbortedException ex) + { + throw new TaskCanceledException("The request was aborted", ex); + } + } + + private async ValueTask ReadAsyncInternal(Memory buffer, CancellationToken cancellationToken) + { + while (true) + { + var result = await _pipeReader.ReadAsync(cancellationToken); + + if (result.IsCanceled) + { + throw new OperationCanceledException("The read was canceled"); + } + + var readableBuffer = result.Buffer; + var readableBufferLength = readableBuffer.Length; + + var consumed = readableBuffer.End; + var actual = 0; + try + { + if (readableBufferLength != 0) + { + actual = (int)Math.Min(readableBufferLength, buffer.Length); + + var slice = actual == readableBufferLength ? readableBuffer : readableBuffer.Slice(0, actual); + consumed = slice.End; + slice.CopyTo(buffer.Span); + + return actual; + } + + if (result.IsCompleted) + { + return 0; + } + } + finally + { + _pipeReader.AdvanceTo(consumed); + } + } + + } + + /// + public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken) + { + if (destination == null) + { + throw new ArgumentNullException(nameof(destination)); + } + + if (bufferSize <= 0) + { + throw new ArgumentOutOfRangeException(nameof(bufferSize)); + } + + return CopyToAsyncInternal(destination, cancellationToken); + } + + private async Task CopyToAsyncInternal(Stream destination, CancellationToken cancellationToken) + { + while (true) + { + var result = await _pipeReader.ReadAsync(cancellationToken); + var readableBuffer = result.Buffer; + var readableBufferLength = readableBuffer.Length; + + try + { + if (readableBufferLength != 0) + { + foreach (var memory in readableBuffer) + { + await destination.WriteAsync(memory, cancellationToken); + } + } + + if (result.IsCompleted) + { + return; + } + } + finally + { + _pipeReader.AdvanceTo(readableBuffer.End); + } + } + } } } diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpResponseStream.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpResponseStream.cs index 2faed0e12f..2bf5017278 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpResponseStream.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpResponseStream.cs @@ -2,33 +2,52 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.IO; using System.IO.Pipelines; +using System.Threading; +using System.Threading.Tasks; using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Internal; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { - internal sealed class HttpResponseStream : WriteOnlyPipeStream + internal sealed class HttpResponseStream : Stream { private readonly HttpResponsePipeWriter _pipeWriter; private readonly IHttpBodyControlFeature _bodyControl; public HttpResponseStream(IHttpBodyControlFeature bodyControl, HttpResponsePipeWriter pipeWriter) - : base(pipeWriter) { _bodyControl = bodyControl; _pipeWriter = pipeWriter; } - public override void Write(byte[] buffer, int offset, int count) - { - if (!_bodyControl.AllowSynchronousIO) - { - throw new InvalidOperationException(CoreStrings.SynchronousWritesDisallowed); - } + public override bool CanSeek => false; - base.Write(buffer, offset, count); + public override bool CanRead => false; + + public override bool CanWrite => true; + + public override long Length => throw new NotSupportedException(); + + public override long Position + { + get => throw new NotSupportedException(); + set => throw new NotSupportedException(); + } + + public override int ReadTimeout + { + get => throw new NotSupportedException(); + set => throw new NotSupportedException(); } + public override int Read(byte[] buffer, int offset, int count) + => throw new NotSupportedException(); + + public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + => throw new NotSupportedException(); + public override void Flush() { if (!_bodyControl.AllowSynchronousIO) @@ -36,7 +55,87 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http throw new InvalidOperationException(CoreStrings.SynchronousWritesDisallowed); } - base.Flush(); + FlushAsync(default).GetAwaiter().GetResult(); + } + + public override Task FlushAsync(CancellationToken cancellationToken) + { + return _pipeWriter.FlushAsync(cancellationToken).GetAsTask(); + } + + public override long Seek(long offset, SeekOrigin origin) + { + throw new NotSupportedException(); + } + + + public override void SetLength(long value) + { + throw new NotSupportedException(); + } + + + public override void Write(byte[] buffer, int offset, int count) + { + if (!_bodyControl.AllowSynchronousIO) + { + throw new InvalidOperationException(CoreStrings.SynchronousWritesDisallowed); + } + + WriteAsync(buffer, offset, count, default).GetAwaiter().GetResult(); + } + + public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) + { + var task = WriteAsync(buffer, offset, count, default, state); + if (callback != null) + { + task.ContinueWith(t => callback.Invoke(t)); + } + return task; + } + + public override void EndWrite(IAsyncResult asyncResult) + { + ((Task)asyncResult).GetAwaiter().GetResult(); + } + + private Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken, object state) + { + var tcs = new TaskCompletionSource(state); + var task = WriteAsync(buffer, offset, count, cancellationToken); + task.ContinueWith((task2, state2) => + { + var tcs2 = (TaskCompletionSource)state2; + if (task2.IsCanceled) + { + tcs2.SetCanceled(); + } + else if (task2.IsFaulted) + { + tcs2.SetException(task2.Exception); + } + else + { + tcs2.SetResult(null); + } + }, tcs, cancellationToken); + return tcs.Task; + } + + public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + { + return WriteAsyncInternal(new ReadOnlyMemory(buffer, offset, count), cancellationToken); + } + + public override ValueTask WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default) + { + return new ValueTask(WriteAsyncInternal(source, cancellationToken)); + } + + private Task WriteAsyncInternal(ReadOnlyMemory source, CancellationToken cancellationToken = default) + { + return _pipeWriter.WriteAsync(source, cancellationToken).GetAsTask(); } } } diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2OutputProducer.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2OutputProducer.cs index fec48783ef..4f481850d7 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2OutputProducer.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2OutputProducer.cs @@ -12,7 +12,6 @@ using Microsoft.AspNetCore.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 { @@ -363,7 +362,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 pauseWriterThreshold: 1, resumeWriterThreshold: 1, useSynchronizationContext: false, - minimumSegmentSize: KestrelMemoryPool.MinimumSegmentSize + minimumSegmentSize: pool.GetMinimumSegmentSize() )); } } diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs index 5a27a5641f..d9407a8318 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs @@ -12,7 +12,6 @@ using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.Extensions.Primitives; using Microsoft.Net.Http.Headers; @@ -494,7 +493,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 pauseWriterThreshold: windowSize + 1, resumeWriterThreshold: windowSize + 1, useSynchronizationContext: false, - minimumSegmentSize: KestrelMemoryPool.MinimumSegmentSize + minimumSegmentSize: _context.MemoryPool.GetMinimumSegmentSize() )); private (StreamCompletionFlags OldState, StreamCompletionFlags NewState) ApplyCompletionFlag(StreamCompletionFlags completionState) diff --git a/src/Servers/Kestrel/Core/src/Internal/HttpConnection.cs b/src/Servers/Kestrel/Core/src/Internal/HttpConnection.cs index 2bb90b1ae0..2d7b3c7633 100644 --- a/src/Servers/Kestrel/Core/src/Internal/HttpConnection.cs +++ b/src/Servers/Kestrel/Core/src/Internal/HttpConnection.cs @@ -18,7 +18,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Features; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal @@ -62,7 +61,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal pauseWriterThreshold: _context.ServiceContext.ServerOptions.Limits.MaxRequestBufferSize ?? 0, resumeWriterThreshold: _context.ServiceContext.ServerOptions.Limits.MaxRequestBufferSize ?? 0, useSynchronizationContext: false, - minimumSegmentSize: KestrelMemoryPool.MinimumSegmentSize + minimumSegmentSize: MemoryPool.GetMinimumSegmentSize() ); internal PipeOptions AdaptedOutputPipeOptions => new PipeOptions @@ -73,7 +72,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal pauseWriterThreshold: _context.ServiceContext.ServerOptions.Limits.MaxResponseBufferSize ?? 0, resumeWriterThreshold: _context.ServiceContext.ServerOptions.Limits.MaxResponseBufferSize ?? 0, useSynchronizationContext: false, - minimumSegmentSize: KestrelMemoryPool.MinimumSegmentSize + minimumSegmentSize: MemoryPool.GetMinimumSegmentSize() ); private IKestrelTrace Log => _context.ServiceContext.Log; @@ -94,7 +93,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal adaptedPipeline = new AdaptedPipeline(_adaptedTransport, new Pipe(AdaptedInputPipeOptions), new Pipe(AdaptedOutputPipeOptions), - Log); + Log, + MemoryPool.GetMinimumAllocSize()); _adaptedTransport = adaptedPipeline; } diff --git a/src/Servers/Kestrel/Core/src/Internal/HttpConnectionMiddleware.cs b/src/Servers/Kestrel/Core/src/Internal/HttpConnectionMiddleware.cs index 76b2f3c8e0..efae39ce71 100644 --- a/src/Servers/Kestrel/Core/src/Internal/HttpConnectionMiddleware.cs +++ b/src/Servers/Kestrel/Core/src/Internal/HttpConnectionMiddleware.cs @@ -47,20 +47,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal Transport = connectionContext.Transport }; - var connectionFeature = connectionContext.Features.Get(); - - if (connectionFeature != null) - { - if (connectionFeature.LocalIpAddress != null) - { - httpConnectionContext.LocalEndPoint = new IPEndPoint(connectionFeature.LocalIpAddress, connectionFeature.LocalPort); - } - - if (connectionFeature.RemoteIpAddress != null) - { - httpConnectionContext.RemoteEndPoint = new IPEndPoint(connectionFeature.RemoteIpAddress, connectionFeature.RemotePort); - } - } + httpConnectionContext.LocalEndPoint = connectionContext.LocalEndPoint as IPEndPoint; + httpConnectionContext.RemoteEndPoint = connectionContext.RemoteEndPoint as IPEndPoint; var connection = new HttpConnection(httpConnectionContext); diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/ConnectionManager.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/ConnectionManager.cs index cb402facea..05bb0f0726 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/ConnectionManager.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/ConnectionManager.cs @@ -1,8 +1,12 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Concurrent; +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Connections; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure { @@ -37,10 +41,15 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure public void RemoveConnection(long id) { - if (!_connectionReferences.TryRemove(id, out _)) + if (!_connectionReferences.TryRemove(id, out var reference)) { throw new ArgumentException(nameof(id)); } + + if (reference.TryGetConnection(out var connection)) + { + connection.Complete(); + } } public void Walk(Action callback) @@ -64,6 +73,46 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure } } + public async Task CloseAllConnectionsAsync(CancellationToken token) + { + var closeTasks = new List(); + + Walk(connection => + { + connection.RequestClose(); + closeTasks.Add(connection.ExecutionTask); + }); + + var allClosedTask = Task.WhenAll(closeTasks.ToArray()); + return await Task.WhenAny(allClosedTask, CancellationTokenAsTask(token)).ConfigureAwait(false) == allClosedTask; + } + + public async Task AbortAllConnectionsAsync() + { + var abortTasks = new List(); + + Walk(connection => + { + connection.TransportConnection.Abort(new ConnectionAbortedException(CoreStrings.ConnectionAbortedDuringServerShutdown)); + abortTasks.Add(connection.ExecutionTask); + }); + + var allAbortedTask = Task.WhenAll(abortTasks.ToArray()); + return await Task.WhenAny(allAbortedTask, Task.Delay(1000)).ConfigureAwait(false) == allAbortedTask; + } + + private static Task CancellationTokenAsTask(CancellationToken token) + { + if (token.IsCancellationRequested) + { + return Task.CompletedTask; + } + + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + token.Register(() => tcs.SetResult(null)); + return tcs.Task; + } + private static ResourceCounter GetCounter(long? number) => number.HasValue ? ResourceCounter.Quota(number.Value) diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/ConnectionManagerShutdownExtensions.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/ConnectionManagerShutdownExtensions.cs deleted file mode 100644 index 5877cbcf55..0000000000 --- a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/ConnectionManagerShutdownExtensions.cs +++ /dev/null @@ -1,53 +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.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Connections; - -namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure -{ - internal static class ConnectionManagerShutdownExtensions - { - public static async Task CloseAllConnectionsAsync(this ConnectionManager connectionManager, CancellationToken token) - { - var closeTasks = new List(); - - connectionManager.Walk(connection => - { - connection.TransportConnection.RequestClose(); - closeTasks.Add(connection.ExecutionTask); - }); - - var allClosedTask = Task.WhenAll(closeTasks.ToArray()); - return await Task.WhenAny(allClosedTask, CancellationTokenAsTask(token)).ConfigureAwait(false) == allClosedTask; - } - - public static async Task AbortAllConnectionsAsync(this ConnectionManager connectionManager) - { - var abortTasks = new List(); - - connectionManager.Walk(connection => - { - connection.TransportConnection.Abort(new ConnectionAbortedException(CoreStrings.ConnectionAbortedDuringServerShutdown)); - abortTasks.Add(connection.ExecutionTask); - }); - - var allAbortedTask = Task.WhenAll(abortTasks.ToArray()); - return await Task.WhenAny(allAbortedTask, Task.Delay(1000)).ConfigureAwait(false) == allAbortedTask; - } - - private static Task CancellationTokenAsTask(CancellationToken token) - { - if (token.IsCancellationRequested) - { - return Task.CompletedTask; - } - - var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - token.Register(() => tcs.SetResult(null)); - return tcs.Task; - } - } -} diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/HeartbeatManager.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/HeartbeatManager.cs index 8fcd25fe98..18635e1f27 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/HeartbeatManager.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/HeartbeatManager.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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; @@ -35,7 +35,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure private void WalkCallback(KestrelConnection connection) { - connection.TransportConnection.TickHeartbeat(); + connection.TickHeartbeat(); } } } diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelConnection.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelConnection.cs index a253aa5c32..ccb51230c5 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelConnection.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelConnection.cs @@ -1,25 +1,170 @@ // 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.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; +using Microsoft.AspNetCore.Connections; +using Microsoft.AspNetCore.Connections.Features; +using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure { - internal class KestrelConnection + internal class KestrelConnection : IConnectionHeartbeatFeature, IConnectionCompleteFeature, IConnectionLifetimeNotificationFeature { - private TaskCompletionSource _executionTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + private List<(Action handler, object state)> _heartbeatHandlers; + private readonly object _heartbeatLock = new object(); - public KestrelConnection(TransportConnection transportConnection) + private Stack, object>> _onCompleted; + private bool _completed; + + private readonly CancellationTokenSource _connectionClosingCts = new CancellationTokenSource(); + private readonly TaskCompletionSource _completionTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + public KestrelConnection(ConnectionContext connectionContext, ILogger logger) { - TransportConnection = transportConnection; - ExecutionTask = _executionTcs.Task; + Logger = logger; + TransportConnection = connectionContext; + + // Set a connection id if the transport didn't set one + TransportConnection.ConnectionId ??= CorrelationIdGenerator.GetNextId(); + connectionContext.Features.Set(this); + connectionContext.Features.Set(this); + connectionContext.Features.Set(this); + ConnectionClosedRequested = _connectionClosingCts.Token; } - public TransportConnection TransportConnection { get; } + private ILogger Logger { get; } - public Task ExecutionTask { get; } + public ConnectionContext TransportConnection { get; set; } + public CancellationToken ConnectionClosedRequested { get; set; } + public Task ExecutionTask => _completionTcs.Task; - internal void Complete() => _executionTcs.TrySetResult(null); + public void TickHeartbeat() + { + lock (_heartbeatLock) + { + if (_heartbeatHandlers == null) + { + return; + } + + foreach (var (handler, state) in _heartbeatHandlers) + { + handler(state); + } + } + } + + public void OnHeartbeat(Action action, object state) + { + lock (_heartbeatLock) + { + if (_heartbeatHandlers == null) + { + _heartbeatHandlers = new List<(Action handler, object state)>(); + } + + _heartbeatHandlers.Add((action, state)); + } + } + + void IConnectionCompleteFeature.OnCompleted(Func callback, object state) + { + if (_completed) + { + throw new InvalidOperationException("The connection is already complete."); + } + + if (_onCompleted == null) + { + _onCompleted = new Stack, object>>(); + } + _onCompleted.Push(new KeyValuePair, object>(callback, state)); + } + + public Task FireOnCompletedAsync() + { + if (_completed) + { + throw new InvalidOperationException("The connection is already complete."); + } + + _completed = true; + var onCompleted = _onCompleted; + + if (onCompleted == null || onCompleted.Count == 0) + { + return Task.CompletedTask; + } + + return CompleteAsyncMayAwait(onCompleted); + } + + private Task CompleteAsyncMayAwait(Stack, object>> onCompleted) + { + while (onCompleted.TryPop(out var entry)) + { + try + { + var task = entry.Key.Invoke(entry.Value); + if (!ReferenceEquals(task, Task.CompletedTask)) + { + return CompleteAsyncAwaited(task, onCompleted); + } + } + catch (Exception ex) + { + Logger.LogError(ex, "An error occured running an IConnectionCompleteFeature.OnCompleted callback."); + } + } + + return Task.CompletedTask; + } + + private async Task CompleteAsyncAwaited(Task currentTask, Stack, object>> onCompleted) + { + try + { + await currentTask; + } + catch (Exception ex) + { + Logger.LogError(ex, "An error occured running an IConnectionCompleteFeature.OnCompleted callback."); + } + + while (onCompleted.TryPop(out var entry)) + { + try + { + await entry.Key.Invoke(entry.Value); + } + catch (Exception ex) + { + Logger.LogError(ex, "An error occured running an IConnectionCompleteFeature.OnCompleted callback."); + } + } + } + + public void RequestClose() + { + try + { + _connectionClosingCts.Cancel(); + } + catch (ObjectDisposedException) + { + // There's a race where the token could be disposed + // swallow the exception and no-op + } + } + + public void Complete() + { + _completionTcs.TrySetResult(null); + + _connectionClosingCts.Dispose(); + } } } diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelEventSource.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelEventSource.cs index ae6a03915b..fdabf48247 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelEventSource.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelEventSource.cs @@ -2,10 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Diagnostics.Tracing; -using System.Net; using System.Runtime.CompilerServices; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure { @@ -27,15 +26,15 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure // - Avoid renaming methods or parameters marked with EventAttribute. EventSource uses these to form the event object. [NonEvent] - public void ConnectionStart(TransportConnection connection) + public void ConnectionStart(ConnectionContext connection) { // avoid allocating strings unless this event source is enabled if (IsEnabled()) { ConnectionStart( connection.ConnectionId, - connection.LocalAddress != null ? new IPEndPoint(connection.LocalAddress, connection.LocalPort).ToString() : null, - connection.RemoteAddress != null ? new IPEndPoint(connection.RemoteAddress, connection.RemotePort).ToString() : null); + connection.LocalEndPoint?.ToString(), + connection.RemoteEndPoint?.ToString()); } } @@ -54,7 +53,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure } [NonEvent] - public void ConnectionStop(TransportConnection connection) + public void ConnectionStop(ConnectionContext connection) { if (IsEnabled()) { diff --git a/src/Servers/Kestrel/Core/src/Internal/MemoryPoolExtensions.cs b/src/Servers/Kestrel/Core/src/Internal/MemoryPoolExtensions.cs new file mode 100644 index 0000000000..d3b1f30a02 --- /dev/null +++ b/src/Servers/Kestrel/Core/src/Internal/MemoryPoolExtensions.cs @@ -0,0 +1,31 @@ +using System; +using System.Buffers; +using System.Collections.Generic; +using System.Text; + +namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal +{ + internal static class MemoryPoolExtensions + { + /// + /// Computes a minimum segment size + /// + /// + /// + public static int GetMinimumSegmentSize(this MemoryPool pool) + { + if (pool == null) + { + return 4096; + } + + return Math.Min(4096, pool.MaxBufferSize); + } + + public static int GetMinimumAllocSize(this MemoryPool pool) + { + // 1/2 of a segment + return pool.GetMinimumSegmentSize() / 2; + } + } +} diff --git a/src/Servers/Kestrel/Core/src/KestrelServer.cs b/src/Servers/Kestrel/Core/src/KestrelServer.cs index 51b444ada2..0481df8fad 100644 --- a/src/Servers/Kestrel/Core/src/KestrelServer.cs +++ b/src/Servers/Kestrel/Core/src/KestrelServer.cs @@ -6,13 +6,13 @@ using System.Collections.Generic; using System.IO.Pipelines; using System.Threading; using System.Threading.Tasks; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Hosting.Server.Features; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; @@ -20,23 +20,21 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core { public class KestrelServer : IServer { - private readonly List _transports = new List(); + private readonly List<(IConnectionListener, Task)> _transports = new List<(IConnectionListener, Task)>(); private readonly IServerAddressesFeature _serverAddresses; - private readonly ITransportFactory _transportFactory; + private readonly IConnectionListenerFactory _transportFactory; private bool _hasStarted; private int _stopping; private readonly TaskCompletionSource _stoppedTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); -#pragma warning disable PUB0001 // Pubternal type in public API - public KestrelServer(IOptions options, ITransportFactory transportFactory, ILoggerFactory loggerFactory) -#pragma warning restore PUB0001 + public KestrelServer(IOptions options, IConnectionListenerFactory transportFactory, ILoggerFactory loggerFactory) : this(transportFactory, CreateServiceContext(options, loggerFactory)) { } // For testing - internal KestrelServer(ITransportFactory transportFactory, ServiceContext serviceContext) + internal KestrelServer(IConnectionListenerFactory transportFactory, ServiceContext serviceContext) { if (transportFactory == null) { @@ -79,27 +77,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core DebuggerWrapper.Singleton, trace); - // TODO: This logic will eventually move into the IConnectionHandler and off - // the service context once we get to https://github.com/aspnet/KestrelHttpServer/issues/1662 - PipeScheduler scheduler = null; - switch (serverOptions.ApplicationSchedulingMode) - { - case SchedulingMode.Default: - case SchedulingMode.ThreadPool: - scheduler = PipeScheduler.ThreadPool; - break; - case SchedulingMode.Inline: - scheduler = PipeScheduler.Inline; - break; - default: - throw new NotSupportedException(CoreStrings.FormatUnknownTransportMode(serverOptions.ApplicationSchedulingMode)); - } - return new ServiceContext { Log = trace, HttpParser = new HttpParser(trace.IsEnabled(LogLevel.Information)), - Scheduler = scheduler, + Scheduler = PipeScheduler.ThreadPool, SystemClock = heartbeatManager, DateHeaderValueManager = dateHeaderValueManager, ConnectionManager = connectionManager, @@ -138,12 +120,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core ServiceContext.Heartbeat?.Start(); - async Task OnBind(ListenOptions endpoint) + async Task OnBind(ListenOptions options) { // Add the HTTP middleware as the terminal connection middleware - endpoint.UseHttpServer(endpoint.ConnectionAdapters, ServiceContext, application, endpoint.Protocols); + options.UseHttpServer(options.ConnectionAdapters, ServiceContext, application, options.Protocols); - var connectionDelegate = endpoint.Build(); + var connectionDelegate = options.Build(); // Add the connection limit middleware if (Options.Limits.MaxConcurrentConnections.HasValue) @@ -152,10 +134,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core } var connectionDispatcher = new ConnectionDispatcher(ServiceContext, connectionDelegate); - var transport = _transportFactory.Create(endpoint, connectionDispatcher); - _transports.Add(transport); + var transport = await _transportFactory.BindAsync(options.EndPoint).ConfigureAwait(false); - await transport.BindAsync().ConfigureAwait(false); + // Update the endpoint + options.EndPoint = transport.EndPoint; + var acceptLoopTask = connectionDispatcher.StartAcceptingConnections(transport); + + _transports.Add((transport, acceptLoopTask)); } await AddressBinder.BindAsync(_serverAddresses, Options, Trace, OnBind).ConfigureAwait(false); @@ -182,8 +167,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core var tasks = new Task[_transports.Count]; for (int i = 0; i < _transports.Count; i++) { - tasks[i] = _transports[i].UnbindAsync(); + (IConnectionListener listener, Task acceptLoop) = _transports[i]; + tasks[i] = Task.WhenAll(listener.UnbindAsync(cancellationToken).AsTask(), acceptLoop); } + await Task.WhenAll(tasks).ConfigureAwait(false); if (!await ConnectionManager.CloseAllConnectionsAsync(cancellationToken).ConfigureAwait(false)) @@ -198,8 +185,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core for (int i = 0; i < _transports.Count; i++) { - tasks[i] = _transports[i].StopAsync(); + (IConnectionListener listener, Task acceptLoop) = _transports[i]; + tasks[i] = listener.DisposeAsync().AsTask(); } + await Task.WhenAll(tasks).ConfigureAwait(false); ServiceContext.Heartbeat?.Dispose(); diff --git a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs index bbe5d30b9a..7ac2acc27e 100644 --- a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs +++ b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Net; using System.Security.Cryptography.X509Certificates; @@ -10,7 +11,6 @@ using Microsoft.AspNetCore.Certificates.Generation; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.AspNetCore.Server.Kestrel.Https; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -38,14 +38,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core /// public bool AddServerHeader { get; set; } = true; - /// - /// Gets or sets a value that determines how Kestrel should schedule user callbacks. - /// - /// The default mode is -#pragma warning disable PUB0001 // Pubternal type in public API - public SchedulingMode ApplicationSchedulingMode { get; set; } = SchedulingMode.Default; -#pragma warning restore PUB0001 // Pubternal type in public API - /// /// Gets or sets a value that controls whether synchronous IO is allowed for the and /// @@ -304,7 +296,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core { throw new ArgumentNullException(nameof(socketPath)); } - if (socketPath.Length == 0 || socketPath[0] != '/') + + if (!Path.IsPathRooted(socketPath)) { throw new ArgumentException(CoreStrings.UnixSocketPathMustBeAbsolute, nameof(socketPath)); } diff --git a/src/Servers/Kestrel/Core/src/ListenOptions.cs b/src/Servers/Kestrel/Core/src/ListenOptions.cs index b3e4ec21ce..3a850c25f9 100644 --- a/src/Servers/Kestrel/Core/src/ListenOptions.cs +++ b/src/Servers/Kestrel/Core/src/ListenOptions.cs @@ -1,15 +1,15 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Linq; using System.Net; +using System.Net.Sockets; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Server.Kestrel.Core.Adapter.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; namespace Microsoft.AspNetCore.Server.Kestrel.Core { @@ -17,21 +17,18 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core /// Describes either an , Unix domain socket path, or a file descriptor for an already open /// socket that Kestrel should bind to or open. /// - public class ListenOptions : IEndPointInformation, IConnectionBuilder + public class ListenOptions : IConnectionBuilder { - private FileHandleType _handleType; internal readonly List> _middleware = new List>(); internal ListenOptions(IPEndPoint endPoint) { - Type = ListenType.IPEndPoint; - IPEndPoint = endPoint; + EndPoint = endPoint; } internal ListenOptions(string socketPath) { - Type = ListenType.SocketPath; - SocketPath = socketPath; + EndPoint = new UnixDomainSocketEndPoint(socketPath); } internal ListenOptions(ulong fileHandle) @@ -41,73 +38,29 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core internal ListenOptions(ulong fileHandle, FileHandleType handleType) { - Type = ListenType.FileHandle; - FileHandle = fileHandle; - switch (handleType) - { - case FileHandleType.Auto: - case FileHandleType.Tcp: - case FileHandleType.Pipe: - _handleType = handleType; - break; - default: - throw new NotSupportedException(); - } + EndPoint = new FileHandleEndPoint(fileHandle, handleType); } - /// - /// The type of interface being described: either an , Unix domain socket path, or a file descriptor. - /// -#pragma warning disable PUB0001 // Pubternal type in public API - public ListenType Type { get; } -#pragma warning restore PUB0001 // Pubternal type in public API - -#pragma warning disable PUB0001 // Pubternal type in public API - public FileHandleType HandleType -#pragma warning restore PUB0001 // Pubternal type in public API - { - get => _handleType; - set - { - if (value == _handleType) - { - return; - } - if (Type != ListenType.FileHandle || _handleType != FileHandleType.Auto) - { - throw new InvalidOperationException(); - } - - switch (value) - { - case FileHandleType.Tcp: - case FileHandleType.Pipe: - _handleType = value; - break; - default: - throw new ArgumentException(nameof(HandleType)); - } - } - } + public EndPoint EndPoint { get; internal set; } // IPEndPoint is mutable so port 0 can be updated to the bound port. /// /// The to bind to. - /// Only set if the is . + /// Only set if the is . /// - public IPEndPoint IPEndPoint { get; set; } + public IPEndPoint IPEndPoint => EndPoint as IPEndPoint; /// /// The absolute path to a Unix domain socket to bind to. - /// Only set if the is . + /// Only set if the is . /// - public string SocketPath { get; } + public string SocketPath => (EndPoint as UnixDomainSocketEndPoint)?.ToString(); /// /// A file descriptor for the socket to open. - /// Only set if the is . + /// Only set if the is . /// - public ulong FileHandle { get; } + public ulong FileHandle => (EndPoint as FileHandleEndPoint)?.FileHandle ?? 0; /// /// Enables an to resolve and use services registered by the application during startup. @@ -115,14 +68,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core /// public KestrelServerOptions KestrelServerOptions { get; internal set; } - /// - /// Set to false to enable Nagle's algorithm for all connections. - /// - /// - /// Defaults to true. - /// - public bool NoDelay { get; set; } = true; - /// /// The protocols enabled on this endpoint. /// @@ -153,13 +98,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core ? "https" : "http"; - switch (Type) + switch (EndPoint) { - case ListenType.IPEndPoint: + case IPEndPoint _: return $"{scheme}://{IPEndPoint}"; - case ListenType.SocketPath: - return $"{scheme}://unix:{SocketPath}"; - case ListenType.FileHandle: + case UnixDomainSocketEndPoint _: + return $"{scheme}://unix:{EndPoint}"; + case FileHandleEndPoint _: return $"{scheme}://"; default: throw new InvalidOperationException(); diff --git a/src/Servers/Kestrel/Core/src/LocalhostListenOptions.cs b/src/Servers/Kestrel/Core/src/LocalhostListenOptions.cs index 80e008c78b..c7e5f47cad 100644 --- a/src/Servers/Kestrel/Core/src/LocalhostListenOptions.cs +++ b/src/Servers/Kestrel/Core/src/LocalhostListenOptions.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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; @@ -76,9 +76,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core { var options = new ListenOptions(new IPEndPoint(address, IPEndPoint.Port)) { - HandleType = HandleType, KestrelServerOptions = KestrelServerOptions, - NoDelay = NoDelay, Protocols = Protocols, }; diff --git a/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj b/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj index a528049cf6..8161334613 100644 --- a/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj +++ b/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/Servers/Kestrel/Core/test/AddressBinderTests.cs b/src/Servers/Kestrel/Core/test/AddressBinderTests.cs index 74b067cae3..76d5172207 100644 --- a/src/Servers/Kestrel/Core/test/AddressBinderTests.cs +++ b/src/Servers/Kestrel/Core/test/AddressBinderTests.cs @@ -4,12 +4,13 @@ using System; using System.IO; using System.Net; +using System.Net.Sockets; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Http.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.AspNetCore.Testing; +using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging.Abstractions; using Xunit; @@ -53,10 +54,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests [InlineData("contoso.com")] public void ParseAddressDefaultsToAnyIPOnInvalidIPAddress(string host) { - var options = new KestrelServerOptions(); var listenOptions = AddressBinder.ParseAddress($"http://{host}", out var https); Assert.IsType(listenOptions); - Assert.Equal(ListenType.IPEndPoint, listenOptions.Type); + Assert.IsType(listenOptions.EndPoint); Assert.Equal(IPAddress.IPv6Any, listenOptions.IPEndPoint.Address); Assert.Equal(80, listenOptions.IPEndPoint.Port); Assert.False(https); @@ -65,21 +65,20 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests [Fact] public void ParseAddressLocalhost() { - var options = new KestrelServerOptions(); var listenOptions = AddressBinder.ParseAddress("http://localhost", out var https); Assert.IsType(listenOptions); - Assert.Equal(ListenType.IPEndPoint, listenOptions.Type); + Assert.IsType(listenOptions.EndPoint); Assert.Equal(IPAddress.Loopback, listenOptions.IPEndPoint.Address); Assert.Equal(80, listenOptions.IPEndPoint.Port); Assert.False(https); } - [Fact] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win8, WindowsVersions.Win81, WindowsVersions.Win2008R2, SkipReason = "UnixDomainSocketEndPoint is not supported on older versions of Windows")] + [ConditionalFact] public void ParseAddressUnixPipe() { - var options = new KestrelServerOptions(); var listenOptions = AddressBinder.ParseAddress("http://unix:/tmp/kestrel-test.sock", out var https); - Assert.Equal(ListenType.SocketPath, listenOptions.Type); + Assert.IsType(listenOptions.EndPoint); Assert.Equal("/tmp/kestrel-test.sock", listenOptions.SocketPath); Assert.False(https); } @@ -92,9 +91,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests [InlineData("https://127.0.0.1", "127.0.0.1", 443, true)] public void ParseAddressIP(string address, string ip, int port, bool isHttps) { - var options = new KestrelServerOptions(); var listenOptions = AddressBinder.ParseAddress(address, out var https); - Assert.Equal(ListenType.IPEndPoint, listenOptions.Type); + Assert.IsType(listenOptions.EndPoint); Assert.Equal(IPAddress.Parse(ip), listenOptions.IPEndPoint.Address); Assert.Equal(port, listenOptions.IPEndPoint.Port); Assert.Equal(isHttps, https); diff --git a/src/Servers/Kestrel/Core/test/ConnectionDispatcherTests.cs b/src/Servers/Kestrel/Core/test/ConnectionDispatcherTests.cs index 1d1c3b46e3..5302cccba7 100644 --- a/src/Servers/Kestrel/Core/test/ConnectionDispatcherTests.cs +++ b/src/Servers/Kestrel/Core/test/ConnectionDispatcherTests.cs @@ -3,13 +3,14 @@ using System; using System.Collections.Generic; -using System.IO.Pipelines; using System.Linq; +using System.Net; using System.Threading; using System.Threading.Tasks; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Connections.Features; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; +using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Logging; using Moq; @@ -30,7 +31,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests var connection = new Mock { CallBase = true }.Object; connection.ConnectionClosed = new CancellationToken(canceled: true); - dispatcher.OnConnection(connection); + _ = dispatcher.Execute(new KestrelConnection(connection, Mock.Of())); // The scope should be created var scopeObjects = ((TestKestrelTrace)serviceContext.Log) @@ -51,25 +52,21 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests } [Fact] - public async Task OnConnectionCompletesTransportPipesAfterReturning() + public async Task StartAcceptingConnectionsAsyncLogsIfAcceptAsyncThrows() { var serviceContext = new TestServiceContext(); + var logger = ((TestKestrelTrace)serviceContext.Log).Logger; + logger.ThrowOnCriticalErrors = false; + var dispatcher = new ConnectionDispatcher(serviceContext, _ => Task.CompletedTask); - var mockConnection = new Mock { CallBase = true }; - mockConnection.Object.ConnectionClosed = new CancellationToken(canceled: true); - var mockPipeReader = new Mock(); - var mockPipeWriter = new Mock(); - var mockPipe = new Mock(); - mockPipe.Setup(m => m.Input).Returns(mockPipeReader.Object); - mockPipe.Setup(m => m.Output).Returns(mockPipeWriter.Object); - mockConnection.Setup(m => m.Transport).Returns(mockPipe.Object); - var connection = mockConnection.Object; + await dispatcher.StartAcceptingConnections(new ThrowingListener()); - await dispatcher.OnConnection(connection); - - mockPipeWriter.Verify(m => m.Complete(It.IsAny()), Times.Once()); - mockPipeReader.Verify(m => m.Complete(It.IsAny()), Times.Once()); + Assert.Equal(1, logger.CriticalErrorsLogged); + var critical = logger.Messages.SingleOrDefault(m => m.LogLevel == LogLevel.Critical); + Assert.NotNull(critical); + Assert.IsType(critical.Exception); + Assert.Equal("Unexpected error listening", critical.Exception.Message); } [Fact] @@ -80,14 +77,15 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests var connection = new Mock { CallBase = true }.Object; connection.ConnectionClosed = new CancellationToken(canceled: true); - var completeFeature = connection.Features.Get(); + var kestrelConnection = new KestrelConnection(connection, Mock.Of()); + var completeFeature = kestrelConnection.TransportConnection.Features.Get(); Assert.NotNull(completeFeature); object stateObject = new object(); object callbackState = null; completeFeature.OnCompleted(state => { callbackState = state; return Task.CompletedTask; }, stateObject); - await dispatcher.OnConnection(connection); + await dispatcher.Execute(kestrelConnection); Assert.Equal(stateObject, callbackState); } @@ -100,21 +98,41 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests var connection = new Mock { CallBase = true }.Object; connection.ConnectionClosed = new CancellationToken(canceled: true); - var completeFeature = connection.Features.Get(); var mockLogger = new Mock(); - connection.Logger = mockLogger.Object; + var kestrelConnection = new KestrelConnection(connection, mockLogger.Object); + var completeFeature = kestrelConnection.TransportConnection.Features.Get(); Assert.NotNull(completeFeature); object stateObject = new object(); object callbackState = null; completeFeature.OnCompleted(state => { callbackState = state; throw new InvalidTimeZoneException(); }, stateObject); - await dispatcher.OnConnection(connection); + await dispatcher.Execute(kestrelConnection); Assert.Equal(stateObject, callbackState); var log = mockLogger.Invocations.First(); Assert.Equal("An error occured running an IConnectionCompleteFeature.OnCompleted callback.", log.Arguments[2].ToString()); Assert.IsType(log.Arguments[3]); } + + private class ThrowingListener : IConnectionListener + { + public EndPoint EndPoint { get; set; } + + public ValueTask AcceptAsync(CancellationToken cancellationToken = default) + { + throw new InvalidOperationException("Unexpected error listening"); + } + + public ValueTask DisposeAsync() + { + return default; + } + + public ValueTask UnbindAsync(CancellationToken cancellationToken = default) + { + return default; + } + } } } diff --git a/src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs b/src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs index 494e4531e6..042a136b3e 100644 --- a/src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs +++ b/src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs @@ -19,7 +19,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Features; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Primitives; @@ -43,7 +42,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests public Http1ConnectionTests() { - _pipelineFactory = KestrelMemoryPool.Create(); + _pipelineFactory = MemoryPoolFactory.Create(); var options = new PipeOptions(_pipelineFactory, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false); var pair = DuplexPipe.CreateConnectionPair(options, options); diff --git a/src/Servers/Kestrel/Core/test/HttpConnectionManagerTests.cs b/src/Servers/Kestrel/Core/test/HttpConnectionManagerTests.cs index 809c719e5b..b7c7df6a1d 100644 --- a/src/Servers/Kestrel/Core/test/HttpConnectionManagerTests.cs +++ b/src/Servers/Kestrel/Core/test/HttpConnectionManagerTests.cs @@ -3,8 +3,9 @@ using System; using System.Runtime.CompilerServices; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; +using Microsoft.Extensions.Logging; using Moq; using Xunit; @@ -38,9 +39,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests ConnectionManager httpConnectionManager, Mock trace) { - var mock = new Mock(); + var mock = new Mock() { CallBase = true }; mock.Setup(m => m.ConnectionId).Returns(connectionId); - var httpConnection = new KestrelConnection(mock.Object); + var httpConnection = new KestrelConnection(mock.Object, Mock.Of()); httpConnectionManager.AddConnection(0, httpConnection); diff --git a/src/Servers/Kestrel/Core/test/HttpResponseHeadersTests.cs b/src/Servers/Kestrel/Core/test/HttpResponseHeadersTests.cs index 4aad2e3561..6a4e1c2352 100644 --- a/src/Servers/Kestrel/Core/test/HttpResponseHeadersTests.cs +++ b/src/Servers/Kestrel/Core/test/HttpResponseHeadersTests.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Buffers; using System.Collections.Generic; using System.Globalization; using System.IO.Pipelines; @@ -9,7 +10,6 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Primitives; using Xunit; @@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests [Fact] public void InitialDictionaryIsEmpty() { - using (var memoryPool = KestrelMemoryPool.Create()) + using (var memoryPool = MemoryPoolFactory.Create()) { var options = new PipeOptions(memoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false); var pair = DuplexPipe.CreateConnectionPair(options, options); diff --git a/src/Servers/Kestrel/Core/test/KestrelServerOptionsTests.cs b/src/Servers/Kestrel/Core/test/KestrelServerOptionsTests.cs index 02e52db7f0..c8243b6025 100644 --- a/src/Servers/Kestrel/Core/test/KestrelServerOptionsTests.cs +++ b/src/Servers/Kestrel/Core/test/KestrelServerOptionsTests.cs @@ -8,20 +8,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests { public class KestrelServerOptionsTests { - [Fact] - public void NoDelayDefaultsToTrue() - { - var o1 = new KestrelServerOptions(); - o1.Listen(IPAddress.Loopback, 0); - o1.Listen(IPAddress.Loopback, 0, d => - { - d.NoDelay = false; - }); - - Assert.True(o1.ListenOptions[0].NoDelay); - Assert.False(o1.ListenOptions[1].NoDelay); - } - [Fact] public void AllowSynchronousIODefaultsToFalse() { @@ -36,33 +22,32 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests var options = new KestrelServerOptions(); options.ListenLocalhost(5000); - Assert.True(options.ListenOptions[0].NoDelay); + Assert.Equal(HttpProtocols.Http1AndHttp2, options.ListenOptions[0].Protocols); options.ConfigureEndpointDefaults(opt => { - opt.NoDelay = false; + opt.Protocols = HttpProtocols.Http1; }); options.Listen(new IPEndPoint(IPAddress.Loopback, 5000), opt => { // ConfigureEndpointDefaults runs before this callback - Assert.False(opt.NoDelay); + Assert.Equal(HttpProtocols.Http1, opt.Protocols); }); - Assert.False(options.ListenOptions[1].NoDelay); + Assert.Equal(HttpProtocols.Http1, options.ListenOptions[1].Protocols); options.ListenLocalhost(5000, opt => { - Assert.False(opt.NoDelay); - opt.NoDelay = true; // Can be overriden + Assert.Equal(HttpProtocols.Http1, opt.Protocols); + opt.Protocols = HttpProtocols.Http2; // Can be overriden }); - Assert.True(options.ListenOptions[2].NoDelay); - + Assert.Equal(HttpProtocols.Http2, options.ListenOptions[2].Protocols); options.ListenAnyIP(5000, opt => { - Assert.False(opt.NoDelay); + opt.Protocols = HttpProtocols.Http2; }); - Assert.False(options.ListenOptions[3].NoDelay); + Assert.Equal(HttpProtocols.Http2, options.ListenOptions[3].Protocols); } } } diff --git a/src/Servers/Kestrel/Core/test/KestrelServerTests.cs b/src/Servers/Kestrel/Core/test/KestrelServerTests.cs index 180c7e9bf8..8af4397809 100644 --- a/src/Servers/Kestrel/Core/test/KestrelServerTests.cs +++ b/src/Servers/Kestrel/Core/test/KestrelServerTests.cs @@ -7,11 +7,11 @@ using System.Net; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Hosting.Server.Features; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -203,7 +203,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests var mockLoggerFactory = new Mock(); var mockLogger = new Mock(); mockLoggerFactory.Setup(m => m.CreateLogger(It.IsAny())).Returns(mockLogger.Object); - new KestrelServer(Options.Create(null), Mock.Of(), mockLoggerFactory.Object); + new KestrelServer(Options.Create(null), Mock.Of(), mockLoggerFactory.Object); mockLoggerFactory.Verify(factory => factory.CreateLogger("Microsoft.AspNetCore.Server.Kestrel")); } @@ -233,21 +233,26 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests var unbind = new SemaphoreSlim(0); var stop = new SemaphoreSlim(0); - var mockTransport = new Mock(); - mockTransport - .Setup(transport => transport.BindAsync()) - .Returns(Task.CompletedTask); - mockTransport - .Setup(transport => transport.UnbindAsync()) - .Returns(async () => await unbind.WaitAsync()); - mockTransport - .Setup(transport => transport.StopAsync()) - .Returns(async () => await stop.WaitAsync()); - - var mockTransportFactory = new Mock(); + var mockTransport = new Mock(); + var mockTransportFactory = new Mock(); mockTransportFactory - .Setup(transportFactory => transportFactory.Create(It.IsAny(), It.IsAny())) - .Returns(mockTransport.Object); + .Setup(transportFactory => transportFactory.BindAsync(It.IsAny(), It.IsAny())) + .Returns((e, token) => + { + mockTransport + .Setup(transport => transport.AcceptAsync(It.IsAny())) + .Returns(new ValueTask((ConnectionContext)null)); + mockTransport + .Setup(transport => transport.UnbindAsync(It.IsAny())) + .Returns(() => new ValueTask(unbind.WaitAsync())); + mockTransport + .Setup(transport => transport.DisposeAsync()) + .Returns(() => new ValueTask(stop.WaitAsync())); + mockTransport + .Setup(transport => transport.EndPoint).Returns(e); + + return new ValueTask(mockTransport.Object); + }); var mockLoggerFactory = new Mock(); var mockLogger = new Mock(); @@ -255,9 +260,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests var server = new KestrelServer(Options.Create(options), mockTransportFactory.Object, mockLoggerFactory.Object); await server.StartAsync(new DummyApplication(), CancellationToken.None); - var stopTask1 = server.StopAsync(default(CancellationToken)); - var stopTask2 = server.StopAsync(default(CancellationToken)); - var stopTask3 = server.StopAsync(default(CancellationToken)); + var stopTask1 = server.StopAsync(default); + var stopTask2 = server.StopAsync(default); + var stopTask3 = server.StopAsync(default); Assert.False(stopTask1.IsCompleted); Assert.False(stopTask2.IsCompleted); @@ -268,8 +273,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests await Task.WhenAll(new[] { stopTask1, stopTask2, stopTask3 }).DefaultTimeout(); - mockTransport.Verify(transport => transport.UnbindAsync(), Times.Once); - mockTransport.Verify(transport => transport.StopAsync(), Times.Once); + mockTransport.Verify(transport => transport.UnbindAsync(It.IsAny()), Times.Once); } [Fact] @@ -286,25 +290,27 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests var unbind = new SemaphoreSlim(0); var unbindException = new InvalidOperationException(); - var mockTransport = new Mock(); - mockTransport - .Setup(transport => transport.BindAsync()) - .Returns(Task.CompletedTask); - mockTransport - .Setup(transport => transport.UnbindAsync()) - .Returns(async () => - { - await unbind.WaitAsync(); - throw unbindException; - }); - mockTransport - .Setup(transport => transport.StopAsync()) - .Returns(Task.CompletedTask); - - var mockTransportFactory = new Mock(); + var mockTransport = new Mock(); + var mockTransportFactory = new Mock(); mockTransportFactory - .Setup(transportFactory => transportFactory.Create(It.IsAny(), It.IsAny())) - .Returns(mockTransport.Object); + .Setup(transportFactory => transportFactory.BindAsync(It.IsAny(), It.IsAny())) + .Returns((e, token) => + { + mockTransport + .Setup(transport => transport.AcceptAsync(It.IsAny())) + .Returns(new ValueTask((ConnectionContext)null)); + mockTransport + .Setup(transport => transport.UnbindAsync(It.IsAny())) + .Returns(async () => + { + await unbind.WaitAsync(); + throw unbindException; + }); + mockTransport + .Setup(transport => transport.EndPoint).Returns(e); + + return new ValueTask(mockTransport.Object); + }); var mockLoggerFactory = new Mock(); var mockLogger = new Mock(); @@ -312,9 +318,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests var server = new KestrelServer(Options.Create(options), mockTransportFactory.Object, mockLoggerFactory.Object); await server.StartAsync(new DummyApplication(), CancellationToken.None); - var stopTask1 = server.StopAsync(default(CancellationToken)); - var stopTask2 = server.StopAsync(default(CancellationToken)); - var stopTask3 = server.StopAsync(default(CancellationToken)); + var stopTask1 = server.StopAsync(default); + var stopTask2 = server.StopAsync(default); + var stopTask3 = server.StopAsync(default); Assert.False(stopTask1.IsCompleted); Assert.False(stopTask2.IsCompleted); @@ -327,7 +333,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests Assert.Same(unbindException, await Assert.ThrowsAsync(() => stopTask2.TimeoutAfter(timeout))); Assert.Same(unbindException, await Assert.ThrowsAsync(() => stopTask3.TimeoutAfter(timeout))); - mockTransport.Verify(transport => transport.UnbindAsync(), Times.Once); + mockTransport.Verify(transport => transport.UnbindAsync(It.IsAny()), Times.Once); } [Fact] @@ -343,21 +349,23 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests var unbindTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var mockTransport = new Mock(); - mockTransport - .Setup(transport => transport.BindAsync()) - .Returns(Task.CompletedTask); - mockTransport - .Setup(transport => transport.UnbindAsync()) - .Returns(unbindTcs.Task); - mockTransport - .Setup(transport => transport.StopAsync()) - .Returns(Task.CompletedTask); - - var mockTransportFactory = new Mock(); + var mockTransport = new Mock(); + var mockTransportFactory = new Mock(); mockTransportFactory - .Setup(transportFactory => transportFactory.Create(It.IsAny(), It.IsAny())) - .Returns(mockTransport.Object); + .Setup(transportFactory => transportFactory.BindAsync(It.IsAny(), It.IsAny())) + .Returns((e, token) => + { + mockTransport + .Setup(transport => transport.AcceptAsync(It.IsAny())) + .Returns(new ValueTask((ConnectionContext)null)); + mockTransport + .Setup(transport => transport.UnbindAsync(It.IsAny())) + .Returns(new ValueTask(unbindTcs.Task)); + mockTransport + .Setup(transport => transport.EndPoint).Returns(e); + + return new ValueTask(mockTransport.Object); + }); var mockLoggerFactory = new Mock(); var mockLogger = new Mock(); @@ -384,7 +392,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests await stopTask2.DefaultTimeout(); await continuationTask.DefaultTimeout(); - mockTransport.Verify(transport => transport.UnbindAsync(), Times.Once); + mockTransport.Verify(transport => transport.UnbindAsync(It.IsAny()), Times.Once); } [Fact] @@ -438,11 +446,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests server.StartAsync(new DummyApplication(context => Task.CompletedTask), CancellationToken.None).GetAwaiter().GetResult(); } - private class MockTransportFactory : ITransportFactory + private class MockTransportFactory : IConnectionListenerFactory { - public ITransport Create(IEndPointInformation endPointInformation, IConnectionDispatcher handler) + public ValueTask BindAsync(EndPoint endpoint, CancellationToken cancellationToken = default) { - return Mock.Of(); + var mock = new Mock(); + mock.Setup(m => m.EndPoint).Returns(endpoint); + return new ValueTask(mock.Object); } } } diff --git a/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj b/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj index b334a87ed9..fa82cf0beb 100644 --- a/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj +++ b/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj @@ -12,12 +12,12 @@ + - + - diff --git a/src/Servers/Kestrel/Core/test/OutputProducerTests.cs b/src/Servers/Kestrel/Core/test/OutputProducerTests.cs index 749e2473a5..53aa300f1c 100644 --- a/src/Servers/Kestrel/Core/test/OutputProducerTests.cs +++ b/src/Servers/Kestrel/Core/test/OutputProducerTests.cs @@ -9,7 +9,6 @@ using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Server.Kestrel.Core.Features; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.AspNetCore.Testing; using Moq; using Xunit; @@ -22,7 +21,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests public OutputProducerTests() { - _memoryPool = KestrelMemoryPool.Create(); + _memoryPool = MemoryPoolFactory.Create(); } public void Dispose() diff --git a/src/Servers/Kestrel/Core/test/PipeOptionsTests.cs b/src/Servers/Kestrel/Core/test/PipeOptionsTests.cs index 1f5b377360..0b06bec0e9 100644 --- a/src/Servers/Kestrel/Core/test/PipeOptionsTests.cs +++ b/src/Servers/Kestrel/Core/test/PipeOptionsTests.cs @@ -1,9 +1,8 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.IO.Pipelines; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.AspNetCore.Testing; using Moq; using Xunit; @@ -12,43 +11,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests { public class PipeOptionsTests { - [Theory] - [InlineData(10, 10, 10)] - [InlineData(0, 1, 1)] - [InlineData(null, 0, 0)] - public void OutputPipeOptionsConfiguredCorrectly(long? maxResponseBufferSize, long expectedMaximumSizeLow, long expectedMaximumSizeHigh) - { - var serviceContext = new TestServiceContext(); - serviceContext.ServerOptions.Limits.MaxResponseBufferSize = maxResponseBufferSize; - serviceContext.Scheduler = PipeScheduler.ThreadPool; - - var mockScheduler = Mock.Of(); - var outputPipeOptions = ConnectionDispatcher.GetOutputPipeOptions(serviceContext, KestrelMemoryPool.Create(), readerScheduler: mockScheduler); - - Assert.Equal(expectedMaximumSizeLow, outputPipeOptions.ResumeWriterThreshold); - Assert.Equal(expectedMaximumSizeHigh, outputPipeOptions.PauseWriterThreshold); - Assert.Same(mockScheduler, outputPipeOptions.ReaderScheduler); - Assert.Same(serviceContext.Scheduler, outputPipeOptions.WriterScheduler); - } - - [Theory] - [InlineData(10, 10, 10)] - [InlineData(null, 0, 0)] - public void InputPipeOptionsConfiguredCorrectly(long? maxRequestBufferSize, long expectedMaximumSizeLow, long expectedMaximumSizeHigh) - { - var serviceContext = new TestServiceContext(); - serviceContext.ServerOptions.Limits.MaxRequestBufferSize = maxRequestBufferSize; - serviceContext.Scheduler = PipeScheduler.ThreadPool; - - var mockScheduler = Mock.Of(); - var inputPipeOptions = ConnectionDispatcher.GetInputPipeOptions(serviceContext, KestrelMemoryPool.Create(), writerScheduler: mockScheduler); - - Assert.Equal(expectedMaximumSizeLow, inputPipeOptions.ResumeWriterThreshold); - Assert.Equal(expectedMaximumSizeHigh, inputPipeOptions.PauseWriterThreshold); - Assert.Same(serviceContext.Scheduler, inputPipeOptions.ReaderScheduler); - Assert.Same(mockScheduler, inputPipeOptions.WriterScheduler); - } - [Theory] [InlineData(10, 10, 10)] [InlineData(null, 0, 0)] diff --git a/src/Servers/Kestrel/Core/test/PipelineExtensionTests.cs b/src/Servers/Kestrel/Core/test/PipelineExtensionTests.cs index 1e5f82677d..e2dfc2efd4 100644 --- a/src/Servers/Kestrel/Core/test/PipelineExtensionTests.cs +++ b/src/Servers/Kestrel/Core/test/PipelineExtensionTests.cs @@ -6,7 +6,6 @@ using System.Buffers; using System.IO.Pipelines; using System.Text; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests @@ -17,7 +16,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests private const int _ulongMaxValueLength = 20; private readonly Pipe _pipe; - private readonly MemoryPool _memoryPool = KestrelMemoryPool.Create(); + private readonly MemoryPool _memoryPool = MemoryPoolFactory.Create(); public PipelineExtensionTests() { diff --git a/src/Servers/Kestrel/Core/test/StartLineTests.cs b/src/Servers/Kestrel/Core/test/StartLineTests.cs index 9b9656fbba..bd4d5f4d5b 100644 --- a/src/Servers/Kestrel/Core/test/StartLineTests.cs +++ b/src/Servers/Kestrel/Core/test/StartLineTests.cs @@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Moq; using Xunit; @@ -500,7 +499,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests public StartLineTests() { - MemoryPool = KestrelMemoryPool.Create(); + MemoryPool = MemoryPoolFactory.Create(); var options = new PipeOptions(MemoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false); var pair = DuplexPipe.CreateConnectionPair(options, options); Transport = pair.Transport; diff --git a/src/Servers/Kestrel/Core/test/TestHelpers/TestInput.cs b/src/Servers/Kestrel/Core/test/TestHelpers/TestInput.cs index 81f046b10d..3a8ce70e67 100644 --- a/src/Servers/Kestrel/Core/test/TestHelpers/TestInput.cs +++ b/src/Servers/Kestrel/Core/test/TestHelpers/TestInput.cs @@ -12,7 +12,6 @@ using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.AspNetCore.Testing; using Moq; @@ -24,7 +23,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests public TestInput() { - _memoryPool = KestrelMemoryPool.Create(); + _memoryPool = MemoryPoolFactory.Create(); var options = new PipeOptions(pool: _memoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false); var pair = DuplexPipe.CreateConnectionPair(options, options); Transport = pair.Transport; diff --git a/src/Servers/Kestrel/Kestrel/src/WebHostBuilderKestrelExtensions.cs b/src/Servers/Kestrel/Kestrel/src/WebHostBuilderKestrelExtensions.cs index 62411b168d..3616679369 100644 --- a/src/Servers/Kestrel/Kestrel/src/WebHostBuilderKestrelExtensions.cs +++ b/src/Servers/Kestrel/Kestrel/src/WebHostBuilderKestrelExtensions.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; @@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Hosting return hostBuilder.ConfigureServices(services => { // Don't override an already-configured transport - services.TryAddSingleton(); + services.TryAddSingleton(); services.AddTransient, KestrelServerOptionsSetup>(); services.AddSingleton(); diff --git a/src/Servers/Kestrel/Kestrel/test/KestrelConfigurationBuilderTests.cs b/src/Servers/Kestrel/Kestrel/test/KestrelConfigurationBuilderTests.cs index c2bb493845..12d32431ae 100644 --- a/src/Servers/Kestrel/Kestrel/test/KestrelConfigurationBuilderTests.cs +++ b/src/Servers/Kestrel/Kestrel/test/KestrelConfigurationBuilderTests.cs @@ -133,7 +133,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Tests serverOptions.ConfigureEndpointDefaults(opt => { - opt.NoDelay = false; opt.Protocols = HttpProtocols.Http2; }); @@ -156,13 +155,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Tests Assert.True(opt.IsHttps); Assert.NotNull(opt.HttpsOptions.ServerCertificate); Assert.Equal(ClientCertificateMode.RequireCertificate, opt.HttpsOptions.ClientCertificateMode); - Assert.False(opt.ListenOptions.NoDelay); Assert.Equal(HttpProtocols.Http2, opt.ListenOptions.Protocols); }) .LocalhostEndpoint(5002, opt => { ran2 = true; - Assert.False(opt.NoDelay); Assert.Equal(HttpProtocols.Http2, opt.Protocols); }) .Load(); @@ -181,7 +178,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Tests serverOptions.ConfigureEndpointDefaults(opt => { - opt.NoDelay = false; opt.UseHttps(TestResources.GetTestCertificate()); }); @@ -202,12 +198,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Tests ran1 = true; Assert.True(opt.IsHttps); Assert.Equal(ClientCertificateMode.RequireCertificate, opt.HttpsOptions.ClientCertificateMode); - Assert.False(opt.ListenOptions.NoDelay); }) .LocalhostEndpoint(5002, opt => { ran2 = true; - Assert.False(opt.NoDelay); }) .Load(); diff --git a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj index 814c905495..cb32fe57c1 100644 --- a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj +++ b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.0 @@ -12,7 +12,7 @@ - + @@ -20,7 +20,6 @@ - diff --git a/src/Servers/Kestrel/Kestrel/test/WebHostBuilderKestrelExtensionsTests.cs b/src/Servers/Kestrel/Kestrel/test/WebHostBuilderKestrelExtensionsTests.cs index 7ea16d4c85..fd5c31d032 100644 --- a/src/Servers/Kestrel/Kestrel/test/WebHostBuilderKestrelExtensionsTests.cs +++ b/src/Servers/Kestrel/Kestrel/test/WebHostBuilderKestrelExtensionsTests.cs @@ -1,9 +1,9 @@ // 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 Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Server.Kestrel.Core; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal; using Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets; using Microsoft.Extensions.DependencyInjection; @@ -57,7 +57,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Tests .UseKestrel() .Configure(app => { }); - Assert.IsType(hostBuilder.Build().Services.GetService()); + Assert.IsType(hostBuilder.Build().Services.GetService()); } [Fact] @@ -68,14 +68,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Tests .UseLibuv() .Configure(app => { }); - Assert.IsType(hostBuilder.Build().Services.GetService()); + Assert.IsType(hostBuilder.Build().Services.GetService()); var hostBuilderReversed = new WebHostBuilder() .UseLibuv() .UseKestrel() .Configure(app => { }); - Assert.IsType(hostBuilderReversed.Build().Services.GetService()); + Assert.IsType(hostBuilderReversed.Build().Services.GetService()); } [Fact] @@ -86,14 +86,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Tests .UseSockets() .Configure(app => { }); - Assert.IsType(hostBuilder.Build().Services.GetService()); + Assert.IsType(hostBuilder.Build().Services.GetService()); var hostBuilderReversed = new WebHostBuilder() .UseSockets() .UseKestrel() .Configure(app => { }); - Assert.IsType(hostBuilderReversed.Build().Services.GetService()); + Assert.IsType(hostBuilderReversed.Build().Services.GetService()); } } } diff --git a/src/Servers/Kestrel/Transport.Abstractions/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.netcoreapp3.0.cs b/src/Servers/Kestrel/Transport.Abstractions/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.netcoreapp3.0.cs deleted file mode 100644 index 5420d07eac..0000000000 --- a/src/Servers/Kestrel/Transport.Abstractions/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.netcoreapp3.0.cs +++ /dev/null @@ -1,113 +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. - -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal -{ - public enum FileHandleType - { - Auto = 0, - Tcp = 1, - Pipe = 2, - } - public partial interface IApplicationTransportFeature - { - System.IO.Pipelines.IDuplexPipe Application { get; set; } - } - public partial interface IConnectionDispatcher - { - System.Threading.Tasks.Task OnConnection(Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.TransportConnection connection); - } - public partial interface IEndPointInformation - { - ulong FileHandle { get; } - Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.FileHandleType HandleType { get; set; } - System.Net.IPEndPoint IPEndPoint { get; set; } - bool NoDelay { get; } - string SocketPath { get; } - Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.ListenType Type { get; } - } - public partial interface ITransport - { - System.Threading.Tasks.Task BindAsync(); - System.Threading.Tasks.Task StopAsync(); - System.Threading.Tasks.Task UnbindAsync(); - } - public partial interface ITransportFactory - { - Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.ITransport Create(Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.IEndPointInformation endPointInformation, Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.IConnectionDispatcher dispatcher); - } - public partial interface ITransportSchedulerFeature - { - System.IO.Pipelines.PipeScheduler InputWriterScheduler { get; } - System.IO.Pipelines.PipeScheduler OutputReaderScheduler { get; } - } - public static partial class KestrelMemoryPool - { - public static readonly int MinimumSegmentSize; - public static System.Buffers.MemoryPool Create() { throw null; } - public static System.Buffers.MemoryPool CreateSlabMemoryPool() { throw null; } - } - public enum ListenType - { - IPEndPoint = 0, - SocketPath = 1, - FileHandle = 2, - } - public enum SchedulingMode - { - Default = 0, - ThreadPool = 1, - Inline = 2, - } - public abstract partial class TransportConnection : Microsoft.AspNetCore.Connections.ConnectionContext, Microsoft.AspNetCore.Connections.Features.IConnectionCompleteFeature, Microsoft.AspNetCore.Connections.Features.IConnectionHeartbeatFeature, Microsoft.AspNetCore.Connections.Features.IConnectionIdFeature, Microsoft.AspNetCore.Connections.Features.IConnectionItemsFeature, Microsoft.AspNetCore.Connections.Features.IConnectionLifetimeFeature, Microsoft.AspNetCore.Connections.Features.IConnectionLifetimeNotificationFeature, Microsoft.AspNetCore.Connections.Features.IConnectionTransportFeature, Microsoft.AspNetCore.Connections.Features.IMemoryPoolFeature, Microsoft.AspNetCore.Http.Features.IFeatureCollection, Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature, Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.IApplicationTransportFeature, Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.ITransportSchedulerFeature, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable - { - protected readonly System.Threading.CancellationTokenSource _connectionClosingCts; - public TransportConnection() { } - public System.IO.Pipelines.IDuplexPipe Application { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Threading.CancellationToken ConnectionClosed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Threading.CancellationToken ConnectionClosedRequested { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public override string ConnectionId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public override Microsoft.AspNetCore.Http.Features.IFeatureCollection Features { get { throw null; } } - public System.IO.Pipelines.PipeWriter Input { get { throw null; } } - public virtual System.IO.Pipelines.PipeScheduler InputWriterScheduler { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public override System.Collections.Generic.IDictionary Items { get { throw null; } set { } } - public System.Net.IPAddress LocalAddress { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int LocalPort { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - protected internal virtual Microsoft.Extensions.Logging.ILogger Logger { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Buffers.MemoryPool MemoryPool { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - System.Collections.Generic.IDictionary Microsoft.AspNetCore.Connections.Features.IConnectionItemsFeature.Items { get { throw null; } set { } } - System.Threading.CancellationToken Microsoft.AspNetCore.Connections.Features.IConnectionLifetimeFeature.ConnectionClosed { get { throw null; } set { } } - System.Threading.CancellationToken Microsoft.AspNetCore.Connections.Features.IConnectionLifetimeNotificationFeature.ConnectionClosedRequested { get { throw null; } set { } } - System.IO.Pipelines.IDuplexPipe Microsoft.AspNetCore.Connections.Features.IConnectionTransportFeature.Transport { get { throw null; } set { } } - System.Buffers.MemoryPool Microsoft.AspNetCore.Connections.Features.IMemoryPoolFeature.MemoryPool { get { throw null; } } - bool Microsoft.AspNetCore.Http.Features.IFeatureCollection.IsReadOnly { get { throw null; } } - object Microsoft.AspNetCore.Http.Features.IFeatureCollection.this[System.Type key] { get { throw null; } set { } } - int Microsoft.AspNetCore.Http.Features.IFeatureCollection.Revision { get { throw null; } } - string Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature.ConnectionId { get { throw null; } set { } } - System.Net.IPAddress Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature.LocalIpAddress { get { throw null; } set { } } - int Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature.LocalPort { get { throw null; } set { } } - System.Net.IPAddress Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature.RemoteIpAddress { get { throw null; } set { } } - int Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature.RemotePort { get { throw null; } set { } } - System.IO.Pipelines.IDuplexPipe Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.IApplicationTransportFeature.Application { get { throw null; } set { } } - System.IO.Pipelines.PipeScheduler Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.ITransportSchedulerFeature.InputWriterScheduler { get { throw null; } } - System.IO.Pipelines.PipeScheduler Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.ITransportSchedulerFeature.OutputReaderScheduler { get { throw null; } } - public System.IO.Pipelines.PipeReader Output { get { throw null; } } - public virtual System.IO.Pipelines.PipeScheduler OutputReaderScheduler { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Net.IPAddress RemoteAddress { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int RemotePort { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public override System.IO.Pipelines.IDuplexPipe Transport { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public override void Abort(Microsoft.AspNetCore.Connections.ConnectionAbortedException abortReason) { } - public System.Threading.Tasks.Task CompleteAsync() { throw null; } - void Microsoft.AspNetCore.Connections.Features.IConnectionCompleteFeature.OnCompleted(System.Func callback, object state) { } - void Microsoft.AspNetCore.Connections.Features.IConnectionHeartbeatFeature.OnHeartbeat(System.Action action, object state) { } - void Microsoft.AspNetCore.Connections.Features.IConnectionLifetimeFeature.Abort() { } - void Microsoft.AspNetCore.Connections.Features.IConnectionLifetimeNotificationFeature.RequestClose() { } - TFeature Microsoft.AspNetCore.Http.Features.IFeatureCollection.Get() { throw null; } - void Microsoft.AspNetCore.Http.Features.IFeatureCollection.Set(TFeature feature) { } - public void OnHeartbeat(System.Action action, object state) { } - public void RequestClose() { } - System.Collections.Generic.IEnumerator> System.Collections.Generic.IEnumerable>.GetEnumerator() { throw null; } - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } - public void TickHeartbeat() { } - } -} diff --git a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/IApplicationTransportFeature.cs b/src/Servers/Kestrel/Transport.Abstractions/src/Internal/IApplicationTransportFeature.cs deleted file mode 100644 index 8aa8328a6b..0000000000 --- a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/IApplicationTransportFeature.cs +++ /dev/null @@ -1,12 +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.IO.Pipelines; - -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal -{ - public interface IApplicationTransportFeature - { - IDuplexPipe Application { get; set; } - } -} diff --git a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/IConnectionDispatcher.cs b/src/Servers/Kestrel/Transport.Abstractions/src/Internal/IConnectionDispatcher.cs deleted file mode 100644 index 813c541d1a..0000000000 --- a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/IConnectionDispatcher.cs +++ /dev/null @@ -1,12 +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.Threading.Tasks; - -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal -{ - public interface IConnectionDispatcher - { - Task OnConnection(TransportConnection connection); - } -} diff --git a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/IEndPointInformation.cs b/src/Servers/Kestrel/Transport.Abstractions/src/Internal/IEndPointInformation.cs deleted file mode 100644 index 1b7abfa497..0000000000 --- a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/IEndPointInformation.cs +++ /dev/null @@ -1,46 +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.Net; - -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal -{ - public interface IEndPointInformation - { - /// - /// The type of interface being described: either an , Unix domain socket path, or a file descriptor. - /// - ListenType Type { get; } - - // IPEndPoint is mutable so port 0 can be updated to the bound port. - /// - /// The to bind to. - /// Only set if is . - /// - IPEndPoint IPEndPoint { get; set; } - - /// - /// The absolute path to a Unix domain socket to bind to. - /// Only set if is . - /// - string SocketPath { get; } - - /// - /// A file descriptor for the socket to open. - /// Only set if is . - /// - ulong FileHandle { get; } - - // HandleType is mutable so it can be re-specified later. - /// - /// The type of file descriptor being used. - /// Only set if is . - /// - FileHandleType HandleType { get; set; } - - /// - /// Set to false to enable Nagle's algorithm for all connections. - /// - bool NoDelay { get; } - } -} diff --git a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/ITransport.cs b/src/Servers/Kestrel/Transport.Abstractions/src/Internal/ITransport.cs deleted file mode 100644 index 5a6dc0c20c..0000000000 --- a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/ITransport.cs +++ /dev/null @@ -1,15 +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.Threading.Tasks; - -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal -{ - public interface ITransport - { - // Can only be called once per ITransport - Task BindAsync(); - Task UnbindAsync(); - Task StopAsync(); - } -} diff --git a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/ITransportFactory.cs b/src/Servers/Kestrel/Transport.Abstractions/src/Internal/ITransportFactory.cs deleted file mode 100644 index 4037467e87..0000000000 --- a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/ITransportFactory.cs +++ /dev/null @@ -1,10 +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. - -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal -{ - public interface ITransportFactory - { - ITransport Create(IEndPointInformation endPointInformation, IConnectionDispatcher dispatcher); - } -} diff --git a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/ITransportSchedulerFeature.cs b/src/Servers/Kestrel/Transport.Abstractions/src/Internal/ITransportSchedulerFeature.cs deleted file mode 100644 index c4df6d5a37..0000000000 --- a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/ITransportSchedulerFeature.cs +++ /dev/null @@ -1,14 +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.IO.Pipelines; - -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal -{ - public interface ITransportSchedulerFeature - { - PipeScheduler InputWriterScheduler { get; } - - PipeScheduler OutputReaderScheduler { get; } - } -} diff --git a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/ListenType.cs b/src/Servers/Kestrel/Transport.Abstractions/src/Internal/ListenType.cs deleted file mode 100644 index 3616f1967e..0000000000 --- a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/ListenType.cs +++ /dev/null @@ -1,15 +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. - -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal -{ - /// - /// Enumerates the types. - /// - public enum ListenType - { - IPEndPoint, - SocketPath, - FileHandle - } -} diff --git a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/SchedulingMode.cs b/src/Servers/Kestrel/Transport.Abstractions/src/Internal/SchedulingMode.cs deleted file mode 100644 index 881006087c..0000000000 --- a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/SchedulingMode.cs +++ /dev/null @@ -1,12 +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. - -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal -{ - public enum SchedulingMode - { - Default, - ThreadPool, - Inline - } -} diff --git a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/TransportConnection.FeatureCollection.cs b/src/Servers/Kestrel/Transport.Abstractions/src/Internal/TransportConnection.FeatureCollection.cs deleted file mode 100644 index 7f98162507..0000000000 --- a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/TransportConnection.FeatureCollection.cs +++ /dev/null @@ -1,188 +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.Buffers; -using System.Collections.Generic; -using System.IO.Pipelines; -using System.Net; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Connections.Features; -using Microsoft.AspNetCore.Http.Features; -using Microsoft.Extensions.Logging; - -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal -{ - public partial class TransportConnection : IHttpConnectionFeature, - IConnectionIdFeature, - IConnectionTransportFeature, - IConnectionItemsFeature, - IMemoryPoolFeature, - IApplicationTransportFeature, - ITransportSchedulerFeature, - IConnectionLifetimeFeature, - IConnectionHeartbeatFeature, - IConnectionLifetimeNotificationFeature, - IConnectionCompleteFeature - { - // NOTE: When feature interfaces are added to or removed from this TransportConnection class implementation, - // then the list of `features` in the generated code project MUST also be updated. - // See also: tools/CodeGenerator/TransportConnectionFeatureCollection.cs - - private Stack, object>> _onCompleted; - private bool _completed; - - string IHttpConnectionFeature.ConnectionId - { - get => ConnectionId; - set => ConnectionId = value; - } - - IPAddress IHttpConnectionFeature.RemoteIpAddress - { - get => RemoteAddress; - set => RemoteAddress = value; - } - - IPAddress IHttpConnectionFeature.LocalIpAddress - { - get => LocalAddress; - set => LocalAddress = value; - } - - int IHttpConnectionFeature.RemotePort - { - get => RemotePort; - set => RemotePort = value; - } - - int IHttpConnectionFeature.LocalPort - { - get => LocalPort; - set => LocalPort = value; - } - - MemoryPool IMemoryPoolFeature.MemoryPool => MemoryPool; - - IDuplexPipe IConnectionTransportFeature.Transport - { - get => Transport; - set => Transport = value; - } - - IDuplexPipe IApplicationTransportFeature.Application - { - get => Application; - set => Application = value; - } - - IDictionary IConnectionItemsFeature.Items - { - get => Items; - set => Items = value; - } - - PipeScheduler ITransportSchedulerFeature.InputWriterScheduler => InputWriterScheduler; - PipeScheduler ITransportSchedulerFeature.OutputReaderScheduler => OutputReaderScheduler; - - CancellationToken IConnectionLifetimeFeature.ConnectionClosed - { - get => ConnectionClosed; - set => ConnectionClosed = value; - } - - CancellationToken IConnectionLifetimeNotificationFeature.ConnectionClosedRequested - { - get => ConnectionClosedRequested; - set => ConnectionClosedRequested = value; - } - - void IConnectionLifetimeFeature.Abort() => Abort(new ConnectionAbortedException("The connection was aborted by the application via IConnectionLifetimeFeature.Abort().")); - - void IConnectionLifetimeNotificationFeature.RequestClose() => RequestClose(); - - void IConnectionHeartbeatFeature.OnHeartbeat(System.Action action, object state) - { - OnHeartbeat(action, state); - } - - void IConnectionCompleteFeature.OnCompleted(Func callback, object state) - { - if (_completed) - { - throw new InvalidOperationException("The connection is already complete."); - } - - if (_onCompleted == null) - { - _onCompleted = new Stack, object>>(); - } - _onCompleted.Push(new KeyValuePair, object>(callback, state)); - } - - public Task CompleteAsync() - { - if (_completed) - { - throw new InvalidOperationException("The connection is already complete."); - } - - _completed = true; - var onCompleted = _onCompleted; - - if (onCompleted == null || onCompleted.Count == 0) - { - return Task.CompletedTask; - } - - return CompleteAsyncMayAwait(onCompleted); - } - - private Task CompleteAsyncMayAwait(Stack, object>> onCompleted) - { - while (onCompleted.TryPop(out var entry)) - { - try - { - var task = entry.Key.Invoke(entry.Value); - if (!ReferenceEquals(task, Task.CompletedTask)) - { - return CompleteAsyncAwaited(task, onCompleted); - } - } - catch (Exception ex) - { - Logger?.LogError(ex, "An error occured running an IConnectionCompleteFeature.OnCompleted callback."); - } - } - - return Task.CompletedTask; - } - - private async Task CompleteAsyncAwaited(Task currentTask, Stack, object>> onCompleted) - { - try - { - await currentTask; - } - catch (Exception ex) - { - Logger?.LogError(ex, "An error occured running an IConnectionCompleteFeature.OnCompleted callback."); - } - - while (onCompleted.TryPop(out var entry)) - { - try - { - await entry.Key.Invoke(entry.Value); - } - catch (Exception ex) - { - Logger?.LogError(ex, "An error occured running an IConnectionCompleteFeature.OnCompleted callback."); - } - } - } - } -} diff --git a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/TransportConnection.cs b/src/Servers/Kestrel/Transport.Abstractions/src/Internal/TransportConnection.cs deleted file mode 100644 index e3d012cc27..0000000000 --- a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/TransportConnection.cs +++ /dev/null @@ -1,121 +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.Buffers; -using System.Collections.Generic; -using System.IO.Pipelines; -using System.Net; -using System.Threading; -using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Http.Features; -using Microsoft.Extensions.Logging; - -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal -{ - public abstract partial class TransportConnection : ConnectionContext - { - private IDictionary _items; - private List<(Action handler, object state)> _heartbeatHandlers; - private readonly object _heartbeatLock = new object(); - protected readonly CancellationTokenSource _connectionClosingCts = new CancellationTokenSource(); - - public TransportConnection() - { - FastReset(); - - ConnectionClosedRequested = _connectionClosingCts.Token; - } - - public IPAddress RemoteAddress { get; set; } - public int RemotePort { get; set; } - public IPAddress LocalAddress { get; set; } - public int LocalPort { get; set; } - - public override string ConnectionId { get; set; } - - public override IFeatureCollection Features => this; - - protected internal virtual ILogger Logger { get; set; } - - public virtual MemoryPool MemoryPool { get; } - public virtual PipeScheduler InputWriterScheduler { get; } - public virtual PipeScheduler OutputReaderScheduler { get; } - - public override IDuplexPipe Transport { get; set; } - public IDuplexPipe Application { get; set; } - - public override IDictionary Items - { - get - { - // Lazily allocate connection metadata - return _items ?? (_items = new ConnectionItems()); - } - set - { - _items = value; - } - } - - public PipeWriter Input => Application.Output; - public PipeReader Output => Application.Input; - - public CancellationToken ConnectionClosed { get; set; } - - public CancellationToken ConnectionClosedRequested { get; set; } - - public void TickHeartbeat() - { - lock (_heartbeatLock) - { - if (_heartbeatHandlers == null) - { - return; - } - - foreach (var (handler, state) in _heartbeatHandlers) - { - handler(state); - } - } - } - - public void OnHeartbeat(Action action, object state) - { - lock (_heartbeatLock) - { - if (_heartbeatHandlers == null) - { - _heartbeatHandlers = new List<(Action handler, object state)>(); - } - - _heartbeatHandlers.Add((action, state)); - } - } - - // DO NOT remove this override to ConnectionContext.Abort. Doing so would cause - // any TransportConnection that does not override Abort or calls base.Abort - // to stack overflow when IConnectionLifetimeFeature.Abort() is called. - // That said, all derived types should override this method should override - // this implementation of Abort because canceling pending output reads is not - // sufficient to abort the connection if there is backpressure. - public override void Abort(ConnectionAbortedException abortReason) - { - Output.CancelPendingRead(); - } - - public void RequestClose() - { - try - { - _connectionClosingCts.Cancel(); - } - catch (ObjectDisposedException) - { - // There's a race where the token could be disposed - // swallow the exception and no-op - } - } - } -} diff --git a/src/Servers/Kestrel/Transport.Abstractions/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj b/src/Servers/Kestrel/Transport.Abstractions/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj deleted file mode 100644 index 9f9270d232..0000000000 --- a/src/Servers/Kestrel/Transport.Abstractions/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - Transport abstractions for the ASP.NET Core Kestrel cross-platform web server. - netcoreapp3.0 - true - true - aspnetcore;kestrel - CS1570;CS1571;CS1572;CS1573;CS1574;CS1591;$(NoWarn) - true - false - - - - - - - - - - - - diff --git a/src/Servers/Kestrel/Transport.Abstractions/src/Properties/AssemblyInfo.cs b/src/Servers/Kestrel/Transport.Abstractions/src/Properties/AssemblyInfo.cs deleted file mode 100644 index fe6f597c72..0000000000 --- a/src/Servers/Kestrel/Transport.Abstractions/src/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +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.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Core, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Core.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Sockets.FunctionalTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Libuv.FunctionalTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("InMemory.FunctionalTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Sockets.BindTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Libuv.BindTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/Servers/Kestrel/Transport.Libuv/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj b/src/Servers/Kestrel/Transport.Libuv/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj index 381c885bdd..366ac6ec5c 100644 --- a/src/Servers/Kestrel/Transport.Libuv/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj +++ b/src/Servers/Kestrel/Transport.Libuv/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj @@ -7,8 +7,9 @@ - + + diff --git a/src/Servers/Kestrel/Transport.Libuv/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.netcoreapp3.0.cs b/src/Servers/Kestrel/Transport.Libuv/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.netcoreapp3.0.cs index 8e37f8714d..f24337e79d 100644 --- a/src/Servers/Kestrel/Transport.Libuv/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.netcoreapp3.0.cs +++ b/src/Servers/Kestrel/Transport.Libuv/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.netcoreapp3.0.cs @@ -14,6 +14,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv public partial class LibuvTransportOptions { public LibuvTransportOptions() { } + public long? MaxReadBufferSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public long? MaxWriteBufferSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool NoDelay { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public int ThreadCount { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } } } diff --git a/src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvConnection.cs b/src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvConnection.cs index adcc5cd09d..962359bd8f 100644 --- a/src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvConnection.cs +++ b/src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvConnection.cs @@ -9,15 +9,14 @@ using System.Net; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal.Networking; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal { - internal partial class LibuvConnection : TransportConnection, IDisposable + internal partial class LibuvConnection : TransportConnection { - private static readonly int MinAllocBufferSize = KestrelMemoryPool.MinimumSegmentSize / 2; + private static readonly int MinAllocBufferSize = SlabMemoryPool.BlockSize / 2; private static readonly Action _readCallback = (handle, status, state) => ReadCallback(handle, status, state); @@ -31,31 +30,55 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal private volatile ConnectionAbortedException _abortReason; private MemoryHandle _bufferHandle; + private Task _processingTask; - public LibuvConnection(UvStreamHandle socket, ILibuvTrace log, LibuvThread thread, IPEndPoint remoteEndPoint, IPEndPoint localEndPoint) + public LibuvConnection(UvStreamHandle socket, + ILibuvTrace log, + LibuvThread thread, + IPEndPoint remoteEndPoint, + IPEndPoint localEndPoint, + PipeOptions inputOptions = null, + PipeOptions outputOptions = null, + long? maxReadBufferSize = null, + long? maxWriteBufferSize = null) { _socket = socket; - RemoteAddress = remoteEndPoint?.Address; - RemotePort = remoteEndPoint?.Port ?? 0; - - LocalAddress = localEndPoint?.Address; - LocalPort = localEndPoint?.Port ?? 0; + LocalEndPoint = localEndPoint; + RemoteEndPoint = remoteEndPoint; ConnectionClosed = _connectionClosedTokenSource.Token; - Logger = log; Log = log; Thread = thread; + + maxReadBufferSize ??= 0; + maxWriteBufferSize ??= 0; + + inputOptions ??= new PipeOptions(MemoryPool, PipeScheduler.ThreadPool, Thread, maxReadBufferSize.Value, maxReadBufferSize.Value / 2, useSynchronizationContext: false); + outputOptions ??= new PipeOptions(MemoryPool, Thread, PipeScheduler.ThreadPool, maxWriteBufferSize.Value, maxWriteBufferSize.Value / 2, useSynchronizationContext: false); + + var pair = DuplexPipe.CreateConnectionPair(inputOptions, outputOptions); + + // Set the transport and connection id + Transport = pair.Transport; + Application = pair.Application; } + public PipeWriter Input => Application.Output; + + public PipeReader Output => Application.Input; + public LibuvOutputConsumer OutputConsumer { get; set; } private ILibuvTrace Log { get; } private LibuvThread Thread { get; } public override MemoryPool MemoryPool => Thread.MemoryPool; - public override PipeScheduler InputWriterScheduler => Thread; - public override PipeScheduler OutputReaderScheduler => Thread; - public async Task Start() + public void Start() + { + _processingTask = StartCore(); + } + + private async Task StartCore() { try { @@ -96,7 +119,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal } finally { - inputError = inputError ?? _abortReason ?? new ConnectionAbortedException("The libuv transport's send loop completed gracefully."); + inputError ??= _abortReason ?? new ConnectionAbortedException("The libuv transport's send loop completed gracefully."); // Now, complete the input so that no more reads can happen Input.Complete(inputError); @@ -111,7 +134,22 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal // We're done with the socket now _socket.Dispose(); - ThreadPool.UnsafeQueueUserWorkItem(state => ((LibuvConnection)state).CancelConnectionClosedToken(), this); + + // Fire the connection closed token and wait for it to complete + var waitForConnectionClosedTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + ThreadPool.UnsafeQueueUserWorkItem(state => + { + (var connection, var tcs) = state; + + connection.CancelConnectionClosedToken(); + + tcs.TrySetResult(null); + }, + (this, waitForConnectionClosedTcs), + preferLocal: false); + + await waitForConnectionClosedTcs.Task; } } catch (Exception e) @@ -123,7 +161,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal public override void Abort(ConnectionAbortedException abortReason) { _abortReason = abortReason; - + // Cancel WriteOutputAsync loop after setting _abortReason. Output.CancelPendingRead(); @@ -131,11 +169,17 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal Thread.Post(s => s.Dispose(), _socket); } - // Only called after connection middleware is complete which means the ConnectionClosed token has fired. - public void Dispose() + public override async ValueTask DisposeAsync() { + Transport.Input.Complete(); + Transport.Output.Complete(); + + if (_processingTask != null) + { + await _processingTask; + } + _connectionClosedTokenSource.Dispose(); - _connectionClosingCts.Dispose(); } // Called on Libuv thread diff --git a/src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvTransport.cs b/src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvConnectionListener.cs similarity index 51% rename from src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvTransport.cs rename to src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvConnectionListener.cs index 4bbeae88f1..d1b2e9a8e7 100644 --- a/src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvTransport.cs +++ b/src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvConnectionListener.cs @@ -4,32 +4,34 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Net; +using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal.Networking; -using Microsoft.Extensions.Logging; using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal { - internal class LibuvTransport : ITransport + internal class LibuvConnectionListener : IConnectionListener { - private readonly IEndPointInformation _endPointInformation; + private readonly List _listeners = new List(); + private IAsyncEnumerator _acceptEnumerator; + private bool _stopped; + private bool _disposed; - private readonly List _listeners = new List(); - - public LibuvTransport(LibuvTransportContext context, IEndPointInformation endPointInformation) - : this(new LibuvFunctions(), context, endPointInformation) + public LibuvConnectionListener(LibuvTransportContext context, EndPoint endPoint) + : this(new LibuvFunctions(), context, endPoint) { } // For testing - public LibuvTransport(LibuvFunctions uv, LibuvTransportContext context, IEndPointInformation endPointInformation) + public LibuvConnectionListener(LibuvFunctions uv, LibuvTransportContext context, EndPoint endPoint) { Libuv = uv; TransportContext = context; - _endPointInformation = endPointInformation; + EndPoint = endPoint; } public LibuvFunctions Libuv { get; } @@ -40,7 +42,64 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal public ILibuvTrace Log => TransportContext.Log; public LibuvTransportOptions TransportOptions => TransportContext.Options; - public async Task StopAsync() + public EndPoint EndPoint { get; set; } + + public async ValueTask AcceptAsync(CancellationToken cancellationToken = default) + { + if (_disposed) + { + throw new ObjectDisposedException(GetType().FullName); + } + + if (await _acceptEnumerator.MoveNextAsync()) + { + return _acceptEnumerator.Current; + } + + // null means we're done... + return null; + } + + public async ValueTask UnbindAsync(CancellationToken cancellationToken = default) + { + if (_stopped) + { + return; + } + + _stopped = true; + + var disposeTasks = _listeners.Select(listener => ((IAsyncDisposable)listener).DisposeAsync()).ToArray(); + + if (!await WaitAsync(Task.WhenAll(disposeTasks), TimeSpan.FromSeconds(5)).ConfigureAwait(false)) + { + Log.LogError(0, null, "Disposing listeners failed"); + } + } + + + public async ValueTask DisposeAsync() + { + if (_disposed) + { + return; + } + + _disposed = true; + + await UnbindAsync().ConfigureAwait(false); + + foreach (var listener in _listeners) + { + await listener.AbortQueuedConnectionAsync().ConfigureAwait(false); + } + + _listeners.Clear(); + + await StopThreadsAsync().ConfigureAwait(false); + } + + internal async Task StopThreadsAsync() { try { @@ -68,13 +127,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal #endif } - public async Task BindAsync() + internal async Task BindAsync() { // TODO: Move thread management to LibuvTransportFactory // TODO: Split endpoint management from thread management for (var index = 0; index < TransportOptions.ThreadCount; index++) { - Threads.Add(new LibuvThread(this)); + Threads.Add(new LibuvThread(Libuv, TransportContext)); } foreach (var thread in Threads) @@ -88,7 +147,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal { var listener = new Listener(TransportContext); _listeners.Add(listener); - await listener.StartAsync(_endPointInformation, Threads[0]).ConfigureAwait(false); + await listener.StartAsync(EndPoint, Threads[0]).ConfigureAwait(false); + EndPoint = listener.EndPoint; } else { @@ -97,15 +157,17 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal var listenerPrimary = new ListenerPrimary(TransportContext); _listeners.Add(listenerPrimary); - await listenerPrimary.StartAsync(pipeName, pipeMessage, _endPointInformation, Threads[0]).ConfigureAwait(false); + await listenerPrimary.StartAsync(pipeName, pipeMessage, EndPoint, Threads[0]).ConfigureAwait(false); + EndPoint = listenerPrimary.EndPoint; foreach (var thread in Threads.Skip(1)) { var listenerSecondary = new ListenerSecondary(TransportContext); _listeners.Add(listenerSecondary); - await listenerSecondary.StartAsync(pipeName, pipeMessage, _endPointInformation, thread).ConfigureAwait(false); + await listenerSecondary.StartAsync(pipeName, pipeMessage, EndPoint, thread).ConfigureAwait(false); } } + _acceptEnumerator = AcceptConnections(); } catch (UvException ex) when (ex.StatusCode == LibuvConstants.EADDRINUSE) { @@ -119,16 +181,45 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal } } - public async Task UnbindAsync() + private async IAsyncEnumerator AcceptConnections() { - var disposeTasks = _listeners.Select(listener => listener.DisposeAsync()).ToArray(); + var slots = new Task<(LibuvConnection, int)>[_listeners.Count]; + // This is the task we'll put in the slot when each listening completes. It'll prevent + // us from having to shrink the array. We'll just loop while there are active slots. + var incompleteTask = new TaskCompletionSource<(LibuvConnection, int)>().Task; - if (!await WaitAsync(Task.WhenAll(disposeTasks), TimeSpan.FromSeconds(5)).ConfigureAwait(false)) + var remainingSlots = slots.Length; + + // Issue parallel accepts on all listeners + for (int i = 0; i < remainingSlots; i++) { - Log.LogError(0, null, "Disposing listeners failed"); + slots[i] = AcceptAsync(_listeners[i], i); } - _listeners.Clear(); + while (remainingSlots > 0) + { + // Calling GetAwaiter().GetResult() is safe because we know the task is completed + (var connection, var slot) = (await Task.WhenAny(slots)).GetAwaiter().GetResult(); + + // If the connection is null then the listener was closed + if (connection == null) + { + remainingSlots--; + slots[slot] = incompleteTask; + } + else + { + // Fill that slot with another accept and yield the connection + slots[slot] = AcceptAsync(_listeners[slot], slot); + + yield return connection; + } + } + + static async Task<(LibuvConnection, int)> AcceptAsync(ListenerContext listener, int slot) + { + return (await listener.AcceptAsync(), slot); + } } private static async Task WaitAsync(Task task, TimeSpan timeout) diff --git a/src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvThread.cs b/src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvThread.cs index 9d50eb5f67..de212ca89d 100644 --- a/src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvThread.cs +++ b/src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvThread.cs @@ -20,9 +20,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal // maximum times the work queues swapped and are processed in a single pass // as completing a task may immediately have write data to put on the network // otherwise it needs to wait till the next pass of the libuv loop - private readonly int _maxLoops = 8; + private readonly int _maxLoops; - private readonly LibuvTransport _transport; + private readonly LibuvFunctions _libuv; private readonly IHostApplicationLifetime _appLifetime; private readonly Thread _thread; private readonly TaskCompletionSource _threadTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); @@ -40,13 +40,19 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal private Exception _closeError; private readonly ILibuvTrace _log; - public LibuvThread(LibuvTransport transport) + public LibuvThread(LibuvFunctions libuv, LibuvTransportContext libuvTransportContext, int maxLoops = 8) + : this(libuv, libuvTransportContext.AppLifetime, libuvTransportContext.Options.MemoryPoolFactory(), libuvTransportContext.Log, maxLoops) { - _transport = transport; - _appLifetime = transport.AppLifetime; - _log = transport.Log; + } + + public LibuvThread(LibuvFunctions libuv, IHostApplicationLifetime appLifetime, MemoryPool pool, ILibuvTrace log, int maxLoops = 8) + { + _libuv = libuv; + _appLifetime = appLifetime; + _log = log; _loop = new UvLoopHandle(_log); _post = new UvAsyncHandle(_log); + _maxLoops = maxLoops; _thread = new Thread(ThreadStart); #if !INNER_LOOP @@ -60,17 +66,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal #endif QueueCloseHandle = PostCloseHandle; QueueCloseAsyncHandle = EnqueueCloseHandle; - MemoryPool = transport.TransportOptions.MemoryPoolFactory(); + MemoryPool = pool; WriteReqPool = new WriteReqPool(this, _log); } - // For testing - public LibuvThread(LibuvTransport transport, int maxLoops) - : this(transport) - { - _maxLoops = maxLoops; - } - public UvLoopHandle Loop { get { return _loop; } } public MemoryPool MemoryPool { get; } @@ -113,13 +112,17 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal Post(t => t.AllowStop()); if (!await WaitAsync(_threadTcs.Task, stepTimeout).ConfigureAwait(false)) { + _log.LogCritical($"{nameof(LibuvThread)}.{nameof(StopAsync)} failed to terminate libuv thread, {nameof(AllowStop)}"); + Post(t => t.OnStopRude()); if (!await WaitAsync(_threadTcs.Task, stepTimeout).ConfigureAwait(false)) { + _log.LogCritical($"{nameof(LibuvThread)}.{nameof(StopAsync)} failed to terminate libuv thread, {nameof(OnStopRude)}."); + Post(t => t.OnStopImmediate()); if (!await WaitAsync(_threadTcs.Task, stepTimeout).ConfigureAwait(false)) { - _log.LogCritical($"{nameof(LibuvThread)}.{nameof(StopAsync)} failed to terminate libuv thread."); + _log.LogCritical($"{nameof(LibuvThread)}.{nameof(StopAsync)} failed to terminate libuv thread, {nameof(OnStopImmediate)}."); } } } @@ -253,7 +256,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal private void Walk(LibuvFunctions.uv_walk_cb callback, IntPtr arg) { - _transport.Libuv.walk( + _libuv.walk( _loop, callback, arg @@ -282,7 +285,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal var tcs = (TaskCompletionSource)parameter; try { - _loop.Init(_transport.Libuv); + _loop.Init(_libuv); _post.Init(_loop, OnPost, EnqueueCloseHandle); _initCompleted = true; tcs.SetResult(0); diff --git a/src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvTransportContext.cs b/src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvTransportContext.cs index 7f9e1d62f9..973a0fec06 100644 --- a/src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvTransportContext.cs +++ b/src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvTransportContext.cs @@ -1,7 +1,6 @@ // 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 Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.Extensions.Hosting; namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal @@ -13,7 +12,5 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal public IHostApplicationLifetime AppLifetime { get; set; } public ILibuvTrace Log { get; set; } - - public IConnectionDispatcher ConnectionDispatcher { get; set; } } } diff --git a/src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvTransportFactory.cs b/src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvTransportFactory.cs index 485582355d..689c473195 100644 --- a/src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvTransportFactory.cs +++ b/src/Servers/Kestrel/Transport.Libuv/src/Internal/LibuvTransportFactory.cs @@ -2,14 +2,17 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; +using System.Net; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Connections; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal { - internal class LibuvTransportFactory : ITransportFactory + internal class LibuvTransportFactory : IConnectionListenerFactory { private readonly LibuvTransportContext _baseTransportContext; @@ -31,7 +34,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal throw new ArgumentNullException(nameof(loggerFactory)); } - var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv"); + var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv"); var trace = new LibuvTrace(logger); var threadCount = options.Value.ThreadCount; @@ -61,17 +64,18 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal }; } - public ITransport Create(IEndPointInformation endPointInformation, IConnectionDispatcher dispatcher) + public async ValueTask BindAsync(EndPoint endpoint, CancellationToken cancellationToken = default) { var transportContext = new LibuvTransportContext { Options = _baseTransportContext.Options, AppLifetime = _baseTransportContext.AppLifetime, - Log = _baseTransportContext.Log, - ConnectionDispatcher = dispatcher + Log = _baseTransportContext.Log }; - return new LibuvTransport(transportContext, endPointInformation); + var transport = new LibuvConnectionListener(transportContext, endpoint); + await transport.BindAsync(); + return transport; } } } diff --git a/src/Servers/Kestrel/Transport.Libuv/src/Internal/Listener.cs b/src/Servers/Kestrel/Transport.Libuv/src/Internal/Listener.cs index 010a84e006..9dc11a31a4 100644 --- a/src/Servers/Kestrel/Transport.Libuv/src/Internal/Listener.cs +++ b/src/Servers/Kestrel/Transport.Libuv/src/Internal/Listener.cs @@ -2,8 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Net; +using System.Net.Sockets; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal.Networking; using Microsoft.Extensions.Logging; @@ -14,6 +16,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal /// internal class Listener : ListenerContext, IAsyncDisposable { + // REVIEW: This needs to be bounded and we need a strategy for what to do when the queue is full private bool _closed; public Listener(LibuvTransportContext transportContext) : base(transportContext) @@ -25,10 +28,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal public ILibuvTrace Log => TransportContext.Log; public Task StartAsync( - IEndPointInformation endPointInformation, + EndPoint endPoint, LibuvThread thread) { - EndPointInformation = endPointInformation; + EndPoint = endPoint; Thread = thread; return Thread.PostAsync(listener => @@ -43,13 +46,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal /// private UvStreamHandle CreateListenSocket() { - switch (EndPointInformation.Type) + switch (EndPoint) { - case ListenType.IPEndPoint: + case IPEndPoint _: return ListenTcp(useFileHandle: false); - case ListenType.SocketPath: + case UnixDomainSocketEndPoint _: return ListenPipe(useFileHandle: false); - case ListenType.FileHandle: + case FileHandleEndPoint _: return ListenHandle(); default: throw new NotSupportedException(); @@ -63,18 +66,18 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal try { socket.Init(Thread.Loop, Thread.QueueCloseHandle); - socket.NoDelay(EndPointInformation.NoDelay); + socket.NoDelay(TransportContext.Options.NoDelay); if (!useFileHandle) { - socket.Bind(EndPointInformation.IPEndPoint); + socket.Bind((IPEndPoint)EndPoint); // If requested port was "0", replace with assigned dynamic port. - EndPointInformation.IPEndPoint = socket.GetSockIPEndPoint(); + EndPoint = socket.GetSockIPEndPoint(); } else { - socket.Open((IntPtr)EndPointInformation.FileHandle); + socket.Open((IntPtr)((FileHandleEndPoint)EndPoint).FileHandle); } } catch @@ -96,11 +99,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal if (!useFileHandle) { - pipe.Bind(EndPointInformation.SocketPath); + // UnixDomainSocketEndPoint.ToString() returns the path + pipe.Bind(EndPoint.ToString()); } else { - pipe.Open((IntPtr)EndPointInformation.FileHandle); + pipe.Open((IntPtr)((FileHandleEndPoint)EndPoint).FileHandle); } } catch @@ -114,7 +118,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal private UvStreamHandle ListenHandle() { - switch (EndPointInformation.HandleType) + var handleEndPoint = (FileHandleEndPoint)EndPoint; + + switch (handleEndPoint.FileHandleType) { case FileHandleType.Auto: break; @@ -130,7 +136,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal try { handle = ListenTcp(useFileHandle: true); - EndPointInformation.HandleType = FileHandleType.Tcp; + EndPoint = new FileHandleEndPoint(handleEndPoint.FileHandle, FileHandleType.Tcp); return handle; } catch (UvException exception) when (exception.StatusCode == LibuvConstants.ENOTSUP) @@ -139,7 +145,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal } handle = ListenPipe(useFileHandle: true); - EndPointInformation.HandleType = FileHandleType.Pipe; + EndPoint = new FileHandleEndPoint(handleEndPoint.FileHandle, FileHandleType.Pipe); return handle; } @@ -186,9 +192,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal protected virtual void DispatchConnection(UvStreamHandle socket) { - // REVIEW: This task should be tracked by the server for graceful shutdown - // Today it's handled specifically for http but not for arbitrary middleware - _ = HandleConnectionAsync(socket); + HandleConnection(socket); } public virtual async Task DisposeAsync() @@ -205,6 +209,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal listener._closed = true; + listener.StopAcceptingConnections(); + }, this).ConfigureAwait(false); } diff --git a/src/Servers/Kestrel/Transport.Libuv/src/Internal/ListenerContext.cs b/src/Servers/Kestrel/Transport.Libuv/src/Internal/ListenerContext.cs index e153565af8..528ec5ca3b 100644 --- a/src/Servers/Kestrel/Transport.Libuv/src/Internal/ListenerContext.cs +++ b/src/Servers/Kestrel/Transport.Libuv/src/Internal/ListenerContext.cs @@ -2,9 +2,14 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Diagnostics; +using System.IO.Pipelines; using System.Net; +using System.Net.Sockets; +using System.Threading; +using System.Threading.Channels; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal.Networking; using Microsoft.Extensions.Logging; @@ -12,6 +17,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal { internal class ListenerContext { + // Single reader, single writer queue since all writes happen from the uv thread and reads happen sequentially + private readonly Channel _acceptQueue = Channel.CreateUnbounded(new UnboundedChannelOptions + { + SingleReader = true, + SingleWriter = true + }); + public ListenerContext(LibuvTransportContext transportContext) { TransportContext = transportContext; @@ -19,29 +31,62 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal public LibuvTransportContext TransportContext { get; set; } - public IEndPointInformation EndPointInformation { get; set; } + public EndPoint EndPoint { get; set; } public LibuvThread Thread { get; set; } + public PipeOptions InputOptions { get; set; } + + public PipeOptions OutputOptions { get; set; } + + public async ValueTask AcceptAsync(CancellationToken cancellationToken = default) + { + while (await _acceptQueue.Reader.WaitToReadAsync()) + { + while (_acceptQueue.Reader.TryRead(out var connection)) + { + return connection; + } + } + + return null; + } + + /// + /// Aborts all unaccepted connections in the queue + /// + /// + public async Task AbortQueuedConnectionAsync() + { + while (await _acceptQueue.Reader.WaitToReadAsync()) + { + while (_acceptQueue.Reader.TryRead(out var connection)) + { + // REVIEW: Pass an abort reason? + connection.Abort(); + } + } + } + /// /// Creates a socket which can be used to accept an incoming connection. /// protected UvStreamHandle CreateAcceptSocket() { - switch (EndPointInformation.Type) + switch (EndPoint) { - case ListenType.IPEndPoint: + case IPEndPoint _: return AcceptTcp(); - case ListenType.SocketPath: + case UnixDomainSocketEndPoint _: return AcceptPipe(); - case ListenType.FileHandle: + case FileHandleEndPoint _: return AcceptHandle(); default: throw new InvalidOperationException(); } } - protected async Task HandleConnectionAsync(UvStreamHandle socket) + protected internal void HandleConnection(UvStreamHandle socket) { try { @@ -63,18 +108,16 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal } } - var connection = new LibuvConnection(socket, TransportContext.Log, Thread, remoteEndPoint, localEndPoint); - var middlewareTask = TransportContext.ConnectionDispatcher.OnConnection(connection); - var transportTask = connection.Start(); + var options = TransportContext.Options; + var connection = new LibuvConnection(socket, TransportContext.Log, Thread, remoteEndPoint, localEndPoint, InputOptions, OutputOptions, options.MaxReadBufferSize, options.MaxWriteBufferSize); + connection.Start(); - await transportTask; - await middlewareTask; - - connection.Dispose(); + bool accepted = _acceptQueue.Writer.TryWrite(connection); + Debug.Assert(accepted, "The connection was not written to the channel!"); } catch (Exception ex) { - TransportContext.Log.LogCritical(ex, $"Unexpected exception in {nameof(ListenerContext)}.{nameof(HandleConnectionAsync)}."); + TransportContext.Log.LogCritical(ex, $"Unexpected exception in {nameof(ListenerContext)}.{nameof(HandleConnection)}."); } } @@ -85,7 +128,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal try { socket.Init(Thread.Loop, Thread.QueueCloseHandle); - socket.NoDelay(EndPointInformation.NoDelay); + socket.NoDelay(TransportContext.Options.NoDelay); } catch { @@ -113,9 +156,16 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal return pipe; } + protected void StopAcceptingConnections() + { + _acceptQueue.Writer.TryComplete(); + } + private UvStreamHandle AcceptHandle() { - switch (EndPointInformation.HandleType) + var fileHandleEndPoint = (FileHandleEndPoint)EndPoint; + + switch (fileHandleEndPoint.FileHandleType) { case FileHandleType.Auto: throw new InvalidOperationException("Cannot accept on a non-specific file handle, listen should be performed first."); diff --git a/src/Servers/Kestrel/Transport.Libuv/src/Internal/ListenerPrimary.cs b/src/Servers/Kestrel/Transport.Libuv/src/Internal/ListenerPrimary.cs index 4ce0afab29..acbc356294 100644 --- a/src/Servers/Kestrel/Transport.Libuv/src/Internal/ListenerPrimary.cs +++ b/src/Servers/Kestrel/Transport.Libuv/src/Internal/ListenerPrimary.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; using System.IO; +using System.Net; using System.Runtime.InteropServices; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal.Networking; using Microsoft.Extensions.Logging; @@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal public async Task StartAsync( string pipeName, byte[] pipeMessage, - IEndPointInformation endPointInformation, + EndPoint endPoint, LibuvThread thread) { _pipeName = pipeName; @@ -59,7 +59,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal Marshal.StructureToPtr(fileCompletionInfo, _fileCompletionInfoPtr, false); } - await StartAsync(endPointInformation, thread).ConfigureAwait(false); + await StartAsync(endPoint, thread).ConfigureAwait(false); await Thread.PostAsync(listener => listener.PostCallback(), this).ConfigureAwait(false); } diff --git a/src/Servers/Kestrel/Transport.Libuv/src/Internal/ListenerSecondary.cs b/src/Servers/Kestrel/Transport.Libuv/src/Internal/ListenerSecondary.cs index 6597df28d7..477d391f88 100644 --- a/src/Servers/Kestrel/Transport.Libuv/src/Internal/ListenerSecondary.cs +++ b/src/Servers/Kestrel/Transport.Libuv/src/Internal/ListenerSecondary.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Net; using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal.Networking; using Microsoft.Extensions.Logging; @@ -35,14 +35,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal public Task StartAsync( string pipeName, byte[] pipeMessage, - IEndPointInformation endPointInformation, + EndPoint endPoint, LibuvThread thread) { _pipeName = pipeName; _pipeMessage = pipeMessage; _buf = thread.Loop.Libuv.buf_init(_ptr, 4); - EndPointInformation = endPointInformation; + EndPoint = endPoint; Thread = thread; DispatchPipe = new UvPipeHandle(Log); @@ -152,9 +152,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal { DispatchPipe.Accept(acceptSocket); - // REVIEW: This task should be tracked by the server for graceful shutdown - // Today it's handled specifically for http but not for arbitrary middleware - _ = HandleConnectionAsync(acceptSocket); + HandleConnection(acceptSocket); } catch (UvException ex) when (LibuvConstants.IsConnectionReset(ex.StatusCode)) { @@ -192,11 +190,15 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal listener._closed = true; + listener.StopAcceptingConnections(); + }, this).ConfigureAwait(false); } else { FreeBuffer(); + + StopAcceptingConnections(); } } } diff --git a/src/Servers/Kestrel/Transport.Libuv/src/LibuvTransportOptions.cs b/src/Servers/Kestrel/Transport.Libuv/src/LibuvTransportOptions.cs index a040dea87b..4ba48aa9ad 100644 --- a/src/Servers/Kestrel/Transport.Libuv/src/LibuvTransportOptions.cs +++ b/src/Servers/Kestrel/Transport.Libuv/src/LibuvTransportOptions.cs @@ -1,9 +1,8 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Buffers; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv { @@ -20,7 +19,19 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv /// public int ThreadCount { get; set; } = ProcessorThreadCount; - internal Func> MemoryPoolFactory { get; set; } = () => KestrelMemoryPool.Create(); + /// + /// Set to false to enable Nagle's algorithm for all connections. + /// + /// + /// Defaults to true. + /// + public bool NoDelay { get; set; } = true; + + public long? MaxReadBufferSize { get; set; } = 1024 * 1024; + + public long? MaxWriteBufferSize { get; set; } = 64 * 1024; + + internal Func> MemoryPoolFactory { get; set; } = System.Buffers.MemoryPoolFactory.Create; private static int ProcessorThreadCount { diff --git a/src/Servers/Kestrel/Transport.Libuv/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj b/src/Servers/Kestrel/Transport.Libuv/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj index 2b52fe7f46..d6bd6d4e45 100644 --- a/src/Servers/Kestrel/Transport.Libuv/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj +++ b/src/Servers/Kestrel/Transport.Libuv/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj @@ -1,4 +1,4 @@ - + Libuv transport for the ASP.NET Core Kestrel cross-platform web server. @@ -10,12 +10,18 @@ true + + + + + - + + diff --git a/src/Servers/Kestrel/Transport.Libuv/src/WebHostBuilderLibuvExtensions.cs b/src/Servers/Kestrel/Transport.Libuv/src/WebHostBuilderLibuvExtensions.cs index 386d0b6679..8f0986d334 100644 --- a/src/Servers/Kestrel/Transport.Libuv/src/WebHostBuilderLibuvExtensions.cs +++ b/src/Servers/Kestrel/Transport.Libuv/src/WebHostBuilderLibuvExtensions.cs @@ -1,8 +1,8 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv; using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal; using Microsoft.Extensions.DependencyInjection; @@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Hosting { return hostBuilder.ConfigureServices(services => { - services.AddSingleton(); + services.AddSingleton(); }); } diff --git a/src/Servers/Kestrel/Transport.Libuv/test/LibuvConnectionTests.cs b/src/Servers/Kestrel/Transport.Libuv/test/LibuvConnectionTests.cs index c284ec1584..d1ff9b380c 100644 --- a/src/Servers/Kestrel/Transport.Libuv/test/LibuvConnectionTests.cs +++ b/src/Servers/Kestrel/Transport.Libuv/test/LibuvConnectionTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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; @@ -19,39 +19,33 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests [Fact] public async Task DoesNotEndConnectionOnZeroRead() { - var mockConnectionDispatcher = new MockConnectionDispatcher(); var mockLibuv = new MockLibuv(); - var transportContext = new TestLibuvTransportContext { ConnectionDispatcher = mockConnectionDispatcher }; - var transport = new LibuvTransport(mockLibuv, transportContext, null); - var thread = new LibuvThread(transport); - Task connectionTask = null; + var transportContext = new TestLibuvTransportContext(); + var thread = new LibuvThread(mockLibuv, transportContext); + var listenerContext = new ListenerContext(transportContext) + { + Thread = thread + }; + try { await thread.StartAsync(); await thread.PostAsync(_ => - { - var listenerContext = new ListenerContext(transportContext) - { - Thread = thread - }; + { var socket = new MockSocket(mockLibuv, Thread.CurrentThread.ManagedThreadId, transportContext.Log); - var connection = new LibuvConnection(socket, listenerContext.TransportContext.Log, thread, null, null); - listenerContext.TransportContext.ConnectionDispatcher.OnConnection(connection); - connectionTask = connection.Start(); + listenerContext.HandleConnection(socket); mockLibuv.AllocCallback(socket.InternalGetHandle(), 2048, out var ignored); mockLibuv.ReadCallback(socket.InternalGetHandle(), 0, ref ignored); }, (object)null); - var readAwaitable = mockConnectionDispatcher.Input.Reader.ReadAsync(); + await using var connection = await listenerContext.AcceptAsync(); + + var readAwaitable = connection.Transport.Input.ReadAsync(); Assert.False(readAwaitable.IsCompleted); } finally { - mockConnectionDispatcher.Input.Reader.Complete(); - mockConnectionDispatcher.Output.Writer.Complete(); - await connectionTask; - await thread.StopAsync(TimeSpan.FromSeconds(5)); } } @@ -59,25 +53,27 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests [Fact] public async Task ConnectionDoesNotResumeAfterSocketCloseIfBackpressureIsApplied() { - var mockConnectionDispatcher = new MockConnectionDispatcher(); var mockLibuv = new MockLibuv(); - var transportContext = new TestLibuvTransportContext { ConnectionDispatcher = mockConnectionDispatcher }; - var transport = new LibuvTransport(mockLibuv, transportContext, null); - var thread = new LibuvThread(transport); - mockConnectionDispatcher.InputOptions = pool => - new PipeOptions( - pool: pool, + var transportContext = new TestLibuvTransportContext(); + var thread = new LibuvThread(mockLibuv, transportContext); + var listenerContext = new ListenerContext(transportContext) + { + Thread = thread, + InputOptions = new PipeOptions( + pool: thread.MemoryPool, pauseWriterThreshold: 3, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, - useSynchronizationContext: false); + useSynchronizationContext: false), - // We don't set the output writer scheduler here since we want to run the callback inline + // We don't set the output writer scheduler here since we want to run the callback inline + OutputOptions = new PipeOptions( + pool: thread.MemoryPool, + readerScheduler: thread, + writerScheduler: PipeScheduler.Inline, + useSynchronizationContext: false) + }; - mockConnectionDispatcher.OutputOptions = pool => new PipeOptions(pool: pool, readerScheduler: thread, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false); - - - Task connectionTask = null; try { await thread.StartAsync(); @@ -85,28 +81,22 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests // Write enough to make sure back pressure will be applied await thread.PostAsync(_ => { - var listenerContext = new ListenerContext(transportContext) - { - Thread = thread - }; var socket = new MockSocket(mockLibuv, Thread.CurrentThread.ManagedThreadId, transportContext.Log); - var connection = new LibuvConnection(socket, listenerContext.TransportContext.Log, thread, null, null); - listenerContext.TransportContext.ConnectionDispatcher.OnConnection(connection); - connectionTask = connection.Start(); + listenerContext.HandleConnection(socket); mockLibuv.AllocCallback(socket.InternalGetHandle(), 2048, out var ignored); mockLibuv.ReadCallback(socket.InternalGetHandle(), 5, ref ignored); }, null); + var connection = await listenerContext.AcceptAsync(); + // Now assert that we removed the callback from libuv to stop reading Assert.Null(mockLibuv.AllocCallback); Assert.Null(mockLibuv.ReadCallback); // Now complete the output writer so that the connection closes - mockConnectionDispatcher.Output.Writer.Complete(); - - await connectionTask.DefaultTimeout(); + await connection.DisposeAsync(); // Assert that we don't try to start reading Assert.Null(mockLibuv.AllocCallback); @@ -114,9 +104,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests } finally { - mockConnectionDispatcher.Input.Reader.Complete(); - mockConnectionDispatcher.Output.Writer.Complete(); - await thread.StopAsync(TimeSpan.FromSeconds(5)); } } @@ -124,29 +111,32 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests [Fact] public async Task ConnectionDoesNotResumeAfterReadCallbackScheduledAndSocketCloseIfBackpressureIsApplied() { - var mockConnectionDispatcher = new MockConnectionDispatcher(); var mockLibuv = new MockLibuv(); - var transportContext = new TestLibuvTransportContext { ConnectionDispatcher = mockConnectionDispatcher }; - var transport = new LibuvTransport(mockLibuv, transportContext, null); - var thread = new LibuvThread(transport); + var transportContext = new TestLibuvTransportContext(); + var thread = new LibuvThread(mockLibuv, transportContext); var mockScheduler = new Mock(); Action backPressure = null; mockScheduler.Setup(m => m.Schedule(It.IsAny>(), It.IsAny())).Callback, object>((a, o) => { backPressure = () => a(o); }); - mockConnectionDispatcher.InputOptions = pool => - new PipeOptions( - pool: pool, + var listenerContext = new ListenerContext(transportContext) + { + Thread = thread, + InputOptions = new PipeOptions( + pool: thread.MemoryPool, pauseWriterThreshold: 3, resumeWriterThreshold: 3, writerScheduler: mockScheduler.Object, readerScheduler: PipeScheduler.Inline, - useSynchronizationContext: false); + useSynchronizationContext: false), + OutputOptions = new PipeOptions( + pool: thread.MemoryPool, + readerScheduler: thread, + writerScheduler: PipeScheduler.Inline, + useSynchronizationContext: false) + }; - mockConnectionDispatcher.OutputOptions = pool => new PipeOptions(pool: pool, readerScheduler: thread, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false); - - Task connectionTask = null; try { await thread.StartAsync(); @@ -154,32 +144,28 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests // Write enough to make sure back pressure will be applied await thread.PostAsync(_ => { - var listenerContext = new ListenerContext(transportContext) - { - Thread = thread - }; var socket = new MockSocket(mockLibuv, Thread.CurrentThread.ManagedThreadId, transportContext.Log); - var connection = new LibuvConnection(socket, listenerContext.TransportContext.Log, thread, null, null); - listenerContext.TransportContext.ConnectionDispatcher.OnConnection(connection); - connectionTask = connection.Start(); - + listenerContext.HandleConnection(socket); + mockLibuv.AllocCallback(socket.InternalGetHandle(), 2048, out var ignored); mockLibuv.ReadCallback(socket.InternalGetHandle(), 5, ref ignored); }, null); + var connection = await listenerContext.AcceptAsync(); + // Now assert that we removed the callback from libuv to stop reading Assert.Null(mockLibuv.AllocCallback); Assert.Null(mockLibuv.ReadCallback); // Now release backpressure by reading the input - var result = await mockConnectionDispatcher.Input.Reader.ReadAsync(); + var result = await connection.Transport.Input.ReadAsync(); // Calling advance will call into our custom scheduler that captures the back pressure // callback - mockConnectionDispatcher.Input.Reader.AdvanceTo(result.Buffer.End); + connection.Transport.Input.AdvanceTo(result.Buffer.End); // Cancel the current pending flush - mockConnectionDispatcher.Input.Writer.CancelPendingFlush(); + connection.Application.Output.CancelPendingFlush(); // Now release the back pressure await thread.PostAsync(a => a(), backPressure); @@ -189,19 +175,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests Assert.Null(mockLibuv.ReadCallback); // Now complete the output writer and wait for the connection to close - mockConnectionDispatcher.Output.Writer.Complete(); - - await connectionTask.DefaultTimeout(); - + await connection.DisposeAsync(); + // Assert that we don't try to start reading Assert.Null(mockLibuv.AllocCallback); Assert.Null(mockLibuv.ReadCallback); } finally { - mockConnectionDispatcher.Input.Reader.Complete(); - mockConnectionDispatcher.Output.Writer.Complete(); - await thread.StopAsync(TimeSpan.FromSeconds(5)); } } @@ -209,42 +190,35 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests [Fact] public async Task DoesNotThrowIfOnReadCallbackCalledWithEOFButAllocCallbackNotCalled() { - var mockConnectionDispatcher = new MockConnectionDispatcher(); var mockLibuv = new MockLibuv(); - var transportContext = new TestLibuvTransportContext { ConnectionDispatcher = mockConnectionDispatcher }; - var transport = new LibuvTransport(mockLibuv, transportContext, null); - var thread = new LibuvThread(transport); + var transportContext = new TestLibuvTransportContext(); + var thread = new LibuvThread(mockLibuv, transportContext); + var listenerContext = new ListenerContext(transportContext) + { + Thread = thread + }; - Task connectionTask = null; try { await thread.StartAsync(); await thread.PostAsync(_ => { - var listenerContext = new ListenerContext(transportContext) - { - Thread = thread - }; var socket = new MockSocket(mockLibuv, Thread.CurrentThread.ManagedThreadId, transportContext.Log); - var connection = new LibuvConnection(socket, listenerContext.TransportContext.Log, thread, null, null); - listenerContext.TransportContext.ConnectionDispatcher.OnConnection(connection); - connectionTask = connection.Start(); - + listenerContext.HandleConnection(socket); + var ignored = new LibuvFunctions.uv_buf_t(); mockLibuv.ReadCallback(socket.InternalGetHandle(), TestConstants.EOF, ref ignored); }, (object)null); - var readAwaitable = await mockConnectionDispatcher.Input.Reader.ReadAsync(); + await using var connection = await listenerContext.AcceptAsync(); + + var readAwaitable = await connection.Transport.Input.ReadAsync(); Assert.True(readAwaitable.IsCompleted); } finally { - mockConnectionDispatcher.Input.Reader.Complete(); - mockConnectionDispatcher.Output.Writer.Complete(); - await connectionTask; - await thread.StopAsync(TimeSpan.FromSeconds(5)); } } } -} \ No newline at end of file +} diff --git a/src/Servers/Kestrel/Transport.Libuv/test/LibuvOutputConsumerTests.cs b/src/Servers/Kestrel/Transport.Libuv/test/LibuvOutputConsumerTests.cs index d72e6485b5..f0a9769357 100644 --- a/src/Servers/Kestrel/Transport.Libuv/test/LibuvOutputConsumerTests.cs +++ b/src/Servers/Kestrel/Transport.Libuv/test/LibuvOutputConsumerTests.cs @@ -14,7 +14,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal; using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal.Networking; using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.TestHelpers; @@ -42,11 +41,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests public LibuvOutputConsumerTests() { - _memoryPool = KestrelMemoryPool.Create(); + _memoryPool = MemoryPoolFactory.Create(); _mockLibuv = new MockLibuv(); - var libuvTransport = new LibuvTransport(_mockLibuv, new TestLibuvTransportContext(), new ListenOptions((ulong)0)); - _libuvThread = new LibuvThread(libuvTransport, maxLoops: 1); + var context = new TestLibuvTransportContext(); + _libuvThread = new LibuvThread(_mockLibuv, context, maxLoops: 1); _libuvThread.StartAsync().Wait(); } @@ -769,5 +768,43 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests outputReader.Complete(ex); } } + + // Work around the internal type conflict (multiple assemblies have internalized this type and that fails with IVT) + private class DuplexPipe : IDuplexPipe + { + public DuplexPipe(PipeReader reader, PipeWriter writer) + { + Input = reader; + Output = writer; + } + + public PipeReader Input { get; } + + public PipeWriter Output { get; } + + public static DuplexPipePair CreateConnectionPair(PipeOptions inputOptions, PipeOptions outputOptions) + { + var input = new Pipe(inputOptions); + var output = new Pipe(outputOptions); + + var transportToApplication = new DuplexPipe(output.Reader, input.Writer); + var applicationToTransport = new DuplexPipe(input.Reader, output.Writer); + + return new DuplexPipePair(applicationToTransport, transportToApplication); + } + + // This class exists to work around issues with value tuple on .NET Framework + public readonly struct DuplexPipePair + { + public IDuplexPipe Transport { get; } + public IDuplexPipe Application { get; } + + public DuplexPipePair(IDuplexPipe transport, IDuplexPipe application) + { + Transport = transport; + Application = application; + } + } + } } } diff --git a/src/Servers/Kestrel/Transport.Libuv/test/LibuvThreadTests.cs b/src/Servers/Kestrel/Transport.Libuv/test/LibuvThreadTests.cs index 69daacab35..7bfd5280ef 100644 --- a/src/Servers/Kestrel/Transport.Libuv/test/LibuvThreadTests.cs +++ b/src/Servers/Kestrel/Transport.Libuv/test/LibuvThreadTests.cs @@ -14,11 +14,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests [Fact] public async Task LibuvThreadDoesNotThrowIfPostingWorkAfterDispose() { - var mockConnectionDispatcher = new MockConnectionDispatcher(); var mockLibuv = new MockLibuv(); - var transportContext = new TestLibuvTransportContext { ConnectionDispatcher = mockConnectionDispatcher }; - var transport = new LibuvTransport(mockLibuv, transportContext, null); - var thread = new LibuvThread(transport); + var transportContext = new TestLibuvTransportContext(); + var thread = new LibuvThread(mockLibuv, transportContext); var ranOne = false; var ranTwo = false; var ranThree = false; diff --git a/src/Servers/Kestrel/Transport.Libuv/test/LibuvTransportTests.cs b/src/Servers/Kestrel/Transport.Libuv/test/LibuvTransportTests.cs index abdd8e1c7a..d18af3aa39 100644 --- a/src/Servers/Kestrel/Transport.Libuv/test/LibuvTransportTests.cs +++ b/src/Servers/Kestrel/Transport.Libuv/test/LibuvTransportTests.cs @@ -1,18 +1,18 @@ // 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.Buffers; using System.Collections.Generic; using System.Linq; using System.Net; using System.Net.Http; using System.Net.Sockets; using System.Text; -using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; -using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal; using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.TestHelpers; using Microsoft.AspNetCore.Testing; @@ -23,71 +23,154 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests { public class LibuvTransportTests { - public static TheoryData ConnectionAdapterData => new TheoryData - { - new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)), - new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)) - { - ConnectionAdapters = { new PassThroughConnectionAdapter() } - } - }; - public static IEnumerable OneToTen => Enumerable.Range(1, 10).Select(i => new object[] { i }); [Fact] public async Task TransportCanBindAndStop() { var transportContext = new TestLibuvTransportContext(); - var transport = new LibuvTransport(transportContext, - new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0))); + var transport = new LibuvConnectionListener(transportContext, new IPEndPoint(IPAddress.Loopback, 0)); // The transport can no longer start threads without binding to an endpoint. await transport.BindAsync(); - await transport.StopAsync(); + await transport.DisposeAsync(); } [Fact] public async Task TransportCanBindUnbindAndStop() { var transportContext = new TestLibuvTransportContext(); - var transport = new LibuvTransport(transportContext, new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0))); + var transport = new LibuvConnectionListener(transportContext, new IPEndPoint(IPAddress.Loopback, 0)); await transport.BindAsync(); await transport.UnbindAsync(); - await transport.StopAsync(); + await transport.DisposeAsync(); } - [Theory] - [MemberData(nameof(ConnectionAdapterData))] - public async Task ConnectionCanReadAndWrite(ListenOptions listenOptions) + [Fact] + public async Task ConnectionCanReadAndWrite() { - var serviceContext = new TestServiceContext(); - listenOptions.UseHttpServer(listenOptions.ConnectionAdapters, serviceContext, new DummyApplication(TestApp.EchoApp), HttpProtocols.Http1); - - var transportContext = new TestLibuvTransportContext - { - ConnectionDispatcher = new ConnectionDispatcher(serviceContext, listenOptions.Build()) - }; - - var transport = new LibuvTransport(transportContext, listenOptions); + var transportContext = new TestLibuvTransportContext(); + await using var transport = new LibuvConnectionListener(transportContext, new IPEndPoint(IPAddress.Loopback, 0)); await transport.BindAsync(); + var endpoint = (IPEndPoint)transport.EndPoint; - using (var socket = TestConnection.CreateConnectedLoopbackSocket(listenOptions.IPEndPoint.Port)) + async Task EchoServerAsync() { - var data = "Hello World"; - socket.Send(Encoding.ASCII.GetBytes($"POST / HTTP/1.0\r\nContent-Length: 11\r\n\r\n{data}")); + while (true) + { + await using var connection = await transport.AcceptAsync(); + + if (connection == null) + { + break; + } + + while (true) + { + var result = await connection.Transport.Input.ReadAsync(); + + if (result.IsCompleted) + { + break; + } + await connection.Transport.Output.WriteAsync(result.Buffer.ToArray()); + + connection.Transport.Input.AdvanceTo(result.Buffer.End); + } + } + } + + var serverTask = EchoServerAsync(); + + using (var socket = TestConnection.CreateConnectedLoopbackSocket(endpoint.Port)) + { + var data = Encoding.ASCII.GetBytes("Hello World"); + await socket.SendAsync(data, SocketFlags.None); + var buffer = new byte[data.Length]; var read = 0; while (read < data.Length) { - read += socket.Receive(buffer, read, buffer.Length - read, SocketFlags.None); + read += await socket.ReceiveAsync(buffer.AsMemory(read, buffer.Length - read), SocketFlags.None); + } + + Assert.Equal(data, buffer); + } + + await transport.UnbindAsync(); + + await serverTask.DefaultTimeout(); + } + + [Fact] + public async Task UnacceptedConnectionsAreAborted() + { + var transportContext = new TestLibuvTransportContext(); + var transport = new LibuvConnectionListener(transportContext, new IPEndPoint(IPAddress.Loopback, 0)); + + await transport.BindAsync(); + var endpoint = (IPEndPoint)transport.EndPoint; + + async Task ConnectAsync() + { + using (var socket = TestConnection.CreateConnectedLoopbackSocket(endpoint.Port)) + { + try + { + var read = await socket.ReceiveAsync(new byte[10], SocketFlags.None); + Assert.Equal(0, read); + } + catch (SocketException) + { + // The connection can be reset sometimes + } } } - Assert.True(await serviceContext.ConnectionManager.CloseAllConnectionsAsync(new CancellationTokenSource(TestConstants.DefaultTimeout).Token)); + var connectTask = ConnectAsync(); + await transport.UnbindAsync(); - await transport.StopAsync(); + await transport.DisposeAsync(); + + // The connection was accepted because libuv eagerly accepts connections + // they sit in a queue in each listener, we want to make sure that resources + // are cleaned up if they are never accepted by the caller + + await connectTask.DefaultTimeout(); + } + + [Fact] + public async Task CallingAcceptAfterDisposeAsyncThrows() + { + var transportContext = new TestLibuvTransportContext(); + var transport = new LibuvConnectionListener(transportContext, new IPEndPoint(IPAddress.Loopback, 0)); + + await transport.BindAsync(); + var endpoint = (IPEndPoint)transport.EndPoint; + + await transport.UnbindAsync(); + await transport.DisposeAsync(); + + await Assert.ThrowsAsync(() => transport.AcceptAsync().AsTask()); + } + + [Fact] + public async Task CallingDisposeAsyncWillYieldPendingAccepts() + { + var transportContext = new TestLibuvTransportContext(); + await using var transport = new LibuvConnectionListener(transportContext, new IPEndPoint(IPAddress.Loopback, 0)); + + await transport.BindAsync(); + + var acceptTask = transport.AcceptAsync(); + + await transport.UnbindAsync(); + + var connection = await acceptTask.DefaultTimeout(); + + Assert.Null(connection); } [ConditionalTheory] @@ -106,13 +189,15 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests var transportContext = new TestLibuvTransportContext { - ConnectionDispatcher = new ConnectionDispatcher(serviceContext, listenOptions.Build()), Options = new LibuvTransportOptions { ThreadCount = threadCount } }; - var transport = new LibuvTransport(transportContext, listenOptions); - + await using var transport = new LibuvConnectionListener(transportContext, listenOptions.EndPoint); await transport.BindAsync(); + listenOptions.EndPoint = transport.EndPoint; + + var dispatcher = new ConnectionDispatcher(serviceContext, listenOptions.Build()); + var acceptTask = dispatcher.StartAcceptingConnections(transport); using (var client = new HttpClient()) { @@ -132,12 +217,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests await transport.UnbindAsync(); - if (!await serviceContext.ConnectionManager.CloseAllConnectionsAsync(default).ConfigureAwait(false)) - { - await serviceContext.ConnectionManager.AbortAllConnectionsAsync().ConfigureAwait(false); - } + await acceptTask; - await transport.StopAsync(); + if (!await serviceContext.ConnectionManager.CloseAllConnectionsAsync(default)) + { + await serviceContext.ConnectionManager.AbortAllConnectionsAsync(); + } } } } diff --git a/src/Servers/Kestrel/Transport.Libuv/test/ListenerPrimaryTests.cs b/src/Servers/Kestrel/Transport.Libuv/test/ListenerPrimaryTests.cs index b1a338bd56..b3ed1b94fe 100644 --- a/src/Servers/Kestrel/Transport.Libuv/test/ListenerPrimaryTests.cs +++ b/src/Servers/Kestrel/Transport.Libuv/test/ListenerPrimaryTests.cs @@ -2,16 +2,10 @@ // 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.IO; using System.Linq; using System.Net; using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Server.Kestrel.Core; -using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal; using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal.Networking; using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.TestHelpers; @@ -28,42 +22,39 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests { var libuv = new LibuvFunctions(); - var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)); + var endpoint = new IPEndPoint(IPAddress.Loopback, 0); - var serviceContextPrimary = new TestServiceContext(); var transportContextPrimary = new TestLibuvTransportContext(); - var builderPrimary = new ConnectionBuilder(); - builderPrimary.UseHttpServer(serviceContextPrimary, new DummyApplication(c => c.Response.WriteAsync("Primary")), HttpProtocols.Http1); - transportContextPrimary.ConnectionDispatcher = new ConnectionDispatcher(serviceContextPrimary, builderPrimary.Build()); - - var serviceContextSecondary = new TestServiceContext(); - var builderSecondary = new ConnectionBuilder(); - builderSecondary.UseHttpServer(serviceContextSecondary, new DummyApplication(c => c.Response.WriteAsync("Secondary")), HttpProtocols.Http1); var transportContextSecondary = new TestLibuvTransportContext(); - transportContextSecondary.ConnectionDispatcher = new ConnectionDispatcher(serviceContextSecondary, builderSecondary.Build()); - - var libuvTransport = new LibuvTransport(libuv, transportContextPrimary, listenOptions); var pipeName = (libuv.IsWindows ? @"\\.\pipe\kestrel_" : "/tmp/kestrel_") + Guid.NewGuid().ToString("n"); var pipeMessage = Guid.NewGuid().ToByteArray(); // Start primary listener - var libuvThreadPrimary = new LibuvThread(libuvTransport); + var libuvThreadPrimary = new LibuvThread(libuv, transportContextPrimary); await libuvThreadPrimary.StartAsync(); var listenerPrimary = new ListenerPrimary(transportContextPrimary); - await listenerPrimary.StartAsync(pipeName, pipeMessage, listenOptions, libuvThreadPrimary); - var address = GetUri(listenOptions); + await listenerPrimary.StartAsync(pipeName, pipeMessage, endpoint, libuvThreadPrimary); + var address = GetUri(listenerPrimary.EndPoint); - // Until a secondary listener is added, TCP connections get dispatched directly - Assert.Equal("Primary", await HttpClientSlim.GetStringAsync(address)); - Assert.Equal("Primary", await HttpClientSlim.GetStringAsync(address)); + var acceptTask = listenerPrimary.AcceptAsync().AsTask(); + using (var socket = await HttpClientSlim.GetSocket(address)) + { + await (await acceptTask.DefaultTimeout()).DisposeAsync(); + } + + acceptTask = listenerPrimary.AcceptAsync().AsTask(); + using (var socket = await HttpClientSlim.GetSocket(address)) + { + await (await acceptTask.DefaultTimeout()).DisposeAsync(); + } var listenerCount = listenerPrimary.UvPipeCount; // Add secondary listener - var libuvThreadSecondary = new LibuvThread(libuvTransport); + var libuvThreadSecondary = new LibuvThread(libuv, transportContextSecondary); await libuvThreadSecondary.StartAsync(); var listenerSecondary = new ListenerSecondary(transportContextSecondary); - await listenerSecondary.StartAsync(pipeName, pipeMessage, listenOptions, libuvThreadSecondary); + await listenerSecondary.StartAsync(pipeName, pipeMessage, endpoint, libuvThreadSecondary); var maxWait = Task.Delay(TestConstants.DefaultTimeout); // wait for ListenerPrimary.ReadCallback to add the secondary pipe @@ -77,14 +68,18 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests } // Once a secondary listener is added, TCP connections start getting dispatched to it - await AssertResponseEventually(address, "Secondary", allowed: new[] { "Primary" }); + // This returns the incomplete primary task after the secondary listener got the last + // connection + var primary = await WaitForSecondaryListener(address, listenerPrimary, listenerSecondary); // TCP connections will still get round-robined to the primary listener - Assert.Equal("Primary", await HttpClientSlim.GetStringAsync(address)); - Assert.Equal("Secondary", await HttpClientSlim.GetStringAsync(address)); - Assert.Equal("Primary", await HttpClientSlim.GetStringAsync(address)); + ListenerContext currentListener = listenerSecondary; + Task expected = primary; + + await AssertRoundRobin(address, listenerPrimary, listenerSecondary, currentListener, expected); await listenerSecondary.DisposeAsync(); + await libuvThreadSecondary.StopAsync(TimeSpan.FromSeconds(5)); await listenerPrimary.DisposeAsync(); @@ -96,48 +91,36 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests public async Task NonListenerPipeConnectionsAreLoggedAndIgnored() { var libuv = new LibuvFunctions(); - var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)); + var endpoint = new IPEndPoint(IPAddress.Loopback, 0); var logger = new TestApplicationErrorLogger(); - var serviceContextPrimary = new TestServiceContext(); - var builderPrimary = new ConnectionBuilder(); - builderPrimary.UseHttpServer(serviceContextPrimary, new DummyApplication(c => c.Response.WriteAsync("Primary")), HttpProtocols.Http1); var transportContextPrimary = new TestLibuvTransportContext { Log = new LibuvTrace(logger) }; - transportContextPrimary.ConnectionDispatcher = new ConnectionDispatcher(serviceContextPrimary, builderPrimary.Build()); - - var serviceContextSecondary = new TestServiceContext - { - DateHeaderValueManager = serviceContextPrimary.DateHeaderValueManager, - ServerOptions = serviceContextPrimary.ServerOptions, - Scheduler = serviceContextPrimary.Scheduler, - HttpParser = serviceContextPrimary.HttpParser, - }; - var builderSecondary = new ConnectionBuilder(); - builderSecondary.UseHttpServer(serviceContextSecondary, new DummyApplication(c => c.Response.WriteAsync("Secondary")), HttpProtocols.Http1); var transportContextSecondary = new TestLibuvTransportContext(); - transportContextSecondary.ConnectionDispatcher = new ConnectionDispatcher(serviceContextSecondary, builderSecondary.Build()); - - var libuvTransport = new LibuvTransport(libuv, transportContextPrimary, listenOptions); var pipeName = (libuv.IsWindows ? @"\\.\pipe\kestrel_" : "/tmp/kestrel_") + Guid.NewGuid().ToString("n"); var pipeMessage = Guid.NewGuid().ToByteArray(); // Start primary listener - var libuvThreadPrimary = new LibuvThread(libuvTransport); + var libuvThreadPrimary = new LibuvThread(libuv, transportContextPrimary); await libuvThreadPrimary.StartAsync(); var listenerPrimary = new ListenerPrimary(transportContextPrimary); - await listenerPrimary.StartAsync(pipeName, pipeMessage, listenOptions, libuvThreadPrimary); - var address = GetUri(listenOptions); + await listenerPrimary.StartAsync(pipeName, pipeMessage, endpoint, libuvThreadPrimary); + var address = GetUri(listenerPrimary.EndPoint); // Add secondary listener - var libuvThreadSecondary = new LibuvThread(libuvTransport); + var libuvThreadSecondary = new LibuvThread(libuv, transportContextSecondary); await libuvThreadSecondary.StartAsync(); var listenerSecondary = new ListenerSecondary(transportContextSecondary); - await listenerSecondary.StartAsync(pipeName, pipeMessage, listenOptions, libuvThreadSecondary); + await listenerSecondary.StartAsync(pipeName, pipeMessage, endpoint, libuvThreadSecondary); // TCP Connections get round-robined - await AssertResponseEventually(address, "Secondary", allowed: new[] { "Primary" }); - Assert.Equal("Primary", await HttpClientSlim.GetStringAsync(address)); + var primary = await WaitForSecondaryListener(address, listenerPrimary, listenerSecondary); + + // Make sure the pending accept get yields + using (var socket = await HttpClientSlim.GetSocket(address)) + { + await (await primary.DefaultTimeout()).DisposeAsync(); + } // Create a pipe connection and keep it open without sending any data var connectTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); @@ -173,9 +156,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests await connectTcs.Task; // TCP connections will still get round-robined between only the two listeners - Assert.Equal("Secondary", await HttpClientSlim.GetStringAsync(address)); - Assert.Equal("Primary", await HttpClientSlim.GetStringAsync(address)); - Assert.Equal("Secondary", await HttpClientSlim.GetStringAsync(address)); + await AssertRoundRobin(address, listenerPrimary, listenerSecondary, listenerPrimary); await libuvThreadPrimary.PostAsync(_ => pipe.Dispose(), (object)null); @@ -186,9 +167,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests } // Same for after the non-listener pipe connection is closed - Assert.Equal("Primary", await HttpClientSlim.GetStringAsync(address)); - Assert.Equal("Secondary", await HttpClientSlim.GetStringAsync(address)); - Assert.Equal("Primary", await HttpClientSlim.GetStringAsync(address)); + await AssertRoundRobin(address, listenerPrimary, listenerSecondary, listenerPrimary); await listenerSecondary.DisposeAsync(); await libuvThreadSecondary.StopAsync(TimeSpan.FromSeconds(5)); @@ -207,45 +186,28 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests public async Task PipeConnectionsWithWrongMessageAreLoggedAndIgnored() { var libuv = new LibuvFunctions(); - var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)); + var endpoint = new IPEndPoint(IPAddress.Loopback, 0); var logger = new TestApplicationErrorLogger(); - var serviceContextPrimary = new TestServiceContext(); - var builderPrimary = new ConnectionBuilder(); - builderPrimary.UseHttpServer(serviceContextPrimary, new DummyApplication(c => c.Response.WriteAsync("Primary")), HttpProtocols.Http1); var transportContextPrimary = new TestLibuvTransportContext { Log = new LibuvTrace(logger) }; - transportContextPrimary.ConnectionDispatcher = new ConnectionDispatcher(serviceContextPrimary, builderPrimary.Build()); - - var serviceContextSecondary = new TestServiceContext - { - DateHeaderValueManager = serviceContextPrimary.DateHeaderValueManager, - ServerOptions = serviceContextPrimary.ServerOptions, - Scheduler = serviceContextPrimary.Scheduler, - HttpParser = serviceContextPrimary.HttpParser, - }; - var builderSecondary = new ConnectionBuilder(); - builderSecondary.UseHttpServer(serviceContextSecondary, new DummyApplication(c => c.Response.WriteAsync("Secondary")), HttpProtocols.Http1); var transportContextSecondary = new TestLibuvTransportContext(); - transportContextSecondary.ConnectionDispatcher = new ConnectionDispatcher(serviceContextSecondary, builderSecondary.Build()); - - var libuvTransport = new LibuvTransport(libuv, transportContextPrimary, listenOptions); var pipeName = (libuv.IsWindows ? @"\\.\pipe\kestrel_" : "/tmp/kestrel_") + Guid.NewGuid().ToString("n"); var pipeMessage = Guid.NewGuid().ToByteArray(); // Start primary listener - var libuvThreadPrimary = new LibuvThread(libuvTransport); + var libuvThreadPrimary = new LibuvThread(libuv, transportContextPrimary); await libuvThreadPrimary.StartAsync(); var listenerPrimary = new ListenerPrimary(transportContextPrimary); - await listenerPrimary.StartAsync(pipeName, pipeMessage, listenOptions, libuvThreadPrimary); - var address = GetUri(listenOptions); + await listenerPrimary.StartAsync(pipeName, pipeMessage, endpoint, libuvThreadPrimary); + var address = GetUri(listenerPrimary.EndPoint); // Add secondary listener with wrong pipe message - var libuvThreadSecondary = new LibuvThread(libuvTransport); + var libuvThreadSecondary = new LibuvThread(libuv, transportContextSecondary); await libuvThreadSecondary.StartAsync(); var listenerSecondary = new ListenerSecondary(transportContextSecondary); - await listenerSecondary.StartAsync(pipeName, Guid.NewGuid().ToByteArray(), listenOptions, libuvThreadSecondary); + await listenerSecondary.StartAsync(pipeName, Guid.NewGuid().ToByteArray(), endpoint, libuvThreadSecondary); // Wait up to 10 seconds for error to be logged for (var i = 0; i < 10 && logger.TotalErrorsLogged == 0; i++) @@ -253,10 +215,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests await Task.Delay(100); } - // TCP Connections don't get round-robined - Assert.Equal("Primary", await HttpClientSlim.GetStringAsync(address)); - Assert.Equal("Primary", await HttpClientSlim.GetStringAsync(address)); - Assert.Equal("Primary", await HttpClientSlim.GetStringAsync(address)); + // TCP Connections don't get round-robined. This should time out if the request goes to the secondary listener + for (int i = 0; i < 3; i++) + { + using var socket = await HttpClientSlim.GetSocket(address); + + await using var connection = await listenerPrimary.AcceptAsync().AsTask().DefaultTimeout(); + } await listenerSecondary.DisposeAsync(); await libuvThreadSecondary.StopAsync(TimeSpan.FromSeconds(5)); @@ -270,73 +235,73 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests Assert.Contains("Bad data", errorMessage.Exception.ToString()); } - private static async Task AssertResponseEventually( - Uri address, - string expected, - string[] allowed = null, - int maxRetries = 100, - int retryDelay = 100) + + private static async Task AssertRoundRobin(Uri address, ListenerPrimary listenerPrimary, ListenerSecondary listenerSecondary, ListenerContext currentListener, Task expected = null, int connections = 4) { - for (var i = 0; i < maxRetries; i++) + for (int i = 0; i < connections; i++) { - var response = await HttpClientSlim.GetStringAsync(address); - if (response == expected) + if (currentListener == listenerPrimary) { - return; + expected ??= listenerSecondary.AcceptAsync().AsTask(); + currentListener = listenerSecondary; + } + else + { + expected ??= listenerPrimary.AcceptAsync().AsTask(); + currentListener = listenerPrimary; } - if (allowed != null) + using var socket = await HttpClientSlim.GetSocket(address); + + await using var connection = await expected.DefaultTimeout(); + + expected = null; + } + } + + private static async Task> WaitForSecondaryListener(Uri address, ListenerContext listenerPrimary, ListenerContext listenerSecondary) + { + int maxRetries = 100; + int retryDelay = 100; + + Task primary = null; + Task secondary = null; + + for (var i = 0; i < maxRetries; i++) + { + primary ??= listenerPrimary.AcceptAsync().AsTask(); + secondary ??= listenerSecondary.AcceptAsync().AsTask(); + + using var _ = await HttpClientSlim.GetSocket(address); + + var task = await Task.WhenAny(primary, secondary); + + if (task == secondary) { - Assert.Contains(response, allowed); + // Dispose this connection now that we know the seconary listener is working + await (await secondary).DisposeAsync(); + + // Return the primary task (it should be incomplete), we do this so that we can + return primary; + } + else + { + // Dispose the connection + await (await primary).DisposeAsync(); + + primary = null; } await Task.Delay(retryDelay); } - Assert.True(false, $"'{address}' failed to respond with '{expected}' in {maxRetries} retries."); + Assert.True(false, $"'{address}' failed to get queued connection in secondary listener in {maxRetries} retries."); + return null; } - private static Uri GetUri(ListenOptions options) + private static Uri GetUri(EndPoint endpoint) { - if (options.Type != ListenType.IPEndPoint) - { - throw new InvalidOperationException($"Could not determine a proper URI for options with Type {options.Type}"); - } - - var scheme = options.ConnectionAdapters.Any(f => f.IsHttps) - ? "https" - : "http"; - - return new Uri($"{scheme}://{options.IPEndPoint}"); - } - - private class ConnectionBuilder : IConnectionBuilder - { - private readonly List> _components = new List>(); - - public IServiceProvider ApplicationServices { get; set; } - - public IConnectionBuilder Use(Func middleware) - { - _components.Add(middleware); - return this; - } - - public ConnectionDelegate Build() - { - ConnectionDelegate app = context => - { - return Task.CompletedTask; - }; - - for (int i = _components.Count - 1; i >= 0; i--) - { - var component = _components[i]; - app = component(app); - } - - return app; - } + return new Uri($"http://{endpoint}"); } } } diff --git a/src/Servers/Kestrel/Transport.Libuv/test/TestHelpers/MockConnectionDispatcher.cs b/src/Servers/Kestrel/Transport.Libuv/test/TestHelpers/MockConnectionDispatcher.cs deleted file mode 100644 index 01e0c049d0..0000000000 --- a/src/Servers/Kestrel/Transport.Libuv/test/TestHelpers/MockConnectionDispatcher.cs +++ /dev/null @@ -1,31 +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.Buffers; -using System.IO.Pipelines; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; - -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.TestHelpers -{ - public class MockConnectionDispatcher : IConnectionDispatcher - { - public Func, PipeOptions> InputOptions { get; set; } = pool => new PipeOptions(pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false); - public Func, PipeOptions> OutputOptions { get; set; } = pool => new PipeOptions(pool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false); - - public Task OnConnection(TransportConnection connection) - { - Input = new Pipe(InputOptions(connection.MemoryPool)); - Output = new Pipe(OutputOptions(connection.MemoryPool)); - - connection.Transport = new DuplexPipe(Input.Reader, Output.Writer); - connection.Application = new DuplexPipe(Output.Reader, Input.Writer); - - return Task.CompletedTask; - } - - public Pipe Input { get; private set; } - public Pipe Output { get; private set; } - } -} diff --git a/src/Servers/Kestrel/Transport.Libuv/test/TestHelpers/TestLibuvTransportContext.cs b/src/Servers/Kestrel/Transport.Libuv/test/TestHelpers/TestLibuvTransportContext.cs index 155c31b2eb..1bccf57d32 100644 --- a/src/Servers/Kestrel/Transport.Libuv/test/TestHelpers/TestLibuvTransportContext.cs +++ b/src/Servers/Kestrel/Transport.Libuv/test/TestHelpers/TestLibuvTransportContext.cs @@ -13,7 +13,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.TestHelpers var logger = new TestApplicationErrorLogger(); AppLifetime = new LifetimeNotImplemented(); - ConnectionDispatcher = new MockConnectionDispatcher(); Log = new LibuvTrace(logger); Options = new LibuvTransportOptions { ThreadCount = 1 }; } diff --git a/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj b/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj index d41703c771..d5f1350fec 100644 --- a/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj +++ b/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.netcoreapp3.0.cs b/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.netcoreapp3.0.cs index 2b9b9b1b87..34c7f982bb 100644 --- a/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.netcoreapp3.0.cs +++ b/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.netcoreapp3.0.cs @@ -11,15 +11,18 @@ namespace Microsoft.AspNetCore.Hosting } namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets { - public sealed partial class SocketTransportFactory : Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.ITransportFactory + public sealed partial class SocketTransportFactory : Microsoft.AspNetCore.Connections.IConnectionListenerFactory { - public SocketTransportFactory(Microsoft.Extensions.Options.IOptions options, Microsoft.Extensions.Hosting.IHostApplicationLifetime applicationLifetime, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - public Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.ITransport Create(Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.IEndPointInformation endPointInformation, Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.IConnectionDispatcher dispatcher) { throw null; } + public SocketTransportFactory(Microsoft.Extensions.Options.IOptions options, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public System.Threading.Tasks.ValueTask BindAsync(System.Net.EndPoint endpoint, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } } public partial class SocketTransportOptions { public SocketTransportOptions() { } public int IOQueueCount { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public long? MaxReadBufferSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public long? MaxWriteBufferSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool NoDelay { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } } } namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal diff --git a/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketConnection.cs b/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketConnection.cs index bfb467f94a..1c867f3199 100644 --- a/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketConnection.cs +++ b/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketConnection.cs @@ -11,19 +11,17 @@ using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal { - internal sealed class SocketConnection : TransportConnection, IDisposable + internal sealed class SocketConnection : TransportConnection { - private static readonly int MinAllocBufferSize = KestrelMemoryPool.MinimumSegmentSize / 2; + private static readonly int MinAllocBufferSize = SlabMemoryPool.BlockSize / 2; private static readonly bool IsWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows); private static readonly bool IsMacOS = RuntimeInformation.IsOSPlatform(OSPlatform.OSX); private readonly Socket _socket; - private readonly PipeScheduler _scheduler; private readonly ISocketsTrace _trace; private readonly SocketReceiver _receiver; private readonly SocketSender _sender; @@ -32,8 +30,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal private readonly object _shutdownLock = new object(); private volatile bool _socketDisposed; private volatile Exception _shutdownReason; + private Task _processingTask; - internal SocketConnection(Socket socket, MemoryPool memoryPool, PipeScheduler scheduler, ISocketsTrace trace) + internal SocketConnection(Socket socket, + MemoryPool memoryPool, + PipeScheduler scheduler, + ISocketsTrace trace, + long? maxReadBufferSize = null, + long? maxWriteBufferSize = null) { Debug.Assert(socket != null); Debug.Assert(memoryPool != null); @@ -41,35 +45,46 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal _socket = socket; MemoryPool = memoryPool; - _scheduler = scheduler; - Logger = trace; _trace = trace; - var localEndPoint = (IPEndPoint)_socket.LocalEndPoint; - var remoteEndPoint = (IPEndPoint)_socket.RemoteEndPoint; - - LocalAddress = localEndPoint.Address; - LocalPort = localEndPoint.Port; - - RemoteAddress = remoteEndPoint.Address; - RemotePort = remoteEndPoint.Port; + LocalEndPoint = _socket.LocalEndPoint; + RemoteEndPoint = _socket.RemoteEndPoint; ConnectionClosed = _connectionClosedTokenSource.Token; // On *nix platforms, Sockets already dispatches to the ThreadPool. // Yes, the IOQueues are still used for the PipeSchedulers. This is intentional. // https://github.com/aspnet/KestrelHttpServer/issues/2573 - var awaiterScheduler = IsWindows ? _scheduler : PipeScheduler.Inline; + var awaiterScheduler = IsWindows ? scheduler : PipeScheduler.Inline; _receiver = new SocketReceiver(_socket, awaiterScheduler); _sender = new SocketSender(_socket, awaiterScheduler); + + maxReadBufferSize ??= 0; + maxWriteBufferSize ??= 0; + + var inputOptions = new PipeOptions(MemoryPool, PipeScheduler.ThreadPool, scheduler, maxReadBufferSize.Value, maxReadBufferSize.Value / 2, useSynchronizationContext: false); + var outputOptions = new PipeOptions(MemoryPool, scheduler, PipeScheduler.ThreadPool, maxWriteBufferSize.Value, maxWriteBufferSize.Value / 2, useSynchronizationContext: false); + + var pair = DuplexPipe.CreateConnectionPair(inputOptions, outputOptions); + + // Set the transport and connection id + Transport = pair.Transport; + Application = pair.Application; } - public override MemoryPool MemoryPool { get; } - public override PipeScheduler InputWriterScheduler => _scheduler; - public override PipeScheduler OutputReaderScheduler => _scheduler; + public PipeWriter Input => Application.Output; - public async Task StartAsync() + public PipeReader Output => Application.Input; + + public override MemoryPool MemoryPool { get; } + + public void Start() + { + _processingTask = StartAsync(); + } + + private async Task StartAsync() { try { @@ -83,7 +98,22 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal _receiver.Dispose(); _sender.Dispose(); - ThreadPool.UnsafeQueueUserWorkItem(state => ((SocketConnection)state).CancelConnectionClosedToken(), this); + + // Fire the connection closed token and wait for it to complete + var waitForConnectionClosedTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + ThreadPool.UnsafeQueueUserWorkItem(state => + { + (var connection, var tcs) = state; + + connection.CancelConnectionClosedToken(); + + tcs.TrySetResult(null); + }, + (this, waitForConnectionClosedTcs), + preferLocal: false); + + await waitForConnectionClosedTcs.Task; } catch (Exception ex) { @@ -101,10 +131,17 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal } // Only called after connection middleware is complete which means the ConnectionClosed token has fired. - public void Dispose() + public override async ValueTask DisposeAsync() { + Transport.Input.Complete(); + Transport.Output.Complete(); + + if (_processingTask != null) + { + await _processingTask; + } + _connectionClosedTokenSource.Dispose(); - _connectionClosingCts.Dispose(); } private async Task DoReceive() @@ -211,7 +248,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal } catch (SocketException ex) when (IsConnectionResetError(ex.SocketErrorCode)) { - shutdownReason = new ConnectionResetException(ex.Message, ex);; + shutdownReason = new ConnectionResetException(ex.Message, ex); _trace.ConnectionReset(ConnectionId); } catch (Exception ex) diff --git a/src/Servers/Kestrel/Transport.Sockets/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj b/src/Servers/Kestrel/Transport.Sockets/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj index e5ffbb53b6..337685e9b7 100644 --- a/src/Servers/Kestrel/Transport.Sockets/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj +++ b/src/Servers/Kestrel/Transport.Sockets/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj @@ -10,9 +10,14 @@ CS1591;$(NoWarn) + + + + + - + diff --git a/src/Servers/Kestrel/Transport.Sockets/src/SocketConnectionListener.cs b/src/Servers/Kestrel/Transport.Sockets/src/SocketConnectionListener.cs new file mode 100644 index 0000000000..6f6e10f867 --- /dev/null +++ b/src/Servers/Kestrel/Transport.Sockets/src/SocketConnectionListener.cs @@ -0,0 +1,143 @@ +// 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.Buffers; +using System.Diagnostics; +using System.IO.Pipelines; +using System.Net; +using System.Net.Sockets; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Connections; +using Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal; + +namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets +{ + internal sealed class SocketConnectionListener : IConnectionListener + { + private readonly MemoryPool _memoryPool; + private readonly int _numSchedulers; + private readonly PipeScheduler[] _schedulers; + private readonly ISocketsTrace _trace; + private Socket _listenSocket; + private int _schedulerIndex; + private readonly SocketTransportOptions _options; + + public EndPoint EndPoint { get; private set; } + + internal SocketConnectionListener( + EndPoint endpoint, + SocketTransportOptions options, + ISocketsTrace trace) + { + EndPoint = endpoint; + _trace = trace; + _options = options; + _memoryPool = _options.MemoryPoolFactory(); + var ioQueueCount = options.IOQueueCount; + + if (ioQueueCount > 0) + { + _numSchedulers = ioQueueCount; + _schedulers = new IOQueue[_numSchedulers]; + + for (var i = 0; i < _numSchedulers; i++) + { + _schedulers[i] = new IOQueue(); + } + } + else + { + var directScheduler = new PipeScheduler[] { PipeScheduler.ThreadPool }; + _numSchedulers = directScheduler.Length; + _schedulers = directScheduler; + } + } + + internal void Bind() + { + if (_listenSocket != null) + { + throw new InvalidOperationException(SocketsStrings.TransportAlreadyBound); + } + + Socket listenSocket; + + // Unix domain sockets are unspecified + var protocolType = EndPoint is UnixDomainSocketEndPoint ? ProtocolType.Unspecified : ProtocolType.Tcp; + + listenSocket = new Socket(EndPoint.AddressFamily, SocketType.Stream, protocolType); + + // Kestrel expects IPv6Any to bind to both IPv6 and IPv4 + if (EndPoint is IPEndPoint ip && ip.Address == IPAddress.IPv6Any) + { + listenSocket.DualMode = true; + } + + try + { + listenSocket.Bind(EndPoint); + } + catch (SocketException e) when (e.SocketErrorCode == SocketError.AddressAlreadyInUse) + { + throw new AddressInUseException(e.Message, e); + } + + EndPoint = listenSocket.LocalEndPoint; + + listenSocket.Listen(512); + + _listenSocket = listenSocket; + } + + public async ValueTask AcceptAsync(CancellationToken cancellationToken = default) + { + while (true) + { + try + { + var acceptSocket = await _listenSocket.AcceptAsync(); + + // Only apply no delay to Tcp based endpoints + if (acceptSocket.LocalEndPoint is IPEndPoint) + { + acceptSocket.NoDelay = _options.NoDelay; + } + + var connection = new SocketConnection(acceptSocket, _memoryPool, _schedulers[_schedulerIndex], _trace, _options.MaxReadBufferSize, _options.MaxWriteBufferSize); + + connection.Start(); + + _schedulerIndex = (_schedulerIndex + 1) % _numSchedulers; + + return connection; + } + catch (ObjectDisposedException) + { + // A call was made to UnbindAsync/DisposeAsync just return null which signals we're done + return null; + } + catch (SocketException) + { + // The connection got reset while it was in the backlog, so we try again. + _trace.ConnectionReset(connectionId: "(null)"); + } + } + } + + public ValueTask UnbindAsync(CancellationToken cancellationToken = default) + { + _listenSocket?.Dispose(); + return default; + } + + public ValueTask DisposeAsync() + { + _listenSocket?.Dispose(); + // Dispose the memory pool + _memoryPool.Dispose(); + return default; + } + } +} diff --git a/src/Servers/Kestrel/Transport.Sockets/src/SocketTransport.cs b/src/Servers/Kestrel/Transport.Sockets/src/SocketTransport.cs deleted file mode 100644 index a1b01d45bb..0000000000 --- a/src/Servers/Kestrel/Transport.Sockets/src/SocketTransport.cs +++ /dev/null @@ -1,205 +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.Buffers; -using System.Diagnostics; -using System.IO.Pipelines; -using System.Net; -using System.Net.Sockets; -using System.Runtime.ExceptionServices; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Hosting; - -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets -{ - internal sealed class SocketTransport : ITransport - { - private readonly MemoryPool _memoryPool; - private readonly IEndPointInformation _endPointInformation; - private readonly IConnectionDispatcher _dispatcher; - private readonly IHostApplicationLifetime _appLifetime; - private readonly int _numSchedulers; - private readonly PipeScheduler[] _schedulers; - private readonly ISocketsTrace _trace; - private Socket _listenSocket; - private Task _listenTask; - private Exception _listenException; - private volatile bool _unbinding; - - internal SocketTransport( - IEndPointInformation endPointInformation, - IConnectionDispatcher dispatcher, - IHostApplicationLifetime applicationLifetime, - int ioQueueCount, - ISocketsTrace trace, - MemoryPool memoryPool) - { - Debug.Assert(endPointInformation != null); - Debug.Assert(endPointInformation.Type == ListenType.IPEndPoint); - Debug.Assert(dispatcher != null); - Debug.Assert(applicationLifetime != null); - Debug.Assert(trace != null); - - _endPointInformation = endPointInformation; - _dispatcher = dispatcher; - _appLifetime = applicationLifetime; - _trace = trace; - _memoryPool = memoryPool; - - if (ioQueueCount > 0) - { - _numSchedulers = ioQueueCount; - _schedulers = new IOQueue[_numSchedulers]; - - for (var i = 0; i < _numSchedulers; i++) - { - _schedulers[i] = new IOQueue(); - } - } - else - { - var directScheduler = new PipeScheduler[] { PipeScheduler.ThreadPool }; - _numSchedulers = directScheduler.Length; - _schedulers = directScheduler; - } - } - - public Task BindAsync() - { - if (_listenSocket != null) - { - throw new InvalidOperationException(SocketsStrings.TransportAlreadyBound); - } - - IPEndPoint endPoint = _endPointInformation.IPEndPoint; - - var listenSocket = new Socket(endPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp); - - // Kestrel expects IPv6Any to bind to both IPv6 and IPv4 - if (endPoint.Address == IPAddress.IPv6Any) - { - listenSocket.DualMode = true; - } - - try - { - listenSocket.Bind(endPoint); - } - catch (SocketException e) when (e.SocketErrorCode == SocketError.AddressAlreadyInUse) - { - throw new AddressInUseException(e.Message, e); - } - - // If requested port was "0", replace with assigned dynamic port. - if (_endPointInformation.IPEndPoint.Port == 0) - { - _endPointInformation.IPEndPoint = (IPEndPoint)listenSocket.LocalEndPoint; - } - - listenSocket.Listen(512); - - _listenSocket = listenSocket; - - _listenTask = Task.Run(() => RunAcceptLoopAsync()); - - return Task.CompletedTask; - } - - public async Task UnbindAsync() - { - if (_listenSocket != null) - { - _unbinding = true; - _listenSocket.Dispose(); - - Debug.Assert(_listenTask != null); - await _listenTask.ConfigureAwait(false); - - _unbinding = false; - _listenSocket = null; - _listenTask = null; - - if (_listenException != null) - { - var exInfo = ExceptionDispatchInfo.Capture(_listenException); - _listenException = null; - exInfo.Throw(); - } - } - } - - public Task StopAsync() - { - _memoryPool.Dispose(); - return Task.CompletedTask; - } - - private async Task RunAcceptLoopAsync() - { - try - { - while (true) - { - for (var schedulerIndex = 0; schedulerIndex < _numSchedulers; schedulerIndex++) - { - try - { - var acceptSocket = await _listenSocket.AcceptAsync(); - acceptSocket.NoDelay = _endPointInformation.NoDelay; - - var connection = new SocketConnection(acceptSocket, _memoryPool, _schedulers[schedulerIndex], _trace); - - // REVIEW: This task should be tracked by the server for graceful shutdown - // Today it's handled specifically for http but not for arbitrary middleware - _ = HandleConnectionAsync(connection); - } - catch (SocketException) when (!_unbinding) - { - _trace.ConnectionReset(connectionId: "(null)"); - } - } - } - } - catch (Exception ex) - { - if (_unbinding) - { - // Means we must be unbinding. Eat the exception. - } - else - { - _trace.LogCritical(ex, $"Unexpected exception in {nameof(SocketTransport)}.{nameof(RunAcceptLoopAsync)}."); - _listenException = ex; - - // Request shutdown so we can rethrow this exception - // in Stop which should be observable. - _appLifetime.StopApplication(); - } - } - } - - private async Task HandleConnectionAsync(SocketConnection connection) - { - try - { - var middlewareTask = _dispatcher.OnConnection(connection); - var transportTask = connection.StartAsync(); - - await transportTask; - await middlewareTask; - - connection.Dispose(); - } - catch (Exception ex) - { - _trace.LogCritical(ex, $"Unexpected exception in {nameof(SocketTransport)}.{nameof(HandleConnectionAsync)}."); - } - } - } -} diff --git a/src/Servers/Kestrel/Transport.Sockets/src/SocketTransportFactory.cs b/src/Servers/Kestrel/Transport.Sockets/src/SocketTransportFactory.cs index f6ef805fbb..1988897855 100644 --- a/src/Servers/Kestrel/Transport.Sockets/src/SocketTransportFactory.cs +++ b/src/Servers/Kestrel/Transport.Sockets/src/SocketTransportFactory.cs @@ -2,66 +2,46 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; +using System.Net; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal; -using Microsoft.Extensions.Options; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging.Abstractions; +using Microsoft.Extensions.Options; namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets { -#pragma warning disable PUB0001 // Pubternal type in public API - public sealed class SocketTransportFactory : ITransportFactory -#pragma warning restore PUB0001 // Pubternal type in public API + public sealed class SocketTransportFactory : IConnectionListenerFactory { private readonly SocketTransportOptions _options; - private readonly IHostApplicationLifetime _appLifetime; private readonly SocketsTrace _trace; public SocketTransportFactory( IOptions options, - IHostApplicationLifetime applicationLifetime, ILoggerFactory loggerFactory) { if (options == null) { throw new ArgumentNullException(nameof(options)); } - if (applicationLifetime == null) - { - throw new ArgumentNullException(nameof(applicationLifetime)); - } + if (loggerFactory == null) { throw new ArgumentNullException(nameof(loggerFactory)); } _options = options.Value; - _appLifetime = applicationLifetime; - var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets"); + var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets"); _trace = new SocketsTrace(logger); } -#pragma warning disable PUB0001 // Pubternal type in public API - public ITransport Create(IEndPointInformation endPointInformation, IConnectionDispatcher dispatcher) -#pragma warning restore PUB0001 // Pubternal type in public API + public ValueTask BindAsync(EndPoint endpoint, CancellationToken cancellationToken = default) { - if (endPointInformation == null) - { - throw new ArgumentNullException(nameof(endPointInformation)); - } - - if (endPointInformation.Type != ListenType.IPEndPoint) - { - throw new ArgumentException(SocketsStrings.OnlyIPEndPointsSupported, nameof(endPointInformation)); - } - - if (dispatcher == null) - { - throw new ArgumentNullException(nameof(dispatcher)); - } - - return new SocketTransport(endPointInformation, dispatcher, _appLifetime, _options.IOQueueCount, _trace, _options.MemoryPoolFactory()); + var transport = new SocketConnectionListener(endpoint, _options, _trace); + transport.Bind(); + return new ValueTask(transport); } } } diff --git a/src/Servers/Kestrel/Transport.Sockets/src/SocketTransportOptions.cs b/src/Servers/Kestrel/Transport.Sockets/src/SocketTransportOptions.cs index 2dad914423..7bd8e6e937 100644 --- a/src/Servers/Kestrel/Transport.Sockets/src/SocketTransportOptions.cs +++ b/src/Servers/Kestrel/Transport.Sockets/src/SocketTransportOptions.cs @@ -1,9 +1,8 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Buffers; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets { @@ -17,6 +16,18 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets /// public int IOQueueCount { get; set; } = Math.Min(Environment.ProcessorCount, 16); - internal Func> MemoryPoolFactory { get; set; } = () => KestrelMemoryPool.Create(); + /// + /// Set to false to enable Nagle's algorithm for all connections. + /// + /// + /// Defaults to true. + /// + public bool NoDelay { get; set; } = true; + + public long? MaxReadBufferSize { get; set; } = 1024 * 1024; + + public long? MaxWriteBufferSize { get; set; } = 64 * 1024; + + internal Func> MemoryPoolFactory { get; set; } = System.Buffers.MemoryPoolFactory.Create; } } diff --git a/src/Servers/Kestrel/Transport.Sockets/src/WebHostBuilderSocketExtensions.cs b/src/Servers/Kestrel/Transport.Sockets/src/WebHostBuilderSocketExtensions.cs index 95d27e46db..d073f91aa4 100644 --- a/src/Servers/Kestrel/Transport.Sockets/src/WebHostBuilderSocketExtensions.cs +++ b/src/Servers/Kestrel/Transport.Sockets/src/WebHostBuilderSocketExtensions.cs @@ -1,8 +1,8 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets; using Microsoft.Extensions.DependencyInjection; @@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Hosting { return hostBuilder.ConfigureServices(services => { - services.AddSingleton(); + services.AddSingleton(); }); } diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/ChunkWriterBenchmark.cs b/src/Servers/Kestrel/perf/Kestrel.Performance/ChunkWriterBenchmark.cs index 3b24e49cab..c327d8d51f 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/ChunkWriterBenchmark.cs +++ b/src/Servers/Kestrel/perf/Kestrel.Performance/ChunkWriterBenchmark.cs @@ -6,7 +6,6 @@ using System.IO.Pipelines; using System.Threading.Tasks; using BenchmarkDotNet.Attributes; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; namespace Microsoft.AspNetCore.Server.Kestrel.Performance { @@ -21,7 +20,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance [GlobalSetup] public void Setup() { - _memoryPool = KestrelMemoryPool.Create(); + _memoryPool = MemoryPoolFactory.Create(); var pipe = new Pipe(new PipeOptions(_memoryPool)); _reader = pipe.Reader; _writer = pipe.Writer; diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Http1ConnectionBenchmark.cs b/src/Servers/Kestrel/perf/Kestrel.Performance/Http1ConnectionBenchmark.cs index c404a16c27..d7bdd0a709 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Http1ConnectionBenchmark.cs +++ b/src/Servers/Kestrel/perf/Kestrel.Performance/Http1ConnectionBenchmark.cs @@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; namespace Microsoft.AspNetCore.Server.Kestrel.Performance { @@ -27,7 +26,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance [GlobalSetup] public void Setup() { - var memoryPool = KestrelMemoryPool.Create(); + var memoryPool = MemoryPoolFactory.Create(); var options = new PipeOptions(memoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false); var pair = DuplexPipe.CreateConnectionPair(options, options); diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Http1ConnectionParsingOverheadBenchmark.cs b/src/Servers/Kestrel/perf/Kestrel.Performance/Http1ConnectionParsingOverheadBenchmark.cs index 84ac57e630..8ffe0a0059 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Http1ConnectionParsingOverheadBenchmark.cs +++ b/src/Servers/Kestrel/perf/Kestrel.Performance/Http1ConnectionParsingOverheadBenchmark.cs @@ -9,7 +9,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; namespace Microsoft.AspNetCore.Server.Kestrel.Performance { @@ -23,7 +22,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance [IterationSetup] public void Setup() { - var memoryPool = KestrelMemoryPool.Create(); + var memoryPool = MemoryPoolFactory.Create(); var options = new PipeOptions(memoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false); var pair = DuplexPipe.CreateConnectionPair(options, options); diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Http1ReadingBenchmark.cs b/src/Servers/Kestrel/perf/Kestrel.Performance/Http1ReadingBenchmark.cs index 122c5b694c..2faca73d6a 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Http1ReadingBenchmark.cs +++ b/src/Servers/Kestrel/perf/Kestrel.Performance/Http1ReadingBenchmark.cs @@ -13,7 +13,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.AspNetCore.Testing; namespace Microsoft.AspNetCore.Server.Kestrel.Performance @@ -35,7 +34,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance [GlobalSetup] public void GlobalSetup() { - _memoryPool = KestrelMemoryPool.Create(); + _memoryPool = MemoryPoolFactory.Create(); _http1Connection = MakeHttp1Connection(); } diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Http1WritingBenchmark.cs b/src/Servers/Kestrel/perf/Kestrel.Performance/Http1WritingBenchmark.cs index d0c1cf3370..94dc4e66c5 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Http1WritingBenchmark.cs +++ b/src/Servers/Kestrel/perf/Kestrel.Performance/Http1WritingBenchmark.cs @@ -13,7 +13,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.AspNetCore.Testing; namespace Microsoft.AspNetCore.Server.Kestrel.Performance @@ -35,7 +34,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance [GlobalSetup] public void GlobalSetup() { - _memoryPool = KestrelMemoryPool.Create(); + _memoryPool = MemoryPoolFactory.Create(); _http1Connection = MakeHttp1Connection(); } diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/HttpProtocolFeatureCollection.cs b/src/Servers/Kestrel/perf/Kestrel.Performance/HttpProtocolFeatureCollection.cs index 3f8bae879f..7f948c5a4b 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/HttpProtocolFeatureCollection.cs +++ b/src/Servers/Kestrel/perf/Kestrel.Performance/HttpProtocolFeatureCollection.cs @@ -1,7 +1,8 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Buffers; using System.IO.Pipelines; using System.Runtime.CompilerServices; using System.Threading; @@ -11,7 +12,6 @@ using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; namespace Microsoft.AspNetCore.Server.Kestrel.Performance { @@ -78,7 +78,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance public HttpProtocolFeatureCollection() { - var memoryPool = KestrelMemoryPool.Create(); + var memoryPool = MemoryPoolFactory.Create(); var options = new PipeOptions(memoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false); var pair = DuplexPipe.CreateConnectionPair(options, options); diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/InMemoryTransportBenchmark.cs b/src/Servers/Kestrel/perf/Kestrel.Performance/InMemoryTransportBenchmark.cs index d5421ab448..b3e4e13eff 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/InMemoryTransportBenchmark.cs +++ b/src/Servers/Kestrel/perf/Kestrel.Performance/InMemoryTransportBenchmark.cs @@ -6,13 +6,15 @@ using System.Buffers; using System.Collections.Generic; using System.IO.Pipelines; using System.Linq; +using System.Net; using System.Text; +using System.Threading; using System.Threading.Tasks; using BenchmarkDotNet.Attributes; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.Extensions.DependencyInjection; namespace Microsoft.AspNetCore.Server.Kestrel.Performance @@ -45,7 +47,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance .UseKestrel() // Bind to a single non-HTTPS endpoint .UseUrls("http://127.0.0.1:5000") - .ConfigureServices(services => services.AddSingleton(transportFactory)) + .ConfigureServices(services => services.AddSingleton(transportFactory)) .Configure(app => app.UseMiddleware()) .Build(); @@ -94,21 +96,21 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance await _connection.ReadResponseAsync(_plaintextPipelinedExpectedResponse.Length); } - internal class InMemoryTransportFactory : ITransportFactory + internal class InMemoryTransportFactory : IConnectionListenerFactory { private readonly int _connectionsPerEndPoint; - private readonly Dictionary> _connections = - new Dictionary>(); + private readonly Dictionary> _connections = + new Dictionary>(); - public IReadOnlyDictionary> Connections => _connections; + public IReadOnlyDictionary> Connections => _connections; public InMemoryTransportFactory(int connectionsPerEndPoint) { _connectionsPerEndPoint = connectionsPerEndPoint; } - public ITransport Create(IEndPointInformation endPointInformation, IConnectionDispatcher handler) + public ValueTask BindAsync(EndPoint endpoint, CancellationToken cancellationToken = default) { var connections = new InMemoryConnection[_connectionsPerEndPoint]; for (var i = 0; i < _connectionsPerEndPoint; i++) @@ -116,46 +118,66 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance connections[i] = new InMemoryConnection(); } - _connections.Add(endPointInformation, connections); + _connections.Add(endpoint, connections); - return new InMemoryTransport(handler, connections); + return new ValueTask(new InMemoryTransport(endpoint, connections)); } } - public class InMemoryTransport : ITransport + public class InMemoryTransport : IConnectionListener { - private readonly IConnectionDispatcher _dispatcher; private readonly IReadOnlyList _connections; + private readonly TaskCompletionSource _tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + private int _acceptedConnections; - public InMemoryTransport(IConnectionDispatcher dispatcher, IReadOnlyList connections) + public InMemoryTransport(EndPoint endpoint, IReadOnlyList connections) { - _dispatcher = dispatcher; + EndPoint = endpoint; _connections = connections; } - public Task BindAsync() + public EndPoint EndPoint { get; } + + public ValueTask AcceptAsync(CancellationToken cancellationToken = default) { - foreach (var connection in _connections) + if (_acceptedConnections < _connections.Count) { - _dispatcher.OnConnection(connection); + return new ValueTask(_connections[_acceptedConnections++]); } - - return Task.CompletedTask; + return new ValueTask(_tcs.Task); } - public Task StopAsync() + public ValueTask DisposeAsync() { - return Task.CompletedTask; + _tcs.TrySetResult(null); + return default; } - public Task UnbindAsync() + public ValueTask UnbindAsync(CancellationToken cancellationToken = default) { - return Task.CompletedTask; + _tcs.TrySetResult(null); + return default; } } public class InMemoryConnection : TransportConnection { + public InMemoryConnection() + { + var inputOptions = new PipeOptions(useSynchronizationContext: false); + var outputOptions = new PipeOptions(useSynchronizationContext: false); + + var pair = DuplexPipe.CreateConnectionPair(inputOptions, outputOptions); + + // Set the transport and connection id + Transport = pair.Transport; + Application = pair.Application; + } + + public PipeWriter Input => Application.Output; + + public PipeReader Output => Application.Input; + public ValueTask SendRequestAsync(byte[] request) { return Input.WriteAsync(request); diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj b/src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj index e801048b67..93d77cab5f 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj +++ b/src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj @@ -10,6 +10,7 @@ + diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/PipeThroughputBenchmark.cs b/src/Servers/Kestrel/perf/Kestrel.Performance/PipeThroughputBenchmark.cs index b37656faec..03b3eb2f1d 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/PipeThroughputBenchmark.cs +++ b/src/Servers/Kestrel/perf/Kestrel.Performance/PipeThroughputBenchmark.cs @@ -1,11 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Buffers; using System.IO.Pipelines; using System.Threading.Tasks; using BenchmarkDotNet.Attributes; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; namespace Microsoft.AspNetCore.Server.Kestrel.Performance { @@ -20,7 +19,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance [IterationSetup] public void Setup() { - _memoryPool = KestrelMemoryPool.Create(); + _memoryPool = MemoryPoolFactory.Create(); _pipe = new Pipe(new PipeOptions(_memoryPool)); } diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/RequestParsingBenchmark.cs b/src/Servers/Kestrel/perf/Kestrel.Performance/RequestParsingBenchmark.cs index da9f0f7faf..a6cba51178 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/RequestParsingBenchmark.cs +++ b/src/Servers/Kestrel/perf/Kestrel.Performance/RequestParsingBenchmark.cs @@ -9,7 +9,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; namespace Microsoft.AspNetCore.Server.Kestrel.Performance { @@ -24,7 +23,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance [IterationSetup] public void Setup() { - _memoryPool = KestrelMemoryPool.Create(); + _memoryPool = MemoryPoolFactory.Create(); var options = new PipeOptions(_memoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false); var pair = DuplexPipe.CreateConnectionPair(options, options); diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/ResponseHeaderCollectionBenchmark.cs b/src/Servers/Kestrel/perf/Kestrel.Performance/ResponseHeaderCollectionBenchmark.cs index 530a0ec968..417c5a8bbe 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/ResponseHeaderCollectionBenchmark.cs +++ b/src/Servers/Kestrel/perf/Kestrel.Performance/ResponseHeaderCollectionBenchmark.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Buffers; using System.IO.Pipelines; using System.Runtime.CompilerServices; using System.Text; @@ -12,7 +13,6 @@ using Microsoft.AspNetCore.Http.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.Net.Http.Headers; namespace Microsoft.AspNetCore.Server.Kestrel.Performance @@ -172,7 +172,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance [IterationSetup] public void Setup() { - var memoryPool = KestrelMemoryPool.Create(); + var memoryPool = MemoryPoolFactory.Create(); var options = new PipeOptions(memoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false); var pair = DuplexPipe.CreateConnectionPair(options, options); diff --git a/src/Servers/Kestrel/perf/PlatformBenchmarks/BenchmarkApplication.HttpConnection.cs b/src/Servers/Kestrel/perf/PlatformBenchmarks/BenchmarkApplication.HttpConnection.cs index 1d5cc6f55d..bda3e005a8 100644 --- a/src/Servers/Kestrel/perf/PlatformBenchmarks/BenchmarkApplication.HttpConnection.cs +++ b/src/Servers/Kestrel/perf/PlatformBenchmarks/BenchmarkApplication.HttpConnection.cs @@ -125,11 +125,9 @@ namespace PlatformBenchmarks { } -#if NETCOREAPP3_0 public void OnHeadersComplete() { } -#endif public async ValueTask OnReadCompletedAsync() { @@ -182,9 +180,10 @@ namespace PlatformBenchmarks public void OnStartLine(HttpMethod method, HttpVersion version, Span target, Span path, Span query, Span customMethod, bool pathEncoded) => RequestHandler.OnStartLine(method, version, target, path, query, customMethod, pathEncoded); -#if NETCOREAPP3_0 public void OnHeadersComplete() => RequestHandler.OnHeadersComplete(); +#if !NETCOREAPP3_0 +#error This is a .NET Core 3.0 application and needs to be compiled for netcoreapp3.0 #endif } } diff --git a/src/Servers/Kestrel/perf/PlatformBenchmarks/BenchmarkApplication.cs b/src/Servers/Kestrel/perf/PlatformBenchmarks/BenchmarkApplication.cs index b1e5c8b475..25382fe7b0 100644 --- a/src/Servers/Kestrel/perf/PlatformBenchmarks/BenchmarkApplication.cs +++ b/src/Servers/Kestrel/perf/PlatformBenchmarks/BenchmarkApplication.cs @@ -117,7 +117,7 @@ namespace PlatformBenchmarks // Content-Length header writer.Write(_headerContentLength); - var jsonPayload = JsonSerializer.ToBytes(new { message = "Hello, World!" }, SerializerOptions); + var jsonPayload = JsonSerializer.ToUtf8Bytes(new JsonMessage { message = "Hello, World!" }, SerializerOptions); writer.WriteNumeric((uint)jsonPayload.Length); // End of headers @@ -155,5 +155,10 @@ namespace PlatformBenchmarks PlainText, Json } + + public struct JsonMessage + { + public string message { get; set; } + } } } diff --git a/src/Servers/Kestrel/samples/Http2SampleApp/Program.cs b/src/Servers/Kestrel/samples/Http2SampleApp/Program.cs index f1fc2223cf..794f011ecc 100644 --- a/src/Servers/Kestrel/samples/Http2SampleApp/Program.cs +++ b/src/Servers/Kestrel/samples/Http2SampleApp/Program.cs @@ -7,7 +7,6 @@ using Microsoft.AspNetCore.Connections.Features; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Adapter.Internal; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; @@ -29,9 +28,6 @@ namespace Http2SampleApp { var basePort = context.Configuration.GetValue("BASE_PORT") ?? 5000; - // Run callbacks on the transport thread - options.ApplicationSchedulingMode = SchedulingMode.Inline; - // Http/1.1 endpoint for comparison options.Listen(IPAddress.Any, basePort, listenOptions => { diff --git a/src/Servers/Kestrel/samples/PlaintextApp/PlaintextApp.csproj b/src/Servers/Kestrel/samples/PlaintextApp/PlaintextApp.csproj index 86fd68771b..8b48f958a9 100644 --- a/src/Servers/Kestrel/samples/PlaintextApp/PlaintextApp.csproj +++ b/src/Servers/Kestrel/samples/PlaintextApp/PlaintextApp.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.0 @@ -8,6 +8,7 @@ + diff --git a/src/Servers/Kestrel/samples/PlaintextApp/Startup.cs b/src/Servers/Kestrel/samples/PlaintextApp/Startup.cs index 28da0a6f2c..044e8b5dfe 100644 --- a/src/Servers/Kestrel/samples/PlaintextApp/Startup.cs +++ b/src/Servers/Kestrel/samples/PlaintextApp/Startup.cs @@ -2,10 +2,13 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.IO; +using System.IO.Pipelines; using System.Net; +using System.Runtime.CompilerServices; using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Hosting; namespace PlaintextApp @@ -18,17 +21,18 @@ namespace PlaintextApp { app.Run((httpContext) => { + var payload = _helloWorldBytes; var response = httpContext.Response; + response.StatusCode = 200; response.ContentType = "text/plain"; + response.ContentLength = payload.Length; - var helloWorld = _helloWorldBytes; - response.ContentLength = helloWorld.Length; - return response.Body.WriteAsync(helloWorld, 0, helloWorld.Length); + return response.BodyWriter.WriteAsync(payload).GetAsTask(); }); } - public static Task Main(string[] args) + public static async Task Main(string[] args) { var host = new WebHostBuilder() .UseKestrel(options => @@ -39,7 +43,25 @@ namespace PlaintextApp .UseStartup() .Build(); - return host.RunAsync(); + await host.RunAsync(); + } + } + + internal static class ValueTaskExtensions + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static Task GetAsTask(this in ValueTask valueTask) + { + if (valueTask.IsCompletedSuccessfully) + { + // Signal consumption to the IValueTaskSource + valueTask.GetAwaiter().GetResult(); + return Task.CompletedTask; + } + else + { + return valueTask.AsTask(); + } } } } diff --git a/src/Servers/Kestrel/samples/SampleApp/Startup.cs b/src/Servers/Kestrel/samples/SampleApp/Startup.cs index 71f218d816..82f505c510 100644 --- a/src/Servers/Kestrel/samples/SampleApp/Startup.cs +++ b/src/Servers/Kestrel/samples/SampleApp/Startup.cs @@ -14,7 +14,6 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Https.Internal; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; @@ -85,19 +84,11 @@ namespace SampleApp var basePort = context.Configuration.GetValue("BASE_PORT") ?? 5000; - options.ConfigureEndpointDefaults(opt => - { - opt.NoDelay = true; - }); - options.ConfigureHttpsDefaults(httpsOptions => { httpsOptions.SslProtocols = SslProtocols.Tls12; }); - // Run callbacks on the transport thread - options.ApplicationSchedulingMode = SchedulingMode.Inline; - options.Listen(IPAddress.Loopback, basePort, listenOptions => { // Uncomment the following to enable Nagle's algorithm for this endpoint. @@ -148,7 +139,7 @@ namespace SampleApp .Configure(context.Configuration.GetSection("Kestrel")) .Endpoint("NamedEndpoint", opt => { - opt.ListenOptions.NoDelay = true; + }) .Endpoint("NamedHttpsEndpoint", opt => { diff --git a/src/Servers/Kestrel/samples/SystemdTestApp/Startup.cs b/src/Servers/Kestrel/samples/SystemdTestApp/Startup.cs index e91322a827..56e6f3f980 100644 --- a/src/Servers/Kestrel/samples/SystemdTestApp/Startup.cs +++ b/src/Servers/Kestrel/samples/SystemdTestApp/Startup.cs @@ -9,7 +9,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; @@ -51,9 +50,6 @@ namespace SystemdTestApp { var basePort = context.Configuration.GetValue("BASE_PORT") ?? 5000; - // Run callbacks on the transport thread - options.ApplicationSchedulingMode = SchedulingMode.Inline; - options.Listen(IPAddress.Loopback, basePort, listenOptions => { // Uncomment the following to enable Nagle's algorithm for this endpoint. @@ -89,4 +85,4 @@ namespace SystemdTestApp return hostBuilder.Build().RunAsync(); } } -} \ No newline at end of file +} diff --git a/src/Servers/Kestrel/shared/test/TaskTimeoutExtensions.cs b/src/Servers/Kestrel/shared/test/TaskTimeoutExtensions.cs index 8e83a7a70e..68010b090a 100644 --- a/src/Servers/Kestrel/shared/test/TaskTimeoutExtensions.cs +++ b/src/Servers/Kestrel/shared/test/TaskTimeoutExtensions.cs @@ -7,6 +7,16 @@ namespace System.Threading.Tasks { public static class TaskTimeoutExtensions { + public static Task DefaultTimeout(this ValueTask task) + { + return task.AsTask().TimeoutAfter(TestConstants.DefaultTimeout); + } + + public static Task DefaultTimeout(this ValueTask task) + { + return task.AsTask().TimeoutAfter(TestConstants.DefaultTimeout); + } + public static Task DefaultTimeout(this Task task) { return task.TimeoutAfter(TestConstants.DefaultTimeout); diff --git a/src/Servers/Kestrel/shared/test/TestServiceContext.cs b/src/Servers/Kestrel/shared/test/TestServiceContext.cs index 7b6abf939d..e5332963aa 100644 --- a/src/Servers/Kestrel/shared/test/TestServiceContext.cs +++ b/src/Servers/Kestrel/shared/test/TestServiceContext.cs @@ -8,7 +8,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Testing @@ -75,7 +74,7 @@ namespace Microsoft.AspNetCore.Testing public MockSystemClock MockSystemClock { get; set; } - public Func> MemoryPoolFactory { get; set; } = KestrelMemoryPool.Create; + public Func> MemoryPoolFactory { get; set; } = System.Buffers.MemoryPoolFactory.Create; public int ExpectedConnectionMiddlewareCount { get; set; } diff --git a/src/Servers/Kestrel/shared/test/TransportTestHelpers/DiagnosticMemoryPoolFactory.cs b/src/Servers/Kestrel/shared/test/TransportTestHelpers/DiagnosticMemoryPoolFactory.cs index d3a33bf2cf..26c8746e39 100644 --- a/src/Servers/Kestrel/shared/test/TransportTestHelpers/DiagnosticMemoryPoolFactory.cs +++ b/src/Servers/Kestrel/shared/test/TransportTestHelpers/DiagnosticMemoryPoolFactory.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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; @@ -6,7 +6,6 @@ using System.Buffers; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { @@ -29,7 +28,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { lock (_pools) { - var pool = new DiagnosticMemoryPool(KestrelMemoryPool.CreateSlabMemoryPool(), _allowLateReturn, _rentTracking); + var pool = new DiagnosticMemoryPool(new SlabMemoryPool(), _allowLateReturn, _rentTracking); _pools.Add(pool); return pool; } @@ -43,4 +42,4 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } } } -} \ No newline at end of file +} diff --git a/src/Servers/Kestrel/shared/test/TransportTestHelpers/TestServer.cs b/src/Servers/Kestrel/shared/test/TransportTestHelpers/TestServer.cs index bbb6d6fe49..1382a70175 100644 --- a/src/Servers/Kestrel/shared/test/TransportTestHelpers/TestServer.cs +++ b/src/Servers/Kestrel/shared/test/TransportTestHelpers/TestServer.cs @@ -8,11 +8,11 @@ using System.Reflection; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.Kestrel.Core; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -61,7 +61,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests _app = app; Context = context; - _host = TransportSelector.GetWebHostBuilder(context.MemoryPoolFactory) + _host = TransportSelector.GetWebHostBuilder(context.MemoryPoolFactory, context.ServerOptions.Limits.MaxRequestBufferSize) .UseKestrel(options => { configureKestrel(options); @@ -86,7 +86,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests Assert.All(context.ServerOptions.ListenOptions, lo => Assert.Equal(context.ExpectedConnectionMiddlewareCount, lo._middleware.Count)); - return new KestrelServer(sp.GetRequiredService(), context); + return new KestrelServer(sp.GetRequiredService(), context); }); configureServices(services); }) diff --git a/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs b/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs index 540690317b..039b148db0 100644 --- a/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs +++ b/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs @@ -289,7 +289,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests TaskCompletionSource clientFinishedSendingRequestBody, Func> memoryPoolFactory = null) { - var host = TransportSelector.GetWebHostBuilder(memoryPoolFactory) + var host = TransportSelector.GetWebHostBuilder(memoryPoolFactory, maxRequestBufferSize) .ConfigureServices(AddTestLogging) .UseKestrel(options => { diff --git a/src/Servers/Kestrel/test/FunctionalTests/UnixDomainSocketsTests.cs b/src/Servers/Kestrel/test/FunctionalTests/UnixDomainSocketsTests.cs new file mode 100644 index 0000000000..5992c7a232 --- /dev/null +++ b/src/Servers/Kestrel/test/FunctionalTests/UnixDomainSocketsTests.cs @@ -0,0 +1,117 @@ +// 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.Buffers; +using System.IO; +using System.Linq; +using System.Net.Sockets; +using System.Text; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Connections; +using Microsoft.AspNetCore.Connections.Features; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Testing; +using Microsoft.AspNetCore.Testing.xunit; +using Xunit; + +namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests +{ + public class UnixDomainSocketsTest : TestApplicationErrorLoggerLoggedTest + { +#if LIBUV + [OSSkipCondition(OperatingSystems.Windows, SkipReason = "Libuv does not support unix domain sockets on Windows.")] +#else + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win8, WindowsVersions.Win81, WindowsVersions.Win2008R2, SkipReason = "UnixDomainSocketEndPoint is not supported on older versions of Windows")] +#endif + [ConditionalFact] + public async Task TestUnixDomainSocket() + { + var path = Path.GetTempFileName(); + + Delete(path); + + try + { + async Task EchoServer(ConnectionContext connection) + { + // For graceful shutdown + var notificationFeature = connection.Features.Get(); + + try + { + while (true) + { + var result = await connection.Transport.Input.ReadAsync(notificationFeature.ConnectionClosedRequested); + + if (result.IsCompleted) + { + break; + } + + await connection.Transport.Output.WriteAsync(result.Buffer.ToArray()); + + connection.Transport.Input.AdvanceTo(result.Buffer.End); + } + } + catch (OperationCanceledException) + { + + } + } + + var hostBuilder = TransportSelector.GetWebHostBuilder() + .UseKestrel(o => + { + o.ListenUnixSocket(path, builder => + { + builder.Run(EchoServer); + }); + }) + .ConfigureServices(AddTestLogging) + .Configure(c => { }); + + using (var host = hostBuilder.Build()) + { + await host.StartAsync(); + + using (var socket = new Socket(AddressFamily.Unix, SocketType.Stream, ProtocolType.Unspecified)) + { + await socket.ConnectAsync(new UnixDomainSocketEndPoint(path)); + + var data = Encoding.ASCII.GetBytes("Hello World"); + await socket.SendAsync(data, SocketFlags.None); + + var buffer = new byte[data.Length]; + var read = 0; + while (read < data.Length) + { + read += await socket.ReceiveAsync(buffer.AsMemory(read, buffer.Length - read), SocketFlags.None); + } + + Assert.Equal(data, buffer); + } + + await host.StopAsync(); + } + } + finally + { + Delete(path); + } + } + + private static void Delete(string path) + { + try + { + File.Delete(path); + } + catch (FileNotFoundException) + { + + } + } + } +} diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedRequestTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedRequestTests.cs index 2f3f01a941..12ac5791ff 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedRequestTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedRequestTests.cs @@ -127,7 +127,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests [Fact] public async Task Http10KeepAliveTransferEncoding() { - var testContext = new TestServiceContext(); + var testContext = new TestServiceContext(LoggerFactory); await using (var server = new TestServer(AppChunked, testContext)) { diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs index 6751565db1..424307ac26 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs @@ -23,7 +23,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.HPack; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Logging; using Microsoft.Net.Http.Headers; @@ -115,7 +114,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests protected static readonly byte[] _noData = new byte[0]; protected static readonly byte[] _maxData = Encoding.ASCII.GetBytes(new string('a', Http2PeerSettings.MinAllowedMaxFrameSize)); - private readonly MemoryPool _memoryPool = KestrelMemoryPool.Create(); + private readonly MemoryPool _memoryPool = MemoryPoolFactory.Create(); internal readonly Http2PeerSettings _clientSettings = new Http2PeerSettings(); internal readonly HPackEncoder _hpackEncoder = new HPackEncoder(); @@ -429,8 +428,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests // Always dispatch test code back to the ThreadPool. This prevents deadlocks caused by continuing // Http2Connection.ProcessRequestsAsync() loop with writer locks acquired. Run product code inline to make // it easier to verify request frames are processed correctly immediately after sending the them. - var inputPipeOptions = ConnectionDispatcher.GetInputPipeOptions(_serviceContext, _memoryPool, PipeScheduler.ThreadPool); - var outputPipeOptions = ConnectionDispatcher.GetOutputPipeOptions(_serviceContext, _memoryPool, PipeScheduler.ThreadPool); + var inputPipeOptions = GetInputPipeOptions(_serviceContext, _memoryPool, PipeScheduler.ThreadPool); + var outputPipeOptions = GetOutputPipeOptions(_serviceContext, _memoryPool, PipeScheduler.ThreadPool); _pair = DuplexPipe.CreateConnectionPair(inputPipeOptions, outputPipeOptions); @@ -1248,6 +1247,41 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests _timeoutControl.Tick(clock.UtcNow); } + private static PipeOptions GetInputPipeOptions(ServiceContext serviceContext, MemoryPool memoryPool, PipeScheduler writerScheduler) => new PipeOptions + ( + pool: memoryPool, + readerScheduler: serviceContext.Scheduler, + writerScheduler: writerScheduler, + pauseWriterThreshold: serviceContext.ServerOptions.Limits.MaxRequestBufferSize ?? 0, + resumeWriterThreshold: serviceContext.ServerOptions.Limits.MaxRequestBufferSize ?? 0, + useSynchronizationContext: false, + minimumSegmentSize: memoryPool.GetMinimumSegmentSize() + ); + + private static PipeOptions GetOutputPipeOptions(ServiceContext serviceContext, MemoryPool memoryPool, PipeScheduler readerScheduler) => new PipeOptions + ( + pool: memoryPool, + readerScheduler: readerScheduler, + writerScheduler: serviceContext.Scheduler, + pauseWriterThreshold: GetOutputResponseBufferSize(serviceContext), + resumeWriterThreshold: GetOutputResponseBufferSize(serviceContext), + useSynchronizationContext: false, + minimumSegmentSize: memoryPool.GetMinimumSegmentSize() + ); + + private static long GetOutputResponseBufferSize(ServiceContext serviceContext) + { + var bufferSize = serviceContext.ServerOptions.Limits.MaxResponseBufferSize; + if (bufferSize == 0) + { + // 0 = no buffering so we need to configure the pipe so the writer waits on the reader directly + return 1; + } + + // null means that we have no back pressure + return bufferSize ?? 0; + } + internal class Http2FrameWithPayload : Http2Frame { public Http2FrameWithPayload() : base() diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsTests.cs index 30847af463..00602983e4 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsTests.cs @@ -408,7 +408,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests using (var sslStream = new SslStream(connection.Stream, true, (sender, certificate, chain, errors) => true)) { await sslStream.AuthenticateAsClientAsync("127.0.0.1", clientCertificates: null, - enabledSslProtocols: SslProtocols.None, + enabledSslProtocols: SslProtocols.Tls11 | SslProtocols.Tls12, checkCertificateRevocation: false); } } @@ -447,7 +447,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests using (var sslStream = new SslStream(connection.Stream, true, (sender, certificate, chain, errors) => true)) { await sslStream.AuthenticateAsClientAsync("127.0.0.1", clientCertificates: null, - enabledSslProtocols: SslProtocols.None, + enabledSslProtocols: SslProtocols.Tls11 | SslProtocols.Tls12, checkCertificateRevocation: false); } } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj index c7b344c2c8..c1c9107598 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj @@ -4,6 +4,7 @@ netcoreapp3.0 true InMemory.FunctionalTests + true @@ -11,9 +12,11 @@ + + diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/KeepAliveTimeoutTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/KeepAliveTimeoutTests.cs index 422520f5b8..34f3932129 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/KeepAliveTimeoutTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/KeepAliveTimeoutTests.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.IO.Pipelines; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -33,6 +34,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests { using (var connection = server.CreateConnection()) { + await connection.TransportConnection.WaitForReadTask; + await connection.Send( "GET / HTTP/1.1", "Host:", @@ -59,6 +62,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests { using (var connection = server.CreateConnection()) { + await connection.TransportConnection.WaitForReadTask; + for (var i = 0; i < 10; i++) { await connection.Send( @@ -86,6 +91,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests { using (var connection = server.CreateConnection()) { + await connection.TransportConnection.WaitForReadTask; + await connection.Send( "POST /consume HTTP/1.1", "Host:", @@ -126,6 +133,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests { using (var connection = server.CreateConnection()) { + await connection.TransportConnection.WaitForReadTask; + await connection.Send( "GET /longrunning HTTP/1.1", "Host:", @@ -164,6 +173,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests { using (var connection = server.CreateConnection()) { + await connection.TransportConnection.WaitForReadTask; + // Min amount of time between requests that triggers a keep-alive timeout. testContext.MockSystemClock.UtcNow += _keepAliveTimeout + Heartbeat.Interval + TimeSpan.FromTicks(1); heartbeatManager.OnHeartbeat(testContext.SystemClock.UtcNow); @@ -184,6 +195,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests { using (var connection = server.CreateConnection()) { + await connection.TransportConnection.WaitForReadTask; + await connection.Send( "GET /upgrade HTTP/1.1", "Host:", @@ -212,6 +225,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests private TestServer CreateServer(TestServiceContext context, CancellationToken longRunningCt = default, CancellationToken upgradeCt = default) { + // Ensure request headers timeout is started as soon as the tests send requests. + context.Scheduler = PipeScheduler.Inline; context.ServerOptions.AddServerHeader = false; context.ServerOptions.Limits.KeepAliveTimeout = _keepAliveTimeout; context.ServerOptions.Limits.MinRequestBodyDataRate = null; diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestHeadersTimeoutTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestHeadersTimeoutTests.cs index 65448bd6d2..e217ece3f0 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestHeadersTimeoutTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestHeadersTimeoutTests.cs @@ -32,6 +32,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests { using (var connection = server.CreateConnection()) { + await connection.TransportConnection.WaitForReadTask; + await connection.Send( "GET / HTTP/1.1", headers); @@ -55,6 +57,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests { using (var connection = server.CreateConnection()) { + await connection.TransportConnection.WaitForReadTask; + await connection.Send( "POST / HTTP/1.1", "Host:", @@ -86,6 +90,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests { using (var connection = server.CreateConnection()) { + await connection.TransportConnection.WaitForReadTask; + await connection.Send(requestLine); // Min amount of time between requests that triggers a request headers timeout. @@ -110,6 +116,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests { using (var connection = server.CreateConnection()) { + await connection.TransportConnection.WaitForReadTask; + foreach (var ch in "POST / HTTP/1.1\r\nHost:\r\n\r\n") { await connection.Send(ch.ToString()); diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs index 7aa6ccd275..60890db5e0 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs @@ -57,30 +57,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests } } - [Fact] - public async Task PipesAreNotPersistedBySettingStreamPipeWriterAcrossRequests() - { - var responseBodyPersisted = false; - PipeWriter bodyPipe = null; - await using (var server = new TestServer(async context => - { - if (context.Response.BodyWriter == bodyPipe) - { - responseBodyPersisted = true; - } - bodyPipe = new StreamPipeWriter(new MemoryStream()); - context.Response.BodyWriter = bodyPipe; - - await context.Response.WriteAsync("hello, world"); - }, new TestServiceContext(LoggerFactory))) - { - Assert.Equal(string.Empty, await server.HttpClientSlim.GetStringAsync($"http://localhost:{server.Port}/")); - Assert.Equal(string.Empty, await server.HttpClientSlim.GetStringAsync($"http://localhost:{server.Port}/")); - - Assert.False(responseBodyPersisted); - } - } - [Fact] public async Task PipesAreNotPersistedAcrossRequests() { diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseTests.cs index 3980092bd1..b9579f18c7 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseTests.cs @@ -3851,45 +3851,15 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests } } - [Fact] - public async Task ResponseSetBodyAndPipeBodyIsWrapped() - { - await using (var server = new TestServer(async httpContext => - { - httpContext.Response.Body = new MemoryStream(); - httpContext.Response.BodyWriter = new Pipe().Writer; - Assert.IsType(httpContext.Response.Body); - - await Task.CompletedTask; - }, new TestServiceContext(LoggerFactory))) - { - using (var connection = server.CreateConnection()) - { - await connection.Send( - "GET / HTTP/1.1", - "Host:", - "", - ""); - await connection.Receive( - "HTTP/1.1 200 OK", - $"Date: {server.Context.DateHeaderValue}", - "Content-Length: 0", - "", - ""); - } - } - } - [Fact] public async Task ResponseSetBodyToSameValueTwiceGetPipeMultipleTimesDifferentObject() { await using (var server = new TestServer(async httpContext => { - var memoryStream = new MemoryStream(); - httpContext.Response.Body = memoryStream; + httpContext.Response.Body = new MemoryStream(); var BodyWriter1 = httpContext.Response.BodyWriter; - httpContext.Response.Body = memoryStream; + httpContext.Response.Body = new MemoryStream(); var BodyWriter2 = httpContext.Response.BodyWriter; Assert.NotEqual(BodyWriter1, BodyWriter2); @@ -3913,104 +3883,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests } } - [Fact] - public async Task ResponseSetPipeToSameValueTwiceGetBodyMultipleTimesDifferent() - { - await using (var server = new TestServer(async httpContext => - { - var pipeWriter = new Pipe().Writer; - httpContext.Response.BodyWriter = pipeWriter; - var body1 = httpContext.Response.Body; - - httpContext.Response.BodyWriter = pipeWriter; - var body2 = httpContext.Response.Body; - - Assert.NotEqual(body1, body2); - await Task.CompletedTask; - }, new TestServiceContext(LoggerFactory))) - { - using (var connection = server.CreateConnection()) - { - await connection.Send( - "GET / HTTP/1.1", - "Host:", - "", - ""); - await connection.Receive( - "HTTP/1.1 200 OK", - $"Date: {server.Context.DateHeaderValue}", - "Content-Length: 0", - "", - ""); - } - } - } - - [Fact] - public async Task ResponseSetPipeAndBodyWriterIsWrapped() - { - await using (var server = new TestServer(async httpContext => - { - httpContext.Response.BodyWriter = new Pipe().Writer; - httpContext.Response.Body = new MemoryStream(); - Assert.IsType(httpContext.Response.BodyWriter); - Assert.IsType(httpContext.Response.Body); - - await Task.CompletedTask; - }, new TestServiceContext(LoggerFactory))) - { - using (var connection = server.CreateConnection()) - { - await connection.Send( - "GET / HTTP/1.1", - "Host:", - "", - ""); - await connection.Receive( - "HTTP/1.1 200 OK", - $"Date: {server.Context.DateHeaderValue}", - "Content-Length: 0", - "", - ""); - } - } - } - - [Fact] - public async Task ResponseWriteToBodyWriterAndStreamAllBlocksDisposed() - { - await using (var server = new TestServer(async httpContext => - { - for (var i = 0; i < 3; i++) - { - httpContext.Response.BodyWriter = new Pipe().Writer; - await httpContext.Response.Body.WriteAsync(new byte[1]); - httpContext.Response.Body = new MemoryStream(); - await httpContext.Response.BodyWriter.WriteAsync(new byte[1]); - } - - // TestMemoryPool will confirm that all rented blocks have been disposed, meaning dispose was called. - - await Task.CompletedTask; - }, new TestServiceContext(LoggerFactory))) - { - using (var connection = server.CreateConnection()) - { - await connection.Send( - "GET / HTTP/1.1", - "Host:", - "", - ""); - await connection.Receive( - "HTTP/1.1 200 OK", - $"Date: {server.Context.DateHeaderValue}", - "Content-Length: 0", - "", - ""); - } - } - } - [Fact] public async Task ResponseStreamWrappingWorks() { @@ -4026,10 +3898,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests httpContext.Response.Body = oldBody; - // Even though we are restoring the original response body, we will create a - // wrapper rather than restoring the original pipe. - Assert.IsType(httpContext.Response.BodyWriter); - }, new TestServiceContext(LoggerFactory))) { using (var connection = server.CreateConnection()) @@ -4040,50 +3908,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "", ""); await connection.Receive( - "HTTP/1.1 200 OK", - $"Date: {server.Context.DateHeaderValue}", - "Content-Length: 0", - "", - ""); - } - } - } - - [Fact] - public async Task ResponsePipeWrappingWorks() - { - await using (var server = new TestServer(async httpContext => - { - var oldPipeWriter = httpContext.Response.BodyWriter; - var pipe = new Pipe(); - httpContext.Response.BodyWriter = pipe.Writer; - - await httpContext.Response.Body.WriteAsync(new byte[1]); - await httpContext.Response.BodyWriter.WriteAsync(new byte[1]); - - var readResult = await pipe.Reader.ReadAsync(); - Assert.Equal(2, readResult.Buffer.Length); - - httpContext.Response.BodyWriter = oldPipeWriter; - - // Even though we are restoring the original response body, we will create a - // wrapper rather than restoring the original pipe. - Assert.IsType(httpContext.Response.Body); - }, new TestServiceContext(LoggerFactory))) - { - using (var connection = server.CreateConnection()) - { - await connection.Send( - "GET / HTTP/1.1", - "Host:", - "", - ""); - await connection.Receive( - "HTTP/1.1 200 OK", - $"Date: {server.Context.DateHeaderValue}", - "Content-Length: 0", - "", - ""); + "HTTP/1.1 200 OK", + $"Date: {server.Context.DateHeaderValue}", + "Content-Length: 0", + "", + ""); } } } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/InMemoryTransportConnection.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/InMemoryTransportConnection.cs index 95c1907c0a..cc91efd9b2 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/InMemoryTransportConnection.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/InMemoryTransportConnection.cs @@ -6,34 +6,45 @@ using System.Buffers; using System.IO.Pipelines; using System.Net; using System.Threading; +using System.Threading.Tasks; +using System.Threading.Tasks.Sources; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTransport { - internal class InMemoryTransportConnection : TransportConnection, IDisposable + internal class InMemoryTransportConnection : TransportConnection { private readonly CancellationTokenSource _connectionClosedTokenSource = new CancellationTokenSource(); private readonly ILogger _logger; private bool _isClosed; + private readonly TaskCompletionSource _waitForCloseTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - public InMemoryTransportConnection(MemoryPool memoryPool, ILogger logger) + public InMemoryTransportConnection(MemoryPool memoryPool, ILogger logger, PipeScheduler scheduler = null) { MemoryPool = memoryPool; _logger = logger; - LocalAddress = IPAddress.Loopback; - RemoteAddress = IPAddress.Loopback; + LocalEndPoint = new IPEndPoint(IPAddress.Loopback, 0); + RemoteEndPoint = new IPEndPoint(IPAddress.Loopback, 0); + + var pair = DuplexPipe.CreateConnectionPair(new PipeOptions(memoryPool, readerScheduler: scheduler, useSynchronizationContext: false), new PipeOptions(memoryPool, writerScheduler: scheduler, useSynchronizationContext: false)); + Application = pair.Application; + var wrapper = new ObservableDuplexPipe(pair.Transport); + Transport = wrapper; + WaitForReadTask = wrapper.WaitForReadTask; ConnectionClosed = _connectionClosedTokenSource.Token; } - public override MemoryPool MemoryPool { get; } + public PipeWriter Input => Application.Output; - public override PipeScheduler InputWriterScheduler => PipeScheduler.ThreadPool; - public override PipeScheduler OutputReaderScheduler => PipeScheduler.ThreadPool; + public PipeReader Output => Application.Input; + + public Task WaitForReadTask { get; } + + public override MemoryPool MemoryPool { get; } public ConnectionAbortedException AbortReason { get; private set; } @@ -57,14 +68,141 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTrans ThreadPool.UnsafeQueueUserWorkItem(state => { - var self = (InMemoryTransportConnection)state; - self._connectionClosedTokenSource.Cancel(); - }, this); + state._connectionClosedTokenSource.Cancel(); + + state._waitForCloseTcs.TrySetResult(null); + }, + this, + preferLocal: false); } - public void Dispose() + public override async ValueTask DisposeAsync() { + Transport.Input.Complete(); + Transport.Output.Complete(); + + await _waitForCloseTcs.Task; + _connectionClosedTokenSource.Dispose(); } + + // This piece of code allows us to wait until the PipeReader has been awaited on. + // We need to wrap lots of layers (including the ValueTask) to gain visiblity into when + // the machinery for the await happens + private class ObservableDuplexPipe : IDuplexPipe + { + private readonly ObservablePipeReader _reader; + + public ObservableDuplexPipe(IDuplexPipe duplexPipe) + { + _reader = new ObservablePipeReader(duplexPipe.Input); + + Input = _reader; + Output = duplexPipe.Output; + + } + + public Task WaitForReadTask => _reader.WaitForReadTask; + + public PipeReader Input { get; } + + public PipeWriter Output { get; } + + private class ObservablePipeReader : PipeReader + { + private readonly PipeReader _reader; + private readonly TaskCompletionSource _tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + public Task WaitForReadTask => _tcs.Task; + + public ObservablePipeReader(PipeReader reader) + { + _reader = reader; + } + + public override void AdvanceTo(SequencePosition consumed) + { + _reader.AdvanceTo(consumed); + } + + public override void AdvanceTo(SequencePosition consumed, SequencePosition examined) + { + _reader.AdvanceTo(consumed, examined); + } + + public override void CancelPendingRead() + { + _reader.CancelPendingRead(); + } + + public override void Complete(Exception exception = null) + { + _reader.Complete(exception); + } + + public override void OnWriterCompleted(Action callback, object state) + { + _reader.OnWriterCompleted(callback, state); + } + + public override ValueTask ReadAsync(CancellationToken cancellationToken = default) + { + var task = _reader.ReadAsync(cancellationToken); + + if (_tcs.Task.IsCompleted) + { + return task; + } + + return new ValueTask(new ObservableValueTask(task, _tcs), 0); + } + + public override bool TryRead(out ReadResult result) + { + return _reader.TryRead(out result); + } + + private class ObservableValueTask : IValueTaskSource + { + private readonly ValueTask _task; + private readonly TaskCompletionSource _tcs; + + public ObservableValueTask(ValueTask task, TaskCompletionSource tcs) + { + _task = task; + _tcs = tcs; + } + + public T GetResult(short token) + { + return _task.GetAwaiter().GetResult(); + } + + public ValueTaskSourceStatus GetStatus(short token) + { + if (_task.IsCanceled) + { + return ValueTaskSourceStatus.Canceled; + } + if (_task.IsFaulted) + { + return ValueTaskSourceStatus.Faulted; + } + if (_task.IsCompleted) + { + return ValueTaskSourceStatus.Succeeded; + } + return ValueTaskSourceStatus.Pending; + } + + public void OnCompleted(Action continuation, object state, short token, ValueTaskSourceOnCompletedFlags flags) + { + _task.GetAwaiter().UnsafeOnCompleted(() => continuation(state)); + + _tcs.TrySetResult(null); + } + } + } + } } } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/InMemoryTransportFactory.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/InMemoryTransportFactory.cs index eeb271a706..6c5ff14882 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/InMemoryTransportFactory.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/InMemoryTransportFactory.cs @@ -2,43 +2,56 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Net; +using System.Threading; +using System.Threading.Channels; using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; +using Microsoft.AspNetCore.Connections; namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTransport { - internal class InMemoryTransportFactory : ITransportFactory + internal class InMemoryTransportFactory : IConnectionListenerFactory, IConnectionListener { - public ITransport Create(IEndPointInformation endPointInformation, IConnectionDispatcher dispatcher) + private Channel _acceptQueue = Channel.CreateUnbounded(); + + public EndPoint EndPoint { get; set; } + + public void AddConnection(ConnectionContext connection) { - if (ConnectionDispatcher != null) - { - throw new InvalidOperationException("InMemoryTransportFactory doesn't support creating multiple endpoints"); - } - - ConnectionDispatcher = dispatcher; - - return new NoopTransport(); + _acceptQueue.Writer.TryWrite(connection); } - public IConnectionDispatcher ConnectionDispatcher { get; private set; } - - private class NoopTransport : ITransport + public async ValueTask AcceptAsync(CancellationToken cancellationToken = default) { - public Task BindAsync() + if (await _acceptQueue.Reader.WaitToReadAsync(cancellationToken)) { - return Task.CompletedTask; + while (_acceptQueue.Reader.TryRead(out var item)) + { + return item; + } } - public Task StopAsync() - { - return Task.CompletedTask; - } + return null; - public Task UnbindAsync() - { - return Task.CompletedTask; - } + } + + public ValueTask BindAsync(EndPoint endpoint, CancellationToken cancellationToken = default) + { + EndPoint = endpoint; + + return new ValueTask(this); + } + + public ValueTask DisposeAsync() + { + return UnbindAsync(default); + } + + public ValueTask UnbindAsync(CancellationToken cancellationToken = default) + { + _acceptQueue.Writer.TryComplete(); + + return default; } } } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/TestServer.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/TestServer.cs index 9f3828f07b..c7bab027d8 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/TestServer.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/TestServer.cs @@ -102,8 +102,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTrans public InMemoryConnection CreateConnection() { - var transportConnection = new InMemoryTransportConnection(_memoryPool, Context.Log); - _ = HandleConnection(transportConnection); + var transportConnection = new InMemoryTransportConnection(_memoryPool, Context.Log, Context.Scheduler); + _transportFactory.AddConnection(transportConnection); return new InMemoryConnection(transportConnection); } @@ -128,36 +128,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTrans return services.BuildServiceProvider(); } - private async Task HandleConnection(InMemoryTransportConnection transportConnection) - { - try - { - var middlewareTask = _transportFactory.ConnectionDispatcher.OnConnection(transportConnection); - var transportTask = CancellationTokenAsTask(transportConnection.ConnectionClosed); - - await transportTask; - await middlewareTask; - - transportConnection.Dispose(); - } - catch (Exception ex) - { - Debug.Assert(false, $"Unexpected exception: {ex}."); - } - } - - private static Task CancellationTokenAsTask(CancellationToken token) - { - if (token.IsCancellationRequested) - { - return Task.CompletedTask; - } - - var tcs = new TaskCompletionSource(); - token.Register(() => tcs.SetResult(null)); - return tcs.Task; - } - public async ValueTask DisposeAsync() { // The concrete WebHost implements IAsyncDisposable diff --git a/src/Servers/Kestrel/test/Libuv.FunctionalTests/TransportSelector.cs b/src/Servers/Kestrel/test/Libuv.FunctionalTests/TransportSelector.cs index ca209ba6e7..4bcae2a6cf 100644 --- a/src/Servers/Kestrel/test/Libuv.FunctionalTests/TransportSelector.cs +++ b/src/Servers/Kestrel/test/Libuv.FunctionalTests/TransportSelector.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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; @@ -9,9 +9,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { public static class TransportSelector { - public static IWebHostBuilder GetWebHostBuilder(Func> memoryPoolFactory = null) + public static IWebHostBuilder GetWebHostBuilder(Func> memoryPoolFactory = null, + long? maxReadBufferSize = null) { - return new WebHostBuilder().UseLibuv(options => { options.MemoryPoolFactory = memoryPoolFactory ?? options.MemoryPoolFactory; }); + return new WebHostBuilder().UseLibuv(options => + { + options.MemoryPoolFactory = memoryPoolFactory ?? options.MemoryPoolFactory; + options.MaxReadBufferSize = maxReadBufferSize; + }); } } } diff --git a/src/Servers/Kestrel/test/Sockets.FunctionalTests/TransportSelector.cs b/src/Servers/Kestrel/test/Sockets.FunctionalTests/TransportSelector.cs index 3e3cfe3f6c..6d2461866e 100644 --- a/src/Servers/Kestrel/test/Sockets.FunctionalTests/TransportSelector.cs +++ b/src/Servers/Kestrel/test/Sockets.FunctionalTests/TransportSelector.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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; @@ -9,9 +9,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { public static class TransportSelector { - public static IWebHostBuilder GetWebHostBuilder(Func> memoryPoolFactory = null) + public static IWebHostBuilder GetWebHostBuilder(Func> memoryPoolFactory = null, + long? maxReadBufferSize = null) { - return new WebHostBuilder().UseSockets(options => { options.MemoryPoolFactory = memoryPoolFactory ?? options.MemoryPoolFactory; }); + return new WebHostBuilder().UseSockets(options => + { + options.MemoryPoolFactory = memoryPoolFactory ?? options.MemoryPoolFactory; + options.MaxReadBufferSize = maxReadBufferSize; + }); } } } diff --git a/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj b/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj index afb106a5cf..90f9bb3627 100644 --- a/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj +++ b/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj @@ -18,7 +18,7 @@ $(MSBuildThisFileDirectory)..\..\ - Core/src/Internal/Http/HttpHeaders.Generated.cs Core/src/Internal/Http/HttpProtocol.Generated.cs Core/src/Internal/Infrastructure/HttpUtilities.Generated.cs Transport.Abstractions/src/Internal/TransportConnection.Generated.cs + Core/src/Internal/Http/HttpHeaders.Generated.cs Core/src/Internal/Http/HttpProtocol.Generated.cs Core/src/Internal/Infrastructure/HttpUtilities.Generated.cs ../Connections.Abstractions/src/TransportConnection.Generated.cs diff --git a/src/Servers/Kestrel/tools/CodeGenerator/TransportConnectionFeatureCollection.cs b/src/Servers/Kestrel/tools/CodeGenerator/TransportConnectionFeatureCollection.cs index 93d0339a53..76ef64d783 100644 --- a/src/Servers/Kestrel/tools/CodeGenerator/TransportConnectionFeatureCollection.cs +++ b/src/Servers/Kestrel/tools/CodeGenerator/TransportConnectionFeatureCollection.cs @@ -8,20 +8,14 @@ namespace CodeGenerator public static string GenerateFile() { // NOTE: This list MUST always match the set of feature interfaces implemented by TransportConnection. - // See also: src/Kestrel.Transport.Abstractions/Internal/TransportConnection.FeatureCollection.cs + // See also: src/Connections.Abstractions/TransportConnection.FeatureCollection.cs var features = new[] { - "IHttpConnectionFeature", "IConnectionIdFeature", "IConnectionTransportFeature", "IConnectionItemsFeature", "IMemoryPoolFeature", - "IApplicationTransportFeature", - "ITransportSchedulerFeature", - "IConnectionLifetimeFeature", - "IConnectionHeartbeatFeature", - "IConnectionLifetimeNotificationFeature", - "IConnectionCompleteFeature" + "IConnectionLifetimeFeature" }; var usings = $@" @@ -29,7 +23,7 @@ using Microsoft.AspNetCore.Connections.Features; using Microsoft.AspNetCore.Http.Features;"; return FeatureCollectionGenerator.GenerateFile( - namespaceName: "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal", + namespaceName: "Microsoft.AspNetCore.Connections", className: "TransportConnection", allFeatures: features, implementedFeatures: features, diff --git a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/KestrelMemoryPool.cs b/src/Shared/Buffers.MemoryPool/MemoryPoolFactory.cs similarity index 69% rename from src/Servers/Kestrel/Transport.Abstractions/src/Internal/KestrelMemoryPool.cs rename to src/Shared/Buffers.MemoryPool/MemoryPoolFactory.cs index b3577f2c0a..c7ee26ca25 100644 --- a/src/Servers/Kestrel/Transport.Abstractions/src/Internal/KestrelMemoryPool.cs +++ b/src/Shared/Buffers.MemoryPool/MemoryPoolFactory.cs @@ -1,12 +1,9 @@ // 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.Buffers; - -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal +namespace System.Buffers { - public static class KestrelMemoryPool + internal static class MemoryPoolFactory { public static MemoryPool Create() { @@ -21,7 +18,5 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal { return new SlabMemoryPool(); } - - public static readonly int MinimumSegmentSize = 4096; } } diff --git a/src/Shared/Buffers.MemoryPool/SlabMemoryPool.cs b/src/Shared/Buffers.MemoryPool/SlabMemoryPool.cs index 0359c72193..e808624010 100644 --- a/src/Shared/Buffers.MemoryPool/SlabMemoryPool.cs +++ b/src/Shared/Buffers.MemoryPool/SlabMemoryPool.cs @@ -30,6 +30,11 @@ namespace System.Buffers /// public override int MaxBufferSize { get; } = _blockSize; + /// + /// The size of a block. 4096 is chosen because most operating systems use 4k pages. + /// + public static int BlockSize => _blockSize; + /// /// 4096 * 32 gives you a slabLength of 128k contiguous bytes allocated per slab /// diff --git a/src/Shared/E2ETesting/E2ETesting.targets b/src/Shared/E2ETesting/E2ETesting.targets index 628880eb53..3b27dc75f7 100644 --- a/src/Shared/E2ETesting/E2ETesting.targets +++ b/src/Shared/E2ETesting/E2ETesting.targets @@ -37,6 +37,7 @@ + diff --git a/src/SignalR/common/testassets/Tests.Utils/SyncPoint.cs b/src/Shared/SyncPoint/SyncPoint.cs similarity index 98% rename from src/SignalR/common/testassets/Tests.Utils/SyncPoint.cs rename to src/Shared/SyncPoint/SyncPoint.cs index 55f4a034d5..ccf36d59df 100644 --- a/src/SignalR/common/testassets/Tests.Utils/SyncPoint.cs +++ b/src/Shared/SyncPoint/SyncPoint.cs @@ -4,7 +4,7 @@ using System; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.SignalR.Tests +namespace Microsoft.AspNetCore.Internal { public class SyncPoint { diff --git a/src/Shared/test/Certificates/selfSignedNoEkuCertificateExpired.cer b/src/Shared/test/Certificates/selfSignedNoEkuCertificateExpired.cer new file mode 100644 index 0000000000..81b6326d6f Binary files /dev/null and b/src/Shared/test/Certificates/selfSignedNoEkuCertificateExpired.cer differ diff --git a/src/Shared/test/Certificates/selfSignedNoEkuCertificateNotValidYet.cer b/src/Shared/test/Certificates/selfSignedNoEkuCertificateNotValidYet.cer new file mode 100644 index 0000000000..9c8cf9d71b Binary files /dev/null and b/src/Shared/test/Certificates/selfSignedNoEkuCertificateNotValidYet.cer differ diff --git a/src/Shared/test/Certificates/validSelfSignedClientEkuCertificate.cer b/src/Shared/test/Certificates/validSelfSignedClientEkuCertificate.cer new file mode 100644 index 0000000000..db4bb5b90a Binary files /dev/null and b/src/Shared/test/Certificates/validSelfSignedClientEkuCertificate.cer differ diff --git a/src/Shared/test/Certificates/validSelfSignedNoEkuCertificate.cer b/src/Shared/test/Certificates/validSelfSignedNoEkuCertificate.cer new file mode 100644 index 0000000000..2be2a46d79 Binary files /dev/null and b/src/Shared/test/Certificates/validSelfSignedNoEkuCertificate.cer differ diff --git a/src/Shared/test/Certificates/validSelfSignedServerEkuCertificate.cer b/src/Shared/test/Certificates/validSelfSignedServerEkuCertificate.cer new file mode 100644 index 0000000000..823000d4a1 Binary files /dev/null and b/src/Shared/test/Certificates/validSelfSignedServerEkuCertificate.cer differ diff --git a/src/SignalR/SignalR.sln b/src/SignalR/SignalR.sln index bfe46375f3..1da004b371 100644 --- a/src/SignalR/SignalR.sln +++ b/src/SignalR/SignalR.sln @@ -129,8 +129,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataPr EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Core", "..\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj", "{FCB0410B-A034-47C5-885F-6527D5FB2C5B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions", "..\Servers\Kestrel\Transport.Abstractions\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj", "{C26AC15D-4E6E-4F1A-9AFB-92510A905AAE}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "..\Servers\Kestrel\Transport.Sockets\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", "{6A3D75B3-6268-456B-89BA-B716387135FF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing", "..\Http\Routing\src\Microsoft.AspNetCore.Routing.csproj", "{C1364FE1-91CA-44E0-AB76-F99B74F00A06}" @@ -147,6 +145,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpOv EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Protocols.Json", "common\Protocols.Json\src\Microsoft.AspNetCore.SignalR.Protocols.Json.csproj", "{BB52C0FB-19FD-485A-9EBD-3FC173ECAEA0}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Metadata", "..\Http\Metadata\src\Microsoft.AspNetCore.Metadata.csproj", "{2E107FBB-2387-4A9F-A2CA-EFDF2E4DD64D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -369,10 +369,6 @@ Global {FCB0410B-A034-47C5-885F-6527D5FB2C5B}.Debug|Any CPU.Build.0 = Debug|Any CPU {FCB0410B-A034-47C5-885F-6527D5FB2C5B}.Release|Any CPU.ActiveCfg = Release|Any CPU {FCB0410B-A034-47C5-885F-6527D5FB2C5B}.Release|Any CPU.Build.0 = Release|Any CPU - {C26AC15D-4E6E-4F1A-9AFB-92510A905AAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C26AC15D-4E6E-4F1A-9AFB-92510A905AAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C26AC15D-4E6E-4F1A-9AFB-92510A905AAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C26AC15D-4E6E-4F1A-9AFB-92510A905AAE}.Release|Any CPU.Build.0 = Release|Any CPU {6A3D75B3-6268-456B-89BA-B716387135FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6A3D75B3-6268-456B-89BA-B716387135FF}.Debug|Any CPU.Build.0 = Debug|Any CPU {6A3D75B3-6268-456B-89BA-B716387135FF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -405,6 +401,10 @@ Global {BB52C0FB-19FD-485A-9EBD-3FC173ECAEA0}.Debug|Any CPU.Build.0 = Debug|Any CPU {BB52C0FB-19FD-485A-9EBD-3FC173ECAEA0}.Release|Any CPU.ActiveCfg = Release|Any CPU {BB52C0FB-19FD-485A-9EBD-3FC173ECAEA0}.Release|Any CPU.Build.0 = Release|Any CPU + {2E107FBB-2387-4A9F-A2CA-EFDF2E4DD64D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2E107FBB-2387-4A9F-A2CA-EFDF2E4DD64D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2E107FBB-2387-4A9F-A2CA-EFDF2E4DD64D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2E107FBB-2387-4A9F-A2CA-EFDF2E4DD64D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -466,7 +466,6 @@ Global {F7B1DFA9-AB81-4BB7-B54A-E7B50C49AE21} = {EDE8E45E-A5D0-4F0E-B72C-7CC14146C60A} {61AB2797-D78B-4FA5-9D2A-F65E7FE18C1C} = {EDE8E45E-A5D0-4F0E-B72C-7CC14146C60A} {FCB0410B-A034-47C5-885F-6527D5FB2C5B} = {EDE8E45E-A5D0-4F0E-B72C-7CC14146C60A} - {C26AC15D-4E6E-4F1A-9AFB-92510A905AAE} = {EDE8E45E-A5D0-4F0E-B72C-7CC14146C60A} {6A3D75B3-6268-456B-89BA-B716387135FF} = {EDE8E45E-A5D0-4F0E-B72C-7CC14146C60A} {C1364FE1-91CA-44E0-AB76-F99B74F00A06} = {EDE8E45E-A5D0-4F0E-B72C-7CC14146C60A} {538BB9BF-1460-4159-A5FC-F00358EA3517} = {EDE8E45E-A5D0-4F0E-B72C-7CC14146C60A} @@ -475,6 +474,7 @@ Global {762A7DD1-E45E-4EA3-8109-521E844AE613} = {1C8016A8-F362-45C7-9EA9-A1CCE7918F2F} {FD3A8F8D-2967-4635-86FC-CC49BAF651C1} = {EDE8E45E-A5D0-4F0E-B72C-7CC14146C60A} {BB52C0FB-19FD-485A-9EBD-3FC173ECAEA0} = {9FCD621E-E710-4991-B45C-1BABC977BEEC} + {2E107FBB-2387-4A9F-A2CA-EFDF2E4DD64D} = {EDE8E45E-A5D0-4F0E-B72C-7CC14146C60A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7945A4E4-ACDB-4F6E-95CA-6AC6E7C2CD59} diff --git a/src/SignalR/clients/csharp/Client.Core/src/HubConnection.Log.cs b/src/SignalR/clients/csharp/Client.Core/src/HubConnection.Log.cs index 7061e276b1..b37239869a 100644 --- a/src/SignalR/clients/csharp/Client.Core/src/HubConnection.Log.cs +++ b/src/SignalR/clients/csharp/Client.Core/src/HubConnection.Log.cs @@ -103,7 +103,7 @@ namespace Microsoft.AspNetCore.SignalR.Client LoggerMessage.Define(LogLevel.Error, new EventId(34, "ErrorInvokingClientSideMethod"), "Invoking client side method '{MethodName}' failed."); private static readonly Action _errorProcessingHandshakeResponse = - LoggerMessage.Define(LogLevel.Error, new EventId(35, "ErrorReceivingHandshakeResponse"), "Error processing the handshake response."); + LoggerMessage.Define(LogLevel.Error, new EventId(35, "ErrorReceivingHandshakeResponse"), "The underlying connection closed while processing the handshake response. See exception for details."); private static readonly Action _handshakeServerError = LoggerMessage.Define(LogLevel.Error, new EventId(36, "HandshakeServerError"), "Server returned handshake error: {Error}"); @@ -240,6 +240,15 @@ namespace Microsoft.AspNetCore.SignalR.Client private static readonly Action _attemptingStateTransition = LoggerMessage.Define(LogLevel.Trace, new EventId(80, "AttemptingStateTransition"), "The HubConnection is attempting to transition from the {ExpectedState} state to the {NewState} state."); + private static readonly Action _errorInvalidHandshakeResponse = + LoggerMessage.Define(LogLevel.Error, new EventId(81, "ErrorInvalidHandshakeResponse"), "Received an invalid handshake response."); + + private static readonly Action _errorHandshakeTimedOut = + LoggerMessage.Define(LogLevel.Error, new EventId(82, "ErrorHandshakeTimedOut"), "The handshake timed out after {HandshakeTimeoutSeconds} seconds."); + + private static readonly Action _errorHandshakeCanceled = + LoggerMessage.Define(LogLevel.Error, new EventId(83, "ErrorHandshakeCanceled"), "The handshake was canceled by the client."); + public static void PreparingNonBlockingInvocation(ILogger logger, string target, int count) { _preparingNonBlockingInvocation(logger, target, count, null); @@ -640,6 +649,21 @@ namespace Microsoft.AspNetCore.SignalR.Client { _attemptingStateTransition(logger, expectedState, newState, null); } + + public static void ErrorInvalidHandshakeResponse(ILogger logger, Exception exception) + { + _errorInvalidHandshakeResponse(logger, exception); + } + + public static void ErrorHandshakeTimedOut(ILogger logger, TimeSpan handshakeTimeout, Exception exception) + { + _errorHandshakeTimedOut(logger, handshakeTimeout.TotalSeconds, exception); + } + + public static void ErrorHandshakeCanceled(ILogger logger, Exception exception) + { + _errorHandshakeCanceled(logger, exception); + } } } } diff --git a/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs b/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs index 13ddb56792..0cde5b0dcc 100644 --- a/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs +++ b/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs @@ -253,9 +253,9 @@ namespace Microsoft.AspNetCore.SignalR.Client throw new InvalidOperationException($"The {nameof(HubConnection)} cannot be started while {nameof(StopAsync)} is running."); } - using (var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, _state.StopCts.Token)) + using (CreateLinkedToken(cancellationToken, _state.StopCts.Token, out var linkedToken)) { - await StartAsyncCore(cancellationToken); + await StartAsyncCore(linkedToken); } _state.ChangeState(HubConnectionState.Connecting, HubConnectionState.Connected); @@ -1018,20 +1018,23 @@ namespace Microsoft.AspNetCore.SignalR.Client if (sendHandshakeResult.IsCompleted) { // The other side disconnected - throw new InvalidOperationException("The server disconnected before the handshake was completed"); + var ex = new IOException("The server disconnected before the handshake could be started."); + Log.ErrorReceivingHandshakeResponse(_logger, ex); + throw ex; } var input = startingConnectionState.Connection.Transport.Input; + using var handshakeCts = new CancellationTokenSource(HandshakeTimeout); + try { - using (var handshakeCts = new CancellationTokenSource(HandshakeTimeout)) // cancellationToken already contains _state.StopCts.Token, so we don't have to link it again - using (var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, handshakeCts.Token)) + using (CreateLinkedToken(cancellationToken, handshakeCts.Token, out var linkedToken)) { while (true) { - var result = await input.ReadAsync(cts.Token); + var result = await input.ReadAsync(linkedToken); var buffer = result.Buffer; var consumed = buffer.Start; @@ -1057,6 +1060,7 @@ namespace Microsoft.AspNetCore.SignalR.Client $"Unable to complete handshake with the server due to an error: {message.Error}"); } + Log.HandshakeComplete(_logger); break; } } @@ -1075,17 +1079,34 @@ namespace Microsoft.AspNetCore.SignalR.Client } } } + catch (HubException) + { + // This was already logged as a HandshakeServerError + throw; + } + catch (InvalidDataException ex) + { + Log.ErrorInvalidHandshakeResponse(_logger, ex); + throw; + } + catch (OperationCanceledException ex) + { + if (handshakeCts.IsCancellationRequested) + { + Log.ErrorHandshakeTimedOut(_logger, HandshakeTimeout, ex); + } + else + { + Log.ErrorHandshakeCanceled(_logger, ex); + } - // shutdown if we're unable to read handshake - // Ignore HubException because we throw it when we receive a handshake response with an error - // And because we already have the error, we don't need to log that the handshake failed - catch (Exception ex) when (!(ex is HubException)) + throw; + } + catch (Exception ex) { Log.ErrorReceivingHandshakeResponse(_logger, ex); throw; } - - Log.HandshakeComplete(_logger); } private async Task ReceiveLoop(ConnectionState connectionState) @@ -1485,6 +1506,26 @@ namespace Microsoft.AspNetCore.SignalR.Client } } + private IDisposable CreateLinkedToken(CancellationToken token1, CancellationToken token2, out CancellationToken linkedToken) + { + if (!token1.CanBeCanceled) + { + linkedToken = token2; + return null; + } + else if (!token2.CanBeCanceled) + { + linkedToken = token1; + return null; + } + else + { + var cts = CancellationTokenSource.CreateLinkedTokenSource(token1, token2); + linkedToken = cts.Token; + return cts; + } + } + // Debug.Assert plays havoc with Unit Tests. But I want something that I can "assert" only in Debug builds. [Conditional("DEBUG")] private static void SafeAssert(bool condition, string message, [CallerMemberName] string memberName = null, [CallerFilePath] string fileName = null, [CallerLineNumber] int lineNumber = 0) @@ -1495,7 +1536,6 @@ namespace Microsoft.AspNetCore.SignalR.Client } } - private class Subscription : IDisposable { private readonly InvocationHandler _handler; diff --git a/src/SignalR/clients/csharp/Client/src/HttpConnectionFactory.cs b/src/SignalR/clients/csharp/Client/src/HttpConnectionFactory.cs index 99da56fbb4..3ecf4dacd0 100644 --- a/src/SignalR/clients/csharp/Client/src/HttpConnectionFactory.cs +++ b/src/SignalR/clients/csharp/Client/src/HttpConnectionFactory.cs @@ -60,7 +60,7 @@ namespace Microsoft.AspNetCore.SignalR.Client /// public Task DisposeAsync(ConnectionContext connection) { - return ((HttpConnection)connection).DisposeAsync(); + return connection.DisposeAsync().AsTask(); } } -} \ No newline at end of file +} diff --git a/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs b/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs index 5a8d26f060..d723973629 100644 --- a/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs +++ b/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs @@ -59,7 +59,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests var delegateConnectionFactory = new DelegateConnectionFactory( GetHttpConnectionFactory(url, loggerFactory, path, transportType ?? HttpTransportType.LongPolling | HttpTransportType.WebSockets | HttpTransportType.ServerSentEvents), - connection => ((HttpConnection)connection).DisposeAsync()); + connection => ((HttpConnection)connection).DisposeAsync().AsTask()); hubConnectionBuilder.Services.AddSingleton(delegateConnectionFactory); return hubConnectionBuilder.Build(); diff --git a/src/SignalR/clients/csharp/Client/test/FunctionalTests/VersionStartup.cs b/src/SignalR/clients/csharp/Client/test/FunctionalTests/VersionStartup.cs index 18972ebb87..329ebe5211 100644 --- a/src/SignalR/clients/csharp/Client/test/FunctionalTests/VersionStartup.cs +++ b/src/SignalR/clients/csharp/Client/test/FunctionalTests/VersionStartup.cs @@ -1,18 +1,10 @@ // 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.IdentityModel.Tokens.Jwt; -using System.Security.Claims; -using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Connections; using Microsoft.AspNetCore.SignalR.Protocol; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -using Microsoft.IdentityModel.Tokens; -using Newtonsoft.Json; namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests { @@ -33,11 +25,12 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests public void Configure(IApplicationBuilder app) { + app.UseRouting(); app.UseAuthentication(); - app.UseSignalR(routes => + app.UseEndpoints(endpoints => { - routes.MapHub("/version"); + endpoints.MapHub("/version"); }); } } diff --git a/src/SignalR/clients/csharp/Client/test/UnitTests/HttpConnectionTests.ConnectionLifecycle.cs b/src/SignalR/clients/csharp/Client/test/UnitTests/HttpConnectionTests.ConnectionLifecycle.cs index c141ffbe8a..61821226b2 100644 --- a/src/SignalR/clients/csharp/Client/test/UnitTests/HttpConnectionTests.ConnectionLifecycle.cs +++ b/src/SignalR/clients/csharp/Client/test/UnitTests/HttpConnectionTests.ConnectionLifecycle.cs @@ -10,6 +10,7 @@ using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Http.Connections; using Microsoft.AspNetCore.Http.Connections.Client; using Microsoft.AspNetCore.Http.Connections.Client.Internal; +using Microsoft.AspNetCore.Internal; using Microsoft.AspNetCore.SignalR.Tests; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; @@ -43,13 +44,13 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests CreateConnection(loggerFactory: LoggerFactory, transport: new TestTransport(onTransportStart: SyncPoint.Create(out var syncPoint))), async (connection) => { - var firstStart = connection.StartAsync(TransferFormat.Text).OrTimeout(); - await syncPoint.WaitForSyncPoint(); - var secondStart = connection.StartAsync(TransferFormat.Text).OrTimeout(); + var firstStart = connection.StartAsync(TransferFormat.Text); + await syncPoint.WaitForSyncPoint().OrTimeout(); + var secondStart = connection.StartAsync(TransferFormat.Text); syncPoint.Continue(); - await firstStart; - await secondStart; + await firstStart.OrTimeout(); + await secondStart.OrTimeout(); }); } } @@ -64,10 +65,10 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests async (connection) => { await connection.StartAsync(TransferFormat.Text).OrTimeout(); - await connection.DisposeAsync(); + await connection.DisposeAsync().OrTimeout(); var exception = await Assert.ThrowsAsync( - async () => await connection.StartAsync(TransferFormat.Text).OrTimeout()); + async () => await connection.StartAsync(TransferFormat.Text)).OrTimeout(); Assert.Equal(nameof(HttpConnection), exception.ObjectName); }); @@ -90,8 +91,8 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests var startCounter = 0; var expected = new Exception("Transport failed to start"); - // We have 4 cases here. Falling back once, falling back twice and each of these - // with WebSockets available and not. If Websockets aren't available and + // We have 4 cases here. Falling back once, falling back twice and each of these + // with WebSockets available and not. If Websockets aren't available and // we can't to test the fallback once scenario we don't decrement the passthreshold // because we still try to start twice (SSE and LP). if (!TestHelpers.IsWebSocketsSupported() && passThreshold > 2) @@ -121,7 +122,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests async (connection) => { Assert.Equal(0, startCounter); - await connection.StartAsync(TransferFormat.Text); + await connection.StartAsync(TransferFormat.Text).OrTimeout(); Assert.Equal(passThreshold, startCounter); }); } @@ -154,7 +155,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests transport: new TestTransport(onTransportStart: OnTransportStart)), async (connection) => { - var ex = await Assert.ThrowsAsync(() => connection.StartAsync(TransferFormat.Text)); + var ex = await Assert.ThrowsAsync(() => connection.StartAsync(TransferFormat.Text)).OrTimeout(); Assert.Equal("Unable to connect to the server with any of the available transports. " + "(WebSockets failed: Transport failed to start) (ServerSentEvents failed: Transport failed to start) (LongPolling failed: Transport failed to start)", ex.Message); @@ -179,8 +180,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests CreateConnection(loggerFactory: LoggerFactory), async (connection) => { - await connection.DisposeAsync(); - + await connection.DisposeAsync().OrTimeout(); }); } } @@ -203,7 +203,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests await transportStart.WaitForSyncPoint().OrTimeout(); // While the transport is starting, dispose the connection - var disposeTask = connection.DisposeAsync().OrTimeout(); + var disposeTask = connection.DisposeAsync(); transportStart.Continue(); // We need to release StartAsync, because Dispose waits for it. // Wait for start to finish, as that has to finish before the transport will be stopped. @@ -214,7 +214,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests transportStop.Continue(); // Dispose should finish - await disposeTask; + await disposeTask.OrTimeout(); }); } } @@ -234,14 +234,14 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests await connection.StartAsync(TransferFormat.Text).OrTimeout(); // Dispose the connection - var stopTask = connection.DisposeAsync().OrTimeout(); + var stopTask = connection.DisposeAsync(); // Once the transport starts shutting down - await transportStop.WaitForSyncPoint(); + await transportStop.WaitForSyncPoint().OrTimeout(); Assert.False(stopTask.IsCompleted); // Start disposing again, and then let the first dispose continue - var disposeTask = connection.DisposeAsync().OrTimeout(); + var disposeTask = connection.DisposeAsync(); transportStop.Continue(); // Wait for the tasks to complete @@ -249,7 +249,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests await disposeTask.OrTimeout(); // We should be disposed and thus unable to restart. - await AssertDisposedAsync(connection); + await AssertDisposedAsync(connection).OrTimeout(); }); } } @@ -316,7 +316,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests await connection.Transport.Output.WriteAsync(new byte[] { 0x42 }).OrTimeout(); // We should get the exception in the transport input completion. - await Assert.ThrowsAsync(() => connection.Transport.Input.WaitForWriterToComplete()); + await Assert.ThrowsAsync(() => connection.Transport.Input.WaitForWriterToComplete()).OrTimeout(); }); } } @@ -371,11 +371,11 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests CreateConnection(httpHandler, loggerFactory: LoggerFactory, transport: sse), async (connection) => { - var startTask = connection.StartAsync(TransferFormat.Text).OrTimeout(); + var startTask = connection.StartAsync(TransferFormat.Text); Assert.False(connectResponseTcs.Task.IsCompleted); Assert.False(startTask.IsCompleted); connectResponseTcs.TrySetResult(null); - await startTask; + await startTask.OrTimeout(); }); } } @@ -383,7 +383,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests private static async Task AssertDisposedAsync(HttpConnection connection) { var exception = - await Assert.ThrowsAsync(() => connection.StartAsync(TransferFormat.Text).OrTimeout()); + await Assert.ThrowsAsync(() => connection.StartAsync(TransferFormat.Text)); Assert.Equal(nameof(HttpConnection), exception.ObjectName); } } diff --git a/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.ConnectionLifecycle.cs b/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.ConnectionLifecycle.cs index f60b124d59..7e29231574 100644 --- a/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.ConnectionLifecycle.cs +++ b/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.ConnectionLifecycle.cs @@ -8,9 +8,11 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; +using Microsoft.AspNetCore.Internal; using Microsoft.AspNetCore.SignalR.Protocol; using Microsoft.AspNetCore.SignalR.Tests; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging.Testing; using Newtonsoft.Json.Linq; using Xunit; @@ -18,7 +20,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests { public partial class HubConnectionTests { - public class ConnectionLifecycle + public class ConnectionLifecycle : VerifiableLoggedTest { // This tactic (using names and a dictionary) allows non-serializable data (like a Func) to be used in a theory AND get it to show in the new hierarchical view in Test Explorer as separate tests you can run individually. private static readonly IDictionary> MethodsThatRequireActiveConnection = new Dictionary>() @@ -30,27 +32,6 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests public static IEnumerable MethodsNamesThatRequireActiveConnection => MethodsThatRequireActiveConnection.Keys.Select(k => new object[] { k }); - private HubConnection CreateHubConnection(TestConnection testConnection) - { - var builder = new HubConnectionBuilder(); - - var delegateConnectionFactory = new DelegateConnectionFactory( - testConnection.StartAsync, - connection => ((TestConnection)connection).DisposeAsync()); - builder.Services.AddSingleton(delegateConnectionFactory); - - return builder.Build(); - } - - private HubConnection CreateHubConnection(Func> connectDelegate, Func disposeDelegate) - { - var builder = new HubConnectionBuilder(); - - var delegateConnectionFactory = new DelegateConnectionFactory(connectDelegate, disposeDelegate); - builder.Services.AddSingleton(delegateConnectionFactory); - - return builder.Build(); - } [Fact] public async Task StartAsyncStartsTheUnderlyingConnection() @@ -60,7 +41,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests { Assert.Equal(HubConnectionState.Disconnected, connection.State); - await connection.StartAsync(); + await connection.StartAsync().OrTimeout(); Assert.True(testConnection.Started.IsCompleted); Assert.Equal(HubConnectionState.Connected, connection.State); }); @@ -73,22 +54,22 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests var testConnection = new TestConnection(onStart: SyncPoint.Create(out var syncPoint)); await AsyncUsing(CreateHubConnection(testConnection), async connection => { - var firstStart = connection.StartAsync().OrTimeout(); + var firstStart = connection.StartAsync(); Assert.False(firstStart.IsCompleted); // Wait for us to be in IConnectionFactory.ConnectAsync - await syncPoint.WaitForSyncPoint(); + await syncPoint.WaitForSyncPoint().OrTimeout(); // Try starting again - var secondStart = connection.StartAsync().OrTimeout(); + var secondStart = connection.StartAsync(); Assert.False(secondStart.IsCompleted); // Release the sync point syncPoint.Continue(); // The first start should finish fine, but the second throws an InvalidOperationException. - await firstStart; - await Assert.ThrowsAsync(() => secondStart); + await firstStart.OrTimeout(); + await Assert.ThrowsAsync(() => secondStart).OrTimeout(); }); } @@ -105,10 +86,14 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests Task DisposeAsync(ConnectionContext connection) { - return ((TestConnection)connection).DisposeAsync(); + return connection.DisposeAsync().AsTask(); } - await AsyncUsing(CreateHubConnection(ConnectionFactory, DisposeAsync), async connection => + var builder = new HubConnectionBuilder(); + var delegateConnectionFactory = new DelegateConnectionFactory(ConnectionFactory, DisposeAsync); + builder.Services.AddSingleton(delegateConnectionFactory); + + await AsyncUsing(builder.Build(), async connection => { Assert.Equal(HubConnectionState.Disconnected, connection.State); @@ -137,49 +122,76 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests return new TestConnection(onDispose: createCount == 1 ? onDisposeForFirstConnection : null).StartAsync(format); } - Task DisposeAsync(ConnectionContext connection) => ((TestConnection)connection).DisposeAsync(); + Task DisposeAsync(ConnectionContext connection) => connection.DisposeAsync().AsTask(); - await AsyncUsing(CreateHubConnection(ConnectionFactory, DisposeAsync), async connection => + var builder = new HubConnectionBuilder(); + var delegateConnectionFactory = new DelegateConnectionFactory(ConnectionFactory, DisposeAsync); + builder.Services.AddSingleton(delegateConnectionFactory); + + await AsyncUsing(builder.Build(), async connection => { await connection.StartAsync().OrTimeout(); Assert.Equal(1, createCount); - var stopTask = connection.StopAsync().OrTimeout(); + var stopTask = connection.StopAsync(); // Wait to hit DisposeAsync on TestConnection (which should be after StopAsync has cleared the connection state) await syncPoint.WaitForSyncPoint().OrTimeout(); // We should not yet be able to start now because StopAsync hasn't completed Assert.False(stopTask.IsCompleted); - var startTask = connection.StartAsync().OrTimeout(); + var startTask = connection.StartAsync(); Assert.False(stopTask.IsCompleted); // When we release the sync point, the StopAsync task will finish syncPoint.Continue(); - await stopTask; + await stopTask.OrTimeout(); // Which will then allow StartAsync to finish. - await startTask; + await startTask.OrTimeout(); }); } [Fact] public async Task StartAsyncWithFailedHandshakeCanBeStopped() { - var testConnection = new TestConnection(autoHandshake: false); - await AsyncUsing(CreateHubConnection(testConnection), async connection => - { - testConnection.Transport.Input.Complete(); - try - { - await connection.StartAsync(); - } - catch - { } + var handshakeConnectionErrorLogged = false; - await connection.StopAsync(); - Assert.True(testConnection.Started.IsCompleted); - }); + bool ExpectedErrors(WriteContext writeContext) + { + if (writeContext.LoggerName == typeof(HubConnection).FullName) + { + if (writeContext.EventId.Name == "ErrorReceivingHandshakeResponse") + { + handshakeConnectionErrorLogged = true; + return true; + } + + return writeContext.EventId.Name == "ErrorStartingConnection"; + } + + return false; + } + + using (StartVerifiableLog(ExpectedErrors)) + { + var testConnection = new TestConnection(autoHandshake: false); + await AsyncUsing(CreateHubConnection(testConnection, loggerFactory: LoggerFactory), async connection => + { + testConnection.Transport.Input.Complete(); + try + { + await connection.StartAsync().OrTimeout(); + } + catch + { } + + await connection.StopAsync().OrTimeout(); + Assert.True(testConnection.Started.IsCompleted); + }); + } + + Assert.True(handshakeConnectionErrorLogged, "The connnection error during the handshake wasn't logged."); } [Theory] @@ -191,7 +203,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests var testConnection = new TestConnection(); await AsyncUsing(CreateHubConnection(testConnection), async connection => { - var ex = await Assert.ThrowsAsync(() => method(connection)); + var ex = await Assert.ThrowsAsync(() => method(connection)).OrTimeout(); Assert.Equal($"The '{name}' method cannot be called if the connection is not active", ex.Message); }); } @@ -207,27 +219,27 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests await AsyncUsing(CreateHubConnection(testConnection), async connection => { // Start, and wait for the sync point to be hit - var startTask = connection.StartAsync().OrTimeout(); + var startTask = connection.StartAsync(); Assert.False(startTask.IsCompleted); - await syncPoint.WaitForSyncPoint(); + await syncPoint.WaitForSyncPoint().OrTimeout(); // Run the method, but it will be waiting for the lock - var targetTask = method(connection).OrTimeout(); + var targetTask = method(connection); // Release the SyncPoint syncPoint.Continue(); // Wait for start to finish - await startTask; + await startTask.OrTimeout(); // We need some special logic to ensure InvokeAsync completes. if (string.Equals(name, nameof(HubConnection.InvokeCoreAsync))) { - await ForceLastInvocationToComplete(testConnection); + await ForceLastInvocationToComplete(testConnection).OrTimeout(); } // Wait for the method to complete. - await targetTask; + await targetTask.OrTimeout(); }); } @@ -239,9 +251,9 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests await AsyncUsing(CreateHubConnection(testConnection), async connection => { // Start, and wait for the sync point to be hit - var startTask = connection.StartAsync().OrTimeout(); + var startTask = connection.StartAsync(); Assert.False(startTask.IsCompleted); - await syncPoint.WaitForSyncPoint(); + await syncPoint.WaitForSyncPoint().OrTimeout(); Assert.Equal(HubConnectionState.Connecting, connection.State); @@ -249,7 +261,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests syncPoint.Continue(); // Wait for start to finish - await startTask; + await startTask.OrTimeout(); Assert.Equal(HubConnectionState.Connected, connection.State); }); @@ -349,7 +361,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests await closed.Task.OrTimeout(); // We should be stopped now - var ex = await Assert.ThrowsAsync(() => connection.SendAsync("Foo").OrTimeout()); + var ex = await Assert.ThrowsAsync(() => connection.SendAsync("Foo")).OrTimeout(); Assert.Equal($"The '{nameof(HubConnection.SendCoreAsync)}' method cannot be called if the connection is not active", ex.Message); }); } @@ -374,20 +386,20 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests Assert.True(testConnection.Started.IsCompleted); // Start shutting down and complete the transport side - var stopTask = connection.StopAsync().OrTimeout(); + var stopTask = connection.StopAsync(); testConnection.CompleteFromTransport(); // Wait for the connection to close. await testConnectionClosed.Task.OrTimeout(); // The stop should be completed. - await stopTask; + await stopTask.OrTimeout(); // The HubConnection should now be closed. await connectionClosed.Task.OrTimeout(); // We should be stopped now - var ex = await Assert.ThrowsAsync(() => connection.SendAsync("Foo").OrTimeout()); + var ex = await Assert.ThrowsAsync(() => connection.SendAsync("Foo")).OrTimeout(); Assert.Equal($"The '{nameof(HubConnection.SendCoreAsync)}' method cannot be called if the connection is not active", ex.Message); await testConnection.Disposed.OrTimeout(); @@ -416,16 +428,16 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests testConnection.CompleteFromTransport(); // Start stopping manually (these can't be synchronized by a Sync Point because the transport is disposed outside the lock) - var stopTask = connection.StopAsync().OrTimeout(); + var stopTask = connection.StopAsync(); await testConnection.Disposed.OrTimeout(); // Wait for the stop task to complete and the closed event to fire - await stopTask; + await stopTask.OrTimeout(); await connectionClosed.Task.OrTimeout(); // We should be stopped now - var ex = await Assert.ThrowsAsync(() => connection.SendAsync("Foo").OrTimeout()); + var ex = await Assert.ThrowsAsync(() => connection.SendAsync("Foo")).OrTimeout(); Assert.Equal($"The '{nameof(HubConnection.SendCoreAsync)}' method cannot be called if the connection is not active", ex.Message); }); } @@ -444,89 +456,141 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests // Stop and invoke the method. These two aren't synchronizable via a Sync Point any more because the transport is disposed // outside the lock :( - var disposeTask = connection.StopAsync().OrTimeout(); + var disposeTask = connection.StopAsync(); // Wait to hit DisposeAsync on TestConnection (which should be after StopAsync has cleared the connection state) await syncPoint.WaitForSyncPoint().OrTimeout(); - var targetTask = method(connection).OrTimeout(); + var targetTask = method(connection); // Release the sync point syncPoint.Continue(); // Wait for the method to complete, with an expected error. - var ex = await Assert.ThrowsAsync(() => targetTask); + var ex = await Assert.ThrowsAsync(() => targetTask).OrTimeout(); Assert.Equal($"The '{methodName}' method cannot be called if the connection is not active", ex.Message); - await disposeTask; + await disposeTask.OrTimeout(); }); } [Fact] public async Task ClientTimesoutWhenHandshakeResponseTakesTooLong() { - var connection = new TestConnection(autoHandshake: false); - var hubConnection = CreateHubConnection(connection); - try - { - hubConnection.HandshakeTimeout = TimeSpan.FromMilliseconds(1); + var handshakeTimeoutLogged = false; - await Assert.ThrowsAsync(() => hubConnection.StartAsync().OrTimeout()); - Assert.Equal(HubConnectionState.Disconnected, hubConnection.State); - } - finally + bool ExpectedErrors(WriteContext writeContext) { - await hubConnection.DisposeAsync().OrTimeout(); - await connection.DisposeAsync().OrTimeout(); + if (writeContext.LoggerName == typeof(HubConnection).FullName) + { + if (writeContext.EventId.Name == "ErrorHandshakeTimedOut") + { + handshakeTimeoutLogged = true; + return true; + } + + return writeContext.EventId.Name == "ErrorStartingConnection"; + } + + return false; } + + using (StartVerifiableLog(ExpectedErrors)) + { + var connection = new TestConnection(autoHandshake: false); + var hubConnection = CreateHubConnection(connection, loggerFactory: LoggerFactory); + try + { + hubConnection.HandshakeTimeout = TimeSpan.FromMilliseconds(1); + + await Assert.ThrowsAsync(() => hubConnection.StartAsync()).OrTimeout(); + Assert.Equal(HubConnectionState.Disconnected, hubConnection.State); + } + finally + { + await hubConnection.DisposeAsync().OrTimeout(); + await connection.DisposeAsync().OrTimeout(); + } + } + + Assert.True(handshakeTimeoutLogged, "The handshake timeout wasn't logged."); } [Fact] public async Task StartAsyncWithTriggeredCancellationTokenIsCanceled() { - var onStartCalled = false; - var connection = new TestConnection(onStart: () => + using (StartVerifiableLog()) { - onStartCalled = true; - return Task.CompletedTask; - }); - var hubConnection = CreateHubConnection(connection); - try - { - await Assert.ThrowsAsync(() => hubConnection.StartAsync(new CancellationToken(canceled: true)).OrTimeout()); - Assert.False(onStartCalled); - } - finally - { - await hubConnection.DisposeAsync().OrTimeout(); - await connection.DisposeAsync().OrTimeout(); + var onStartCalled = false; + var connection = new TestConnection(onStart: () => + { + onStartCalled = true; + return Task.CompletedTask; + }); + var hubConnection = CreateHubConnection(connection, loggerFactory: LoggerFactory); + try + { + await Assert.ThrowsAsync(() => hubConnection.StartAsync(new CancellationToken(canceled: true))).OrTimeout(); + Assert.False(onStartCalled); + } + finally + { + await hubConnection.DisposeAsync().OrTimeout(); + await connection.DisposeAsync().OrTimeout(); + } } } [Fact] public async Task StartAsyncCanTriggerCancellationTokenToCancelHandshake() { - var cts = new CancellationTokenSource(); - var connection = new TestConnection(onStart: () => - { - cts.Cancel(); - return Task.CompletedTask; - }, autoHandshake: false); - var hubConnection = CreateHubConnection(connection); - // We want to make sure the cancellation is because of the token passed to StartAsync - hubConnection.HandshakeTimeout = Timeout.InfiniteTimeSpan; - try - { - var startTask = hubConnection.StartAsync(cts.Token); - await Assert.ThrowsAnyAsync(() => startTask.OrTimeout()); + var handshakeCancellationLogged = false; - // We aren't worried about the exact message and it's localized so asserting it is non-trivial. - } - finally + bool ExpectedErrors(WriteContext writeContext) { - await hubConnection.DisposeAsync().OrTimeout(); - await connection.DisposeAsync().OrTimeout(); + if (writeContext.LoggerName == typeof(HubConnection).FullName) + { + if (writeContext.EventId.Name == "ErrorHandshakeCanceled") + { + handshakeCancellationLogged = true; + return true; + } + + return writeContext.EventId.Name == "ErrorStartingConnection"; + } + + return false; } + + using (StartVerifiableLog(ExpectedErrors)) + { + var cts = new CancellationTokenSource(); + TestConnection connection = null; + + connection = new TestConnection(autoHandshake: false); + + var hubConnection = CreateHubConnection(connection, loggerFactory: LoggerFactory); + // We want to make sure the cancellation is because of the token passed to StartAsync + hubConnection.HandshakeTimeout = Timeout.InfiniteTimeSpan; + + try + { + var startTask = hubConnection.StartAsync(cts.Token); + + await connection.ReadSentTextMessageAsync().OrTimeout(); + cts.Cancel(); + + // We aren't worried about the exact message and it's localized so asserting it is non-trivial. + await Assert.ThrowsAnyAsync(() => startTask).OrTimeout(); + } + finally + { + await hubConnection.DisposeAsync().OrTimeout(); + await connection.DisposeAsync().OrTimeout(); + } + } + + Assert.True(handshakeCancellationLogged, "The handshake cancellation wasn't logged."); } [Fact] @@ -537,7 +601,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests var delegateConnectionFactory = new DelegateConnectionFactory( format => innerConnection.StartAsync(format), - connection => ((TestConnection)connection).DisposeAsync()); + connection => connection.DisposeAsync().AsTask()); builder.Services.AddSingleton(delegateConnectionFactory); var hubConnection = builder.Build(); @@ -574,13 +638,14 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests { try { + // Using OrTimeout here will hide any timeout issues in the test :(. await action(connection); } finally { // Dispose isn't under test here, so fire and forget so that errors/timeouts here don't cause // test errors that mask the real errors. - _ = connection.DisposeAsync(); + _ = connection.DisposeAsync(); } } } diff --git a/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.Helpers.cs b/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.Helpers.cs index 6aa6106f40..96c18db8d0 100644 --- a/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.Helpers.cs +++ b/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.Helpers.cs @@ -1,3 +1,6 @@ +// 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 Microsoft.AspNetCore.SignalR.Protocol; using Microsoft.AspNetCore.SignalR.Tests; using Microsoft.Extensions.DependencyInjection; @@ -7,13 +10,13 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests { public partial class HubConnectionTests { - private static HubConnection CreateHubConnection(TestConnection connection, IHubProtocol protocol = null, ILoggerFactory loggerFactory = null, IRetryPolicy reconnectPolicy = null) + private static HubConnection CreateHubConnection(TestConnection connection, IHubProtocol protocol = null, ILoggerFactory loggerFactory = null) { var builder = new HubConnectionBuilder(); var delegateConnectionFactory = new DelegateConnectionFactory( connection.StartAsync, - c => ((TestConnection)c).DisposeAsync()); + c => c.DisposeAsync().AsTask()); builder.Services.AddSingleton(delegateConnectionFactory); @@ -27,11 +30,6 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests builder.Services.AddSingleton(protocol); } - if (reconnectPolicy != null) - { - builder.WithAutomaticReconnect(reconnectPolicy); - } - return builder.Build(); } } diff --git a/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.Protocol.cs b/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.Protocol.cs index 5ddcc51161..93cc3dd863 100644 --- a/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.Protocol.cs +++ b/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.Protocol.cs @@ -2,9 +2,10 @@ // 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.IO; using System.Threading.Channels; using System.Threading.Tasks; +using Microsoft.AspNetCore.SignalR.Tests; using Xunit; namespace Microsoft.AspNetCore.SignalR.Client.Tests @@ -14,7 +15,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests // don't cause problems. public partial class HubConnectionTests { - public class Protocol + public class Protocol : VerifiableLoggedTest { [Fact] public async Task SendAsyncSendsANonBlockingInvocationMessage() @@ -31,6 +32,8 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests // ReadSentTextMessageAsync strips off the record separator (because it has use it as a separator now that we use Pipelines) Assert.Equal("{\"type\":1,\"target\":\"Foo\",\"arguments\":[]}", invokeMessage); + + await invokeTask.OrTimeout(); } finally { @@ -47,14 +50,14 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests try { // We can't await StartAsync because it depends on the negotiate process! - var startTask = hubConnection.StartAsync().OrTimeout(); + var startTask = hubConnection.StartAsync(); var handshakeMessage = await connection.ReadHandshakeAndSendResponseAsync().OrTimeout(); // ReadSentTextMessageAsync strips off the record separator (because it has use it as a separator now that we use Pipelines) Assert.Equal("{\"protocol\":\"json\",\"version\":1}", handshakeMessage); - await startTask; + await startTask.OrTimeout(); } finally { @@ -63,6 +66,35 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests } } + [Fact] + public async Task InvalidHandshakeResponseCausesStartToFail() + { + using (StartVerifiableLog()) + { + var connection = new TestConnection(autoHandshake: false); + var hubConnection = CreateHubConnection(connection); + try + { + // We can't await StartAsync because it depends on the negotiate process! + var startTask = hubConnection.StartAsync(); + + await connection.ReadSentTextMessageAsync().OrTimeout(); + + // The client expects the first message to be a handshake response, but a handshake response doesn't have a "type". + await connection.ReceiveJsonMessage(new { type = "foo" }).OrTimeout(); + + var ex = await Assert.ThrowsAsync(() => startTask).OrTimeout(); + + Assert.Equal("Expected a handshake response from the server.", ex.Message); + } + finally + { + await hubConnection.DisposeAsync().OrTimeout(); + await connection.DisposeAsync().OrTimeout(); + } + } + } + [Fact] public async Task ClientIsOkayReceivingMinorVersionInHandshake() { @@ -74,9 +106,9 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests try { var startTask = hubConnection.StartAsync(); - var message = await connection.ReadHandshakeAndSendResponseAsync(56); + var message = await connection.ReadHandshakeAndSendResponseAsync(56).OrTimeout(); - await startTask; + await startTask.OrTimeout(); } finally { @@ -94,12 +126,14 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests { await hubConnection.StartAsync().OrTimeout(); - var invokeTask = hubConnection.InvokeAsync("Foo").OrTimeout(); + var invokeTask = hubConnection.InvokeAsync("Foo"); var invokeMessage = await connection.ReadSentTextMessageAsync().OrTimeout(); // ReadSentTextMessageAsync strips off the record separator (because it has use it as a separator now that we use Pipelines) Assert.Equal("{\"type\":1,\"invocationId\":\"1\",\"target\":\"Foo\",\"arguments\":[]}", invokeMessage); + + Assert.Equal(TaskStatus.WaitingForActivation, invokeTask.Status); } finally { @@ -184,7 +218,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests // Complete the channel await connection.ReceiveJsonMessage(new { invocationId = "1", type = 3 }).OrTimeout(); - await channel.Completion; + await channel.Completion.OrTimeout(); } finally { @@ -202,7 +236,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests { await hubConnection.StartAsync().OrTimeout(); - var invokeTask = hubConnection.InvokeAsync("Foo").OrTimeout(); + var invokeTask = hubConnection.InvokeAsync("Foo"); await connection.ReceiveJsonMessage(new { invocationId = "1", type = 3 }).OrTimeout(); @@ -246,7 +280,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests { await hubConnection.StartAsync().OrTimeout(); - var invokeTask = hubConnection.InvokeAsync("Foo").OrTimeout(); + var invokeTask = hubConnection.InvokeAsync("Foo"); await connection.ReceiveJsonMessage(new { invocationId = "1", type = 3, result = 42 }).OrTimeout(); @@ -268,7 +302,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests { await hubConnection.StartAsync().OrTimeout(); - var invokeTask = hubConnection.InvokeAsync("Foo").OrTimeout(); + var invokeTask = hubConnection.InvokeAsync("Foo"); await connection.ReceiveJsonMessage(new { invocationId = "1", type = 3, error = "An error occurred" }).OrTimeout(); @@ -295,7 +329,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests await connection.ReceiveJsonMessage(new { invocationId = "1", type = 3, result = "Oops" }).OrTimeout(); - var ex = await Assert.ThrowsAsync(async () => await channel.ReadAndCollectAllAsync().OrTimeout()); + var ex = await Assert.ThrowsAsync(() => channel.ReadAndCollectAllAsync()).OrTimeout(); Assert.Equal("Server provided a result in a completion response to a streamed invocation.", ex.Message); } finally @@ -318,7 +352,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests await connection.ReceiveJsonMessage(new { invocationId = "1", type = 3, error = "An error occurred" }).OrTimeout(); - var ex = await Assert.ThrowsAsync(async () => await channel.ReadAndCollectAllAsync().OrTimeout()); + var ex = await Assert.ThrowsAsync(async () => await channel.ReadAndCollectAllAsync()).OrTimeout(); Assert.Equal("An error occurred", ex.Message); } finally @@ -337,7 +371,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests { await hubConnection.StartAsync().OrTimeout(); - var invokeTask = hubConnection.InvokeAsync("Foo").OrTimeout(); + var invokeTask = hubConnection.InvokeAsync("Foo"); await connection.ReceiveJsonMessage(new { invocationId = "1", type = 2, item = 42 }).OrTimeout(); @@ -479,7 +513,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests await hubConnection.StartAsync().OrTimeout(); // Send an invocation - var invokeTask = hubConnection.InvokeAsync("Foo").OrTimeout(); + var invokeTask = hubConnection.InvokeAsync("Foo"); // Receive the ping mid-invocation so we can see that the rest of the flow works fine await connection.ReceiveJsonMessage(new { type = 6 }).OrTimeout(); @@ -506,15 +540,15 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests { var task = hubConnection.StartAsync(); - await connection.ReceiveTextAsync("{"); + await connection.ReceiveTextAsync("{").OrTimeout(); Assert.False(task.IsCompleted); - await connection.ReceiveTextAsync("}"); + await connection.ReceiveTextAsync("}").OrTimeout(); Assert.False(task.IsCompleted); - await connection.ReceiveTextAsync("\u001e"); + await connection.ReceiveTextAsync("\u001e").OrTimeout(); await task.OrTimeout(); } @@ -539,9 +573,9 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests tcs.TrySetResult(data); }); - await connection.ReceiveTextAsync(payload); + await connection.ReceiveTextAsync(payload).OrTimeout(); - await hubConnection.StartAsync(); + await hubConnection.StartAsync().OrTimeout(); var response = await tcs.Task.OrTimeout(); Assert.Equal("hello", response); @@ -568,15 +602,15 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests await hubConnection.StartAsync().OrTimeout(); - await connection.ReceiveTextAsync("{\"type\":1, "); + await connection.ReceiveTextAsync("{\"type\":1, ").OrTimeout(); Assert.False(tcs.Task.IsCompleted); - await connection.ReceiveTextAsync("\"target\": \"Echo\", \"arguments\""); + await connection.ReceiveTextAsync("\"target\": \"Echo\", \"arguments\"").OrTimeout(); Assert.False(tcs.Task.IsCompleted); - await connection.ReceiveTextAsync(":[\"hello\"]}\u001e"); + await connection.ReceiveTextAsync(":[\"hello\"]}\u001e").OrTimeout(); var response = await tcs.Task.OrTimeout(); diff --git a/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.Reconnect.cs b/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.Reconnect.cs index 8e6c684b7b..a039bbd0ef 100644 --- a/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.Reconnect.cs +++ b/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.Reconnect.cs @@ -8,6 +8,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Internal; using Microsoft.AspNetCore.SignalR.Protocol; +using Microsoft.AspNetCore.SignalR.Tests; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging.Testing; using Moq; @@ -17,897 +18,900 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests { public partial class HubConnectionTests { - [Fact] - public async Task ReconnectIsNotEnabledByDefault() + public class Reconnect : VerifiableLoggedTest { - bool ExpectedErrors(WriteContext writeContext) + [Fact] + public async Task IsNotEnabledByDefault() { - return writeContext.LoggerName == typeof(HubConnection).FullName && - (writeContext.EventId.Name == "ShutdownWithError" || - writeContext.EventId.Name == "ServerDisconnectedWithError"); - } - - using (StartVerifiableLog(ExpectedErrors)) - { - var exception = new Exception(); - - var testConnection = new TestConnection(); - await using var hubConnection = CreateHubConnection(testConnection, loggerFactory: LoggerFactory); - - var reconnectingCalled = false; - var closedErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - - hubConnection.Reconnecting += error => + bool ExpectedErrors(WriteContext writeContext) { - reconnectingCalled = true; - return Task.CompletedTask; - }; - - hubConnection.Closed += error => - { - closedErrorTcs.SetResult(error); - return Task.CompletedTask; - }; - - await hubConnection.StartAsync().OrTimeout(); - - testConnection.CompleteFromTransport(exception); - - Assert.Same(exception, await closedErrorTcs.Task.OrTimeout()); - Assert.False(reconnectingCalled); - } - } - - [Fact] - public async Task ReconnectCanBeOptedInto() - { - bool ExpectedErrors(WriteContext writeContext) - { - return writeContext.LoggerName == typeof(HubConnection).FullName && - (writeContext.EventId.Name == "ServerDisconnectedWithError" || - writeContext.EventId.Name == "ReconnectingWithError"); - } - - var failReconnectTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - - using (StartVerifiableLog(ExpectedErrors)) - { - var builder = new HubConnectionBuilder().WithLoggerFactory(LoggerFactory); - var testConnectionFactory = default(ReconnectingConnectionFactory); - var startCallCount = 0; - var originalConnectionId = "originalConnectionId"; - var reconnectedConnectionId = "reconnectedConnectionId"; - - async Task OnTestConnectionStart() - { - startCallCount++; - - // Only fail the first reconnect attempt. - if (startCallCount == 2) - { - await failReconnectTcs.Task; - } - - var testConnection = await testConnectionFactory.GetNextOrCurrentTestConnection(); - - // Change the connection id before reconnecting. - if (startCallCount == 3) - { - testConnection.ConnectionId = reconnectedConnectionId; - } - else - { - testConnection.ConnectionId = originalConnectionId; - } + return writeContext.LoggerName == typeof(HubConnection).FullName && + (writeContext.EventId.Name == "ShutdownWithError" || + writeContext.EventId.Name == "ServerDisconnectedWithError"); } - testConnectionFactory = new ReconnectingConnectionFactory(() => new TestConnection(OnTestConnectionStart)); - builder.Services.AddSingleton(testConnectionFactory); - - var retryContexts = new List(); - var mockReconnectPolicy = new Mock(); - mockReconnectPolicy.Setup(p => p.NextRetryDelay(It.IsAny())).Returns(context => + using (StartVerifiableLog(ExpectedErrors)) { - retryContexts.Add(context); - return TimeSpan.Zero; - }); - builder.WithAutomaticReconnect(mockReconnectPolicy.Object); + var exception = new Exception(); - await using var hubConnection = builder.Build(); - var reconnectingCount = 0; - var reconnectedCount = 0; - var reconnectingErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var reconnectedConnectionIdTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var closedErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var testConnection = new TestConnection(); + await using var hubConnection = CreateHubConnection(testConnection, loggerFactory: LoggerFactory); - hubConnection.Reconnecting += error => - { - reconnectingCount++; - reconnectingErrorTcs.SetResult(error); - return Task.CompletedTask; - }; + var reconnectingCalled = false; + var closedErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - hubConnection.Reconnected += connectionId => - { - reconnectedCount++; - reconnectedConnectionIdTcs.SetResult(connectionId); - return Task.CompletedTask; - }; - - hubConnection.Closed += error => - { - closedErrorTcs.SetResult(error); - return Task.CompletedTask; - }; - - await hubConnection.StartAsync().OrTimeout(); - - Assert.Same(originalConnectionId, hubConnection.ConnectionId); - - var firstException = new Exception(); - (await testConnectionFactory.GetNextOrCurrentTestConnection()).CompleteFromTransport(firstException); - - Assert.Same(firstException, await reconnectingErrorTcs.Task.OrTimeout()); - Assert.Single(retryContexts); - Assert.Same(firstException, retryContexts[0].RetryReason); - Assert.Equal(0, retryContexts[0].PreviousRetryCount); - Assert.Equal(TimeSpan.Zero, retryContexts[0].ElapsedTime); - - var reconnectException = new Exception(); - failReconnectTcs.SetException(reconnectException); - - Assert.Same(reconnectedConnectionId, await reconnectedConnectionIdTcs.Task.OrTimeout()); - - Assert.Equal(2, retryContexts.Count); - Assert.Same(reconnectException, retryContexts[1].RetryReason); - Assert.Equal(1, retryContexts[1].PreviousRetryCount); - Assert.True(TimeSpan.Zero <= retryContexts[1].ElapsedTime); - - await hubConnection.StopAsync().OrTimeout(); - - var closeError = await closedErrorTcs.Task.OrTimeout(); - Assert.Null(closeError); - Assert.Equal(1, reconnectingCount); - Assert.Equal(1, reconnectedCount); - } - } - - [Fact] - public async Task ReconnectStopsIfTheReconnectPolicyReturnsNull() - { - bool ExpectedErrors(WriteContext writeContext) - { - return writeContext.LoggerName == typeof(HubConnection).FullName && - (writeContext.EventId.Name == "ServerDisconnectedWithError" || - writeContext.EventId.Name == "ReconnectingWithError"); - } - - var failReconnectTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - - using (StartVerifiableLog(ExpectedErrors)) - { - var builder = new HubConnectionBuilder().WithLoggerFactory(LoggerFactory); - var startCallCount = 0; - - Task OnTestConnectionStart() - { - startCallCount++; - - // Fail the first reconnect attempts. - if (startCallCount > 1) + hubConnection.Reconnecting += error => { - return failReconnectTcs.Task; - } + reconnectingCalled = true; + return Task.CompletedTask; + }; - return Task.CompletedTask; + hubConnection.Closed += error => + { + closedErrorTcs.SetResult(error); + return Task.CompletedTask; + }; + + await hubConnection.StartAsync().OrTimeout(); + + testConnection.CompleteFromTransport(exception); + + Assert.Same(exception, await closedErrorTcs.Task.OrTimeout()); + Assert.False(reconnectingCalled); + } + } + + [Fact] + public async Task CanBeOptedInto() + { + bool ExpectedErrors(WriteContext writeContext) + { + return writeContext.LoggerName == typeof(HubConnection).FullName && + (writeContext.EventId.Name == "ServerDisconnectedWithError" || + writeContext.EventId.Name == "ReconnectingWithError"); } - var testConnectionFactory = new ReconnectingConnectionFactory(() => new TestConnection(OnTestConnectionStart)); - builder.Services.AddSingleton(testConnectionFactory); + var failReconnectTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var retryContexts = new List(); - var mockReconnectPolicy = new Mock(); - mockReconnectPolicy.Setup(p => p.NextRetryDelay(It.IsAny())).Returns(context => + using (StartVerifiableLog(ExpectedErrors)) { - retryContexts.Add(context); - return context.PreviousRetryCount == 0 ? TimeSpan.Zero : (TimeSpan?)null; - }); - builder.WithAutomaticReconnect(mockReconnectPolicy.Object); + var builder = new HubConnectionBuilder().WithLoggerFactory(LoggerFactory); + var testConnectionFactory = default(ReconnectingConnectionFactory); + var startCallCount = 0; + var originalConnectionId = "originalConnectionId"; + var reconnectedConnectionId = "reconnectedConnectionId"; - await using var hubConnection = builder.Build(); - var reconnectingCount = 0; - var reconnectedCount = 0; - var reconnectingErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var closedErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - - hubConnection.Reconnecting += error => - { - reconnectingCount++; - reconnectingErrorTcs.SetResult(error); - return Task.CompletedTask; - }; - - hubConnection.Reconnected += connectionId => - { - reconnectedCount++; - return Task.CompletedTask; - }; - - hubConnection.Closed += error => - { - closedErrorTcs.SetResult(error); - return Task.CompletedTask; - }; - - await hubConnection.StartAsync().OrTimeout(); - - var firstException = new Exception(); - (await testConnectionFactory.GetNextOrCurrentTestConnection()).CompleteFromTransport(firstException); - - Assert.Same(firstException, await reconnectingErrorTcs.Task.OrTimeout()); - Assert.Single(retryContexts); - Assert.Same(firstException, retryContexts[0].RetryReason); - Assert.Equal(0, retryContexts[0].PreviousRetryCount); - Assert.Equal(TimeSpan.Zero, retryContexts[0].ElapsedTime); - - var reconnectException = new Exception(); - failReconnectTcs.SetException(reconnectException); - - var closeError = await closedErrorTcs.Task.OrTimeout(); - Assert.IsType(closeError); - - Assert.Equal(2, retryContexts.Count); - Assert.Same(reconnectException, retryContexts[1].RetryReason); - Assert.Equal(1, retryContexts[1].PreviousRetryCount); - Assert.True(TimeSpan.Zero <= retryContexts[1].ElapsedTime); - - Assert.Equal(1, reconnectingCount); - Assert.Equal(0, reconnectedCount); - } - } - - [Fact] - public async Task ReconnectCanHappenMultipleTimes() - { - bool ExpectedErrors(WriteContext writeContext) - { - return writeContext.LoggerName == typeof(HubConnection).FullName && - (writeContext.EventId.Name == "ServerDisconnectedWithError" || - writeContext.EventId.Name == "ReconnectingWithError"); - } - - using (StartVerifiableLog(ExpectedErrors)) - { - var builder = new HubConnectionBuilder().WithLoggerFactory(LoggerFactory); - var testConnectionFactory = new ReconnectingConnectionFactory(); - builder.Services.AddSingleton(testConnectionFactory); - - var retryContexts = new List(); - var mockReconnectPolicy = new Mock(); - mockReconnectPolicy.Setup(p => p.NextRetryDelay(It.IsAny())).Returns(context => - { - retryContexts.Add(context); - return TimeSpan.Zero; - }); - builder.WithAutomaticReconnect(mockReconnectPolicy.Object); - - await using var hubConnection = builder.Build(); - var reconnectingCount = 0; - var reconnectedCount = 0; - var reconnectingErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var reconnectedConnectionIdTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var closedErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - - hubConnection.Reconnecting += error => - { - reconnectingCount++; - reconnectingErrorTcs.SetResult(error); - return Task.CompletedTask; - }; - - hubConnection.Reconnected += connectionId => - { - reconnectedCount++; - reconnectedConnectionIdTcs.SetResult(connectionId); - return Task.CompletedTask; - }; - - hubConnection.Closed += error => - { - closedErrorTcs.SetResult(error); - return Task.CompletedTask; - }; - - await hubConnection.StartAsync().OrTimeout(); - - var firstException = new Exception(); - (await testConnectionFactory.GetNextOrCurrentTestConnection()).CompleteFromTransport(firstException); - - Assert.Same(firstException, await reconnectingErrorTcs.Task.OrTimeout()); - Assert.Single(retryContexts); - Assert.Same(firstException, retryContexts[0].RetryReason); - Assert.Equal(0, retryContexts[0].PreviousRetryCount); - Assert.Equal(TimeSpan.Zero, retryContexts[0].ElapsedTime); - - await reconnectedConnectionIdTcs.Task.OrTimeout(); - - Assert.Equal(1, reconnectingCount); - Assert.Equal(1, reconnectedCount); - Assert.Equal(TaskStatus.WaitingForActivation, closedErrorTcs.Task.Status); - - reconnectingErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - reconnectedConnectionIdTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - - var secondException = new Exception(); - (await testConnectionFactory.GetNextOrCurrentTestConnection()).CompleteFromTransport(secondException); - - Assert.Same(secondException, await reconnectingErrorTcs.Task.OrTimeout()); - Assert.Equal(2, retryContexts.Count); - Assert.Same(secondException, retryContexts[1].RetryReason); - Assert.Equal(0, retryContexts[1].PreviousRetryCount); - Assert.Equal(TimeSpan.Zero, retryContexts[1].ElapsedTime); - - await reconnectedConnectionIdTcs.Task.OrTimeout(); - - Assert.Equal(2, reconnectingCount); - Assert.Equal(2, reconnectedCount); - Assert.Equal(TaskStatus.WaitingForActivation, closedErrorTcs.Task.Status); - - await hubConnection.StopAsync().OrTimeout(); - - var closeError = await closedErrorTcs.Task.OrTimeout(); - Assert.Null(closeError); - Assert.Equal(2, reconnectingCount); - Assert.Equal(2, reconnectedCount); - } - } - - [Fact] - public async Task ReconnectEventsNotFiredIfFirstRetryDelayIsNull() - { - bool ExpectedErrors(WriteContext writeContext) - { - return writeContext.LoggerName == typeof(HubConnection).FullName && - writeContext.EventId.Name == "ServerDisconnectedWithError"; - } - - using (StartVerifiableLog(ExpectedErrors)) - { - var builder = new HubConnectionBuilder().WithLoggerFactory(LoggerFactory); - var testConnectionFactory = new ReconnectingConnectionFactory(); - builder.Services.AddSingleton(testConnectionFactory); - - var mockReconnectPolicy = new Mock(); - mockReconnectPolicy.Setup(p => p.NextRetryDelay(It.IsAny())).Returns(null); - builder.WithAutomaticReconnect(mockReconnectPolicy.Object); - - await using var hubConnection = builder.Build(); - var reconnectingCount = 0; - var reconnectedCount = 0; - var closedErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - - hubConnection.Reconnecting += error => - { - reconnectingCount++; - return Task.CompletedTask; - }; - - hubConnection.Reconnected += connectionId => - { - reconnectedCount++; - return Task.CompletedTask; - }; - - hubConnection.Closed += error => - { - closedErrorTcs.SetResult(error); - return Task.CompletedTask; - }; - - await hubConnection.StartAsync().OrTimeout(); - - var firstException = new Exception(); - (await testConnectionFactory.GetNextOrCurrentTestConnection()).CompleteFromTransport(firstException); - - await closedErrorTcs.Task.OrTimeout(); - - Assert.Equal(0, reconnectingCount); - Assert.Equal(0, reconnectedCount); - } - } - - [Fact] - public async Task ReconnectDoesNotStartIfConnectionIsLostDuringInitialHandshake() - { - bool ExpectedErrors(WriteContext writeContext) - { - return writeContext.LoggerName == typeof(HubConnection).FullName && - (writeContext.EventId.Name == "ErrorReceivingHandshakeResponse" || - writeContext.EventId.Name == "ErrorStartingConnection"); - } - - using (StartVerifiableLog(ExpectedErrors)) - { - var builder = new HubConnectionBuilder().WithLoggerFactory(LoggerFactory); - var testConnectionFactory = new ReconnectingConnectionFactory(() => new TestConnection(autoHandshake: false)); - builder.Services.AddSingleton(testConnectionFactory); - - var mockReconnectPolicy = new Mock(); - mockReconnectPolicy.Setup(p => p.NextRetryDelay(It.IsAny())).Returns(null); - builder.WithAutomaticReconnect(mockReconnectPolicy.Object); - - await using var hubConnection = builder.Build(); - var reconnectingCount = 0; - var reconnectedCount = 0; - var closedCount = 0; - - hubConnection.Reconnecting += error => - { - reconnectingCount++; - return Task.CompletedTask; - }; - - hubConnection.Reconnected += connectionId => - { - reconnectedCount++; - return Task.CompletedTask; - }; - - hubConnection.Closed += error => - { - closedCount++; - return Task.CompletedTask; - }; - - var startTask = hubConnection.StartAsync().OrTimeout(); - - var firstException = new Exception(); - (await testConnectionFactory.GetNextOrCurrentTestConnection()).CompleteFromTransport(firstException); - - Assert.Same(firstException, await Assert.ThrowsAsync(() => startTask).OrTimeout()); - Assert.Equal(HubConnectionState.Disconnected, hubConnection.State); - Assert.Equal(0, reconnectingCount); - Assert.Equal(0, reconnectedCount); - Assert.Equal(0, closedCount); - } - } - - [Fact] - public async Task ReconnectContinuesIfConnectionLostDuringReconnectHandshake() - { - bool ExpectedErrors(WriteContext writeContext) - { - return writeContext.LoggerName == typeof(HubConnection).FullName && - (writeContext.EventId.Name == "ServerDisconnectedWithError" || - writeContext.EventId.Name == "ReconnectingWithError" || - writeContext.EventId.Name == "ErrorReceivingHandshakeResponse" || - writeContext.EventId.Name == "ErrorStartingConnection"); - } - - using (StartVerifiableLog(ExpectedErrors)) - { - var builder = new HubConnectionBuilder().WithLoggerFactory(LoggerFactory); - var testConnectionFactory = new ReconnectingConnectionFactory(() => new TestConnection(autoHandshake: false)); - builder.Services.AddSingleton(testConnectionFactory); - - var retryContexts = new List(); - var secondRetryDelayTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var mockReconnectPolicy = new Mock(); - mockReconnectPolicy.Setup(p => p.NextRetryDelay(It.IsAny())).Returns(context => - { - retryContexts.Add(context); - - if (retryContexts.Count == 2) + async Task OnTestConnectionStart() { - secondRetryDelayTcs.SetResult(null); + startCallCount++; + + // Only fail the first reconnect attempt. + if (startCallCount == 2) + { + await failReconnectTcs.Task; + } + + var testConnection = await testConnectionFactory.GetNextOrCurrentTestConnection(); + + // Change the connection id before reconnecting. + if (startCallCount == 3) + { + testConnection.ConnectionId = reconnectedConnectionId; + } + else + { + testConnection.ConnectionId = originalConnectionId; + } } - return TimeSpan.Zero; - }); - builder.WithAutomaticReconnect(mockReconnectPolicy.Object); + testConnectionFactory = new ReconnectingConnectionFactory(() => new TestConnection(OnTestConnectionStart)); + builder.Services.AddSingleton(testConnectionFactory); - await using var hubConnection = builder.Build(); - var reconnectingCount = 0; - var reconnectedCount = 0; - var reconnectingErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var reconnectedConnectionIdTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var closedErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - - hubConnection.Reconnecting += error => - { - reconnectingCount++; - reconnectingErrorTcs.SetResult(error); - return Task.CompletedTask; - }; - - hubConnection.Reconnected += connectionId => - { - reconnectedCount++; - reconnectedConnectionIdTcs.SetResult(connectionId); - return Task.CompletedTask; - }; - - hubConnection.Closed += error => - { - closedErrorTcs.SetResult(error); - return Task.CompletedTask; - }; - - var startTask = hubConnection.StartAsync(); - - // Complete handshake - var currentTestConnection = await testConnectionFactory.GetNextOrCurrentTestConnection(); - await currentTestConnection.ReadHandshakeAndSendResponseAsync().OrTimeout(); - - await startTask.OrTimeout(); - - var firstException = new Exception(); - currentTestConnection.CompleteFromTransport(firstException); - - Assert.Same(firstException, await reconnectingErrorTcs.Task.OrTimeout()); - Assert.Single(retryContexts); - Assert.Same(firstException, retryContexts[0].RetryReason); - Assert.Equal(0, retryContexts[0].PreviousRetryCount); - Assert.Equal(TimeSpan.Zero, retryContexts[0].ElapsedTime); - - var secondException = new Exception(); - (await testConnectionFactory.GetNextOrCurrentTestConnection()).CompleteFromTransport(secondException); - - await secondRetryDelayTcs.Task.OrTimeout(); - - Assert.Equal(2, retryContexts.Count); - Assert.Same(secondException, retryContexts[1].RetryReason); - Assert.Equal(1, retryContexts[1].PreviousRetryCount); - Assert.True(TimeSpan.Zero <= retryContexts[0].ElapsedTime); - - // Complete handshake - currentTestConnection = await testConnectionFactory.GetNextOrCurrentTestConnection(); - await currentTestConnection.ReadHandshakeAndSendResponseAsync().OrTimeout(); - await reconnectedConnectionIdTcs.Task.OrTimeout(); - - Assert.Equal(1, reconnectingCount); - Assert.Equal(1, reconnectedCount); - Assert.Equal(TaskStatus.WaitingForActivation, closedErrorTcs.Task.Status); - - await hubConnection.StopAsync().OrTimeout(); - - var closeError = await closedErrorTcs.Task.OrTimeout(); - Assert.Null(closeError); - Assert.Equal(1, reconnectingCount); - Assert.Equal(1, reconnectedCount); - } - } - - [Fact] - public async Task ReconnectContinuesIfInvalidHandshakeResponse() - { - bool ExpectedErrors(WriteContext writeContext) - { - return writeContext.LoggerName == typeof(HubConnection).FullName && - (writeContext.EventId.Name == "ServerDisconnectedWithError" || - writeContext.EventId.Name == "ReconnectingWithError" || - writeContext.EventId.Name == "ErrorReceivingHandshakeResponse" || - writeContext.EventId.Name == "HandshakeServerError" || - writeContext.EventId.Name == "ErrorStartingConnection"); - } - - using (StartVerifiableLog(ExpectedErrors)) - { - var builder = new HubConnectionBuilder().WithLoggerFactory(LoggerFactory); - var testConnectionFactory = new ReconnectingConnectionFactory(() => new TestConnection(autoHandshake: false)); - builder.Services.AddSingleton(testConnectionFactory); - - var retryContexts = new List(); - var secondRetryDelayTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var mockReconnectPolicy = new Mock(); - mockReconnectPolicy.Setup(p => p.NextRetryDelay(It.IsAny())).Returns(context => - { - retryContexts.Add(context); - - if (retryContexts.Count == 2) + var retryContexts = new List(); + var mockReconnectPolicy = new Mock(); + mockReconnectPolicy.Setup(p => p.NextRetryDelay(It.IsAny())).Returns(context => { - secondRetryDelayTcs.SetResult(null); + retryContexts.Add(context); + return TimeSpan.Zero; + }); + builder.WithAutomaticReconnect(mockReconnectPolicy.Object); + + await using var hubConnection = builder.Build(); + var reconnectingCount = 0; + var reconnectedCount = 0; + var reconnectingErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var reconnectedConnectionIdTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var closedErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + hubConnection.Reconnecting += error => + { + reconnectingCount++; + reconnectingErrorTcs.SetResult(error); + return Task.CompletedTask; + }; + + hubConnection.Reconnected += connectionId => + { + reconnectedCount++; + reconnectedConnectionIdTcs.SetResult(connectionId); + return Task.CompletedTask; + }; + + hubConnection.Closed += error => + { + closedErrorTcs.SetResult(error); + return Task.CompletedTask; + }; + + await hubConnection.StartAsync().OrTimeout(); + + Assert.Same(originalConnectionId, hubConnection.ConnectionId); + + var firstException = new Exception(); + (await testConnectionFactory.GetNextOrCurrentTestConnection()).CompleteFromTransport(firstException); + + Assert.Same(firstException, await reconnectingErrorTcs.Task.OrTimeout()); + Assert.Single(retryContexts); + Assert.Same(firstException, retryContexts[0].RetryReason); + Assert.Equal(0, retryContexts[0].PreviousRetryCount); + Assert.Equal(TimeSpan.Zero, retryContexts[0].ElapsedTime); + + var reconnectException = new Exception(); + failReconnectTcs.SetException(reconnectException); + + Assert.Same(reconnectedConnectionId, await reconnectedConnectionIdTcs.Task.OrTimeout()); + + Assert.Equal(2, retryContexts.Count); + Assert.Same(reconnectException, retryContexts[1].RetryReason); + Assert.Equal(1, retryContexts[1].PreviousRetryCount); + Assert.True(TimeSpan.Zero <= retryContexts[1].ElapsedTime); + + await hubConnection.StopAsync().OrTimeout(); + + var closeError = await closedErrorTcs.Task.OrTimeout(); + Assert.Null(closeError); + Assert.Equal(1, reconnectingCount); + Assert.Equal(1, reconnectedCount); + } + } + + [Fact] + public async Task StopsIfTheReconnectPolicyReturnsNull() + { + bool ExpectedErrors(WriteContext writeContext) + { + return writeContext.LoggerName == typeof(HubConnection).FullName && + (writeContext.EventId.Name == "ServerDisconnectedWithError" || + writeContext.EventId.Name == "ReconnectingWithError"); + } + + var failReconnectTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + using (StartVerifiableLog(ExpectedErrors)) + { + var builder = new HubConnectionBuilder().WithLoggerFactory(LoggerFactory); + var startCallCount = 0; + + Task OnTestConnectionStart() + { + startCallCount++; + + // Fail the first reconnect attempts. + if (startCallCount > 1) + { + return failReconnectTcs.Task; + } + + return Task.CompletedTask; } - return TimeSpan.Zero; - }); - builder.WithAutomaticReconnect(mockReconnectPolicy.Object); + var testConnectionFactory = new ReconnectingConnectionFactory(() => new TestConnection(OnTestConnectionStart)); + builder.Services.AddSingleton(testConnectionFactory); - await using var hubConnection = builder.Build(); - var reconnectingCount = 0; - var reconnectedCount = 0; - var reconnectingErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var reconnectedConnectionIdTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var closedErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var retryContexts = new List(); + var mockReconnectPolicy = new Mock(); + mockReconnectPolicy.Setup(p => p.NextRetryDelay(It.IsAny())).Returns(context => + { + retryContexts.Add(context); + return context.PreviousRetryCount == 0 ? TimeSpan.Zero : (TimeSpan?)null; + }); + builder.WithAutomaticReconnect(mockReconnectPolicy.Object); - hubConnection.Reconnecting += error => - { - reconnectingCount++; - reconnectingErrorTcs.SetResult(error); - return Task.CompletedTask; - }; + await using var hubConnection = builder.Build(); + var reconnectingCount = 0; + var reconnectedCount = 0; + var reconnectingErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var closedErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - hubConnection.Reconnected += connectionId => - { - reconnectedCount++; - reconnectedConnectionIdTcs.SetResult(connectionId); - return Task.CompletedTask; - }; + hubConnection.Reconnecting += error => + { + reconnectingCount++; + reconnectingErrorTcs.SetResult(error); + return Task.CompletedTask; + }; - hubConnection.Closed += error => - { - closedErrorTcs.SetResult(error); - return Task.CompletedTask; - }; + hubConnection.Reconnected += connectionId => + { + reconnectedCount++; + return Task.CompletedTask; + }; - var startTask = hubConnection.StartAsync(); + hubConnection.Closed += error => + { + closedErrorTcs.SetResult(error); + return Task.CompletedTask; + }; - // Complete handshake - var currentTestConnection = await testConnectionFactory.GetNextOrCurrentTestConnection(); - await currentTestConnection.ReadHandshakeAndSendResponseAsync().OrTimeout(); + await hubConnection.StartAsync().OrTimeout(); - await startTask.OrTimeout(); + var firstException = new Exception(); + (await testConnectionFactory.GetNextOrCurrentTestConnection()).CompleteFromTransport(firstException); - var firstException = new Exception(); - currentTestConnection.CompleteFromTransport(firstException); + Assert.Same(firstException, await reconnectingErrorTcs.Task.OrTimeout()); + Assert.Single(retryContexts); + Assert.Same(firstException, retryContexts[0].RetryReason); + Assert.Equal(0, retryContexts[0].PreviousRetryCount); + Assert.Equal(TimeSpan.Zero, retryContexts[0].ElapsedTime); - Assert.Same(firstException, await reconnectingErrorTcs.Task.OrTimeout()); - Assert.Single(retryContexts); - Assert.Same(firstException, retryContexts[0].RetryReason); - Assert.Equal(0, retryContexts[0].PreviousRetryCount); - Assert.Equal(TimeSpan.Zero, retryContexts[0].ElapsedTime); + var reconnectException = new Exception(); + failReconnectTcs.SetException(reconnectException); - // Respond to handshake with error. - currentTestConnection = await testConnectionFactory.GetNextOrCurrentTestConnection(); - await currentTestConnection.ReadSentTextMessageAsync().OrTimeout(); + var closeError = await closedErrorTcs.Task.OrTimeout(); + Assert.IsType(closeError); - var output = MemoryBufferWriter.Get(); - try - { - HandshakeProtocol.WriteResponseMessage(new HandshakeResponseMessage("Error!"), output); - await currentTestConnection.Application.Output.WriteAsync(output.ToArray()).OrTimeout(); + Assert.Equal(2, retryContexts.Count); + Assert.Same(reconnectException, retryContexts[1].RetryReason); + Assert.Equal(1, retryContexts[1].PreviousRetryCount); + Assert.True(TimeSpan.Zero <= retryContexts[1].ElapsedTime); + + Assert.Equal(1, reconnectingCount); + Assert.Equal(0, reconnectedCount); } - finally - { - MemoryBufferWriter.Return(output); - } - - await secondRetryDelayTcs.Task.OrTimeout(); - - Assert.Equal(2, retryContexts.Count); - Assert.IsType(retryContexts[1].RetryReason); - Assert.Equal(1, retryContexts[1].PreviousRetryCount); - Assert.True(TimeSpan.Zero <= retryContexts[0].ElapsedTime); - - // Complete handshake - - currentTestConnection = await testConnectionFactory.GetNextOrCurrentTestConnection(); - await currentTestConnection.ReadHandshakeAndSendResponseAsync().OrTimeout(); - await reconnectedConnectionIdTcs.Task.OrTimeout(); - - Assert.Equal(1, reconnectingCount); - Assert.Equal(1, reconnectedCount); - Assert.Equal(TaskStatus.WaitingForActivation, closedErrorTcs.Task.Status); - - await hubConnection.StopAsync().OrTimeout(); - - var closeError = await closedErrorTcs.Task.OrTimeout(); - Assert.Null(closeError); - Assert.Equal(1, reconnectingCount); - Assert.Equal(1, reconnectedCount); - } - } - - [Fact] - public async Task ReconnectCanBeStoppedWhileRestartingUnderlyingConnection() - { - bool ExpectedErrors(WriteContext writeContext) - { - return writeContext.LoggerName == typeof(HubConnection).FullName && - (writeContext.EventId.Name == "ServerDisconnectedWithError" || - writeContext.EventId.Name == "ReconnectingWithError" || - writeContext.EventId.Name == "ErrorReceivingHandshakeResponse" || - writeContext.EventId.Name == "ErrorStartingConnection"); } - using (StartVerifiableLog(ExpectedErrors)) + [Fact] + public async Task CanHappenMultipleTimes() { - var builder = new HubConnectionBuilder().WithLoggerFactory(LoggerFactory); - var connectionStartTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - - async Task OnTestConnectionStart() + bool ExpectedErrors(WriteContext writeContext) { + return writeContext.LoggerName == typeof(HubConnection).FullName && + (writeContext.EventId.Name == "ServerDisconnectedWithError" || + writeContext.EventId.Name == "ReconnectingWithError"); + } + + using (StartVerifiableLog(ExpectedErrors)) + { + var builder = new HubConnectionBuilder().WithLoggerFactory(LoggerFactory); + var testConnectionFactory = new ReconnectingConnectionFactory(); + builder.Services.AddSingleton(testConnectionFactory); + + var retryContexts = new List(); + var mockReconnectPolicy = new Mock(); + mockReconnectPolicy.Setup(p => p.NextRetryDelay(It.IsAny())).Returns(context => + { + retryContexts.Add(context); + return TimeSpan.Zero; + }); + builder.WithAutomaticReconnect(mockReconnectPolicy.Object); + + await using var hubConnection = builder.Build(); + var reconnectingCount = 0; + var reconnectedCount = 0; + var reconnectingErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var reconnectedConnectionIdTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var closedErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + hubConnection.Reconnecting += error => + { + reconnectingCount++; + reconnectingErrorTcs.SetResult(error); + return Task.CompletedTask; + }; + + hubConnection.Reconnected += connectionId => + { + reconnectedCount++; + reconnectedConnectionIdTcs.SetResult(connectionId); + return Task.CompletedTask; + }; + + hubConnection.Closed += error => + { + closedErrorTcs.SetResult(error); + return Task.CompletedTask; + }; + + await hubConnection.StartAsync().OrTimeout(); + + var firstException = new Exception(); + (await testConnectionFactory.GetNextOrCurrentTestConnection()).CompleteFromTransport(firstException); + + Assert.Same(firstException, await reconnectingErrorTcs.Task.OrTimeout()); + Assert.Single(retryContexts); + Assert.Same(firstException, retryContexts[0].RetryReason); + Assert.Equal(0, retryContexts[0].PreviousRetryCount); + Assert.Equal(TimeSpan.Zero, retryContexts[0].ElapsedTime); + + await reconnectedConnectionIdTcs.Task.OrTimeout(); + + Assert.Equal(1, reconnectingCount); + Assert.Equal(1, reconnectedCount); + Assert.Equal(TaskStatus.WaitingForActivation, closedErrorTcs.Task.Status); + + reconnectingErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + reconnectedConnectionIdTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + var secondException = new Exception(); + (await testConnectionFactory.GetNextOrCurrentTestConnection()).CompleteFromTransport(secondException); + + Assert.Same(secondException, await reconnectingErrorTcs.Task.OrTimeout()); + Assert.Equal(2, retryContexts.Count); + Assert.Same(secondException, retryContexts[1].RetryReason); + Assert.Equal(0, retryContexts[1].PreviousRetryCount); + Assert.Equal(TimeSpan.Zero, retryContexts[1].ElapsedTime); + + await reconnectedConnectionIdTcs.Task.OrTimeout(); + + Assert.Equal(2, reconnectingCount); + Assert.Equal(2, reconnectedCount); + Assert.Equal(TaskStatus.WaitingForActivation, closedErrorTcs.Task.Status); + + await hubConnection.StopAsync().OrTimeout(); + + var closeError = await closedErrorTcs.Task.OrTimeout(); + Assert.Null(closeError); + Assert.Equal(2, reconnectingCount); + Assert.Equal(2, reconnectedCount); + } + } + + [Fact] + public async Task EventsNotFiredIfFirstRetryDelayIsNull() + { + bool ExpectedErrors(WriteContext writeContext) + { + return writeContext.LoggerName == typeof(HubConnection).FullName && + writeContext.EventId.Name == "ServerDisconnectedWithError"; + } + + using (StartVerifiableLog(ExpectedErrors)) + { + var builder = new HubConnectionBuilder().WithLoggerFactory(LoggerFactory); + var testConnectionFactory = new ReconnectingConnectionFactory(); + builder.Services.AddSingleton(testConnectionFactory); + + var mockReconnectPolicy = new Mock(); + mockReconnectPolicy.Setup(p => p.NextRetryDelay(It.IsAny())).Returns(null); + builder.WithAutomaticReconnect(mockReconnectPolicy.Object); + + await using var hubConnection = builder.Build(); + var reconnectingCount = 0; + var reconnectedCount = 0; + var closedErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + hubConnection.Reconnecting += error => + { + reconnectingCount++; + return Task.CompletedTask; + }; + + hubConnection.Reconnected += connectionId => + { + reconnectedCount++; + return Task.CompletedTask; + }; + + hubConnection.Closed += error => + { + closedErrorTcs.SetResult(error); + return Task.CompletedTask; + }; + + await hubConnection.StartAsync().OrTimeout(); + + var firstException = new Exception(); + (await testConnectionFactory.GetNextOrCurrentTestConnection()).CompleteFromTransport(firstException); + + await closedErrorTcs.Task.OrTimeout(); + + Assert.Equal(0, reconnectingCount); + Assert.Equal(0, reconnectedCount); + } + } + + [Fact] + public async Task DoesNotStartIfConnectionIsLostDuringInitialHandshake() + { + bool ExpectedErrors(WriteContext writeContext) + { + return writeContext.LoggerName == typeof(HubConnection).FullName && + (writeContext.EventId.Name == "ErrorReceivingHandshakeResponse" || + writeContext.EventId.Name == "ErrorStartingConnection"); + } + + using (StartVerifiableLog(ExpectedErrors)) + { + var builder = new HubConnectionBuilder().WithLoggerFactory(LoggerFactory); + var testConnectionFactory = new ReconnectingConnectionFactory(() => new TestConnection(autoHandshake: false)); + builder.Services.AddSingleton(testConnectionFactory); + + var mockReconnectPolicy = new Mock(); + mockReconnectPolicy.Setup(p => p.NextRetryDelay(It.IsAny())).Returns(null); + builder.WithAutomaticReconnect(mockReconnectPolicy.Object); + + await using var hubConnection = builder.Build(); + var reconnectingCount = 0; + var reconnectedCount = 0; + var closedCount = 0; + + hubConnection.Reconnecting += error => + { + reconnectingCount++; + return Task.CompletedTask; + }; + + hubConnection.Reconnected += connectionId => + { + reconnectedCount++; + return Task.CompletedTask; + }; + + hubConnection.Closed += error => + { + closedCount++; + return Task.CompletedTask; + }; + + var startTask = hubConnection.StartAsync().OrTimeout(); + + var firstException = new Exception(); + (await testConnectionFactory.GetNextOrCurrentTestConnection()).CompleteFromTransport(firstException); + + Assert.Same(firstException, await Assert.ThrowsAsync(() => startTask).OrTimeout()); + Assert.Equal(HubConnectionState.Disconnected, hubConnection.State); + Assert.Equal(0, reconnectingCount); + Assert.Equal(0, reconnectedCount); + Assert.Equal(0, closedCount); + } + } + + [Fact] + public async Task ContinuesIfConnectionLostDuringReconnectHandshake() + { + bool ExpectedErrors(WriteContext writeContext) + { + return writeContext.LoggerName == typeof(HubConnection).FullName && + (writeContext.EventId.Name == "ServerDisconnectedWithError" || + writeContext.EventId.Name == "ReconnectingWithError" || + writeContext.EventId.Name == "ErrorReceivingHandshakeResponse" || + writeContext.EventId.Name == "ErrorStartingConnection"); + } + + using (StartVerifiableLog(ExpectedErrors)) + { + var builder = new HubConnectionBuilder().WithLoggerFactory(LoggerFactory); + var testConnectionFactory = new ReconnectingConnectionFactory(() => new TestConnection(autoHandshake: false)); + builder.Services.AddSingleton(testConnectionFactory); + + var retryContexts = new List(); + var secondRetryDelayTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var mockReconnectPolicy = new Mock(); + mockReconnectPolicy.Setup(p => p.NextRetryDelay(It.IsAny())).Returns(context => + { + retryContexts.Add(context); + + if (retryContexts.Count == 2) + { + secondRetryDelayTcs.SetResult(null); + } + + return TimeSpan.Zero; + }); + builder.WithAutomaticReconnect(mockReconnectPolicy.Object); + + await using var hubConnection = builder.Build(); + var reconnectingCount = 0; + var reconnectedCount = 0; + var reconnectingErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var reconnectedConnectionIdTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var closedErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + hubConnection.Reconnecting += error => + { + reconnectingCount++; + reconnectingErrorTcs.SetResult(error); + return Task.CompletedTask; + }; + + hubConnection.Reconnected += connectionId => + { + reconnectedCount++; + reconnectedConnectionIdTcs.SetResult(connectionId); + return Task.CompletedTask; + }; + + hubConnection.Closed += error => + { + closedErrorTcs.SetResult(error); + return Task.CompletedTask; + }; + + var startTask = hubConnection.StartAsync(); + + // Complete handshake + var currentTestConnection = await testConnectionFactory.GetNextOrCurrentTestConnection(); + await currentTestConnection.ReadHandshakeAndSendResponseAsync().OrTimeout(); + + await startTask.OrTimeout(); + + var firstException = new Exception(); + currentTestConnection.CompleteFromTransport(firstException); + + Assert.Same(firstException, await reconnectingErrorTcs.Task.OrTimeout()); + Assert.Single(retryContexts); + Assert.Same(firstException, retryContexts[0].RetryReason); + Assert.Equal(0, retryContexts[0].PreviousRetryCount); + Assert.Equal(TimeSpan.Zero, retryContexts[0].ElapsedTime); + + var secondException = new Exception(); + (await testConnectionFactory.GetNextOrCurrentTestConnection()).CompleteFromTransport(secondException); + + await secondRetryDelayTcs.Task.OrTimeout(); + + Assert.Equal(2, retryContexts.Count); + Assert.Same(secondException, retryContexts[1].RetryReason); + Assert.Equal(1, retryContexts[1].PreviousRetryCount); + Assert.True(TimeSpan.Zero <= retryContexts[0].ElapsedTime); + + // Complete handshake + currentTestConnection = await testConnectionFactory.GetNextOrCurrentTestConnection(); + await currentTestConnection.ReadHandshakeAndSendResponseAsync().OrTimeout(); + await reconnectedConnectionIdTcs.Task.OrTimeout(); + + Assert.Equal(1, reconnectingCount); + Assert.Equal(1, reconnectedCount); + Assert.Equal(TaskStatus.WaitingForActivation, closedErrorTcs.Task.Status); + + await hubConnection.StopAsync().OrTimeout(); + + var closeError = await closedErrorTcs.Task.OrTimeout(); + Assert.Null(closeError); + Assert.Equal(1, reconnectingCount); + Assert.Equal(1, reconnectedCount); + } + } + + [Fact] + public async Task ContinuesIfInvalidHandshakeResponse() + { + bool ExpectedErrors(WriteContext writeContext) + { + return writeContext.LoggerName == typeof(HubConnection).FullName && + (writeContext.EventId.Name == "ServerDisconnectedWithError" || + writeContext.EventId.Name == "ReconnectingWithError" || + writeContext.EventId.Name == "ErrorReceivingHandshakeResponse" || + writeContext.EventId.Name == "HandshakeServerError" || + writeContext.EventId.Name == "ErrorStartingConnection"); + } + + using (StartVerifiableLog(ExpectedErrors)) + { + var builder = new HubConnectionBuilder().WithLoggerFactory(LoggerFactory); + var testConnectionFactory = new ReconnectingConnectionFactory(() => new TestConnection(autoHandshake: false)); + builder.Services.AddSingleton(testConnectionFactory); + + var retryContexts = new List(); + var secondRetryDelayTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var mockReconnectPolicy = new Mock(); + mockReconnectPolicy.Setup(p => p.NextRetryDelay(It.IsAny())).Returns(context => + { + retryContexts.Add(context); + + if (retryContexts.Count == 2) + { + secondRetryDelayTcs.SetResult(null); + } + + return TimeSpan.Zero; + }); + builder.WithAutomaticReconnect(mockReconnectPolicy.Object); + + await using var hubConnection = builder.Build(); + var reconnectingCount = 0; + var reconnectedCount = 0; + var reconnectingErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var reconnectedConnectionIdTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var closedErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + hubConnection.Reconnecting += error => + { + reconnectingCount++; + reconnectingErrorTcs.SetResult(error); + return Task.CompletedTask; + }; + + hubConnection.Reconnected += connectionId => + { + reconnectedCount++; + reconnectedConnectionIdTcs.SetResult(connectionId); + return Task.CompletedTask; + }; + + hubConnection.Closed += error => + { + closedErrorTcs.SetResult(error); + return Task.CompletedTask; + }; + + var startTask = hubConnection.StartAsync(); + + // Complete handshake + var currentTestConnection = await testConnectionFactory.GetNextOrCurrentTestConnection(); + await currentTestConnection.ReadHandshakeAndSendResponseAsync().OrTimeout(); + + await startTask.OrTimeout(); + + var firstException = new Exception(); + currentTestConnection.CompleteFromTransport(firstException); + + Assert.Same(firstException, await reconnectingErrorTcs.Task.OrTimeout()); + Assert.Single(retryContexts); + Assert.Same(firstException, retryContexts[0].RetryReason); + Assert.Equal(0, retryContexts[0].PreviousRetryCount); + Assert.Equal(TimeSpan.Zero, retryContexts[0].ElapsedTime); + + // Respond to handshake with error. + currentTestConnection = await testConnectionFactory.GetNextOrCurrentTestConnection(); + await currentTestConnection.ReadSentTextMessageAsync().OrTimeout(); + + var output = MemoryBufferWriter.Get(); try { - await connectionStartTcs.Task; + HandshakeProtocol.WriteResponseMessage(new HandshakeResponseMessage("Error!"), output); + await currentTestConnection.Application.Output.WriteAsync(output.ToArray()).OrTimeout(); } finally { - connectionStartTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + MemoryBufferWriter.Return(output); + } + + await secondRetryDelayTcs.Task.OrTimeout(); + + Assert.Equal(2, retryContexts.Count); + Assert.IsType(retryContexts[1].RetryReason); + Assert.Equal(1, retryContexts[1].PreviousRetryCount); + Assert.True(TimeSpan.Zero <= retryContexts[0].ElapsedTime); + + // Complete handshake + + currentTestConnection = await testConnectionFactory.GetNextOrCurrentTestConnection(); + await currentTestConnection.ReadHandshakeAndSendResponseAsync().OrTimeout(); + await reconnectedConnectionIdTcs.Task.OrTimeout(); + + Assert.Equal(1, reconnectingCount); + Assert.Equal(1, reconnectedCount); + Assert.Equal(TaskStatus.WaitingForActivation, closedErrorTcs.Task.Status); + + await hubConnection.StopAsync().OrTimeout(); + + var closeError = await closedErrorTcs.Task.OrTimeout(); + Assert.Null(closeError); + Assert.Equal(1, reconnectingCount); + Assert.Equal(1, reconnectedCount); + } + } + + [Fact] + public async Task CanBeStoppedWhileRestartingUnderlyingConnection() + { + bool ExpectedErrors(WriteContext writeContext) + { + return writeContext.LoggerName == typeof(HubConnection).FullName && + (writeContext.EventId.Name == "ServerDisconnectedWithError" || + writeContext.EventId.Name == "ReconnectingWithError" || + writeContext.EventId.Name == "ErrorHandshakeCanceled" || + writeContext.EventId.Name == "ErrorStartingConnection"); + } + + using (StartVerifiableLog(ExpectedErrors)) + { + var builder = new HubConnectionBuilder().WithLoggerFactory(LoggerFactory); + var connectionStartTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + async Task OnTestConnectionStart() + { + try + { + await connectionStartTcs.Task; + } + finally + { + connectionStartTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + } + } + + var testConnectionFactory = new ReconnectingConnectionFactory(() => new TestConnection(OnTestConnectionStart)); + builder.Services.AddSingleton(testConnectionFactory); + + var retryContexts = new List(); + var mockReconnectPolicy = new Mock(); + mockReconnectPolicy.Setup(p => p.NextRetryDelay(It.IsAny())).Returns(context => + { + retryContexts.Add(context); + return TimeSpan.Zero; + }); + builder.WithAutomaticReconnect(mockReconnectPolicy.Object); + + await using var hubConnection = builder.Build(); + var reconnectingCount = 0; + var reconnectedCount = 0; + var reconnectingErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var closedErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + hubConnection.Reconnecting += error => + { + reconnectingCount++; + reconnectingErrorTcs.SetResult(error); + return Task.CompletedTask; + }; + + hubConnection.Reconnected += connectionId => + { + reconnectedCount++; + return Task.CompletedTask; + }; + + hubConnection.Closed += error => + { + closedErrorTcs.SetResult(error); + return Task.CompletedTask; + }; + + // Allow the first connection to start successfully. + connectionStartTcs.SetResult(null); + await hubConnection.StartAsync().OrTimeout(); + + var firstException = new Exception(); + (await testConnectionFactory.GetNextOrCurrentTestConnection()).CompleteFromTransport(firstException); + + Assert.Same(firstException, await reconnectingErrorTcs.Task.OrTimeout()); + Assert.Single(retryContexts); + Assert.Same(firstException, retryContexts[0].RetryReason); + Assert.Equal(0, retryContexts[0].PreviousRetryCount); + Assert.Equal(TimeSpan.Zero, retryContexts[0].ElapsedTime); + + var secondException = new Exception(); + var stopTask = hubConnection.StopAsync(); + connectionStartTcs.SetResult(null); + + Assert.IsType(await closedErrorTcs.Task.OrTimeout()); + Assert.Single(retryContexts); + Assert.Equal(1, reconnectingCount); + Assert.Equal(0, reconnectedCount); + await stopTask.OrTimeout(); + } + } + + [Fact] + public async Task CanBeStoppedDuringRetryDelay() + { + bool ExpectedErrors(WriteContext writeContext) + { + return writeContext.LoggerName == typeof(HubConnection).FullName && + (writeContext.EventId.Name == "ServerDisconnectedWithError" || + writeContext.EventId.Name == "ReconnectingWithError" || + writeContext.EventId.Name == "ErrorReceivingHandshakeResponse" || + writeContext.EventId.Name == "ErrorStartingConnection"); + } + + using (StartVerifiableLog(ExpectedErrors)) + { + var builder = new HubConnectionBuilder().WithLoggerFactory(LoggerFactory); + var testConnectionFactory = new ReconnectingConnectionFactory(); + builder.Services.AddSingleton(testConnectionFactory); + + var retryContexts = new List(); + var mockReconnectPolicy = new Mock(); + mockReconnectPolicy.Setup(p => p.NextRetryDelay(It.IsAny())).Returns(context => + { + retryContexts.Add(context); + // Hopefully this test never takes over a minute. + return TimeSpan.FromMinutes(1); + }); + builder.WithAutomaticReconnect(mockReconnectPolicy.Object); + + await using var hubConnection = builder.Build(); + var reconnectingCount = 0; + var reconnectedCount = 0; + var reconnectingErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var closedErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + hubConnection.Reconnecting += error => + { + reconnectingCount++; + reconnectingErrorTcs.SetResult(error); + return Task.CompletedTask; + }; + + hubConnection.Reconnected += connectionId => + { + reconnectedCount++; + return Task.CompletedTask; + }; + + hubConnection.Closed += error => + { + closedErrorTcs.SetResult(error); + return Task.CompletedTask; + }; + + // Allow the first connection to start successfully. + await hubConnection.StartAsync().OrTimeout(); + + var firstException = new Exception(); + (await testConnectionFactory.GetNextOrCurrentTestConnection()).CompleteFromTransport(firstException); + + Assert.Same(firstException, await reconnectingErrorTcs.Task.OrTimeout()); + Assert.Single(retryContexts); + Assert.Same(firstException, retryContexts[0].RetryReason); + Assert.Equal(0, retryContexts[0].PreviousRetryCount); + Assert.Equal(TimeSpan.Zero, retryContexts[0].ElapsedTime); + + await hubConnection.StopAsync().OrTimeout(); + + Assert.IsType(await closedErrorTcs.Task.OrTimeout()); + Assert.Single(retryContexts); + Assert.Equal(1, reconnectingCount); + Assert.Equal(0, reconnectedCount); + } + } + + private class ReconnectingConnectionFactory : IConnectionFactory + { + public readonly Func _testConnectionFactory; + public TaskCompletionSource _testConnectionTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + public ReconnectingConnectionFactory() + : this(() => new TestConnection()) + { + } + + public ReconnectingConnectionFactory(Func testConnectionFactory) + { + _testConnectionFactory = testConnectionFactory; + } + + public Task GetNextOrCurrentTestConnection() + { + return _testConnectionTcs.Task; + } + + public async Task ConnectAsync(TransferFormat transferFormat, CancellationToken cancellationToken = default) + { + var testConnection = _testConnectionFactory(); + + _testConnectionTcs.SetResult(testConnection); + + try + { + return await testConnection.StartAsync(transferFormat); + } + catch + { + _testConnectionTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + throw; } } - var testConnectionFactory = new ReconnectingConnectionFactory(() => new TestConnection(OnTestConnectionStart)); - builder.Services.AddSingleton(testConnectionFactory); - - var retryContexts = new List(); - var mockReconnectPolicy = new Mock(); - mockReconnectPolicy.Setup(p => p.NextRetryDelay(It.IsAny())).Returns(context => + public async Task DisposeAsync(ConnectionContext connection) { - retryContexts.Add(context); - return TimeSpan.Zero; - }); - builder.WithAutomaticReconnect(mockReconnectPolicy.Object); + var disposingTestConnection = await _testConnectionTcs.Task; - await using var hubConnection = builder.Build(); - var reconnectingCount = 0; - var reconnectedCount = 0; - var reconnectingErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var closedErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - - hubConnection.Reconnecting += error => - { - reconnectingCount++; - reconnectingErrorTcs.SetResult(error); - return Task.CompletedTask; - }; - - hubConnection.Reconnected += connectionId => - { - reconnectedCount++; - return Task.CompletedTask; - }; - - hubConnection.Closed += error => - { - closedErrorTcs.SetResult(error); - return Task.CompletedTask; - }; - - // Allow the first connection to start successfully. - connectionStartTcs.SetResult(null); - await hubConnection.StartAsync().OrTimeout(); - - var firstException = new Exception(); - (await testConnectionFactory.GetNextOrCurrentTestConnection()).CompleteFromTransport(firstException); - - Assert.Same(firstException, await reconnectingErrorTcs.Task.OrTimeout()); - Assert.Single(retryContexts); - Assert.Same(firstException, retryContexts[0].RetryReason); - Assert.Equal(0, retryContexts[0].PreviousRetryCount); - Assert.Equal(TimeSpan.Zero, retryContexts[0].ElapsedTime); - - var secondException = new Exception(); - var stopTask = hubConnection.StopAsync(); - connectionStartTcs.SetResult(null); - - Assert.IsType(await closedErrorTcs.Task.OrTimeout()); - Assert.Single(retryContexts); - Assert.Equal(1, reconnectingCount); - Assert.Equal(0, reconnectedCount); - await stopTask.OrTimeout(); - } - } - - [Fact] - public async Task ReconnectCanBeStoppedDuringRetryDelay() - { - bool ExpectedErrors(WriteContext writeContext) - { - return writeContext.LoggerName == typeof(HubConnection).FullName && - (writeContext.EventId.Name == "ServerDisconnectedWithError" || - writeContext.EventId.Name == "ReconnectingWithError" || - writeContext.EventId.Name == "ErrorReceivingHandshakeResponse" || - writeContext.EventId.Name == "ErrorStartingConnection"); - } - - using (StartVerifiableLog(ExpectedErrors)) - { - var builder = new HubConnectionBuilder().WithLoggerFactory(LoggerFactory); - var testConnectionFactory = new ReconnectingConnectionFactory(); - builder.Services.AddSingleton(testConnectionFactory); - - var retryContexts = new List(); - var mockReconnectPolicy = new Mock(); - mockReconnectPolicy.Setup(p => p.NextRetryDelay(It.IsAny())).Returns(context => - { - retryContexts.Add(context); - // Hopefully this test never takes over a minute. - return TimeSpan.FromMinutes(1); - }); - builder.WithAutomaticReconnect(mockReconnectPolicy.Object); - - await using var hubConnection = builder.Build(); - var reconnectingCount = 0; - var reconnectedCount = 0; - var reconnectingErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var closedErrorTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - - hubConnection.Reconnecting += error => - { - reconnectingCount++; - reconnectingErrorTcs.SetResult(error); - return Task.CompletedTask; - }; - - hubConnection.Reconnected += connectionId => - { - reconnectedCount++; - return Task.CompletedTask; - }; - - hubConnection.Closed += error => - { - closedErrorTcs.SetResult(error); - return Task.CompletedTask; - }; - - // Allow the first connection to start successfully. - await hubConnection.StartAsync().OrTimeout(); - - var firstException = new Exception(); - (await testConnectionFactory.GetNextOrCurrentTestConnection()).CompleteFromTransport(firstException); - - Assert.Same(firstException, await reconnectingErrorTcs.Task.OrTimeout()); - Assert.Single(retryContexts); - Assert.Same(firstException, retryContexts[0].RetryReason); - Assert.Equal(0, retryContexts[0].PreviousRetryCount); - Assert.Equal(TimeSpan.Zero, retryContexts[0].ElapsedTime); - - await hubConnection.StopAsync().OrTimeout(); - - Assert.IsType(await closedErrorTcs.Task.OrTimeout()); - Assert.Single(retryContexts); - Assert.Equal(1, reconnectingCount); - Assert.Equal(0, reconnectedCount); - } - } - - private class ReconnectingConnectionFactory : IConnectionFactory - { - public readonly Func _testConnectionFactory; - public TaskCompletionSource _testConnectionTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - - public ReconnectingConnectionFactory() - : this (() => new TestConnection()) - { - } - - public ReconnectingConnectionFactory(Func testConnectionFactory) - { - _testConnectionFactory = testConnectionFactory; - } - - public Task GetNextOrCurrentTestConnection() - { - return _testConnectionTcs.Task; - } - - public async Task ConnectAsync(TransferFormat transferFormat, CancellationToken cancellationToken = default) - { - var testConnection = _testConnectionFactory(); - - _testConnectionTcs.SetResult(testConnection); - - try - { - return await testConnection.StartAsync(transferFormat); - } - catch - { _testConnectionTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - throw; + + await disposingTestConnection.DisposeAsync(); } } - - public async Task DisposeAsync(ConnectionContext connection) - { - var disposingTestConnection = await _testConnectionTcs.Task; - - _testConnectionTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - - await disposingTestConnection.DisposeAsync(); - } } } } diff --git a/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.cs b/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.cs index 40cca161c0..74a2da0c7f 100644 --- a/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.cs +++ b/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.cs @@ -63,7 +63,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests var delegateConnectionFactory = new DelegateConnectionFactory( format => new TestConnection().StartAsync(format), - connection => ((TestConnection)connection).DisposeAsync()); + connection => ((TestConnection)connection).DisposeAsync().AsTask()); builder.Services.AddSingleton(delegateConnectionFactory); var hubConnection = builder.Build(); diff --git a/src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj b/src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj index a2b40fbe25..cc45556edd 100644 --- a/src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj +++ b/src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.0 @@ -8,6 +8,7 @@ + diff --git a/src/SignalR/clients/csharp/Client/test/UnitTests/ServerSentEventsTransportTests.cs b/src/SignalR/clients/csharp/Client/test/UnitTests/ServerSentEventsTransportTests.cs index 421e1cef61..aa3c41bbed 100644 --- a/src/SignalR/clients/csharp/Client/test/UnitTests/ServerSentEventsTransportTests.cs +++ b/src/SignalR/clients/csharp/Client/test/UnitTests/ServerSentEventsTransportTests.cs @@ -11,6 +11,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Http.Connections.Client.Internal; +using Microsoft.AspNetCore.Internal; using Microsoft.AspNetCore.SignalR.Tests; using Microsoft.Extensions.Logging.Testing; using Moq; diff --git a/src/SignalR/clients/csharp/Client/test/UnitTests/TestConnection.cs b/src/SignalR/clients/csharp/Client/test/UnitTests/TestConnection.cs index dc9e1b9d56..cdb61db868 100644 --- a/src/SignalR/clients/csharp/Client/test/UnitTests/TestConnection.cs +++ b/src/SignalR/clients/csharp/Client/test/UnitTests/TestConnection.cs @@ -60,7 +60,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests null); } - public Task DisposeAsync() => DisposeCoreAsync(); + public override ValueTask DisposeAsync() => DisposeCoreAsync(); public async Task StartAsync(TransferFormat transferFormat = TransferFormat.Binary) { @@ -195,7 +195,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests Application.Output.Complete(ex); } - private async Task DisposeCoreAsync(Exception ex = null) + private async ValueTask DisposeCoreAsync(Exception ex = null) { Interlocked.Increment(ref _disposeCount); _disposed.TrySetResult(null); diff --git a/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netcoreapp3.0.cs b/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netcoreapp3.0.cs index dd78ecdf90..3c74a6e8c1 100644 --- a/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netcoreapp3.0.cs +++ b/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netcoreapp3.0.cs @@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client bool Microsoft.AspNetCore.Connections.Features.IConnectionInherentKeepAliveFeature.HasInherentKeepAlive { get { throw null; } } public override System.IO.Pipelines.IDuplexPipe Transport { get { throw null; } set { } } [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task DisposeAsync() { throw null; } + public override System.Threading.Tasks.ValueTask DisposeAsync() { throw null; } [System.Diagnostics.DebuggerStepThroughAttribute] public System.Threading.Tasks.Task StartAsync(Microsoft.AspNetCore.Connections.TransferFormat transferFormat, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public System.Threading.Tasks.Task StartAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } diff --git a/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netstandard2.0.cs b/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netstandard2.0.cs index dd78ecdf90..3c74a6e8c1 100644 --- a/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netstandard2.0.cs +++ b/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netstandard2.0.cs @@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client bool Microsoft.AspNetCore.Connections.Features.IConnectionInherentKeepAliveFeature.HasInherentKeepAlive { get { throw null; } } public override System.IO.Pipelines.IDuplexPipe Transport { get { throw null; } set { } } [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task DisposeAsync() { throw null; } + public override System.Threading.Tasks.ValueTask DisposeAsync() { throw null; } [System.Diagnostics.DebuggerStepThroughAttribute] public System.Threading.Tasks.Task StartAsync(Microsoft.AspNetCore.Connections.TransferFormat transferFormat, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public System.Threading.Tasks.Task StartAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } diff --git a/src/SignalR/clients/csharp/Http.Connections.Client/src/HttpConnection.cs b/src/SignalR/clients/csharp/Http.Connections.Client/src/HttpConnection.cs index fdbecdef64..4953e82c92 100644 --- a/src/SignalR/clients/csharp/Http.Connections.Client/src/HttpConnection.cs +++ b/src/SignalR/clients/csharp/Http.Connections.Client/src/HttpConnection.cs @@ -234,7 +234,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client /// A connection cannot be restarted after it has stopped. To restart a connection /// a new instance should be created using the same options. /// - public async Task DisposeAsync() + public override async ValueTask DisposeAsync() { using (_logger.BeginScope(_logScope)) { diff --git a/src/SignalR/clients/java/signalr/build.gradle b/src/SignalR/clients/java/signalr/build.gradle index 20c3661bda..61b170a40d 100644 --- a/src/SignalR/clients/java/signalr/build.gradle +++ b/src/SignalR/clients/java/signalr/build.gradle @@ -83,7 +83,7 @@ task generatePOM { project { inceptionYear '2018' description 'ASP.NET Core SignalR Client for Java applications' - url 'https://github.com/aspnet/SignalR' + url 'https://github.com/aspnet/AspNetCore' name groupId + ':' + artifactId licenses { license { @@ -93,9 +93,9 @@ task generatePOM { } } scm { - connection 'scm:git:git://github.com/aspnet/SignalR.git' - developerConnection 'scm:git:git://github.com/aspnet/SignalR.git' - url 'http://github.com/aspnet/SignalR/tree/master' + connection 'scm:git:git://github.com/aspnet/AspNetCore.git' + developerConnection 'scm:git:git://github.com/aspnet/AspNetCore.git' + url 'http://github.com/aspnet/AspNetCore/tree/master' } developers { developer { diff --git a/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json b/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json index 00b01bbd9a..ec43ec225c 100644 --- a/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json +++ b/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json @@ -41,10 +41,8 @@ "dist/**/*", "src/**/*" ], - "peerDependencies": { - "@aspnet/signalr": "^1.0.0-preview3" - }, "dependencies": { + "@aspnet/signalr": "file:../signalr", "msgpack5": "^4.0.2" }, "devDependencies": { diff --git a/src/SignalR/clients/ts/signalr-protocol-msgpack/signalr-protocol-msgpack.npmproj b/src/SignalR/clients/ts/signalr-protocol-msgpack/signalr-protocol-msgpack.npmproj index d918ed1ed0..e42f9078d7 100644 --- a/src/SignalR/clients/ts/signalr-protocol-msgpack/signalr-protocol-msgpack.npmproj +++ b/src/SignalR/clients/ts/signalr-protocol-msgpack/signalr-protocol-msgpack.npmproj @@ -3,14 +3,19 @@ @aspnet/signalr-protocol-msgpack - true + !$(MSBuildProjectDirectory.Contains('node_modules')) false - true + !$(MSBuildProjectDirectory.Contains('node_modules')) + !$(MSBuildProjectDirectory.Contains('node_modules')) + + + + diff --git a/src/SignalR/clients/ts/signalr-protocol-msgpack/yarn.lock b/src/SignalR/clients/ts/signalr-protocol-msgpack/yarn.lock index 72f6c7ea87..e4d150625f 100644 --- a/src/SignalR/clients/ts/signalr-protocol-msgpack/yarn.lock +++ b/src/SignalR/clients/ts/signalr-protocol-msgpack/yarn.lock @@ -2,6 +2,13 @@ # yarn lockfile v1 +"@aspnet/signalr@file:../signalr": + version "3.0.0-dev" + dependencies: + eventsource "^1.0.7" + request "^2.88.0" + ws "^6.0.0" + "@types/bl@*": version "0.8.31" resolved "https://registry.yarnpkg.com/@types/bl/-/bl-0.8.31.tgz#caa006702e13c36cda00345fa698b8d55c03113b" @@ -21,11 +28,60 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-8.5.5.tgz#6f9e8164ae1a55a9beb1d2571cfb7acf9d720c61" integrity sha512-JRnfoh0Ll4ElmIXKxbUfcOodkGvcNHljct6mO1X9hE/mlrMzAx0hYCLAD7sgT53YAY1HdlpzUcV0CkmDqUqTuA== +ajv@^6.5.5: + version "6.10.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1" + integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg== + dependencies: + fast-deep-equal "^2.0.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +asn1@~0.2.3: + version "0.2.4" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" + integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== + dependencies: + safer-buffer "~2.1.0" + +assert-plus@1.0.0, assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + +async-limiter@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" + integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg== + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= + +aws-sign2@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" + integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= + +aws4@^1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" + integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== + base64-js@^1.0.2: version "1.2.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886" integrity sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw== +bcrypt-pbkdf@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" + integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= + dependencies: + tweetnacl "^0.14.3" + bl@^1.2.1: version "1.2.2" resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c" @@ -42,11 +98,118 @@ buffer@^5.0.8: base64-js "^1.0.2" ieee754 "^1.1.4" -core-util-is@~1.0.0: +caseless@~0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= + +combined-stream@^1.0.6, combined-stream@~1.0.6: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + +core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= +dashdash@^1.12.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" + integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= + dependencies: + assert-plus "^1.0.0" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= + +ecc-jsbn@~0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" + integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= + dependencies: + jsbn "~0.1.0" + safer-buffer "^2.1.0" + +eventsource@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0" + integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ== + dependencies: + original "^1.0.0" + +extend@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== + +extsprintf@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" + integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= + +extsprintf@^1.2.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" + integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= + +fast-deep-equal@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" + integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk= + +fast-json-stable-stringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= + +forever-agent@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" + integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= + +form-data@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" + integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.6" + mime-types "^2.1.12" + +getpass@^0.1.1: + version "0.1.7" + resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" + integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= + dependencies: + assert-plus "^1.0.0" + +har-schema@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" + integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= + +har-validator@~5.1.0: + version "5.1.3" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" + integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g== + dependencies: + ajv "^6.5.5" + har-schema "^2.0.0" + +http-signature@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" + integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= + dependencies: + assert-plus "^1.0.0" + jsprim "^1.2.2" + sshpk "^1.7.0" + ieee754@^1.1.4: version "1.1.8" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4" @@ -57,11 +220,63 @@ inherits@^2.0.3, inherits@~2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= +is-typedarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +isstream@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= + +jsbn@~0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-schema@0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" + integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= + +json-stringify-safe@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= + +jsprim@^1.2.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" + integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= + dependencies: + assert-plus "1.0.0" + extsprintf "1.3.0" + json-schema "0.2.3" + verror "1.10.0" + +mime-db@1.40.0: + version "1.40.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32" + integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA== + +mime-types@^2.1.12, mime-types@~2.1.19: + version "2.1.24" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81" + integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ== + dependencies: + mime-db "1.40.0" + msgpack5@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/msgpack5/-/msgpack5-4.0.2.tgz#88be70e432d142b7a379bfb170f433bd41447508" @@ -72,11 +287,53 @@ msgpack5@^4.0.2: readable-stream "^2.3.3" safe-buffer "^5.1.1" +oauth-sign@~0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" + integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== + +original@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f" + integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg== + dependencies: + url-parse "^1.4.3" + +performance-now@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= + process-nextick-args@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw== +psl@^1.1.24: + version "1.1.31" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184" + integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw== + +punycode@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" + integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= + +punycode@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +qs@~6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" + integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== + +querystringify@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e" + integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA== + readable-stream@^2.3.3, readable-stream@^2.3.5: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" @@ -90,11 +347,67 @@ readable-stream@^2.3.3, readable-stream@^2.3.5: string_decoder "~1.1.1" util-deprecate "~1.0.1" +request@^2.88.0: + version "2.88.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" + integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg== + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.8.0" + caseless "~0.12.0" + combined-stream "~1.0.6" + extend "~3.0.2" + forever-agent "~0.6.1" + form-data "~2.3.2" + har-validator "~5.1.0" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.19" + oauth-sign "~0.9.0" + performance-now "^2.1.0" + qs "~6.5.2" + safe-buffer "^5.1.2" + tough-cookie "~2.4.3" + tunnel-agent "^0.6.0" + uuid "^3.3.2" + +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= + +safe-buffer@^5.0.1, safe-buffer@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg== +safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +sshpk@^1.7.0: + version "1.16.1" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" + integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== + dependencies: + asn1 "~0.2.3" + assert-plus "^1.0.0" + bcrypt-pbkdf "^1.0.0" + dashdash "^1.12.0" + ecc-jsbn "~0.1.1" + getpass "^0.1.1" + jsbn "~0.1.0" + safer-buffer "^2.0.2" + tweetnacl "~0.14.0" + string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -102,7 +415,63 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" +tough-cookie@~2.4.3: + version "2.4.3" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" + integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ== + dependencies: + psl "^1.1.24" + punycode "^1.4.1" + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + dependencies: + safe-buffer "^5.0.1" + +tweetnacl@^0.14.3, tweetnacl@~0.14.0: + version "0.14.5" + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= + +uri-js@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" + integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== + dependencies: + punycode "^2.1.0" + +url-parse@^1.4.3: + version "1.4.7" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278" + integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +uuid@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" + integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== + +verror@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" + integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + +ws@^6.0.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" + integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== + dependencies: + async-limiter "~1.0.0" diff --git a/src/SignalR/clients/ts/signalr/signalr.npmproj b/src/SignalR/clients/ts/signalr/signalr.npmproj index 7c145fae0d..28afdaec0a 100644 --- a/src/SignalR/clients/ts/signalr/signalr.npmproj +++ b/src/SignalR/clients/ts/signalr/signalr.npmproj @@ -3,9 +3,10 @@ @aspnet/signalr - true + !$(MSBuildProjectDirectory.Contains('node_modules')) false - true + !$(MSBuildProjectDirectory.Contains('node_modules')) + !$(MSBuildProjectDirectory.Contains('node_modules')) diff --git a/src/SignalR/clients/ts/signalr/src/HttpConnection.ts b/src/SignalR/clients/ts/signalr/src/HttpConnection.ts index 729d01cc32..adaab94722 100644 --- a/src/SignalR/clients/ts/signalr/src/HttpConnection.ts +++ b/src/SignalR/clients/ts/signalr/src/HttpConnection.ts @@ -63,6 +63,7 @@ export class HttpConnection implements IConnection { private stopPromiseResolver!: (value?: PromiseLike) => void; private stopError?: Error; private accessTokenFactory?: () => string | Promise; + private sendQueue?: TransportSendQueue; public readonly features: any = {}; public connectionId?: string; @@ -146,8 +147,12 @@ export class HttpConnection implements IConnection { return Promise.reject(new Error("Cannot send data if the connection is not in the 'Connected' State.")); } + if (!this.sendQueue) { + this.sendQueue = new TransportSendQueue(this.transport!); + } + // Transport will not be null if state is connected - return this.transport!.send(data); + return this.sendQueue.send(data); } public async stop(error?: Error): Promise { @@ -189,6 +194,11 @@ export class HttpConnection implements IConnection { // The transport should always be set if currently connected. If it wasn't set, it's likely because // stop was called during start() and start() failed. if (this.transport) { + if (this.sendQueue) { + this.sendQueue.stop(); + this.sendQueue = undefined; + } + try { await this.transport.stop(); } catch (e) { @@ -501,3 +511,96 @@ export class HttpConnection implements IConnection { function transportMatches(requestedTransport: HttpTransportType | undefined, actualTransport: HttpTransportType) { return !requestedTransport || ((actualTransport & requestedTransport) !== 0); } + +export class TransportSendQueue { + private buffer: any[] = []; + private sendBufferedData: PromiseSource; + private executing: boolean = true; + private transportResult: PromiseSource; + + constructor(private readonly transport: ITransport) { + this.sendBufferedData = new PromiseSource(); + this.transportResult = new PromiseSource(); + + // Suppress typescript error about handling Promises. The sendLoop doesn't need to be observed + this.sendLoop().then(() => {}, (_) => {}); + } + + public send(data: string | ArrayBuffer): Promise { + this.bufferData(data); + return this.transportResult.promise; + } + + public stop(): void { + this.executing = false; + this.sendBufferedData.resolve(); + } + + private bufferData(data: string | ArrayBuffer): void { + if (this.buffer.length && typeof(this.buffer[0]) !== typeof(data)) { + throw new Error(`Expected data to be of type ${typeof(this.buffer)} but was of type ${typeof(data)}`); + } + + this.buffer.push(data); + this.sendBufferedData.resolve(); + } + + private async sendLoop(): Promise { + while (true) { + await this.sendBufferedData.promise; + + if (!this.executing) { + // Did we stop? + break; + } + + this.sendBufferedData = new PromiseSource(); + + const transportResult = this.transportResult; + this.transportResult = new PromiseSource(); + + const data = typeof(this.buffer[0]) === "string" ? + this.buffer.join("") : + TransportSendQueue.concatBuffers(this.buffer); + + this.buffer.length = 0; + + try { + await this.transport.send(data); + transportResult.resolve(); + } catch (error) { + transportResult.reject(error); + } + } + } + + private static concatBuffers(arrayBuffers: ArrayBuffer[]): ArrayBuffer { + const totalLength = arrayBuffers.map((b) => b.byteLength).reduce((a, b) => a + b); + const result = new Uint8Array(totalLength); + let offset = 0; + for (const item of arrayBuffers) { + result.set(new Uint8Array(item), offset); + offset += item.byteLength; + } + + return result; + } +} + +class PromiseSource { + private resolver?: () => void; + private rejecter!: (reason?: any) => void; + public promise: Promise; + + constructor() { + this.promise = new Promise((resolve, reject) => [this.resolver, this.rejecter] = [resolve, reject]); + } + + public resolve(): void { + this.resolver!(); + } + + public reject(reason?: any): void { + this.rejecter!(reason); + } +} diff --git a/src/SignalR/clients/ts/signalr/src/HubConnection.ts b/src/SignalR/clients/ts/signalr/src/HubConnection.ts index 1247c35797..2a91ac45a1 100644 --- a/src/SignalR/clients/ts/signalr/src/HubConnection.ts +++ b/src/SignalR/clients/ts/signalr/src/HubConnection.ts @@ -854,7 +854,7 @@ export class HubConnection { private isObservable(arg: any): arg is IStreamResult { // This allows other stream implementations to just work (like rxjs) - return arg.subscribe && typeof arg.subscribe === "function"; + return arg && arg.subscribe && typeof arg.subscribe === "function"; } private createStreamInvocation(methodName: string, args: any[], streamIds: string[]): StreamInvocationMessage { diff --git a/src/SignalR/clients/ts/signalr/tests/HttpConnection.test.ts b/src/SignalR/clients/ts/signalr/tests/HttpConnection.test.ts index 39e44ef03d..3da6b59918 100644 --- a/src/SignalR/clients/ts/signalr/tests/HttpConnection.test.ts +++ b/src/SignalR/clients/ts/signalr/tests/HttpConnection.test.ts @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. import { HttpResponse } from "../src/HttpClient"; -import { HttpConnection, INegotiateResponse } from "../src/HttpConnection"; +import { HttpConnection, INegotiateResponse, TransportSendQueue } from "../src/HttpConnection"; import { IHttpConnectionOptions } from "../src/IHttpConnectionOptions"; import { HttpTransportType, ITransport, TransferFormat } from "../src/ITransport"; @@ -12,6 +12,7 @@ import { EventSourceConstructor, WebSocketConstructor } from "../src/Polyfills"; import { eachEndpointUrl, eachTransport, VerifyLogger } from "./Common"; import { TestHttpClient } from "./TestHttpClient"; +import { TestTransport } from "./TestTransport"; import { PromiseSource, registerUnhandledRejectionHandler, SyncPoint } from "./Utils"; const commonOptions: IHttpConnectionOptions = { @@ -844,3 +845,212 @@ describe("HttpConnection", () => { }); }); }); + +describe("TransportSendQueue", () => { + it("sends data when not currently sending", async () => { + const sendMock = jest.fn(() => Promise.resolve()); + const transport = new TestTransport(); + transport.send = sendMock; + const queue = new TransportSendQueue(transport); + + await queue.send("Hello"); + + expect(sendMock.mock.calls.length).toBe(1); + + queue.stop(); + }); + + it("sends buffered data on fail", async () => { + const promiseSource1 = new PromiseSource(); + const promiseSource2 = new PromiseSource(); + const promiseSource3 = new PromiseSource(); + const transport = new TestTransport(); + const sendMock = jest.fn() + .mockImplementationOnce(async () => { + await promiseSource1; + promiseSource2.resolve(); + await promiseSource3; + }) + .mockImplementationOnce(() => Promise.resolve()); + transport.send = sendMock; + + const queue = new TransportSendQueue(transport); + + const first = queue.send("Hello"); + // This should allow first to enter transport.send + promiseSource1.resolve(); + // Wait until we're inside transport.send + await promiseSource2; + + // This should get queued. + const second = queue.send("world"); + + promiseSource3.reject(); + + let hasError = false; + try { + await first; + } catch { + hasError = true; + } + + await second; + + expect(hasError).toBe(true); + expect(sendMock.mock.calls.length).toBe(2); + expect(sendMock.mock.calls[0][0]).toEqual("Hello"); + expect(sendMock.mock.calls[1][0]).toEqual("world"); + + queue.stop(); + }); + + it("rejects promise for buffered sends", async () => { + const promiseSource1 = new PromiseSource(); + const promiseSource2 = new PromiseSource(); + const promiseSource3 = new PromiseSource(); + const transport = new TestTransport(); + const sendMock = jest.fn() + .mockImplementationOnce(async () => { + await promiseSource1; + promiseSource2.resolve(); + await promiseSource3; + }) + .mockImplementationOnce(() => Promise.reject()); + transport.send = sendMock; + + const queue = new TransportSendQueue(transport); + + const first = queue.send("Hello"); + // This should allow first to enter transport.send + promiseSource1.resolve(); + // Wait until we're inside transport.send + await promiseSource2; + + // This should get queued. + const second = queue.send("world"); + + promiseSource3.resolve(); + + await first; + + let hasError = false; + try { + await second; + } catch { + hasError = true; + } + + expect(hasError).toBe(true); + expect(sendMock.mock.calls.length).toBe(2); + expect(sendMock.mock.calls[0][0]).toEqual("Hello"); + expect(sendMock.mock.calls[1][0]).toEqual("world"); + + queue.stop(); + }); + + it ("concatenates string sends", async () => { + const promiseSource1 = new PromiseSource(); + const promiseSource2 = new PromiseSource(); + const promiseSource3 = new PromiseSource(); + const transport = new TestTransport(); + const sendMock = jest.fn() + .mockImplementationOnce(async () => { + await promiseSource1; + promiseSource2.resolve(); + await promiseSource3; + }) + .mockImplementationOnce(() => Promise.resolve()); + transport.send = sendMock; + + const queue = new TransportSendQueue(transport); + + const first = queue.send("Hello"); + // This should allow first to enter transport.send + promiseSource1.resolve(); + // Wait until we're inside transport.send + await promiseSource2; + + // These two operations should get queued. + const second = queue.send("world"); + const third = queue.send("!"); + + promiseSource3.resolve(); + + await Promise.all([first, second, third]); + + expect(sendMock.mock.calls.length).toBe(2); + expect(sendMock.mock.calls[0][0]).toEqual("Hello"); + expect(sendMock.mock.calls[1][0]).toEqual("world!"); + + queue.stop(); + }); + + it ("concatenates buffered ArrayBuffer", async () => { + const promiseSource1 = new PromiseSource(); + const promiseSource2 = new PromiseSource(); + const promiseSource3 = new PromiseSource(); + const transport = new TestTransport(); + const sendMock = jest.fn() + .mockImplementationOnce(async () => { + await promiseSource1; + promiseSource2.resolve(); + await promiseSource3; + }) + .mockImplementationOnce(() => Promise.resolve()); + transport.send = sendMock; + + const queue = new TransportSendQueue(transport); + + const first = queue.send(new Uint8Array([4, 5, 6])); + // This should allow first to enter transport.send + promiseSource1.resolve(); + // Wait until we're inside transport.send + await promiseSource2; + + // These two operations should get queued. + const second = queue.send(new Uint8Array([7, 8, 10])); + const third = queue.send(new Uint8Array([12, 14])); + + promiseSource3.resolve(); + + await Promise.all([first, second, third]); + + expect(sendMock.mock.calls.length).toBe(2); + expect(sendMock.mock.calls[0][0]).toEqual(new Uint8Array([4, 5, 6])); + expect(sendMock.mock.calls[1][0]).toEqual(new Uint8Array([7, 8, 10, 12, 14])); + + queue.stop(); + }); + + it ("throws if mixed data is queued", async () => { + const promiseSource1 = new PromiseSource(); + const promiseSource2 = new PromiseSource(); + const promiseSource3 = new PromiseSource(); + const transport = new TestTransport(); + const sendMock = jest.fn() + .mockImplementationOnce(async () => { + await promiseSource1; + promiseSource2.resolve(); + await promiseSource3; + }) + .mockImplementationOnce(() => Promise.resolve()); + transport.send = sendMock; + + const queue = new TransportSendQueue(transport); + + const first = queue.send(new Uint8Array([4, 5, 6])); + // This should allow first to enter transport.send + promiseSource1.resolve(); + // Wait until we're inside transport.send + await promiseSource2; + + // These two operations should get queued. + const second = queue.send(new Uint8Array([7, 8, 10])); + expect(() => queue.send("A string!")).toThrow(); + + promiseSource3.resolve(); + + await Promise.all([first, second]); + queue.stop(); + }); +}); diff --git a/src/SignalR/clients/ts/signalr/tests/HubConnection.test.ts b/src/SignalR/clients/ts/signalr/tests/HubConnection.test.ts index 257f2e174d..ed05cb3232 100644 --- a/src/SignalR/clients/ts/signalr/tests/HubConnection.test.ts +++ b/src/SignalR/clients/ts/signalr/tests/HubConnection.test.ts @@ -123,6 +123,35 @@ describe("HubConnection", () => { } }); }); + + it("works if argument is null", async () => { + await VerifyLogger.run(async (logger) => { + const connection = new TestConnection(); + + const hubConnection = createHubConnection(connection, logger); + try { + // We don't actually care to wait for the send. + // tslint:disable-next-line:no-floating-promises + hubConnection.send("testMethod", "arg", null) + .catch((_) => { }); // Suppress exception and unhandled promise rejection warning. + + // Verify the message is sent + expect(connection.sentData.length).toBe(1); + expect(JSON.parse(connection.sentData[0])).toEqual({ + arguments: [ + "arg", + null, + ], + streamIds: [], + target: "testMethod", + type: MessageType.Invocation, + }); + } finally { + // Close the connection + await hubConnection.stop(); + } + }); + }); }); describe("invoke", () => { diff --git a/src/SignalR/clients/ts/signalr/tests/TestTransport.ts b/src/SignalR/clients/ts/signalr/tests/TestTransport.ts new file mode 100644 index 0000000000..c3a7d95964 --- /dev/null +++ b/src/SignalR/clients/ts/signalr/tests/TestTransport.ts @@ -0,0 +1,21 @@ +// 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. + +import { ITransport } from "signalr/src/ITransport"; + +export class TestTransport implements ITransport { + public connect() { + return Promise.resolve(); + } + + public send(): Promise { + return Promise.resolve(); + } + + public stop(): Promise { + return Promise.resolve(); + } + + public onreceive: ((data: string | ArrayBuffer) => void) | null = null; + public onclose: ((error?: Error | undefined) => void) | null = null; +} diff --git a/src/SignalR/common/Http.Connections/ref/Microsoft.AspNetCore.Http.Connections.netcoreapp3.0.cs b/src/SignalR/common/Http.Connections/ref/Microsoft.AspNetCore.Http.Connections.netcoreapp3.0.cs index 78ca329b45..afe027ed66 100644 --- a/src/SignalR/common/Http.Connections/ref/Microsoft.AspNetCore.Http.Connections.netcoreapp3.0.cs +++ b/src/SignalR/common/Http.Connections/ref/Microsoft.AspNetCore.Http.Connections.netcoreapp3.0.cs @@ -12,6 +12,7 @@ namespace Microsoft.AspNetCore.Builder } public static partial class ConnectionsAppBuilderExtensions { + [System.ObsoleteAttribute("This method is obsolete and will be removed in a future version. The recommended alternative is to use MapConnections or MapConnectionHandler inside Microsoft.AspNetCore.Builder.UseEndpoints(...).")] public static Microsoft.AspNetCore.Builder.IApplicationBuilder UseConnections(this Microsoft.AspNetCore.Builder.IApplicationBuilder app, System.Action configure) { throw null; } } } @@ -28,6 +29,7 @@ namespace Microsoft.AspNetCore.Http.Connections public ConnectionOptionsSetup() { } public void Configure(Microsoft.AspNetCore.Http.Connections.ConnectionOptions options) { } } + [System.ObsoleteAttribute("This class is obsolete and will be removed in a future version. The recommended alternative is to use MapConnection and MapConnectionHandler inside Microsoft.AspNetCore.Builder.UseEndpoints(...).")] public partial class ConnectionsRouteBuilder { internal ConnectionsRouteBuilder() { } diff --git a/src/SignalR/common/Http.Connections/src/ConnectionEndpointRouteBuilderExtensions.cs b/src/SignalR/common/Http.Connections/src/ConnectionEndpointRouteBuilderExtensions.cs index bc111a2ed4..7833a46600 100644 --- a/src/SignalR/common/Http.Connections/src/ConnectionEndpointRouteBuilderExtensions.cs +++ b/src/SignalR/common/Http.Connections/src/ConnectionEndpointRouteBuilderExtensions.cs @@ -3,8 +3,6 @@ using System; using System.Collections.Generic; -using System.Linq; -using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Http.Connections; using Microsoft.AspNetCore.Http.Connections.Internal; @@ -48,13 +46,6 @@ namespace Microsoft.AspNetCore.Builder public static IEndpointConventionBuilder MapConnectionHandler(this IEndpointRouteBuilder endpoints, string pattern, Action configureOptions) where TConnectionHandler : ConnectionHandler { var options = new HttpConnectionDispatcherOptions(); - // REVIEW: WE should consider removing this and instead just relying on the - // AuthorizationMiddleware - var attributes = typeof(TConnectionHandler).GetCustomAttributes(inherit: true); - foreach (var attribute in attributes.OfType()) - { - options.AuthorizationData.Add(attribute); - } configureOptions?.Invoke(options); var conventionBuilder = endpoints.MapConnections(pattern, options, b => @@ -62,6 +53,7 @@ namespace Microsoft.AspNetCore.Builder b.UseConnectionHandler(); }); + var attributes = typeof(TConnectionHandler).GetCustomAttributes(inherit: true); conventionBuilder.Add(e => { // Add all attributes on the ConnectionHandler has metadata (this will allow for things like) @@ -93,7 +85,7 @@ namespace Microsoft.AspNetCore.Builder var connectionDelegate = connectionBuilder.Build(); // REVIEW: Consider expanding the internals of the dispatcher as endpoint routes instead of - // using if statemants we can let the matcher handle + // using if statements we can let the matcher handle var conventionBuilders = new List(); diff --git a/src/SignalR/common/Http.Connections/src/ConnectionsAppBuilderExtensions.cs b/src/SignalR/common/Http.Connections/src/ConnectionsAppBuilderExtensions.cs index a663b31d6b..05227d6f39 100644 --- a/src/SignalR/common/Http.Connections/src/ConnectionsAppBuilderExtensions.cs +++ b/src/SignalR/common/Http.Connections/src/ConnectionsAppBuilderExtensions.cs @@ -3,9 +3,6 @@ using System; using Microsoft.AspNetCore.Http.Connections; -using Microsoft.AspNetCore.Http.Connections.Internal; -using Microsoft.AspNetCore.Routing; -using Microsoft.Extensions.DependencyInjection; namespace Microsoft.AspNetCore.Builder { @@ -16,10 +13,15 @@ namespace Microsoft.AspNetCore.Builder { /// /// Adds support for ASP.NET Core Connection Handlers to the request execution pipeline. + /// + /// This method is obsolete and will be removed in a future version. + /// The recommended alternative is to use MapConnections or MapConnectionHandler<TConnectionHandler> inside Microsoft.AspNetCore.Builder.UseEndpoints(...). + /// /// /// The . /// A callback to configure connection routes. /// The same instance of the for chaining. + [Obsolete("This method is obsolete and will be removed in a future version. The recommended alternative is to use MapConnections or MapConnectionHandler inside Microsoft.AspNetCore.Builder.UseEndpoints(...).")] public static IApplicationBuilder UseConnections(this IApplicationBuilder app, Action configure) { if (configure == null) @@ -27,14 +29,13 @@ namespace Microsoft.AspNetCore.Builder throw new ArgumentNullException(nameof(configure)); } - var dispatcher = app.ApplicationServices.GetRequiredService(); - - var routes = new RouteBuilder(app); - - configure(new ConnectionsRouteBuilder(routes, dispatcher)); - app.UseWebSockets(); - app.UseRouter(routes.Build()); + app.UseRouting(); + app.UseAuthorization(); + app.UseEndpoints(endpoints => + { + configure(new ConnectionsRouteBuilder(endpoints)); + }); return app; } } diff --git a/src/SignalR/common/Http.Connections/src/ConnectionsRouteBuilder.cs b/src/SignalR/common/Http.Connections/src/ConnectionsRouteBuilder.cs index 5bda6e6648..b76d5688f0 100644 --- a/src/SignalR/common/Http.Connections/src/ConnectionsRouteBuilder.cs +++ b/src/SignalR/common/Http.Connections/src/ConnectionsRouteBuilder.cs @@ -2,26 +2,27 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Reflection; -using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Http.Connections.Internal; using Microsoft.AspNetCore.Routing; namespace Microsoft.AspNetCore.Http.Connections { /// /// Maps routes to ASP.NET Core Connection Handlers. + /// + /// This class is obsolete and will be removed in a future version. + /// The recommended alternative is to use MapConnection and MapConnectionHandler<TConnectionHandler> inside Microsoft.AspNetCore.Builder.UseEndpoints(...). + /// /// + [Obsolete("This class is obsolete and will be removed in a future version. The recommended alternative is to use MapConnection and MapConnectionHandler inside Microsoft.AspNetCore.Builder.UseEndpoints(...).")] public class ConnectionsRouteBuilder { - private readonly HttpConnectionDispatcher _dispatcher; - private readonly RouteBuilder _routes; + private readonly IEndpointRouteBuilder _endpoints; - internal ConnectionsRouteBuilder(RouteBuilder routes, HttpConnectionDispatcher dispatcher) + internal ConnectionsRouteBuilder(IEndpointRouteBuilder endpoints) { - _routes = routes; - _dispatcher = dispatcher; + _endpoints = endpoints; } /// @@ -38,24 +39,16 @@ namespace Microsoft.AspNetCore.Http.Connections /// The request path. /// Options used to configure the connection. /// A callback to configure the connection. - public void MapConnections(PathString path, HttpConnectionDispatcherOptions options, Action configure) - { - var connectionBuilder = new ConnectionBuilder(_routes.ServiceProvider); - configure(connectionBuilder); - var socket = connectionBuilder.Build(); - _routes.MapRoute(path, c => _dispatcher.ExecuteAsync(c, options, socket)); - _routes.MapRoute(path + "/negotiate", c => _dispatcher.ExecuteNegotiateAsync(c, options)); - } + public void MapConnections(PathString path, HttpConnectionDispatcherOptions options, Action configure) => + _endpoints.MapConnections(path, options, configure); /// /// Maps incoming requests with the specified path to the provided connection pipeline. /// /// The type. /// The request path. - public void MapConnectionHandler(PathString path) where TConnectionHandler : ConnectionHandler - { + public void MapConnectionHandler(PathString path) where TConnectionHandler : ConnectionHandler => MapConnectionHandler(path, configureOptions: null); - } /// /// Maps incoming requests with the specified path to the provided connection pipeline. @@ -63,20 +56,7 @@ namespace Microsoft.AspNetCore.Http.Connections /// The type. /// The request path. /// A callback to configure dispatcher options. - public void MapConnectionHandler(PathString path, Action configureOptions) where TConnectionHandler : ConnectionHandler - { - var authorizeAttributes = typeof(TConnectionHandler).GetCustomAttributes(inherit: true); - var options = new HttpConnectionDispatcherOptions(); - foreach (var attribute in authorizeAttributes) - { - options.AuthorizationData.Add(attribute); - } - configureOptions?.Invoke(options); - - MapConnections(path, options, builder => - { - builder.UseConnectionHandler(); - }); - } + public void MapConnectionHandler(PathString path, Action configureOptions) where TConnectionHandler : ConnectionHandler => + _endpoints.MapConnectionHandler(path, configureOptions); } } diff --git a/src/SignalR/common/Http.Connections/src/Internal/AuthorizeHelper.cs b/src/SignalR/common/Http.Connections/src/Internal/AuthorizeHelper.cs deleted file mode 100644 index 7b48314ef0..0000000000 --- a/src/SignalR/common/Http.Connections/src/Internal/AuthorizeHelper.cs +++ /dev/null @@ -1,69 +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.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Authorization.Policy; -using Microsoft.Extensions.DependencyInjection; - -namespace Microsoft.AspNetCore.Http.Connections.Internal -{ - internal static class AuthorizeHelper - { - public static async Task AuthorizeAsync(HttpContext context, IList policies) - { - if (policies.Count == 0) - { - return true; - } - - var policyProvider = context.RequestServices.GetRequiredService(); - - var authorizePolicy = await AuthorizationPolicy.CombineAsync(policyProvider, policies); - - var policyEvaluator = context.RequestServices.GetRequiredService(); - - // This will set context.User if required - var authenticateResult = await policyEvaluator.AuthenticateAsync(authorizePolicy, context); - - var authorizeResult = await policyEvaluator.AuthorizeAsync(authorizePolicy, authenticateResult, context, resource: null); - if (authorizeResult.Succeeded) - { - return true; - } - else if (authorizeResult.Challenged) - { - if (authorizePolicy.AuthenticationSchemes.Count > 0) - { - foreach (var scheme in authorizePolicy.AuthenticationSchemes) - { - await context.ChallengeAsync(scheme); - } - } - else - { - await context.ChallengeAsync(); - } - return false; - } - else if (authorizeResult.Forbidden) - { - if (authorizePolicy.AuthenticationSchemes.Count > 0) - { - foreach (var scheme in authorizePolicy.AuthenticationSchemes) - { - await context.ForbidAsync(scheme); - } - } - else - { - await context.ForbidAsync(); - } - return false; - } - return false; - } - } -} diff --git a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs index 20bd0ccb24..ea0bee5bb7 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs @@ -61,11 +61,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal var logScope = new ConnectionLogScope(GetConnectionId(context)); using (_logger.BeginScope(logScope)) { - if (!await AuthorizeHelper.AuthorizeAsync(context, options.AuthorizationData)) - { - return; - } - if (HttpMethods.IsPost(context.Request.Method)) { // POST /{path} @@ -95,11 +90,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal var logScope = new ConnectionLogScope(connectionId: string.Empty); using (_logger.BeginScope(logScope)) { - if (!await AuthorizeHelper.AuthorizeAsync(context, options.AuthorizationData)) - { - return; - } - if (HttpMethods.IsPost(context.Request.Method)) { // POST /{path}/negotiate diff --git a/src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj b/src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj index c7dfbeb9e1..175167df71 100644 --- a/src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj +++ b/src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj @@ -14,6 +14,7 @@ + diff --git a/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs b/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs index 5b4c164ce3..d79bcd3d92 100644 --- a/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs +++ b/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs @@ -21,6 +21,7 @@ using Microsoft.AspNetCore.Http.Connections.Internal; using Microsoft.AspNetCore.Http.Connections.Internal.Transports; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Http.Internal; +using Microsoft.AspNetCore.Internal; using Microsoft.AspNetCore.SignalR.Tests; using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing.xunit; @@ -1346,358 +1347,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests } } - [Fact] - public async Task UnauthorizedConnectionFailsToStartEndPoint() - { - using (StartVerifiableLog()) - { - var manager = CreateConnectionManager(LoggerFactory); - var connection = manager.CreateConnection(); - connection.TransportType = HttpTransportType.LongPolling; - var dispatcher = new HttpConnectionDispatcher(manager, LoggerFactory); - var context = new DefaultHttpContext(); - var services = new ServiceCollection(); - services.AddOptions(); - services.AddSingleton(); - services.AddAuthorization(o => - { - o.AddPolicy("test", policy => policy.RequireClaim(ClaimTypes.NameIdentifier)); - }); - services.AddAuthenticationCore(o => - { - o.DefaultScheme = "Default"; - o.AddScheme("Default", a => a.HandlerType = typeof(TestAuthenticationHandler)); - }); - services.AddLogging(); - var sp = services.BuildServiceProvider(); - context.Request.Path = "/foo"; - context.Request.Method = "GET"; - context.RequestServices = sp; - var values = new Dictionary(); - values["id"] = connection.ConnectionId; - var qs = new QueryCollection(values); - context.Request.Query = qs; - - var builder = new ConnectionBuilder(sp); - builder.UseConnectionHandler(); - var app = builder.Build(); - var options = new HttpConnectionDispatcherOptions(); - options.AuthorizationData.Add(new AuthorizeAttribute("test")); - - // would get stuck if EndPoint was running - await dispatcher.ExecuteAsync(context, options, app).OrTimeout(); - - Assert.Equal(StatusCodes.Status401Unauthorized, context.Response.StatusCode); - } - } - - [Fact] - public async Task AuthenticatedUserWithoutPermissionCausesForbidden() - { - using (StartVerifiableLog()) - { - var manager = CreateConnectionManager(LoggerFactory); - var connection = manager.CreateConnection(); - connection.TransportType = HttpTransportType.LongPolling; - var dispatcher = new HttpConnectionDispatcher(manager, LoggerFactory); - var context = new DefaultHttpContext(); - var services = new ServiceCollection(); - services.AddOptions(); - services.AddSingleton(); - services.AddAuthorization(o => - { - o.AddPolicy("test", policy => policy.RequireClaim(ClaimTypes.NameIdentifier)); - }); - services.AddAuthenticationCore(o => - { - o.DefaultScheme = "Default"; - o.AddScheme("Default", a => a.HandlerType = typeof(TestAuthenticationHandler)); - }); - services.AddLogging(); - var sp = services.BuildServiceProvider(); - context.Request.Path = "/foo"; - context.Request.Method = "GET"; - context.RequestServices = sp; - var values = new Dictionary(); - values["id"] = connection.ConnectionId; - var qs = new QueryCollection(values); - context.Request.Query = qs; - - var builder = new ConnectionBuilder(sp); - builder.UseConnectionHandler(); - var app = builder.Build(); - var options = new HttpConnectionDispatcherOptions(); - options.AuthorizationData.Add(new AuthorizeAttribute("test")); - - context.User = new ClaimsPrincipal(new ClaimsIdentity("authenticated")); - - // would get stuck if EndPoint was running - await dispatcher.ExecuteAsync(context, options, app).OrTimeout(); - - Assert.Equal(StatusCodes.Status403Forbidden, context.Response.StatusCode); - } - } - - [Fact] - public async Task AuthorizedConnectionCanConnectToEndPoint() - { - using (StartVerifiableLog()) - { - var manager = CreateConnectionManager(LoggerFactory); - var connection = manager.CreateConnection(); - connection.TransportType = HttpTransportType.LongPolling; - var dispatcher = new HttpConnectionDispatcher(manager, LoggerFactory); - var context = new DefaultHttpContext(); - context.Features.Set(new ResponseFeature()); - var services = new ServiceCollection(); - services.AddOptions(); - services.AddSingleton(); - services.AddAuthorization(o => - { - o.AddPolicy("test", policy => - { - policy.RequireClaim(ClaimTypes.NameIdentifier); - }); - }); - services.AddLogging(); - services.AddAuthenticationCore(o => - { - o.DefaultScheme = "Default"; - o.AddScheme("Default", a => a.HandlerType = typeof(TestAuthenticationHandler)); - }); - var sp = services.BuildServiceProvider(); - context.Request.Path = "/foo"; - context.Request.Method = "GET"; - context.RequestServices = sp; - var values = new Dictionary(); - values["id"] = connection.ConnectionId; - var qs = new QueryCollection(values); - context.Request.Query = qs; - context.Response.Body = new MemoryStream(); - - var builder = new ConnectionBuilder(sp); - builder.UseConnectionHandler(); - var app = builder.Build(); - var options = new HttpConnectionDispatcherOptions(); - options.AuthorizationData.Add(new AuthorizeAttribute("test")); - - // "authorize" user - context.User = new ClaimsPrincipal(new ClaimsIdentity(new[] { new Claim(ClaimTypes.NameIdentifier, "name") })); - - var connectionHandlerTask = dispatcher.ExecuteAsync(context, options, app); - await connectionHandlerTask.OrTimeout(); - Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode); - - connectionHandlerTask = dispatcher.ExecuteAsync(context, options, app); - await connection.Transport.Output.WriteAsync(Encoding.UTF8.GetBytes("Hello, World")).AsTask().OrTimeout(); - await connectionHandlerTask.OrTimeout(); - - Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode); - Assert.Equal("Hello, World", GetContentAsString(context.Response.Body)); - } - } - - [Fact] - public async Task AllPoliciesRequiredForAuthorizedEndPoint() - { - using (StartVerifiableLog()) - { - var manager = CreateConnectionManager(LoggerFactory); - var connection = manager.CreateConnection(); - connection.TransportType = HttpTransportType.LongPolling; - var dispatcher = new HttpConnectionDispatcher(manager, LoggerFactory); - var context = new DefaultHttpContext(); - context.Features.Set(new ResponseFeature()); - var services = new ServiceCollection(); - services.AddOptions(); - services.AddSingleton(); - services.AddAuthorization(o => - { - o.AddPolicy("test", policy => - { - policy.RequireClaim(ClaimTypes.NameIdentifier); - }); - o.AddPolicy("secondPolicy", policy => - { - policy.RequireClaim(ClaimTypes.StreetAddress); - }); - }); - services.AddLogging(); - services.AddAuthenticationCore(o => - { - o.DefaultScheme = "Default"; - o.AddScheme("Default", a => a.HandlerType = typeof(TestAuthenticationHandler)); - }); - var sp = services.BuildServiceProvider(); - context.Request.Path = "/foo"; - context.Request.Method = "GET"; - context.RequestServices = sp; - var values = new Dictionary(); - values["id"] = connection.ConnectionId; - var qs = new QueryCollection(values); - context.Request.Query = qs; - context.Response.Body = new MemoryStream(); - - var builder = new ConnectionBuilder(sp); - builder.UseConnectionHandler(); - var app = builder.Build(); - var options = new HttpConnectionDispatcherOptions(); - options.AuthorizationData.Add(new AuthorizeAttribute("test")); - options.AuthorizationData.Add(new AuthorizeAttribute("secondPolicy")); - - // partially "authorize" user - context.User = new ClaimsPrincipal(new ClaimsIdentity(new[] { new Claim(ClaimTypes.NameIdentifier, "name") })); - - // would get stuck if EndPoint was running - await dispatcher.ExecuteAsync(context, options, app).OrTimeout(); - - Assert.Equal(StatusCodes.Status401Unauthorized, context.Response.StatusCode); - - // reset HttpContext - context = new DefaultHttpContext(); - context.Features.Set(new ResponseFeature()); - context.Request.Path = "/foo"; - context.Request.Method = "GET"; - context.RequestServices = sp; - context.Request.Query = qs; - context.Response.Body = new MemoryStream(); - // fully "authorize" user - context.User = new ClaimsPrincipal(new ClaimsIdentity(new[] - { - new Claim(ClaimTypes.NameIdentifier, "name"), - new Claim(ClaimTypes.StreetAddress, "12345 123rd St. NW") - })); - - // First poll - var connectionHandlerTask = dispatcher.ExecuteAsync(context, options, app); - Assert.True(connectionHandlerTask.IsCompleted); - Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode); - - connectionHandlerTask = dispatcher.ExecuteAsync(context, options, app); - await connection.Transport.Output.WriteAsync(Encoding.UTF8.GetBytes("Hello, World")).AsTask().OrTimeout(); - - await connectionHandlerTask.OrTimeout(); - - Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode); - Assert.Equal("Hello, World", GetContentAsString(context.Response.Body)); - } - } - - [Fact] - public async Task AuthorizedConnectionWithAcceptedSchemesCanConnectToEndPoint() - { - using (StartVerifiableLog()) - { - var manager = CreateConnectionManager(LoggerFactory); - var connection = manager.CreateConnection(); - connection.TransportType = HttpTransportType.LongPolling; - var dispatcher = new HttpConnectionDispatcher(manager, LoggerFactory); - var context = new DefaultHttpContext(); - context.Features.Set(new ResponseFeature()); - var services = new ServiceCollection(); - services.AddOptions(); - services.AddSingleton(); - services.AddAuthorization(o => - { - o.AddPolicy("test", policy => - { - policy.RequireClaim(ClaimTypes.NameIdentifier); - policy.AddAuthenticationSchemes("Default"); - }); - }); - services.AddLogging(); - services.AddAuthenticationCore(o => - { - o.DefaultScheme = "Default"; - o.AddScheme("Default", a => a.HandlerType = typeof(TestAuthenticationHandler)); - }); - var sp = services.BuildServiceProvider(); - context.Request.Path = "/foo"; - context.Request.Method = "GET"; - context.RequestServices = sp; - var values = new Dictionary(); - values["id"] = connection.ConnectionId; - var qs = new QueryCollection(values); - context.Request.Query = qs; - context.Response.Body = new MemoryStream(); - - var builder = new ConnectionBuilder(sp); - builder.UseConnectionHandler(); - var app = builder.Build(); - var options = new HttpConnectionDispatcherOptions(); - options.AuthorizationData.Add(new AuthorizeAttribute("test")); - - // "authorize" user - context.User = new ClaimsPrincipal(new ClaimsIdentity(new[] { new Claim(ClaimTypes.NameIdentifier, "name") })); - - // Initial poll - var connectionHandlerTask = dispatcher.ExecuteAsync(context, options, app); - Assert.True(connectionHandlerTask.IsCompleted); - Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode); - - connectionHandlerTask = dispatcher.ExecuteAsync(context, options, app); - await connection.Transport.Output.WriteAsync(Encoding.UTF8.GetBytes("Hello, World")).AsTask().OrTimeout(); - - await connectionHandlerTask.OrTimeout(); - - Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode); - Assert.Equal("Hello, World", GetContentAsString(context.Response.Body)); - } - } - - [Fact] - public async Task AuthorizedConnectionWithRejectedSchemesFailsToConnectToEndPoint() - { - using (StartVerifiableLog()) - { - var manager = CreateConnectionManager(LoggerFactory); - var connection = manager.CreateConnection(); - connection.TransportType = HttpTransportType.LongPolling; - var dispatcher = new HttpConnectionDispatcher(manager, LoggerFactory); - var context = new DefaultHttpContext(); - var services = new ServiceCollection(); - services.AddOptions(); - services.AddSingleton(); - services.AddAuthorization(o => - { - o.AddPolicy("test", policy => - { - policy.RequireClaim(ClaimTypes.NameIdentifier); - policy.AddAuthenticationSchemes("Default"); - }); - }); - services.AddLogging(); - services.AddAuthenticationCore(o => - { - o.DefaultScheme = "Default"; - o.AddScheme("Default", a => a.HandlerType = typeof(RejectHandler)); - }); - var sp = services.BuildServiceProvider(); - context.Request.Path = "/foo"; - context.Request.Method = "GET"; - context.RequestServices = sp; - var values = new Dictionary(); - values["id"] = connection.ConnectionId; - var qs = new QueryCollection(values); - context.Request.Query = qs; - context.Response.Body = new MemoryStream(); - - var builder = new ConnectionBuilder(sp); - builder.UseConnectionHandler(); - var app = builder.Build(); - var options = new HttpConnectionDispatcherOptions(); - options.AuthorizationData.Add(new AuthorizeAttribute("test")); - - // "authorize" user - context.User = new ClaimsPrincipal(new ClaimsIdentity(new[] { new Claim(ClaimTypes.NameIdentifier, "name") })); - - // would block if EndPoint was executed - await dispatcher.ExecuteAsync(context, options, app).OrTimeout(); - - Assert.Equal(StatusCodes.Status401Unauthorized, context.Response.StatusCode); - } - } - [Fact] public async Task SetsInherentKeepAliveFeatureOnFirstLongPollingRequest() { @@ -2118,50 +1767,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests } } - private class RejectHandler : TestAuthenticationHandler - { - protected override bool ShouldAccept => false; - } - - private class TestAuthenticationHandler : IAuthenticationHandler - { - private HttpContext HttpContext; - private AuthenticationScheme _scheme; - - protected virtual bool ShouldAccept => true; - - public Task AuthenticateAsync() - { - if (ShouldAccept) - { - return Task.FromResult(AuthenticateResult.Success(new AuthenticationTicket(HttpContext.User, _scheme.Name))); - } - else - { - return Task.FromResult(AuthenticateResult.NoResult()); - } - } - - public Task ChallengeAsync(AuthenticationProperties properties) - { - HttpContext.Response.StatusCode = StatusCodes.Status401Unauthorized; - return Task.CompletedTask; - } - - public Task ForbidAsync(AuthenticationProperties properties) - { - HttpContext.Response.StatusCode = StatusCodes.Status403Forbidden; - return Task.CompletedTask; - } - - public Task InitializeAsync(AuthenticationScheme scheme, HttpContext context) - { - HttpContext = context; - _scheme = scheme; - return Task.CompletedTask; - } - } - private static async Task CheckTransportSupported(HttpTransportType supportedTransports, HttpTransportType transportType, int status, ILoggerFactory loggerFactory) { var manager = CreateConnectionManager(loggerFactory); diff --git a/src/SignalR/common/Http.Connections/test/MapConnectionHandlerTests.cs b/src/SignalR/common/Http.Connections/test/MapConnectionHandlerTests.cs index 4541f5e3f1..1b5716c01c 100644 --- a/src/SignalR/common/Http.Connections/test/MapConnectionHandlerTests.cs +++ b/src/SignalR/common/Http.Connections/test/MapConnectionHandlerTests.cs @@ -4,11 +4,14 @@ using System; using System.Linq; using System.Net.WebSockets; +using System.Reflection; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Connections; +using Microsoft.AspNetCore.Cors; +using Microsoft.AspNetCore.Cors.Infrastructure; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.Server.Features; using Microsoft.AspNetCore.Routing; @@ -34,39 +37,113 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests public void MapConnectionHandlerFindsAuthAttributeOnEndPoint() { var authCount = 0; - using (var builder = BuildWebHost("/auth", + using (var host = BuildWebHost("/auth", options => authCount += options.AuthorizationData.Count)) { - builder.Start(); + host.Start(); + + var dataSource = host.Services.GetRequiredService(); + // We register 2 endpoints (/negotiate and /) + Assert.Collection(dataSource.Endpoints, + endpoint => + { + Assert.Equal("/auth/negotiate", endpoint.DisplayName); + Assert.Single(endpoint.Metadata.GetOrderedMetadata()); + }, + endpoint => + { + Assert.Equal("/auth", endpoint.DisplayName); + Assert.Single(endpoint.Metadata.GetOrderedMetadata()); + }); } - Assert.Equal(1, authCount); + Assert.Equal(0, authCount); } [Fact] public void MapConnectionHandlerFindsAuthAttributeOnInheritedEndPoint() { var authCount = 0; - using (var builder = BuildWebHost("/auth", + using (var host = BuildWebHost("/auth", options => authCount += options.AuthorizationData.Count)) { - builder.Start(); + host.Start(); + + var dataSource = host.Services.GetRequiredService(); + // We register 2 endpoints (/negotiate and /) + Assert.Collection(dataSource.Endpoints, + endpoint => + { + Assert.Equal("/auth/negotiate", endpoint.DisplayName); + Assert.Single(endpoint.Metadata.GetOrderedMetadata()); + }, + endpoint => + { + Assert.Equal("/auth", endpoint.DisplayName); + Assert.Single(endpoint.Metadata.GetOrderedMetadata()); + }); } - Assert.Equal(1, authCount); + Assert.Equal(0, authCount); } [Fact] + public void MapConnectionHandlerFindsAuthAttributesOnDoubleAuthEndPoint() { var authCount = 0; - using (var builder = BuildWebHost("/auth", + using (var host = BuildWebHost("/auth", options => authCount += options.AuthorizationData.Count)) { - builder.Start(); + host.Start(); + + var dataSource = host.Services.GetRequiredService(); + // We register 2 endpoints (/negotiate and /) + Assert.Collection(dataSource.Endpoints, + endpoint => + { + Assert.Equal("/auth/negotiate", endpoint.DisplayName); + Assert.Equal(2, endpoint.Metadata.GetOrderedMetadata().Count); + }, + endpoint => + { + Assert.Equal("/auth", endpoint.DisplayName); + Assert.Equal(2, endpoint.Metadata.GetOrderedMetadata().Count); + }); } - Assert.Equal(2, authCount); + Assert.Equal(0, authCount); + } + + [Fact] + public void MapConnectionHandlerFindsAttributesFromEndPointAndOptions() + { + var authCount = 0; + using (var host = BuildWebHost("/auth", + options => + { + authCount += options.AuthorizationData.Count; + options.AuthorizationData.Add(new AuthorizeAttribute()); + })) + { + host.Start(); + + var dataSource = host.Services.GetRequiredService(); + // We register 2 endpoints (/negotiate and /) + Assert.Collection(dataSource.Endpoints, + endpoint => + { + Assert.Equal("/auth/negotiate", endpoint.DisplayName); + Assert.Equal(2, endpoint.Metadata.GetOrderedMetadata().Count); + }, + endpoint => + { + Assert.Equal("/auth", endpoint.DisplayName); + Assert.Equal(2, endpoint.Metadata.GetOrderedMetadata().Count); + }); + } + + Assert.Equal(0, authCount); } [Fact] @@ -82,12 +159,50 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests var dataSource = host.Services.GetRequiredService(); // We register 2 endpoints (/negotiate and /) - Assert.Equal(2, dataSource.Endpoints.Count); - Assert.NotNull(dataSource.Endpoints[0].Metadata.GetMetadata()); - Assert.NotNull(dataSource.Endpoints[1].Metadata.GetMetadata()); + Assert.Collection(dataSource.Endpoints, + endpoint => + { + Assert.Equal("/path/negotiate", endpoint.DisplayName); + Assert.Single(endpoint.Metadata.GetOrderedMetadata()); + }, + endpoint => + { + Assert.Equal("/path", endpoint.DisplayName); + Assert.Single(endpoint.Metadata.GetOrderedMetadata()); + }); } - Assert.Equal(1, authCount); + Assert.Equal(0, authCount); + } + + [Fact] + public void MapConnectionHandlerEndPointRoutingFindsAttributesFromOptions() + { + var authCount = 0; + using (var host = BuildWebHostWithEndPointRouting(routes => routes.MapConnectionHandler("/path", options => + { + authCount += options.AuthorizationData.Count; + options.AuthorizationData.Add(new AuthorizeAttribute()); + }))) + { + host.Start(); + + var dataSource = host.Services.GetRequiredService(); + // We register 2 endpoints (/negotiate and /) + Assert.Collection(dataSource.Endpoints, + endpoint => + { + Assert.Equal("/path/negotiate", endpoint.DisplayName); + Assert.Equal(2, endpoint.Metadata.GetOrderedMetadata().Count); + }, + endpoint => + { + Assert.Equal("/path", endpoint.DisplayName); + Assert.Equal(2, endpoint.Metadata.GetOrderedMetadata().Count); + }); + } + + Assert.Equal(0, authCount); } [Fact] @@ -106,9 +221,27 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests var dataSource = host.Services.GetRequiredService(); // We register 2 endpoints (/negotiate and /) - Assert.Equal(2, dataSource.Endpoints.Count); - Assert.Equal("Foo", dataSource.Endpoints[0].Metadata.GetMetadata()?.Policy); - Assert.Equal("Foo", dataSource.Endpoints[1].Metadata.GetMetadata()?.Policy); + Assert.Collection(dataSource.Endpoints, + endpoint => + { + Assert.Equal("/path/negotiate", endpoint.DisplayName); + Assert.Collection(endpoint.Metadata.GetOrderedMetadata(), + auth => { }, + auth => + { + Assert.Equal("Foo", auth?.Policy); + }); + }, + endpoint => + { + Assert.Equal("/path", endpoint.DisplayName); + Assert.Collection(endpoint.Metadata.GetOrderedMetadata(), + auth => { }, + auth => + { + Assert.Equal("Foo", auth?.Policy); + }); + }); } } @@ -126,9 +259,45 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests var dataSource = host.Services.GetRequiredService(); // We register 2 endpoints (/negotiate and /) - Assert.Equal(2, dataSource.Endpoints.Count); - Assert.NotNull(dataSource.Endpoints[0].Metadata.GetMetadata()); - Assert.Null(dataSource.Endpoints[1].Metadata.GetMetadata()); + Assert.Collection(dataSource.Endpoints, + endpoint => + { + Assert.Equal("/path/negotiate", endpoint.DisplayName); + Assert.NotNull(endpoint.Metadata.GetMetadata()); + }, + endpoint => + { + Assert.Equal("/path", endpoint.DisplayName); + Assert.Null(endpoint.Metadata.GetMetadata()); + }); + } + } + + [Fact] + public void MapConnectionHandlerEndPointRoutingAppliesCorsMetadata() + { + void ConfigureRoutes(IEndpointRouteBuilder endpoints) + { + endpoints.MapConnectionHandler("/path"); + } + + using (var host = BuildWebHostWithEndPointRouting(ConfigureRoutes)) + { + host.Start(); + + var dataSource = host.Services.GetRequiredService(); + // We register 2 endpoints (/negotiate and /) + Assert.Collection(dataSource.Endpoints, + endpoint => + { + Assert.Equal("/path/negotiate", endpoint.DisplayName); + Assert.NotNull(endpoint.Metadata.GetMetadata()); + }, + endpoint => + { + Assert.Equal("/path", endpoint.DisplayName); + Assert.NotNull(endpoint.Metadata.GetMetadata()); + }); } } @@ -177,6 +346,15 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests } } + [EnableCors] + private class CorsConnectionHandler : ConnectionHandler + { + public override Task OnConnectedAsync(ConnectionContext connection) + { + throw new NotImplementedException(); + } + } + private class InheritedAuthConnectionHandler : AuthConnectionHandler { public override Task OnConnectedAsync(ConnectionContext connection) @@ -227,10 +405,12 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests }) .Configure(app => { +#pragma warning disable CS0618 // Type or member is obsolete app.UseConnections(routes => { routes.MapConnectionHandler(path, configureOptions); }); +#pragma warning restore CS0618 // Type or member is obsolete }) .ConfigureLogging(factory => { diff --git a/src/SignalR/common/Http.Connections/test/Microsoft.AspNetCore.Http.Connections.Tests.csproj b/src/SignalR/common/Http.Connections/test/Microsoft.AspNetCore.Http.Connections.Tests.csproj index 6c03dfe4eb..5a8aca685f 100644 --- a/src/SignalR/common/Http.Connections/test/Microsoft.AspNetCore.Http.Connections.Tests.csproj +++ b/src/SignalR/common/Http.Connections/test/Microsoft.AspNetCore.Http.Connections.Tests.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.0 @@ -6,6 +6,7 @@ + @@ -14,6 +15,7 @@ + diff --git a/src/SignalR/common/Protocols.Json/src/Protocol/JsonHubProtocol.cs b/src/SignalR/common/Protocols.Json/src/Protocol/JsonHubProtocol.cs index 15020e6991..84de212bfb 100644 --- a/src/SignalR/common/Protocols.Json/src/Protocol/JsonHubProtocol.cs +++ b/src/SignalR/common/Protocols.Json/src/Protocol/JsonHubProtocol.cs @@ -585,7 +585,7 @@ namespace Microsoft.AspNetCore.SignalR.Protocol private JsonDocument GetParsedObject(object obj, Type type) { - var bytes = JsonSerializer.ToBytes(obj, type, _payloadSerializerOptions); + var bytes = JsonSerializer.ToUtf8Bytes(obj, type, _payloadSerializerOptions); var token = JsonDocument.Parse(bytes); return token; } diff --git a/src/SignalR/server/Core/src/Internal/TaskCache.cs b/src/SignalR/common/Shared/TaskCache.cs similarity index 88% rename from src/SignalR/server/Core/src/Internal/TaskCache.cs rename to src/SignalR/common/Shared/TaskCache.cs index e11f53506e..2df6d85ed9 100644 --- a/src/SignalR/server/Core/src/Internal/TaskCache.cs +++ b/src/SignalR/common/Shared/TaskCache.cs @@ -3,11 +3,11 @@ using System.Threading.Tasks; -namespace Microsoft.AspNetCore.SignalR.Internal +namespace Microsoft.AspNetCore.Internal { internal static class TaskCache { public static readonly Task True = Task.FromResult(true); public static readonly Task False = Task.FromResult(false); } -} \ No newline at end of file +} diff --git a/src/SignalR/common/testassets/Tests.Utils/TaskExtensions.cs b/src/SignalR/common/testassets/Tests.Utils/TaskExtensions.cs index 5aa1675012..2e0a5215c3 100644 --- a/src/SignalR/common/testassets/Tests.Utils/TaskExtensions.cs +++ b/src/SignalR/common/testassets/Tests.Utils/TaskExtensions.cs @@ -17,6 +17,16 @@ namespace System.Threading.Tasks { private const int DefaultTimeout = 30 * 1000; + public static Task OrTimeout(this ValueTask task, int milliseconds = DefaultTimeout, [CallerMemberName] string memberName = null, [CallerFilePath] string filePath = null, [CallerLineNumber] int? lineNumber = null) + { + return OrTimeout(task, new TimeSpan(0, 0, 0, 0, milliseconds), memberName, filePath, lineNumber); + } + + public static Task OrTimeout(this ValueTask task, TimeSpan timeout, [CallerMemberName] string memberName = null, [CallerFilePath] string filePath = null, [CallerLineNumber] int? lineNumber = null) + { + return task.AsTask().TimeoutAfter(timeout, filePath, lineNumber ?? 0); + } + public static Task OrTimeout(this Task task, int milliseconds = DefaultTimeout, [CallerMemberName] string memberName = null, [CallerFilePath] string filePath = null, [CallerLineNumber] int? lineNumber = null) { return OrTimeout(task, new TimeSpan(0, 0, 0, 0, milliseconds), memberName, filePath, lineNumber); diff --git a/src/SignalR/samples/ClientSample/Tcp/TcpConnection.cs b/src/SignalR/samples/ClientSample/Tcp/TcpConnection.cs index 1fbb213b9b..d2802b2e0c 100644 --- a/src/SignalR/samples/ClientSample/Tcp/TcpConnection.cs +++ b/src/SignalR/samples/ClientSample/Tcp/TcpConnection.cs @@ -43,14 +43,14 @@ namespace ClientSample // We claim to have inherent keep-alive so the client doesn't kill the connection when it hasn't seen ping frames. public bool HasInherentKeepAlive { get; } = true; - public Task DisposeAsync() + public override ValueTask DisposeAsync() { Transport?.Output.Complete(); Transport?.Input.Complete(); _socket?.Dispose(); - return Task.CompletedTask; + return default; } public async Task StartAsync() diff --git a/src/SignalR/samples/ClientSample/Tcp/TcpHubConnectionBuilderExtensions.cs b/src/SignalR/samples/ClientSample/Tcp/TcpHubConnectionBuilderExtensions.cs index 763725cb69..a52b18600e 100644 --- a/src/SignalR/samples/ClientSample/Tcp/TcpHubConnectionBuilderExtensions.cs +++ b/src/SignalR/samples/ClientSample/Tcp/TcpHubConnectionBuilderExtensions.cs @@ -54,7 +54,7 @@ namespace Microsoft.AspNetCore.SignalR.Client public Task DisposeAsync(ConnectionContext connection) { - return ((TcpConnection)connection).DisposeAsync(); + return connection.DisposeAsync().AsTask(); } } } diff --git a/src/SignalR/server/Core/src/Internal/DefaultHubDispatcher.cs b/src/SignalR/server/Core/src/Internal/DefaultHubDispatcher.cs index ee39dcad9d..16f1b8da63 100644 --- a/src/SignalR/server/Core/src/Internal/DefaultHubDispatcher.cs +++ b/src/SignalR/server/Core/src/Internal/DefaultHubDispatcher.cs @@ -11,6 +11,7 @@ using System.Threading; using System.Threading.Channels; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Internal; using Microsoft.AspNetCore.SignalR.Protocol; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Internal; diff --git a/src/SignalR/server/Core/src/Microsoft.AspNetCore.SignalR.Core.csproj b/src/SignalR/server/Core/src/Microsoft.AspNetCore.SignalR.Core.csproj index 8d8194fbc7..5db9ea75b2 100644 --- a/src/SignalR/server/Core/src/Microsoft.AspNetCore.SignalR.Core.csproj +++ b/src/SignalR/server/Core/src/Microsoft.AspNetCore.SignalR.Core.csproj @@ -12,6 +12,7 @@ + diff --git a/src/SignalR/server/SignalR/ref/Microsoft.AspNetCore.SignalR.netcoreapp3.0.cs b/src/SignalR/server/SignalR/ref/Microsoft.AspNetCore.SignalR.netcoreapp3.0.cs index 27663babcc..56b62a7317 100644 --- a/src/SignalR/server/SignalR/ref/Microsoft.AspNetCore.SignalR.netcoreapp3.0.cs +++ b/src/SignalR/server/SignalR/ref/Microsoft.AspNetCore.SignalR.netcoreapp3.0.cs @@ -10,6 +10,7 @@ namespace Microsoft.AspNetCore.Builder } public static partial class SignalRAppBuilderExtensions { + [System.ObsoleteAttribute("This method is obsolete and will be removed in a future version. The recommended alternative is to use MapHub inside Microsoft.AspNetCore.Builder.UseEndpoints(...).")] public static Microsoft.AspNetCore.Builder.IApplicationBuilder UseSignalR(this Microsoft.AspNetCore.Builder.IApplicationBuilder app, System.Action configure) { throw null; } } } @@ -25,6 +26,7 @@ namespace Microsoft.AspNetCore.SignalR internal HubEndpointConventionBuilder() { } public void Add(System.Action convention) { } } + [System.ObsoleteAttribute("This class is obsolete and will be removed in a future version. The recommended alternative is to use MapHub inside Microsoft.AspNetCore.Builder.UseEndpoints(...).")] public partial class HubRouteBuilder { public HubRouteBuilder(Microsoft.AspNetCore.Http.Connections.ConnectionsRouteBuilder routes) { } diff --git a/src/SignalR/server/SignalR/src/HubEndpointRouteBuilderExtensions.cs b/src/SignalR/server/SignalR/src/HubEndpointRouteBuilderExtensions.cs index f53632d00f..553ea3f8ce 100644 --- a/src/SignalR/server/SignalR/src/HubEndpointRouteBuilderExtensions.cs +++ b/src/SignalR/server/SignalR/src/HubEndpointRouteBuilderExtensions.cs @@ -2,8 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Linq; -using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http.Connections; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.SignalR; @@ -44,14 +42,6 @@ namespace Microsoft.AspNetCore.Builder } var options = new HttpConnectionDispatcherOptions(); - // REVIEW: WE should consider removing this and instead just relying on the - // AuthorizationMiddleware - var attributes = typeof(THub).GetCustomAttributes(inherit: true); - foreach (var attribute in attributes.OfType()) - { - options.AuthorizationData.Add(attribute); - } - configureOptions?.Invoke(options); var conventionBuilder = endpoints.MapConnections(pattern, options, b => @@ -59,9 +49,10 @@ namespace Microsoft.AspNetCore.Builder b.UseHub(); }); + var attributes = typeof(THub).GetCustomAttributes(inherit: true); conventionBuilder.Add(e => { - // Add all attributes on the Hub has metadata (this will allow for things like) + // Add all attributes on the Hub as metadata (this will allow for things like) // auth attributes and cors attributes to work seamlessly foreach (var item in attributes) { diff --git a/src/SignalR/server/SignalR/src/HubRouteBuilder.cs b/src/SignalR/server/SignalR/src/HubRouteBuilder.cs index 06f945bbb0..cf9f694bb3 100644 --- a/src/SignalR/server/SignalR/src/HubRouteBuilder.cs +++ b/src/SignalR/server/SignalR/src/HubRouteBuilder.cs @@ -4,17 +4,25 @@ using System; using System.Reflection; using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Connections; +using Microsoft.AspNetCore.Routing; namespace Microsoft.AspNetCore.SignalR { /// /// Maps incoming requests to types. + /// + /// This class is obsolete and will be removed in a future version. + /// The recommended alternative is to use MapHub<THub> inside Microsoft.AspNetCore.Builder.UseEndpoints(...). + /// /// + [Obsolete("This class is obsolete and will be removed in a future version. The recommended alternative is to use MapHub inside Microsoft.AspNetCore.Builder.UseEndpoints(...).")] public class HubRouteBuilder { private readonly ConnectionsRouteBuilder _routes; + private readonly IEndpointRouteBuilder _endpoints; /// /// Initializes a new instance of the class. @@ -25,6 +33,11 @@ namespace Microsoft.AspNetCore.SignalR _routes = routes; } + internal HubRouteBuilder(IEndpointRouteBuilder endpoints) + { + _endpoints = endpoints; + } + /// /// Maps incoming requests with the specified path to the specified type. /// @@ -43,6 +56,14 @@ namespace Microsoft.AspNetCore.SignalR /// A callback to configure dispatcher options. public void MapHub(PathString path, Action configureOptions) where THub : Hub { + // This will be null if someone is manually using the HubRouteBuilder(ConnectionsRouteBuilder routes) constructor + // SignalR itself will only use the IEndpointRouteBuilder overload + if (_endpoints != null) + { + _endpoints.MapHub(path, configureOptions); + return; + } + // find auth attributes var authorizeAttributes = typeof(THub).GetCustomAttributes(inherit: true); var options = new HttpConnectionDispatcherOptions(); diff --git a/src/SignalR/server/SignalR/src/SignalRAppBuilderExtensions.cs b/src/SignalR/server/SignalR/src/SignalRAppBuilderExtensions.cs index 8a85de1a70..e01870193a 100644 --- a/src/SignalR/server/SignalR/src/SignalRAppBuilderExtensions.cs +++ b/src/SignalR/server/SignalR/src/SignalRAppBuilderExtensions.cs @@ -14,10 +14,15 @@ namespace Microsoft.AspNetCore.Builder { /// /// Adds SignalR to the request execution pipeline. + /// + /// This method is obsolete and will be removed in a future version. + /// The recommended alternative is to use MapHub<THub> inside Microsoft.AspNetCore.Builder.UseEndpoints(...). + /// /// /// The . /// A callback to configure hub routes. /// The same instance of the for chaining. + [Obsolete("This method is obsolete and will be removed in a future version. The recommended alternative is to use MapHub inside Microsoft.AspNetCore.Builder.UseEndpoints(...).")] public static IApplicationBuilder UseSignalR(this IApplicationBuilder app, Action configure) { var marker = app.ApplicationServices.GetService(); @@ -27,9 +32,12 @@ namespace Microsoft.AspNetCore.Builder "'IServiceCollection.AddSignalR' inside the call to 'ConfigureServices(...)' in the application startup code."); } - app.UseConnections(routes => + app.UseWebSockets(); + app.UseRouting(); + app.UseAuthorization(); + app.UseEndpoints(endpoints => { - configure(new HubRouteBuilder(routes)); + configure(new HubRouteBuilder(endpoints)); }); return app; diff --git a/src/SignalR/server/SignalR/test/AuthHub.cs b/src/SignalR/server/SignalR/test/AuthHub.cs new file mode 100644 index 0000000000..6adf678870 --- /dev/null +++ b/src/SignalR/server/SignalR/test/AuthHub.cs @@ -0,0 +1,12 @@ +// 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 Microsoft.AspNetCore.Authorization; + +namespace Microsoft.AspNetCore.SignalR.Tests +{ + [Authorize] + class AuthHub : Hub + { + } +} diff --git a/src/SignalR/server/SignalR/test/EndToEndTests.cs b/src/SignalR/server/SignalR/test/EndToEndTests.cs index ae59219a94..b3aabeee1c 100644 --- a/src/SignalR/server/SignalR/test/EndToEndTests.cs +++ b/src/SignalR/server/SignalR/test/EndToEndTests.cs @@ -446,6 +446,52 @@ namespace Microsoft.AspNetCore.SignalR.Tests } } + [Fact] + [LogLevel(LogLevel.Trace)] + public async Task AuthorizedConnectionCanConnect() + { + bool ExpectedErrors(WriteContext writeContext) + { + return writeContext.LoggerName == typeof(HttpConnection).FullName && + writeContext.EventId.Name == "ErrorWithNegotiation"; + } + + using (StartServer(out var server, ExpectedErrors)) + { + var logger = LoggerFactory.CreateLogger(); + + string token; + using (var client = new HttpClient()) + { + client.BaseAddress = new Uri(server.Url); + + var response = await client.GetAsync("generatetoken?user=bob"); + token = await response.Content.ReadAsStringAsync(); + } + + var url = server.Url + "/auth"; + var connection = new HttpConnection(new HttpConnectionOptions() + { + AccessTokenProvider = () => Task.FromResult(token), + Url = new Uri(url), + Transports = HttpTransportType.ServerSentEvents + }, LoggerFactory); + + try + { + logger.LogInformation("Starting connection to {url}", url); + await connection.StartAsync(TransferFormat.Text).OrTimeout(); + logger.LogInformation("Connected to {url}", url); + } + finally + { + logger.LogInformation("Disposing Connection"); + await connection.DisposeAsync().OrTimeout(); + logger.LogInformation("Disposed Connection"); + } + } + } + [ConditionalFact] [WebSocketsSupportedCondition] public async Task ServerClosesConnectionWithErrorIfHubCannotBeCreated_WebSocket() @@ -532,6 +578,178 @@ namespace Microsoft.AspNetCore.SignalR.Tests } } + [Fact] + [LogLevel(LogLevel.Trace)] + public async Task UnauthorizedHubConnectionDoesNotConnectWithEndpoints() + { + bool ExpectedErrors(WriteContext writeContext) + { + return writeContext.LoggerName == typeof(HttpConnection).FullName && + writeContext.EventId.Name == "ErrorWithNegotiation"; + } + + using (StartServer(out var server, ExpectedErrors)) + { + var logger = LoggerFactory.CreateLogger(); + + var url = server.Url + "/authHubEndpoints"; + var connection = new HubConnectionBuilder() + .WithLoggerFactory(LoggerFactory) + .WithUrl(url, HttpTransportType.LongPolling) + .Build(); + + try + { + logger.LogInformation("Starting connection to {url}", url); + await connection.StartAsync().OrTimeout(); + Assert.True(false); + } + catch (Exception ex) + { + Assert.Equal("Response status code does not indicate success: 401 (Unauthorized).", ex.Message); + } + finally + { + logger.LogInformation("Disposing Connection"); + await connection.DisposeAsync().OrTimeout(); + logger.LogInformation("Disposed Connection"); + } + } + } + + [Fact] + [LogLevel(LogLevel.Trace)] + public async Task UnauthorizedHubConnectionDoesNotConnect() + { + bool ExpectedErrors(WriteContext writeContext) + { + return writeContext.LoggerName == typeof(HttpConnection).FullName && + writeContext.EventId.Name == "ErrorWithNegotiation"; + } + + using (StartServer(out var server, ExpectedErrors)) + { + var logger = LoggerFactory.CreateLogger(); + + var url = server.Url + "/authHub"; + var connection = new HubConnectionBuilder() + .WithLoggerFactory(LoggerFactory) + .WithUrl(url, HttpTransportType.LongPolling) + .Build(); + + try + { + logger.LogInformation("Starting connection to {url}", url); + await connection.StartAsync().OrTimeout(); + Assert.True(false); + } + catch (Exception ex) + { + Assert.Equal("Response status code does not indicate success: 401 (Unauthorized).", ex.Message); + } + finally + { + logger.LogInformation("Disposing Connection"); + await connection.DisposeAsync().OrTimeout(); + logger.LogInformation("Disposed Connection"); + } + } + } + + [Fact] + [LogLevel(LogLevel.Trace)] + public async Task AuthorizedHubConnectionCanConnectWithEndpoints() + { + bool ExpectedErrors(WriteContext writeContext) + { + return writeContext.LoggerName == typeof(HttpConnection).FullName && + writeContext.EventId.Name == "ErrorWithNegotiation"; + } + + using (StartServer(out var server, ExpectedErrors)) + { + var logger = LoggerFactory.CreateLogger(); + + string token; + using (var client = new HttpClient()) + { + client.BaseAddress = new Uri(server.Url); + + var response = await client.GetAsync("generatetoken?user=bob"); + token = await response.Content.ReadAsStringAsync(); + } + + var url = server.Url + "/authHubEndpoints"; + var connection = new HubConnectionBuilder() + .WithLoggerFactory(LoggerFactory) + .WithUrl(url, HttpTransportType.LongPolling, o => + { + o.AccessTokenProvider = () => Task.FromResult(token); + }) + .Build(); + + try + { + logger.LogInformation("Starting connection to {url}", url); + await connection.StartAsync().OrTimeout(); + logger.LogInformation("Connected to {url}", url); + } + finally + { + logger.LogInformation("Disposing Connection"); + await connection.DisposeAsync().OrTimeout(); + logger.LogInformation("Disposed Connection"); + } + } + } + + [Fact] + [LogLevel(LogLevel.Trace)] + public async Task AuthorizedHubConnectionCanConnect() + { + bool ExpectedErrors(WriteContext writeContext) + { + return writeContext.LoggerName == typeof(HttpConnection).FullName && + writeContext.EventId.Name == "ErrorWithNegotiation"; + } + + using (StartServer(out var server, ExpectedErrors)) + { + var logger = LoggerFactory.CreateLogger(); + + string token; + using (var client = new HttpClient()) + { + client.BaseAddress = new Uri(server.Url); + + var response = await client.GetAsync("generatetoken?user=bob"); + token = await response.Content.ReadAsStringAsync(); + } + + var url = server.Url + "/authHub"; + var connection = new HubConnectionBuilder() + .WithLoggerFactory(LoggerFactory) + .WithUrl(url, HttpTransportType.LongPolling, o => + { + o.AccessTokenProvider = () => Task.FromResult(token); + }) + .Build(); + + try + { + logger.LogInformation("Starting connection to {url}", url); + await connection.StartAsync().OrTimeout(); + logger.LogInformation("Connected to {url}", url); + } + finally + { + logger.LogInformation("Disposing Connection"); + await connection.DisposeAsync().OrTimeout(); + logger.LogInformation("Disposed Connection"); + } + } + } + // Serves a fake transport that lets us verify fallback behavior private class TestTransportFactory : ITransportFactory { diff --git a/src/SignalR/server/SignalR/test/MapSignalRTests.cs b/src/SignalR/server/SignalR/test/MapSignalRTests.cs index 40ea60382f..01bc4d2e33 100644 --- a/src/SignalR/server/SignalR/test/MapSignalRTests.cs +++ b/src/SignalR/server/SignalR/test/MapSignalRTests.cs @@ -1,7 +1,4 @@ using System; -using System.Collections; -using System.Collections.Generic; -using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; @@ -42,10 +39,12 @@ namespace Microsoft.AspNetCore.SignalR.Tests var ex = Assert.Throws(() => { +#pragma warning disable CS0618 // Type or member is obsolete app.UseSignalR(routes => { routes.MapHub("/overloads"); }); +#pragma warning restore CS0618 // Type or member is obsolete }); Assert.Equal("Unable to find the required services. Please add all the required services by calling " + @@ -109,9 +108,23 @@ namespace Microsoft.AspNetCore.SignalR.Tests }))) { host.Start(); + + var dataSource = host.Services.GetRequiredService(); + // We register 2 endpoints (/negotiate and /) + Assert.Collection(dataSource.Endpoints, + endpoint => + { + Assert.Equal("/path/negotiate", endpoint.DisplayName); + Assert.Equal(1, endpoint.Metadata.GetOrderedMetadata().Count); + }, + endpoint => + { + Assert.Equal("/path", endpoint.DisplayName); + Assert.Equal(1, endpoint.Metadata.GetOrderedMetadata().Count); + }); } - Assert.Equal(1, authCount); + Assert.Equal(0, authCount); } [Fact] @@ -124,9 +137,23 @@ namespace Microsoft.AspNetCore.SignalR.Tests }))) { host.Start(); + + var dataSource = host.Services.GetRequiredService(); + // We register 2 endpoints (/negotiate and /) + Assert.Collection(dataSource.Endpoints, + endpoint => + { + Assert.Equal("/path/negotiate", endpoint.DisplayName); + Assert.Equal(1, endpoint.Metadata.GetOrderedMetadata().Count); + }, + endpoint => + { + Assert.Equal("/path", endpoint.DisplayName); + Assert.Equal(1, endpoint.Metadata.GetOrderedMetadata().Count); + }); } - Assert.Equal(1, authCount); + Assert.Equal(0, authCount); } [Fact] @@ -139,9 +166,23 @@ namespace Microsoft.AspNetCore.SignalR.Tests }))) { host.Start(); + + var dataSource = host.Services.GetRequiredService(); + // We register 2 endpoints (/negotiate and /) + Assert.Collection(dataSource.Endpoints, + endpoint => + { + Assert.Equal("/path/negotiate", endpoint.DisplayName); + Assert.Equal(2, endpoint.Metadata.GetOrderedMetadata().Count); + }, + endpoint => + { + Assert.Equal("/path", endpoint.DisplayName); + Assert.Equal(2, endpoint.Metadata.GetOrderedMetadata().Count); + }); } - Assert.Equal(2, authCount); + Assert.Equal(0, authCount); } [Fact] @@ -157,12 +198,52 @@ namespace Microsoft.AspNetCore.SignalR.Tests var dataSource = host.Services.GetRequiredService(); // We register 2 endpoints (/negotiate and /) - Assert.Equal(2, dataSource.Endpoints.Count); - Assert.NotNull(dataSource.Endpoints[0].Metadata.GetMetadata()); - Assert.NotNull(dataSource.Endpoints[1].Metadata.GetMetadata()); + Assert.Collection(dataSource.Endpoints, + endpoint => + { + Assert.Equal("/path/negotiate", endpoint.DisplayName); + Assert.Equal(1, endpoint.Metadata.GetOrderedMetadata().Count); + }, + endpoint => + { + Assert.Equal("/path", endpoint.DisplayName); + Assert.Equal(1, endpoint.Metadata.GetOrderedMetadata().Count); + }); } - Assert.Equal(1, authCount); + Assert.Equal(0, authCount); + } + + [Fact] + public void MapHubEndPointRoutingFindsAttributesOnHubAndFromOptions() + { + var authCount = 0; + HttpConnectionDispatcherOptions configuredOptions = null; + using (var host = BuildWebHostWithEndPointRouting(routes => routes.MapHub("/path", options => + { + authCount += options.AuthorizationData.Count; + options.AuthorizationData.Add(new AuthorizeAttribute()); + configuredOptions = options; + }))) + { + host.Start(); + + var dataSource = host.Services.GetRequiredService(); + // We register 2 endpoints (/negotiate and /) + Assert.Collection(dataSource.Endpoints, + endpoint => + { + Assert.Equal("/path/negotiate", endpoint.DisplayName); + Assert.Equal(2, endpoint.Metadata.GetOrderedMetadata().Count); + }, + endpoint => + { + Assert.Equal("/path", endpoint.DisplayName); + Assert.Equal(2, endpoint.Metadata.GetOrderedMetadata().Count); + }); + } + + Assert.Equal(0, authCount); } [Fact] @@ -181,9 +262,27 @@ namespace Microsoft.AspNetCore.SignalR.Tests var dataSource = host.Services.GetRequiredService(); // We register 2 endpoints (/negotiate and /) - Assert.Equal(2, dataSource.Endpoints.Count); - Assert.Equal("Foo", dataSource.Endpoints[0].Metadata.GetMetadata()?.Policy); - Assert.Equal("Foo", dataSource.Endpoints[1].Metadata.GetMetadata()?.Policy); + Assert.Collection(dataSource.Endpoints, + endpoint => + { + Assert.Equal("/path/negotiate", endpoint.DisplayName); + Assert.Collection(endpoint.Metadata.GetOrderedMetadata(), + auth => { }, + auth => + { + Assert.Equal("Foo", auth?.Policy); + }); + }, + endpoint => + { + Assert.Equal("/path", endpoint.DisplayName); + Assert.Collection(endpoint.Metadata.GetOrderedMetadata(), + auth => { }, + auth => + { + Assert.Equal("Foo", auth?.Policy); + }); + }); } } @@ -202,11 +301,52 @@ namespace Microsoft.AspNetCore.SignalR.Tests var dataSource = host.Services.GetRequiredService(); // We register 2 endpoints (/negotiate and /) - Assert.Equal(2, dataSource.Endpoints.Count); - Assert.Equal(typeof(AuthHub), dataSource.Endpoints[0].Metadata.GetMetadata()?.HubType); - Assert.Equal(typeof(AuthHub), dataSource.Endpoints[1].Metadata.GetMetadata()?.HubType); - Assert.NotNull(dataSource.Endpoints[0].Metadata.GetMetadata()); - Assert.Null(dataSource.Endpoints[1].Metadata.GetMetadata()); + Assert.Collection(dataSource.Endpoints, + endpoint => + { + Assert.Equal("/path/negotiate", endpoint.DisplayName); + Assert.Equal(typeof(AuthHub), endpoint.Metadata.GetMetadata()?.HubType); + Assert.NotNull(endpoint.Metadata.GetMetadata()); + }, + endpoint => + { + Assert.Equal("/path", endpoint.DisplayName); + Assert.Equal(typeof(AuthHub), endpoint.Metadata.GetMetadata()?.HubType); + Assert.Null(endpoint.Metadata.GetMetadata()); + }); + } + } + + [Fact] + public void MapHubAppliesHubMetadata() + { +#pragma warning disable CS0618 // Type or member is obsolete + void ConfigureRoutes(HubRouteBuilder routes) +#pragma warning restore CS0618 // Type or member is obsolete + { + // This "Foo" policy should override the default auth attribute + routes.MapHub("/path"); + } + + using (var host = BuildWebHost(ConfigureRoutes)) + { + host.Start(); + + var dataSource = host.Services.GetRequiredService(); + // We register 2 endpoints (/negotiate and /) + Assert.Collection(dataSource.Endpoints, + endpoint => + { + Assert.Equal("/path/negotiate", endpoint.DisplayName); + Assert.Equal(typeof(AuthHub), endpoint.Metadata.GetMetadata()?.HubType); + Assert.NotNull(endpoint.Metadata.GetMetadata()); + }, + endpoint => + { + Assert.Equal("/path", endpoint.DisplayName); + Assert.Equal(typeof(AuthHub), endpoint.Metadata.GetMetadata()?.HubType); + Assert.Null(endpoint.Metadata.GetMetadata()); + }); } } @@ -252,6 +392,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests .Build(); } +#pragma warning disable CS0618 // Type or member is obsolete private IWebHost BuildWebHost(Action configure) { return new WebHostBuilder() @@ -267,5 +408,6 @@ namespace Microsoft.AspNetCore.SignalR.Tests .UseUrls("http://127.0.0.1:0") .Build(); } +#pragma warning restore CS0618 // Type or member is obsolete } } diff --git a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.csproj b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.csproj index c4fd5fd37b..527ae19b19 100644 --- a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.csproj +++ b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.csproj @@ -1,17 +1,20 @@ - + netcoreapp3.0 + + + - + @@ -23,4 +26,4 @@ - + \ No newline at end of file diff --git a/src/SignalR/server/SignalR/test/SerializedHubMessageTests.cs b/src/SignalR/server/SignalR/test/SerializedHubMessageTests.cs index b69952b523..da55a5e675 100644 --- a/src/SignalR/server/SignalR/test/SerializedHubMessageTests.cs +++ b/src/SignalR/server/SignalR/test/SerializedHubMessageTests.cs @@ -1,5 +1,6 @@ using System.Linq; using System.Threading.Tasks; +using Microsoft.AspNetCore.Internal; using Microsoft.AspNetCore.SignalR.Protocol; using Xunit; diff --git a/src/SignalR/server/SignalR/test/Startup.cs b/src/SignalR/server/SignalR/test/Startup.cs index 0f8ff7f21a..25612f917f 100644 --- a/src/SignalR/server/SignalR/test/Startup.cs +++ b/src/SignalR/server/SignalR/test/Startup.cs @@ -1,14 +1,24 @@ // 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 Microsoft.AspNetCore.Authentication.Cookies; +using System; +using System.IdentityModel.Tokens.Jwt; +using System.Security.Claims; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; +using Microsoft.IdentityModel.Tokens; namespace Microsoft.AspNetCore.SignalR.Tests { public class Startup { + private readonly SymmetricSecurityKey SecurityKey = new SymmetricSecurityKey(Guid.NewGuid().ToByteArray()); + private readonly JwtSecurityTokenHandler JwtTokenHandler = new JwtSecurityTokenHandler(); + public void ConfigureServices(IServiceCollection services) { services.AddConnections(); @@ -19,11 +29,40 @@ namespace Microsoft.AspNetCore.SignalR.Tests services.AddAuthentication(options => { - options.DefaultAuthenticateScheme = CookieAuthenticationDefaults.AuthenticationScheme; - options.DefaultChallengeScheme = CookieAuthenticationDefaults.AuthenticationScheme; - }).AddCookie(); + options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; + options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme; + }).AddJwtBearer(options => + { + options.TokenValidationParameters = + new TokenValidationParameters + { + LifetimeValidator = (before, expires, token, parameters) => expires > DateTime.UtcNow, + ValidateAudience = false, + ValidateIssuer = false, + ValidateActor = false, + ValidateLifetime = true, + IssuerSigningKey = SecurityKey + }; + + options.Events = new JwtBearerEvents + { + OnMessageReceived = context => + { + var accessToken = context.Request.Query["access_token"]; + + if (!string.IsNullOrEmpty(accessToken) && + (context.HttpContext.WebSockets.IsWebSocketRequest || context.Request.Headers["Accept"] == "text/event-stream")) + { + context.Token = context.Request.Query["access_token"]; + } + return Task.CompletedTask; + } + }; + }); services.AddAuthorization(); + + services.AddSingleton(); } public void Configure(IApplicationBuilder app) @@ -32,15 +71,37 @@ namespace Microsoft.AspNetCore.SignalR.Tests app.UseAuthentication(); app.UseAuthorization(); + // Legacy routing, runs different code path for mapping hubs +#pragma warning disable CS0618 // Type or member is obsolete + app.UseSignalR(routes => + { + routes.MapHub("/authHub"); + }); +#pragma warning restore CS0618 // Type or member is obsolete + app.UseEndpoints(endpoints => { endpoints.MapHub("/uncreatable"); + endpoints.MapHub("/authHubEndpoints"); endpoints.MapConnectionHandler("/echo"); endpoints.MapConnectionHandler("/echoAndClose"); endpoints.MapConnectionHandler("/httpheader"); endpoints.MapConnectionHandler("/auth"); + + endpoints.MapGet("/generatetoken", context => + { + return context.Response.WriteAsync(GenerateToken(context)); + }); }); } + + private string GenerateToken(HttpContext httpContext) + { + var claims = new[] { new Claim(ClaimTypes.NameIdentifier, httpContext.Request.Query["user"]) }; + var credentials = new SigningCredentials(SecurityKey, SecurityAlgorithms.HmacSha256); + var token = new JwtSecurityToken("SignalRTestServer", "SignalRTests", claims, expires: DateTime.UtcNow.AddMinutes(1), signingCredentials: credentials); + return JwtTokenHandler.WriteToken(token); + } } } diff --git a/src/SignalR/server/SignalR/test/TestAuthHandler.cs b/src/SignalR/server/SignalR/test/TestAuthHandler.cs new file mode 100644 index 0000000000..0e070944a1 --- /dev/null +++ b/src/SignalR/server/SignalR/test/TestAuthHandler.cs @@ -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.Security.Claims; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; + +namespace Microsoft.AspNetCore.SignalR.Tests +{ + public class TestAuthHandler : IAuthorizationHandler + { + public Task HandleAsync(AuthorizationHandlerContext context) + { + foreach (var req in context.Requirements) + { + context.Succeed(req); + } + + var hasClaim = context.User.HasClaim(o => o.Type == ClaimTypes.NameIdentifier && !string.IsNullOrEmpty(o.Value)); + + if (!hasClaim) + { + context.Fail(); + } + + return Task.CompletedTask; + } + } +} diff --git a/src/SignalR/server/SignalR/test/UncreatableHub.cs b/src/SignalR/server/SignalR/test/UncreatableHub.cs index 97142cf271..e481613f72 100644 --- a/src/SignalR/server/SignalR/test/UncreatableHub.cs +++ b/src/SignalR/server/SignalR/test/UncreatableHub.cs @@ -1,9 +1,9 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 Microsoft.AspNetCore.SignalR.Tests { - public class UncreatableHub: Hub + public class UncreatableHub : Hub { public UncreatableHub(object obj) { diff --git a/src/SignalR/server/StackExchangeRedis/test/Docker.cs b/src/SignalR/server/StackExchangeRedis/test/Docker.cs index c5f613461e..cdcbe9bfcc 100644 --- a/src/SignalR/server/StackExchangeRedis/test/Docker.cs +++ b/src/SignalR/server/StackExchangeRedis/test/Docker.cs @@ -81,6 +81,9 @@ namespace Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests { logger.LogError(ex, "Error starting redis docker container, retrying."); Thread.Sleep(1000); + + // Call stop just in case the container somehow started after the timeout so our retry logic doesn't fail + RunProcessAndWait(_path, $"stop {_dockerContainerName}", "docker stop", logger, TimeSpan.FromSeconds(15), out var _); Run(); } @@ -90,7 +93,7 @@ namespace Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests // use static name 'redisTestContainer' so if the container doesn't get removed we don't keep adding more // use redis base docker image // 30 second timeout to allow redis image to be downloaded, should be a rare occurrence, only happening when a new version is released - RunProcessAndThrowIfFailed(_path, $"run --rm -p 6379:6379 --name {_dockerContainerName} -d redis", "redis", logger, TimeSpan.FromSeconds(30)); + RunProcessAndThrowIfFailed(_path, $"run --rm -p 6379:6379 --name {_dockerContainerName} -d redis", "redis", logger, TimeSpan.FromMinutes(1)); } } diff --git a/startvs.cmd b/startvs.cmd index d15843640b..dd9c798c5b 100644 --- a/startvs.cmd +++ b/startvs.cmd @@ -1,4 +1,5 @@ @ECHO OFF +SETLOCAL :: This command launches a Visual Studio solution with environment variables required to use a local version of the .NET Core SDK. diff --git a/version.props b/version.props index 8a53be49d8..6b10f69bdf 100644 --- a/version.props +++ b/version.props @@ -3,7 +3,7 @@ 3 0 0 - 6 + 7 preview$(PreReleasePreviewNumber) Preview $(PreReleasePreviewNumber) 0.3.$(AspNetCorePatchVersion) @@ -34,13 +34,11 @@ <_BuildNumberShortDate>$([MSBuild]::Add($([MSBuild]::Add($([MSBuild]::Multiply($(_BuildNumberYY), 1000)), $([MSBuild]::Multiply($(_BuildNumberMM), 50)))), $(_BuildNumberDD))) $([System.Convert]::ToInt32($(_BuildNumberR))) - $(VersionSuffixBuildOfTheDay.PadLeft(2, '0')) - - $(_BuildNumberShortDate)-$(VersionSuffixBuildOfTheDayPadded) + $(_BuildNumberShortDate).$(VersionSuffixBuildOfTheDay) $(_BuildNumberShortDate) - $(PreReleaseLabel)-$(BuildNumberSuffix) + $(PreReleaseLabel).$(BuildNumberSuffix)