browser_sniffer 2.4.0 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bb83754d8d9d227841406041cb455e973554dde6b74a94288ee0e4bc8bce0fb
-  data.tar.gz: 690cb4204124ede02eb0f8d20ecda5a81be5d41e599b8b795fd685d4775eb05b
+  metadata.gz: f1fa6f0ef701270fad08c72634ccbb5c9a01a8748eb5368ccff0d62066065c9a
+  data.tar.gz: 7915b883d825b1776b6833ea89cdde0be71ebed046fd06e73627cdc6b52c07ad
 SHA512:
-  metadata.gz: 48984712d0918c8202493f1ace3027ae4f02abfadc092b7102d6c9158e375d0553f4550d87f3a6d8d3b0ad90df98ced731fa02b2edab7b72ce9141120fc335c9
-  data.tar.gz: 5c5b4cf4cac87fbd8e928e5d4ab720660e55d06e0af9175fddf61d7febb2324f7bf5b47855c2586f48f4de17c7190a75ea0b64344dfc74828abce41d2934cf21
+  metadata.gz: 53940f3356cabe18354c764930c2acbfb0e09c884147d63e5556f139c41df51a0c437fa05b77bf50a10e117e6d3aec2a8f2e4450be2f762a909e2ac9f64eb8ab
+  data.tar.gz: 6cb0b817ae2c25c0163d7a70e6db1952878ce2a96d19981d158b0de53d45943d587584ff64e66076c1b5e5d68cfc47ad7e2c220babff87e4ffe5c0aba4f3efa1

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: weekly

data/.github/workflows/test.yml

@@ -19,9 +19,9 @@ jobs:
           - 3.2
           - jruby
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
       - name: Set up Ruby ${{ matrix.version }}
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
         with:
           bundler-cache: true
           ruby-version: ${{ matrix.version }}

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/.ruby-version

@@ -0,0 +1 @@
+3.1.2

data/Gemfile.lock

