creevey 0.10.0-beta.31 → 0.10.0-beta.32

package/src/server/docker.ts

@@ -5,6 +5,7 @@ import Dockerode, { Container } from 'dockerode';
 import { DockerAuth } from '../types.js';
 import { subscribeOn } from './messages.js';
 import { logger } from './logger.js';
+import { waitForBrowserClose } from './webdriver.js';
 
 const docker = new Dockerode();
 
@@ -58,12 +59,13 @@ export async function pullImages(
   }
 }
 
-export async function buildImage(imageName: string, dockerfile: string): Promise<void> {
+export async function buildImage(imageName: string, version: string, dockerfile: string): Promise<void> {
   const images = await docker.listImages({ filters: { label: [`creevey=${imageName}`] } });
 
-  if (images.at(0)) {
+  const containers = await docker.listContainers({ all: true, filters: { label: [`creevey=${imageName}`] } });
+  if (containers.length > 0) {
     await Promise.all(
-      (await docker.listContainers({ all: true, filters: { label: [`creevey=${imageName}`] } })).map(async (info) => {
+      containers.map(async (info) => {
         const container = docker.getContainer(info.Id);
         try {
           await container.remove({ force: true });
@@ -72,6 +74,23 @@ export async function buildImage(imageName: string, dockerfile: string): Promise
         }
       }),
     );
+  }
+
+  const oldImages = images.filter((info) => info.Labels.version !== version);
+  if (oldImages.length > 0) {
+    await Promise.all(
+      oldImages.map(async (info) => {
+        const image = docker.getImage(info.Id);
+        try {
+          await image.remove({ force: true });
+        } catch {
+          /* noop */
+        }
+      }),
+    );
+  }
+
+  if (oldImages.length !== images.length) {
     logger().info(`Image ${imageName} already exists`);
     return;
   }
@@ -91,7 +110,7 @@ export async function buildImage(imageName: string, dockerfile: string): Promise
       // @ts-expect-error Type incompatibility AsyncIterator and AsyncIterableIterator
       pack,
       // TODO Support buildkit decode grpc (version: '2')
-      { t: imageName, labels: { creevey: imageName }, version: '1' },
+      { t: imageName, labels: { creevey: imageName, version }, version: '1' },
       (buildError: Error | null, stream) => {
         if (buildError || !stream) {
           // spinner.error(buildError?.message);
@@ -151,6 +170,7 @@ export async function runImage(
       // eslint-disable-next-line @typescript-eslint/no-misused-promises
       subscribeOn('shutdown', async () => {
         try {
+          await Promise.race([waitForBrowserClose(), new Promise((resolve) => setTimeout(resolve, 2_000))]);
           await container.remove({ force: true });
         } catch {
           /* noop */

package/src/server/index.ts

@@ -6,13 +6,13 @@ import { resolveCommand } from 'package-manager-detector/commands';
 import { readConfig, defaultBrowser } from './config.js';
 import { Options, Config, BrowserConfigObject, isWorkerMessage } from '../types.js';
 import { logger } from './logger.js';
+import { getStorybookUrl, checkIsStorybookConnected } from './connection.js';
 import { SeleniumWebdriver } from './selenium/webdriver.js';
 import { LOCALHOST_REGEXP } from './webdriver.js';
 import { isInsideDocker, killTree, resolvePlaywrightBrowserType, shutdownWithError } from './utils.js';
 import { sendWorkerMessage, subscribeOn } from './messages.js';
 import { buildImage } from './docker.js';
 import { mkdir, writeFile } from 'fs/promises';
-import { getStorybookUrl, checkIsStorybookConnected } from './connection.js';
 import assert from 'assert';
 
 async function startWebdriverServer(browser: string, config: Config, options: Options): Promise<string | undefined> {
@@ -35,7 +35,7 @@ async function startWebdriverServer(browser: string, config: Config, options: Op
       if (cluster.isPrimary) return undefined;
 
       const { browserName } = config.browsers[browser] as BrowserConfigObject;
-      return `creevey://${resolvePlaywrightBrowserType(browserName)}.playwright`;
+      return `creevey://${resolvePlaywrightBrowserType(browserName)}`;
     }
 
     const {
@@ -48,24 +48,21 @@ async function startWebdriverServer(browser: string, config: Config, options: Op
       const { browserName } = config.browsers[browser] as BrowserConfigObject;
 
       const imageName = `creevey/${browserName}:v${version}`;
-      const host = await startPlaywrightContainer(imageName, options.debug);
+      const host = await startPlaywrightContainer(imageName, browser, config, options.debug);
 
       return host;
     } else {
       const { playwrightDockerFile } = await import('./playwright/docker-file.js');
-      const browsers = [
-        ...new Set(
-          Object.values(config.browsers).map(
-            (c) => [(c as BrowserConfigObject).browserName, (c as BrowserConfigObject).playwrightOptions] as const,
-          ),
-        ),
-      ];
+      const {
+        default: { version: creeveyVersion },
+      } = await import('../../package.json', { with: { type: 'json' } });
+      const browsers = [...new Set(Object.values(config.browsers).map((c) => (c as BrowserConfigObject).browserName))];
       await Promise.all(
-        browsers.map(async ([browserName, launchOptions]) => {
+        browsers.map(async (browserName) => {
           const imageName = `creevey/${browserName}:v${version}`;
-          const dockerfile = playwrightDockerFile(browserName, version, launchOptions);
+          const dockerfile = await playwrightDockerFile(browserName, version);
 
-          await buildImage(imageName, dockerfile);
+          await buildImage(imageName, creeveyVersion, dockerfile);
         }),
       );
 
@@ -107,7 +104,7 @@ export default async function (options: Options): Promise<void> {
     gridUrl = await startWebdriverServer(browser, config, options);
   }
 
-  if (cluster.isPrimary) {
+  if (cluster.isPrimary && process.env.CI !== 'true') {
     const [localUrl, remoteUrl] = getStorybookUrl(config, options);
     const pm = getUserAgent();
     assert(pm, new Error('Failed to detect current package manager'));

package/src/server/master/start.ts

@@ -109,7 +109,7 @@ export async function start(
         })
         .finally(() => {
           // NOTE: Take some time to kill processes
-          void shutdownWorkers().then(() => setTimeout(() => process.exit(), 500));
+          void shutdownWorkers().then(() => setTimeout(() => process.exit(), 1_000));
         });
     });
     // TODO grep

package/src/server/playwright/docker-file.ts

@@ -1,10 +1,12 @@
+import { readFile } from 'fs/promises';
+import { pathToFileURL } from 'url';
 import semver from 'semver';
 import { exec } from 'shelljs';
-import { LaunchOptions } from 'playwright-core';
-import { resolvePlaywrightBrowserType } from '../utils';
+
+const importMetaUrl = pathToFileURL(__filename).href;
 
 // TODO Support custom docker images
-export function playwrightDockerFile(browser: string, version: string, serverOptions?: LaunchOptions): string {
+export async function playwrightDockerFile(browser: string, version: string): Promise<string> {
   const sv = semver.coerce(version);
 
   let npmRegistry;
@@ -14,14 +16,19 @@ export function playwrightDockerFile(browser: string, version: string, serverOpt
     /* noop */
   }
 
+  const indexJs = await readFile(new URL('./index-source.mjs', importMetaUrl), 'utf-8');
+
   return `
 FROM node:lts
 
 WORKDIR /creevey
 
 RUN echo "{ \\"type\\": \\"module\\" }" > package.json && \\
-    echo "import { ${resolvePlaywrightBrowserType(browser)} as browser } from 'playwright-core';" >> index.js && \\
-    echo "const ws = await browser.launchServer({ ...${JSON.stringify(serverOptions)}, port: 4444, wsPath: 'creevey' })" >> index.js && \\${
+    ${indexJs
+      .split('\n')
+      .map((line) => `echo "${line.replace(/"/g, '\\"')}" >> index.js && \\`)
+      .join('\n')}
+    ${
       npmRegistry
         ? `
     echo "registry=${npmRegistry}" > .npmrc && \\`

package/src/server/playwright/docker.ts

@@ -1,9 +1,17 @@
+import assert from 'assert';
 import { runImage } from '../docker';
 import { emitWorkerMessage, subscribeOn } from '../messages';
-import { isInsideDocker } from '../utils';
+import { getCreeveyCache, isInsideDocker, resolvePlaywrightBrowserType } from '../utils';
 import { LOCALHOST_REGEXP } from '../webdriver';
+import type { BrowserConfigObject, Config } from '../../types';
 
-export async function startPlaywrightContainer(imageName: string, debug: boolean): Promise<string> {
+export async function startPlaywrightContainer(
+  imageName: string,
+  browser: string,
+  config: Config,
+  debug: boolean,
+): Promise<string> {
+  const { browserName, playwrightOptions } = config.browsers[browser] as BrowserConfigObject;
   const port = await new Promise<number>((resolve) => {
     subscribeOn('worker', (message) => {
       if (message.type == 'port') {
@@ -13,13 +21,18 @@ export async function startPlaywrightContainer(imageName: string, debug: boolean
     emitWorkerMessage({ type: 'port', payload: { port: -1 } });
   });
 
+  const cacheDir = await getCreeveyCache();
+
+  assert(cacheDir, "Couldn't get cache directory");
+
   const host = await runImage(
     imageName,
-    [],
+    [JSON.stringify({ ...playwrightOptions, browser: resolvePlaywrightBrowserType(browserName) })],
     {
       ExposedPorts: { [`${port}/tcp`]: {} },
       HostConfig: {
         PortBindings: { ['4444/tcp']: [{ HostPort: `${port}` }] },
+        Binds: [`${cacheDir}/${process.pid}:/creevey/traces`],
       },
     },
     debug,

package/src/server/playwright/index-source.mjs

@@ -0,0 +1,16 @@
+import { chromium, firefox, webkit } from 'playwright-core';
+
+/** @type import("playwright-core").LaunchOptions & { browser: 'chromium' | 'firefox' | 'webkit' } */
+// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+const config = JSON.parse(process.argv.slice(2)[0]);
+
+const browsers = { chromium, firefox, webkit };
+
+const ws = await browsers[config.browser].launchServer({
+  ...config,
+  port: 4444,
+  wsPath: 'creevey',
+  tracesDir: 'traces',
+});
+
+console.log(config.browser, 'browser server launched on:', ws.wsEndpoint());

package/src/server/playwright/internal.ts

@@ -1,8 +1,10 @@
-import { Browser, BrowserType, Page, chromium, firefox, webkit } from 'playwright-core';
+import path from 'path';
+import { Browser, BrowserContext, BrowserType, Page, chromium, firefox, webkit } from 'playwright-core';
 import chalk from 'chalk';
 import { v4 } from 'uuid';
 import Logger from 'loglevel';
 import prefix from 'loglevel-plugin-prefix';
+import type { Args } from '@storybook/csf';
 import {
   BrowserConfigObject,
   Config,
@@ -11,13 +13,18 @@ import {
   StoryInput,
   StorybookEvents,
   StorybookGlobals,
-  noop,
 } from '../../types';
-import { subscribeOn } from '../messages';
-import { appendIframePath, getAddresses, LOCALHOST_REGEXP, resolveStorybookUrl, storybookRootID } from '../webdriver';
-import { isShuttingDown, resolvePlaywrightBrowserType, runSequence } from '../utils';
+import {
+  appendIframePath,
+  getAddresses,
+  LOCALHOST_REGEXP,
+  openBrowser,
+  resolveStorybookUrl,
+  storybookRootID,
+} from '../webdriver';
+import { getCreeveyCache, isShuttingDown, resolvePlaywrightBrowserType, runSequence } from '../utils';
 import { colors, logger } from '../logger';
-import type { Args } from '@storybook/csf';
+import assert from 'assert';
 
 const browsers = {
   chromium,
@@ -59,22 +66,34 @@ async function tryConnect(type: BrowserType, gridUrl: string): Promise<Browser |
 export class InternalBrowser {
   #isShuttingDown = false;
   #browser: Browser;
+  #context: BrowserContext;
   #page: Page;
+  #traceDir: string;
   #sessionId: string = v4();
   #serverHost: string | null = null;
   #serverPort: number;
+  #debug: boolean;
   #storybookGlobals?: StorybookGlobals;
-  #unsubscribe: () => void = noop;
-  constructor(browser: Browser, page: Page, port: number, storybookGlobals?: StorybookGlobals) {
+  #closeBrowser = openBrowser();
+  constructor(
+    browser: Browser,
+    context: BrowserContext,
+    page: Page,
+    traceDir: string,
+    port: number,
+    debug: boolean,
+    storybookGlobals?: StorybookGlobals,
+  ) {
     this.#browser = browser;
+    this.#context = context;
     this.#page = page;
+    this.#traceDir = traceDir;
     this.#serverPort = port;
+    this.#debug = debug;
     this.#storybookGlobals = storybookGlobals;
-    this.#unsubscribe = subscribeOn('shutdown', () => {
-      void this.closeBrowser();
-    });
   }
 
+  // TODO Expose #browser and #context in tests
   get browser() {
     return this.#page;
   }
@@ -87,19 +106,21 @@ export class InternalBrowser {
     if (this.#isShuttingDown) return;
 
     this.#isShuttingDown = true;
-    this.#unsubscribe();
 
     try {
+      if (this.#debug) await this.#context.tracing.stop({ path: path.join(this.#traceDir, 'trace.zip') });
       await this.#page.close();
+      if (this.#debug) await this.#page.video()?.saveAs(path.join(this.#traceDir, 'video.webm'));
+      await this.#context.close();
       await this.#browser.close();
-    } catch (_) {
+    } catch {
       /* noop */
+    } finally {
+      this.#closeBrowser();
     }
   }
 
   async takeScreenshot(captureElement?: string | null, ignoreElements?: string | string[] | null): Promise<Buffer> {
-    // TODO Implement features from selenium `takeScreenshot`
-    // TODO Do we need scroll bar hack from selenium?
     const ignore = Array.isArray(ignoreElements) ? ignoreElements : ignoreElements ? [ignoreElements] : [];
     const mask = ignore.map((el) => this.#page.locator(el));
     if (captureElement) {
@@ -186,14 +207,24 @@ export class InternalBrowser {
       seleniumCapabilities,
       playwrightOptions,
     } = browserConfig;
+    const parsedUrl = new URL(gridUrl);
+    const tracesDir = path.join(
+      playwrightOptions?.tracesDir ?? path.join(config.reportDir, 'traces'),
+      process.pid.toString(),
+    );
+    const cacheDir = await getCreeveyCache();
+
+    assert(cacheDir, "Couldn't get cache directory");
 
     let browser: Browser | null = null;
 
-    const parsedUrl = new URL(gridUrl);
     if (parsedUrl.protocol === 'ws:') {
       browser = await tryConnect(browsers[resolvePlaywrightBrowserType(browserConfig.browserName)], gridUrl);
     } else if (parsedUrl.protocol === 'creevey:') {
-      browser = await browsers[resolvePlaywrightBrowserType(browserConfig.browserName)].launch(playwrightOptions);
+      browser = await browsers[resolvePlaywrightBrowserType(browserConfig.browserName)].launch({
+        ...playwrightOptions,
+        tracesDir: path.join(cacheDir, `${process.pid}`),
+      });
     } else {
       if (browserConfig.browserName !== 'chrome') {
         logger().error("Playwright's Selenium Grid feature supports only chrome browser");
@@ -203,20 +234,29 @@ export class InternalBrowser {
       process.env.SELENIUM_REMOTE_URL = gridUrl;
       process.env.SELENIUM_REMOTE_CAPABILITIES = JSON.stringify(seleniumCapabilities);
 
-      browser = await chromium.launch(playwrightOptions);
+      browser = await chromium.launch({ ...playwrightOptions, tracesDir: path.join(cacheDir, `${process.pid}`) });
     }
 
     if (!browser) {
       return null;
     }
 
-    // TODO Record video
-    const page = await browser.newPage();
-    // TODO Support tracing
-    // if (playwrightOptions?.trace) {
-    //   const context = page.context();
-    //   await context.tracing.start(playwrightOptions.trace);
-    // }
+    const context = await browser.newContext({
+      recordVideo: options.debug
+        ? {
+            dir: path.join(cacheDir, `${process.pid}`),
+            size: viewport,
+          }
+        : undefined,
+      screen: viewport,
+      viewport,
+    });
+    const page = await context.newPage();
+    if (options.debug) {
+      await context.tracing.start(
+        Object.assign({ screenshots: true, snapshots: true, sources: true }, playwrightOptions?.trace),
+      );
+    }
 
     if (logger().getLevel() <= Logger.levels.DEBUG) {
       page.on('console', (msg) => {
@@ -224,15 +264,20 @@ export class InternalBrowser {
       });
     }
 
-    // TODO Add debug output
-
-    const internalBrowser = new InternalBrowser(browser, page, options.port, _storybookGlobals);
+    const internalBrowser = new InternalBrowser(
+      browser,
+      context,
+      page,
+      tracesDir,
+      options.port,
+      options.debug,
+      _storybookGlobals,
+    );
 
     try {
       if (isShuttingDown.current) return null;
       const done = await internalBrowser.init({
         browserName,
-        viewport,
         storybookUrl: address,
       });
 
@@ -250,15 +295,7 @@ export class InternalBrowser {
     }
   }
 
-  private async init({
-    browserName,
-    viewport,
-    storybookUrl,
-  }: {
-    browserName: string;
-    viewport?: { width: number; height: number };
-    storybookUrl: string;
-  }) {
+  private async init({ browserName, storybookUrl }: { browserName: string; storybookUrl: string }) {
     const sessionId = this.#sessionId;
 
     prefix.apply(logger(), {
@@ -278,7 +315,6 @@ export class InternalBrowser {
         () => this.updateStorybookGlobals(),
         () => this.resolveCreeveyHost(),
         () => this.updateBrowserGlobalVariables(),
-        () => this.resizeViewport(viewport),
       ],
       () => !this.#isShuttingDown,
     );
@@ -291,7 +327,6 @@ export class InternalBrowser {
     }
 
     try {
-      // TODO this.#page.setDefaultNavigationTimeout(10000);
       const resolvedUrl = await resolveStorybookUrl(appendIframePath(storybookUrl), (url) => this.checkUrl(url));
       await this.#page.goto(resolvedUrl);
     } catch (error) {
@@ -317,8 +352,7 @@ export class InternalBrowser {
   }
 
   private async waitForStorybook(): Promise<void> {
-    // TODO Duplicated code with selenium
-    logger().debug('Waiting for `setStories` event to make sure that storybook is initiated');
+    logger().debug('Waiting for Storybook to initiate');
 
     const isTimeout = await Promise.race([
       new Promise<boolean>((resolve) => {
@@ -331,7 +365,6 @@ export class InternalBrowser {
         do {
           try {
             // TODO Research a different way to ensure storybook is initiated
-            // TODO Maybe use `__STORYBOOK_PREVIEW__.extract()`
             wait = await this.#page.evaluate((SET_GLOBALS: string) => {
               if (typeof window.__STORYBOOK_ADDONS_CHANNEL__ == 'undefined') return true;
               if (window.__STORYBOOK_ADDONS_CHANNEL__.last(SET_GLOBALS) == undefined) return true;
@@ -347,10 +380,10 @@ export class InternalBrowser {
       })(),
     ]);
 
-    // TODO Change the message to describe a reason why it might happen
-    if (isTimeout) throw new Error('Failed to wait `setStories` event');
+    if (isTimeout) throw new Error('Failed to wait Storybook init');
   }
 
+  // TODO Doesn't work for some reason, maybe because of race-condition
   private async triggerViteReload(): Promise<void> {
     // NOTE: On the first load, Vite might try to optimize some dependencies and reload the page
     // We need to trigger reload earlier to avoid unnecessary reloads further
@@ -410,13 +443,6 @@ export class InternalBrowser {
     );
   }
 
-  private async resizeViewport(viewport?: { width: number; height: number }): Promise<void> {
-    if (!viewport) return;
-
-    logger().debug('Resizing viewport to', viewport);
-    await this.#page.setViewportSize(viewport);
-  }
-
   private async resetMousePosition(): Promise<void> {
     logger().debug('Resetting mouse position to (0, 0)');
     await this.#page.mouse.move(0, 0);

package/src/server/playwright/webdriver.ts

@@ -21,7 +21,7 @@ export class PlaywrightWebdriver extends CreeveyWebdriverBase {
     this.#options = options;
 
     subscribeOn('shutdown', () => {
-      void this.#browser?.closeBrowser().finally(() => process.exit());
+      void this.#browser?.closeBrowser().finally(() => setTimeout(() => process.exit(), 5_000));
       this.#browser = null;
     });
   }
@@ -32,7 +32,6 @@ export class PlaywrightWebdriver extends CreeveyWebdriverBase {
 
   getSessionId(): Promise<string> {
     if (!this.#browser) {
-      // TODO Describe the error
       throw new Error('Browser is not initialized');
     }
 
@@ -79,7 +78,6 @@ export class PlaywrightWebdriver extends CreeveyWebdriverBase {
 
   async loadStoriesFromBrowser(): Promise<StoriesRaw> {
     if (!this.#browser) {
-      // TODO Describe the error
       throw new Error('Browser is not initialized');
     }
 
@@ -95,7 +93,6 @@ export class PlaywrightWebdriver extends CreeveyWebdriverBase {
     ignoreElements?: string | string[] | null,
   ): Promise<Buffer> {
     if (!this.#browser) {
-      // TODO Describe the error
       throw new Error('Browser is not initialized');
     }
 
@@ -104,7 +101,6 @@ export class PlaywrightWebdriver extends CreeveyWebdriverBase {
 
   protected waitForComplete(callback: (isCompleted: boolean) => void): void {
     if (!this.#browser) {
-      // TODO Describe the error
       throw new Error('Browser is not initialized');
     }
 
@@ -113,7 +109,6 @@ export class PlaywrightWebdriver extends CreeveyWebdriverBase {
 
   protected async selectStory(id: string, waitForReady?: boolean): Promise<boolean> {
     if (!this.#browser) {
-      // TODO Describe the error
       throw new Error('Browser is not initialized');
     }
 
@@ -122,7 +117,6 @@ export class PlaywrightWebdriver extends CreeveyWebdriverBase {
 
   protected async updateStoryArgs(story: StoryInput, updatedArgs: Args): Promise<void> {
     if (!this.#browser) {
-      // TODO Describe the error
       throw new Error('Browser is not initialized');
     }
 

package/src/server/selenium/internal.ts

@@ -249,7 +249,7 @@ export class InternalBrowser {
         const rects = await this.#browser.executeScript<
           { elementRect: ElementRect; windowRect: ElementRect } | undefined
         >(function (selector: string): { elementRect: ElementRect; windowRect: ElementRect } | undefined {
-          window.scrollTo(0, 0); // TODO Maybe we should remove same code from `resetMousePosition`
+          window.scrollTo(0, 0);
           // eslint-disable-next-line no-var
           var element = document.querySelector(selector);
           if (!element) return;
@@ -297,12 +297,10 @@ export class InternalBrowser {
         //   ? context
         //     ? await context.captureElementScreenshot(await element.getId())
         //     : await browser.findElement(By.css(captureElement)).takeScreenshot()
-        //   : // TODO pointer-events: none, need to research
-        //     await takeCompositeScreenshot(browser, windowRect, elementRect);
+        //   : await takeCompositeScreenshot(browser, windowRect, elementRect);
         screenshot = isFitIntoViewport
           ? await this.#browser.findElement(By.css(captureElement)).takeScreenshot()
-          : // TODO pointer-events: none, need to research
-            await this.takeCompositeScreenshot(windowRect, elementRect);
+          : await this.takeCompositeScreenshot(windowRect, elementRect);
 
         logger().debug(`${chalk.cyan(captureElement)} is captured`);
       }
@@ -503,7 +501,6 @@ export class InternalBrowser {
     }
 
     try {
-      // 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));
     } catch (error) {
@@ -541,7 +538,7 @@ export class InternalBrowser {
   }
 
   private async waitForStorybook(): Promise<void> {
-    logger().debug('Waiting for `setStories` event to make sure that storybook is initiated');
+    logger().debug('Waiting for Storybook to initiate');
 
     const isTimeout = await Promise.race([
       new Promise<boolean>((resolve) => {
@@ -554,9 +551,6 @@ export class InternalBrowser {
         do {
           // 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;
@@ -566,8 +560,7 @@ export class InternalBrowser {
       })(),
     ]);
 
-    // TODO Change the message to describe a reason why it might happen
-    if (isTimeout) throw new Error('Failed to wait `setStories` event');
+    if (isTimeout) throw new Error('Failed to wait Storybook init');
   }
 
   private async updateStorybookGlobals(): Promise<void> {

package/src/server/selenium/webdriver.ts

@@ -42,7 +42,6 @@ export class SeleniumWebdriver extends CreeveyWebdriverBase {
 
   getSessionId(): Promise<string> {
     if (!this.#browser) {
-      // TODO Describe the error
       throw new Error('Browser is not initialized');
     }
 
@@ -89,7 +88,6 @@ export class SeleniumWebdriver extends CreeveyWebdriverBase {
 
   async loadStoriesFromBrowser(): Promise<StoriesRaw> {
     if (!this.#browser) {
-      // TODO Describe the error
       throw new Error('Browser is not initialized');
     }
 
@@ -98,7 +96,6 @@ export class SeleniumWebdriver extends CreeveyWebdriverBase {
 
   afterTest(test: ServerTest): Promise<void> {
     if (!this.#browser) {
-      // TODO Describe the error
       throw new Error('Browser is not initialized');
     }
 
@@ -110,7 +107,6 @@ export class SeleniumWebdriver extends CreeveyWebdriverBase {
     ignoreElements?: string | string[] | null,
   ): Promise<Buffer> {
     if (!this.#browser) {
-      // TODO Describe the error
       throw new Error('Browser is not initialized');
     }
 
@@ -119,7 +115,6 @@ export class SeleniumWebdriver extends CreeveyWebdriverBase {
 
   protected waitForComplete(callback: (isCompleted: boolean) => void): void {
     if (!this.#browser) {
-      // TODO Describe the error
       throw new Error('Browser is not initialized');
     }
 
@@ -128,7 +123,6 @@ export class SeleniumWebdriver extends CreeveyWebdriverBase {
 
   protected async selectStory(id: string, waitForReady?: boolean): Promise<boolean> {
     if (!this.#browser) {
-      // TODO Describe the error
       throw new Error('Browser is not initialized');
     }
 
@@ -137,7 +131,6 @@ export class SeleniumWebdriver extends CreeveyWebdriverBase {
 
   protected async updateStoryArgs(story: StoryInput, updatedArgs: Args): Promise<void> {
     if (!this.#browser) {
-      // TODO Describe the error
       throw new Error('Browser is not initialized');
     }