Merge pull request #96 from argon-chat/fixes/cdn-do-not-use-async

Cdn Fixes
argon-chat · Dec 3, 2024 · 775ead4 · 775ead4
2 parents 6bd0e97 + 89ff18e
commit 775ead4
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 34 deletions.
diff --git a/src/Argon.Api/Controllers/FilesController.cs b/src/Argon.Api/Controllers/FilesController.cs
@@ -1,19 +1,11 @@
-namespace Argon.Api.Controllers;
+namespace Argon.Controllers;
 
-using ActualLab.Collections;
-using Features.MediaStorage.Storages;
-using Contracts;
-using Extensions;
 using Features.MediaStorage;
+using Features.MediaStorage.Storages;
 using Features.Pex;
-using Grains.Interfaces;
-using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
 using Microsoft.AspNetCore.StaticFiles;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Argon.Features;
-using Contracts.Models.ArchetypeModel;
 
 public class FilesController(
     IOptions<CdnOptions> cdnOptions,
@@ -61,7 +53,7 @@ public async ValueTask<IActionResult> UploadServerAvatar([FromRoute] Guid server
         await grainFactory.GetGrain<IServerGrain>(serverId)
            .UpdateServer(new ServerInput(null, null, assetId.ToFileId()));
 
-        return Ok(await cdn.GenerateAssetUrl(ns, assetId));
+        return Ok(cdn.GenerateAssetUrl(ns, assetId));
     }
 
     [HttpPost("/files/user/@me/avatar"), Authorize(JwtBearerDefaults.AuthenticationScheme)]
@@ -78,6 +70,6 @@ public async ValueTask<IActionResult> UploadUserAvatar(IFormFile file)
         await grainFactory.GetGrain<IUserGrain>(userId)
            .UpdateUser(new UserEditInput(null, null, assetId.ToFileId()));
 
-        return Ok(await cdn.GenerateAssetUrl(ns, assetId));
+        return Ok(cdn.GenerateAssetUrl(ns, assetId));
     }
 }
