fix cirucular deps

added additonal file types

AobaCore/Models/Media.cs

@@ -22,17 +22,20 @@ public class Media
 	public static readonly Dictionary<string, MediaType> KnownTypes = new()
 		{
 			{ ".jpg", MediaType.Image },
-			{ ".avif", MediaType.Image },
 			{ ".jpeg", MediaType.Image },
+			{ ".jxr", MediaType.Image },
+			{ ".avif", MediaType.Image },
 			{ ".png", MediaType.Image },
 			{ ".apng", MediaType.Image },
 			{ ".webp", MediaType.Image },
+			{ ".qoi", MediaType.Image },
 			{ ".ico", MediaType.Image },
 			{ ".gif", MediaType.Image },
 			{ ".mp3", MediaType.Audio },
 			{ ".flac", MediaType.Audio },
 			{ ".alac", MediaType.Audio },
 			{ ".mp4", MediaType.Video },
+			{ ".m4v", MediaType.Video },
 			{ ".webm", MediaType.Video },
 			{ ".mov", MediaType.Video },
 			{ ".avi", MediaType.Video },
@@ -50,6 +53,10 @@ public class Media
 			{ ".xml", MediaType.Code },
 			{ ".json", MediaType.Code },
 			{ ".py", MediaType.Code },
+			{ ".rs", MediaType.Code },
+			{ ".zed", MediaType.Code },
+			{ ".ts", MediaType.Code },
+			{ ".astro", MediaType.Code },
 		};
 
 	[BsonConstructor]

AobaCore/Services/AobaService.cs

@@ -2,6 +2,8 @@ using AobaCore.Models;
 
 using MaybeError.Errors;
 
+using Microsoft.Extensions.Logging;
+
 using MongoDB.Bson;
 using MongoDB.Driver;
 using MongoDB.Driver.GridFS;
@@ -69,6 +71,7 @@ public class AobaService(IMongoDatabase db)
 		{
 			var fileId = await _gridFs.UploadFromStreamAsync(filename, data, cancellationToken: cancellationToken);
 			var media = new Media(fileId, filename, owner);
+			
 			await AddMediaAsync(media, cancellationToken);
 			return media;
 		}

AobaCore/Services/ThumbnailService.cs

@@ -24,7 +24,6 @@ namespace AobaCore.Services;
 public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
 {
 	private readonly GridFSBucket _gridfs = new GridFSBucket(db);
-	private Lock _lock = new();
 
 	/// <summary>
 	///
@@ -121,29 +120,39 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
 	public Maybe<Stream> GenerateVideoThumbnail(Stream data, ThumbnailSize size, CancellationToken cancellationToken = default)
 	{
 		var w = (int)size;
-		var source = new MemoryStream();
+		var fn = ObjectId.GenerateNewId().ToString();
+		var filePath = $"/tmp/{fn}.in";
+		using var source = new FileStream(filePath, FileMode.CreateNew);
 		data.CopyTo(source);
-		source.Position = 0;
+		source.Flush();
-		var output = new MemoryStream();
+		source.Dispose();
-		FFMpegArguments.FromPipeInput(new StreamPipeSource(source), opt =>
+		data.Dispose();
+		try
 		{
-			opt.WithCustomArgument("-t 5");
+			var output = new MemoryStream();
-		}).OutputToPipe(new StreamPipeSink(output), opt =>
+			FFMpegArguments.FromFileInput(filePath, false, opt =>
+			{
+				opt.WithCustomArgument("-t 5");
+			}).OutputToPipe(new StreamPipeSink(output), opt =>
+			{
+				opt.WithCustomArgument($"-vf \"crop='min(in_w,in_h)':'min(in_w,in_h)',scale={w}:{w}\" -loop 0 -r 15")
+				.ForceFormat("webp");
+			}).ProcessSynchronously();
+			output.Position = 0;
+			return output;
+		}
+		catch(Exception ex)
 		{
-			opt.WithCustomArgument($"-vf \"crop='min(in_w,in_h)':'min(in_w,in_h)',scale={w}:{w}\" -loop 0 -r 15")
+			return ex;
-			.ForceFormat("webp");
+		}
-		}).Configure(cfg =>
+		finally
 		{
-#if !DEBUG
+			File.Delete(filePath);
-			cfg.BinaryFolder = "/usr/bin";
+		}
-#endif
-		}).ProcessSynchronously();
-		output.Position = 0;
-		return output;
 	}
 
 	public async Task<Maybe<Stream>> GenerateDocumentThumbnailAsync(Stream data, ThumbnailSize size, CancellationToken cancellationToken = default)
 	{
 		return new NotImplementedException();
 	}
-}
+}

AobaServer/Controllers/MediaController.cs

