Skip to content

Commit 335e10a

Browse files
hexydechexydec
committed
Merge branch 'main' of github.com:hexydec/agentzero
2 parents 5657247 + 8dc178c commit 335e10a

File tree

7 files changed

+86
-25
lines changed

7 files changed

+86
-25
lines changed

‎src/agentzero.php‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,19 @@ public function __get(string $key) : string|int|null {
150150
*
151151
* @return array<string,string> An array containing relevant client hints sent by the client
152152
*/
153-
public static function getHints() : array {
153+
public static function getHints(?array $headers = null) : array {
154+
155+
// get from $_SERVER
156+
if ($headers === null) {
157+
$values = $_SERVER;
158+
$prefix = 'HTTP_';
159+
} else {
160+
$values = [];
161+
foreach ($headers AS $key => $item) {
162+
$values[\strtoupper(\str_replace('-', '_', $key))] = $item;
163+
}
164+
$prefix = '';
165+
}
154166
$hints = [
155167
'sec-ch-ua-mobile',
156168
'sec-ch-ua-full-version-list',
@@ -164,8 +176,8 @@ public static function getHints() : array {
164176
$data = [];
165177
foreach ($hints AS $item) {
166178
$upper = \strtoupper(\str_replace('-', '_', $item));
167-
if (!empty($_SERVER['HTTP_'.$upper])) {
168-
$data[$item] = $_SERVER['HTTP_'.$upper];
179+
if (!empty($values[$prefix.$upper])) {
180+
$data[$item] = $values[$prefix.$upper];
169181
}
170182
}
171183
return $data;

‎src/helpers/versions.php‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ protected static function latest(array $versions, ?\DateTime $now = null) : ?str
7575
protected static function released(array $data, string $version) : ?string {
7676
$major = \intval($version);
7777
$len = 0;
78-
$i = 0;
7978
$vlen = \strlen($version);
8079
$released = null;
8180
foreach ($data AS $ver => $date) {
@@ -89,14 +88,13 @@ protected static function released(array $data, string $version) : ?string {
8988
break;
9089
}
9190
}
92-
if ($match > $len) {
91+
if ($match && $match > $len && ($released === null || $released > $date)) {
9392
$len = $match;
9493
$released = $date;
9594
}
9695
}
97-
$i++;
9896
}
99-
return $released !== null ? (new \DateTime(\strval($released)))->format('Y-m-d') : null;
97+
return !empty($released) ? (new \DateTime(\strval($released)))->format('Y-m-d') : null;
10098
}
10199

102100
public static function get(string $browser, string $version, array $config) : array {
@@ -105,10 +103,9 @@ public static function get(string $browser, string $version, array $config) : ar
105103
$life = $config['versionscachelife'];
106104
if ($cache !== null && ($versions = self::load($source, $cache, $life)) !== false) {
107105
$data = [];
108-
if (isset($versions[$browser])) {
109106

110-
// get latest version of the browser
111-
$data['browserlatest'] = self::latest($versions[$browser], $config['currentdate']);
107+
// get latest version of the browser
108+
if (isset($versions[$browser]) && ($data['browserlatest'] = self::latest($versions[$browser], $config['currentdate'])) !== null) {
112109

113110
// check if version is greater than latest version
114111
$major = \intval($version);
@@ -142,7 +139,7 @@ public static function get(string $browser, string $version, array $config) : ar
142139
$data['browserreleased'] = self::released($versions[$browser], $version);
143140

144141
// calculate status
145-
if (isset($data['browserreleased'])) {
142+
if (isset($data['browserreleased'], $data['browserlatest'])) {
146143
$current = \explode('.', $data['browserlatest'])[0] === \explode('.', $version)[0];
147144
$released = new \DateTime($data['browserreleased']);
148145

‎src/mappings/browsers.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ protected static function getBrowser(string $value, int $i, array $tokens, strin
5050
'Samsung Internet' => 'samsung',
5151
'Huawei Browser' => 'huawei',
5252
'K-Meleon' => 'kmeleon',
53-
'Fennec' => 'firefox',
5453
'Native Opera Mini' => 'opera',
5554
'Cronet' => 'chrome'
5655
];

‎tests/browsersTest.php‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ public function testBrave() : void {
500500
'engineversion' => '601.1.46',
501501
'browser' => 'Brave',
502502
'browserversion' => '1.2.11',
503-
'browserreleased' => '2025-08-13'
503+
'browserreleased' => '2025-08-26'
504504
],
505505
'Mozilla/5.0 (Macintosh; Intel Mac OS X 13_4_1) AppleWebKit/605.1.15 (KHTML, like Gecko) Brave/115.0.0.0 Safari/605.1.15' => [
506506
'string' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 13_4_1) AppleWebKit/605.1.15 (KHTML, like Gecko) Brave/115.0.0.0 Safari/605.1.15',
@@ -1335,7 +1335,7 @@ public function testOculusBrowser() : void {
13351335
'appversion' => '13.0.0.2.16.259832224',
13361336
'engine' => 'Blink',
13371337
'engineversion' => '87.0.4280.66',
1338-
'browserreleased' => '2020-11-17'
1338+
'browserreleased' => '2021-01-11'
13391339
],
13401340
'Mozilla/5.0 (Linux; Android 10; Quest) AppleWebKit/537.36 (KHTML, like Gecko) OculusBrowser/19.1.0.1.50.350517500 SamsungBrowser/4.0 Chrome/96.0.4664.174 Mobile VR Safari/537.36' => [
13411341
'string' => 'Mozilla/5.0 (Linux; Android 10; Quest) AppleWebKit/537.36 (KHTML, like Gecko) OculusBrowser/19.1.0.1.50.350517500 SamsungBrowser/4.0 Chrome/96.0.4664.174 Mobile VR Safari/537.36',
@@ -1353,7 +1353,7 @@ public function testOculusBrowser() : void {
13531353
'appversion' => '19.1.0.1.50.350517500',
13541354
'engine' => 'Blink',
13551355
'engineversion' => '96.0.4664.174',
1356-
'browserreleased' => '2021-12-13'
1356+
'browserreleased' => '2021-01-11'
13571357
],
13581358
'Mozilla/5.0 (Linux; Android 7.1.1; Pacific) AppleWebKit/537.36 (KHTML, like Gecko) OculusBrowser/9.2.0.2.122.217074189 SamsungBrowser/4.0 Chrome/81.0.4044.117 Mobile VR Safari/537.36' => [
13591359
'string' => 'Mozilla/5.0 (Linux; Android 7.1.1; Pacific) AppleWebKit/537.36 (KHTML, like Gecko) OculusBrowser/9.2.0.2.122.217074189 SamsungBrowser/4.0 Chrome/81.0.4044.117 Mobile VR Safari/537.36',
@@ -1371,7 +1371,7 @@ public function testOculusBrowser() : void {
13711371
'appversion' => '9.2.0.2.122.217074189',
13721372
'engine' => 'Blink',
13731373
'engineversion' => '81.0.4044.117',
1374-
'browserreleased' => '2020-04-15'
1374+
'browserreleased' => '2021-01-11'
13751375
]
13761376
];
13771377
foreach ($strings AS $ua => $item) {
@@ -1394,7 +1394,7 @@ public function testSamsungBrowser() : void {
13941394
'browserversion' => '19.0',
13951395
'engine' => 'Blink',
13961396
'engineversion' => '102.0.5005.125',
1397-
'browserreleased' => '2022-06-09'
1397+
'browserreleased' => '2023-01-07'
13981398
],
13991399
'Mozilla/5.0 (Linux; Android 8.1.0; SAMSUNG SM-A260G Build/OPR6; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 SamsungBrowser/7.2 Chrome/108.0.5359.128 Mobile Safari/537.36' => [
14001400
'string' => 'Mozilla/5.0 (Linux; Android 8.1.0; SAMSUNG SM-A260G Build/OPR6; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 SamsungBrowser/7.2 Chrome/108.0.5359.128 Mobile Safari/537.36',
@@ -1410,7 +1410,7 @@ public function testSamsungBrowser() : void {
14101410
'browserversion' => '7.2',
14111411
'engine' => 'Blink',
14121412
'engineversion' => '108.0.5359.128',
1413-
'browserreleased' => '2023-01-10'
1413+
'browserreleased' => '2018-06-26'
14141414
]
14151415
];
14161416
foreach ($strings AS $ua => $item) {
@@ -1637,8 +1637,7 @@ public function testFennec() : void {
16371637
'browser' => 'Fennec',
16381638
'engine' => 'Gecko',
16391639
'browserversion' => '31.0',
1640-
'engineversion' => '31.0',
1641-
'browserreleased' => '2014-07-22'
1640+
'engineversion' => '31.0'
16421641
]
16431642
];
16441643
foreach ($strings AS $ua => $item) {

‎tests/categoriesTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public function testTablet() : void {
165165
'app' => 'Facebook',
166166
'appname' => 'FB4A',
167167
'appversion' => '419.0.0.37.71',
168-
'browserreleased' => '2023-06-26'
168+
'browserreleased' => '2023-06-13'
169169
]
170170
];
171171
foreach ($strings AS $ua => $item) {
@@ -193,7 +193,7 @@ public function testVr() : void {
193193
'app' => 'Oculus Browser',
194194
'appname' => 'OculusBrowser',
195195
'appversion' => '25.3.0.4.30.438623098',
196-
'browserreleased' => '2023-01-10'
196+
'browserreleased' => '2021-01-11'
197197
]
198198
];
199199
foreach ($strings AS $ua => $item) {
@@ -309,7 +309,7 @@ public function testTv() : void {
309309
'engineversion' => '69.0.3497.106',
310310
'browser' => 'Samsung Internet',
311311
'browserversion' => '3.0',
312-
'browserreleased' => '2018-09-17'
312+
'browserreleased' => '2017-11-09'
313313
]
314314
];
315315
foreach ($strings AS $ua => $item) {

‎tests/crawlersTest.php‎

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,8 @@ public function testAds() : void {
757757
'browser' => 'Samsung Internet',
758758
'browserversion' => '3.3',
759759
'engine' => 'Blink',
760-
'engineversion' => '38.0.2125.102'
760+
'engineversion' => '38.0.2125.102',
761+
'browserreleased' => '2017-11-09'
761762
]
762763
];
763764
foreach ($strings AS $ua => $item) {
@@ -1920,6 +1921,59 @@ public function testAi() : void {
19201921
'platformversion' => '5.0',
19211922
'app' => 'Tik Tok Spider',
19221923
'appname' => 'TikTokSpider'
1924+
],
1925+
'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36; ClaudeBot/1.0; +claudebot@anthropic.com)' => [
1926+
'string' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36; ClaudeBot/1.0; +claudebot@anthropic.com)',
1927+
'type' => 'robot',
1928+
'category' => 'ai',
1929+
'vendor' => 'Apple',
1930+
'device' => 'Macintosh',
1931+
'processor' => 'Intel',
1932+
'architecture' => 'x86',
1933+
'bits' => 64,
1934+
'kernel' => 'Linux',
1935+
'platform' => 'Mac OS X',
1936+
'platformversion' => '10.15.7',
1937+
'engine' => 'Blink',
1938+
'engineversion' => '131.0.0.0',
1939+
'browser' => 'Chrome',
1940+
'browserversion' => '131.0.0.0',
1941+
'browserreleased' => '2025-01-22',
1942+
'app' => 'Claude Bot',
1943+
'appname' => 'ClaudeBot',
1944+
'appversion' => '1.0'
1945+
],
1946+
'ClaudeBot/1.0 (web crawler; +https://www.anthropic.com/; claudebot@anthropic.com)' => [
1947+
'string' => 'ClaudeBot/1.0 (web crawler; +https://www.anthropic.com/; claudebot@anthropic.com)',
1948+
'type' => 'robot',
1949+
'category' => 'ai',
1950+
'app' => 'Claude Bot',
1951+
'appname' => 'ClaudeBot',
1952+
'appversion' => '1.0',
1953+
'url' => 'https://www.anthropic.com/'
1954+
],
1955+
'Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; ClaudeBot/1.0; +support@anthropic.com)' => [
1956+
'string' => 'Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; ClaudeBot/1.0; +support@anthropic.com)',
1957+
'type' => 'robot',
1958+
'category' => 'ai',
1959+
'app' => 'Claude Bot',
1960+
'appname' => 'ClaudeBot',
1961+
'appversion' => '1.0'
1962+
],
1963+
'ClaudeBot' => [
1964+
'string' => 'ClaudeBot',
1965+
'type' => 'robot',
1966+
'category' => 'ai',
1967+
'app' => 'Claude Bot',
1968+
'appname' => 'ClaudeBot'
1969+
],
1970+
'Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; ClaudeBot/1.0; +claudebot@anthropic.com)' => [
1971+
'string' => 'Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; ClaudeBot/1.0; +claudebot@anthropic.com)',
1972+
'type' => 'robot',
1973+
'category' => 'ai',
1974+
'app' => 'Claude Bot',
1975+
'appname' => 'ClaudeBot',
1976+
'appversion' => '1.0'
19231977
]
19241978
];
19251979
foreach ($strings AS $ua => $item) {

‎tests/platformsTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,7 @@ public function testX11() : void {
10681068
'engineversion' => '106.0.5249.181',
10691069
'architecture' => 'x86',
10701070
'bits' => 64,
1071-
'browserreleased' => '2022-10-25'
1071+
'browserreleased' => '2021-01-11'
10721072
],
10731073
'Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.14pre) Gecko/20101224 Ubuntu/10.04 (lucid) Namoroka/3.6.14pre' => [
10741074
'string' => 'Mozilla/5.0 (X11; U; Linux x86_64; fr; rv:1.9.2.14pre) Gecko/20101224 Ubuntu/10.04 (lucid) Namoroka/3.6.14pre',

0 commit comments

Comments
 (0)