creevey 0.10.0-beta.1 → 0.10.0-beta.11

package/dist/server/reporter.js

@@ -17,20 +17,20 @@ class CreeveyReporter {
     // TODO Output in better way, like vitest, maybe
     constructor(runner, options) {
         const { sessionId, browserName } = options.reporterOptions.creevey;
-        const testLogger = loglevel_1.default.getLogger(browserName);
+        const testLogger = loglevel_1.default.getLogger(sessionId);
         loglevel_plugin_prefix_1.default.apply(testLogger, {
             format(level) {
-                return `${testLevels[level]} => (${browserName}:${chalk_1.default.gray(sessionId)})`;
+                return `[${browserName}:${chalk_1.default.gray(process.pid)}] ${testLevels[level]} => ${chalk_1.default.gray(sessionId)}`;
             },
         });
         runner.on(types_js_1.TEST_EVENTS.TEST_BEGIN, (test) => {
             testLogger.warn(chalk_1.default.cyan(test.titlePath().join('/')));
         });
         runner.on(types_js_1.TEST_EVENTS.TEST_PASS, (test) => {
-            testLogger.info(chalk_1.default.cyan(test.titlePath().join('/')));
+            testLogger.info(chalk_1.default.cyan(test.titlePath().join('/')), chalk_1.default.gray(`(${test.duration} ms)`));
         });
         runner.on(types_js_1.TEST_EVENTS.TEST_FAIL, (test, error) => {
-            testLogger.error(chalk_1.default.cyan(test.titlePath().join('/')), '\n  ', this.getErrors(error, (error, imageName) => `${chalk_1.default.bold(imageName ?? browserName)}:${error}`, (error) => error.stack ?? error.message).join('\n  '));
+            testLogger.error(chalk_1.default.cyan(test.titlePath().join('/')), chalk_1.default.gray(`(${test.duration} ms)`), '\n  ', this.getErrors(error, (error, imageName) => `${chalk_1.default.bold(imageName ?? browserName)}:${error}`, (error) => error.stack ?? error.message).join('\n  '));
         });
     }
     getErrors(error, imageErrorToString, errorToString) {
@@ -61,12 +61,16 @@ class TeamcityReporter {
         runner.on(types_js_1.TEST_EVENTS.TEST_BEGIN, (test) => {
             console.log(`##teamcity[testStarted name='${this.escape(test.title)}' flowId='${process.pid}']`);
         });
+        runner.on(types_js_1.TEST_EVENTS.TEST_PASS, (test) => {
+            console.log(`##teamcity[testFinished name='${this.escape(test.title)}' flowId='${process.pid}']`);
+        });
         runner.on(types_js_1.TEST_EVENTS.TEST_FAIL, (test, error) => {
             Object.entries(reporterOptions.images).forEach(([name, image]) => {
                 if (!image)
                     return;
                 const filePath = test
                     .titlePath()
+                    .slice(0, -1)
                     .concat(name == browserName ? [] : [browserName])
                     .map(this.escape)
                     .join('/');

package/dist/server/reporter.js.map

@@ -1 +1 @@
-{"version":3,"file":"reporter.js","sourceRoot":"","sources":["../../src/server/reporter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reporter.js","sourceRoot":"","sources":["../../src/server/reporter.ts"],"names":[],"mappings":"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"}

package/dist/server/selenium/internal.d.ts

@@ -1,10 +1,9 @@
 import { Args } from '@storybook/csf';
-import Logger from 'loglevel';
 import { WebDriver } from 'selenium-webdriver';
-import { Config, StoryInput, StoriesRaw, Options, ServerTest } from '../../types.js';
+import { Config, StorybookGlobals, StoryInput, StoriesRaw, Options, ServerTest } from '../../types.js';
 export declare class InternalBrowser {
     #private;
-    constructor(browser: WebDriver, port: number, logger: Logger.Logger);
+    constructor(browser: WebDriver, port: number, storybookGlobals?: StorybookGlobals);
     get browser(): WebDriver;
     closeBrowser(): Promise<void>;
     takeScreenshot(captureElement?: string | null, ignoreElements?: string | string[] | null): Promise<Buffer>;

package/dist/server/selenium/internal.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InternalBrowser = void 0;
-const core_events_1 = require("@storybook/core-events");
 const chalk_1 = __importDefault(require("chalk"));
 const http_1 = __importDefault(require("http"));
 const https_1 = __importDefault(require("https"));
@@ -59,15 +58,19 @@ async function openUrlAndWaitForPageSource(browser, url, predicate) {
     } while (predicate(source));
     return source;
 }
-async function buildWebdriver(browserName, gridUrl, config, options) {
-    const browserConfig = config.browsers[browserName];
-    const { _storybookGlobals, /*customizeBuilder,*/ ...userCapabilities } = browserConfig;
+async function buildWebdriver(browser, gridUrl, config, options) {
+    const browserConfig = config.browsers[browser];
+    const { /*customizeBuilder,*/ seleniumCapabilities, browserName } = browserConfig;
     const url = new URL(gridUrl);
     url.username = url.username ? '********' : '';
     url.password = url.password ? '********' : '';
-    logger_js_1.logger.debug(`(${browserName}) Connecting to Selenium ${chalk_1.default.magenta(url.toString())}`);
+    (0, logger_js_1.logger)().debug(`Connecting to Selenium ${chalk_1.default.magenta(url.toString())}`);
     // TODO Define some capabilities explicitly and define typings
-    const capabilities = new selenium_webdriver_1.Capabilities({ ...userCapabilities, pageLoadStrategy: capabilities_js_1.PageLoadStrategy.EAGER });
+    const capabilities = new selenium_webdriver_1.Capabilities({
+        browserName,
+        ...seleniumCapabilities,
+        pageLoadStrategy: capabilities_js_1.PageLoadStrategy.EAGER,
+    });
     const prefs = new selenium_webdriver_1.logging.Preferences();
     if (options.trace) {
         for (const type of Object.values(selenium_webdriver_1.logging.Type)) {
@@ -77,47 +80,74 @@ async function buildWebdriver(browserName, gridUrl, config, options) {
     // TODO Fetch selenium grid capabilities
     // TODO Validate browsers, versions, and platform
     // TODO Use `customizeBuilder`
-    let browser;
+    let webdriver;
     try {
-        // const ie = new IeOptions();
-        // const edge = new EdgeOptions();
-        // const chrome = new ChromeOptions();
-        // const safari = new SafariOptions();
-        // const firefox = new FirefoxOptions();
-        // edge.enableBidi();
-        // chrome.enableBidi();
-        // firefox.enableBidi();
-        browser = await new selenium_webdriver_1.Builder()
-            // .setIeOptions(ie)
-            // .setEdgeOptions(edge)
-            // .setChromeOptions(chrome)
-            // .setSafariOptions(safari)
-            // .setFirefoxOptions(firefox)
-            .usingServer(gridUrl)
-            .withCapabilities(capabilities)
-            .setLoggingPrefs(prefs) // NOTE: Should go last
-            .build();
-        // const id = await browser.getWindowHandle();
-        // context = await BrowsingContext(browser, { browsingContextId: id });
+        const maxRetries = 5;
+        let retries = 0;
+        do {
+            webdriver = await Promise.race([
+                new Promise((resolve) => {
+                    setTimeout(() => {
+                        retries += 1;
+                        resolve(null);
+                    }, 120_000);
+                }),
+                (async () => {
+                    if (retries > 0) {
+                        (0, logger_js_1.logger)().debug(`Trying to initialize session to Selenium Grid: retried ${retries} of ${maxRetries}`);
+                    }
+                    const retry = retries;
+                    // const ie = new IeOptions();
+                    // const edge = new EdgeOptions();
+                    // const chrome = new ChromeOptions();
+                    // const safari = new SafariOptions();
+                    // const firefox = new FirefoxOptions();
+                    // edge.enableBidi();
+                    // chrome.enableBidi();
+                    // firefox.enableBidi();
+                    const driver = await new selenium_webdriver_1.Builder()
+                        // .setIeOptions(ie)
+                        // .setEdgeOptions(edge)
+                        // .setChromeOptions(chrome)
+                        // .setSafariOptions(safari)
+                        // .setFirefoxOptions(firefox)
+                        .usingServer(gridUrl)
+                        .withCapabilities(capabilities)
+                        .setLoggingPrefs(prefs) // NOTE: Should go last
+                        .build();
+                    // const id = await driver.getWindowHandle();
+                    // context = await BrowsingContext(driver, { browsingContextId: id });
+                    if (retry != retries) {
+                        void driver.quit();
+                        return null;
+                    }
+                    return driver;
+                })(),
+            ]);
+            if (webdriver)
+                break;
+        } while (retries < maxRetries);
+        if (!webdriver)
+            throw new Error('Failed to initialize session to Selenium Grid due to many retries');
     }
     catch (error) {
-        logger_js_1.logger.error(`(${browserName}) Failed to start browser:`, error);
+        (0, logger_js_1.logger)().error(`Failed to start browser:`, error);
         return null;
     }
-    return browser;
+    return webdriver;
 }
 class InternalBrowser {
     #isShuttingDown = false;
     #browser;
     #serverHost = null;
     #serverPort;
-    #logger;
+    #storybookGlobals;
     #unsubscribe = types_js_1.noop;
     #keepAliveInterval = null;
-    constructor(browser, port, logger) {
+    constructor(browser, port, storybookGlobals) {
         this.#browser = browser;
         this.#serverPort = port;
-        this.#logger = logger;
+        this.#storybookGlobals = storybookGlobals;
         this.#unsubscribe = (0, messages_js_1.subscribeOn)('shutdown', () => {
             void this.closeBrowser();
         });
@@ -142,23 +172,23 @@ class InternalBrowser {
     async takeScreenshot(captureElement, ignoreElements) {
         let screenshot;
         const ignoreStyles = await this.insertIgnoreStyles(ignoreElements);
-        if (this.#logger.getLevel() <= loglevel_1.default.levels.DEBUG) {
+        if ((0, logger_js_1.logger)().getLevel() <= loglevel_1.default.levels.DEBUG) {
             const { innerWidth, innerHeight } = await this.#browser.executeScript(function () {
                 return {
                     innerWidth: window.innerWidth,
                     innerHeight: window.innerHeight,
                 };
             });
-            this.#logger.debug(`Viewport size is: ${innerWidth}x${innerHeight}`);
+            (0, logger_js_1.logger)().debug(`Viewport size is: ${innerWidth}x${innerHeight}`);
         }
         try {
             if (!captureElement) {
-                this.#logger.debug('Capturing viewport screenshot');
+                (0, logger_js_1.logger)().debug('Capturing viewport screenshot');
                 screenshot = await this.#browser.takeScreenshot();
-                this.#logger.debug('Viewport screenshot is captured');
+                (0, logger_js_1.logger)().debug('Viewport screenshot is captured');
             }
             else {
-                this.#logger.debug(`Checking is element ${chalk_1.default.cyan(captureElement)} fit into viewport`);
+                (0, logger_js_1.logger)().debug(`Checking is element ${chalk_1.default.cyan(captureElement)} fit into viewport`);
                 const rects = await this.#browser.executeScript(function (selector) {
                     window.scrollTo(0, 0); // TODO Maybe we should remove same code from `resetMousePosition`
                     // eslint-disable-next-line no-var
@@ -191,10 +221,10 @@ class InternalBrowser {
                 const isFitIntoViewport = elementRect.width + elementRect.left <= windowRect.width &&
                     elementRect.height + elementRect.top <= windowRect.height;
                 if (isFitIntoViewport) {
-                    this.#logger.debug(`Capturing ${chalk_1.default.cyan(captureElement)} with size: ${elementRect.width}x${elementRect.height}`);
+                    (0, logger_js_1.logger)().debug(`Capturing ${chalk_1.default.cyan(captureElement)} with size: ${elementRect.width}x${elementRect.height}`);
                 }
                 else
-                    this.#logger.debug(`Capturing composite screenshot image of ${chalk_1.default.cyan(captureElement)} with size: ${elementRect.width}x${elementRect.height}`);
+                    (0, logger_js_1.logger)().debug(`Capturing composite screenshot image of ${chalk_1.default.cyan(captureElement)} with size: ${elementRect.width}x${elementRect.height}`);
                 // const element = await browser.findElement(By.css(captureElement));
                 // screenshot = isFitIntoViewport
                 //   ? context
@@ -206,7 +236,7 @@ class InternalBrowser {
                     ? await this.#browser.findElement(selenium_webdriver_1.By.css(captureElement)).takeScreenshot()
                     : // TODO pointer-events: none, need to research
                         await this.takeCompositeScreenshot(windowRect, elementRect);
-                this.#logger.debug(`${chalk_1.default.cyan(captureElement)} is captured`);
+                (0, logger_js_1.logger)().debug(`${chalk_1.default.cyan(captureElement)} is captured`);
             }
         }
         finally {
@@ -223,9 +253,10 @@ class InternalBrowser {
     }
     async selectStory(id, waitForReady = false) {
         // NOTE: Global variables might be reset after hot reload. I think it's workaround, maybe we need better solution
+        await this.updateStorybookGlobals();
         await this.updateBrowserGlobalVariables();
         await this.resetMousePosition();
-        this.#logger.debug(`Triggering 'SetCurrentStory' event with storyId ${chalk_1.default.magenta(id)}`);
+        (0, logger_js_1.logger)().debug(`Triggering 'SetCurrentStory' event with storyId ${chalk_1.default.magenta(id)}`);
         const result = await this.#browser.executeAsyncScript(function (storyId, shouldWaitForReady, callback) {
             if (typeof window.__CREEVEY_SELECT_STORY__ == 'undefined') {
                 callback([
@@ -247,7 +278,7 @@ class InternalBrowser {
                 storyId,
                 updatedArgs,
             });
-        }, story.id, updatedArgs, core_events_1.UPDATE_STORY_ARGS, core_events_1.STORY_RENDERED);
+        }, story.id, updatedArgs, types_js_1.StorybookEvents.UPDATE_STORY_ARGS, types_js_1.StorybookEvents.STORY_RENDERED);
     }
     async loadStoriesFromBrowser() {
         const stories = await this.#browser.executeAsyncScript(function (callback) {
@@ -258,14 +289,14 @@ class InternalBrowser {
         return stories;
     }
     async afterTest(test) {
-        if (this.#logger.getLevel() === loglevel_1.default.levels.TRACE) {
+        if ((0, logger_js_1.logger)().getLevel() === loglevel_1.default.levels.TRACE) {
             const output = [];
             const types = await this.#browser.manage().logs().getAvailableLogTypes();
             for (const type of types) {
                 const logs = await this.#browser.manage().logs().get(type);
                 output.push(logs.map((log) => JSON.stringify(log.toJSON(), null, 2)).join('\n'));
             }
-            this.#logger.debug('----------', (0, utils_js_1.getTestPath)(test).join('/'), '----------\n', output.join('\n'), '\n----------------------------------------------------------------------------------------------------');
+            (0, logger_js_1.logger)().debug('----------', (0, utils_js_1.getTestPath)(test).join('/'), '----------\n', output.join('\n'), '\n----------------------------------------------------------------------------------------------------');
         }
     }
     static async getBrowser(browserName, gridUrl, config, options) {
@@ -275,7 +306,7 @@ class InternalBrowser {
         const browser = await buildWebdriver(browserName, gridUrl, config, options);
         if (!browser)
             return null;
-        const internalBrowser = new InternalBrowser(browser, options.port, logger_js_1.logger);
+        const internalBrowser = new InternalBrowser(browser, options.port, _storybookGlobals);
         try {
             if (utils_js_1.isShuttingDown.current)
                 return null;
@@ -284,22 +315,21 @@ class InternalBrowser {
                 gridUrl,
                 viewport,
                 storybookUrl: address,
-                storybookGlobals: _storybookGlobals,
                 resolveStorybookUrl: config.resolveStorybookUrl,
             });
             return done ? internalBrowser : null;
         }
         catch (originalError) {
             void internalBrowser.closeBrowser();
-            const message = originalError instanceof Error ? originalError.message : originalError;
-            const error = new Error(`Can't load storybook root page by URL ${await browser.getCurrentUrl()}: ${message}`);
+            const message = originalError instanceof Error ? originalError.message : (originalError ?? 'Unknown error');
+            const error = new Error(`Can't load storybook root page: ${message}`);
             if (originalError instanceof Error)
                 error.stack = originalError.stack;
-            logger_js_1.logger.error(error);
+            (0, logger_js_1.logger)().error(error);
             return null;
         }
     }
-    async init({ browserName, gridUrl, viewport, storybookUrl, storybookGlobals, resolveStorybookUrl, }) {
+    async init({ browserName, gridUrl, viewport, storybookUrl, resolveStorybookUrl, }) {
         const sessionId = (await this.#browser.getSession()).getId();
         let browserHost = '';
         try {
@@ -310,19 +340,18 @@ class InternalBrowser {
         catch {
             /* noop */
         }
-        this.#logger = loglevel_1.default.getLogger(sessionId);
-        loglevel_plugin_prefix_1.default.apply(this.#logger, {
+        loglevel_plugin_prefix_1.default.apply((0, logger_js_1.logger)(), {
             format(level) {
                 const levelColor = logger_js_1.colors[level.toUpperCase()];
-                return `[${browserName}:${chalk_1.default.gray(sessionId)}] ${levelColor(level)} =>`;
+                return `[${browserName}:${chalk_1.default.gray(process.pid)}] ${levelColor(level)} => ${chalk_1.default.gray(sessionId)}`;
             },
         });
-        this.#logger.debug(`Connected successful with ${chalk_1.default.green(browserHost)}`);
+        (0, logger_js_1.logger)().debug(`Connected successful with ${chalk_1.default.green(browserHost)}`);
         return await (0, utils_js_1.runSequence)([
-            () => this.#browser.manage().setTimeouts({ pageLoad: 10000, script: 60000 }),
+            () => this.#browser.manage().setTimeouts({ pageLoad: 60000, script: 60000 }),
             () => this.openStorybookPage(storybookUrl, resolveStorybookUrl),
             () => this.waitForStorybook(),
-            () => this.updateStorybookGlobals(storybookGlobals),
+            () => this.updateStorybookGlobals(),
             () => this.resolveCreeveyHost(),
             () => this.updateBrowserGlobalVariables(),
             // NOTE: Selenium draws automation toolbar with some delay after webdriver initialization
@@ -340,27 +369,28 @@ class InternalBrowser {
         }
         try {
             if (resolver) {
-                this.#logger.debug('Resolving storybook url with custom resolver');
+                (0, logger_js_1.logger)().debug('Resolving storybook url with custom resolver');
                 const resolvedUrl = await resolver();
-                this.#logger.debug(`Resolver storybook url ${resolvedUrl}`);
+                (0, logger_js_1.logger)().debug(`Resolver storybook url ${resolvedUrl}`);
                 await this.#browser.get((0, webdriver_js_1.appendIframePath)(resolvedUrl));
             }
             else {
+                // TODO Pageload timeout 10s
                 // NOTE: getUrlChecker already calls `browser.get` so we don't need another one
-                await (0, webdriver_js_1.resolveStorybookUrl)((0, webdriver_js_1.appendIframePath)(storybookUrl), (url) => this.checkUrl(url), this.#logger);
+                await (0, webdriver_js_1.resolveStorybookUrl)((0, webdriver_js_1.appendIframePath)(storybookUrl), (url) => this.checkUrl(url));
             }
         }
         catch (error) {
-            this.#logger.error('Failed to resolve storybook URL', error instanceof Error ? error.message : '');
+            (0, logger_js_1.logger)().error('Failed to resolve storybook URL', error instanceof Error ? error.message : '');
             throw error;
         }
     }
     async checkUrl(url) {
         try {
             // NOTE: Before trying a new url, reset the current one
-            this.#logger.debug(`Opening ${chalk_1.default.magenta('about:blank')} page`);
+            (0, logger_js_1.logger)().debug(`Opening ${chalk_1.default.magenta('about:blank')} page`);
             await openUrlAndWaitForPageSource(this.#browser, 'about:blank', (source) => !source.includes('<body></body>'));
-            this.#logger.debug(`Opening ${chalk_1.default.magenta(url)} and checking the page source`);
+            (0, logger_js_1.logger)().debug(`Opening ${chalk_1.default.magenta(url)} and checking the page source`);
             const source = await openUrlAndWaitForPageSource(this.#browser, url, 
             // NOTE: IE11 can return only `head` without body
             (source) => source.length == 0 || !/<body([^>]*>).+<\/body>/s.test(source));
@@ -369,7 +399,7 @@ class InternalBrowser {
             // because other add significant delay and some of them don't work in earlier chrome versions
             // Browsers always load page successful even it's failed
             // So we just check `root` element
-            this.#logger.debug(`Checking ${chalk_1.default.cyan(`#${webdriver_js_1.storybookRootID}`)} existence on ${chalk_1.default.magenta(url)}`);
+            (0, logger_js_1.logger)().debug(`Checking ${chalk_1.default.cyan(`#${webdriver_js_1.storybookRootID}`)} existence on ${chalk_1.default.magenta(url)}`);
             return source.includes(`id="${webdriver_js_1.storybookRootID}"`);
         }
         catch {
@@ -377,7 +407,7 @@ class InternalBrowser {
         }
     }
     async waitForStorybook() {
-        this.#logger.debug('Waiting for `setStories` event to make sure that storybook is initiated');
+        (0, logger_js_1.logger)().debug('Waiting for `setStories` event to make sure that storybook is initiated');
         const isTimeout = await Promise.race([
             new Promise((resolve) => {
                 setTimeout(() => {
@@ -387,22 +417,17 @@ class InternalBrowser {
             (async () => {
                 let wait = true;
                 do {
-                    try {
-                        // TODO Research a different way to ensure storybook is initiated
-                        wait = await this.#browser.executeScript(function (SET_GLOBALS) {
-                            // TODO Maybe use
-                            // import { global } from '@storybook/global';
-                            // global.IS_STORYBOOK
-                            if (typeof window.__STORYBOOK_ADDONS_CHANNEL__ == 'undefined')
-                                return true;
-                            if (window.__STORYBOOK_ADDONS_CHANNEL__.last(SET_GLOBALS) == undefined)
-                                return true;
-                            return false;
-                        }, core_events_1.SET_GLOBALS);
-                    }
-                    catch (e) {
-                        this.#logger.debug('An error has been caught during the script:', e);
-                    }
+                    // TODO Research a different way to ensure storybook is initiated
+                    wait = await this.#browser.executeScript(function (SET_GLOBALS) {
+                        // TODO Maybe use
+                        // import { global } from '@storybook/global';
+                        // global.IS_STORYBOOK
+                        if (typeof window.__STORYBOOK_ADDONS_CHANNEL__ == 'undefined')
+                            return true;
+                        if (window.__STORYBOOK_ADDONS_CHANNEL__.last(SET_GLOBALS) == undefined)
+                            return true;
+                        return false;
+                    }, types_js_1.StorybookEvents.SET_GLOBALS);
                 } while (wait);
                 return false;
             })(),
@@ -411,13 +436,13 @@ class InternalBrowser {
         if (isTimeout)
             throw new Error('Failed to wait `setStories` event');
     }
-    async updateStorybookGlobals(globals) {
-        if (!globals)
+    async updateStorybookGlobals() {
+        if (!this.#storybookGlobals)
             return;
-        this.#logger.debug('Applying storybook globals');
+        (0, logger_js_1.logger)().debug('Applying storybook globals');
         await this.#browser.executeScript(function (globals) {
             window.__CREEVEY_UPDATE_GLOBALS__(globals);
-        }, globals);
+        }, this.#storybookGlobals);
     }
     async resolveCreeveyHost() {
         const addresses = (0, webdriver_js_1.getAddresses)();
@@ -464,7 +489,7 @@ class InternalBrowser {
                 innerHeight: window.innerHeight,
             };
         });
-        this.#logger.debug(`Resizing viewport from ${innerWidth}x${innerHeight} to ${viewport.width}x${viewport.height}`);
+        (0, logger_js_1.logger)().debug(`Resizing viewport from ${innerWidth}x${innerHeight} to ${viewport.width}x${viewport.height}`);
         const dWidth = windowRect.width - innerWidth;
         const dHeight = windowRect.height - innerHeight;
         await this.#browser
@@ -476,7 +501,7 @@ class InternalBrowser {
         });
     }
     async resetMousePosition() {
-        this.#logger.debug('Resetting mouse position to the top-left corner');
+        (0, logger_js_1.logger)().debug('Resetting mouse position to the top-left corner');
         const browserName = (await this.#browser.getCapabilities()).getBrowserName();
         const [browserVersion] = (await this.#browser.getCapabilities()).getBrowserVersion()?.split('.') ??
             (await this.#browser.getCapabilities()).get('version')?.split('.') ??
@@ -502,8 +527,9 @@ class InternalBrowser {
             })
                 .perform();
         }
-        else if (browserName == 'firefox' && browserVersion == '61') {
+        else if (browserName == 'firefox') {
             // NOTE Firefox for some reason moving by 0 x 0 move cursor in bottom left corner :sad:
+            // NOTE In recent versions (eg 128.0) moving by 0 x 0 doesn't work at all
             await this.#browser.actions().move({ origin: selenium_webdriver_1.Origin.VIEWPORT, x: 0, y: 1 }).perform();
         }
         else {
@@ -515,7 +541,7 @@ class InternalBrowser {
         const ignoreSelectors = Array.prototype.concat(ignoreElements).filter(Boolean);
         if (!ignoreSelectors.length)
             return null;
-        this.#logger.debug('Hiding ignored elements before capturing');
+        (0, logger_js_1.logger)().debug('Hiding ignored elements before capturing');
         return await this.#browser.executeScript(function (ignoreSelectors) {
             return window.__CREEVEY_INSERT_IGNORE_STYLES__(ignoreSelectors);
         }, ignoreSelectors);
@@ -576,7 +602,7 @@ class InternalBrowser {
     }
     async removeIgnoreStyles(ignoreStyles) {
         if (ignoreStyles) {
-            this.#logger.debug('Revert hiding ignored elements');
+            (0, logger_js_1.logger)().debug('Revert hiding ignored elements');
             await this.#browser.executeScript(function (ignoreStyles) {
                 window.__CREEVEY_REMOVE_IGNORE_STYLES__(ignoreStyles);
             }, ignoreStyles);
@@ -608,7 +634,7 @@ class InternalBrowser {
         this.#keepAliveInterval = setInterval(() => {
             // NOTE Simple way to keep session alive
             void this.#browser.getCurrentUrl().then((url) => {
-                logger_js_1.logger.debug('current url', chalk_1.default.magenta(url));
+                (0, logger_js_1.logger)().debug('current url', chalk_1.default.magenta(url));
             });
         }, 10 * 1000);
     }