Revert "[Static Assets] Consume original-resource instead of the Etag (#63379)"

This reverts commit b8a8adf.

Author: dariatiurina

src/StaticAssets/src/Development/StaticAssetDevelopmentRuntimeHandler.cs

@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics;
 using System.Globalization;
 using System.IO.Compression;
 using System.IO.Pipelines;
@@ -23,34 +22,20 @@
 namespace Microsoft.AspNetCore.Builder;
 
 // Handles changes during development to support common scenarios where for example, a developer changes a file in the wwwroot folder.
-internal sealed partial class StaticAssetDevelopmentRuntimeHandler
+internal sealed partial class StaticAssetDevelopmentRuntimeHandler(List<StaticAssetDescriptor> descriptors)
 {
     internal const string ReloadStaticAssetsAtRuntimeKey = "ReloadStaticAssetsAtRuntime";
 
-    private readonly Dictionary<(string Route, string ETag), StaticAssetDescriptor> _descriptorsMap = [];
-
-    public StaticAssetDevelopmentRuntimeHandler(List<StaticAssetDescriptor> descriptors)
-    {
-        CreateDescriptorMap(descriptors);
-    }
-
     public void AttachRuntimePatching(EndpointBuilder builder)
     {
         var original = builder.RequestDelegate!;
         var asset = builder.Metadata.OfType<StaticAssetDescriptor>().Single();
         if (asset.HasContentEncoding())
         {
-            var originalETag = GetDescriptorOriginalResourceProperty(asset);
-            StaticAssetDescriptor? originalAsset = null;
-            if (originalETag is not null && _descriptorsMap.TryGetValue((asset.Route, originalETag), out originalAsset))
-            {
-                asset = originalAsset;
-            }
-            else
-            {
-                Debug.Assert(originalETag != null, $"The static asset descriptor {asset.Route} - {asset.AssetPath} does not have an original-resource property.");
-                Debug.Assert(originalAsset != null, $"The static asset descriptor {asset.Route} - {asset.AssetPath} has an original-resource property that does not match any known static asset descriptor.");
-            }
+            // This is a compressed asset, which might get out of "sync" with the original uncompressed version.
+            // We are going to find the original by using the weak etag from this compressed asset and locating an asset with the same etag.
+            var eTag = asset.GetWeakETag();
+            asset = FindOriginalAsset(eTag.Tag.Value!, descriptors);
         }
 
         builder.RequestDelegate = async context =>
@@ -72,57 +57,6 @@ public void AttachRuntimePatching(EndpointBuilder builder)
         };
     }
 
-    private static string? GetDescriptorOriginalResourceProperty(StaticAssetDescriptor descriptor)
-    {
-        for (var i = 0; i < descriptor.Properties.Count; i++)
-        {
-            var property = descriptor.Properties[i];
-            if (string.Equals(property.Name, "original-resource", StringComparison.OrdinalIgnoreCase))
-            {
-                return property.Value;
-            }
-        }
-
-        return null;
-    }
-
-    private static string? GetDescriptorETagResponseHeader(StaticAssetDescriptor descriptor)
-    {
-        for (var i = 0; i < descriptor.ResponseHeaders.Count; i++)
-        {
-            var header = descriptor.ResponseHeaders[i];
-            if (string.Equals(header.Name, HeaderNames.ETag, StringComparison.OrdinalIgnoreCase))
-            {
-                return header.Value;
-            }
-        }
-
-        return null;
-    }
-
-    private void CreateDescriptorMap(List<StaticAssetDescriptor> descriptors)
-    {
-        for (var i = 0; i < descriptors.Count; i++)
-        {
-            var descriptor = descriptors[i];
-            if (descriptor.HasContentEncoding())
-            {
-                continue;
-            }
-            var etag = GetDescriptorETagResponseHeader(descriptor);
-            if (etag != null && !_descriptorsMap.ContainsKey((descriptor.Route, etag)))
-            {
-                _descriptorsMap[(descriptor.Route, etag)] = descriptor;
-            }
-            else
-            {
-                Debug.Assert(etag != null, $"The static asset descriptor {descriptor.Route} - {descriptor.AssetPath} does not have an ETag response header.");
-                Debug.Assert(_descriptorsMap.ContainsKey((descriptor.Route, etag)),
-                    $"The static asset descriptor {descriptor.Route} - {descriptor.AssetPath} has an ETag response header that is already registered in the map. This should not happen, as the ETag should be unique for each static asset.");
-            }
-        }
-    }
-
     internal static string GetETag(IFileInfo fileInfo)
     {
         using var stream = fileInfo.CreateReadStream();
@@ -180,7 +114,10 @@ public Task SendFileAsync(string path, long offset, long? count, CancellationTok
                 _context.Response.Headers.ContentLength = stream.Length;
 
                 var eTag = Convert.ToBase64String(SHA256.HashData(stream));
-                _context.Response.Headers.ETag = new StringValues($"\"{eTag}\"");
+                var weakETag = $"W/{GetETag(fileInfo)}";
+
+                // Here we add the ETag for the Gzip stream as well as the weak ETag for the original asset.
+                _context.Response.Headers.ETag = new StringValues([$"\"{eTag}\"", weakETag]);
 
                 stream.Seek(0, SeekOrigin.Begin);
                 return stream.CopyToAsync(_context.Response.Body, cancellationToken);
@@ -205,6 +142,19 @@ public Task StartAsync(CancellationToken cancellationToken = default)
         }
     }
 
+    private static StaticAssetDescriptor FindOriginalAsset(string tag, List<StaticAssetDescriptor> descriptors)
+    {
+        for (var i = 0; i < descriptors.Count; i++)
+        {
+            if (descriptors[i].HasETag(tag))
+            {
+                return descriptors[i];
+            }
+        }
+
+        throw new InvalidOperationException("The original asset was not found.");
+    }
+
     internal static bool IsEnabled(bool isBuildManifest, IServiceProvider serviceProvider)
     {
         var config = serviceProvider.GetRequiredService<IConfiguration>();

src/StaticAssets/test/StaticAssetsIntegrationTests.cs

@@ -519,12 +519,13 @@ private static void CreateTestManifest(string appName, string webRoot, params Sp
                     Route = resource.Path,
                     AssetPath = $"{resource.Path}.gz",
                     Selectors = [new StaticAssetSelector("Content-Encoding", "gzip", "1.0")],
-                    Properties = [new("original-resource", $"\"{GetEtag(resource.Content)}\"")],
+                    Properties = [],
                     ResponseHeaders = [
                         new ("Accept-Ranges", "bytes"),
                         new ("Content-Type", GetContentType(filePath)),
 
                         new ("Content-Length", length.ToString(CultureInfo.InvariantCulture)),
+                        new ("ETag", $"W/\"{GetEtag(resource.Content)}\""),
                         new ("ETag", $"\"{GetEtagForFile(compressedFilePath)}\""),
                         new ("Last-Modified", lastModified.ToString("ddd, dd MMM yyyy HH:mm:ss 'GMT'", CultureInfo.InvariantCulture)),