Updating from source commit d3c900a097e16377211871308025f04ca8b5566c on 2025-08-16T14:19:33-07:00

Author: ljcollins25

src/Codex.Application/Codex.Application.csproj

@@ -29,6 +29,7 @@
     <PackageReference Include="LibGit2Sharp.NativeBinaries" />
     <PackageReference Include="Microsoft.Build.Locator" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
+    <PackageReference Include="Microsoft.Net.Http.Headers" />
 
     <PackageReference Include="Mono.Options"/>
   </ItemGroup>

src/Codex.Application/Verbs/ZipPutOperation.cs

@@ -28,7 +28,7 @@ protected override async ValueTask InitializeAsync()
         await base.InitializeAsync();
         SourcePath = Path.GetFullPath(SourcePath);
         TargetZipPath = Path.GetFullPath(TargetZipPath);
-        EntryPathPrefix = EntryPathPrefix?.EnsureTrailingSlash("/", normalize: true);
+        EntryPathPrefix = EntryPathPrefix?.EnsureTrailingSlash('/', normalize: true);
     }
 
     protected override async ValueTask<int> ExecuteAsync()

src/Codex.Integration.Tests/CodexTestBase.cs

@@ -26,6 +26,8 @@ public record CodexTestBase : IDisposable
 
     public Action<AnalyzeOperation> UpdateAnalyze { get; set; }
 
+    public const string IndexContainer = "indexcontainer";
+
     public bool CleanTestDir { get; set; }
     public ITestOutputHelper Output { get; }
     public TestLogger Logger { get; }

src/Codex.Integration.Tests/UtilitiesTests.cs

