creevey 0.10.0-beta.4 → 0.10.0-beta.6

package/src/server/master/runner.ts

@@ -13,12 +13,14 @@ import {
   TestMeta,
 } from '../../types.js';
 import Pool from './pool.js';
+import { WorkerQueue } from './queue.js';
 
 export default class Runner extends EventEmitter {
   private failFast: boolean;
   private screenDir: string;
   private reportDir: string;
   private browsers: string[];
+  private scheduler: WorkerQueue;
   private pools: Record<string, Pool> = {};
   tests: Partial<Record<string, ServerTest>> = {};
   public get isRunning(): boolean {
@@ -30,9 +32,10 @@ export default class Runner extends EventEmitter {
     this.failFast = config.failFast;
     this.screenDir = config.screenDir;
     this.reportDir = config.reportDir;
+    this.scheduler = new WorkerQueue(config.useWorkerQueue);
     this.browsers = Object.keys(config.browsers);
     this.browsers
-      .map((browser) => (this.pools[browser] = new Pool(config, browser, gridUrl)))
+      .map((browser) => (this.pools[browser] = new Pool(this.scheduler, config, browser, gridUrl)))
       .map((pool) => pool.on('test', this.handlePoolMessage));
   }
 

package/src/server/master/server.ts

@@ -96,7 +96,7 @@ export function start(reportDir: string, port: number, ui: boolean): (api: Creev
   app.use(mount('/report', serve(reportDir)));
 
   wss.on('error', (error) => {
-    logger.error(error);
+    logger().error(error);
   });
 
   server.listen(port);

package/src/server/master/start.ts

@@ -42,7 +42,10 @@ function outputUnnecessaryImages(imagesDir: string, images: Set<string>): void {
     .map((imagePath) => path.posix.relative(imagesDir, imagePath))
     .filter((imagePath) => !images.has(imagePath));
   if (unnecessaryImages.length > 0) {
-    logger.warn('We found unnecessary screenshot images, those can be safely removed:\n', unnecessaryImages.join('\n'));
+    logger().warn(
+      'We found unnecessary screenshot images, those can be safely removed:\n',
+      unnecessaryImages.join('\n'),
+    );
   }
 }
 
@@ -81,10 +84,10 @@ export async function start(
 
   if (options.ui) {
     resolveApi(creeveyApi(runner));
-    logger.info(`Started on http://localhost:${options.port}`);
+    logger().info(`Started on http://localhost:${options.port}`);
   } else {
     if (Object.values(runner.status.tests).filter((test) => test && !test.skip).length == 0) {
-      logger.warn("Don't have any tests to run");
+      logger().warn("Don't have any tests to run");
 
       void shutdownWorkers().then(() => process.exit());
       return;
@@ -101,7 +104,7 @@ export async function start(
       void sendScreenshotsCount(config, options, runner.status)
         .catch((reason: unknown) => {
           const error = reason instanceof Error ? (reason.stack ?? reason.message) : (reason as string);
-          logger.warn(`Can't send telemetry: ${error}`);
+          logger().warn(`Can't send telemetry: ${error}`);
         })
         .finally(() => {
           void shutdownWorkers().then(() => process.exit());

package/src/server/playwright/internal.ts

@@ -1,5 +1,4 @@
 import { Browser, BrowserType, Page, chromium, firefox, webkit } from 'playwright-core';
-import Logger from 'loglevel';
 import chalk from 'chalk';
 import { v4 } from 'uuid';
 import prefix from 'loglevel-plugin-prefix';
@@ -28,7 +27,7 @@ async function tryConnect(type: BrowserType, gridUrl: string): Promise<Browser |
       (resolve) =>
         (timeout = setTimeout(() => {
           isTimeout = true;
-          logger.error(`Can't connect to ${type.name()} playwright browser`, error);
+          logger().error(`Can't connect to ${type.name()} playwright browser`, error);
           resolve(null);
         }, 10000)),
     ),
@@ -57,13 +56,11 @@ export class InternalBrowser {
   #sessionId: string = v4();
   #serverHost: string | null = null;
   #serverPort: number;
-  #logger: Logger.Logger;
   #unsubscribe: () => void = noop;
   constructor(browser: Browser, page: Page, port: number) {
     this.#browser = browser;
     this.#page = page;
     this.#serverPort = port;
-    this.#logger = Logger.getLogger(this.#sessionId);
     this.#unsubscribe = subscribeOn('shutdown', () => {
       void this.closeBrowser();
     });
@@ -113,7 +110,7 @@ export class InternalBrowser {
     await this.updateBrowserGlobalVariables();
     await this.resetMousePosition();
 
-    this.#logger.debug(`Triggering 'SetCurrentStory' event with storyId ${chalk.magenta(id)}`);
+    logger().debug(`Triggering 'SetCurrentStory' event with storyId ${chalk.magenta(id)}`);
 
     const result = await this.#page.evaluate<
       [error?: string | null, isCaptureCalled?: boolean] | null,
@@ -198,13 +195,13 @@ export class InternalBrowser {
           break;
 
         default:
-          logger.error(
+          logger().error(
             `Unknown browser ${browserConfig.browserName}. Playwright supports browsers: chromium, firefox, webkit`,
           );
       }
     } else {
       if (browserConfig.browserName != 'chrome') {
-        logger.error("Playwright's Selenium Grid feature supports only chrome browser");
+        logger().error("Playwright's Selenium Grid feature supports only chrome browser");
         return null;
       }
 
@@ -242,7 +239,7 @@ export class InternalBrowser {
       const error = new Error(`Can't load storybook root page: ${message}`);
       if (originalError instanceof Error) error.stack = originalError.stack;
 
-      logger.error(error);
+      logger().error(error);
 
       return null;
     }
@@ -263,14 +260,13 @@ export class InternalBrowser {
   }) {
     const sessionId = this.#sessionId;
 
-    prefix.apply(this.#logger, {
+    prefix.apply(logger(), {
       format(level) {
         const levelColor = colors[level.toUpperCase() as keyof typeof colors];
-        return `[${browserName}:${chalk.gray(sessionId)}] ${levelColor(level)} =>`;
+        return `[${browserName}:${chalk.gray(process.pid)}] ${levelColor(level)} => ${chalk.gray(sessionId)}`;
       },
     });
 
-    this.#page.setDefaultNavigationTimeout(10000);
     this.#page.setDefaultTimeout(60000);
 
     return await runSequence(
@@ -294,29 +290,30 @@ export class InternalBrowser {
 
     try {
       if (resolver) {
-        this.#logger.debug('Resolving storybook url with custom resolver');
+        logger().debug('Resolving storybook url with custom resolver');
 
         const resolvedUrl = await resolver();
 
-        this.#logger.debug(`Resolver storybook url ${resolvedUrl}`);
+        logger().debug(`Resolver storybook url ${resolvedUrl}`);
 
         await this.#page.goto(appendIframePath(resolvedUrl));
       } else {
-        await resolveStorybookUrl(appendIframePath(storybookUrl), (url) => this.checkUrl(url), this.#logger);
+        // TODO this.#page.setDefaultNavigationTimeout(10000);
+        await resolveStorybookUrl(appendIframePath(storybookUrl), (url) => this.checkUrl(url));
       }
     } catch (error) {
-      this.#logger.error('Failed to resolve storybook URL', error instanceof Error ? error.message : '');
+      logger().error('Failed to resolve storybook URL', error instanceof Error ? error.message : '');
       throw error;
     }
   }
 
   private async checkUrl(url: string): Promise<boolean> {
     try {
-      this.#logger.debug(`Opening ${chalk.magenta(url)} and checking the page source`);
+      logger().debug(`Opening ${chalk.magenta(url)} and checking the page source`);
       const response = await this.#page.goto(url, { waitUntil: 'commit' });
       const source = await response?.text();
 
-      this.#logger.debug(`Checking ${chalk.cyan(`#${storybookRootID}`)} existence on ${chalk.magenta(url)}`);
+      logger().debug(`Checking ${chalk.cyan(`#${storybookRootID}`)} existence on ${chalk.magenta(url)}`);
       return source?.includes(`id="${storybookRootID}"`) ?? false;
     } catch {
       return false;
@@ -325,7 +322,7 @@ export class InternalBrowser {
 
   private async waitForStorybook(): Promise<void> {
     // TODO Duplicated code with selenium
-    this.#logger.debug('Waiting for `setStories` event to make sure that storybook is initiated');
+    logger().debug('Waiting for `setStories` event to make sure that storybook is initiated');
 
     const isTimeout = await Promise.race([
       new Promise<boolean>((resolve) => {
@@ -344,7 +341,7 @@ export class InternalBrowser {
               return false;
             }, StorybookEvents.SET_GLOBALS);
           } catch (e: unknown) {
-            this.#logger.debug('An error has been caught during the script:', e);
+            logger().debug('An error has been caught during the script:', e);
           }
         } while (wait);
         return false;
@@ -358,7 +355,7 @@ export class InternalBrowser {
   private async updateStorybookGlobals(globals?: StorybookGlobals): Promise<void> {
     if (!globals) return;
 
-    this.#logger.debug('Applying storybook globals');
+    logger().debug('Applying storybook globals');
     await this.#page.evaluate((globals: StorybookGlobals) => {
       window.__CREEVEY_UPDATE_GLOBALS__(globals);
     }, globals);

package/src/server/playwright/webdriver.ts

@@ -53,7 +53,7 @@ export class PlaywrightWebdriver extends CreeveyWebdriverBase {
       try {
         return await import('./internal.js');
       } catch (error) {
-        logger.error(error);
+        logger().error(error);
         return null;
       }
     })();

package/src/server/providers/browser.ts

@@ -17,7 +17,7 @@ export const loadStories: StoriesProvider = async (_config, storiesListener, web
           if (message.type == 'set') {
             const { stories, oldTests } = message.payload;
             if (oldTests.length > 0)
-              logger.warn(
+              logger().warn(
                 `If you use browser stories provider of CSFv3 Storybook feature\n` +
                   `Creevey will not load tests defined in story parameters from following stories:\n` +
                   oldTests.join('\n'),

package/src/server/providers/hybrid.ts

@@ -54,7 +54,7 @@ async function parseParams(
 
   if (listener) {
     chokidar.watch(testFiles).on('change', (filePath) => {
-      logger.debug(`changed: ${filePath}`);
+      logger().debug(`changed: ${filePath}`);
 
       // doesn't work, always returns {} due modules caching
       // see https://github.com/nodejs/modules/issues/307

package/src/server/reporter.ts

@@ -22,11 +22,11 @@ export class CreeveyReporter {
   // TODO Output in better way, like vitest, maybe
   constructor(runner: EventEmitter, options: { reporterOptions: { creevey: ReporterOptions } }) {
     const { sessionId, browserName } = options.reporterOptions.creevey;
-    const testLogger = Logger.getLogger(browserName);
+    const testLogger = Logger.getLogger(sessionId);
 
     prefix.apply(testLogger, {
       format(level) {
-        return `${testLevels[level]} => (${browserName}:${chalk.gray(sessionId)})`;
+        return `[${browserName}:${chalk.gray(process.pid)}] ${testLevels[level]} => ${chalk.gray(sessionId)}`;
       },
     });
 
@@ -39,6 +39,7 @@ export class CreeveyReporter {
     runner.on(TEST_EVENTS.TEST_FAIL, (test: FakeTest, error) => {
       testLogger.error(
         chalk.cyan(test.titlePath().join('/')),
+        chalk.gray(`(${test.duration} ms)`),
         '\n  ',
         this.getErrors(
           error,

package/src/server/selenium/internal.ts

@@ -94,21 +94,25 @@ async function openUrlAndWaitForPageSource(
 }
 
 async function buildWebdriver(
-  browserName: string,
+  browser: string,
   gridUrl: string,
   config: Config,
   options: Options,
 ): Promise<WebDriver | null> {
-  const browserConfig = config.browsers[browserName] as BrowserConfigObject;
-  const { /*customizeBuilder,*/ seleniumCapabilities } = browserConfig;
+  const browserConfig = config.browsers[browser] as BrowserConfigObject;
+  const { /*customizeBuilder,*/ seleniumCapabilities, browserName } = browserConfig;
 
   const url = new URL(gridUrl);
   url.username = url.username ? '********' : '';
   url.password = url.password ? '********' : '';
-  logger.debug(`(${browserName}) Connecting to Selenium ${chalk.magenta(url.toString())}`);
+  logger().debug(`Connecting to Selenium ${chalk.magenta(url.toString())}`);
 
   // TODO Define some capabilities explicitly and define typings
-  const capabilities = new Capabilities({ ...seleniumCapabilities, pageLoadStrategy: PageLoadStrategy.EAGER });
+  const capabilities = new Capabilities({
+    browserName,
+    ...seleniumCapabilities,
+    pageLoadStrategy: PageLoadStrategy.EAGER,
+  });
   const prefs = new logging.Preferences();
 
   if (options.trace) {
@@ -121,37 +125,65 @@ async function buildWebdriver(
   // TODO Validate browsers, versions, and platform
   // TODO Use `customizeBuilder`
 
-  let browser: WebDriver;
+  let webdriver: WebDriver | null;
 
   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 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<null>((resolve) => {
+          setTimeout(() => {
+            retries += 1;
+            resolve(null);
+          }, 120_000);
+        }),
+        (async () => {
+          if (retries > 0) {
+            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 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.error(`(${browserName}) Failed to start browser:`, error);
+    logger().error(`Failed to start browser:`, error);
     return null;
   }
 
-  return browser;
+  return webdriver;
 }
 
 export class InternalBrowser {
@@ -159,13 +191,11 @@ export class InternalBrowser {
   #browser: WebDriver;
   #serverHost: string | null = null;
   #serverPort: number;
-  #logger: Logger.Logger;
   #unsubscribe: () => void = noop;
   #keepAliveInterval: NodeJS.Timeout | null = null;
-  constructor(browser: WebDriver, port: number, logger: Logger.Logger) {
+  constructor(browser: WebDriver, port: number) {
     this.#browser = browser;
     this.#serverPort = port;
-    this.#logger = logger;
     this.#unsubscribe = subscribeOn('shutdown', () => {
       void this.closeBrowser();
     });
@@ -194,7 +224,7 @@ export class InternalBrowser {
 
     const ignoreStyles = await this.insertIgnoreStyles(ignoreElements);
 
-    if (this.#logger.getLevel() <= Logger.levels.DEBUG) {
+    if (logger().getLevel() <= Logger.levels.DEBUG) {
       const { innerWidth, innerHeight } = await this.#browser.executeScript<{
         innerWidth: number;
         innerHeight: number;
@@ -204,16 +234,16 @@ export class InternalBrowser {
           innerHeight: window.innerHeight,
         };
       });
-      this.#logger.debug(`Viewport size is: ${innerWidth}x${innerHeight}`);
+      logger().debug(`Viewport size is: ${innerWidth}x${innerHeight}`);
     }
 
     try {
       if (!captureElement) {
-        this.#logger.debug('Capturing viewport screenshot');
+        logger().debug('Capturing viewport screenshot');
         screenshot = await this.#browser.takeScreenshot();
-        this.#logger.debug('Viewport screenshot is captured');
+        logger().debug('Viewport screenshot is captured');
       } else {
-        this.#logger.debug(`Checking is element ${chalk.cyan(captureElement)} fit into viewport`);
+        logger().debug(`Checking is element ${chalk.cyan(captureElement)} fit into viewport`);
         const rects = await this.#browser.executeScript<
           { elementRect: ElementRect; windowRect: ElementRect } | undefined
         >(function (selector: string): { elementRect: ElementRect; windowRect: ElementRect } | undefined {
@@ -252,11 +282,11 @@ export class InternalBrowser {
           elementRect.height + elementRect.top <= windowRect.height;
 
         if (isFitIntoViewport) {
-          this.#logger.debug(
+          logger().debug(
             `Capturing ${chalk.cyan(captureElement)} with size: ${elementRect.width}x${elementRect.height}`,
           );
         } else
-          this.#logger.debug(
+          logger().debug(
             `Capturing composite screenshot image of ${chalk.cyan(captureElement)} with size: ${elementRect.width}x${elementRect.height}`,
           );
 
@@ -272,7 +302,7 @@ export class InternalBrowser {
           : // TODO pointer-events: none, need to research
             await this.takeCompositeScreenshot(windowRect, elementRect);
 
-        this.#logger.debug(`${chalk.cyan(captureElement)} is captured`);
+        logger().debug(`${chalk.cyan(captureElement)} is captured`);
       }
     } finally {
       await this.removeIgnoreStyles(ignoreStyles);
@@ -294,7 +324,7 @@ export class InternalBrowser {
     await this.updateBrowserGlobalVariables();
     await this.resetMousePosition();
 
-    this.#logger.debug(`Triggering 'SetCurrentStory' event with storyId ${chalk.magenta(id)}`);
+    logger().debug(`Triggering 'SetCurrentStory' event with storyId ${chalk.magenta(id)}`);
 
     const result = await this.#browser.executeAsyncScript<[error?: string | null, isCaptureCalled?: boolean] | null>(
       function (
@@ -356,14 +386,14 @@ export class InternalBrowser {
   }
 
   async afterTest(test: ServerTest): Promise<void> {
-    if (this.#logger.getLevel() === Logger.levels.TRACE) {
+    if (logger().getLevel() === Logger.levels.TRACE) {
       const output: string[] = [];
       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(
+      logger().debug(
         '----------',
         getTestPath(test).join('/'),
         '----------\n',
@@ -387,7 +417,7 @@ export class InternalBrowser {
 
     if (!browser) return null;
 
-    const internalBrowser = new InternalBrowser(browser, options.port, logger);
+    const internalBrowser = new InternalBrowser(browser, options.port);
 
     try {
       if (isShuttingDown.current) return null;
@@ -405,11 +435,12 @@ export class InternalBrowser {
     } catch (originalError) {
       void internalBrowser.closeBrowser();
 
-      const message = originalError instanceof Error ? originalError.message : (originalError as string);
-      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') as string);
+      const error = new Error(`Can't load storybook root page: ${message}`);
       if (originalError instanceof Error) error.stack = originalError.stack;
 
-      logger.error(error);
+      logger().error(error);
 
       return null;
     }
@@ -440,20 +471,18 @@ export class InternalBrowser {
       /* noop */
     }
 
-    this.#logger = Logger.getLogger(sessionId);
-
-    prefix.apply(this.#logger, {
+    prefix.apply(logger(), {
       format(level) {
         const levelColor = colors[level.toUpperCase() as keyof typeof colors];
-        return `[${browserName}:${chalk.gray(sessionId)}] ${levelColor(level)} =>`;
+        return `[${browserName}:${chalk.gray(process.pid)}] ${levelColor(level)} => ${chalk.gray(sessionId)}`;
       },
     });
 
-    this.#logger.debug(`Connected successful with ${chalk.green(browserHost)}`);
+    logger().debug(`Connected successful with ${chalk.green(browserHost)}`);
 
     return await 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),
@@ -478,19 +507,20 @@ export class InternalBrowser {
 
     try {
       if (resolver) {
-        this.#logger.debug('Resolving storybook url with custom resolver');
+        logger().debug('Resolving storybook url with custom resolver');
 
         const resolvedUrl = await resolver();
 
-        this.#logger.debug(`Resolver storybook url ${resolvedUrl}`);
+        logger().debug(`Resolver storybook url ${resolvedUrl}`);
 
         await this.#browser.get(appendIframePath(resolvedUrl));
       } else {
+        // TODO Pageload timeout 10s
         // NOTE: getUrlChecker already calls `browser.get` so we don't need another one
-        await resolveStorybookUrl(appendIframePath(storybookUrl), (url) => this.checkUrl(url), this.#logger);
+        await resolveStorybookUrl(appendIframePath(storybookUrl), (url) => this.checkUrl(url));
       }
     } catch (error) {
-      this.#logger.error('Failed to resolve storybook URL', error instanceof Error ? error.message : '');
+      logger().error('Failed to resolve storybook URL', error instanceof Error ? error.message : '');
       throw error;
     }
   }
@@ -498,13 +528,13 @@ export class InternalBrowser {
   private async checkUrl(url: string): Promise<boolean> {
     try {
       // NOTE: Before trying a new url, reset the current one
-      this.#logger.debug(`Opening ${chalk.magenta('about:blank')} page`);
+      logger().debug(`Opening ${chalk.magenta('about:blank')} page`);
       await openUrlAndWaitForPageSource(
         this.#browser,
         'about:blank',
         (source: string) => !source.includes('<body></body>'),
       );
-      this.#logger.debug(`Opening ${chalk.magenta(url)} and checking the page source`);
+      logger().debug(`Opening ${chalk.magenta(url)} and checking the page source`);
       const source = await openUrlAndWaitForPageSource(
         this.#browser,
         url,
@@ -516,7 +546,7 @@ export 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.cyan(`#${storybookRootID}`)} existence on ${chalk.magenta(url)}`);
+      logger().debug(`Checking ${chalk.cyan(`#${storybookRootID}`)} existence on ${chalk.magenta(url)}`);
       return source.includes(`id="${storybookRootID}"`);
     } catch {
       return false;
@@ -524,7 +554,7 @@ export class InternalBrowser {
   }
 
   private async waitForStorybook(): Promise<void> {
-    this.#logger.debug('Waiting for `setStories` event to make sure that storybook is initiated');
+    logger().debug('Waiting for `setStories` event to make sure that storybook is initiated');
 
     const isTimeout = await Promise.race([
       new Promise<boolean>((resolve) => {
@@ -535,19 +565,15 @@ export class InternalBrowser {
       (async () => {
         let wait = true;
         do {
-          try {
-            // TODO Research a different way to ensure storybook is initiated
-            wait = await this.#browser.executeScript<boolean>(function (SET_GLOBALS: string): boolean {
-              // 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;
-            }, StorybookEvents.SET_GLOBALS);
-          } catch (e: unknown) {
-            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<boolean>(function (SET_GLOBALS: string): boolean {
+            // 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;
+          }, StorybookEvents.SET_GLOBALS);
         } while (wait);
         return false;
       })(),
@@ -560,7 +586,7 @@ export class InternalBrowser {
   private async updateStorybookGlobals(globals?: StorybookGlobals): Promise<void> {
     if (!globals) return;
 
-    this.#logger.debug('Applying storybook globals');
+    logger().debug('Applying storybook globals');
     await this.#browser.executeScript(function (globals: StorybookGlobals) {
       window.__CREEVEY_UPDATE_GLOBALS__(globals);
     }, globals);
@@ -630,7 +656,7 @@ export class InternalBrowser {
       },
     );
 
-    this.#logger.debug(`Resizing viewport from ${innerWidth}x${innerHeight} to ${viewport.width}x${viewport.height}`);
+    logger().debug(`Resizing viewport from ${innerWidth}x${innerHeight} to ${viewport.width}x${viewport.height}`);
 
     const dWidth = windowRect.width - innerWidth;
     const dHeight = windowRect.height - innerHeight;
@@ -644,7 +670,7 @@ export class InternalBrowser {
   }
 
   private async resetMousePosition(): Promise<void> {
-    this.#logger.debug('Resetting mouse position to the top-left corner');
+    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('.') ??
@@ -685,7 +711,7 @@ export class InternalBrowser {
     const ignoreSelectors = Array.prototype.concat(ignoreElements).filter(Boolean);
     if (!ignoreSelectors.length) return null;
 
-    this.#logger.debug('Hiding ignored elements before capturing');
+    logger().debug('Hiding ignored elements before capturing');
 
     return await this.#browser.executeScript(function (ignoreSelectors: string[]) {
       return window.__CREEVEY_INSERT_IGNORE_STYLES__(ignoreSelectors);
@@ -766,7 +792,7 @@ export class InternalBrowser {
 
   private async removeIgnoreStyles(ignoreStyles: WebElement | null): Promise<void> {
     if (ignoreStyles) {
-      this.#logger.debug('Revert hiding ignored elements');
+      logger().debug('Revert hiding ignored elements');
       await this.#browser.executeScript(function (ignoreStyles: HTMLStyleElement) {
         window.__CREEVEY_REMOVE_IGNORE_STYLES__(ignoreStyles);
       }, ignoreStyles);
@@ -805,7 +831,7 @@ export class InternalBrowser {
     this.#keepAliveInterval = setInterval(() => {
       // NOTE Simple way to keep session alive
       void this.#browser.getCurrentUrl().then((url) => {
-        logger.debug('current url', chalk.magenta(url));
+        logger().debug('current url', chalk.magenta(url));
       });
     }, 10 * 1000);
   }