device_detector 1.1.2 → 1.1.3

data/lib/device_detector/client_hint.rb

@@ -14,12 +14,12 @@ class DeviceDetector
       return if headers.nil?
 
       @headers = headers
-      @full_version = headers['Sec-CH-UA-Full-Version']
+      @full_version = extract_full_version
       @browser_list = extract_browser_list
       @app_name = extract_app_name
-      @platform = headers['Sec-CH-UA-Platform']
+      @platform = extract_platform
       @platform_version = extract_platform_version
-      @mobile = headers['Sec-CH-UA-Mobile']
+      @mobile = extract_mobile
       @model = extract_model
     end
 
@@ -27,19 +27,24 @@ class DeviceDetector
                 :platform_version
 
     def browser_name
-      return 'Iridium' if is_iridium?
+      return 'Iridium' if iridium?
+      return '360 Secure Browser' if secure_browser?
 
       browser_name_from_list || app_name
     end
 
     def os_version
       return windows_version if platform == 'Windows'
+      return lineage_version if lineage_os_app?
+      return fire_os_version if fire_os_app?
 
       platform_version
     end
 
     def os_name
       return 'Android' if android_app?
+      return 'Lineage OS' if lineage_os_app?
+      return 'Fire OS' if fire_os_app?
       return unless ['Windows', 'Chromium OS'].include?(platform)
 
       platform
@@ -59,21 +64,27 @@ class DeviceDetector
 
     private
 
-    def extract_platform_version
-      return if  headers['Sec-CH-UA-Platform-Version'].nil?
-      return if  headers['Sec-CH-UA-Platform-Version'] == ''
-
-      headers['Sec-CH-UA-Platform-Version']
-    end
-
     # https://github.com/matomo-org/device-detector/blob/28211c6f411528abf41304e07b886fdf322a49b7/Parser/OperatingSystem.php#L330
     def android_app?
       %w[com.hisense.odinbrowser com.seraphic.openinet.pre
-         com.appssppa.idesktoppcbrowser].include?(app_name_from_headers)
+         com.appssppa.idesktoppcbrowser every.browser.inc].include?(app_name_from_headers)
+    end
+
+    # https://github.com/matomo-org/device-detector/blob/67ae11199a5129b42fa8b985d372ea834104fe3a/Parser/OperatingSystem.php#L449-L456
+    def fire_os_app?
+      app_name_from_headers == 'org.mozilla.tv.firefox'
+    end
+
+    # https://github.com/matomo-org/device-detector/blob/67ae11199a5129b42fa8b985d372ea834104fe3a/Parser/OperatingSystem.php#L439-L447
+    def lineage_os_app?
+      app_name_from_headers == 'org.lineageos.jelly'
     end
 
+    # https://github.com/matomo-org/device-detector/blob/75d88bbefb0182f9207c9f48dc39b1bc8c7cc43f/Parser/Client/Browser.php#L1076-L1079
     def browser_name_from_list
-      @browser_name_from_list ||= browser_list&.reject { |b| b.name == 'Chromium' }&.last&.name
+      @browser_name_from_list ||= browser_list&.reject do |b|
+        ['Chromium', 'Microsoft Edge'].include?(b.name)
+      end&.last&.name
     end
 
     def available_browsers
@@ -94,14 +105,35 @@ class DeviceDetector
       major_version < 11 ? '10' : '11'
     end
 
-    # https://github.com/matomo-org/device-detector/blob/be1c9ef486c247dc4886668da5ed0b1c49d90ba8/Parser/Client/Browser.php#L749
-    # If version from client hints report 2022 or 2022.04, then is the Iridium browser
-    # https://iridiumbrowser.de/news/2022/05/16/version-2022-04-released
-    def is_iridium?
+    def lineage_version
+      DeviceDetector::OS
+        .mapped_os_version(platform_version, DeviceDetector::OS::LINEAGE_OS_VERSION_MAPPING)
+    end
+
+    def fire_os_version
+      DeviceDetector::OS
+        .mapped_os_version(platform_version, DeviceDetector::OS::FIRE_OS_VERSION_MAPPING)
+    end
+
+    # https://github.com/matomo-org/device-detector/blob/67ae11199a5129b42fa8b985d372ea834104fe3a/Parser/Client/Browser.php#L923-L929
+    # If the version reported from the client hints is YYYY or YYYY.MM (e.g., 2022 or 2022.04),
+    # then it is the Iridium browser
+    # https://iridiumbrowser.de/news/
+    def iridium?
       return if browser_list.nil?
 
       !browser_list.find do |browser|