@@ -30,16 +30,16 @@ public partial record UtilitiesTests(ITestOutputHelper output) : CodexTestBase(o
 {
     private static ISpanSerializer<SmallIntArray> ValueArraySerializer = new BinaryItemSerializer<SmallIntArray>();
 
-    [Fact]
-    public void UriCombine()
+    [Theory]
+    [InlineData("https://local:234?hello=world", "relative/index", "https://local:234/relative/index?hello=world")]
+    [InlineData(
+        "http://127.0.0.1:33747/devstoreaccount1/testcontainer/index.zip?sv=2023-08-03&ss=b&srt=sco&se=2025-08-16T12%3A46%3A25Z&sp=rwdxylacuptfi&sig=rIFwMOwdtKWddOW6nTHNPrMB%2BSg724E%2BaM7HZ8%2BgRHE%3D",
+        "",
+        "http://127.0.0.1:33747/devstoreaccount1/testcontainer/index.zip?sv=2023-08-03&ss=b&srt=sco&se=2025-08-16T12%3A46%3A25Z&sp=rwdxylacuptfi&sig=rIFwMOwdtKWddOW6nTHNPrMB%2BSg724E%2BaM7HZ8%2BgRHE%3D")]
+    public void UriCombine(string baseUri, string relativeUri, string expected, bool preserveBaseQuery = true, bool forcePreserveBaseQuery = false)
     {
-        test("https://local:234?hello=world", "relative/index", "https://local:234/relative/index?hello=world");
-
-        void test(string baseUri, string relativeUri, string expected, bool preserveBaseQuery = true, bool forcePreserveBaseQuery = false)
-        {
-            var actual = PathUtilities.Combine(baseUri, relativeUri, preserveBaseQuery, forcePreserveBaseQuery);
-            actual.ToString().Should().Be(expected);
-        }
+        var actual = PathUtilities.Combine(baseUri, relativeUri, preserveBaseQuery, forcePreserveBaseQuery);
+        actual.ToString().Should().Be(expected);
     }
 
     [Fact]

src/Codex.Lucene/Paging/FileSystemPageFileAccessor.cs

@@ -18,7 +18,7 @@ public class FileSystemPageFileAccessor : IPageFileAccessor, IHttpClient
         public FileSystemPageFileAccessor(string rootDirectory)
         {
             RootDirectory = rootDirectory;
-            BaseAddress = new Uri(RootDirectory);
+            BaseAddress = new Uri(RootDirectory.EnsureTrailingSlash(normalize: true));
         }
 
         public IPageFileState CreateState(string path, PagingFileEntry entry)
@@ -119,8 +119,10 @@ public async Task<HttpResponseMessage> SendMessageAsync(HttpRequestMessage reque
         {
             var range = request.ExtractRange();
 
+            var fullUri = BaseAddress.Combine(request.RequestUri.WithoutQuery().ToString(), preserveBaseQuery: false);
+
             using var stream = await OpenStreamCoreAsync(
-                request.RequestUri.OriginalString.AsSpan().SubstringFromFirstIndexOfAny("?").ToString(),
+                fullUri.AbsolutePath,
                 range,
                 writable: false,
                 httpMode: true) as MemoryStream;

src/Codex.ObjectModel/Utilities/PathUtilities.cs

@@ -46,15 +46,22 @@ public static Url Combine(this Url baseUri, string relativeUri, bool preserveBas
             return baseUri.Uri.Combine(relativeUri, preserveBaseQuery, forcePreserveBaseQuery);
         }
 
-        public static Uri Combine(this Uri baseUri, string relativeUri, bool preserveBaseQuery = true, bool forcePreserveBaseQuery = false)
+        public static Uri Combine(this Uri baseUri, string relativeUri, bool preserveBaseQuery = true, bool forcePreserveBaseQuery = false, bool treatBaseAsFolder = true)
         {
+            if (string.IsNullOrEmpty(relativeUri))
+            {
+                return baseUri;
+            }
+
             if ((!forcePreserveBaseQuery || string.IsNullOrEmpty(baseUri.Query))
                 && relativeUri?.Contains(":") == true)
             {
                 return new Uri(relativeUri);
             }
 
-            var result = new Uri(baseUri.EnsureTrailingSlash(), relativeUri);
+            baseUri = treatBaseAsFolder ? baseUri.EnsureTrailingSlash() : baseUri;
+
+            var result = new Uri(baseUri, relativeUri);
             if (preserveBaseQuery && !string.IsNullOrEmpty(baseUri.Query))
             {
                 var builder = new UriBuilder(result);

src/Codex.ObjectModel/Utilities/Paths.cs

@@ -141,20 +141,20 @@ public static string NormalizeSlashes(this string path, char? slash = null)
             }
         }
 
-        public static string EnsureTrailingSlash(this string path, string slash = null, bool normalize = false)
+        public static string EnsureTrailingSlash(this string path, char? slash = null, bool normalize = false)
         {
-            slash ??= DirectorySeparator;
+            slash ??= DirectorySeparatorChar;
             if (string.IsNullOrEmpty(path))
             {
                 return path;
             }
 
             if (normalize)
             {
-                path = PathUtilities.NormalizePath(path);
+                path = PathUtilities.NormalizePath(path, directorySeparator: slash);
             }
 
-            if (!path.EndsWith(slash))
+            if (!path.EndsWith(slash.Value))
             {
                 path += slash;
             }

src/Codex.Sdk/Http/HttpClient.cs

@@ -75,17 +75,9 @@ private HttpResponseMessage HandleResponse(HttpResponseMessage response)
             uri = new Uri(uri.OriginalString.Replace('?', '&'), UriKind.RelativeOrAbsolute);
         }
 
-        // Only need to modify uri if both contain query strings
-        if (string.IsNullOrEmpty(BaseAddress?.Query) || uri == null) return uri;
+        if (uri == null) return uri;
 
-        var fullUri = new Uri(BaseAddress, uri);
-        var builder = new UriBuilder(fullUri);
-
-        builder.Query = string.IsNullOrEmpty(builder.Query)
-            ? BaseAddress.Query
-            : $"{builder.Query}&{BaseAddress.Query.AsSpan().TrimStart('?')}";
-
-        return builder.Uri;
+        return BaseAddress.Combine(uri.ToString(), forcePreserveBaseQuery: true);
     }
 }
 

src/Codex.Web.Common/WebProgramBase.cs

@@ -170,11 +170,8 @@ protected virtual string GetIndexSourceUrl(IndexSourceLocation indexSource)
         }
         else
         {
-            var sourceUri = new Uri(url.Replace('\\', '/').TrimStart('/'), UriKind.Relative);
-            var uriBuilder = new UriBuilder(args.RootUrl);
-            uriBuilder.Path = PathUtilities.UriCombine(uriBuilder.Path, sourceUri.GetComponents(UriComponents.Path, UriFormat.Unescaped));
-            uriBuilder.Query = sourceUri.Query;
-            return uriBuilder.Uri.ToString();
+            var result = args.RootUrl.Combine(args.IndexSourceJsonUri).Combine(url, treatBaseAsFolder: false);
+            return result.ToString();
         }
     }