@@ -0,0 +1,24 @@
+PATH
+  remote: .
+  specs:
+    browser_sniffer (2.5.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    minitest (5.22.3)
+    rake (13.1.0)
+
+PLATFORMS
+  arm64-darwin-21
+  universal-java-11
+  x86_64-linux
+
+DEPENDENCIES
+  browser_sniffer!
+  bundler
+  minitest
+  rake
+
+BUNDLED WITH
+   2.3.7

data/dev.yml

@@ -1,7 +1,7 @@
 ---
 name: BrowserSniffer
 up:
-  - ruby: 3.1.2
+  - ruby
   - bundler
 commands:
   test: bundle exec rake test

data/lib/browser_sniffer/patterns.rb

@@ -90,9 +90,12 @@ class BrowserSniffer
         # Shopify Ping iOS
         %r{.*(Shopify Ping)\/(?:iPhone\sOS|iOS)\/([\d\.]+) \((iPhone|iPad|iPod)}i
       ], [[:name, 'Shopify Ping'], :version], [
+        # Shopify CLI
+        %r{.*(Shopify CLI)(?:; v=([\d\.]+))?}i 
+      ], [[:name, 'Shopify CLI'], :version], [
         # Presto based
         /(opera\smini)\/((\d+)?[\w\.-]+)/i, # Opera Mini
-        /(opera\s[mobiletab]+).+:version\/((\d+)?[\w\.-]+)/i, # Opera Mobi/Tablet
+        /(opera\s(mobile|tab)).+:version\/((\d+)?[\w\.-]+)/i, # Opera Mobi/Tablet
         /(opera).+:version\/((\d+)?[\w\.]+)/i, # Opera > 9.80
         /(opera)[\/\s]+((\d+)?[\w\.]+)/i # Opera < 9.80
       ], [:name, :version, :major, [:type, :opera]], [
@@ -106,8 +109,6 @@ class BrowserSniffer
       ], [:name, :version, :major], [
         /(?:ms|\()(ie)\s((\d+)[\w\.]+)/i # Internet Explorer
       ], [:name, :version, :major, [:type, :ie]], [
-        /Edge\/(\d+).\d+/i #Edge
-      ], [:major, [:version, 10], [:name, 'Edge'], [:type, :edge]], [
         /Mozilla\/5.0.*Windows NT 6\.\d.*Trident\/7\.\d.*rv:(\d+)\.\d*/i #IE11 on Win7
       ], [:major, [:version, 7], [:name, 'Internet Explorer'], [:type, :ie]], [
         /Mozilla\/5.0.*Windows NT 10\.\d.*Trident\/7\.\d.*rv:(\d+)\.\d*.*like\sGecko/i #IE11 on Win10
@@ -116,10 +117,16 @@ class BrowserSniffer
         /(rekonq)\/?((\d+)[\w\.]+)*/i, # Rekonq
         /(flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt)\/((\d+)?[\w\.-]+)/i # Chromium/Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt
       ], [:name, :version, :major], [
-        /(yabrowser)\/((\d+)?[\w\.]+)/i # Yandex
-      ], [[:name, 'Yandex'], :version, :major], [
+        /(yabrowser)\/((\d+)?[\w\.]+)/i # Yandex Browser
+      ], [[:name, 'Yandex Browser'], :version, :major, [:type, :yandex]], [
         /(comodo_dragon)\/((\d+)?[\w\.]+)/i # Comodo Dragon
       ], [[:name, 'Comodo Dragon'], :version, :major], [
+        /(vivaldi)\/((\d+)?[\w\.]+)/i # Vivaldi
+      ], [[:name, 'Vivaldi'], :version, :major, [:type, :vivaldi]], [
+        /(brave)\/((\d+)?[\w\.]+)/i # Brave
+      ], [[:name, 'Brave'], :version, :major, [:type, :brave]], [
+        /(?:Edge|Edg)\/(\d+).\d+/i # Edge (must come before Chrome patterns)
+      ], [:major, [:version, 10], [:name, 'Edge'], [:type, :edge]], [
         /(chromium)\/((\d+)?[\w\.-]+)/i, # Chromium
         /(chrome)\/v?((\d+)?[\w\.]+)/i # Chrome
       ], [:name, :version, :major, [:type, :chrome]], [
@@ -156,7 +163,7 @@ class BrowserSniffer
         /(uc\s?browser|polaris|lynx|dillo|icab|doris|amaya|w3m|netsurf|word|excel)[\/\s]?((\d+)?[\w\.]+)/i, # UCBrowser/Polaris/Lynx/Dillo/iCab/Doris/Amaya/w3m/NetSurf/Word/Excel
         /(links)\s\(((\d+)?[\w\.]+)/i, # Links
         /(gobrowser)\/?((\d+)?[\w\.]+)*/i, # GoBrowser
-        /(ice\s?browser)\/v?((\d+)?[\w\._]+)/i, # ICE Browser
+        /(ice\s?browser)\/v?((\d+)?[\w\.]+)/i, # ICE Browser
         /(mosaic)[\/\s]((\d+)?[\w\.]+)/i # Mosaic
       ], [:name, :version, :major]
     ],
@@ -215,13 +222,64 @@ class BrowserSniffer
         %r{.*Shopify POS\/[\d\.]+ \((iPod touch)\;.*Scale/([\d\.]+)}i,
       ], [[:type, :handheld], :scale], [
         # Shopify POS for Android (SmartWebView)
-        %r{.*Shopify\sPOS.*\(.*(Android)\s[\d\.]+\;\s(.*)\sBuild/.*\)\sPOS.*[\d+\.]+}i,
+        %r{.*Shopify\sPOS[^\(]*\((?:[^()]*)(Android)\s[\d\.]+\;\s(?:[^;()]*\;\s)*([^;()]*)\sBuild/[^)]*\)\sPOS[^\d]*[\d+\.]+}i,
       ], [[:type, :handheld], :model], [
         # Shopify POS for Android (Native App)
-        %r{.*\(.*(Android)\s[\d\.]+\;\s(.*)\sBuild/.*\)\sPOS.*[\d+\.]+}i,
+        %r{.*\((?:[^()]*)(Android)\s[\d\.]+\;\s(?:[^;()]*\;\s)*([^;()]*)\sBuild/[^)]*\)\sPOS[^\d]*[\d+\.]+}i,
       ], [[:type, :handheld], :model], [
+        # New tablet patterns (must come early to avoid generic matches)
+        # Xiaomi Tablets
+        /android.+;\s((?:redmi\s+pad|(?:redmi\s*)?mi[\s\-]*pad)[^;]*?)\s*build/i,
+        # Xiaomi tablet numeric codes (pad models like 24091RPADG)
+        /android.+;\s(\d{5}RPAD[A-Z])\s*build/i
+      ], [:model, [:vendor, 'Xiaomi'], [:type, :tablet]], [
+        # Huawei Tablets
+        /android.+;\s(mediapad[^;]*?)\s*build/i,
+        /android.+;\s((?:ag[rs][2356]?k?|bah[234]?|bg[2o]|bt[kv]|cmr|cpn|db[ry]2?|jdn2|got|kob2?k?|mon|pce|scm|sht?|[tw]gr|vrd)-[ad]?[lw][0125][09]b?)\s*build/i
+      ], [:model, [:vendor, 'Huawei'], [:type, :tablet]], [
+        # Honor Tablets
+        /android.+;\s((?:brt|eln|hey2?|gdi|jdn)-[^\s;]*)\s*build/i
+      ], [:model, [:vendor, 'Honor'], [:type, :tablet]], [
+        # OPPO Tablets
+        /android.+;\s(opd2\d{3}a?)\s*build/i
+      ], [:model, [:vendor, 'OPPO'], [:type, :tablet]], [
+        # Huawei Mobile (must come before generic patterns) 
+        /android.+;\s((?:hbp|alm|ane|art|ata|bla|col|cro|dub|ele|emm|eva|hma|hry|lya|mar|nce|pot|sne|vce|vne|yal)-[lx][0-9x]+)\s+build/i
+      ], [:model, [:vendor, 'Huawei'], [:type, :handheld]], [
+        # Lenovo tablets
+        /android.+;\s(let\d+[^;]*?)\s*build/i
+      ], [:model, [:vendor, 'Lenovo'], [:type, :tablet]], [
+        # Onyx e-reader devices
+        /android.+;\s(note(?:air|pro)[^;]*?)\s*build/i
+      ], [:model, [:vendor, 'Onyx'], [:type, :tablet]], [
+        # New mobile patterns (after tablets but before generic patterns)
+        # Xiaomi Mobile
+        /android.+;\s(poco[^;]*?)\s*build/i,
+        /android.+;\s((?:redmi[^;]*?|mi[\s\d][^;]*?))\s*build/i,
+        # Xiaomi numeric model codes (like 24091RPADG)
+        /android.+;\s(\d{5}[a-z]+[^;]*?)\s*build/i
+      ], [:model, [:vendor, 'Xiaomi'], [:type, :handheld]], [
+        # OnePlus Mobile
+        /android.+;\s(oneplus[^;]*?)\s*build/i
+      ], [:model, [:vendor, 'OnePlus'], [:type, :handheld]], [
+        # Realme Mobile
+        /android.+;\s(realme[^;]*?)\s*build/i
+      ], [:model, [:vendor, 'Realme'], [:type, :handheld]], [
+        # Vivo Mobile
+        /android.+;\s(vivo[^;]*?)\s*build/i
+      ], [:model, [:vendor, 'Vivo'], [:type, :handheld]], [
+        # OPPO Mobile
+        /android.+;\s(oppo[^;]*?)\s*build/i
+      ], [:model, [:vendor, 'OPPO'], [:type, :handheld]], [
+        # Google Pixel devices
+        /android.+;\s(pixel[\w\s]*pro[^;]*?)\s+build/i,
+        /android.+;\s(pixel[\w\s]*[^;]*?)\s+build/i
+      ], [:model, [:vendor, 'Google'], [:type, :handheld]], [
         /\((playbook);[\w\s\);-]+(rim)/i # PlayBook
       ], [:model, :vendor, [:type, :tablet]], [
+        # iPad with modern device identifier format (iPad15,x iPad16,x etc)
+        /\((ipad\d+,\d+);[^)]*\)/i
+      ], [[:model, 'iPad'], [:vendor, 'Apple'], [:name, :ipad], [:type, :tablet]], [
         /\((ipad);[\w\s\);-]+(apple)/i # iPad
       ], [:model, :vendor, [:name, :ipad], [:type, :tablet]], [
         /(hp).+(touchpad)/i, # HP TouchPad
@@ -229,6 +287,9 @@ class BrowserSniffer
         /\s(nook)[\w\s]+build\/(\w+)/i, # Nook
         /(dell)\s(strea[kpr\s\d]*[\dko])/i # Dell Streak
       ], [:vendor, :model, [:type, :tablet]], [
+        # iPhone with modern device identifier format (iPhone17,x etc)
+        /\((iphone\d+,\d+);[^)]*\)/i
+      ], [[:model, 'iPhone'], [:vendor, 'Apple'], [:name, :iphone], [:type, :handheld]], [
         /\((?:iphone|ipod(?: touch)?);.+(apple)/i # iPod Touch/iPhone
       ], [:model, :vendor, [:name, :iphone], [:type, :handheld]], [
         /(blackberry)[\s-]?(\w+)/i, # BlackBerry
@@ -242,28 +303,56 @@ class BrowserSniffer
       ], [[:vendor, 'Asus'], :model, [:type, :tablet]], [
         /(sony)\s(tablet\s[ps])/i # Sony Tablets
       ], [:vendor, :model, [:type, :tablet]], [
-        /(nintendo)\s([wids3u]+)/i # Nintendo
+        /(nintendo)\s+(switch|wii\s*u?|3?ds)/i # Nintendo (improved model parsing)
       ], [:vendor, :model, [:type, :console]], [
-        /((playstation)\s[3portablevi]+)/i # Playstation
+        # PlayStation Vita
+        /(playstation vita)\s+[\d\.]+/i
+      ], [[:model, 'PlayStation Vita'], [:vendor, 'Sony'], [:type, :console]], [
+        /((playstation)\s[3portablevi]+)/i # Playstation (generic)
       ], [[:vendor, 'Sony'], :model, [:type, :console]], [
+        # PlayStation 4
+        /(playstation 4)\s+[\d\.]+/i
+      ], [[:model, 'PlayStation 4'], [:vendor, 'Sony'], [:type, :console]], [
+        # PlayStation 5  
+        /playstation;\s+(playstation 5)\/[\d\.]+/i
+      ], [[:model, 'PlayStation 5'], [:vendor, 'Sony'], [:type, :console]], [
+        # Xbox Series X/S (Windows-based)
+        /windows nt .+;\s+xbox;\s+(xbox series [xs])/i
+      ], [[:model, 'Xbox Series X'], [:vendor, 'Microsoft'], [:type, :console]], [
+        # Xbox One (Windows-based)
+        /windows nt .+;\s+xbox_one_ed/i
+      ], [[:model, 'Xbox One'], [:vendor, 'Microsoft'], [:type, :console]], [
+        # Xbox One (Windows Phone-based)
+        /windows phone .+;\s+xbox;\s+(xbox one)/i
+      ], [:model, [:vendor, 'Microsoft'], [:type, :console]], [
+        # Xbox Series X/S (legacy format)
+        /\(xbox;\s+(xbox series [xs])\)/i
+      ], [:model, [:vendor, 'Microsoft'], [:type, :console]], [
+        # Xbox One (legacy format)
+        /\(xbox;\s+(xbox one)\)/i
+      ], [:model, [:vendor, 'Microsoft'], [:type, :console]], [
         /(sprint\s(\w+))/i # Sprint Phones
       ], [:vendor, :model, [:type, :handheld]], [
-        /(htc)[;_\s-]+([\w\s_]+(?=\))|\w+)*/i, # HTC
+        /(htc)[;_\s-]+([\w\s]+(?=\))|\w+)*/i, # HTC
         /(zte)-(\w+)*/i, # ZTE
         /(alcatel|geeksphone|huawei|lenovo|nexian|panasonic|(?=;\s)sony)[_\s-]?([\w-]+)*/i # Alcatel/GeeksPhone/Huawei/Lenovo/Nexian/Panasonic/Sony
       ], [:vendor, [:model, lambda {|str| str && str.gsub(/_/, ' ') }], [:type, :handheld]], [
+        # Modern Motorola devices (must come before generic Motorola pattern)
+        /android.+;\s(moto\s+[^;]*?)\s*build/i
+      ], [:model, [:vendor, 'Motorola'], [:type, :handheld]], [
         /\s((milestone|droid[2x]?))[globa\s]*\sbuild\//i, # Motorola
         /(mot)[\s-]?(\w+)*/i
       ], [[:vendor, 'Motorola'], :model, [:type, :handheld]], [
         /android.+\s((mz60\d|xoom[\s2]{0,2}))\sbuild\//i
       ], [[:vendor, 'Motorola'], :model, [:type, :tablet]], [
-        /android.+((sch-i[89]0\d|shw-m380s|gt-p\d{4}|gt-n8000|sgh-t8[56]9))/i
+        /android.+((sch-i[89]0\d|shw-m380s|sm-[ptx]\w{2,4}|gt-[pn]\d{2,4}|sgh-t8[56]9|nexus 10))/i
       ], [[:vendor, 'Samsung'], :model, [:type, :tablet]], [
         # Samsung
+        /android.+;\s(sm-s[^;)\s]*)/i, # Samsung Galaxy S-series phones  
         /((s[cgp]h-\w+|gt-\w+|galaxy\snexus))/i,
         /(sam[sung]*)[\s-]*(\w+-?[\w-]*)*/i,
         /sec-((sgh\w+))/i
