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

Add retries to CDN downloads (#7881) 

Add retries to CDN downloads
This commit is contained in:
Ryan Brandenburg 2019-02-25 14:44:22 -08:00 committed by GitHub
parent 3d17ac3d4c
commit 03460d81ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/ProjectTemplates/test/CdnScriptTagTests.cs
View File

@ -5,6 +5,8 @@ using AngleSharp;
using AngleSharp.Dom;
using AngleSharp.Dom.Html;
using AngleSharp.Parser.Html;
using Microsoft.AspNetCore.Server.IntegrationTesting;
using Microsoft.Extensions.Logging.Abstractions;
using System;
using System.Collections.Generic;
using System.IO;
@ -112,7 +114,7 @@ namespace Templates.Test
.TrimStart('~')
.TrimStart('/');
var cdnContent = await _httpClient.GetStringAsync(scriptTag.Src);
var cdnContent = await GetStringFromCDN(scriptTag.Src);
var fallbackSrcContent = GetFileContentFromArchive(scriptTag, fallbackSrc);
Assert.Equal(RemoveLineEndings(cdnContent), RemoveLineEndings(fallbackSrcContent));
@ -145,6 +147,27 @@ namespace Templates.Test
}
}
private async Task<string> GetStringFromCDN(string src)
{
var response = await GetFromCDN(src);
return await response.Content.ReadAsStringAsync();
}
private async Task<byte[]> GetByteArrayFromCDN(string src)
{
var response = await GetFromCDN(src);
return await response.Content.ReadAsByteArrayAsync();
}
private async Task<HttpResponseMessage> GetFromCDN(string src)
{
var logger = NullLogger.Instance;
return await RetryHelper.RetryRequest(async () => {
var request = new HttpRequestMessage(HttpMethod.Get, new Uri(src));
return await _httpClient.SendAsync(request);
}, logger);
}
private Task<string> GetShaIntegrity(ScriptTag scriptTag)
{
return GetShaIntegrity(scriptTag.Integrity, scriptTag.Src);
@ -158,7 +181,7 @@ namespace Templates.Test
private async Task<string> GetShaIntegrity(string integrity, string src)
{
var prefix = integrity.Substring(0, 6);
using (var respStream = await _httpClient.GetStreamAsync(src))
var respStream = await GetByteArrayFromCDN(src);
using (HashAlgorithm alg = string.Equals(prefix, "sha256") ? (HashAlgorithm)SHA256.Create() : (HashAlgorithm)SHA384.Create())
{
var hash = alg.ComputeHash(respStream);

1
src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
View File

@ -27,6 +27,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(RepositoryRoot)src\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj" />
<ProjectReference Include="../testassets/DotNetToolsInstaller/DotNetToolsInstaller.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Include="../Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Include="../Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj" ReferenceOutputAssembly="false" />