Cleanup potential memory leaks

AobaCore/AobaCore.csproj

@@ -9,14 +9,14 @@
 	<ItemGroup>
 		<PackageReference Include="FFMpegCore" Version="5.2.0" />
 		<PackageReference Include="Isopoh.Cryptography.Argon2" Version="2.0.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.6" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
 		<PackageReference Include="MaybeError" Version="1.1.0" />
-		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.6" />
+		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.7" />
-		<PackageReference Include="MongoDB.Driver" Version="3.4.0" />
+		<PackageReference Include="MongoDB.Driver" Version="3.4.1" />
 		<PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="2.1.0" />
 		<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.6" />
 		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.12.1" />
-		<PackageReference Include="ZLinq" Version="1.4.12" />
+		<PackageReference Include="ZLinq" Version="1.5.1" />
 	</ItemGroup>
 
 </Project>

AobaCore/Services/AobaService.cs

@@ -79,6 +79,10 @@ public class AobaService(IMongoDatabase db)
 		{
 			return ex;
 		}
+		finally
+		{
+			data.Dispose();
+		}
 	}
 
 	public async Task<MaybeEx<GridFSDownloadStream, GridFSException>> GetFileStreamAsync(ObjectId mediaId, bool seekable = false, CancellationToken cancellationToken = default)

AobaCore/Services/ThumbnailService.cs

@@ -3,6 +3,7 @@
 using FFMpegCore;
 using FFMpegCore.Pipes;
 
+
 using MaybeError.Errors;
 
 using MongoDB.Bson;
@@ -10,6 +11,7 @@ using MongoDB.Driver;
 using MongoDB.Driver.GridFS;
 
 using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Processing;
 
 using System;
@@ -91,17 +93,29 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
 	{
 		return type switch
 		{
-			MediaType.Image => await GenerateImageThumbnailAsync(stream, size, cancellationToken),
+			MediaType.Image => await GenerateImageThumbnailAsync(stream, size, ext, cancellationToken),
 			MediaType.Video => GenerateVideoThumbnail(stream, size, cancellationToken),
 			MediaType.Text or MediaType.Code => await GenerateDocumentThumbnailAsync(stream, size, cancellationToken),
 			_ => new Error($"No Thumbnail for {type}"),
 		};
 	}
 
-	public static async Task<Stream> GenerateImageThumbnailAsync(Stream stream, ThumbnailSize size, CancellationToken cancellationToken = default)
+	private static Maybe<Image> LoadImage(Stream stream, string ext)
 	{
-		var img = Image.Load(stream);
+		if (ext is ".heif" or ".avif")
-		img.Mutate(o =>
+		{
+			return new Error("Unsupported image type");
+		}
+		else
+			return Image.Load(stream);
+	}
+
+	public static async Task<Maybe<Stream>> GenerateImageThumbnailAsync(Stream stream, ThumbnailSize size, string ext, CancellationToken cancellationToken = default)
+	{
+		var img = LoadImage(stream, ext);
+		if (img.HasError)
+			return img.Error;
+		img.Value.Mutate(o =>
 		{
 			var size =
 			o.Resize(new ResizeOptions
@@ -111,8 +125,9 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
 				Size = new Size(300, 300)
 			});
 		});
+		img.Value.Dispose();
 		var result = new MemoryStream();
-		await img.SaveAsWebpAsync(result, cancellationToken);
+		await img.Value.SaveAsWebpAsync(result, cancellationToken);
 		result.Position = 0;
 		return result;
 	}
@@ -141,7 +156,7 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
 			output.Position = 0;
 			return output;
 		}
-		catch(Exception ex)
+		catch (Exception ex)
 		{
 			return ex;
 		}
@@ -155,4 +170,4 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
 	{
 		return new NotImplementedException();
 	}
-}
+}

AobaServer/AobaServer.csproj

@@ -16,7 +16,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Isopoh.Cryptography.Argon2" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.7" />
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.12.1" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
     <PackageReference Include="MimeTypesMap" Version="1.0.9" />
@@ -24,7 +24,7 @@
 	<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.9.0-beta.2" />
 	<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
 	<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
-	<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
+	  <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
   </ItemGroup>
 
   <ItemGroup>

AobaServer/Proto/Types.proto

@@ -103,11 +103,11 @@ message ShareXResponse {
 
 
 message SearchQuery {
-	optional string queryText = 1;
+	optional string queryText = 1;
-	repeated Filter filters = 2;
+	repeated Filter filters = 2;
-}
+}
-
+
-message Filter {
+message Filter {
-	string key = 1;
+	string key = 1;
-	repeated string values = 2;
+	repeated string values = 2;
 }