@applitools/core 1.4.6 → 1.4.7

package/dist/ufg/utils/extract-broker-url.js

@@ -0,0 +1,52 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractBrokerUrl = void 0;
+const utils = __importStar(require("@applitools/utils"));
+async function extractBrokerUrl({ driver, logger, }) {
+    if (!driver.isNative)
+        return null;
+    logger.log('Broker url extraction is started');
+    const element = await driver.element({ type: 'accessibility id', selector: 'Applitools_View' });
+    if (!element)
+        return null;
+    try {
+        let result;
+        do {
+            result = JSON.parse(await element.getText());
+            if (result.nextPath) {
+                logger.log('Broker url was extraction finished successfully with value', result.nextPath);
+                return result.nextPath;
+            }
+            await utils.general.sleep(1000);
+        } while (!result.error);
+        logger.error('Broker url extraction has failed with error', result.error);
+        return null;
+    }
+    catch (error) {
+        return null;
+    }
+}
+exports.extractBrokerUrl = extractBrokerUrl;

package/dist/ufg/utils/generate-safe-selectors.js

@@ -24,8 +24,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSafeSelectors = void 0;
-const snippets = __importStar(require("@applitools/snippets"));
 const utils = __importStar(require("@applitools/utils"));
+const { addElementIds, cleanupElementIds } = require('@applitools/snippets');
 async function generateSafeSelectors({ context, elementReferences, }) {
     const mapping = {
         elements: [],
@@ -36,14 +36,19 @@ async function generateSafeSelectors({ context, elementReferences, }) {
         mapping.elements.push(elements);
         mapping.ids.push(Array(elements.length).fill(utils.general.guid()));
     }
-    const generatedSelectors = await context.execute(snippets.addElementIds, [mapping.elements.flat(), mapping.ids.flat()]);
+    const generatedSelectors = await context.execute(addElementIds, [
+        mapping.elements.flat(),
+        mapping.ids.flat(),
+    ]);
     let offset = 0;
     const selectors = mapping.elements.map((elements, index) => {
         if (elements.length === 0)
             return { safeSelector: null, originalSelector: null, elementReference: elementReferences[index] };
         const safeSelector = generatedSelectors[offset].reduce((selector, value) => {
-            return selector ? { ...selector, shadow: { type: 'css', selector: value } } : { type: 'css', selector: value };
-        }, null);
+            return utils.types.isObject(selector)
+                ? { ...selector, shadow: { type: 'css', selector: value } }
+                : { type: 'css', selector: value };
+        }, undefined);
         offset += elements.length;
         return { safeSelector, originalSelector: elements[0].commonSelector, elementReference: elementReferences[index] };
     });
@@ -54,7 +59,7 @@ async function generateSafeSelectors({ context, elementReferences, }) {
     async function cleanupGeneratedSelectors() {
         if (!mapping.elements.length)
             return;
-        await context.execute(snippets.cleanupElementIds, [mapping.elements.flat()]);
+        await context.execute(cleanupElementIds, [mapping.elements.flat()]);
     }
 }
 exports.generateSafeSelectors = generateSafeSelectors;

package/dist/ufg/utils/take-dom-snapshot.js

@@ -24,45 +24,44 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractCrossFrames = exports.deserializeDomSnapshot = exports.takeDomSnapshot = void 0;
-const dom_snapshot_1 = require("@applitools/dom-snapshot");
 const utils = __importStar(require("@applitools/utils"));
