creevey 0.10.0-beta.9 → 0.10.0-rc.1

package/dist/server/report.js

@@ -0,0 +1,45 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.report = report;
+const open_1 = __importDefault(require("open"));
+const logger_js_1 = require("./logger.js");
+const testsManager_js_1 = require("./master/testsManager.js");
+const server_js_1 = require("./master/server.js");
+const api_js_1 = require("./master/api.js");
+const utils_js_1 = require("./utils.js");
+/**
+ * UI Update Mode implementation.
+ * This mode allows users to review and approve screenshots from the browser interface.
+ * It combines the functionality of both --ui and --update flags.
+ *
+ * @param config Creevey configuration
+ * @param port Port to run the server on
+ */
+function report(config, reportDir, port) {
+    (0, logger_js_1.logger)().info('Starting UI Update Mode');
+    process.on('SIGINT', () => void (0, utils_js_1.shutdownWorkers)());
+    const url = `http://localhost:${port}`;
+    // Initialize TestsManager with the configured directories
+    const testsManager = new testsManager_js_1.TestsManager(config.screenDir, reportDir);
+    // Load tests from the report
+    const testsFromReport = testsManager.loadTestsFromReport();
+    if (Object.keys(testsFromReport).length === 0) {
+        (0, logger_js_1.logger)().warn('No tests found in report. Run tests first to generate report data.');
+        return;
+    }
+    // Set tests in the manager
+    testsManager.updateTests(testsFromReport);
+    // Start API server with UI enabled
+    const resolveApi = (0, server_js_1.start)(reportDir, port, true);
+    // Initialize API
+    const api = new api_js_1.CreeveyApi(testsManager);
+    // Resolve the API for the server
+    resolveApi(api);
+    (0, logger_js_1.logger)().info(`UI Update Mode started on ${url}`);
+    (0, logger_js_1.logger)().info('You can now review and approve screenshots from the browser.');
+    void (0, open_1.default)(url);
+}
+//# sourceMappingURL=report.js.map

package/dist/server/report.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"report.js","sourceRoot":"","sources":["../../src/server/report.ts"],"names":[],"mappings":";;;;;AAgBA,wBAkCC;AAlDD,gDAAwB;AAExB,2CAAqC;AACrC,8DAAwD;AACxD,kDAA0D;AAC1D,4CAA6C;AAC7C,yCAA6C;AAE7C;;;;;;;GAOG;AACH,SAAgB,MAAM,CAAC,MAAc,EAAE,SAAiB,EAAE,IAAY;IACpE,IAAA,kBAAM,GAAE,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IAEzC,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,KAAK,IAAA,0BAAe,GAAE,CAAC,CAAC;IAEnD,MAAM,GAAG,GAAG,oBAAoB,IAAI,EAAE,CAAC;IAEvC,0DAA0D;IAC1D,MAAM,YAAY,GAAG,IAAI,8BAAY,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAEnE,6BAA6B;IAC7B,MAAM,eAAe,GAAG,YAAY,CAAC,mBAAmB,EAAE,CAAC;IAE3D,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9C,IAAA,kBAAM,GAAE,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;QACpF,OAAO;IACT,CAAC;IAED,2BAA2B;IAC3B,YAAY,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;IAE1C,mCAAmC;IACnC,MAAM,UAAU,GAAG,IAAA,iBAAW,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAEtD,iBAAiB;IACjB,MAAM,GAAG,GAAG,IAAI,mBAAU,CAAC,YAAY,CAAC,CAAC;IAEzC,iCAAiC;IACjC,UAAU,CAAC,GAAG,CAAC,CAAC;IAEhB,IAAA,kBAAM,GAAE,CAAC,IAAI,CAAC,6BAA6B,GAAG,EAAE,CAAC,CAAC;IAClD,IAAA,kBAAM,GAAE,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAC;IAE9E,KAAK,IAAA,cAAI,EAAC,GAAG,CAAC,CAAC;AACjB,CAAC"}

package/dist/server/reporters/creevey.d.ts

