Skip to content

Commit 93552e0

Browse files
committed
Improve CPU detection: ARM
1 parent 13d069f commit 93552e0

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

src/main/ua-parser.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -495,30 +495,30 @@
495495

496496
cpu : [[
497497

498-
/\b(?:(amd|x|x86[-_]?|wow|win)64)\b/i // AMD64 (x64)
498+
/\b((amd|x|x86[-_]?|wow|win)64)\b/i // AMD64 (x64)
499499
], [[ARCHITECTURE, 'amd64']], [
500500

501501
/(ia32(?=;))/i, // IA32 (quicktime)
502-
/\b((?:i[346]|x)86)\b/i // IA32 (x86)
502+
/\b((i[346]|x)86)\b/i // IA32 (x86)
503503
], [[ARCHITECTURE, 'ia32']], [
504504

505-
/\b(aarch64|arm(v?8e?l?|_?64))\b/i // ARM64
505+
/\b(aarch64|arm(v?[89]e?l?|_?64))\b/i // ARM64
506506
], [[ARCHITECTURE, 'arm64']], [
507507

508-
/\b(arm(?:v[67])?ht?n?[fl]p?)\b/i // ARMHF
508+
/\b(arm(v[67])?ht?n?[fl]p?)\b/i // ARMHF
509509
], [[ARCHITECTURE, 'armhf']], [
510510

511511
// PocketPC mistakenly identified as PowerPC
512-
/windows (ce|mobile); ppc;/i
512+
/( (ce|mobile); ppc;|\/[\w\.]+arm\b)/i
513513
], [[ARCHITECTURE, 'arm']], [
514514

515-
/((?:ppc|powerpc)(?:64)?)(?: mac|;|\))/i // PowerPC
515+
/((ppc|powerpc)(64)?)( mac|;|\))/i // PowerPC
516516
], [[ARCHITECTURE, /ower/, EMPTY, lowerize]], [
517517

518-
/(sun4\w)[;\)]/i // SPARC
518+
/ sun4\w[;\)]/i // SPARC
519519
], [[ARCHITECTURE, 'sparc']], [
520520

521-
/((?:avr32|ia64(?=;))|68k(?=\))|\barm(?=v(?:[1-7]|[5-7]1)l?|;|eabi)|(?=atmel )avr|(?:irix|mips|sparc)(?:64)?\b|pa-risc)/i
521+
/\b(avr32|ia64(?=;)|68k(?=\))|\barm(?=v([1-7]|[5-7]1)l?|;|eabi)|(irix|mips|sparc)(64)?\b|pa-risc)/i
522522
// IA64, 68K, ARM/64, AVR/32, IRIX/64, MIPS/64, SPARC/64, PA-RISC
523523
], [[ARCHITECTURE, lowerize]]
524524
],

test/data/ua/cpu/cpu-all.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,14 @@
175175
"architecture" : "arm64"
176176
}
177177
},
178+
{
179+
"desc" : "Google Search App",
180+
"ua" : "Mozilla/5.0 (Linux; Android 9; JAT-LX1 Build/HONORJAT-LX1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.96 Mobile Safari/537.36 GoogleApp/11.11.10.21.arm",
181+
"expect" :
182+
{
183+
"architecture" : "arm"
184+
}
185+
},
178186
{
179187
"desc" : "Google Search App",
180188
"ua" : "Mozilla/5.0 (Linux; Android 6.0; M5s Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/44.0.2403.147 Mobile Safari/537.36 GSA/12.40.17.23.arm64",

0 commit comments

Comments
 (0)