+const { getProcessPagePoll, getPollResult, getProcessPagePollForIE, getPollResultForIE, } = require('@applitools/dom-snapshot');
 async function takeDomSnapshot({ context, settings, logger, }) {
     var _a;
     const driver = context.driver;
-    const isLegacyBrowser = driver.isIE || driver.isEdgeLegacy;
-    const { canExecuteOnlyFunctionScripts } = driver.features;
-    const arg = {
-        dontFetchResources: settings === null || settings === void 0 ? void 0 : settings.disableBrowserFetching,
-        skipResources: settings === null || settings === void 0 ? void 0 : settings.skipResources,
-        removeReverseProxyURLPrefixes: Boolean(process.env.APPLITOOLS_SCRIPT_REMOVE_REVERSE_PROXY_URL_PREFIXES),
-        chunkByteLength: (_a = settings === null || settings === void 0 ? void 0 : settings.chunkByteLength) !== null && _a !== void 0 ? _a : (Number(process.env.APPLITOOLS_SCRIPT_RESULT_MAX_BYTE_LENGTH) || (driver.isIOS ? 100000 : 250 * 1024 * 1024)),
-        serializeResources: true,
-        compressResources: false,
-        showLogs: settings === null || settings === void 0 ? void 0 : settings.showLogs,
-    };
-    const scripts = {
-        main: canExecuteOnlyFunctionScripts
-            ? require('@applitools/dom-snapshot').processPagePoll
-            : `return (${isLegacyBrowser ? await (0, dom_snapshot_1.getProcessPagePollForIE)() : await (0, dom_snapshot_1.getProcessPagePoll)()}).apply(null, arguments);`,
-        poll: canExecuteOnlyFunctionScripts
-            ? require('@applitools/dom-snapshot').pollResult
-            : `return (${isLegacyBrowser ? await (0, dom_snapshot_1.getPollResultForIE)() : await (0, dom_snapshot_1.getPollResult)()}).apply(null, arguments);`,
-    };
-    const cookies = driver.features.allCookies ? await driver.getCookies().catch(() => []) : [];
-    const snapshot = await takeContextDomSnapshot({ context });
+    const cookies = ((_a = driver.features) === null || _a === void 0 ? void 0 : _a.allCookies) ? await driver.getCookies().catch(() => []) : [];
+    const snapshot = deserializeDomSnapshot({ snapshot: await takeContextDomSnapshot({ context }) });
     snapshot.cookies = cookies;
-    return deserializeDomSnapshot({ snapshot });
+    return snapshot;
     async function takeContextDomSnapshot({ context }) {
         // logger.log(`taking dom snapshot. ${context._reference ? `context referece: ${JSON.stringify(context._reference)}` : ''}`)
-        var _a, _b;
-        if (!driver.features.allCookies) {
+        var _a, _b, _c, _d, _e, _f;
+        if (!((_a = driver.features) === null || _a === void 0 ? void 0 : _a.allCookies)) {
             cookies.push(...(await context.getCookies()));
         }
+        const isLegacyBrowser = driver.isIE || driver.isEdgeLegacy;
+        const arg = {
+            dontFetchResources: settings === null || settings === void 0 ? void 0 : settings.disableBrowserFetching,
+            skipResources: settings === null || settings === void 0 ? void 0 : settings.skipResources,
+            removeReverseProxyURLPrefixes: Boolean(process.env.APPLITOOLS_SCRIPT_REMOVE_REVERSE_PROXY_URL_PREFIXES),
+            chunkByteLength: (_b = settings === null || settings === void 0 ? void 0 : settings.chunkByteLength) !== null && _b !== void 0 ? _b : (Number(process.env.APPLITOOLS_SCRIPT_RESULT_MAX_BYTE_LENGTH) || (driver.isIOS ? 100000 : 250 * 1024 * 1024)),
+            serializeResources: true,
+            compressResources: false,
+            showLogs: settings === null || settings === void 0 ? void 0 : settings.showLogs,
+        };
+        const scripts = {
+            main: ((_c = driver.features) === null || _c === void 0 ? void 0 : _c.canExecuteOnlyFunctionScripts)
+                ? require('@applitools/dom-snapshot').processPagePoll
+                : `return (${isLegacyBrowser ? await getProcessPagePollForIE() : await getProcessPagePoll()}).apply(null, arguments);`,
+            poll: ((_d = driver.features) === null || _d === void 0 ? void 0 : _d.canExecuteOnlyFunctionScripts)
+                ? require('@applitools/dom-snapshot').pollResult
+                : `return (${isLegacyBrowser ? await getPollResultForIE() : await getPollResult()}).apply(null, arguments);`,
+        };
         const snapshot = await context.executePoll(scripts, {
             main: arg,
             poll: arg,
-            executionTimeout: (_a = settings === null || settings === void 0 ? void 0 : settings.executionTimeout) !== null && _a !== void 0 ? _a : 5 * 60 * 1000,
-            pollTimeout: (_b = settings === null || settings === void 0 ? void 0 : settings.pollTimeout) !== null && _b !== void 0 ? _b : 200,
+            executionTimeout: (_e = settings === null || settings === void 0 ? void 0 : settings.executionTimeout) !== null && _e !== void 0 ? _e : 5 * 60 * 1000,
+            pollTimeout: (_f = settings === null || settings === void 0 ? void 0 : settings.pollTimeout) !== null && _f !== void 0 ? _f : 200,
         });
         const crossFrames = extractCrossFrames({ snapshot, logger });
         for (const { reference, parentSnapshot, cdtNode } of crossFrames) {
@@ -88,16 +87,17 @@ async function takeDomSnapshot({ context, settings, logger, }) {
             }
         }
         logger.log(`dom snapshot cdt length: ${snapshot.cdt.length}`);
-        logger.log(`blobs urls (${snapshot.blobs.length}):`, JSON.stringify(snapshot.blobs.map(({ url }) => url))); // eslint-disable-line prettier/prettier
-        logger.log(`resource urls (${snapshot.resourceUrls.length}):`, JSON.stringify(snapshot.resourceUrls)); // eslint-disable-line prettier/prettier
+        logger.log(`blobs urls (${snapshot.blobs.length}):`, JSON.stringify(snapshot.blobs.map(({ url }) => url)));
+        logger.log(`resource urls (${snapshot.resourceUrls.length}):`, JSON.stringify(snapshot.resourceUrls));
         return snapshot;
     }
 }
 exports.takeDomSnapshot = takeDomSnapshot;
 function deserializeDomSnapshot({ snapshot }) {
+    const { blobs, selector: _, crossFrames: __, ...rest } = snapshot;
     const deserializedSnapshot = {
-        ...snapshot,
-        resourceContents: snapshot.blobs.reduce((resourceContents, blob) => {
+        ...rest,
+        resourceContents: blobs.reduce((resourceContents, blob) => {
             if (blob.value === undefined)
                 return { ...resourceContents, [blob.url]: blob };
             else
@@ -105,13 +105,10 @@ function deserializeDomSnapshot({ snapshot }) {
         }, {}),
         frames: snapshot.frames.map(frameSnapshot => deserializeDomSnapshot({ snapshot: frameSnapshot })),
     };
-    delete deserializedSnapshot.blobs;
-    delete deserializedSnapshot.selector;
-    delete deserializedSnapshot.crossFrames;
     return deserializedSnapshot;
 }
 exports.deserializeDomSnapshot = deserializeDomSnapshot;
-function extractCrossFrames({ snapshot, parent = null, logger }) {
+function extractCrossFrames({ snapshot, parent = null, logger, }) {
     var _a;
     const crossFrames = [snapshot, ...((_a = snapshot.frames) !== null && _a !== void 0 ? _a : [])].flatMap((snapshot, index) => {
         var _a;
@@ -123,7 +120,11 @@ function extractCrossFrames({ snapshot, parent = null, logger }) {
         return [
             ...crossFrames,
             ...(index > 0
-                ? extractCrossFrames({ snapshot, parent: { reference: { type: 'css', selector: snapshot.selector }, parent }, logger })
+                ? extractCrossFrames({
+                    snapshot,
+                    parent: { reference: { type: 'css', selector: snapshot.selector }, parent },
+                    logger,
+                })
                 : []),
         ];
     });

package/dist/ufg/utils/take-dom-snapshots.js

@@ -38,10 +38,10 @@ async function takeDomSnapshots({ driver, settings, hooks, provides, logger, })
     var _a, _b, _c, _d;
     const currentContext = driver.currentContext;
     const waitBeforeCapture = async () => {
-        if (typeof settings.waitBeforeCapture === 'function') {
+        if (utils.types.isFunction(settings.waitBeforeCapture)) {
             await settings.waitBeforeCapture();
         }
-        else {
+        else if (settings.waitBeforeCapture) {
             await utils.general.sleep(settings.waitBeforeCapture);
         }
     };
@@ -55,7 +55,7 @@ async function takeDomSnapshots({ driver, settings, hooks, provides, logger, })
     }
     const isStrictBreakpoints = utils.types.isArray(settings.layoutBreakpoints);
     const requiredWidths = await settings.renderers.reduce(async (prev, renderer, index) => {
-        const { name, width } = await extractRendererInfo({ renderer });
+        const { name, width } = (await extractRendererInfo({ renderer }));
         const requiredWidths = await prev;
         const requiredWidth = isStrictBreakpoints
             ? calculateBreakpoint({ breakpoints: settings.layoutBreakpoints, value: width })
@@ -128,21 +128,17 @@ async function takeDomSnapshots({ driver, settings, hooks, provides, logger, })
     async function extractRendererInfo({ renderer }) {
         if (utils.types.has(renderer, ['width', 'height'])) {
             const { name, width, height } = renderer;
-            return { name, width, height };
+            return { name: name !== null && name !== void 0 ? name : 'default', width, height };
         }
-        else {
-            let devices, info;
-            if (utils.types.has(renderer, 'chromeEmulationInfo')) {
-                info = renderer.chromeEmulationInfo;
-                devices = await provides.getChromeEmulationDevices();
-            }
-            else if (utils.types.has(renderer, 'iosDeviceInfo')) {
-                info = renderer.iosDeviceInfo;
-                devices = await provides.getIOSDevices();
-            }
-            const { deviceName, screenOrientation = 'portrait' } = info;
-            const size = devices[deviceName][screenOrientation];
-            return { name: deviceName, screenOrientation, ...size };
+        else if (utils.types.has(renderer, 'chromeEmulationInfo')) {
+            const devices = await provides.getChromeEmulationDevices();
+            const { deviceName, screenOrientation = 'portrait' } = renderer.chromeEmulationInfo;
+            return { name: deviceName, screenOrientation, ...devices[deviceName][screenOrientation] };
+        }
+        else if (utils.types.has(renderer, 'iosDeviceInfo')) {
+            const devices = await provides.getIOSDevices();
+            const { deviceName, screenOrientation = 'portrait' } = renderer.iosDeviceInfo;
+            return { name: deviceName, screenOrientation, ...devices[deviceName][screenOrientation] };
         }
     }
 }

package/dist/ufg/utils/take-snapshots.js

@@ -18,7 +18,7 @@ exports.takeSnapshots = void 0;
 const take_dom_snapshots_1 = require("./take-dom-snapshots");
 const take_vhses_1 = require("./take-vhses");
 const nml_client_1 = require("@applitools/nml-client");
-const extract_broker_url_1 = require("../../utils/extract-broker-url");
+const extract_broker_url_1 = require("./extract-broker-url");
 __exportStar(require("./take-dom-snapshots"), exports);
 __exportStar(require("./take-vhses"), exports);
 async function takeSnapshots({ driver, settings, hooks, provides, logger, }) {
@@ -26,9 +26,9 @@ async function takeSnapshots({ driver, settings, hooks, provides, logger, }) {
         return (0, take_dom_snapshots_1.takeDomSnapshots)({ driver, settings, hooks, provides, logger });
     }
     else {
-        const brokerUrl = await (0, extract_broker_url_1.extractBrokerUrl)(driver);
+        const brokerUrl = await (0, extract_broker_url_1.extractBrokerUrl)({ driver, logger });
         if (brokerUrl) {
-            return (0, nml_client_1.takeSnapshots)({ url: brokerUrl, settings, logger });
+            return (await (0, nml_client_1.takeSnapshots)({ url: brokerUrl, settings, logger }));
         }
         else {
             return (0, take_vhses_1.takeVHSes)({ driver, settings, hooks, logger });

package/dist/ufg/utils/take-vhses.js

@@ -1,131 +1,109 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.takeVHSes = void 0;
-const utils = __importStar(require("@applitools/utils"));
 async function takeVHSes({ driver, settings, hooks, logger, }) {
     var _a;
     logger.log('taking VHS');
     if (!driver.isAndroid && !driver.isIOS) {
-        throwError('cannot take VHS on mobile device other than iOS or Android');
+        throw new Error('cannot take VHS on mobile device other than iOS or Android');
     }
     await ((_a = hooks === null || hooks === void 0 ? void 0 : hooks.beforeSnapshots) === null || _a === void 0 ? void 0 : _a.call(hooks));
-    const trigger = await findElement({
-        driver,
-        selector: 'UFG_TriggerArea',
-        type: 'Button',
-        timeout: 30000,
-    });
+    const trigger = await driver.waitFor(driver.isAndroid
+        ? { type: 'xpath', selector: `//android.widget.Button[@content-desc="UFG_TriggerArea"]` }
+        : { type: 'accessibility id', selector: 'UFG_TriggerArea' }, { timeout: 30000 });
+    if (!trigger)
+        throw new Error('Trigger element could not be found');
     if (driver.isAndroid) {
-        const apiKeyInput = await findElement({
-            driver,
-            selector: 'UFG_Apikey',
-            type: 'EditText',
-            throwErr: false,
+        const apiKeyInput = await driver.element({
+            type: 'xpath',
+            selector: `//android.widget.EditText[@content-desc="UFG_Apikey"]`,
         });
         if (apiKeyInput) {
             // in case 'apiKeyInput' does not exist, it means it was already triggered on previous cycle
             // this condition is to avoid re-sending 'inputJson' multiple times
             const inputString = JSON.stringify({
-                serverUrl: settings.serverUrl || undefined,
+                serverUrl: settings.serverUrl,
                 apiKey: settings.apiKey,
-                proxy: settings.proxy ? transformProxy(settings.proxy) : undefined,
+                proxy: settings.proxy && transformProxy(settings.proxy),
             });
-            log('sending API key to UFG lib', inputString);
+            logger.log('sending API key to UFG lib', inputString);
             await apiKeyInput.type(inputString);
-            const ready = await findElement({
-                driver,
-                selector: 'UFG_ApikeyReady',
-                type: 'Button',
+            const ready = await driver.element({
+                type: 'xpath',
+                selector: `//android.widget.Button[@content-desc="UFG_ApikeyReady"]`,
             });
+            if (!ready)
+                throw new Error('Api key readiness element could not be found');
             await ready.click();
         }
         else {
-            log('UFG_Apikey was skipped');
+            logger.log('UFG_Apikey was skipped');
         }
     }
     await trigger.click(); // TODO handle stale element exception and then find the trigger again and click it
-    let label = await findElement({
-        driver,
-        selector: 'UFG_SecondaryLabel',
-        type: 'TextView',
-        timeout: 10000,
-        throwErr: false,
-    });
+    let label = await driver.waitFor(driver.isAndroid
+        ? { type: 'xpath', selector: `//android.widget.TextView[@content-desc="UFG_SecondaryLabel"]` }
+        : { type: 'accessibility id', selector: 'UFG_SecondaryLabel' }, { timeout: 10000 });
     if (!label) {
         // This might happen if the tap on the trigger area didn't happen due to Appium bug. So we try to find the trigger again and if it's present, we'll tap it.
         // If the trigger area is not present, then we're probably at the middle of taking the VHS - give it 50 seconds more until we give up
-        log('UFG_SecondaryLabel was not found after 10 seconds, trying to click UFG_TriggerArea again');
-        const triggerRetry = await findElement({
-            driver,
-            selector: 'UFG_TriggerArea',
-            type: 'Button',
-            timeout: 30000,
-            throwErr: false,
-        });
+        logger.log('UFG_SecondaryLabel was not found after 10 seconds, trying to click UFG_TriggerArea again');
+        const triggerRetry = await driver.waitFor(driver.isAndroid
+            ? { type: 'xpath', selector: `//android.widget.Button[@content-desc="UFG_TriggerArea"]` }
+            : { type: 'accessibility id', selector: 'UFG_TriggerArea' }, { timeout: 30000 });
         if (triggerRetry) {
-            log('UFG_TriggerArea was found on retry. clicking it.');
+            logger.log('UFG_TriggerArea was found on retry. clicking it.');
             await triggerRetry.click();
         }
         else {
-            log('UFG_TriggerArea was NOT found on retry. Probably VHS is being taken.');
+            logger.log('UFG_TriggerArea was NOT found on retry. Probably VHS is being taken.');
         }
-        label = await findElement({
-            driver,
-            selector: 'UFG_SecondaryLabel',
-            type: 'TextView',
-            timeout: 50000,
-        });
+        label = await driver.waitFor(driver.isAndroid
+            ? { type: 'xpath', selector: `//android.widget.TextView[@content-desc="UFG_SecondaryLabel"]` }
+            : { type: 'accessibility id', selector: 'UFG_SecondaryLabel' }, { timeout: 50000 });
         if (!label) {
-            log('UFG_SecondaryLabel was not found eventually. Giving up.');
+            logger.log('UFG_SecondaryLabel was not found eventually. Giving up.');
+            throw new Error('Secondary label element could not be found');
         }
     }
     const info = JSON.parse(await label.getText());
-    log('VHS info', info);
-    if (info.error) {
-        throwError(info.error);
-    }
-    let vhs;
+    logger.log('VHS info', info);
+    if (info.error)
+        throw new Error(`Error while taking VHS - ${info.error}`);
+    let vhs = '';
     if (driver.isIOS) {
-        vhs = await extractVHS();
+        const label = await driver.element({ type: 'accessibility id', selector: 'UFG_Label' });
+        if (!label)
+            throw new Error('VHS label element could not be found');
+        vhs = await label.getText();
     }
     else if (info.mode === 'labels') {
-        vhs = await collectChunkedVHS({ count: info.partsCount });
+        const labels = [
+            await driver.element({ type: 'xpath', selector: `//android.widget.TextView[@content-desc="UFG_Label_0"]` }),
+            await driver.element({ type: 'xpath', selector: `//android.widget.TextView[@content-desc="UFG_Label_1"]` }),
+            await driver.element({ type: 'xpath', selector: `//android.widget.TextView[@content-desc="UFG_Label_2"]` }),
+        ];
+        if (labels.some(label => !label))
+            throw new Error('VHS label element could not be found');
+        for (let chunk = 0; chunk < info.partsCount / labels.length; ++chunk) {
+            for (let label = 0; label < Math.min(labels.length, info.partsCount - chunk * labels.length); ++label) {
+                vhs += await labels[label].getText();
+            }
+            if (chunk * labels.length < info.partsCount)
+                await trigger.click();
+        }
     }
     else if (info.mode === 'network') {
         // do nothing
     }
     else {
-        throwError(`unknown mode for android: ${info.mode}`);
+        throw new Error(`unknown mode for android: ${info.mode}`);
     }
-    const clear = await findElement({
-        driver,
-        selector: 'UFG_ClearArea',
-        type: 'Button',
-        timeout: 30000,
-    });
+    const clear = await driver.waitFor(driver.isAndroid
+        ? { type: 'xpath', selector: `//android.widget.Button[@content-desc="UFG_ClearArea"]` }
+        : { type: 'accessibility id', selector: 'UFG_ClearArea' }, { timeout: 30000 });
+    if (!clear)
+        throw new Error('Clear element could not be found');
     await clear.click();
     let snapshot;
     if (driver.isAndroid) {
@@ -155,46 +133,6 @@ async function takeVHSes({ driver, settings, hooks, logger, }) {
         };
     }
     return Array(settings.renderers.length).fill(snapshot);
-    async function extractVHS() {
-        const label = await findElement({
-            driver,
-            selector: 'UFG_Label',
-            type: 'TextView',
-        });
-        return await label.getText();
-    }
-    async function collectChunkedVHS({ count }) {
-        const labels = [
-            await findElement({
-                driver,
-                selector: 'UFG_Label_0',
-                type: 'TextView',
-            }),
-            await findElement({
-                driver,
-                selector: 'UFG_Label_1',
-                type: 'TextView',
-            }),
-            await findElement({
-                driver,
-                selector: 'UFG_Label_2',
-                type: 'TextView',
-            }),
-        ];
-        let vhs = '';
-        for (let chunk = 0; chunk < count / labels.length; ++chunk) {
-            for (let label = 0; label < Math.min(labels.length, count - chunk * labels.length); ++label) {
-                vhs += await labels[label].getText();
-            }
-            if (chunk * labels.length < count) {
-                await trigger.click();
-            }
-        }
-        return vhs;
-    }
-    function log(...msg) {
-        logger.log('[takeVHSes]', ...msg);
-    }
 }
 exports.takeVHSes = takeVHSes;
 function transformProxy(proxy) {
@@ -212,47 +150,3 @@ function transformProxy(proxy) {
     }
     return transformedProxy;
 }
-function throwError(msg) {
-    throw new Error(`Error while taking VHS - ${msg}`);
-}
-async function findElement(options) {
-    const { selector, timeout = 0, throwErr = true } = options;
-    let element = await findElementBySelector(options);
-    if (!element && timeout)
-        element = await waitFor(options);
-    if (!element && throwErr) {
-        const timeoutError = timeout ? `, (waited for ${timeout} ms)` : '.';
-        throwError(`${selector} element could not be found${timeoutError}`);
-    }
-    return element;
-    async function waitFor(options) {
-        const { timeout } = options;
-        const interval = 500;
-        let waiting = true;
-        const waitTime = setTimeout(() => (waiting = false), timeout);
-        while (waiting) {
-            const element = await findElementBySelector(options);
-            if (element) {
-                clearTimeout(waitTime);
-                return element;
-            }
-            await utils.general.sleep(interval);
-        }
-        return null;
-    }
-    async function findElementBySelector(options) {
-        const { driver, selector, type } = options;
-        const context = driver.currentContext;
-        let element;
-        if (driver.isAndroid) {
-            element = await driver.element({
-                type: 'xpath',
-                selector: `//android.widget.${type}[@content-desc="${selector}"]`,
-            });
-        }
-        else {
-            element = await context.element({ type: 'accessibility id', selector });
-        }
-        return element;
-    }
-}