Check firefox version automatically (#1776)

Author: kblok

lib/PuppeteerSharp.Tests/FixturesTests/FixturesTests.cs

@@ -16,12 +16,12 @@ public FixturesTests(ITestOutputHelper output) : base(output) { }
 
         [PuppeteerTest("fixtures.spec.ts", "Fixtures", "should dump browser process stderr")]
         [SkipBrowserFact(skipFirefox: true)]
-        public void ShouldDumpBrowserProcessStderr()
+        public async Task ShouldDumpBrowserProcessStderr()
         {
             var success = false;
             var process = GetTestAppProcess(
                 "PuppeteerSharp.Tests.DumpIO",
-                $"\"{new BrowserFetcher(Product.Chrome).RevisionInfo().ExecutablePath}\"");
+                $"\"{(await new BrowserFetcher(Product.Chrome).GetRevisionInfoAsync()).ExecutablePath}\"");
 
             process.ErrorDataReceived += (_, e) =>
             {
@@ -39,7 +39,7 @@ public async Task ShouldCloseTheBrowserWhenTheConnectedProcessCloses()
         {
             var browserClosedTaskWrapper = new TaskCompletionSource<bool>();
             var ChromiumLauncher = new ChromiumLauncher(
-                new BrowserFetcher(Product.Chrome).RevisionInfo().ExecutablePath,
+                (await new BrowserFetcher(Product.Chrome).GetRevisionInfoAsync()).ExecutablePath,
                 new LaunchOptions { Headless = true });
 
             await ChromiumLauncher.StartAsync().ConfigureAwait(false);

lib/PuppeteerSharp/BrowserFetcher.cs

@@ -12,6 +12,7 @@
 using System.Threading.Tasks;
 using ICSharpCode.SharpZipLib.BZip2;
 using ICSharpCode.SharpZipLib.Tar;
+using Newtonsoft.Json;
 using PuppeteerSharp.Helpers;
 using PuppeteerSharp.Helpers.Linux;
 
@@ -65,7 +66,7 @@ public class BrowserFetcher
         /// <summary>
         /// Default Chromium revision.
         /// </summary>
-        public const string DefaultFirefoxRevision = "90.0a1";
+        public string DefaultFirefoxRevision { get; private set; } = "latest";
 
         /// <summary>
         /// Gets the downloads folder.
@@ -215,7 +216,8 @@ public void Remove(string revision)
         /// Gets the revision info.
         /// </summary>
         /// <returns>Revision info.</returns>
-        public RevisionInfo RevisionInfo() => RevisionInfo(Product == Product.Chrome ? DefaultChromiumRevision : DefaultFirefoxRevision);
+        public async Task<RevisionInfo> GetRevisionInfoAsync()
+            => RevisionInfo(Product == Product.Chrome ? DefaultChromiumRevision : await GetDefaultFirefoxRevisionAsync().ConfigureAwait(false));
 
         /// <summary>
         /// Gets the revision info.
@@ -249,7 +251,11 @@ public RevisionInfo RevisionInfo(string revision)
         /// Downloads the revision.
         /// </summary>
         /// <returns>Task which resolves to the completed download.</returns>
-        public Task<RevisionInfo> DownloadAsync() => DownloadAsync(Product == Product.Chrome ? DefaultChromiumRevision : DefaultFirefoxRevision);
+        public async Task<RevisionInfo> DownloadAsync()
+            => await DownloadAsync(
+                Product == Product.Chrome
+                ? DefaultChromiumRevision
+                : await GetDefaultFirefoxRevisionAsync().ConfigureAwait(false)).ConfigureAwait(false);
 
         /// <summary>
         /// Downloads the revision.
@@ -564,6 +570,19 @@ private string GetRevisionFromPath(string folderName)
             return splits[1];
         }
 
+        private async Task<string> GetDefaultFirefoxRevisionAsync()
+        {
+            if (DefaultFirefoxRevision == "latest")
+            {
+                using var client = new HttpClient();
+                var response = await client.GetStringAsync("https://product-details.mozilla.org/1.0/firefox_versions.json").ConfigureAwait(false);
+                var version = JsonConvert.DeserializeObject<Dictionary<string, string>>(response);
+                DefaultFirefoxRevision = version["FIREFOX_NIGHTLY"];
+            }
+
+            return DefaultFirefoxRevision;
+        }
+
         private static string GetArchiveName(Product product, Platform platform, string revision)
         {
             if (product == Product.Chrome)

lib/PuppeteerSharp/Launcher.cs

@@ -49,7 +49,7 @@ public async Task<Browser> LaunchAsync(LaunchOptions options)
         {
             EnsureSingleLaunchOrConnect();
             _product = options.Product;
-            var executable = GetOrFetchBrowserExecutable(options);
+            var executable = await GetOrFetchBrowserExecutableAsync(options).ConfigureAwait(false);
 
             Process = options.Product switch
             {
@@ -146,7 +146,7 @@ private async Task<string> GetWSEndpointAsync(string browserURL)
         /// Gets the executable path.
         /// </summary>
         /// <returns>The executable path.</returns>
-        public string GetExecutablePath() => ResolveExecutablePath();
+        public Task<string> GetExecutablePathAsync() => ResolveExecutablePathAsync();
 
         #endregion
 
@@ -162,13 +162,13 @@ private void EnsureSingleLaunchOrConnect()
             _processLaunched = true;
         }
 
-        private string GetOrFetchBrowserExecutable(LaunchOptions options)
+        private async Task<string> GetOrFetchBrowserExecutableAsync(LaunchOptions options)
         {
             var browserExecutable = options.ExecutablePath;
 
             if (string.IsNullOrEmpty(browserExecutable))
             {
-                browserExecutable = ResolveExecutablePath();
+                browserExecutable = await ResolveExecutablePathAsync().ConfigureAwait(false);
             }
 
             if (!File.Exists(browserExecutable))
@@ -178,7 +178,7 @@ private string GetOrFetchBrowserExecutable(LaunchOptions options)
             return browserExecutable;
         }
 
-        private string ResolveExecutablePath()
+        private async Task<string> ResolveExecutablePathAsync()
         {
             var executablePath = Environment.GetEnvironmentVariable("PUPPETEER_EXECUTABLE_PATH");
 
@@ -204,7 +204,7 @@ private string ResolveExecutablePath()
                 }
                 return revisionInfo.ExecutablePath;
             }
-            revisionInfo = browserFetcher.RevisionInfo();
+            revisionInfo = await browserFetcher.GetRevisionInfoAsync().ConfigureAwait(false);
             if (!revisionInfo.Local)
             {
                 throw new FileNotFoundException("Process revision is not downloaded. Run BrowserFetcher.DownloadAsync or download the process manually", revisionInfo.ExecutablePath);

lib/PuppeteerSharp/PuppeteerSharp.csproj

@@ -13,10 +13,10 @@
     <Description>Headless Browser .NET API</Description>
     <PackageId>PuppeteerSharp</PackageId>
     <PackageReleaseNotes></PackageReleaseNotes>
-    <PackageVersion>4.0.0</PackageVersion>
-    <ReleaseVersion>4.0.0</ReleaseVersion>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <FileVersion>4.0.0.0</FileVersion>
+    <PackageVersion>5.0.0</PackageVersion>
+    <ReleaseVersion>5.0.0</ReleaseVersion>
+    <AssemblyVersion>5.0.0.0</AssemblyVersion>
+    <FileVersion>5.0.0.0</FileVersion>
     <SynchReleaseVersion>false</SynchReleaseVersion>
     <StyleCopTreatErrorsAsWarnings>false</StyleCopTreatErrorsAsWarnings>
     <CodeAnalysisRuleSet>../PuppeteerSharp.ruleset</CodeAnalysisRuleSet>