mayuki · noismaster · Dec 8, 2024
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
 
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '9.0.x'
 
     - name: "Set VersionSuffix"
       run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
 
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '9.0.x'
 
     - name: "Set VersionSuffix for Preview"
       if: "contains(github.ref, 'refs/tags') && contains(github.ref, 'preview')"

diff --git a/src/Rin.Extensions.EntityFrameworkCore/Rin.Extensions.EntityFrameworkCore.csproj b/src/Rin.Extensions.EntityFrameworkCore/Rin.Extensions.EntityFrameworkCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net9.0</TargetFrameworks>
     <!-- NuGet Package Information -->
     <Description>This package adds support for Entity Framwork Core to Rin</Description>
     <PackageTags>Rin EntityFrameworkCore</PackageTags>

diff --git a/src/Rin.Extensions.Log4NetAppender/Rin.Extensions.Log4NetAppender.csproj b/src/Rin.Extensions.Log4NetAppender/Rin.Extensions.Log4NetAppender.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net9.0</TargetFrameworks>
 
     <!-- NuGet Package Information -->
     <Description>This package adds support for tracing with log4net to Rin</Description>

diff --git a/src/Rin.Extensions.MagicOnion/Rin.Extensions.MagicOnion.csproj b/src/Rin.Extensions.MagicOnion/Rin.Extensions.MagicOnion.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net9.0</TargetFrameworks>
     <!-- NuGet Package Information -->
     <Description>This package adds support for MagicOnion to Rin</Description>
     <PackageTags>Rin MagicOnion</PackageTags>

diff --git a/src/Rin.Mvc/Rin.Mvc.csproj b/src/Rin.Mvc/Rin.Mvc.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net9.0</TargetFrameworks>
 
     <!-- NuGet Package Information -->
     <Description>This package adds support for ASP.NET Core MVC to Rin</Description>

diff --git a/src/Rin.Storage.Redis/Rin.Storage.Redis.csproj b/src/Rin.Storage.Redis/Rin.Storage.Redis.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net9.0</TargetFrameworks>
 
     <!-- NuGet Package Information -->
     <Description>This package adds support for Redis storage to Rin</Description>

diff --git a/src/Rin.Storage.Redis/RinRedisRecordStorageServiceExtensions.cs b/src/Rin.Storage.Redis/RinRedisRecordStorageServiceExtensions.cs
@@ -1,8 +1,5 @@
 #nullable enable
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Text;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Rin.Core.Record;
 using Rin.Extensions;
@@ -21,7 +18,8 @@ public static class RinRedisRecordStorageServiceExtensions
         public static IRinBuilder UseRedisStorage(this IRinBuilder builder, Action<RedisRecordStorageOptions>? configure = null)
         {
             builder.Services.AddOptions<RedisRecordStorageOptions>();
-            builder.Services.Configure<RedisRecordStorageOptions>(configure);
+
+            if (configure != null) builder.Services.Configure<RedisRecordStorageOptions>(configure);
 
             builder.Services.Replace(new ServiceDescriptor(typeof(IRecordStorage), typeof(RedisRecordStorage), ServiceLifetime.Singleton));
 

diff --git a/src/Rin/Core/Resource/EmbeddedZipResourceProvider.cs b/src/Rin/Core/Resource/EmbeddedZipResourceProvider.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -39,7 +39,7 @@ public async Task<bool> TryProcessAsync(HttpContext context)
                 // for SPA (+ rewrite paths in HTML)
                 else if (
                     context.Request.Headers.TryGetValue("Accept", out var acceptHeaders) &&
-                    acceptHeaders.Any(x => x.Contains("text/html")) &&
+                    acceptHeaders.Any(x => x != null && x.Contains("text/html")) &&
                     Resources.TryOpen("index.html", out resourceStream, out contentType)
                 )
                 {
@@ -63,7 +63,7 @@ private async Task WriteStreamToClientAsync(HttpContext context, Stream stream,
             context.Response.StatusCode = 200;
             context.Response.ContentType = contentType;
 
-            if (context.Request.Headers.TryGetValue("accept-encoding", out var headerValues) && headerValues.Any(x => x.Contains("gzip")))
+            if (context.Request.Headers.TryGetValue("accept-encoding", out var headerValues) && headerValues.Any(x => x != null && x.Contains("gzip")))
             {
                 context.Response.Headers["Content-Encoding"] = "gzip";
                 using (var outputStream = new GZipStream(new ForceAsyncStreamWrapper(context.Response.Body), CompressionLevel.Fastest, true))

diff --git a/src/Rin/Hubs/Payloads/BodyDataPayload.cs b/src/Rin/Hubs/Payloads/BodyDataPayload.cs
@@ -44,9 +44,10 @@ public static BodyDataPayload CreateFromRecord(HttpRequestRecord record, IDictio
                 }
             }
 
-            if (payloadBodyContentType.StartsWith("text/") ||
+            if (payloadBodyContentType != null && (
+                payloadBodyContentType.StartsWith("text/") ||
                 payloadBodyContentType.StartsWith("application/json") ||
-                payloadBodyContentType.StartsWith("application/x-www-form-urlencoded"))
+                payloadBodyContentType.StartsWith("application/x-www-form-urlencoded")))
             {
                 return new BodyDataPayload(Encoding.UTF8.GetString(payloadBody), false, transformedBodyContentType);
             }

diff --git a/src/Rin/IO/CapturePipeWriter.cs b/src/Rin/IO/CapturePipeWriter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.IO.Pipelines;
 using System.Threading;
@@ -48,5 +48,13 @@ public override void Complete(Exception? exception = null)
         {
             return _pipeWriter.FlushAsync(cancellationToken);
         }
+
+#if NET9_0
+
+        public override bool CanGetUnflushedBytes => _pipeWriter.CanGetUnflushedBytes;
+
+        public override long UnflushedBytes => _pipeWriter.UnflushedBytes;
+
+#endif
     }
-}
+}
diff --git a/src/Rin/Middlewares/Api/GetDetailByIdMiddleware.cs b/src/Rin/Middlewares/Api/GetDetailByIdMiddleware.cs
@@ -26,8 +26,8 @@ public async Task InvokeAsync(HttpContext context)
                 await context.Response.WriteAsync("Missing required parameter: id");
                 return;
             }
