Archives/lancedikson_bowser
1
0
Fork 0
mirror of https://github.com/lancedikson/bowser synced 2024-10-27 20:34:22 +00:00
Code Issues Releases Wiki Activity

Fix version matching

Browse Source
This commit is contained in:
Denis Demchenko 2017-04-09 22:30:19 +03:00
parent d57094d857
commit ce885847ce
2 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/parser-browsers.js
View File

@ -9,7 +9,7 @@ const browsersList = [
{ {
test: [/opera/i], test: [/opera/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/(?:opera)[\s\/](\d+(\.\d+)?)/i, ua); const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/(?:opera)[\s\/](\S+)/i, ua);
return { return {
name: 'Opera', name: 'Opera',
@ -20,7 +20,7 @@ const browsersList = [
{ {
test: [/opr|opios/i], test: [/opr|opios/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(/(?:opr|opios)[\s\/](\d+(\.\d+)?)/i, ua) || getFirstMatch(commonVersionIdentifier, ua); const version = getFirstMatch(/(?:opr|opios)[\s\/](\S+)/i, ua) || getFirstMatch(commonVersionIdentifier, ua);
return { return {
name: 'Opera', name: 'Opera',
@ -31,7 +31,7 @@ const browsersList = [
{ {
test: [/SamsungBrowser/i], test: [/SamsungBrowser/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/(?:SamsungBrowser)[\s\/](\d+(\.\d+)?)/i, ua); const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/(?:SamsungBrowser)[\s\/](\S+)/i, ua);
return { return {
name: 'Samsung Internet for Android', name: 'Samsung Internet for Android',
@ -42,7 +42,7 @@ const browsersList = [
{ {
test: [/coast/i], test: [/coast/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/(?:coast)[\s\/](\d+(\.\d+)?)/i, ua); const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/(?:coast)[\s\/](\S+)/i, ua);
return { return {
name: 'Opera Coast', name: 'Opera Coast',
@ -53,7 +53,7 @@ const browsersList = [
{ {
test: [/yabrowser/i], test: [/yabrowser/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/(?:yabrowser)[\s\/](\d+(\.\d+)?)/i, ua); const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/(?:yabrowser)[\s\/](\S+)/i, ua);
return { return {
name: 'Yandex Browser', name: 'Yandex Browser',
@ -64,7 +64,7 @@ const browsersList = [
{ {
test: [/ucbrowser/i], test: [/ucbrowser/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/(?:ucbrowser)[\s\/](\d+(?:\.\d+)+)/i, ua); const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/(?:ucbrowser)[\s\/](\S+)/i, ua);
return { return {
name: 'UC Browser', name: 'UC Browser',
@ -75,7 +75,7 @@ const browsersList = [
{ {
test: [/mxios/i], test: [/mxios/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/(?:mxios)[\s\/](\d+(?:\.\d+)+)/i, ua); const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/(?:mxios)[\s\/](\S+)/i, ua);
return { return {
name: 'Maxthon', name: 'Maxthon',
@ -86,7 +86,7 @@ const browsersList = [
{ {
test: [/epiphany/i], test: [/epiphany/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/(?:epiphany)[\s\/](\d+(?:\.\d+)+)/i, ua); const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/(?:epiphany)[\s\/](\S+)/i, ua);
return { return {
name: 'Epiphany', name: 'Epiphany',
@ -97,7 +97,7 @@ const browsersList = [
{ {
test: [/puffin/i], test: [/puffin/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/(?:puffin)[\s\/](\d+(?:\.\d+)?)/i, ua); const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/(?:puffin)[\s\/](\S+)/i, ua);
return { return {
name: 'Puffin', name: 'Puffin',
@ -108,7 +108,7 @@ const browsersList = [
{ {
test: [/sleipnir/i], test: [/sleipnir/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/(?:sleipnir)[\s\/](\d+(?:\.\d+)+)/i, ua); const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/(?:sleipnir)[\s\/](\S+)/i, ua);
return { return {
name: 'Sleipnir', name: 'Sleipnir',
@ -119,7 +119,7 @@ const browsersList = [
{ {
test: [/k-meleon/i], test: [/k-meleon/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/(?:k-meleon)[\s\/](\d+(?:\.\d+)+)/i, ua); const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/(?:k-meleon)[\s\/](\S+)/i, ua);
return { return {
name: 'K-Meleon', name: 'K-Meleon',
@ -130,7 +130,7 @@ const browsersList = [
{ {
test: [/msie|trident/i], test: [/msie|trident/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(/(?:msie |rv:)(\d+(\.\d+)?)/i, ua); const version = getFirstMatch(/(?:msie |rv:)(\S+)/i, ua);
return { return {
name: 'Internet Explorer', name: 'Internet Explorer',
@ -141,7 +141,7 @@ const browsersList = [
{ {
test: [/chrome.+? edge/i], test: [/chrome.+? edge/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(/edge\/(\d+(\.\d+)?)/i, ua); const version = getFirstMatch(/edge\/(\S+)/i, ua);
return { return {
name: 'Microsoft Edge', name: 'Microsoft Edge',
@ -152,7 +152,7 @@ const browsersList = [
{ {
test: [/vivaldi/i], test: [/vivaldi/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(/vivaldi\/(\d+(\.\d+)?)/i, ua); const version = getFirstMatch(/vivaldi\/(\S+)/i, ua);
return { return {
name: 'Vivaldi', name: 'Vivaldi',
@ -163,7 +163,7 @@ const browsersList = [
{ {
test: [/seamonkey/i], test: [/seamonkey/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(/seamonkey\/(\d+(\.\d+)?)/i, ua); const version = getFirstMatch(/seamonkey\/(\S+)/i, ua);
return { return {
name: 'SeaMonkey', name: 'SeaMonkey',
version version
@ -173,7 +173,7 @@ const browsersList = [
{ {
test: [/firefox|iceweasel|fxios/i], test: [/firefox|iceweasel|fxios/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(/(?:firefox|iceweasel|fxios)[ \/](\d+(\.\d+)?)/i, ua); const version = getFirstMatch(/(?:firefox|iceweasel|fxios)[ \/](\S+)/i, ua);
return { return {
name: 'Firefox' name: 'Firefox'
} }
@ -182,7 +182,7 @@ const browsersList = [
{ {
test: [/silk/i], test: [/silk/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(/silk\/(\d+(\.\d+)?)/i, ua); const version = getFirstMatch(/silk\/(\S+)/i, ua);
return { return {
name: 'Amazon Silk', name: 'Amazon Silk',
version version
@ -192,7 +192,7 @@ const browsersList = [
{ {
test: [/phantom/i], test: [/phantom/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(/phantomjs\/(\d+(\.\d+)?)/i, ua); const version = getFirstMatch(/phantomjs\/(\S+)/i, ua);
return { return {
name: 'PhantomJS', name: 'PhantomJS',
@ -203,7 +203,7 @@ const browsersList = [
{ {
test: [/slimerjs/i], test: [/slimerjs/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(/slimerjs\/(\d+(\.\d+)?)/i, ua); const version = getFirstMatch(/slimerjs\/(\S+)/i, ua);
return { return {
name: 'SlimerJS', name: 'SlimerJS',
@ -214,7 +214,7 @@ const browsersList = [
{ {
test: [/blackberry|\bbb\d+/i, /rim\stablet/i], test: [/blackberry|\bbb\d+/i, /rim\stablet/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/blackberry[\d]+\/(\d+(\.\d+)?)/i, ua); const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/blackberry[\d]+\/(\S+)/i, ua);
return { return {
name: 'BlackBerry', name: 'BlackBerry',
@ -225,7 +225,7 @@ const browsersList = [
{ {
test: [/(web|hpw)os/i], test: [/(web|hpw)os/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/w(?:eb)?osbrowser\/(\d+(\.\d+)?)/i, ua); const version = getFirstMatch(commonVersionIdentifier, ua) || getFirstMatch(/w(?:eb)?osbrowser\/(\S+)/i, ua);
return { return {
name: 'WebOS Browser', name: 'WebOS Browser',
@ -236,7 +236,7 @@ const browsersList = [
{ {
test: [/bada/i], test: [/bada/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(/dolfin\/(\d+(\.\d+)?)/i, ua); const version = getFirstMatch(/dolfin\/(\S+)/i, ua);
return { return {
name: 'Bada', name: 'Bada',
@ -247,7 +247,7 @@ const browsersList = [
{ {
test: [/tizen/i], test: [/tizen/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(/(?:tizen\s?)?browser\/(\d+(\.\d+)?)/i, ua) || getFirstMatch(commonVersionIdentifier, ua); const version = getFirstMatch(/(?:tizen\s?)?browser\/(\S+)/i, ua) || getFirstMatch(commonVersionIdentifier, ua);
return { return {
name: 'Tizen', name: 'Tizen',
@ -258,7 +258,7 @@ const browsersList = [
{ {
test: [/qupzilla/i], test: [/qupzilla/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(/(?:qupzilla)[\s\/](\d+(?:\.\d+)+)/i, ua) || getFirstMatch(commonVersionIdentifier, ua); const version = getFirstMatch(/(?:qupzilla)[\s\/](\S+)/i, ua) || getFirstMatch(commonVersionIdentifier, ua);
return { return {
name: 'QupZilla', name: 'QupZilla',
@ -269,7 +269,7 @@ const browsersList = [
{ {
test: [/chromium/i], test: [/chromium/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(/(?:chromium)[\s\/](\d+(?:\.\d+)?)/i, ua) || getFirstMatch(commonVersionIdentifier, ua); const version = getFirstMatch(/(?:chromium)[\s\/](\S+)/i, ua) || getFirstMatch(commonVersionIdentifier, ua);
return { return {
name: 'Chromium', name: 'Chromium',
@ -280,7 +280,7 @@ const browsersList = [
{ {
test: [/chrome|crios|crmo/i], test: [/chrome|crios|crmo/i],
detect(ua) { detect(ua) {
const version = getFirstMatch(/(?:chrome|crios|crmo)\/(\d+(\.\d+)?)/i, ua); const version = getFirstMatch(/(?:chrome|crios|crmo)\/(\S+)/i, ua);
return { return {
name: 'Chrome', name: 'Chrome',

1
test/unit/parser.js
View File

@ -19,4 +19,5 @@ test('test', t => {
test('_parseBrowser', t => { test('_parseBrowser', t => {
const b = parser._parseBrowser(); const b = parser._parseBrowser();
t.is(b.name, 'Opera'); t.is(b.name, 'Opera');
t.is(b.version, '43.0.2442.1165');
}); });