@@ -0,0 +1,7 @@
+import EventEmitter from 'events';
+export declare class CreeveyReporter {
+    private logger;
+    constructor(runner: EventEmitter);
+    private getLogger;
+    private getErrors;
+}

package/dist/server/reporters/creevey.js

@@ -0,0 +1,63 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CreeveyReporter = void 0;
+const chalk_1 = __importDefault(require("chalk"));
+const loglevel_1 = __importDefault(require("loglevel"));
+const loglevel_plugin_prefix_1 = __importDefault(require("loglevel-plugin-prefix"));
+const types_js_1 = require("../../types.js");
+const testLevels = {
+    INFO: chalk_1.default.green('PASS'),
+    WARN: chalk_1.default.yellow('START'),
+    ERROR: chalk_1.default.red('FAIL'),
+};
+class CreeveyReporter {
+    logger = null;
+    // TODO Output in better way, like vitest, maybe
+    constructor(runner) {
+        runner.on(types_js_1.TEST_EVENTS.TEST_BEGIN, (test) => {
+            this.getLogger(test.creevey).warn(chalk_1.default.cyan(test.fullTitle()));
+        });
+        runner.on(types_js_1.TEST_EVENTS.TEST_PASS, (test) => {
+            this.getLogger(test.creevey).info(chalk_1.default.cyan(test.fullTitle()), test.duration ? chalk_1.default.gray(`(${test.duration} ms)`) : '');
+        });
+        runner.on(types_js_1.TEST_EVENTS.TEST_FAIL, (test, error) => {
+            this.getLogger(test.creevey).error(chalk_1.default.cyan(test.fullTitle()), test.duration ? chalk_1.default.gray(`(${test.duration} ms)`) : '', '\n  ', this.getErrors(error, (error, imageName) => `${chalk_1.default.bold(imageName ?? test.creevey.browserName)}:${error}`, (error) => error.stack ?? error.message).join('\n  '));
+        });
+    }
+    getLogger(options) {
+        if (this.logger)
+            return this.logger;
+        const { sessionId, browserName } = options;
+        const testLogger = loglevel_1.default.getLogger(sessionId);
+        this.logger = loglevel_plugin_prefix_1.default.apply(testLogger, {
+            format(level) {
+                return `[${browserName}:${chalk_1.default.gray(process.pid)}] ${testLevels[level]} => ${chalk_1.default.gray(sessionId)}`;
+            },
+        });
+        return this.logger;
+    }
+    getErrors(error, imageErrorToString, errorToString) {
+        const errors = [];
+        if (!(error instanceof Error)) {
+            errors.push(error);
+        }
+        else if (!(0, types_js_1.isImageError)(error)) {
+            errors.push(errorToString(error));
+        }
+        else if (typeof error.images == 'string') {
+            errors.push(imageErrorToString(error.images));
+        }
+        else {
+            const imageErrors = error.images ?? {};
+            Object.keys(imageErrors).forEach((imageName) => {
+                errors.push(imageErrorToString(imageErrors[imageName] ?? '', imageName));
+            });
+        }
+        return errors;
+    }
+}
+exports.CreeveyReporter = CreeveyReporter;
+//# sourceMappingURL=creevey.js.map

package/dist/server/reporters/creevey.js.map

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

package/dist/server/reporters/index.d.ts

@@ -0,0 +1,2 @@
+import { BaseReporter } from '../../types.js';
+export declare function getReporter(reporter: BaseReporter | 'creevey' | 'teamcity' | 'junit'): BaseReporter;

package/dist/server/reporters/index.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getReporter = getReporter;
+const creevey_js_1 = require("./creevey.js");
+const junit_js_1 = require("./junit.js");
+const teamcity_js_1 = require("./teamcity.js");
+function getReporter(reporter) {
+    if (reporter === 'creevey')
+        return creevey_js_1.CreeveyReporter;
+    if (reporter === 'teamcity')
+        return teamcity_js_1.TeamcityReporter;
+    if (reporter === 'junit')
+        return junit_js_1.JUnitReporter;
+    return reporter;
+}
+//# sourceMappingURL=index.js.map

