Escl: Only use the path from the job URI

We want to use the same host etc. as all other requests, particularly for IPv6 link-local addresses which need the network interface.
cyanfish · Dec 12, 2023 · ff0d538 · ff0d538
1 parent 0ea4f32
commit ff0d538
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/NAPS2.Escl/Client/EsclClient.cs b/NAPS2.Escl/Client/EsclClient.cs
@@ -88,23 +88,24 @@ public async Task<EsclJob> CreateScanJob(EsclScanSettings settings)
                     // new XElement(ScanNs + "Threshold", settings.Threshold),
                     new XElement(PwgNs + "DocumentFormat", settings.DocumentFormat)));
         var content = new StringContent(doc, Encoding.UTF8, "text/xml");
-        var url = GetUrl("ScanJobs");
+        var url = GetUrl($"/{_service.RootUrl}/ScanJobs");
         Logger.LogDebug("ESCL POST {Url}", url);
         Logger.LogDebug("{Doc}", doc);
         var response = await HttpClient.PostAsync(url, content);
         response.EnsureSuccessStatusCode();
         Logger.LogDebug("POST OK");
+
         return new EsclJob
         {
-            Uri = response.Headers.Location!
+            UriPath = response.Headers.Location!.AbsolutePath
         };
     }
 
     public async Task<RawDocument?> NextDocument(EsclJob job, Action<double>? pageProgress = null)
     {
         if (pageProgress != null)
         {
-            var progressUrl = job.Uri + "/Progress";
+            var progressUrl = GetUrl($"{job.UriPath}/Progress");
             var progressResponse = await ProgressHttpClient.GetStreamAsync(progressUrl);
             var streamReader = new StreamReader(progressResponse);
             _ = Task.Run(async () =>
@@ -119,7 +120,7 @@ public async Task<EsclJob> CreateScanJob(EsclScanSettings settings)
             });
         }
         // TODO: Maybe check Content-Location on the response header to ensure no duplicate document?
-        var url = job.Uri + "/NextDocument";
+        var url = GetUrl($"{job.UriPath}/NextDocument");;
         Logger.LogDebug("ESCL GET {Url}", url);
         var response = await DocumentHttpClient.GetAsync(url);
         if (response.StatusCode is HttpStatusCode.NotFound or HttpStatusCode.Gone)
@@ -141,7 +142,7 @@ public async Task<EsclJob> CreateScanJob(EsclScanSettings settings)
 
     public async Task<string> ErrorDetails(EsclJob job)
     {
-        var url = job.Uri + "/ErrorDetails";
+        var url = GetUrl($"{job.UriPath}/ErrorDetails");;
         Logger.LogDebug("ESCL GET {Url}", url);
         var response = await HttpClient.GetAsync(url);
         response.EnsureSuccessStatusCode();
@@ -150,8 +151,9 @@ public async Task<string> ErrorDetails(EsclJob job)
 
     public async Task CancelJob(EsclJob job)
     {
-        Logger.LogDebug("ESCL DELETE {Url}", job.Uri);
-        var response = await HttpClient.DeleteAsync(job.Uri);
+        var url = GetUrl(job.UriPath);
+        Logger.LogDebug("ESCL DELETE {Url}", url);
+        var response = await HttpClient.DeleteAsync(url);
         if (!response.IsSuccessStatusCode)
         {
             Logger.LogDebug("DELETE failed: {Status}", response.StatusCode);
@@ -164,7 +166,7 @@ public async Task CancelJob(EsclJob job)
     private async Task<XDocument> DoRequest(string endpoint)
     {
         // TODO: Retry logic
-        var url = GetUrl(endpoint);
+        var url = GetUrl($"/{_service.RootUrl}/{endpoint}");
         Logger.LogDebug("ESCL GET {Url}", url);
         var response = await HttpClient.GetAsync(url, CancelToken);
         response.EnsureSuccessStatusCode();
@@ -177,14 +179,19 @@ private async Task<XDocument> DoRequest(string endpoint)
     private string GetUrl(string endpoint)
     {
         var protocol = _service.Tls || _service.Port == 443 ? "https" : "http";
-        var ipAndPort = new IPEndPoint(_service.RemoteEndpoint, _service.Port).ToString();
+        return $"{protocol}://{GetHostAndPort()}{endpoint}";
+    }
+
+    private string GetHostAndPort()
+    {
+        var host = new IPEndPoint(_service.RemoteEndpoint, _service.Port).ToString();
 #if NET6_0_OR_GREATER
         if (OperatingSystem.IsMacOS())
         {
             // Using the mDNS hostname is more reliable on Mac (but doesn't work at all on Windows)
-            ipAndPort = $"{_service.Host}:{_service.Port}";
+            host = $"{_service.Host}:{_service.Port}";
         }
 #endif
-        return $"{protocol}://{ipAndPort}/{_service.RootUrl}/{endpoint}";
+        return host;
     }
 }
diff --git a/NAPS2.Escl/EsclJob.cs b/NAPS2.Escl/EsclJob.cs
@@ -2,5 +2,5 @@ namespace NAPS2.Escl;
 
 public class EsclJob
 {
-    public required Uri Uri { get; init; }
+    public required string UriPath { get; init; }
 }
diff --git a/NAPS2.Sdk/Scan/Internal/Escl/EsclScanDriver.cs b/NAPS2.Sdk/Scan/Internal/Escl/EsclScanDriver.cs
@@ -152,7 +152,7 @@ public async Task Scan(ScanOptions options, CancellationToken cancelToken, IScan
                     throw;
                 }
                 var status = await client.GetStatus();
-                var jobState = status.JobStates.Get(job.Uri.AbsolutePath);
+                var jobState = status.JobStates.Get(job.UriPath);
                 if (jobState is not (EsclJobState.Pending or EsclJobState.Processing or EsclJobState.Unknown))
                 {
                     // Only retry if the job is pending or processing