@applitools/driver 1.11.46 → 1.11.48

package/dist/driver.js

@@ -181,12 +181,11 @@ class Driver {
             (_c = (_f = this._driverInfo).userAgent) !== null && _c !== void 0 ? _c : (_f.userAgent = (_d = (await this.currentContext.executePoll(snippets.getUserAgent))) !== null && _d !== void 0 ? _d : null);
             this._logger.log('Extracted user agent', this._driverInfo.userAgent);
         }
-        return (_e = this._driverInfo.userAgent) !== null && _e !== void 0 ? _e : null;
+        return (_e = this._driverInfo.userAgent) !== null && _e !== void 0 ? _e : undefined;
     }
     async getUserAgentLegacy({ force } = {}) {
-        var _a;
         const userAgent = await this.getUserAgent({ force });
-        return utils.types.isObject(userAgent) ? (_a = userAgent === null || userAgent === void 0 ? void 0 : userAgent.legacy) !== null && _a !== void 0 ? _a : null : userAgent;
+        return utils.types.isObject(userAgent) ? userAgent === null || userAgent === void 0 ? void 0 : userAgent.legacy : userAgent;
     }
     async getEnvironment() {
         var _a, _b, _c, _d;
@@ -237,11 +236,11 @@ class Driver {
                 this._environment.isAndroid = /Android/i.test(this._environment.platformName);
                 this._environment.isIOS = /iOS/i.test(this._environment.platformName);
             }
-            if (!this._environment.isMobile &&
+            if ((this._environment.isAndroid || this._environment.isIOS) &&
                 this._environment.isWeb &&
-                (this._environment.isAndroid || this._environment.isIOS)) {
+                !this._environment.isMobile) {
                 this._environment.isMobile = true;
-                this._environment.isEmulation = this._environment.isChromium;
+                this._environment.isEmulation = true;
             }
             this._environment.isEC =
                 this._environment.isECClient || /exec-wus.applitools.com/.test((_d = (await this.getDriverUrl())) !== null && _d !== void 0 ? _d : '');

package/dist/user-agent.js

@@ -25,34 +25,29 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractUserAgentEnvironment = void 0;
 const utils = __importStar(require("@applitools/utils"));
-const MAJOR_MINOR = '(\\d+)(?:[_.](\\d+))?';
-const PLATFORM_REGEXES = [
-    new RegExp(`(?:(Windows NT) ${MAJOR_MINOR})`),
-    new RegExp('(?:(Windows XP))'),
-    new RegExp('(?:(Windows 2000))'),
-    new RegExp('(?:(Windows NT))'),
-    new RegExp('(?:(Windows))'),
-    new RegExp(`(?:(Mac OS X) ${MAJOR_MINOR})`),
-    new RegExp(`(?:(Android) ${MAJOR_MINOR})`),
-    new RegExp(`(?:(CPU(?: i[a-zA-Z]+)? OS) ${MAJOR_MINOR})`),
-    new RegExp('(?:(Mac OS X))'),
-    new RegExp('(?:(Mac_PowerPC))'),
-    new RegExp('(?:(Linux))'),
-    new RegExp('(?:(CrOS))'),
-    new RegExp('(?:(SymbOS))'),
+const majorMinorRegexpString = '(?<majorVersion>[^ .;_)]+)[_.;](?<minorVersion>[^ .;_)]*)';
+const platformRegexpMapping = [
+    ['Windows', new RegExp(`Windows(?:(?: NT)? ${majorMinorRegexpString}?)?`)],
+    ['iOS', new RegExp(`CPU(?: i[a-zA-Z]+)? OS ${majorMinorRegexpString}`)],
+    ['Mac OS X', new RegExp(`Mac OS X(?: ${majorMinorRegexpString})?`)],
+    ['Android', new RegExp(`Android ${majorMinorRegexpString}`)],
+    ['Macintosh', new RegExp(`Mac_PowerPC`)],
+    ['Linux', new RegExp(`Linux`)],
+    ['Chrome OS', new RegExp(`CrOS`)],
+    ['SymbOS', new RegExp(`SymbOS`)],
 ];
-const BROWSER_REGEXPES = [
-    new RegExp(`(?:(Opera)/${MAJOR_MINOR})`),
-    new RegExp(`(?:(Edg)/${MAJOR_MINOR})`),
-    new RegExp(`(?:(Edge)/${MAJOR_MINOR})`),
-    new RegExp(`(?:(Chrome)/${MAJOR_MINOR})`),
-    new RegExp(`(?:(Safari)/${MAJOR_MINOR})`),
-    new RegExp(`(?:(Firefox)/${MAJOR_MINOR})`),
-    new RegExp(`(?:MS(IE) ${MAJOR_MINOR})`),
+const browserRegexpMapping = [
+    ['IE', new RegExp(`rv:${majorMinorRegexpString}\\) like Gecko`)],
+    ['IE', new RegExp(`MSIE ${majorMinorRegexpString}`)],
+    ['Electron', new RegExp(`Electron/${majorMinorRegexpString}`)],
+    ['Opera', new RegExp(`Opera/${majorMinorRegexpString}`)],
+    ['Edge', new RegExp(`(?:Edg|Edge)/${majorMinorRegexpString}`)],
+    ['Chrome', new RegExp(`Chrome/${majorMinorRegexpString}`)],
+    ['Safari', new RegExp(`Safari/${majorMinorRegexpString}`)],
+    ['Firefox', new RegExp(`Firefox/${majorMinorRegexpString}`)],
 ];
-const HIDDEN_IE_REGEX = new RegExp(`(?:rv:${MAJOR_MINOR}\\) like Gecko)`);
-const BROWSER_VERSION_REGEX = new RegExp(`(?:Version/${MAJOR_MINOR})`);
-const WINDOWS_VERSIONS = {
+const browserVersionRegexp = new RegExp(`(?:Version/${majorMinorRegexpString})`);
+const windowsVersionsMapping = {
     '0.1.0': '7',
     '0.2.0': '8',
     '0.3.0': '8.1',
@@ -74,68 +69,78 @@ function extractUserAgentEnvironment(userAgent) {
         ...extractUserAgentLegacyBrowser(userAgentLegacy),
     };
     const userAgentEnvironment = userAgentObject && extractUserAgentObjectEnvironment(userAgentObject);
-    const environment = { ...userAgentEnvironment };
-    (_a = environment.platformName) !== null && _a !== void 0 ? _a : (environment.platformName = userAgentLegacyEnvironment.platformName);
-    (_b = environment.platformVersion) !== null && _b !== void 0 ? _b : (environment.platformVersion = userAgentLegacyEnvironment.platformVersion);
-    environment.browserName = (_c = userAgentLegacyEnvironment.browserName) !== null && _c !== void 0 ? _c : environment.browserName;
-    environment.browserVersion = (_d = userAgentLegacyEnvironment.browserVersion) !== null && _d !== void 0 ? _d : environment.browserVersion;
-    return environment;
+    return {
+        ...userAgentEnvironment,
+        platformName: (_a = userAgentEnvironment === null || userAgentEnvironment === void 0 ? void 0 : userAgentEnvironment.platformName) !== null && _a !== void 0 ? _a : userAgentLegacyEnvironment.platformName,
+        platformVersion: (_b = userAgentEnvironment === null || userAgentEnvironment === void 0 ? void 0 : userAgentEnvironment.platformVersion) !== null && _b !== void 0 ? _b : userAgentLegacyEnvironment.platformVersion,
+        browserName: (_c = userAgentLegacyEnvironment.browserName) !== null && _c !== void 0 ? _c : userAgentEnvironment === null || userAgentEnvironment === void 0 ? void 0 : userAgentEnvironment.browserName,
+        browserVersion: (_d = userAgentLegacyEnvironment.browserVersion) !== null && _d !== void 0 ? _d : userAgentEnvironment === null || userAgentEnvironment === void 0 ? void 0 : userAgentEnvironment.browserVersion,
+        isReliable: !!((userAgentEnvironment === null || userAgentEnvironment === void 0 ? void 0 : userAgentEnvironment.platformName) && (userAgentEnvironment === null || userAgentEnvironment === void 0 ? void 0 : userAgentEnvironment.platformVersion)),
+    };
 }
 exports.extractUserAgentEnvironment = extractUserAgentEnvironment;
 function extractUserAgentLegacyPlatform(userAgent) {
-    const platformRegExp = PLATFORM_REGEXES.find(regexp => regexp.test(userAgent));
-    if (!platformRegExp)
-        return { platformName: 'Unknown' };
-    const [_, platformName, platformMajorVersion, platformMinorVersion] = platformRegExp.exec(userAgent);
-    if (platformName.startsWith('CPU')) {
-        return { platformName: 'iOS', platformVersion: platformMajorVersion };
+    let info;
+    for (const [platformName, regexp] of platformRegexpMapping) {
+        const match = regexp.exec(userAgent);
+        if (match) {
+            info = { platformName, ...match.groups };
+            break;
+        }
     }
-    else if (platformName === 'Windows 2000' || platformName === 'Windows XP') {
-        return { platformName: 'Windows', platformVersion: '5' };
+    if (!info)
+        return { platformName: 'Unknown' };
+    if (info.platformName === 'Macintosh' || info.platformName === 'Chrome OS') {
+        info.minorVersion = undefined;
     }
-    else if (platformName === 'Windows NT') {
-        const result = { platformName: 'Windows', platformVersion: platformMajorVersion };
-        if (!platformMajorVersion) {
-            result.platformVersion = '4';
+    else if (info.platformName === 'Windows') {
+        if (info.majorVersion === 'XP') {
+            info.majorVersion = '5';
+            info.minorVersion = '1';
         }
-        else if (platformMajorVersion === '6' && platformMinorVersion === '1') {
-            result.platformVersion = '7';
+        else if (info.majorVersion === '6' && info.minorVersion === '1') {
+            info.majorVersion = '7';
+            info.minorVersion = undefined;
         }
-        else if (platformMajorVersion === '6' && (platformMinorVersion === '2' || platformMinorVersion === '3')) {
-            result.platformVersion = '8';
+        else if (info.majorVersion === '6' && info.minorVersion === '2') {
+            info.majorVersion = '8';
+            info.minorVersion = undefined;
         }
-        return result;
-    }
-    else if (platformName === 'Mac_PowerPC') {
-        return { platformName: 'Macintosh', platformVersion: platformMajorVersion };
-    }
-    else if (platformName === 'CrOS') {
-        return { platformName: 'Chrome OS', platformVersion: platformMajorVersion };
-    }
-    else {
-        return { platformName, platformVersion: platformMajorVersion };
-    }
-}
-function extractUserAgentLegacyBrowser(userAgent) {
-    const browserRegExp = BROWSER_REGEXPES.find(regexp => regexp.test(userAgent));
-    if (!browserRegExp) {
-        if (HIDDEN_IE_REGEX.test(userAgent)) {
-            const [_, browserVersion] = HIDDEN_IE_REGEX.exec(userAgent);
-            return { browserName: 'IE', browserVersion };
+        else if (info.majorVersion === '6' && info.minorVersion === '3') {
+            info.majorVersion = '8';
+            info.minorVersion = '1';
+        }
+        else if (info.majorVersion === '10') {
+            info.minorVersion = undefined;
         }
         else {
-            return { browserName: 'Unknown' };
+            info.majorVersion = undefined;
+            info.minorVersion = undefined;
         }
     }
-    const [_, browserName, browserVersion] = browserRegExp.exec(userAgent);
-    const result = { browserName, browserVersion };
-    if (result.browserName === 'Edg')
-        result.browserName = 'Edge';
-    if (BROWSER_VERSION_REGEX.test(userAgent)) {
-        const [_, browserVersion] = BROWSER_VERSION_REGEX.exec(userAgent);
-        result.browserVersion = browserVersion;
+    return {
+        platformName: info.platformName,
+        platformVersion: info.minorVersion ? `${info.majorVersion}.${info.minorVersion}` : info.majorVersion,
+    };
+}
+function extractUserAgentLegacyBrowser(userAgent) {
+    let info;
+    for (const [browserName, browserRegexp] of browserRegexpMapping) {
+        const browserMatch = browserRegexp.exec(userAgent);
+        if (browserMatch) {
+            info = { browserName, ...browserMatch.groups };
+            const versionMatch = browserVersionRegexp.exec(userAgent);
+            if (versionMatch)
+                info = { ...info, ...versionMatch.groups };
+            break;
+        }
     }
-    return result;
+    if (!info)
+        return { browserName: 'Unknown' };
+    return {
+        browserName: info.browserName,
+        browserVersion: info.minorVersion ? `${info.majorVersion}.${info.minorVersion}` : info.majorVersion,
+    };
 }
 function extractUserAgentObjectEnvironment(userAgent) {
     var _a, _b, _c, _d;
@@ -151,7 +156,8 @@ function extractUserAgentObjectEnvironment(userAgent) {
         isChromium: Boolean(chromiumBrand),
     };
     if (environment.platformName === 'Windows') {
-        environment.platformVersion = WINDOWS_VERSIONS[environment.platformVersion];
+        environment.platformVersion =
+            windowsVersionsMapping[environment.platformVersion];
     }
     else if (environment.platformName === 'macOS') {
         environment.platformName = 'Mac OS X';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/driver",
-  "version": "1.11.46",
+  "version": "1.11.48",
   "description": "Applitools universal framework wrapper",
   "keywords": [
     "applitools",

package/types/driver.d.ts

@@ -45,10 +45,10 @@ export declare class Driver<T extends SpecType> {
     }): Promise<Capabilities | null>;
     getUserAgent({ force }?: {
         force?: boolean;
-    }): Promise<UserAgent | null>;
+    }): Promise<UserAgent | undefined>;
     getUserAgentLegacy({ force }?: {
         force?: boolean;
-    }): Promise<string | null>;
+    }): Promise<string | undefined>;
     getEnvironment(): Promise<Environment>;
     getViewport(): Promise<Viewport>;
     getFeatures(): Promise<Features>;

package/types/types.d.ts

@@ -28,6 +28,7 @@ export type Environment = {
     platformName?: string;
     platformVersion?: string;
     deviceName?: string;
+    isReliable?: boolean;
     isW3C?: boolean;
     isEC?: boolean;
     isECClient?: boolean;