Updating the chromedriver install location

shard.yml

@@ -12,9 +12,9 @@ dependencies:
     github: luckyframework/habitat
     version: ~> 0.4.7
   crystar:
-    git: https://github.com/naqvis/crystar.git
-    commit: 56db8bb9dfbd5ed6d7908353405a5fae632a6561
+    github: naqvis/crystar
+    version: ~> 0.3.1
 development_dependencies:
   ameba:
     github: crystal-ameba/ameba
-    version: ~> 1.1.0
+    version: ~> 1.5

spec/webdrivers/cache_spec.cr

@@ -38,7 +38,7 @@ describe Webdrivers::Cache do
   end
 end
 
-private def with_tempfile
+private def with_tempfile(&)
   tempfile = File.tempfile(suffix: ".txt") do |file|
     file.print("hello!")
   end
@@ -47,7 +47,7 @@ ensure
   tempfile.try(&.delete)
 end
 
-private def with_missing_file
+private def with_missing_file(&)
   tempname = File.tempname(suffix: ".txt")
   yield tempname
 ensure

spec/webdrivers/chrome/driver_remote_version_finder_spec.cr

@@ -7,7 +7,7 @@ module Webdrivers::Chrome
       File.delete(finder.cache_path) if File.exists?(finder.cache_path)
     end
 
