creevey 0.10.0-beta.4 → 0.10.0-beta.41

package/dist/server/index.js

@@ -5,15 +5,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const cluster_1 = __importDefault(require("cluster"));
+const path_1 = __importDefault(require("path"));
+const shelljs_1 = require("shelljs");
+const detect_1 = require("package-manager-detector/detect");
+const commands_1 = require("package-manager-detector/commands");
 const config_js_1 = require("./config.js");
 const types_js_1 = require("../types.js");
 const logger_js_1 = require("./logger.js");
+const connection_js_1 = require("./connection.js");
 const webdriver_js_1 = require("./selenium/webdriver.js");
 const webdriver_js_2 = require("./webdriver.js");
 const utils_js_1 = require("./utils.js");
 const messages_js_1 = require("./messages.js");
-const docker_file_js_1 = require("./playwright/docker-file.js");
 const docker_js_1 = require("./docker.js");
+const promises_1 = require("fs/promises");
+const assert_1 = __importDefault(require("assert"));
 async function startWebdriverServer(browser, config, options) {
     if (config.webdriver === webdriver_js_1.SeleniumWebdriver) {
         if (cluster_1.default.isPrimary) {
@@ -31,24 +37,29 @@ async function startWebdriverServer(browser, config, options) {
     else {
         if (config.gridUrl)
             return undefined;
-        // TODO start standalone playwright server (useDocker == false)
+        if (!config.useDocker) {
+            if (cluster_1.default.isPrimary)
+                return undefined;
+            const { browserName } = config.browsers[browser];
+            return `creevey://${(0, utils_js_1.resolvePlaywrightBrowserType)(browserName)}`;
+        }
         const { default: { version }, } = await import('playwright-core/package.json', { with: { type: 'json' } });
         if (cluster_1.default.isWorker) {
             // TODO Re-use dockerImage
-            // TODO Use https://hub.docker.com/r/playwright/chrome
-            // NOTE It will be possible to use `chrome` browserName
             const { startPlaywrightContainer } = await import('./playwright/docker.js');
             const { browserName } = config.browsers[browser];
             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 { default: { version: creeveyVersion }, } = await import('../../package.json', { with: { type: 'json' } });
             const browsers = [...new Set(Object.values(config.browsers).map((c) => c.browserName))];
             await Promise.all(browsers.map(async (browserName) => {
                 const imageName = `creevey/${browserName}:v${version}`;
-                const dockerfile = (0, docker_file_js_1.playwrightDockerFile)(browserName, version);
-                await (0, docker_js_1.buildImage)(imageName, dockerfile);
+                const dockerfile = await playwrightDockerFile(browserName, version);
+                await (0, docker_js_1.buildImage)(imageName, creeveyVersion, dockerfile);
             }));
             const { default: getPort } = await import('get-port');
             cluster_1.default.on('message', (worker, message) => {
@@ -73,11 +84,53 @@ async function default_1(options) {
     const config = await (0, config_js_1.readConfig)(options);
     const { browser = config_js_1.defaultBrowser, update, ui, port } = options;
     let gridUrl = cluster_1.default.isPrimary ? config.gridUrl : options.gridUrl;
+    // TODO Add package.json with `"type": "commonjs"` as workaround for esm packages to load `data.js`
+    await (0, promises_1.mkdir)(config.reportDir, { recursive: true });
+    await (0, promises_1.writeFile)(path_1.default.join(config.reportDir, 'package.json'), '{"type": "commonjs"}');
     // NOTE: We don't need docker nor selenoid for update option
     if (!(gridUrl || Object.values(config.browsers).every(({ gridUrl }) => gridUrl)) &&
         !update) {
         gridUrl = await startWebdriverServer(browser, config, options);
     }
+    if (cluster_1.default.isPrimary) {
+        const [localUrl, remoteUrl] = (0, connection_js_1.getStorybookUrl)(config, options);
+        if (options.storybookStart) {
+            const pm = (0, detect_1.getUserAgent)();
+            (0, assert_1.default)(pm, new Error('Failed to detect current package manager'));
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const { command, args } = (0, commands_1.resolveCommand)(pm, 'run', ['storybook', 'dev']);
+            const storybookPort = new URL(localUrl).port;
+            const storybookCommand = `${config.storybookAutorunCmd ?? [command, ...args, '--ci'].join(' ')} -p ${storybookPort}`;
+            (0, logger_js_1.logger)().info(`Start Storybook via \`${storybookCommand}\`, it should be accessible at:`);
+            (0, logger_js_1.logger)().info(`Local - ${localUrl}`);
+            if (remoteUrl && localUrl != remoteUrl)
+                (0, logger_js_1.logger)().info(`On your network - ${remoteUrl}`);
+            (0, logger_js_1.logger)().info('Waiting Storybook...');
+            const storybook = (0, shelljs_1.exec)(storybookCommand, { async: true });
+            (0, messages_js_1.subscribeOn)('shutdown', () => {
+                if (storybook.pid)
+                    void (0, utils_js_1.killTree)(storybook.pid);
+            });
+        }
+        else {
+            (0, logger_js_1.logger)().info('Storybook should be started and be accessible at:');
+            (0, logger_js_1.logger)().info(`Local - ${localUrl}`);
+            if (remoteUrl && localUrl != remoteUrl)
+                (0, logger_js_1.logger)().info(`On your network - ${remoteUrl}`);
+            (0, logger_js_1.logger)().info('Tip: Creevey can start Storybook automatically by using `-s` option at the command line. (e.g., yarn/npm run creevey -s)');
+            (0, logger_js_1.logger)().info('Waiting Storybook...');
+        }
+        if (options.storybookStart || process.env.CI !== 'true') {
+            const isConnected = await (0, connection_js_1.checkIsStorybookConnected)(localUrl);
+            if (isConnected) {
+                (0, logger_js_1.logger)().info('Storybook connected!\n');
+            }
+            else {
+                (0, logger_js_1.logger)().error('Storybook is not responding. Please start Storybook and restart Creevey');
+                (0, utils_js_1.shutdownWithError)();
+            }
+        }
+    }
     switch (true) {
         case Boolean(update): {
             (await import('./update.js')).update(config, typeof update == 'string' ? update : undefined);
@@ -89,7 +142,7 @@ async function default_1(options) {
                     await import('selenium-webdriver');
                 }
                 catch {
-                    logger_js_1.logger.error('Failed to start Creevey, missing required dependency: "selenium-webdriver"');
+                    (0, logger_js_1.logger)().error('Failed to start Creevey, missing required dependency: "selenium-webdriver"');
                     process.exit(-1);
                 }
             }
@@ -98,16 +151,16 @@ async function default_1(options) {
                     await import('playwright-core');
                 }
                 catch {
-                    logger_js_1.logger.error('Failed to start Creevey, missing required dependency: "playwright-core"');
+                    (0, logger_js_1.logger)().error('Failed to start Creevey, missing required dependency: "playwright-core"');
                     process.exit(-1);
                 }
             }
-            logger_js_1.logger.info('Starting Master Process');
+            (0, logger_js_1.logger)().info('Starting Master Process');
             const resolveApi = (await import('./master/server.js')).start(config.reportDir, port, ui);
             return (await import('./master/start.js')).start(gridUrl, config, options, resolveApi);
         }
         default: {
-            logger_js_1.logger.info(`Starting Worker for ${browser}`);
+            (0, logger_js_1.logger)().info(`Starting Worker for ${browser}`);
             // NOTE: We assume that we pass `gridUrl` to worker CLI options
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             return (await import('./worker/start.js')).start(browser, gridUrl, config, options);

package/dist/server/index.js.map

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

package/dist/server/logger.d.ts

@@ -7,4 +7,5 @@ export declare const colors: {
     WARN: chalk.Chalk;
     ERROR: chalk.Chalk;
 };
-export declare const logger: Logger.Logger;
+export declare const setRootName: (newName: string) => string;
+export declare const logger: () => Logger.Logger;

package/dist/server/logger.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logger = exports.colors = void 0;
+exports.logger = exports.setRootName = exports.colors = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const loglevel_1 = __importDefault(require("loglevel"));
 const loglevel_plugin_prefix_1 = __importDefault(require("loglevel-plugin-prefix"));
@@ -14,12 +14,16 @@ exports.colors = {
     WARN: chalk_1.default.yellow,
     ERROR: chalk_1.default.red,
 };
+let rootName = 'Creevey';
 loglevel_plugin_prefix_1.default.reg(loglevel_1.default);
 loglevel_plugin_prefix_1.default.apply(loglevel_1.default, {
-    format(level, name = 'Creevey') {
+    format(level, name = rootName) {
         const levelColor = exports.colors[level.toUpperCase()];
         return `[${name}:${chalk_1.default.gray(process.pid)}] ${levelColor(level)} =>`;
     },
 });
-exports.logger = loglevel_1.default.getLogger('Creevey');
+const setRootName = (newName) => (rootName = newName);
+exports.setRootName = setRootName;
+const logger = () => loglevel_1.default.getLogger(rootName);
+exports.logger = logger;
 //# sourceMappingURL=logger.js.map

package/dist/server/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/server/logger.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,wDAA8B;AAC9B,oFAA4C;AAE/B,QAAA,MAAM,GAAG;IACpB,KAAK,EAAE,eAAK,CAAC,OAAO;IACpB,KAAK,EAAE,eAAK,CAAC,IAAI;IACjB,IAAI,EAAE,eAAK,CAAC,IAAI;IAChB,IAAI,EAAE,eAAK,CAAC,MAAM;IAClB,KAAK,EAAE,eAAK,CAAC,GAAG;CACjB,CAAC;AAEF,gCAAM,CAAC,GAAG,CAAC,kBAAM,CAAC,CAAC;AACnB,gCAAM,CAAC,KAAK,CAAC,kBAAM,EAAE;IACnB,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,SAAS;QAC5B,MAAM,UAAU,GAAG,cAAM,CAAC,KAAK,CAAC,WAAW,EAAyB,CAAC,CAAC;QACtE,OAAO,IAAI,IAAI,IAAI,eAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC;IACxE,CAAC;CACF,CAAC,CAAC;AAEU,QAAA,MAAM,GAAG,kBAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/server/logger.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,wDAA8B;AAC9B,oFAA4C;AAE/B,QAAA,MAAM,GAAG;IACpB,KAAK,EAAE,eAAK,CAAC,OAAO;IACpB,KAAK,EAAE,eAAK,CAAC,IAAI;IACjB,IAAI,EAAE,eAAK,CAAC,IAAI;IAChB,IAAI,EAAE,eAAK,CAAC,MAAM;IAClB,KAAK,EAAE,eAAK,CAAC,GAAG;CACjB,CAAC;AAEF,IAAI,QAAQ,GAAG,SAAS,CAAC;AAEzB,gCAAM,CAAC,GAAG,CAAC,kBAAM,CAAC,CAAC;AACnB,gCAAM,CAAC,KAAK,CAAC,kBAAM,EAAE;IACnB,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,QAAQ;QAC3B,MAAM,UAAU,GAAG,cAAM,CAAC,KAAK,CAAC,WAAW,EAAyB,CAAC,CAAC;QACtE,OAAO,IAAI,IAAI,IAAI,eAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC;IACxE,CAAC;CACF,CAAC,CAAC;AAEI,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,EAAE,CAAC,CAAC,QAAQ,GAAG,OAAO,CAAC,CAAC;AAAxD,QAAA,WAAW,eAA6C;AAE9D,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,kBAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;AAA1C,QAAA,MAAM,UAAoC"}

package/dist/server/master/api.js

@@ -22,7 +22,7 @@ function creeveyApi(runner) {
         },
         handleMessage(ws, message) {
             if (typeof message != 'string') {
-                logger_js_1.logger.info('unhandled message', message);
+                (0, logger_js_1.logger)().info('unhandled message', message);
                 return;
             }
             const command = JSON.parse(message);

package/dist/server/master/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/server/master/api.ts"],"names":[],"mappings":";;;;;AAkBA,6BAwCC;AA1DD,4CAA2B;AAG3B,4CAAsC;AAOtC,SAAS,SAAS,CAAC,GAAqB,EAAE,OAAiB;IACzD,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;QACzB,IAAI,EAAE,CAAC,UAAU,KAAK,YAAS,CAAC,IAAI,EAAE,CAAC;YACrC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QACnC,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAwB,UAAU,CAAC,MAAc;IAC/C,OAAO;QACL,SAAS,CAAC,GAAqB;YAC7B,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAsB,EAAE,EAAE;gBAC7C,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC;QACL,CAAC;QAED,aAAa,CAAC,EAAa,EAAE,OAAuB;YAClD,IAAI,OAAO,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC/B,kBAAM,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;gBAC1C,OAAO;YACT,CAAC;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAY,CAAC;YAE/C,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;gBACrB,KAAK,QAAQ,CAAC,CAAC,CAAC;oBACd,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;oBACpE,OAAO;gBACT,CAAC;gBACD,KAAK,OAAO,CAAC,CAAC,CAAC;oBACb,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBAC9B,OAAO;gBACT,CAAC;gBACD,KAAK,MAAM,CAAC,CAAC,CAAC;oBACZ,MAAM,CAAC,IAAI,EAAE,CAAC;oBACd,OAAO;gBACT,CAAC;gBACD,KAAK,SAAS,CAAC,CAAC,CAAC;oBACf,KAAK,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBACrC,OAAO;gBACT,CAAC;gBACD,KAAK,YAAY,CAAC,CAAC,CAAC;oBAClB,KAAK,MAAM,CAAC,UAAU,EAAE,CAAC;oBACzB,OAAO;gBACT,CAAC;YACH,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/server/master/api.ts"],"names":[],"mappings":";;;;;AAkBA,6BAwCC;AA1DD,4CAA2B;AAG3B,4CAAsC;AAOtC,SAAS,SAAS,CAAC,GAAqB,EAAE,OAAiB;IACzD,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;QACzB,IAAI,EAAE,CAAC,UAAU,KAAK,YAAS,CAAC,IAAI,EAAE,CAAC;YACrC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QACnC,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAwB,UAAU,CAAC,MAAc;IAC/C,OAAO;QACL,SAAS,CAAC,GAAqB;YAC7B,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAsB,EAAE,EAAE;gBAC7C,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC;QACL,CAAC;QAED,aAAa,CAAC,EAAa,EAAE,OAAuB;YAClD,IAAI,OAAO,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC/B,IAAA,kBAAM,GAAE,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;gBAC5C,OAAO;YACT,CAAC;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAY,CAAC;YAE/C,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;gBACrB,KAAK,QAAQ,CAAC,CAAC,CAAC;oBACd,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;oBACpE,OAAO;gBACT,CAAC;gBACD,KAAK,OAAO,CAAC,CAAC,CAAC;oBACb,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBAC9B,OAAO;gBACT,CAAC;gBACD,KAAK,MAAM,CAAC,CAAC,CAAC;oBACZ,MAAM,CAAC,IAAI,EAAE,CAAC;oBACd,OAAO;gBACT,CAAC;gBACD,KAAK,SAAS,CAAC,CAAC,CAAC;oBACf,KAAK,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBACrC,OAAO;gBACT,CAAC;gBACD,KAAK,YAAY,CAAC,CAAC,CAAC;oBAClB,KAAK,MAAM,CAAC,UAAU,EAAE,CAAC;oBACzB,OAAO;gBACT,CAAC;YACH,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/server/master/pool.d.ts

@@ -1,6 +1,8 @@
 import { EventEmitter } from 'events';
 import { Config } from '../../types.js';
+import { WorkerQueue } from './queue.js';
 export default class Pool extends EventEmitter {
+    scheduler: WorkerQueue;
     private browser;
     private maxRetries;
     private config;
@@ -9,8 +11,9 @@ export default class Pool extends EventEmitter {
     private forcedStop;
     private failFast;
     private gridUrl?;
+    private storybookUrl;
     get isRunning(): boolean;
-    constructor(config: Config, browser: string, gridUrl?: string);
+    constructor(scheduler: WorkerQueue, config: Config, browser: string, gridUrl?: string);
     init(): Promise<void>;
     start(tests: {
         id: string;
@@ -22,9 +25,7 @@ export default class Pool extends EventEmitter {
     private getFreeWorker;
     private get aliveWorkers();
     private get freeWorkers();
-    private forkWorker;
     private exitHandler;
-    private gracefullyKill;
     private shouldRetry;
     private handleTestResult;
     private subscribe;

package/dist/server/master/pool.js

@@ -1,35 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const cluster_1 = __importStar(require("cluster"));
+const cluster_1 = require("cluster");
 const events_1 = require("events");
-const types_js_1 = require("../../types.js");
 const messages_js_1 = require("../messages.js");
 const utils_js_1 = require("../utils.js");
-const FORK_RETRIES = 5;
 class Pool extends events_1.EventEmitter {
+    scheduler;
     browser;
     maxRetries;
     config;
@@ -38,21 +14,23 @@ class Pool extends events_1.EventEmitter {
     forcedStop = false;
     failFast;
     gridUrl;
+    storybookUrl;
     get isRunning() {
         return this.workers.length !== this.freeWorkers.length;
     }
-    constructor(config, browser, gridUrl) {
+    constructor(scheduler, config, browser, gridUrl) {
         super();
+        this.scheduler = scheduler;
         this.browser = browser;
         this.failFast = config.failFast;
         this.maxRetries = config.maxRetries;
         this.config = config.browsers[browser];
         this.gridUrl = this.config.gridUrl ?? gridUrl;
+        this.storybookUrl = this.config.storybookUrl ?? config.storybookUrl;
     }
     async init() {
         const poolSize = Math.max(1, this.config.limit ?? 1);
-        // TODO Init queue for workers to smooth browser starting load
-        this.workers = (await Promise.all(Array.from({ length: poolSize }).map(() => this.forkWorker()))).filter((workerOrError) => workerOrError instanceof cluster_1.Worker);
+        this.workers = (await Promise.all(Array.from({ length: poolSize }).map(() => this.scheduler.forkWorker(this.browser, this.storybookUrl, this.gridUrl)))).filter((workerOrError) => workerOrError instanceof cluster_1.Worker);
         if (this.workers.length != poolSize)
             throw new Error(`Can't instantiate workers for ${this.browser} due many errors`);
         this.workers.forEach((worker) => {
@@ -90,7 +68,9 @@ class Pool extends events_1.EventEmitter {
         this.sendStatus({ id, status: 'running' });
         this.subscribe(worker, test);
         (0, messages_js_1.sendTestMessage)(worker, { type: 'start', payload: test });
-        this.process();
+        setImmediate(() => {
+            this.process();
+        });
     }
     sendStatus(message) {
         this.emit('test', message);
@@ -105,35 +85,12 @@ class Pool extends events_1.EventEmitter {
     get freeWorkers() {
         return this.aliveWorkers.filter((worker) => !worker.isRunning);
     }
-    async forkWorker(retry = 0) {
-        if (utils_js_1.isShuttingDown.current)
-            return { error: 'Master process is shutting down' };
-        cluster_1.default.setupPrimary({
-            args: ['--browser', this.browser, ...(this.gridUrl ? ['--gridUrl', this.gridUrl] : []), ...process.argv.slice(2)],
-        });
-        const worker = cluster_1.default.fork();
-        const message = await new Promise((resolve) => {
-            const readyHandler = (message) => {
-                if (!(0, types_js_1.isWorkerMessage)(message) || message.type == 'port')
-                    return;
-                worker.off('message', readyHandler);
-                resolve(message);
-            };
-            worker.on('message', readyHandler);
-        });
-        if (message.type != 'error')
-            return worker;
-        this.gracefullyKill(worker);
-        if (retry == FORK_RETRIES)
-            return message.payload;
-        return this.forkWorker(retry + 1);
-    }
     exitHandler(worker) {
         // eslint-disable-next-line @typescript-eslint/no-misused-promises
         worker.once('exit', async () => {
             if (utils_js_1.isShuttingDown.current)
                 return;
-            const workerOrError = await this.forkWorker();
+            const workerOrError = await this.scheduler.forkWorker(this.browser, this.storybookUrl, this.gridUrl);
             if (!(workerOrError instanceof cluster_1.Worker))
                 throw new Error(`Can't instantiate worker for ${this.browser} due many errors`);
             this.exitHandler(workerOrError);
@@ -141,16 +98,6 @@ class Pool extends events_1.EventEmitter {
             this.process();
         });
     }
-    gracefullyKill(worker) {
-        worker.isShuttingDown = true;
-        const timeout = setTimeout(() => {
-            worker.kill();
-        }, 10000);
-        worker.on('exit', () => {
-            clearTimeout(timeout);
-        });
-        (0, messages_js_1.sendShutdownMessage)(worker);
-    }
     shouldRetry(test) {
         return test.retries < this.maxRetries && !this.forcedStop;
     }
@@ -175,9 +122,9 @@ class Pool extends events_1.EventEmitter {
                     unsubscribe();
                 });
                 if (message.payload.subtype == 'unknown') {
-                    this.gracefullyKill(worker);
+                    (0, utils_js_1.gracefullyKill)(worker);
                 }
-                this.handleTestResult(worker, test, { status: 'failed', error: message.payload.error });
+                this.handleTestResult(worker, test, { status: 'failed', error: message.payload.error, retries: test.retries });
             }),
             (0, messages_js_1.subscribeOnWorker)(worker, 'test', (message) => {
                 if (message.type != 'end')

package/dist/server/master/pool.js.map

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

package/dist/server/master/queue.d.ts

@@ -0,0 +1,13 @@
+import { Worker } from '../../types.js';
+type MaybeWorker = Worker | {
+    error: string;
+};
+export declare class WorkerQueue {
+    private useQueue;
+    private isProcessing;
+    private queue;
+    constructor(useQueue: boolean);
+    forkWorker(browser: string, storybookUrl: string, gridUrl?: string, retry?: number): Promise<MaybeWorker>;
+    private process;
+}
+export {};

package/dist/server/master/queue.js

@@ -0,0 +1,71 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WorkerQueue = void 0;
+const cluster_1 = __importDefault(require("cluster"));
+const types_js_1 = require("../../types.js");
+const utils_js_1 = require("../utils.js");
+const FORK_RETRIES = 5;
+class WorkerQueue {
+    useQueue;
+    isProcessing = false;
+    queue = [];
+    // TODO Add concurrency
+    constructor(useQueue) {
+        this.useQueue = useQueue;
+    }
+    async forkWorker(browser, storybookUrl, gridUrl, retry = 0) {
+        return new Promise((resolve) => {
+            this.queue.push({ browser, storybookUrl, gridUrl, retry, resolve });
+            void this.process();
+        });
+    }
+    async process() {
+        if (this.useQueue && this.isProcessing)
+            return;
+        const { browser, storybookUrl, gridUrl, retry, resolve } = this.queue.pop() ?? {};
+        if (browser == undefined || storybookUrl == undefined || retry == undefined || resolve == undefined)
+            return;
+        if (utils_js_1.isShuttingDown.current) {
+            resolve({ error: 'Master process is shutting down' });
+            return;
+        }
+        this.isProcessing = true;
+        cluster_1.default.setupPrimary({
+            args: [
+                '--browser',
+                browser,
+                ...(gridUrl ? ['--gridUrl', gridUrl] : []),
+                ...process.argv.slice(2),
+                '--storybookUrl',
+                storybookUrl,
+            ],
+        });
+        const worker = cluster_1.default.fork();
+        const message = await new Promise((resolve) => {
+            const readyHandler = (message) => {
+                if (!(0, types_js_1.isWorkerMessage)(message) || message.type == 'port')
+                    return;
+                worker.off('message', readyHandler);
+                resolve(message);
+            };
+            worker.on('message', readyHandler);
+        });
+        if (message.type == 'error') {
+            (0, utils_js_1.gracefullyKill)(worker);
+            if (retry == FORK_RETRIES)
+                resolve(message.payload);
+            else
+                this.queue.push({ browser, storybookUrl, gridUrl, retry: retry + 1, resolve });
+        }
+        else {
+            resolve(worker);
+        }
+        this.isProcessing = false;
+        setImmediate(() => void this.process());
+    }
+}
+exports.WorkerQueue = WorkerQueue;
+//# sourceMappingURL=queue.js.map

package/dist/server/master/queue.js.map

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

package/dist/server/master/runner.d.ts

@@ -5,7 +5,10 @@ export default class Runner extends EventEmitter {
     private screenDir;
     private reportDir;
     private browsers;
+    private scheduler;
     private pools;
+    private fakeRunner;
+    private config;
     tests: Partial<Record<string, ServerTest>>;
     get isRunning(): boolean;
     constructor(config: Config, gridUrl?: string);