diff --git a/src/Argon.Api/Features/MediaStorage/AssetId.cs b/src/Argon.Api/Features/MediaStorage/AssetId.cs
@@ -1,4 +1,4 @@
-namespace Argon.Api.Features.MediaStorage;
+namespace Argon.Features.MediaStorage;
 
 public readonly struct AssetId(Guid assetId, AssetScope scope, AssetKind kind, string extensions)
 {
@@ -38,7 +38,7 @@ public Dictionary<string, string> GetTags(StorageNameSpace @namespace)
 
     public static AssetId FromFileId(string fileId)
     {
-        if (fileId.Length != 45)
+        if (fileId.Length < 46)
             throw new InvalidOperationException("Bad file id");
         var span  = fileId.AsSpan();
         var guid  = Guid.Parse(span.Slice(0, 36));

diff --git a/src/Argon.Api/Features/MediaStorage/CdnFeatureExtensions.cs b/src/Argon.Api/Features/MediaStorage/CdnFeatureExtensions.cs
@@ -1,4 +1,4 @@
-namespace Argon.Api.Features.MediaStorage;
+namespace Argon.Features.MediaStorage;
 
 using Storages;
 using Genbox.SimpleS3.Core.Abstracts.Clients;

diff --git a/src/Argon.Api/Features/MediaStorage/CdnOptions.cs b/src/Argon.Api/Features/MediaStorage/CdnOptions.cs
@@ -1,4 +1,4 @@
-namespace Argon.Api.Features.MediaStorage;
+namespace Argon.Features.MediaStorage;
 
 public class CdnOptions
 {

diff --git a/src/Argon.Api/Features/MediaStorage/DiskContentDeliveryNetwork.cs b/src/Argon.Api/Features/MediaStorage/DiskContentDeliveryNetwork.cs
@@ -1,6 +1,4 @@
-namespace Argon.Api.Features.MediaStorage;
-
-using Contracts;
+namespace Argon.Features.MediaStorage;
 
 public class DiskContentDeliveryNetwork([FromKeyedServices(IContentStorage.DiskContentStorageKey)] IContentStorage storage,
     ILogger<YandexContentDeliveryNetwork> logger) : IContentDeliveryNetwork
@@ -23,6 +21,6 @@ public async ValueTask<Maybe<UploadError>> CreateAssetAsync(StorageNameSpace ns,
     public ValueTask<Maybe<UploadError>> ReplaceAssetAsync(StorageNameSpace ns, AssetId asset, Stream file)
         => throw new NotImplementedException();
 
-    public ValueTask<string> GenerateAssetUrl(StorageNameSpace ns, AssetId asset)
+    public string GenerateAssetUrl(StorageNameSpace ns, AssetId asset)
         => new($"/files/{ns.ToPath()}/{asset.GetFilePath()}?nocache=1");
 }
diff --git a/src/Argon.Api/Features/MediaStorage/IContentDeliveryNetwork.cs b/src/Argon.Api/Features/MediaStorage/IContentDeliveryNetwork.cs
@@ -1,6 +1,4 @@
-namespace Argon.Api.Features.MediaStorage;
-
-using Contracts;
+namespace Argon.Features.MediaStorage;
 
 public interface IContentDeliveryNetwork
 {
@@ -20,5 +18,5 @@ ValueTask<Maybe<UploadError>> ReplaceAssetAsync(StorageNameSpace ns, AssetId ass
 
     ValueTask<Maybe<UploadError>> CreateAssetAsync(StorageNameSpace ns, AssetId asset, Stream file);
     ValueTask<Maybe<UploadError>> ReplaceAssetAsync(StorageNameSpace ns, AssetId asset, Stream file);
-    ValueTask<string>             GenerateAssetUrl(StorageNameSpace ns, AssetId asset);
+    string                        GenerateAssetUrl(StorageNameSpace ns, AssetId asset);
 }
diff --git a/src/Argon.Api/Features/MediaStorage/IContentStorage.cs b/src/Argon.Api/Features/MediaStorage/IContentStorage.cs
@@ -1,4 +1,4 @@
-namespace Argon.Api.Features.MediaStorage;
+namespace Argon.Features.MediaStorage;
 
 public interface IContentStorage
 {

diff --git a/src/Argon.Api/Features/MediaStorage/Storages/DiskContentStorage.cs b/src/Argon.Api/Features/MediaStorage/Storages/DiskContentStorage.cs
@@ -1,4 +1,4 @@
-namespace Argon.Api.Features.MediaStorage.Storages;
+namespace Argon.Features.MediaStorage.Storages;
 
 public class DiskContentStorage : IContentStorage
 {

diff --git a/src/Argon.Api/Features/MediaStorage/Storages/S3ContentStorage.cs b/src/Argon.Api/Features/MediaStorage/Storages/S3ContentStorage.cs
@@ -1,8 +1,7 @@
-namespace Argon.Api.Features.MediaStorage.Storages;
+namespace Argon.Features.MediaStorage.Storages;
 
 using Genbox.SimpleS3.Core.Abstracts.Clients;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 
 public class S3ContentStorage([FromKeyedServices("GenericS3:client")] IObjectClient s3Client, IOptions<StorageOptions> options, 
     ILogger<IContentStorage> logger) : IContentStorage

diff --git a/src/Argon.Api/Features/MediaStorage/YandexContentDeliveryNetwork.cs b/src/Argon.Api/Features/MediaStorage/YandexContentDeliveryNetwork.cs
@@ -1,8 +1,6 @@
-namespace Argon.Api.Features.MediaStorage;
+namespace Argon.Features.MediaStorage;
 
 using System.Web;
-using Contracts;
-using Microsoft.Extensions.Options;
 
 public class YandexContentDeliveryNetwork([FromKeyedServices(IContentStorage.GenericS3StorageKey)] IContentStorage storage,
     ILogger<YandexContentDeliveryNetwork> logger, IOptions<CdnOptions> options)
@@ -28,8 +26,8 @@ public async ValueTask<Maybe<UploadError>> CreateAssetAsync(StorageNameSpace ns,
     public ValueTask<Maybe<UploadError>> ReplaceAssetAsync(StorageNameSpace ns, AssetId asset, Stream file)
         => throw new NotImplementedException();
 
-    public ValueTask<string> GenerateAssetUrl(StorageNameSpace ns, AssetId asset)
-        => new(GenerateSignedLink(Config.BaseUrl,$"/{ns.ToPath()}/{asset.GetFilePath()}", Config.SignSecret, (int)Config.EntryExpire.TotalSeconds));
+    public string GenerateAssetUrl(StorageNameSpace ns, AssetId asset)
+        => GenerateSignedLink(Config.BaseUrl, $"/{ns.ToPath()}/{asset.GetFilePath()}", Config.SignSecret, (int)Config.EntryExpire.TotalSeconds);
 
     private static string GenerateSignedLink(
         string hostname,