package/dist/server/reporters/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/reporters/index.ts"],"names":[],"mappings":";;AAKA,kCAKC;AATD,6CAA+C;AAC/C,yCAA2C;AAC3C,+CAAiD;AAEjD,SAAgB,WAAW,CAAC,QAAyD;IACnF,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,4BAAe,CAAC;IACnD,IAAI,QAAQ,KAAK,UAAU;QAAE,OAAO,8BAAgB,CAAC;IACrD,IAAI,QAAQ,KAAK,OAAO;QAAE,OAAO,wBAAa,CAAC;IAC/C,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/dist/server/reporters/junit.d.ts

@@ -0,0 +1,16 @@
+import EventEmitter from 'events';
+export declare class JUnitReporter {
+    private reportFile;
+    private fileFd?;
+    private logger;
+    private suites;
+    constructor(runner: EventEmitter, options: {
+        reportDir: string;
+        reporterOptions: {
+            outputFile?: string;
+        };
+    });
+    private writeElement;
+    private writeTasks;
+    private onFinished;
+}

package/dist/server/reporters/junit.js

@@ -0,0 +1,167 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JUnitReporter = void 0;
+const path_1 = require("path");
+const fs_1 = require("fs");
+const types_js_1 = require("../../types.js");
+const logger_js_1 = require("../logger.js");
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+class IndentedLogger {
+    baseLog;
+    currentIndent = '';
+    constructor(baseLog) {
+        this.baseLog = baseLog;
+    }
+    indent() {
+        this.currentIndent += '    ';
+    }
+    unindent() {
+        this.currentIndent = this.currentIndent.substring(0, this.currentIndent.length - 4);
+    }
+    log(text) {
+        return this.baseLog(this.currentIndent + text);
+    }
+}
+// NOTE: This is a reworked copy of the JUnitReporter class from Vitest.
+class JUnitReporter {
+    reportFile;
+    fileFd;
+    logger;
+    suites = {};
+    // TODO classnameTemplate
+    // TODO Output console logs
+    // TODO Output attachments
+    constructor(runner, options) {
+        const { reportDir, reporterOptions } = options;
+        this.reportFile = reporterOptions.outputFile ?? (0, path_1.resolve)(reportDir, 'junit.xml');
+        this.logger = new IndentedLogger((text) => {
+            this.fileFd ??= (0, fs_1.openSync)(this.reportFile, 'w+');
+            (0, fs_1.writeFileSync)(this.fileFd, `${text}\n`);
+        });
+        runner.on(types_js_1.TEST_EVENTS.RUN_BEGIN, () => {
+            this.suites = {};
+            const outputDirectory = (0, path_1.dirname)(this.reportFile);
+            if (!(0, fs_1.existsSync)(outputDirectory)) {
+                (0, fs_1.mkdirSync)(outputDirectory, { recursive: true });
+            }
+            this.fileFd = (0, fs_1.openSync)(this.reportFile, 'w+');
+        });
+        runner.on(types_js_1.TEST_EVENTS.TEST_PASS, (test) => {
+            const suite = (this.suites[test.parent.title] ??= []);
+            suite.push(test);
+        });
+        runner.on(types_js_1.TEST_EVENTS.TEST_FAIL, (test) => {
+            const suite = (this.suites[test.parent.title] ??= []);
+            suite.push(test);
+        });
+        runner.on(types_js_1.TEST_EVENTS.RUN_END, () => {
+            this.onFinished();
+        });
+    }
+    writeElement(name, attrs, children) {
+        const pairs = [];
+        for (const key in attrs) {
+            const attr = attrs[key];
+            if (attr === undefined) {
+                continue;
+            }
+            pairs.push(`${key}="${escapeXML(attr)}"`);
+        }
+        this.logger.log(`<${name}${pairs.length ? ` ${pairs.join(' ')}` : ''}>`);
+        this.logger.indent();
+        children?.call(this);
+        this.logger.unindent();
+        this.logger.log(`</${name}>`);
+    }
+    writeTasks(tests) {
+        for (const test of tests) {
+            const classname = test.parent.title;
+            this.writeElement('testcase', {
+                classname,
+                name: test.title,
+                time: getDuration(test),
+            }, () => {
+                if (test.state === 'failed') {
+                    const error = test.err;
+                    this.writeElement('failure', { message: error });
+                }
+            });
+        }
+    }
+    onFinished() {
+        this.logger.log('<?xml version="1.0" encoding="UTF-8" ?>');
+        const suites = Object.entries(this.suites).map(([name, tests]) => {
+            return {
+                name,
+                tests,
+                failures: tests.filter((test) => test.state === 'failed').length,
+                time: tests.reduce((acc, test) => acc + (test.duration ?? 0), 0),
+            };
+        });
+        const stats = suites.reduce((s, { tests, failures, time }) => {
+            s.tests += tests.length;
+            s.failures += failures;
+            s.time += time;
+            return s;
+        }, { name: 'creevey tests', tests: 0, failures: 0, time: 0 });
+        this.writeElement('testsuites', { ...stats, time: executionTime(stats.time) }, () => {
+            suites.forEach(({ name, tests, failures, time }) => {
+                this.writeElement('testsuite', {
+                    name,
+                    tests: tests.length,
+                    failures,
+                    time: executionTime(time),
+                }, () => {
+                    this.writeTasks(tests);
+                });
+            });
+        });
+        if (this.reportFile) {
+            (0, logger_js_1.logger)().info(`JUNIT report written to ${this.reportFile}`);
+        }
+        if (this.fileFd) {
+            (0, fs_1.closeSync)(this.fileFd);
+            this.fileFd = undefined;
+        }
+    }
+}
+exports.JUnitReporter = JUnitReporter;
+// https://gist.github.com/john-doherty/b9195065884cdbfd2017a4756e6409cc
+function removeInvalidXMLCharacters(value, removeDiscouragedChars) {
+    let regex = 
+    // eslint-disable-next-line no-control-regex
+    /([\0-\x08\v\f\x0E-\x1F\uFFFD\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])/g;
+    value = String(value).replace(regex, '');
+    if (removeDiscouragedChars) {
+        // remove everything discouraged by XML 1.0 specifications
+        regex = new RegExp('([\\x7F-\\x84]|[\\x86-\\x9F]|[\\uFDD0-\\uFDEF]|\\uD83F[\\uDFFE\\uDFFF]|(?:\\uD87F[\\uDF' +
+            'FE\\uDFFF])|\\uD8BF[\\uDFFE\\uDFFF]|\\uD8FF[\\uDFFE\\uDFFF]|(?:\\uD93F[\\uDFFE\\uD' +
+            'FFF])|\\uD97F[\\uDFFE\\uDFFF]|\\uD9BF[\\uDFFE\\uDFFF]|\\uD9FF[\\uDFFE\\uDFFF]' +
+            '|\\uDA3F[\\uDFFE\\uDFFF]|\\uDA7F[\\uDFFE\\uDFFF]|\\uDABF[\\uDFFE\\uDFFF]|(?:\\' +
+            'uDAFF[\\uDFFE\\uDFFF])|\\uDB3F[\\uDFFE\\uDFFF]|\\uDB7F[\\uDFFE\\uDFFF]|(?:\\uDBBF' +
+            '[\\uDFFE\\uDFFF])|\\uDBFF[\\uDFFE\\uDFFF](?:[\\0-\\t\\v\\f\\x0E-\\u2027\\u202A-\\uD7FF\\' +
+            'uE000-\\uFFFF]|[\\uD800-\\uDBFF][\\uDC00-\\uDFFF]|[\\uD800-\\uDBFF](?![\\uDC00-\\uDFFF])|' +
+            '(?:[^\\uD800-\\uDBFF]|^)[\\uDC00-\\uDFFF]))', 'g');
+        value = value.replace(regex, '');
+    }
+    return value;
+}
+function escapeXML(value) {
+    return removeInvalidXMLCharacters(String(value)
+        .replace(/&/g, '&amp;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&apos;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;'), true);
+}
+function executionTime(durationMS) {
+    return (durationMS / 1000).toLocaleString('en-US', {
+        useGrouping: false,
+        maximumFractionDigits: 10,
+    });
+}
+function getDuration(task) {
+    const duration = task.duration ?? 0;
+    return executionTime(duration);
+}
+//# sourceMappingURL=junit.js.map