-      ], [[:vendor, 'Samsung'], :model, [:type, :handheld]], [
+      ], [:model, [:vendor, 'Samsung'], [:type, :handheld]], [
         /(sie)-(\w+)*/i # Siemens
       ], [[:vendor, 'Siemens'], :model, [:type, :handheld]], [
         /(maemo|nokia).*(n900|lumia\s\d+)/i, # Nokia
@@ -273,9 +362,40 @@ class BrowserSniffer
       ], [[:vendor, 'Acer'], :model, [:type, :tablet]], [
         /android\s3\.[-\s\w;]{10}(lg?)-([06cv9]{3,4})/i # LG
       ], [[:vendor, 'LG'], :model, [:type, :tablet]], [
+        # Xiaomi Tablets (must come before generic mobile patterns)
+        /android.+;\s((?:red)?mi[\s\-]*pad[\w\s]*)\sbuild/i
+      ], [[:vendor, 'Xiaomi'], :model, [:type, :tablet]], [
+        # Huawei Tablets (must come before generic mobile patterns)
+        /android.+;\s(mediapad[\w\s]*)\sbuild/i,
+        /android.+;\s((?:ag[rs][2356]?k?|bah[234]?|bg[2o]|bt[kv]|cmr|cpn|db[ry]2?|jdn2|got|kob2?k?|mon|pce|scm|sht?|[tw]gr|vrd)-[ad]?[lw][0125][09]b?)\sbuild/i
+      ], [[:vendor, 'Huawei'], :model, [:type, :tablet]], [
+        # Honor Tablets (must come before generic mobile patterns)
+        /android.+;\s((?:brt|eln|hey2?|gdi|jdn)-a?[lnw]09|(?:ag[rm]3?|jdn2|kob2)-a?[lw]0[09]hn)\sbuild/i
+      ], [[:vendor, 'Honor'], :model, [:type, :tablet]], [
+        # OPPO Tablets (must come before generic mobile patterns)
+        /android.+;\s(opd2\d{3}a?)\sbuild/i
+      ], [[:vendor, 'OPPO'], :model, [:type, :tablet]], [
         /((nexus\s4))/i,
         /(lg)[-e;\s\/]+(\w+)*/i
       ], [[:vendor, 'LG'], :model, [:type, :handheld]], [
+        # Amazon Fire TV
+        /android.+;\s(aft[a-z0-9]+)(?:\s+build|\))/i
+      ], [:model, [:vendor, 'Amazon'], [:type, :console]], [
+        # Amazon Fire tablets  
+        /android.+;\s(kf[a-z]+[^;]*?)\s*build/i
+      ], [:model, [:vendor, 'Amazon'], [:type, :tablet]], [
+        # Apple TV
+        /appletv(\d+,\d+)\/([\d\.]+)/i  
+      ], [[:model, 'Apple TV'], [:vendor, 'Apple'], [:type, :console]], [
+        # Chromecast
+        /crkey\s+([^)]+)/i
+      ], [[:model, 'Chromecast'], [:vendor, 'Google'], [:type, :console]], [
+        # Google ADT (Android TV Developer)
+        /android.+;\s(adt-\d+)\s+build/i
+      ], [:model, [:vendor, 'Google'], [:type, :console]], [
+        # Roku devices
+        /roku(\w+)\/([^(]+)/i
+      ], [:model, [:vendor, 'Roku'], [:type, :console]], [
         /opera\smobi/i,
         /android/i
       ], [[:type, :handheld]], [
@@ -376,7 +496,7 @@ class BrowserSniffer
         # BSD based
         /\s([frentopc-]{0,4}bsd|dragonfly)\s?([\w\.]+)*/i # FreeBSD/NetBSD/OpenBSD/PC-BSD/DragonFly
       ], [:name, :version],[
-        /(ip[honead]+)(?:.*os\s*([\w]+)*\slike\smac|;\sopera)/i # iOS
+        /(ip[honead]+)(?:.*os\s*([\w]+)\slike\smac|;\sopera)/i # iOS
       ], [[:name, 'iOS'], [:version, lambda {|str| str && str.gsub(/_/, '.') }], [:type, :ios]], [
         /(mac\sos\sx)\s?([\w\s\.]+\w)*/i # Mac OS
       ], [:name, [:version, lambda {|str| str && str.gsub(/_/, '.') }], [:type, :mac]], [

data/lib/browser_sniffer/version.rb

@@ -1,3 +1,3 @@
 class BrowserSniffer
-  VERSION = "2.4.0"
+  VERSION = "2.5.2"
 end

data/lib/browser_sniffer.rb

@@ -2,10 +2,16 @@ require "browser_sniffer/version"
 require "browser_sniffer/patterns"
 
 class BrowserSniffer
+  MAX_USER_AGENT_LENGTH = 512
+
   attr_reader :user_agent
 
   def initialize(user_agent)
-    @user_agent = user_agent
+    @user_agent = if user_agent.is_a?(String)
+      user_agent[0, MAX_USER_AGENT_LENGTH]
+    else
+      user_agent
+    end
   end
 
   def ios?

data/test/browser_sniffer_test.rb

@@ -675,8 +675,834 @@ class BrowserSnifferTest < Minitest::Test
       :major_browser_version => 103,
       :in_app_browser => :instagram,
     },
+    :yandex_mac => {
+      :user_agent => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 YaBrowser/24.4.5.506 Yowser/2.5 Safari/537.36",
+      :form_factor => :desktop,
+      :ios? => false,
+      :android? => false,
+      :desktop? => true,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :mac,
+      :os_version => '10.15.7',
+      :browser => :yandex,
+      :major_browser_version => 24,
+      :in_app_browser => nil,
+    },
+    # New Samsung Tablet Patterns
+    :samsung_tablet_sm_p => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 11; SM-P615 Build/RP1A.200720.012; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/91.0.4472.114 Safari/537.36",
+      :form_factor => :tablet,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "11",
+      :browser => :chrome,
+      :major_browser_version => 91,
+      :device_vendor => 'Samsung',
+      :device_name => 'SM-P615',
+    },
+    :samsung_tablet_gt_n => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 10; GT-N8020 Build/QP1A.190711.020; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/89.0.4389.105 Safari/537.36",
+      :form_factor => :tablet,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "10",
+      :browser => :chrome,
+      :major_browser_version => 89,
+      :device_vendor => 'Samsung',
+      :device_name => 'GT-N8020',
+    },
+    # Xiaomi Devices
+    :xiaomi_tablet_mi_pad => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 9; Mi Pad 4 Build/PKQ1.180904.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.120 Safari/537.36",
+      :form_factor => :tablet,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "9",
+      :browser => :chrome,
+      :major_browser_version => 77,
+      :device_vendor => 'Xiaomi',
+      :device_name => 'Mi Pad 4',
+    },
+    :xiaomi_tablet_redmi_pad => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 12; Redmi Pad Build/SP1A.210812.016; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/103.0.5060.129 Safari/537.36",
+      :form_factor => :tablet,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "12",
+      :browser => :chrome,
+      :major_browser_version => 103,
+      :device_vendor => 'Xiaomi',
+      :device_name => 'Redmi Pad',
+    },
+    :xiaomi_mobile_poco => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 11; POCO X3 Pro Build/RKQ1.200826.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/90.0.4430.210 Mobile Safari/537.36",
+      :form_factor => :handheld,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "11",
+      :browser => :chrome,
+      :major_browser_version => 90,
+      :device_vendor => 'Xiaomi',
+      :device_name => 'POCO X3 Pro',
+    },
+    :xiaomi_mobile_mi_phone => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 12; Mi 11 Build/SKQ1.210216.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/98.0.4758.102 Mobile Safari/537.36",
+      :form_factor => :handheld,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "12",
+      :browser => :chrome,
+      :major_browser_version => 98,
+      :device_vendor => 'Xiaomi',
+      :device_name => 'Mi 11',
+    },
+    # Huawei Tablets
+    :huawei_tablet_mediapad => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 10; MediaPad M5 Build/HUAWEICMR-W09; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/88.0.4324.152 Safari/537.36",
+      :form_factor => :tablet,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "10",
+      :browser => :chrome,
+      :major_browser_version => 88,
+      :device_vendor => 'Huawei',
+      :device_name => 'MediaPad M5',
+    },
+    :huawei_tablet_matepad => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 11; BAH3-W09 Build/HUAWEIBAH3-W09; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/92.0.4515.159 Safari/537.36",
+      :form_factor => :tablet,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "11",
+      :browser => :chrome,
+      :major_browser_version => 92,
+      :device_vendor => 'Huawei',
+      :device_name => 'BAH3-W09',
+    },
+    # Honor Tablets
+    :honor_tablet => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 10; BRT-LX1 Build/HONORBRT-LX1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/87.0.4280.141 Safari/537.36",
+      :form_factor => :tablet,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "10",
+      :browser => :chrome,
+      :major_browser_version => 87,
+      :device_vendor => 'Honor',
+      :device_name => 'BRT-LX1',
+    },
+    # OPPO Devices
+    :oppo_tablet => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 11; OPD2101A Build/RP1A.201005.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/91.0.4472.114 Safari/537.36",
+      :form_factor => :tablet,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "11",
+      :browser => :chrome,
+      :major_browser_version => 91,
+      :device_vendor => 'OPPO',
+      :device_name => 'OPD2101A',
+    },
+    :oppo_mobile => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 12; OPPO Find X5 Build/SP1A.210812.016; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/102.0.5005.125 Mobile Safari/537.36",
+      :form_factor => :handheld,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "12",
+      :browser => :chrome,
+      :major_browser_version => 102,
+      :device_vendor => 'OPPO',
+      :device_name => 'OPPO Find X5',
+    },
+    # OnePlus Mobile
+    :oneplus_mobile => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 12; OnePlus 9 Pro Build/SKQ1.210216.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/99.0.4844.88 Mobile Safari/537.36",
+      :form_factor => :handheld,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "12",
+      :browser => :chrome,
+      :major_browser_version => 99,
+      :device_vendor => 'OnePlus',
+      :device_name => 'OnePlus 9 Pro',
+    },
+    :oneplus_nord => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 11; OnePlus Nord Build/RKQ1.201022.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/88.0.4324.181 Mobile Safari/537.36",
+      :form_factor => :handheld,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "11",
+      :browser => :chrome,
+      :major_browser_version => 88,
+      :device_vendor => 'OnePlus',
+      :device_name => 'OnePlus Nord',
+    },
+    # Realme Mobile
+    :realme_mobile => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 11; realme GT Build/RKQ1.201022.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/89.0.4389.105 Mobile Safari/537.36",
+      :form_factor => :handheld,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "11",
+      :browser => :chrome,
+      :major_browser_version => 89,
+      :device_vendor => 'Realme',
+      :device_name => 'realme GT',
+    },
+    # Vivo Mobile
+    :vivo_mobile => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 12; vivo X70 Pro Build/SP1A.210812.003; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/94.0.4606.85 Mobile Safari/537.36",
+      :form_factor => :handheld,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "12",
+      :browser => :chrome,
+      :major_browser_version => 94,
+      :device_vendor => 'Vivo',
+      :device_name => 'vivo X70 Pro',
+    },
+    # New Browsers
+    :vivaldi_browser => {
+      :user_agent => "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.5060.134 Safari/537.36 Vivaldi/5.3.2679.68",
+      :form_factor => :desktop,
+      :ios? => false,
+      :android? => false,
+      :desktop? => true,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :windows,
+      :os_version => "10",
+      :browser => :vivaldi,
+      :browser_name => 'Vivaldi',
+      :major_browser_version => 5,
+    },
+    :brave_browser => {
+      :user_agent => "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36 Brave/1.41.100",
+      :form_factor => :desktop,
+      :ios? => false,
+      :android? => false,
+      :desktop? => true,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :windows,
+      :os_version => "10",
+      :browser => :brave,
+      :browser_name => 'Brave',
+      :major_browser_version => 1,
+    },
+    # Samsung Galaxy S-series (Issue 1 fix)
+    :samsung_galaxy_s25 => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 15; SM-S931B Build/AP3A.240905.015.A2; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/127.0.6533.103 Mobile Safari/537.36",
+      :form_factor => :handheld,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "15",
+      :browser => :chrome,
+      :major_browser_version => 127,
+      :device_vendor => 'Samsung',
+      :device_name => 'SM-S931B',
+    },
+    :samsung_galaxy_s24_ultra => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 14; SM-S928B/DS) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.6099.230 Mobile Safari/537.36",
+      :form_factor => :handheld,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "14",
+      :browser => :chrome,
+      :major_browser_version => 120,
+      :device_vendor => 'Samsung',
+      :device_name => 'SM-S928B/DS',
+    },
+    :samsung_galaxy_s23 => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 13; SM-S911B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Mobile Safari/537.36",
+      :form_factor => :handheld,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "13",
+      :browser => :chrome,
+      :major_browser_version => 104,
+      :device_vendor => 'Samsung',
+      :device_name => 'SM-S911B',
+    },
+    :samsung_galaxy_s22_5g => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 13; SM-S901B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Mobile Safari/537.36",
+      :form_factor => :handheld,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "13",
+      :browser => :chrome,
+      :major_browser_version => 112,
+      :device_vendor => 'Samsung',
+      :device_name => 'SM-S901B',
+    },
+    :google_pixel_9_pro => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 14; Pixel 9 Pro Build/AD1A.240418.003; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/124.0.6367.54 Mobile Safari/537.36",
+      :form_factor => :handheld,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "14",
+      :browser => :chrome,
+      :major_browser_version => 124,
+      :device_vendor => 'Google',
+      :device_name => 'Pixel 9 Pro',
+    },
+    :google_pixel_8_pro => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 15; Pixel 8 Pro Build/AP4A.250105.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/132.0.6834.163 Mobile Safari/537.36",
+      :form_factor => :handheld,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "15",
+      :browser => :chrome,
+      :major_browser_version => 132,
+      :device_vendor => 'Google',
+      :device_name => 'Pixel 8 Pro',
+    },
+    :google_pixel_7a => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 14; Pixel 7a Build/UQ1A.240105.004; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/120.0.6099.230 Mobile Safari/537.36",
+      :form_factor => :handheld,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "14",
+      :browser => :chrome,
+      :major_browser_version => 120,
+      :device_vendor => 'Google',
+      :device_name => 'Pixel 7a',
+    },
+    :google_pixel_6 => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 12; Pixel 6 Build/SQ3A.220705.003; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/103.0.5060.129 Mobile Safari/537.36",
+      :form_factor => :handheld,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "12",
+      :browser => :chrome,
+      :major_browser_version => 103,
+      :device_vendor => 'Google',
+      :device_name => 'Pixel 6',
+    },
+    :iphone_16_pro => {
+      :user_agent => "Mozilla/5.0 (iPhone17,1; CPU iPhone OS 18_2_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Mohegan Sun/4.7.4",
+      :form_factor => :handheld,
+      :ios? => true,
+      :android? => false,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 605,
+      :os => :ios,
+      :os_version => "18.2.1",
+      :browser => nil,
+      :device_vendor => 'Apple',
+      :device_name => 'iPhone',
+    },
+    :iphone_16e => {
+      :user_agent => "Mozilla/5.0 (iPhone17,5; CPU iPhone OS 18_3_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 FireKeepers/1.7.0",
+      :form_factor => :handheld,
+      :ios? => true,
+      :android? => false,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 605,
+      :os => :ios,
+      :os_version => "18.3.2",
+      :browser => nil,
+      :device_vendor => 'Apple',
+      :device_name => 'iPhone',
+    },
+    :ipad_pro_11_5th => {
+      :user_agent => "Mozilla/5.0 (iPad16,3; CPU OS 18_3_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Tropicana_NJ/5.7.1",
+      :form_factor => :tablet,
+      :ios? => true,
+      :android? => false,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 605,
+      :os => :ios,
+      :os_version => "18.3.2",
+      :browser => nil,
+      :device_vendor => 'Apple',
+      :device_name => 'iPad',
+    },
+    :ipad_air_6th => {
+      :user_agent => "Mozilla/5.0 (iPad15,4; CPU OS 17_6_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 BetMGM_NJ/5.7.1",
+      :form_factor => :tablet,
+      :ios? => true,
+      :android? => false,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 605,
+      :os => :ios,
+      :os_version => "17.6.1",
+      :browser => nil,
+      :device_vendor => 'Apple',
+      :device_name => 'iPad',
+    },
+    :edge_browser => {
+      :user_agent => "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36 Edge/91.0.864.59",
+      :form_factor => :desktop,
+      :ios? => false,
+      :android? => false,
+      :desktop? => true,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :windows,
+      :os_version => "10",
+      :browser => :edge,
+      :browser_name => 'Edge',
+      :major_browser_version => 91,
+    },
+    :playstation_4 => {
+      :user_agent => "Mozilla/5.0 (PlayStation 4 4.55) AppleWebKit/537.73 (KHTML, like Gecko)",
+      :form_factor => :console,
+      :ios? => false,
+      :android? => false,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :device_vendor => 'Sony',
+      :device_name => 'PlayStation 4',
+    },
+    :playstation_5 => {
+      :user_agent => "Mozilla/5.0 (PlayStation; PlayStation 5/2.26) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0 Safari/605.1.15",
+      :form_factor => :console,
+      :ios? => false,
+      :android? => false,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 605,
+      :browser => :safari,
+      :major_browser_version => 13,
+      :device_vendor => 'Sony',
+      :device_name => 'PlayStation 5',
+    },
+    :xbox_series_x => {
+      :user_agent => "Mozilla/5.0 (Xbox; Xbox Series X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36 Edge/20.02",
+      :form_factor => :console,
+      :ios? => false,
+      :android? => false,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :browser => :edge,
+      :major_browser_version => 20,
+      :device_vendor => 'Microsoft',
+      :device_name => 'Xbox Series X',
+    },
+    :xbox_one => {
+      :user_agent => "Mozilla/5.0 (Xbox; Xbox One) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2486.75 Safari/537.36 Edge/13.10586",
+      :form_factor => :console,
+      :ios? => false,
+      :android? => false,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :browser => :edge,
+      :major_browser_version => 13,
+      :device_vendor => 'Microsoft',
+      :device_name => 'Xbox One',
+    },
+    :xiaomi_numeric_model => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 14; 24091RPADG Build/UP1A.231005.007; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/124.0.6367.179 Mobile Safari/537.36",
+      :form_factor => :tablet,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "14",
+      :browser => :chrome,
+      :major_browser_version => 124,
+      :device_vendor => 'Xiaomi',
+      :device_name => '24091RPADG',
+    },
+    :lenovo_tablet => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 12; LET105G Build/SP1A.210812.016) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36",
+      :form_factor => :tablet,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "12",
+      :browser => :chrome,
+      :major_browser_version => 103,
+      :device_vendor => 'Lenovo',
+      :device_name => 'LET105G',
+    },
+    :motorola_moto_g => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 11; moto g power (2021) Build/RRKS31.Q1-19-17-2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.120 Mobile Safari/537.36",
+      :form_factor => :handheld,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "11",
+      :browser => :chrome,
+      :major_browser_version => 91,
+      :device_vendor => 'Motorola',
+      :device_name => 'moto g power (2021)',
+    },
+    :nintendo_switch => {
+      :user_agent => "Mozilla/5.0 (Nintendo Switch; WifiWebAuthApplet) AppleWebKit/601.6 (KHTML, like Gecko) NF/4.0.0.5.10 NintendoBrowser/5.1.0.13343",
+      :form_factor => :console,
+      :ios? => false,
+      :android? => false,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 601,
+      :device_vendor => 'Nintendo',
+      :device_name => 'Switch',
+    },
+    :amazon_fire_tv => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 9; AFTMM Build/PS7233) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.147 Mobile Safari/537.36",
+      :form_factor => :console,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "9",
+      :browser => :chrome,
+      :major_browser_version => 79,
+      :device_vendor => 'Amazon',
+      :device_name => 'AFTMM',
+    },
+    :amazon_fire_tablet => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 7.1.2; KFKAWI Build/NS6265) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.125 Mobile Safari/537.36",
+      :form_factor => :tablet,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "7.1.2",
+      :browser => :chrome,
+      :major_browser_version => 59,
+      :device_vendor => 'Amazon',
+      :device_name => 'KFKAWI',
+    },
+    :apple_tv => {
+      :user_agent => "AppleTV6,2/11.1 CFNetwork/887.60.2 Darwin/17.3.0",
+      :form_factor => :console,
+      :ios? => false,
+      :android? => false,
+      :desktop? => false,
+      :device_vendor => 'Apple',
+      :device_name => 'Apple TV',
+    },
+    :chromecast => {
+      :user_agent => "Mozilla/5.0 (CrKey armv7l 1.5.16041) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.0 Safari/537.36",
+      :form_factor => :console,
+      :ios? => false,
+      :android? => false,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :browser => :chrome,
+      :major_browser_version => 31,
+      :device_vendor => 'Google',
+      :device_name => 'Chromecast',
+    },
+    :roku_device => {
+      :user_agent => "Roku4640X/DVP-7.70 (297.70E04154A)",
+      :form_factor => :console,
+      :ios? => false,
+      :android? => false,
+      :desktop? => false,
+      :device_vendor => 'Roku',
+      :device_name => '4640X',
+    },
+    :xiaomi_pad_7_pro => {
+      :user_agent => "Dalvik/2.1.0 (Linux; U; Android 15; 24091RPADG Build/AQ3A.240801.002)",
+      :form_factor => :tablet,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :os => :android,
+      :os_version => "15",
+      :device_vendor => 'Xiaomi',
+      :device_name => '24091RPADG',
+    },
+    :huawei_pura_70_ultra => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 12; HBP-LX9 Build/HUAWEIHBP-L29; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/130.0.6723.58 Mobile Safari/537.36",
+      :form_factor => :handheld,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "12",
+      :browser => :chrome,
+      :major_browser_version => 130,
+      :device_vendor => 'Huawei',
+      :device_name => 'HBP-LX9',
+    },
+    :windows_10_edge => {
+      :user_agent => "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36 Edg/134.0.0.0",
+      :form_factor => :desktop,
+      :ios? => false,
+      :android? => false,
+      :desktop? => true,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :windows,
+      :browser => :edge,
+      :major_browser_version => 134,
+      :device_vendor => nil,
+      :device_name => nil,
+    },
+    :xbox_series_x_windows => {
+      :user_agent => "Mozilla/5.0 (Windows NT 10.0; Win64; x64; Xbox; Xbox Series X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36 Edge/20.02",
+      :form_factor => :console,
+      :ios? => false,
+      :android? => false,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :windows,
+      :browser => :edge,
+      :major_browser_version => 20,
+      :device_vendor => 'Microsoft',
+      :device_name => 'Xbox Series X',
+    },
+    :xbox_one_s_windows => {
+      :user_agent => "Mozilla/5.0 (Windows NT 10.0; Win64; x64; XBOX_ONE_ED) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36 Edge/14.14393",
+      :form_factor => :console,
+      :ios? => false,
+      :android? => false,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :windows,
+      :browser => :edge,
+      :major_browser_version => 14,
+      :device_vendor => 'Microsoft',
+      :device_name => 'Xbox One',
+    },
+    :xbox_one_windows_phone => {
+      :user_agent => "Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; Xbox; Xbox One) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2486.0 Mobile Safari/537.36 Edge/13.10586",
+      :form_factor => :console,
+      :ios? => false,
+      :android? => false,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :windows,
+      :browser => :edge,
+      :major_browser_version => 13,
+      :device_vendor => 'Microsoft',
+      :device_name => 'Xbox One',
+    },
+    :amazon_fire_tv_stick_aftka => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 9; AFTKA) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/70.0.3538.110 Mobile Safari/537.36",
+      :form_factor => :console,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :android,
+      :os_version => "9",
+      :browser => :chrome,
+      :major_browser_version => 70,
+      :device_vendor => 'Amazon',
+      :device_name => 'AFTKA',
+    },
+    :google_adt_2 => {
+      :user_agent => "Dalvik/2.1.0 (Linux; U; Android 9; ADT-2 Build/PTT5.181126.002)",
+      :form_factor => :console,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :os => :android,
+      :os_version => "9",
+      :device_vendor => 'Google',
+      :device_name => 'ADT-2',
+    },
+    :playstation_vita => {
+      :user_agent => "Mozilla/5.0 (PlayStation Vita 3.61) AppleWebKit/537.73 (KHTML, like Gecko) Silk/3.2",
+      :form_factor => :console,
+      :ios? => false,
+      :android? => false,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :device_vendor => 'Sony',
+      :device_name => 'PlayStation Vita',
+    },
+    :onyx_noteair_3c => {
+      :user_agent => "Dalvik/2.1.0 (Linux; U; Android 12; NoteAir3C Build/2023-11-15_15-07_3.5_0a296ec2c)",
+      :form_factor => :tablet,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :os => :android,
+      :os_version => "12",
+      :device_vendor => 'Onyx',
+      :device_name => 'NoteAir3C',
+    },
+    :shopify_pos_android_native => {
+      :user_agent => "Mozilla/5.0 (Linux; Android 10; SM-G973U Build/QP1A.190711.020) POS 1.0",
+      :form_factor => :handheld,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :os => :android,
+      :os_version => "10",
+      :device_name => 'SM-G973U',
+    },
+    :shopify_pos_android_native_with_locale => {
+      :user_agent => "Mozilla/5.0 (Linux; U; Android 7.1.1; en-US; SM-T560NU Build/NMF26X) POS 2.4.10",
+      :form_factor => :handheld,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :os => :android,
+      :os_version => "7.1.1",
+      :device_name => 'SM-T560NU',
+    },
+    :shopify_pos_android_smartwebview => {
+      :user_agent => "Shopify POS/1.0 Mozilla/5.0 (Linux; Android 10; SM-G973U Build/QP1A.190711.020) POS 1.0",
+      :form_factor => :handheld,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :os => :android,
+      :os_version => "10",
+      :device_name => 'SM-G973U',
+    },
+    :shopify_pos_android_smartwebview_with_locale => {
+      :user_agent => "Shopify POS/2.4.10 Mozilla/5.0 (Linux; U; Android 7.1.1; en-US; SM-T560NU Build/NMF26X) POS 2.4.10",
+      :form_factor => :handheld,
+      :ios? => false,
+      :android? => true,
+      :desktop? => false,
+      :os => :android,
+      :os_version => "7.1.1",
+      :device_name => 'SM-T560NU',
+    },
   }
 
