github_mirrors/ua-parser-js
3
0
Fork 1
mirror of https://github.com/faisalman/ua-parser-js.git synced 2025-12-31 11:29:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improve Windows detection & recognize Windows CE & RT as separate OS variants

Browse Source
This commit is contained in:
Faisal Salman
2025-06-21 13:31:52 +07:00
parent f9836f1981
commit a9378427ed
8 changed files with 365 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/enums/ua-parser-enums.d.ts vendored
View File

@@ -373,9 +373,11 @@ export const OS: Readonly<{
WATCHOS: "watchOS";
WEBOS: "WebOS";
WINDOWS: "Windows";
WINDOWS_CE: "Windows CE";
WINDOWS_IOT: "Windows IoT";
WINDOWS_MOBILE: "Windows Mobile";
WINDOWS_PHONE: "Windows Phone";
WINDOWS_RT: "Windows RT";
XBOX: "Xbox";
XUBUNTU: "Xubuntu";
ZENWALK: "Zenwalk";

2
src/enums/ua-parser-enums.js
View File

@@ -388,9 +388,11 @@ const OS = Object.freeze({
WATCHOS: 'watchOS',
WEBOS: 'WebOS',
WINDOWS: 'Windows',
WINDOWS_CE: 'Windows CE',
WINDOWS_IOT: 'Windows IoT',
WINDOWS_MOBILE: 'Windows Mobile',
WINDOWS_PHONE: 'Windows Phone',
WINDOWS_RT: 'Windows RT',
XBOX: 'Xbox',
XUBUNTU: 'Xubuntu',
ZENWALK: 'Zenwalk'

39
src/main/ua-parser.js
View File

@@ -299,17 +299,17 @@
//////////////
var windowsVersionMap = {
'ME' : '4.90',
'NT 3.11' : 'NT3.51',
'NT 4.0' : 'NT4.0',
'2000' : 'NT 5.0',
'XP' : ['NT 5.1', 'NT 5.2'],
'Vista' : 'NT 6.0',
'7' : 'NT 6.1',
'8' : 'NT 6.2',
'8.1' : 'NT 6.3',
'10' : ['NT 6.4', 'NT 10.0'],
'RT' : 'ARM'
'ME' : '4.90',
'NT 3.51': '3.51',
'NT 4.0': '4.0',
'2000' : ['5.0', '5.01'],
'XP' : ['5.1', '5.2'],
'Vista' : '6.0',
'7' : '6.1',
'8' : '6.2',
'8.1' : '6.3',
'10' : ['6.4', '10.0'],
'NT' : ''
},
formFactorsMap = {
@@ -946,14 +946,17 @@
os : [[
// Windows
/microsoft (windows) (7|vista|xp)/i // Windows
/(windows nt) (6\.[23]); arm/i // Windows RT
], [[NAME, /N/, 'R'], [VERSION, strMapper, windowsVersionMap]], [
/(windows (?:phone|mobile|iot))(?: os)?[\/ ]?([\d\.]*( se)?)/i, // Windows IoT/Mobile/Phone
// Windows NT/3.1/95/98/ME/2000/XP/Vista/7/8/8.1/10/11
/(windows)[\/ ](1[01]|2000|3\.1|7|8(\.1)?|9[58]|me|vista|xp)/i
], [NAME, VERSION], [
/windows nt ?([\d\.\)]*)(?!.+xbox)/i,
/\bwin(?=3| ?9|n)(?:nt| 9x )?([\d\.;]*)/i
], [[VERSION, /(;|\))/g, '', strMapper, windowsVersionMap], [NAME, WINDOWS]], [
/(windows ce)\/?([\d\.]*)/i // Windows CE
], [NAME, VERSION], [
/(windows (?:phone(?: os)?|mobile|iot))[\/ ]?([\d\.\w ]*)/i // Windows Phone
], [NAME, [VERSION, strMapper, windowsVersionMap]], [
/windows nt 6\.2; (arm)/i, // Windows RT
/windows[\/ ]([ntce\d\. ]+\w)(?!.+xbox)/i,
/(?:win(?=3|9|n)|win 9x )([nt\d\.]+)/i
], [[VERSION, strMapper, windowsVersionMap], [NAME, WINDOWS]], [
// iOS/macOS
/[adehimnop]{4,7}\b(?:.*os ([\w]+) like mac|; opera)/i, // iOS