feature: experimental Cloudflare R2 support

Author: jcdcdev

src/Umbraco.Community.FileSystemProviders.B2/B2FileSystemImageCache.cs

@@ -1,18 +1,62 @@
-using Microsoft.Extensions.Options;
+using Amazon.S3;
+using Amazon.S3.Model;
+using Microsoft.Extensions.Options;
+using Our.Umbraco.StorageProviders.AWSS3.IO;
 using SixLabors.ImageSharp.Web;
 using SixLabors.ImageSharp.Web.Caching;
 using SixLabors.ImageSharp.Web.Caching.AWS;
 using SixLabors.ImageSharp.Web.Resolvers;
+using SixLabors.ImageSharp.Web.Resolvers.AWS;
+using Umbraco.Community.FileSystemProviders.B2.Models;
 
 namespace Umbraco.Community.FileSystemProviders.B2;
 
-public class B2FileSystemImageCache(IOptions<AWSS3StorageCacheOptions> options) : IImageCache
+public class B2FileSystemImageCache(
+    IOptions<AWSS3StorageCacheOptions> options,
+    IOptions<B2Options> b2Options,
+    IAWSS3FileSystemProvider fileSystemProvider)
+    : IImageCache
 {
-    private readonly AWSS3StorageCache _baseCache = new(options);
+    private readonly IAmazonS3 _client = fileSystemProvider.GetFileSystem(Constants.Aliases.MediaFileSystem).GetS3Client("");
 
-    public async Task<IImageCacheResolver?> GetAsync(string key) =>
-        await _baseCache.GetAsync(Path.Combine("cache/", key));
+    public virtual async Task<IImageCacheResolver?> GetAsync(string key)
+    {
+        var request = new GetObjectMetadataRequest
+        {
+            BucketName = b2Options.Value.BucketName,
+            Key = key
+        };
 
-    public async Task SetAsync(string key, Stream stream, ImageCacheMetadata metadata) =>
-        await _baseCache.SetAsync(Path.Combine("cache/", key), stream, metadata);
+        try
+        {
+            // HEAD request throws a 404 if not found.
+            var metadata = (await _client.GetObjectMetadataAsync(request)).Metadata;
+            return new AWSS3StorageCacheResolver(_client, b2Options.Value.BucketName, key, metadata);
+        }
+        catch
+        {
+            return null;
+        }
+    }
+
+
+    public virtual async Task SetAsync(string key, Stream stream, ImageCacheMetadata metadata)
+    {
+        var request = new PutObjectRequest
+        {
+            BucketName = options.Value.BucketName,
+            Key = key,
+            ContentType = metadata.ContentType,
+            InputStream = stream,
+            AutoCloseStream = false,
+            DisablePayloadSigning = b2Options.Value.Experimental.DisablePayloadSigning
+        };
+
+        foreach (KeyValuePair<string, string> d in metadata.ToDictionary())
+        {
+            request.Metadata.Add(d.Key, d.Value);
+        }
+
+        await _client.PutObjectAsync(request);
+    }
 }

src/Umbraco.Community.FileSystemProviders.B2/Composing/UmbracoBuilderExtensions.cs

@@ -81,7 +81,7 @@ public static void AddB2MediaFileSystem(this IUmbracoBuilder builder)
         builder.SetMediaFileSystem(x =>
         {
             var provider = x.GetRequiredService<B2FileSystemProvider>();
-            return provider.GetFileSystem("Media");
+            return provider.GetFileSystem(Constants.Aliases.MediaFileSystem);
         });
 
         builder.Services.Configure<UmbracoPipelineOptions>(options =>

src/Umbraco.Community.FileSystemProviders.B2/Constants.cs

@@ -59,4 +59,9 @@ public class Groups
             public const string Configuration = "B2 Configuration";
         }
     }
+
+    public static class Aliases
+    {
+        public const string MediaFileSystem = "Media";
+    }
 }

src/Umbraco.Community.FileSystemProviders.B2/HealthChecks/ApiHealthCheck.cs

@@ -71,7 +71,7 @@ private bool TryGetFileSystem(out IFileSystem? fs)
         fs = null;
         try
         {
-            if (mediaFileManager.GetFileSystem("Media") is IFileSystem fss)
+            if (mediaFileManager.GetFileSystem(Constants.Aliases.MediaFileSystem) is IFileSystem fss)
             {
                 fs = fss;
                 return true;