-
-            var result = await _storage.TryGetDetailByIdAsync(id);
+            
+            var result = await _storage.TryGetDetailByIdAsync(id!);
             if (!result.Succeed || result.Value == null)
             {
                 context.Response.StatusCode = 404;

diff --git a/src/Rin/Middlewares/DownloadMiddleware.cs b/src/Rin/Middlewares/DownloadMiddleware.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Net.Http.Headers;
 using Rin.Core;
@@ -25,8 +25,16 @@ public DownloadRequestBodyMiddleware(RequestDelegate next, IRecordStorage storag
 
         public async Task InvokeAsync(HttpContext context)
         {
-            var result = await _storage.TryGetDetailByIdAsync(context.Request.Query["id"]);
-            var resultBody = await _storage.TryGetRequestBodyByIdAsync(context.Request.Query["id"]);
+            string? queryId = context.Request.Query["id"];
+
+            if (queryId == null)
+            {
+                context.Response.StatusCode = 404;
+                return;
+            }
+
+            var result = await _storage.TryGetDetailByIdAsync(queryId);
+            var resultBody = await _storage.TryGetRequestBodyByIdAsync(queryId);
             var entry = result.Value;
 
             if (!result.Succeed || !resultBody.Succeed || entry == null)
@@ -58,8 +66,16 @@ public DownloadResponseBodyMiddleware(RequestDelegate next, IRecordStorage stora
 
         public async Task InvokeAsync(HttpContext context)
         {
-            var result = await _storage.TryGetDetailByIdAsync(context.Request.Query["id"]);
-            var resultBody = await _storage.TryGetResponseBodyByIdAsync(context.Request.Query["id"]);
+            string? queryId = context.Request.Query["id"];
+
+            if (queryId == null)
+            {
+                context.Response.StatusCode = 404;
+                return;
+            }
+
+            var result = await _storage.TryGetDetailByIdAsync(queryId);
+            var resultBody = await _storage.TryGetResponseBodyByIdAsync(queryId);
             var entry = result.Value;
 
             if (!result.Succeed || !resultBody.Succeed || entry == null)

diff --git a/src/Rin/Middlewares/RequestRecorderMiddleware.cs b/src/Rin/Middlewares/RequestRecorderMiddleware.cs
@@ -112,7 +112,7 @@ private async Task<HttpRequestRecord> PreprocessAsync(HttpContext context, RinOp
             {
                 Id = Guid.NewGuid().ToString(),
                 IsHttps = request.IsHttps,
-                Host = request.Host.Value,
+                Host = request.Host.Value!,
                 QueryString = request.QueryString.Value,
                 Path = request.Path,
                 Method = request.Method,

diff --git a/src/Rin/Rin.csproj b/src/Rin/Rin.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net9.0</TargetFrameworks>
     <nullable>enable</nullable>
 
     <!-- NuGet Package Information -->