Fixes issue with Windows platform relative image paths

Author: JudahGabriel

apps/pwabuilder-google-play/services/packageCreator.ts

@@ -138,6 +138,8 @@ export class PackageCreator {
             const errorMessage = (error as Error)?.message || `${error}`;
             this.dispatchProgressEvent("Unable to generate app package due to error. Checking if error is 403 Forbidden. " + errorMessage, "warn");
             const is403Error =
+                (error as any)?.status === 403 ||
+                (error as any)?.response?.status === 403 ||
                 errorMessage.includes('403') ||
                 errorMessage.includes('ECONNREFUSED') ||
                 errorMessage.includes('ENOTFOUND');

apps/pwabuilder-microsoft-store/Common/HttpClientExtensions.cs

@@ -11,7 +11,7 @@ namespace PWABuilder.MicrosoftStore.Common;
 
 public static class HttpClientExtensions
 {
-    private const string userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36 Edg/137.0.3296.62 PWABuilderHttpAgent"; // Note: this should include PWABuilderHttpAgent, as Cloudflare has whitelisted this UA
+    private const string userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/139.0.0.0 Safari/537.36 Edg/139.0.0.0 PWABuilderHttpAgent";
 
     public static void AddLatestEdgeUserAgent(this HttpClient http)
     {

apps/pwabuilder-microsoft-store/Services/ImageGenerator.cs

@@ -27,7 +27,7 @@ public class ImageGenerator
         private readonly Uri imageGeneratorServiceUrl;
 
         public ImageGenerator(
-            IHttpClientFactory httpClientFactory, 
+            IHttpClientFactory httpClientFactory,
             IOptions<AppSettings> appSettings,
             ILogger<ImageGenerator> logger)
         {
@@ -82,9 +82,13 @@ private async Task<byte[]> GetBaseImage(WindowsImages imageOptions, WebAppManife
             // Better than nothing: the largest image from the manifest
 
             // Go through each source and see if we can get the bytes for it.
+
+            var manifestUrl = !string.IsNullOrEmpty(webManifest.Url) ? new Uri(webManifest.Url) : null;
+            var baseImageAbsoluteUri = manifestUrl != null && imageOptions.BaseImage != null ?
+                new Uri(manifestUrl, imageOptions.BaseImage?.ToString()) : null;
             var baseImageSources = new[]
             {
-                (source: imageOptions.BaseImage, description: "base image from package options"),
+                (source: baseImageAbsoluteUri, description: "base image from package options"),
                 (source: webManifest.GetIconSuitableForWindowsApps(512), description: "largest square PNG or JPG icon 512x512 or larger from web manifest"),
                 (source: webManifest.GetIconSuitableForWindowsApps(256), description: "largest square PNG or JPG icon 256x256 or larger from web manifest"),
                 (source: webManifest.GetIconSuitableForWindowsApps(128), description: "largest square PNG or JPG icon 128x128 or larger from web manifest"),
@@ -114,7 +118,7 @@ private async Task<byte[]> GetBaseImage(WindowsImages imageOptions, WebAppManife
 
             var imageSourceDescriptions = baseImageSources
                 .Where(s => s.source != null)
-                .Select(s => $"{s.description}: {s.source?.ToString()}");            
+                .Select(s => $"{s.description}: {s.source?.ToString()}");
             throw new InvalidOperationException($"Couldn't find a suitable base image from which to generate all Windows package images. Please ensure your web app manifest has a square PNG image 512x512 or larger. Base image sources: {string.Join(", ", imageSourceDescriptions)}");
         }
 

apps/pwabuilder-microsoft-store/wwwroot/index.html

@@ -8,13 +8,17 @@
     <!-- Bootstrap CSS -->
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk" crossorigin="anonymous">
 
-    <title>PWABuilder.Windows.Chromium tester</title>
+    <title>PWABuilder Microsoft Store packaging service</title>
 </head>
 <body class="container">
     <h1 class="display-4">
-        PWABuilder.Windows.Chromium
+        PWABuilder Microsoft Store packaging service
     </h1>
-    <h5 class="display-5"><small class="text-muted">Test the service using the JSON below</small></h5>
+    <h5 class="display-5">
+        <small class="text-muted">
+            This service builds a Microsoft Store app package (.msixbundle) from your PWA. The app package can be uploaded to <a href="https://partner.microsoft.com/dashboard">Microsoft Partner Center</a> for listing in the Microsoft Store.
+        </small>
+    </h5>
     <br>
 
     <div class="card w-100">