+  def test_nil_user_agent_is_preserved
+    assert_nil BrowserSniffer.new(nil).user_agent
+  end
+
+  def test_user_agent_length_is_capped
+    long_user_agent = "a" * 10_000
+    sniffer = BrowserSniffer.new(long_user_agent)
+    assert_equal BrowserSniffer::MAX_USER_AGENT_LENGTH, sniffer.user_agent.length
+  end
+
+  def test_pos_android_regex_does_not_backtrack_catastrophically
+    malicious_user_agent = ("(Android 1.0; a Build/" * 160) + "!"
+    time = Benchmark.realtime { BrowserSniffer.new(malicious_user_agent).form_factor }
+    assert time < 0.1, "Expected POS Android regex to reject crafted UA quickly, took #{time}s"
+  end
+
+  def test_ios_os_regex_does_not_backtrack_catastrophically
+    malicious_user_agent = "iphone os " + ("a" * 320) + "!"
+    time = Benchmark.realtime { BrowserSniffer.new(malicious_user_agent).os }
+    assert time < 0.1, "Expected iOS OS regex to reject crafted UA quickly, took #{time}s"
+  end
+
   AGENTS.each do |agent, attributes|
     define_method "test_sniff_#{agent}_correctly" do
       sniffer = BrowserSniffer.new(attributes[:user_agent])