-        browser.name == 'Chromium' && %w[2021.12 2022.04 2022].include?(browser.version)
+        browser.name == 'Chromium' && browser.version =~ /^202[0-4]/
+      end.nil?
+    end
+
+    # https://github.com/matomo-org/device-detector/blob/67ae11199a5129b42fa8b985d372ea834104fe3a/Parser/Client/Browser.php#L931-L937
+    # https://bbs.360.cn/thread-16096544-1-1.html
+    def secure_browser?
+      return if browser_list.nil?
+
+      !browser_list.find do |browser|
+        browser.name == 'Chromium' && browser.version =~ /^15/
       end.nil?
     end
 
@@ -141,9 +173,15 @@ class DeviceDetector
     end
 
     def extract_browser_list
-      return if headers['Sec-CH-UA'].nil?
+      extract_browser_list_from_full_version_list ||
+        extract_browser_list_from_header('Sec-CH-UA') ||
+        extract_browser_list_from_header('Sec-CH-UA-Full-Version-List')
+    end
 
-      headers['Sec-CH-UA'].split(', ').map do |component|
+    def extract_browser_list_from_header(header)
+      return if headers[header].nil?
+
+      headers[header].split(', ').map do |component|
         name_and_version = extract_browser_name_and_version(component)
         next if name_and_version[:name].nil?
 
@@ -158,24 +196,54 @@ class DeviceDetector
       { name: name, version: browser_version }
     end
 
+    def extract_browser_list_from_full_version_list
+      return if headers['fullVersionList'].nil? && headers['brands'].nil?
+
+      (headers['brands'] || headers['fullVersionList']).map do |item|
+        name = name_from_known_browsers(item['brand'])
+        next if name.nil?
+
+        HintBrowser.new(name, full_version || item['version'])
+      end.compact
+    end
+
     # https://github.com/matomo-org/device-detector/blob/be1c9ef486c247dc4886668da5ed0b1c49d90ba8/Parser/Client/Browser.php#L865
     def name_from_known_browsers(name)
-      # https://github.com/matomo-org/device-detector/blob/be1c9ef486c247dc4886668da5ed0b1c49d90ba8/Parser/Client/Browser.php#L628
-      return 'Chrome' if name == 'Google Chrome'
-
-      available_browsers.find do |i|
-        i == name ||
-          i.gsub(' ', '') == name.gsub(' ', '') ||
-          i == name.gsub('Browser', '') ||
-          i == name.gsub(' Browser', '') ||
-          i == "#{name} Browser"
+      DeviceDetector::Browser::KNOWN_BROWSER_TO_NAME.fetch(name) do
+        available_browsers.find do |i|
+          i == name ||
+            i.gsub(' ', '') == name.gsub(' ', '') ||
+            i == name.gsub('Browser', '') ||
+            i == name.gsub(' Browser', '') ||
+            i == "#{name} Browser"
+        end
       end
     end
 
-    def extract_model
-      return if headers['Sec-CH-UA-Model'].nil? || headers['Sec-CH-UA-Model'] == ''
+    def extract_from_header(header)
+      return if headers[header].nil? || headers[header] == ''
 
-      headers['Sec-CH-UA-Model']
+      headers[header]
+    end
+
+    def extract_full_version
+      extract_from_header('Sec-CH-UA-Full-Version') || extract_from_header('uaFullVersion')
+    end
+
+    def extract_platform
+      extract_from_header('Sec-CH-UA-Platform') || extract_from_header('platform')
+    end
+
+    def extract_platform_version
+      extract_from_header('Sec-CH-UA-Platform-Version') || extract_from_header('platformVersion')
+    end
+
+    def extract_mobile
+      extract_from_header('Sec-CH-UA-Mobile') || extract_from_header('mobile')
+    end
+
+    def extract_model
+      extract_from_header('Sec-CH-UA-Model') || extract_from_header('model')
     end
   end
 end