package/dist/server/reporters/junit.js.map

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

package/dist/server/reporters/teamcity.d.ts

@@ -0,0 +1,7 @@
+import EventEmitter from 'events';
+export declare class TeamcityReporter {
+    constructor(runner: EventEmitter, options: {
+        reportDir: string;
+    });
+    private escape;
+}

package/dist/server/reporters/teamcity.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TeamcityReporter = void 0;
+const types_js_1 = require("../../types.js");
+class TeamcityReporter {
+    constructor(runner, options) {
+        const { reportDir } = options;
+        runner.on(types_js_1.TEST_EVENTS.TEST_BEGIN, (test) => {
+            console.log(`##teamcity[testStarted name='${this.escape(test.fullTitle())}' flowId='${test.creevey.workerId}']`);
+        });
+        runner.on(types_js_1.TEST_EVENTS.TEST_PASS, (test) => {
+            console.log(`##teamcity[testFinished name='${this.escape(test.fullTitle())}' flowId='${test.creevey.workerId}']`);
+        });
+        runner.on(types_js_1.TEST_EVENTS.TEST_FAIL, (test, error) => {
+            const browserName = this.escape(test.creevey.browserName);
+            Object.entries(test.creevey.images).forEach(([name, image]) => {
+                if (!image)
+                    return;
+                const filePath = test
+                    .titlePath()
+                    .slice(0, -1)
+                    .concat(name == browserName ? [] : [browserName])
+                    .map(this.escape)
+                    .join('/');
+                const { error: _, ...rest } = image;
+                Object.values(rest)
+                    .filter(types_js_1.isDefined)
+                    .forEach((fileName) => {
+                    console.log(`##teamcity[publishArtifacts '${reportDir}/${filePath}/${fileName} => report/${filePath}']`);
+                    console.log(`##teamcity[testMetadata testName='${this.escape(test.fullTitle())}' type='image' value='report/${filePath}/${fileName}' flowId='${test.creevey.workerId}']`);
+                });
+            });
+            // Output failed test as passed due TC don't support retry mechanic
+            // https://teamcity-support.jetbrains.com/hc/en-us/community/posts/207216829-Count-test-as-successful-if-at-least-one-try-is-successful?page=1#community_comment_207394125
+            if (test.creevey.willRetry)
+                console.log(`##teamcity[testFinished name='${this.escape(test.fullTitle())}' flowId='${test.creevey.workerId}']`);
+            else
+                console.log(`##teamcity[testFailed name='${this.escape(test.fullTitle())}' message='${this.escape(error.message)}' details='${this.escape(error.stack ?? '')}' flowId='${test.creevey.workerId}']`);
+        });
+    }
+    escape = (str) => {
+        if (!str)
+            return '';
+        return (str
+            .toString()
+            // eslint-disable-next-line no-control-regex
+            .replace(/\x1B.*?m/g, '')
+            .replace(/\|/g, '||')
+            .replace(/\n/g, '|n')
+            .replace(/\r/g, '|r')
+            .replace(/\[/g, '|[')
+            .replace(/\]/g, '|]')
+            .replace(/\u0085/g, '|x')
+            .replace(/\u2028/g, '|l')
+            .replace(/\u2029/g, '|p')
+            .replace(/'/g, "|'"));
+    };
+}
+exports.TeamcityReporter = TeamcityReporter;
+//# sourceMappingURL=teamcity.js.map

package/dist/server/reporters/teamcity.js.map

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

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

@@ -1,6 +1,6 @@
-import { Args } from '@storybook/csf';
+import type { Args } from 'storybook/internal/types';
 import { WebDriver } from 'selenium-webdriver';
-import { Config, StorybookGlobals, StoryInput, StoriesRaw, Options, ServerTest } from '../../types.js';
+import { Config, StorybookGlobals, StoryInput, StoriesRaw, WorkerOptions, ServerTest } from '../../types.js';
 export declare class InternalBrowser {
     #private;
     constructor(browser: WebDriver, port: number, storybookGlobals?: StorybookGlobals);
@@ -12,7 +12,7 @@ export declare class InternalBrowser {
     updateStoryArgs(story: StoryInput, updatedArgs: Args): Promise<void>;
     loadStoriesFromBrowser(): Promise<StoriesRaw>;
     afterTest(test: ServerTest): Promise<void>;
-    static getBrowser(browserName: string, gridUrl: string, config: Config, options: Options): Promise<InternalBrowser | null>;
+    static getBrowser(browserName: string, gridUrl: string, config: Config, options: WorkerOptions): Promise<InternalBrowser | null>;
     private init;
     private openStorybookPage;
     private checkUrl;

package/dist/server/selenium/internal.js

@@ -190,7 +190,7 @@ class InternalBrowser {
             else {
                 (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`
+                    window.scrollTo(0, 0);
                     // eslint-disable-next-line no-var
                     var element = document.querySelector(selector);
                     if (!element)
@@ -206,9 +206,7 @@ class InternalBrowser {
                         },
                         // NOTE page_Offset is used only for IE9-11
                         windowRect: {
-                            // eslint-disable-next-line @typescript-eslint/no-deprecated
                             top: Math.round(window.scrollY || window.pageYOffset),
-                            // eslint-disable-next-line @typescript-eslint/no-deprecated
                             left: Math.round(window.scrollX || window.pageXOffset),
                             width: window.innerWidth,
                             height: window.innerHeight,
@@ -230,12 +228,10 @@ 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(selenium_webdriver_1.By.css(captureElement)).takeScreenshot()
-                    : // TODO pointer-events: none, need to research
-                        await this.takeCompositeScreenshot(windowRect, elementRect);
+                    : await this.takeCompositeScreenshot(windowRect, elementRect);
                 (0, logger_js_1.logger)().debug(`${chalk_1.default.cyan(captureElement)} is captured`);
             }
         }
@@ -281,9 +277,27 @@ class InternalBrowser {
         }, 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) {
-            void window.__CREEVEY_GET_STORIES__().then(callback);
+        const result = await this.#browser.executeAsyncScript(function (callback) {
+            window
+                .__CREEVEY_GET_STORIES__()
+                .then((stories) => {
+                callback([null, stories]);
+            })
+                .catch((error) => {
+                const errorInfo = {
+                    message: error instanceof Error ? error.message : String(error),
+                    stack: error instanceof Error ? error.stack : undefined,
+                };
+                callback([errorInfo]);
+            });
         });
+        const [error, stories] = result;
+        if (error) {
+            const errorObj = new Error(error.message);
+            if (error.stack)
+                errorObj.stack = error.stack;
+            throw errorObj;
+        }
         if (!stories)
             throw new Error("Can't get stories, it seems creevey or storybook API isn't available");
         return stories;
@@ -301,12 +315,14 @@ class InternalBrowser {
     }
     static async getBrowser(browserName, gridUrl, config, options) {
         const browserConfig = config.browsers[browserName];
-        const { storybookUrl: address = config.storybookUrl, limit, viewport, _storybookGlobals } = browserConfig;
+        const { storybookUrl: address = config.storybookUrl, limit, viewport, 
+        // eslint-disable-next-line @typescript-eslint/no-deprecated
+        _storybookGlobals, storybookGlobals = _storybookGlobals, } = browserConfig;
         void limit;
         const browser = await buildWebdriver(browserName, gridUrl, config, options);
         if (!browser)
             return null;
-        const internalBrowser = new InternalBrowser(browser, options.port, _storybookGlobals);
+        const internalBrowser = new InternalBrowser(browser, options.port, storybookGlobals);
         try {
             if (utils_js_1.isShuttingDown.current)
                 return null;
@@ -315,7 +331,6 @@ class InternalBrowser {
                 gridUrl,
                 viewport,
                 storybookUrl: address,
-                resolveStorybookUrl: config.resolveStorybookUrl,
             });
             return done ? internalBrowser : null;
         }
@@ -329,7 +344,7 @@ class InternalBrowser {
             return null;
         }
     }
-    async init({ browserName, gridUrl, viewport, storybookUrl, resolveStorybookUrl, }) {
+    async init({ browserName, gridUrl, viewport, storybookUrl, }) {
         const sessionId = (await this.#browser.getSession()).getId();
         let browserHost = '';
         try {
@@ -349,7 +364,7 @@ class InternalBrowser {
         (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: 60000, script: 60000 }),
-            () => this.openStorybookPage(storybookUrl, resolveStorybookUrl),
+            () => this.openStorybookPage(storybookUrl),
             () => this.waitForStorybook(),
             () => this.updateStorybookGlobals(),
             () => this.resolveCreeveyHost(),
@@ -363,22 +378,13 @@ class InternalBrowser {
             },
         ], () => !this.#isShuttingDown);
     }
-    async openStorybookPage(storybookUrl, resolver) {
+    async openStorybookPage(storybookUrl) {
         if (!webdriver_js_1.LOCALHOST_REGEXP.test(storybookUrl)) {
             return this.#browser.get((0, webdriver_js_1.appendIframePath)(storybookUrl));
         }
         try {
-            if (resolver) {
-                (0, logger_js_1.logger)().debug('Resolving storybook url with custom resolver');
-                const resolvedUrl = await resolver();
-                (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));
-            }
+            // 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));
         }
         catch (error) {
             (0, logger_js_1.logger)().error('Failed to resolve storybook URL', error instanceof Error ? error.message : '');
@@ -407,7 +413,7 @@ class InternalBrowser {
         }
     }
     async waitForStorybook() {
-        (0, logger_js_1.logger)().debug('Waiting for `setStories` event to make sure that storybook is initiated');
+        (0, logger_js_1.logger)().debug('Waiting for Storybook to initiate');
         const isTimeout = await Promise.race([
             new Promise((resolve) => {
                 setTimeout(() => {
@@ -419,9 +425,6 @@ class InternalBrowser {
                 do {
                     // 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)
@@ -432,9 +435,8 @@ class InternalBrowser {
                 return false;
             })(),
         ]);
-        // TODO Change the message to describe a reason why it might happen
         if (isTimeout)
-            throw new Error('Failed to wait `setStories` event');
+            throw new Error('Failed to wait Storybook init');
     }
     async updateStorybookGlobals() {
         if (!this.#storybookGlobals)
@@ -445,7 +447,9 @@ class InternalBrowser {
         }, this.#storybookGlobals);
     }
     async resolveCreeveyHost() {
-        const addresses = (0, webdriver_js_1.getAddresses)();
+        const storybookUrl = await this.#browser.getCurrentUrl();
+        const storybookHost = new URL(storybookUrl).hostname;
+        const addresses = [storybookHost, ...(0, webdriver_js_1.getAddresses)()];
         this.#serverHost = await this.#browser.executeAsyncScript(function (hosts, port, callback) {
             void Promise.all(hosts.map(function (host) {
                 return Promise.race([
@@ -474,6 +478,7 @@ class InternalBrowser {
     }
     async updateBrowserGlobalVariables() {
         await this.#browser.executeScript(function (workerId, creeveyHost, creeveyPort) {
+            window.__CREEVEY_ENV__ = true;
             window.__CREEVEY_WORKER_ID__ = workerId;
             window.__CREEVEY_SERVER_HOST__ = creeveyHost;
             window.__CREEVEY_SERVER_PORT__ = creeveyPort;
@@ -633,8 +638,17 @@ class InternalBrowser {
     keepAlive() {
         this.#keepAliveInterval = setInterval(() => {
             // NOTE Simple way to keep session alive
-            void this.#browser.getCurrentUrl().then((url) => {
+            void this.#browser
+                .getCurrentUrl()
+                .then((url) => {
                 (0, logger_js_1.logger)().debug('current url', chalk_1.default.magenta(url));
+            })
+                .catch((error) => {
+                (0, logger_js_1.logger)().error(error);
+                (0, messages_js_1.emitWorkerMessage)({
+                    type: 'error',
+                    payload: { subtype: 'browser', error: 'Failed to ping browser' },
+                });
             });
         }, 10 * 1000);
     }