data/test/shopify_agents_test.rb

@@ -827,6 +827,26 @@ describe "Shopify agents" do
     }), sniffer.os_info
   end
 
+  it "Shopify CLI can be sniffed" do
+    user_agent = "Shopify CLI; v=3.59.3"
+    sniffer = BrowserSniffer.new(user_agent)
+
+    assert_equal ({
+      name: 'Shopify CLI',
+      version: '3.59.3',
+    }), sniffer.browser_info
+  end
+
+  it "Shopify CLI without version can be sniffed" do
+    user_agent = "Shopify CLI"
+    sniffer = BrowserSniffer.new(user_agent)
+
+    assert_equal ({
+      name: 'Shopify CLI',
+      version: nil,
+    }), sniffer.browser_info
+  end
+
   INCOMPATIBLE_USER_AGENTS = {
     'missing' => nil,
 

data/test/test_helper.rb

@@ -1,4 +1,6 @@
-require 'rubygems'
+$VERBOSE = true
+
+require 'benchmark'
 require 'minitest/autorun'
 
 require "#{File.dirname(__FILE__)}/../init"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: browser_sniffer
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.2
 platform: ruby
 authors:
 - Shopify
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,10 +58,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/cla.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
+- ".ruby-version"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -82,7 +84,6 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -97,8 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
-signing_key: 
+rubygems_version: 4.0.21
 specification_version: 4
 summary: Parses user agent strings and boils it all down to a few simple classifications.
 test_files: []