more improvements

Author: fadi-george

package.json

@@ -80,12 +80,12 @@
     },
     {
       "path": "./build/releases/OneSignalSDK.page.es6.js",
-      "limit": "60.5 kB",
+      "limit": "60.55 kB",
       "gzip": true
     },
     {
       "path": "./build/releases/OneSignalSDK.sw.js",
-      "limit": "25.1 kB",
+      "limit": "25.25 kB",
       "gzip": true
     },
     {

src/shared/useragent/detect.ts

@@ -1,152 +1,106 @@
 interface BrowserConfig {
   name: string;
   pattern: RegExp;
-  versionPattern?: RegExp;
+  versionPattern: RegExp;
 }
 
 interface IBrowserResult {
   name: string;
   version: string;
 }
 
-const PATTERNS = {
-  LIKE_ANDROID: /like android/i,
-  ANDROID: /android/i,
-  IOS_DEVICES: /(iphone|ipod|ipad)/i,
-  TABLET: /tablet/i,
-  TABLET_PC: /tablet pc/i,
-  MOBILE: /[^-]mobi/i,
-  NEXUS_MOBILE: /nexus\s*[0-6]\s*/i,
-  NEXUS_TABLET: /nexus\s*[0-9]+/i,
-  GENERIC_VERSION: /version\/(\d+(?:\.\d+)?)/i,
-} as const;
-
 const BROWSER_CONFIGS: BrowserConfig[] = [
   {
     name: 'Opera',
     pattern: /(?:opera|opr|opios)/i,
-    versionPattern: /(?:opera|opr|opios)[\s\/](\d+(?:\.\d+)?)/i,
+    versionPattern: /(?:opera|opr|opios)[ /](\d+(?:\.\d+)?)/i,
   },
   {
     name: 'Facebook',
     pattern: /FBAN\//i,
     versionPattern: /FBAV\/(\d+(?:\.\d+)?)/i,
   },
   {
-    name: 'Samsung Internet for Android',
+    name: 'Samsung Browser',
     pattern: /samsungbrowser/i,
-    versionPattern: /samsungbrowser[\s\/](\d+(?:\.\d+)?)/i,
+    versionPattern: /samsungbrowser[ /](\d+(?:\.\d+)?)/i,
   },
   {
     name: 'Yandex Browser',
     pattern: /yabrowser/i,
-    versionPattern: /yabrowser[\s\/](\d+(?:\.\d+)?)/i,
+    versionPattern: /yabrowser[ /](\d+(?:\.\d+)?)/i,
   },
   {
     name: 'Vivaldi',
     pattern: /vivaldi/i,
-    versionPattern: /vivaldi[\s\/](\d+(?:\.\d+)?)/i,
+    versionPattern: /vivaldi[ /](\d+(?:\.\d+)?)/i,
   },
   {
     name: 'UC Browser',
     pattern: /ucbrowser/i,
-    versionPattern: /ucbrowser[\s\/](\d+(?:\.\d+)?)/i,
+    versionPattern: /ucbrowser[ /](\d+(?:\.\d+)?)/i,
   },
   {
     name: 'Microsoft Edge',
-    pattern: /(?:edge|edgios|edga|edg)/i,
-    versionPattern: /(?:edge|edgios|edga|edg)[\s\/](\d+(?:\.\d+)?)/i,
+    pattern: /edg/i,
+    versionPattern: /edg[ /](\d+(?:\.\d+)?)/i,
   },
   {
     name: 'Firefox',
     pattern: /firefox|iceweasel|fxios/i,
-    versionPattern: /(?:firefox|iceweasel|fxios)[\s\/](\d+(?:\.\d+)?)/i,
+    versionPattern: /(?:firefox|iceweasel|fxios)[ /](\d+(?:\.\d+)?)/i,
   },
   {
     name: 'Chromium',
     pattern: /chromium/i,
-    versionPattern: /chromium[\s\/](\d+(?:\.\d+)?)/i,
+    versionPattern: /chromium[ /](\d+(?:\.\d+)?)/i,
   },
   {
     name: 'Chrome',
     pattern: /chrome|crios|crmo/i,
-    versionPattern: /(?:chrome|crios|crmo)[\s\/](\d+(?:\.\d+)?)/i,
+    versionPattern: /(?:chrome|crios|crmo)[ /](\d+(?:\.\d+)?)/i,
   },
   {
     name: 'Safari',
     pattern: /safari|applewebkit/i,
-    versionPattern: /version[\s\/](\d+(?:\.\d+)?)/i,
+    versionPattern: /version[ /](\d+(?:\.\d+)?)/i,
   },
 ];
 
-const matchUserAgent = (
-  userAgent: string,
-  position: number,
-  pattern: RegExp,
-): string => userAgent.match(pattern)?.[position] || '';
-
-function extractVersion(userAgent: string, config: BrowserConfig): string {
-  if (!config.versionPattern)
-    return matchUserAgent(userAgent, 1, PATTERNS.GENERIC_VERSION);
-  const match = userAgent.match(config.versionPattern);
-  return match?.[1] || '';
-}
-
 export function getBrowser(userAgent: string): IBrowserResult {
   for (const config of BROWSER_CONFIGS) {
     if (config.pattern.test(userAgent)) {
-      return { name: config.name, version: extractVersion(userAgent, config) };
+      const version = userAgent.match(config.versionPattern)?.[1] ?? '';
+      return { name: config.name, version };
     }
   }
-  return {
-    name: matchUserAgent(userAgent, 1, /^(.*?)[\s\/]/) || 'Unknown',
-    version: matchUserAgent(userAgent, 2, /^(.*?)[\s\/](.+?)[\s]/) || '',
-  };
+  return { name: 'Unknown', version: '' };
 }
+const isAndroid = (userAgent: string): boolean =>
+  !/like android/i.test(userAgent) && /android/i.test(userAgent);
 
-const isAndroidDevice = (userAgent: string): boolean =>
-  !PATTERNS.LIKE_ANDROID.test(userAgent) && PATTERNS.ANDROID.test(userAgent);
+const getIOSDeviceType = (userAgent: string): string =>
+  userAgent.match(/(iphone|ipod|ipad)/i)?.[1]?.toLowerCase() || '';
 
-export function getIOSDeviceType(userAgent: string): string {
-  let deviceType = matchUserAgent(
-    userAgent,
-    1,
-    PATTERNS.IOS_DEVICES,
-  ).toLowerCase();
+export function isTabletBrowser(userAgent = navigator.userAgent): boolean {
+  const ios = getIOSDeviceType(userAgent);
 
-  if (
-    !deviceType &&
-    navigator.platform === 'MacIntel' &&
-    navigator.maxTouchPoints > 2 &&
-    !(window as { MSStream?: unknown })?.MSStream
-  ) {
-    deviceType = 'ipad';
-  }
-  return deviceType;
-}
-
-export function isTablet(userAgent: string): boolean {
-  const isAndroid = isAndroidDevice(userAgent);
-  const iOSDevice = getIOSDeviceType(userAgent);
   return (
-    (PATTERNS.TABLET.test(userAgent) && !PATTERNS.TABLET_PC.test(userAgent)) ||
-    iOSDevice === 'ipad' ||
-    (isAndroid && !PATTERNS.MOBILE.test(userAgent)) ||
-    (!PATTERNS.NEXUS_MOBILE.test(userAgent) &&
-      PATTERNS.NEXUS_TABLET.test(userAgent))
+    (/tablet/i.test(userAgent) && !/tablet pc/i.test(userAgent)) ||
+    ios === 'ipad' ||
+    (isAndroid(userAgent) && !/[^-]mobi/i.test(userAgent)) ||
+    (!/nexus\s*[0-6]\s*/i.test(userAgent) && /nexus\s*\d+/i.test(userAgent))
   );
 }
 
-export function isMobile(userAgent: string): boolean {
-  const isTabletDevice = isTablet(userAgent);
-  const isAndroid = isAndroidDevice(userAgent);
-  const iOSDevice = getIOSDeviceType(userAgent);
+export function isMobileBrowser(userAgent = navigator.userAgent): boolean {
+  if (isTabletBrowser(userAgent)) return false;
+
+  const ios = getIOSDeviceType(userAgent);
   return (
-    !isTabletDevice &&
-    (PATTERNS.MOBILE.test(userAgent) ||
-      iOSDevice === 'iphone' ||
-      iOSDevice === 'ipod' ||
-      isAndroid ||
-      PATTERNS.NEXUS_MOBILE.test(userAgent))
+    /[^-]mobi/i.test(userAgent) ||
+    ios === 'iphone' ||
+    ios === 'ipod' ||
+    isAndroid(userAgent)
   );
 }

src/shared/useragent/useragent.ts

@@ -1,7 +1,9 @@
 import { Browser } from './constants';
-import { getBrowser, isMobile, isTablet } from './detect';
+import { getBrowser } from './detect';
 import type { BrowserValue } from './types';
 
+export { isMobileBrowser, isTabletBrowser } from './detect';
+
 const BROWSER_MAP: Record<string, BrowserValue> = {
   Chrome: Browser.Chrome,
   Chromium: Browser.Chrome,
@@ -21,9 +23,6 @@ export const getBrowserVersion = (): number => {
   return +`${major}.${minor}`;
 };
 
-export const isMobileBrowser = (): boolean => isMobile(navigator.userAgent);
-export const isTabletBrowser = (): boolean => isTablet(navigator.userAgent);
-
 export function requiresUserInteraction(): boolean {
   const browserName = getBrowserName();
   const version = getBrowserVersion();