♻️ Remix things up

DysonNetwork.Drive/Program.cs

@@ -4,6 +4,7 @@ using DysonNetwork.Shared.Auth;
 using DysonNetwork.Shared.Http;
 using DysonNetwork.Shared.Registry;
 using Microsoft.EntityFrameworkCore;
+using tusdotnet.Stores;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -18,6 +19,8 @@ builder.Services.AddAppAuthentication();
 builder.Services.AddAppSwagger();
 builder.Services.AddDysonAuth(builder.Configuration);
 
+builder.Services.AddAppFileStorage(builder.Configuration);
+
 // Add flush handlers and websocket handlers
 builder.Services.AddAppFlushHandlers();
 
@@ -36,8 +39,10 @@ using (var scope = app.Services.CreateScope())
     await db.Database.MigrateAsync();
 }
 
+var tusDiskStore = app.Services.GetRequiredService<TusDiskStore>();
+
 // Configure application middleware pipeline
-app.ConfigureAppMiddleware(builder.Configuration);
+app.ConfigureAppMiddleware(tusDiskStore);
 
 // Configure gRPC
 app.ConfigureGrpcServices();

DysonNetwork.Drive/Startup/ApplicationBuilderExtensions.cs

@@ -1,8 +1,12 @@
+using DysonNetwork.Drive.Storage;
+using tusdotnet;
+using tusdotnet.Interfaces;
+
 namespace DysonNetwork.Drive.Startup;
 
 public static class ApplicationBuilderExtensions
 {
-    public static WebApplication ConfigureAppMiddleware(this WebApplication app, IConfiguration configuration)
+    public static WebApplication ConfigureAppMiddleware(this WebApplication app, ITusStore tusStore)
     {
         // Configure the HTTP request pipeline.
         if (app.Environment.IsDevelopment())
@@ -14,6 +18,8 @@ public static class ApplicationBuilderExtensions
         app.UseHttpsRedirection();
         app.UseAuthorization();
         app.MapControllers();
+        
+        app.MapTus("/tus", _ => Task.FromResult(TusService.BuildConfiguration(tusStore)));
 
         return app;
     }
@@ -21,7 +27,8 @@ public static class ApplicationBuilderExtensions
     public static WebApplication ConfigureGrpcServices(this WebApplication app)
     {
         // Map your gRPC services here
-        // Example: app.MapGrpcService<MyGrpcService>();
+        app.MapGrpcService<FileServiceGrpc>();
+        app.MapGrpcService<FileReferenceServiceGrpc>();
 
         return app;
     }

DysonNetwork.Drive/Startup/ServiceCollectionExtensions.cs

@@ -1,6 +1,5 @@
 using System.Text.Json;
 using System.Threading.RateLimiting;
-using dotnet_etcd.interfaces;
 using DysonNetwork.Shared.Cache;
 using Microsoft.AspNetCore.RateLimiting;
 using Microsoft.OpenApi.Models;
@@ -8,6 +7,7 @@ using NodaTime;
 using NodaTime.Serialization.SystemTextJson;
 using StackExchange.Redis;
 using DysonNetwork.Shared.Proto;
+using tusdotnet.Stores;
 
 namespace DysonNetwork.Drive.Startup;
 
@@ -122,10 +122,23 @@ public static class ServiceCollectionExtensions
 
         return services;
     }
+    
+    public static IServiceCollection AddAppFileStorage(this IServiceCollection services, IConfiguration configuration)
+    {
+        var tusStorePath = configuration.GetSection("Tus").GetValue<string>("StorePath")!;
+        Directory.CreateDirectory(tusStorePath);
+        var tusDiskStore = new TusDiskStore(tusStorePath);
+
+        services.AddSingleton(tusDiskStore);
+
+        return services;
+    }
 
     public static IServiceCollection AddAppBusinessServices(this IServiceCollection services)
     {
-        // Add your business services here
+        services.AddScoped<Storage.FileService>();
+        services.AddScoped<Storage.FileReferenceService>();
+        
         return services;
     }
 }

DysonNetwork.Drive/Storage/FileReferenceServiceGrpc.cs

@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
 using DysonNetwork.Shared.Proto;
-using Google.Protobuf.WellKnownTypes;
 using Grpc.Core;
 using NodaTime;
 using Duration = NodaTime.Duration;
@@ -13,13 +11,9 @@ namespace DysonNetwork.Drive.Storage
         {
             Instant? expiredAt = null;
             if (request.ExpiredAt != null)
-            {
                 expiredAt = Instant.FromUnixTimeSeconds(request.ExpiredAt.Seconds);
-            }
             else if (request.Duration != null)
-            {
                 expiredAt = SystemClock.Instance.GetCurrentInstant() + Duration.FromTimeSpan(request.Duration.ToTimeSpan());
-            }
 
             var reference = await fileReferenceService.CreateReferenceAsync(
                 request.FileId,

DysonNetwork.Drive/Storage/FileServiceGrpc.cs

@@ -1,4 +1,3 @@
-using System.Threading.Tasks;
 using DysonNetwork.Shared.Proto;
 using Google.Protobuf.WellKnownTypes;
 using Grpc.Core;