@@ -17,7 +17,7 @@ public class MediaController(AobaService aobaService, ILogger<MediaController> l
 	[ResponseCache(Duration = int.MaxValue)]
 	public async Task<IActionResult> MediaAsync(ObjectId id, [FromServices] MongoClient client, CancellationToken cancellationToken)
 	{
-		var file = await aobaService.GetFileStreamAsync(id, cancellationToken: cancellationToken);
+		var file = await aobaService.GetFileStreamAsync(id, seekable: true, cancellationToken: cancellationToken);
 		if (file.HasError)
 		{
 			logger.LogError(file.Error.Exception, "Failed to load media stream");

AobaServer/Dockerfile

@@ -32,13 +32,14 @@ RUN dx bundle --platform web
 # Server Build
 # This stage is used when running from VS in fast mode (Default for Debug configuration)
 FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
+RUN apt-get update && apt-get install -y ffmpeg
 USER $APP_UID
 WORKDIR /app
 EXPOSE 8080
 EXPOSE 8081
 
 # This stage is used to build the service project
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0-noble AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
 COPY ["AobaServer/AobaServer.csproj", "AobaServer/"]
@@ -47,7 +48,7 @@ COPY . .
 # Copy Built bundle from client builder
 COPY --from=client-builder /app/AobaClient/target/dx/aoba-client/release/web/public /src/AobaServer/wwwroot
 WORKDIR "/src/AobaServer"
-RUN dotnet build "./AobaServer.csproj" -c $BUILD_CONFIGURATION -o /app/build
+# RUN dotnet build "./AobaServer.csproj" -c $BUILD_CONFIGURATION #-o /app/build
 
 # This stage is used to publish the service project to be copied to the final stage
 FROM build AS publish
@@ -57,8 +58,8 @@ RUN dotnet publish "./AobaServer.csproj" -c $BUILD_CONFIGURATION -o /app/publish
 # This stage is used in production or when running from VS in regular mode (Default when not using the Debug configuration)
 FROM base AS final
 WORKDIR /app
-
 COPY --from=publish /app/publish .
-COPY --from=client-builder /bin/ffmpeg /bin/ffprobe /bin/ffplay /usr/bin/
+ARG VERSION
+
 ENV APP_VERSION=$VERSION
 ENTRYPOINT ["dotnet", "AobaServer.dll"]

AobaServer/Services/AobaAuthService.cs

@@ -14,8 +14,9 @@ using Aoba.RPC;
 
 namespace AobaServer.Services;
 
-public class AobaAuthService(AccountsService accountsService, AuthInfo authInfo) : AuthRpc.AuthRpcBase
+public class AobaAuthService(AccountsService accountsService, AuthConfigService authConfig) : AuthRpc.AuthRpcBase
 {
+	[AllowAnonymous]
 	public override async Task<LoginResponse> Login(Credentials request, ServerCallContext context)
 	{
 		var user = await accountsService.VerifyLoginAsync(request.User, request.Password, context.CancellationToken);
@@ -27,6 +28,7 @@ public class AobaAuthService(AccountsService accountsService, AuthInfo authInfo)
 					Message = "Invalid login credentials"
 				}
 			};
+		var authInfo = await authConfig.GetDefaultAuthInfoAsync();
 		var token = user.GetToken(authInfo);
 		return new LoginResponse
 		{

AobaServer/Services/AobaRpcService.cs

@@ -16,7 +16,7 @@ using System.Text.Json.Serialization;
 
 namespace AobaServer.Services;
 
-public class AobaRpcService(AobaService aobaService, AccountsService accountsService, AuthInfo authInfo) : AobaRpc.AobaRpcBase
+public class AobaRpcService(AobaService aobaService, AccountsService accountsService, AuthConfigService authConfig) : AobaRpc.AobaRpcBase
 {
 	public override async Task<MediaResponse> GetMedia(Id request, ServerCallContext context)
 	{
@@ -37,6 +37,7 @@ public class AobaRpcService(AobaService aobaService, AccountsService accountsSer
 		var user = await accountsService.GetUserAsync(userId, context.CancellationToken);
 		if (user == null)
 			return new ShareXResponse { Error = "User does not exist" };
+		var authInfo = await authConfig.GetDefaultAuthInfoAsync();
 		var token = user.GetToken(authInfo);
 		var dest = new ShareXDestination
 		{

AobaServer/Services/MetricsRpcService.cs

@@ -14,7 +14,6 @@ namespace AobaServer.Services;
 
 public class MetricsRpcService(AuthConfigService authConfig): Aoba.RPC.Metrics.MetricsRpc.MetricsRpcBase
 {
-	[AllowAnonymous]
 	public override async Task<Jwt> GetToken(Empty request, ServerCallContext context)
 	{
 		var authInfo = await authConfig.GetAuthInfoAsync("aoba", "metrics");