Merge pull request #45 from WeihanLi/dev

0.4.3

Author: WeihanLi

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <LangVersion>latest</LangVersion>
+        <LangVersion>preview</LangVersion>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <PackageIcon>icon.png</PackageIcon>
@@ -9,7 +9,7 @@
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>https://github.com/WeihanLi/dotnet-httpie</RepositoryUrl>
-        <Product>dotnet-HTTPie</Product>
+        <Product>dotnet-httpie</Product>
         <Authors>WeihanLi</Authors>
         <Copyright>Copyright 2021-$([System.DateTime]::Now.Year) (c) WeihanLi</Copyright>
     </PropertyGroup>

build/version.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <VersionMajor>0</VersionMajor>
     <VersionMinor>4</VersionMinor>
-    <VersionPatch>2</VersionPatch>
+    <VersionPatch>3</VersionPatch>
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
     <InformationalVersion>$(PackageVersion)</InformationalVersion>
   </PropertyGroup>

src/HTTPie/HTTPie.csproj

@@ -21,6 +21,6 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta3.22114.1" />
     <PackageReference Include="WeihanLi.Common" Version="1.0.51" />
-    <PackageReference Include="WeihanLi.Npoi" Version="2.0.1" />
+    <PackageReference Include="WeihanLi.Npoi" Version="2.0.2" />
   </ItemGroup>
 </Project>

src/HTTPie/Middleware/DownloadMiddleware.cs

@@ -13,17 +13,20 @@ public sealed class DownloadMiddleware : IResponseMiddleware
     public static readonly Option DownloadOption = new(new[] { "-d", "--download" }, "Download file");
     private static readonly Option ContinueOption = new(new[] { "-c", "--continue" }, "Download file using append mode");
     private static readonly Option<string> OutputOption = new(new[] { "-o", "--output" }, "Output file path");
+    private static readonly Option<string> CheckSumOption = new(new[] { "--checksum" }, "Checksum to validate");
+    private static readonly Option<HashType> CheckSumAlgOption = new(new[] { "--checksum-alg" }, () => HashType.SHA1, "Checksum hash algorithm type");
 
     public ICollection<Option> SupportedOptions()
     {
-        return new[] { DownloadOption, ContinueOption, OutputOption };
+        return new[] { DownloadOption, ContinueOption, OutputOption, CheckSumOption, CheckSumAlgOption };
     }
 
     public async Task Invoke(HttpContext context, Func<Task> next)
     {
         var download = context.Request.ParseResult.HasOption(DownloadOption);
         if (!download)
         {
+            await next();
             return;
         }
         var output = context.Request.ParseResult.GetValueForOption(OutputOption);
@@ -51,6 +54,16 @@ public async Task Invoke(HttpContext context, Func<Task> next)
         {
             await File.WriteAllBytesAsync(fileName, context.Response.Bytes).ConfigureAwait(false);
         }
+
+        var checksum = context.Request.ParseResult.GetValueForOption(CheckSumOption);
+        if (checksum.IsNotNullOrWhiteSpace())
+        {
+            var checksumAlgType = context.Request.ParseResult.GetValueForOption(CheckSumAlgOption);
+            var calculatedValue = HashHelper.GetHashedString(checksumAlgType, context.Response.Bytes);
+            var checksumMatched = calculatedValue.EqualsIgnoreCase(checksum);
+            context.Response.Headers.TryAdd(Constants.ResponseCheckSumValueHeaderName, calculatedValue);
+            context.Response.Headers.TryAdd(Constants.ResponseCheckSumValidHeaderName, checksumMatched.ToString());
+        }
         await next();
     }
 

src/HTTPie/Properties/launchSettings.json

@@ -43,6 +43,14 @@
     "proxy-test": {
       "commandName": "Project",
       "commandLineArgs": "https://www.nuget.org/profiles/weihanli/avatar?imageSize=512 --proxy=socks5://172.16.80.136:3389 -v"
+    },
+    "HTTPie-download-with-checksum": {
+      "commandName": "Project",
+      "commandLineArgs": "-v https://www.nuget.org/profiles/weihanli/avatar?imageSize=512 -d --checksum 1234"
+    },
+    "HTTPie-download-with-checksum-alg": {
+      "commandName": "Project",
+      "commandLineArgs": "-v https://www.nuget.org/profiles/weihanli/avatar?imageSize=512 -d --checksum 1234 --checksum-alg=md5"
     }
   }
 }

src/HTTPie/Utilities/Constants.cs

@@ -23,6 +23,9 @@ public static class Constants
     public const string ResponseTimestampHeaderName = $"X-{ApplicationName}-ResponseTimestamp";
     public const string RequestDurationHeaderName = $"X-{ApplicationName}-Duration";
 
+    public const string ResponseCheckSumValueHeaderName = $"X-{ApplicationName}-CheckSum-Value";
+    public const string ResponseCheckSumValidHeaderName = $"X-{ApplicationName}-CheckSum-Valid";
+
 #pragma warning disable 8602
     private static readonly string AppVersion = typeof(Constants).Assembly.GetName().Version.ToString(3);
 #pragma warning restore 8602

tests/HTTPie.UnitTest/HTTPie.UnitTest.csproj

@@ -16,7 +16,7 @@
       <PackageReference Include="FluentAssertions" Version="6.6.0" />
       <PackageReference Include="Moq" Version="4.17.2" />
       <PackageReference Include="xunit" Version="2.4.1" />
-      <PackageReference Include="Xunit.DependencyInjection" Version="8.4.1" />
+      <PackageReference Include="Xunit.DependencyInjection" Version="8.5.0" />
       <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
           <PrivateAssets>all</PrivateAssets>