-    it "will limit return version to matching major version if version" do
+    it "will limit return version to matching major version when version is provided" do
       version = SemanticVersion.new(
         major: 71,
         minor: 22,

src/webdrivers/cache.cr

@@ -1,5 +1,5 @@
 module Webdrivers::Cache
-  def self.fetch(cache_path : String, expires_in : Time::Span, &block)
+  def self.fetch(cache_path : String, expires_in : Time::Span, &)
     value = read(cache_path, expires_in)
     return value if value
 

src/webdrivers/chrome/driver_remote_version_finder.cr

@@ -12,15 +12,35 @@ class Webdrivers::Chrome::DriverRemoteVersionFinder
 
   private def find_raw_version
     Cache.fetch(cache_path, Webdrivers.settings.cache_duration) do
-      response = HTTP::Client.get("https://chromedriver.storage.googleapis.com/#{latest_release}")
-      response.body
+      if v = version
+        if v.major < 113
+          fetch_legacy_version(v)
+        else
+          fetch_latest_version(v)
+        end
+      else
+        fetch_latest_stable
+      end
     end
   end
 
-  private def latest_release
-    limitting_version = version
-    return "LATEST_RELEASE" if limitting_version.nil?
+  private def fetch_legacy_version(version : SemanticVersion)
+    response = HTTP::Client.get("https://chromedriver.storage.googleapis.com/LATEST_RELEASE_#{version.major}")
+    response.body
+  end
+
+  private def fetch_latest_version(version : SemanticVersion)
+    response = HTTP::Client.get("#{chrome_for_testing_base_url}/LATEST_RELEASE_#{version.major}")
+    response.body
+  end
+
+  private def fetch_latest_stable
+    response = HTTP::Client.get("#{chrome_for_testing_base_url}/last-known-good-versions-with-downloads.json")
+    google = JSON.parse(response.body)
+    google.dig("channels", "Stable", "version").as_s
+  end
 
-    "LATEST_RELEASE_#{limitting_version.major}"
+  private def chrome_for_testing_base_url : String
+    "https://googlechromelabs.github.io/chrome-for-testing"
   end
 end

src/webdrivers/chrome/install_driver_executor.cr

@@ -3,18 +3,26 @@ class Webdrivers::Chrome::InstallDriverExecutor
   getter current_version : SemanticVersion?
   getter driver_directory : String
   getter driver_name : String
+  getter cache_path : String
 
   def initialize(@install_version, @driver_directory, @driver_name, @current_version)
+    @cache_path = File.join(Common.driver_directory, "chromedriver.download_url")
   end
 
   def execute
     return if current_version == install_version
 
     Dir.mkdir_p(driver_directory) unless File.exists?(driver_directory)
 
+    if install_version.major < 115
+      normalized_driver_name = driver_name
+    else
+      normalized_driver_name = File.join("chromedriver-#{download_url_platform}", driver_name)
+    end
+
     FileUtils.cd(driver_directory) do
       zip = download_file(from: download_url, to: download_url_filename)
-      Common::ZipExtractor.new(zip, driver_name, driver_directory).extract
+      Common::ZipExtractor.new(zip, normalized_driver_name, driver_directory).extract
       zip.delete
       File.chmod(driver_name, Common::EXECUTABLE_PERMISSIONS)
     end
@@ -28,14 +36,48 @@ class Webdrivers::Chrome::InstallDriverExecutor
     File.new(to, mode: "rb")
   end
 
-  private def download_url
-    "https://chromedriver.storage.googleapis.com/#{converted_version}/#{download_url_filename}"
+  private def download_url : String
+    if install_version.major < 115
+      "https://chromedriver.storage.googleapis.com/#{converted_version}/#{download_url_filename}"
+    else
+      fetch_download_url_for_version
+    end
+  end
+
+  private def fetch_download_url_for_version : String
+    Cache.fetch(cache_path, Webdrivers.settings.cache_duration) do
+      response = HTTP::Client.get("#{chrome_for_testing_base_url}/known-good-versions-with-downloads.json")
+      google = JSON.parse(response.body.to_s)
+      downloads = google["versions"].as_a
+      version_found = downloads.find! { |version| version["version"].as_s == converted_version }
+      platforms = version_found.dig("downloads", "chromedriver").as_a
+      platform_found = platforms.find! { |platform| platform["platform"].as_s == download_url_platform }
+      platform_found["url"].as_s
+    end
   end
 
   private def converted_version : String
     SemverConverter.convert(install_version)
   end
 
+  private def chrome_for_testing_base_url : String
+    "https://googlechromelabs.github.io/chrome-for-testing"
+  end
+
+  # TODO: Support Win64, and Mac Intel
+  private def download_url_platform : String
+    case Common.os
+    when Common::OS::Linux
+      "linux64"
+    when Common::OS::Mac
+      "mac-x64"
+    when Common::OS::Windows
+      "win32"
+    else
+      raise "Unknown os"
+    end
+  end
+
   private def download_url_filename : String
     case Common.os
     when Common::OS::Linux

src/webdrivers/chromedriver.cr

@@ -23,7 +23,7 @@ class Webdrivers::Chromedriver
 
   def self.install : String
     Chrome::InstallDriverExecutor.new(
-      install_version: latest_driver_version.not_nil!,
+      install_version: latest_driver_version.as(SemanticVersion),
       current_version: driver_version,
       driver_directory: Common.driver_directory,
       driver_name: driver_name

src/webdrivers/common/tar_gz_extractor.cr

@@ -9,7 +9,7 @@ class Webdrivers::Common::TarGzExtractor
   def extract
     Compress::Gzip::Reader.open(file) do |gzip|
       Crystar::Reader.open(gzip) do |tar|
-        entry = tar.next_entry.not_nil!
+        entry = tar.next_entry.as(Crystar::Header)
         destination_path = File.join(install_path, entry.name)
         File.delete(destination_path) if File.exists?(destination_path)
         File.write(destination_path, entry.io)

src/webdrivers/common/zip_extractor.cr

@@ -9,7 +9,8 @@ class Webdrivers::Common::ZipExtractor
   def extract
     Compress::Zip::File.open(zip_file) do |zip_contents|
       driver = zip_contents[driver_name]
-      destination_path = File.join(install_path, driver.filename)
+      filepath = driver.filename.split(File::SEPARATOR).last
+      destination_path = File.join(install_path, filepath)
       File.delete(destination_path) if File.exists?(destination_path)
       driver.open { |io| File.write(destination_path, io) }
     end

src/webdrivers/geckodriver.cr

@@ -17,7 +17,7 @@ class Webdrivers::Geckodriver
 
   def self.install : String
     Gecko::InstallDriverExecutor.new(
-      install_version: latest_driver_version.not_nil!,
+      install_version: latest_driver_version.as(SemanticVersion),
       current_version: driver_version,
       driver_directory: Common.driver_directory,
       driver_name: driver_name