creevey 0.9.0-beta.19 → 0.9.0-beta.20

package/lib/cjs/creevey.js

@@ -28,7 +28,7 @@ if (_cluster.default.isWorker) process.on('SIGINT', _types.noop);
 if (_cluster.default.isPrimary) process.on('SIGINT', _utils.shutdown);
 const argv = (0, _minimist.default)(process.argv.slice(2), {
   string: ['browser', 'config', 'reporter', 'reportDir', 'screenDir', 'storybookUrl'],
-  boolean: ['debug', 'ui', 'saveReport', 'tests'],
+  boolean: ['debug', 'trace', 'ui', 'saveReport', 'tests'],
   default: {
     port: 3000,
     saveReport: true
@@ -42,8 +42,11 @@ const argv = (0, _minimist.default)(process.argv.slice(2), {
 });
 
 // @ts-expect-error: define log level for storybook
-global.LOGLEVEL = argv.debug ? 'debug' : 'warn';
-if (argv.debug) {
+global.LOGLEVEL = argv.trace ? 'trace' : argv.debug ? 'debug' : 'warn';
+if (argv.trace) {
+  _logger.logger.setDefaultLevel(_loglevel.levels.TRACE);
+  (0, _loglevel.setDefaultLevel)(_loglevel.levels.TRACE);
+} else if (argv.debug) {
   _logger.logger.setDefaultLevel(_loglevel.levels.DEBUG);
   (0, _loglevel.setDefaultLevel)(_loglevel.levels.DEBUG);
 } else {

package/lib/cjs/server/master/pool.js

@@ -28,6 +28,7 @@ class Pool extends _events.EventEmitter {
   }
   async init() {
     const poolSize = 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.Worker);

package/lib/cjs/server/selenium/browser.js

@@ -24,11 +24,20 @@ var _logger = require("../logger");
 var _messages = require("../messages");
 var _utils = require("../utils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// import { Options as IeOptions } from 'selenium-webdriver/ie';
+// import { Options as EdgeOptions } from 'selenium-webdriver/edge';
+// import { Options as ChromeOptions } from 'selenium-webdriver/chrome';
+// import { Options as SafariOptions } from 'selenium-webdriver/safari';
+// import { Options as FirefoxOptions } from 'selenium-webdriver/firefox';
+
+// type UnPromise<P> = P extends Promise<infer T> ? T : never;
+
 const storybookRootID = 'storybook-root';
 const DOCKER_INTERNAL = 'host.docker.internal';
 let browserLogger = _logger.logger;
 let browserName = '';
 let browser = null;
+// let context: UnPromise<ReturnType<typeof BrowsingContext>> | null = null;
 let creeveyServerHost = null;
 function getSessionData(grid, sessionId = '') {
   const gridUrl = new URL(grid);
@@ -278,6 +287,18 @@ async function takeScreenshot(browser, captureElement, ignoreElements) {
   const ignoreStyles = await insertIgnoreStyles(browser, ignoreElements);
   try {
     if (!captureElement) {
+      if (browserLogger.getLevel() <= _loglevel.levels.DEBUG) {
+        const {
+          innerWidth,
+          innerHeight
+        } = await browser.executeScript(function () {
+          return {
+            innerWidth: window.innerWidth,
+            innerHeight: window.innerHeight
+          };
+        });
+        browserLogger.debug(`Viewport size is: ${innerWidth}x${innerHeight}`);
+      }
       browserLogger.debug('Capturing viewport screenshot');
       screenshot = await browser.takeScreenshot();
       browserLogger.debug('Viewport screenshot is captured');
@@ -313,6 +334,14 @@ async function takeScreenshot(browser, captureElement, ignoreElements) {
       if (!elementRect || !windowRect) throw new Error(`Couldn't find element with selector: '${captureElement}'`);
       const isFitIntoViewport = elementRect.width + elementRect.left <= windowRect.width && elementRect.height + elementRect.top <= windowRect.height;
       if (isFitIntoViewport) browserLogger.debug(`Capturing ${_chalk.default.cyan(captureElement)}`);else browserLogger.debug(`Capturing composite screenshot image of ${_chalk.default.cyan(captureElement)}`);
+
+      // const element = await browser.findElement(By.css(captureElement));
+      // screenshot = isFitIntoViewport
+      //   ? 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);
       screenshot = isFitIntoViewport ? await browser.findElement(_seleniumWebdriver.By.css(captureElement)).takeScreenshot() :
       // TODO pointer-events: none, need to research
       await takeCompositeScreenshot(browser, windowRect, elementRect);
@@ -432,7 +461,34 @@ async function getBrowser(config, options) {
     url.username = url.username ? '********' : '';
     url.password = url.password ? '********' : '';
     browserLogger.debug(`(${browserName}) Connecting to Selenium ${_chalk.default.magenta(url.toString())}`);
-    browser = await new _seleniumWebdriver.Builder().usingServer(gridUrl).withCapabilities(capabilities).build();
+    const prefs = new _seleniumWebdriver.logging.Preferences();
+    if (options.trace) {
+      for (const type of Object.values(_seleniumWebdriver.logging.Type)) {
+        prefs.setLevel(type, _seleniumWebdriver.logging.Level.ALL);
+      }
+    }
+
+    // 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 _seleniumWebdriver.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 sessionId = (_await$browser$getSes = await browser.getSession()) === null || _await$browser$getSes === void 0 ? void 0 : _await$browser$getSes.getId();
     let browserHost = '';
     try {
@@ -454,7 +510,7 @@ async function getBrowser(config, options) {
     await (0, _utils.runSequence)([() => {
       var _browser2;
       return (_browser2 = browser) === null || _browser2 === void 0 ? void 0 : _browser2.manage().setTimeouts({
-        pageLoad: 5000,
+        pageLoad: 10000,
         script: 60000
       });
     }, () => viewport && browser && resizeViewport(browser, viewport), () => browser && openStorybookPage(browser, realAddress, config.resolveStorybookUrl), () => browser && waitForStorybook(browser)], () => !_utils.isShuttingDown.current);

package/lib/cjs/server/selenium/selenoid.js

@@ -111,8 +111,9 @@ async function startSelenoidContainer(config, debug) {
   browsers.forEach(({
     browserName,
     version = 'latest',
+    browserVersion = version,
     limit: browserLimit = 1,
-    dockerImage = `selenoid/${browserName}:${version}`
+    dockerImage = `selenoid/${browserName}:${browserVersion}`
   }) => {
     limit += browserLimit;
     images.push(dockerImage);

package/lib/cjs/server/telemetry.js

@@ -8,20 +8,22 @@ var _path = _interopRequireDefault(require("path"));
 var _https = _interopRequireDefault(require("https"));
 var _shelljs = require("shelljs");
 var _qs = require("qs");
+var _lodash = require("lodash");
+var _uuid = require("uuid");
+var _types = require("../types");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const konturGitHost = 'git.skbkontur.ru';
 const trackId = 232; // front_infra
 const origin = 'http://localhost/';
-const category = 'screenshots';
-const action = 'count';
-const label = 'full_run';
-function buildPathname(info) {
+const category = 'tests_run';
+const action = 'done';
+function buildPathname(label, info) {
   return `/track-event?${(0, _qs.stringify)({
     id: trackId,
     c: category,
     a: action,
     l: label,
-    cv: JSON.stringify(info),
+    cv: typeof info == 'string' ? info : JSON.stringify(info),
     ts: new Date().toISOString(),
     url: origin
   })}`;
@@ -63,15 +65,40 @@ function tryGetCreeveyVersion() {
     return [undefined, error];
   }
 }
+function sendRequest(options) {
+  return new Promise((resolve, reject) => {
+    const req = _https.default.request(options, res => {
+      if (res.statusCode) {
+        if (res.statusCode >= 200 && res.statusCode < 300) {
+          resolve();
+        } else if (res.statusCode >= 300 && res.statusCode < 400) {
+          reject(new Error(`Redirection error: ${res.statusCode}`));
+        } else if (res.statusCode >= 400 && res.statusCode < 500) {
+          reject(new Error(`Client error: ${res.statusCode}`));
+        } else if (res.statusCode >= 500 && res.statusCode < 600) {
+          reject(new Error(`Server error: ${res.statusCode}`));
+        } else {
+          reject(new Error(`Unexpected status code: ${res.statusCode}`));
+        }
+      } else {
+        reject(new Error('No status code received'));
+      }
+    });
+    req.on('error', reject);
+    req.end();
+  });
+}
 async function sendScreenshotsCount(config, options, status) {
   var _config$storiesProvid;
   const [repoUrl] = tryGetRepoUrl();
   const isKonturRepo = repoUrl === null || repoUrl === void 0 ? void 0 : repoUrl.includes(konturGitHost);
   if (!isKonturRepo || config.disableTelemetry) return;
+  const uuid = (0, _uuid.v4)();
   const [creeveyVersion, creeveyVersionError] = tryGetCreeveyVersion();
   const [storybookVersion, storybookVersionError] = tryGetStorybookVersion();
   const gridUrl = config.gridUrl ? sanitizeGridUrl(config.gridUrl) : undefined;
-  const info = {
+  const configMeta = {
+    runId: uuid,
     repoUrl: repoUrl ?? 'unknown',
     creeveyVersion: creeveyVersion ?? 'unknown',
     storybookVersion: storybookVersion ?? 'unknown',
@@ -83,6 +110,10 @@ async function sendScreenshotsCount(config, options, status) {
     maxRetries: config.maxRetries,
     diffOptions: config.diffOptions,
     storiesProvider: ((_config$storiesProvid = config.storiesProvider) === null || _config$storiesProvid === void 0 ? void 0 : _config$storiesProvid.providerName) ?? 'unknown',
+    errors: [creeveyVersionError, storybookVersionError].some(Boolean) ? [creeveyVersionError ? `Error while getting creevey version: ${creeveyVersionError.message}` : undefined, storybookVersionError ? `Error while getting storybook version: ${storybookVersionError.message}` : undefined].filter(Boolean) : undefined
+  };
+  const browsersMeta = {
+    runId: uuid,
     browsers: Object.fromEntries(Object.entries(config.browsers ?? {}).map(([name, browser]) => [name, typeof browser === 'object' ? {
       name: browser.name,
       gridUrl: browser.gridUrl ? sanitizeGridUrl(browser.gridUrl) : undefined,
@@ -93,39 +124,44 @@ async function sendScreenshotsCount(config, options, status) {
       limit: browser.limit,
       dockerImage: browser.dockerImage,
       'se:teamname': browser['se:teamname']
-    } : browser])),
-    tests: Object.values((status === null || status === void 0 ? void 0 : status.tests) ?? {}).filter(x => Boolean(x)).map(test => ({
-      id: test.id,
-      browser: test.browser,
-      testName: test.testName,
-      storyPath: test.storyPath,
-      status: test.status
-    })),
-    errors: [creeveyVersionError, storybookVersionError].some(Boolean) ? [creeveyVersionError ? `Error while getting creevey version: ${creeveyVersionError.message}` : undefined, storybookVersionError ? `Error while getting storybook version: ${storybookVersionError.message}` : undefined].filter(Boolean) : undefined
+    } : browser]))
   };
-  return new Promise((resolve, reject) => {
-    const req = _https.default.request({
-      host: 'metrika.kontur.ru',
-      path: buildPathname(info),
-      protocol: 'https:'
-    }, res => {
-      if (res.statusCode) {
-        if (res.statusCode >= 200 && res.statusCode < 300) {
-          resolve();
-        } else if (res.statusCode >= 300 && res.statusCode < 400) {
-          reject(new Error(`Redirection error: ${res.statusCode}`));
-        } else if (res.statusCode >= 400 && res.statusCode < 500) {
-          reject(new Error(`Client error: ${res.statusCode}`));
-        } else if (res.statusCode >= 500 && res.statusCode < 600) {
-          reject(new Error(`Server error: ${res.statusCode}`));
-        } else {
-          reject(new Error(`Unexpected status code: ${res.statusCode}`));
-        }
-      } else {
-        reject(new Error('No status code received'));
-      }
-    });
-    req.on('error', reject);
-    req.end();
+  const tests = {};
+  Object.values((status === null || status === void 0 ? void 0 : status.tests) ?? {}).filter(_types.isDefined).forEach(test => {
+    (0, _lodash.set)(tests, [...test.storyPath, test.testName, test.browser].filter(_types.isDefined), test.id);
   });
+  const testsMeta = {
+    runId: uuid,
+    tests
+  };
+  const fullPathname = buildPathname('tests', testsMeta);
+  // NOTE: Keep request path shorter than 32k symbols
+  const chunksCount = Math.ceil(fullPathname.length / 32_000);
+  let chunks = [];
+  if (chunksCount > 1) {
+    const testsString = JSON.stringify(tests);
+    const chunkSize = Math.ceil(testsString.length / chunksCount);
+    chunks = Array.from({
+      length: chunksCount
+    }).map((_, chunkIndex) => testsString.slice(chunkIndex * chunkSize, (chunkIndex + 1) * chunkSize)).map((testsPart, seq) => buildPathname('tests', {
+      runId: uuid,
+      tests: testsPart,
+      seq
+    }));
+  } else {
+    chunks = [fullPathname];
+  }
+  await Promise.all([sendRequest({
+    host: 'metrika.kontur.ru',
+    path: buildPathname('config', configMeta),
+    protocol: 'https:'
+  }), sendRequest({
+    host: 'metrika.kontur.ru',
+    path: buildPathname('browsers', browsersMeta),
+    protocol: 'https:'
+  }), ...chunks.map(chunk => sendRequest({
+    host: 'metrika.kontur.ru',
+    path: chunk,
+    protocol: 'https:'
+  }))]);
 }

package/lib/cjs/server/worker/reporter.js

@@ -16,6 +16,7 @@ const testLevels = {
   ERROR: _chalk.default.red('FAIL')
 };
 class CreeveyReporter extends _mocha.reporters.Base {
+  // TODO Output in better way, like vitest, maybe
   constructor(runner, options) {
     super(runner);
     const {

package/lib/cjs/server/worker/worker.js

@@ -171,10 +171,12 @@ async function worker(config, options) {
   const browser = await (0, _selenium.getBrowser)(config, options);
   const sessionId = (_await$browser$getSes = await (browser === null || browser === void 0 ? void 0 : browser.getSession())) === null || _await$browser$getSes === void 0 ? void 0 : _await$browser$getSes.getId();
   if (browser == null) return;
-  const interval = setInterval(() => void browser.getCurrentUrl().then(url => {
-    if (options.debug) _logger.logger.debug(`${options.browser}:${_chalk.default.gray(sessionId)}`, 'current url', _chalk.default.magenta(url));
-  }), 10 * 1000);
-  (0, _messages.subscribeOn)('shutdown', () => clearInterval(interval));
+  if (options.debug) {
+    const interval = setInterval(() => void browser.getCurrentUrl().then(url => {
+      _logger.logger.debug(`${options.browser}:${_chalk.default.gray(sessionId)}`, 'current url', _chalk.default.magenta(url));
+    }), 10 * 1000);
+    (0, _messages.subscribeOn)('shutdown', () => clearInterval(interval));
+  }
   mocha.suite.beforeAll(function () {
     this.config = config;
     this.browser = browser;
@@ -186,6 +188,18 @@ async function worker(config, options) {
     this.screenshots = screenshots;
   });
   mocha.suite.beforeEach(_selenium.switchStory);
+  if (options.trace) {
+    mocha.suite.afterEach(async function () {
+      const types = await (browser === null || browser === void 0 ? void 0 : browser.manage().logs().getAvailableLogTypes());
+      for (const type of types ?? []) {
+        const logs = await (browser === null || browser === void 0 ? void 0 : browser.manage().logs().get(type));
+        logs.forEach(log => {
+          var _this$currentTest;
+          return _logger.logger.trace(sessionId, (_this$currentTest = this.currentTest) === null || _this$currentTest === void 0 ? void 0 : _this$currentTest.titlePath().join('/'), log.toJSON());
+        });
+      }
+    });
+  }
   (0, _messages.subscribeOn)('test', message => {
     if (message.type != 'start') return;
     const test = message.payload;

package/lib/esm/creevey.js

@@ -25,7 +25,7 @@ if (cluster.isWorker) process.on('SIGINT', noop);
 if (cluster.isPrimary) process.on('SIGINT', shutdown);
 const argv = minimist(process.argv.slice(2), {
   string: ['browser', 'config', 'reporter', 'reportDir', 'screenDir', 'storybookUrl'],
-  boolean: ['debug', 'ui', 'saveReport', 'tests'],
+  boolean: ['debug', 'trace', 'ui', 'saveReport', 'tests'],
   default: {
     port: 3000,
     saveReport: true
@@ -39,8 +39,11 @@ const argv = minimist(process.argv.slice(2), {
 });
 
 // @ts-expect-error: define log level for storybook
-global.LOGLEVEL = argv.debug ? 'debug' : 'warn';
-if (argv.debug) {
+global.LOGLEVEL = argv.trace ? 'trace' : argv.debug ? 'debug' : 'warn';
+if (argv.trace) {
+  logger.setDefaultLevel(levels.TRACE);
+  setDefaultLevel(levels.TRACE);
+} else if (argv.debug) {
   logger.setDefaultLevel(levels.DEBUG);
   setDefaultLevel(levels.DEBUG);
 } else {

package/lib/esm/server/master/pool.js

@@ -20,6 +20,7 @@ export default class Pool extends EventEmitter {
   }
   async init() {
     const poolSize = 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 ClusterWorker);

package/lib/esm/server/selenium/browser.js

@@ -2,21 +2,29 @@ import { SET_GLOBALS, UPDATE_STORY_ARGS, STORY_RENDERED } from '@storybook/core-
 import chalk from 'chalk';
 import http from 'http';
 import https from 'https';
-import { getLogger } from 'loglevel';
+import { getLogger, levels } from 'loglevel';
 import prefix from 'loglevel-plugin-prefix';
 import { networkInterfaces } from 'os';
 import { PNG } from 'pngjs';
-import { Builder, By, Capabilities, Origin } from 'selenium-webdriver';
+import { Builder, By, Capabilities, Origin, logging } from 'selenium-webdriver';
+// import { Options as IeOptions } from 'selenium-webdriver/ie';
+// import { Options as EdgeOptions } from 'selenium-webdriver/edge';
+// import { Options as ChromeOptions } from 'selenium-webdriver/chrome';
+// import { Options as SafariOptions } from 'selenium-webdriver/safari';
+// import { Options as FirefoxOptions } from 'selenium-webdriver/firefox';
 import { PageLoadStrategy } from 'selenium-webdriver/lib/capabilities';
 import { isDefined, noop } from '../../types';
 import { colors, logger } from '../logger';
 import { emitStoriesMessage, subscribeOn } from '../messages';
 import { isShuttingDown, LOCALHOST_REGEXP, runSequence } from '../utils';
+// type UnPromise<P> = P extends Promise<infer T> ? T : never;
+
 const storybookRootID = 'storybook-root';
 const DOCKER_INTERNAL = 'host.docker.internal';
 let browserLogger = logger;
 let browserName = '';
 let browser = null;
+// let context: UnPromise<ReturnType<typeof BrowsingContext>> | null = null;
 let creeveyServerHost = null;
 function getSessionData(grid, sessionId = '') {
   const gridUrl = new URL(grid);
@@ -266,6 +274,18 @@ export async function takeScreenshot(browser, captureElement, ignoreElements) {
   const ignoreStyles = await insertIgnoreStyles(browser, ignoreElements);
   try {
     if (!captureElement) {
+      if (browserLogger.getLevel() <= levels.DEBUG) {
+        const {
+          innerWidth,
+          innerHeight
+        } = await browser.executeScript(function () {
+          return {
+            innerWidth: window.innerWidth,
+            innerHeight: window.innerHeight
+          };
+        });
+        browserLogger.debug(`Viewport size is: ${innerWidth}x${innerHeight}`);
+      }
       browserLogger.debug('Capturing viewport screenshot');
       screenshot = await browser.takeScreenshot();
       browserLogger.debug('Viewport screenshot is captured');
@@ -301,6 +321,14 @@ export async function takeScreenshot(browser, captureElement, ignoreElements) {
       if (!elementRect || !windowRect) throw new Error(`Couldn't find element with selector: '${captureElement}'`);
       const isFitIntoViewport = elementRect.width + elementRect.left <= windowRect.width && elementRect.height + elementRect.top <= windowRect.height;
       if (isFitIntoViewport) browserLogger.debug(`Capturing ${chalk.cyan(captureElement)}`);else browserLogger.debug(`Capturing composite screenshot image of ${chalk.cyan(captureElement)}`);
+
+      // const element = await browser.findElement(By.css(captureElement));
+      // screenshot = isFitIntoViewport
+      //   ? 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);
       screenshot = isFitIntoViewport ? await browser.findElement(By.css(captureElement)).takeScreenshot() :
       // TODO pointer-events: none, need to research
       await takeCompositeScreenshot(browser, windowRect, elementRect);
@@ -420,7 +448,34 @@ export async function getBrowser(config, options) {
     url.username = url.username ? '********' : '';
     url.password = url.password ? '********' : '';
     browserLogger.debug(`(${browserName}) Connecting to Selenium ${chalk.magenta(url.toString())}`);
-    browser = await new Builder().usingServer(gridUrl).withCapabilities(capabilities).build();
+    const prefs = new logging.Preferences();
+    if (options.trace) {
+      for (const type of Object.values(logging.Type)) {
+        prefs.setLevel(type, logging.Level.ALL);
+      }
+    }
+
+    // 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 sessionId = (_await$browser$getSes = await browser.getSession()) === null || _await$browser$getSes === void 0 ? void 0 : _await$browser$getSes.getId();
     let browserHost = '';
     try {
@@ -442,7 +497,7 @@ export async function getBrowser(config, options) {
     await runSequence([() => {
       var _browser2;
       return (_browser2 = browser) === null || _browser2 === void 0 ? void 0 : _browser2.manage().setTimeouts({
-        pageLoad: 5000,
+        pageLoad: 10000,
         script: 60000
       });
     }, () => viewport && browser && resizeViewport(browser, viewport), () => browser && openStorybookPage(browser, realAddress, config.resolveStorybookUrl), () => browser && waitForStorybook(browser)], () => !isShuttingDown.current);

package/lib/esm/server/selenium/selenoid.js

@@ -103,8 +103,9 @@ export async function startSelenoidContainer(config, debug) {
   browsers.forEach(({
     browserName,
     version = 'latest',
+    browserVersion = version,
     limit: browserLimit = 1,
-    dockerImage = `selenoid/${browserName}:${version}`
+    dockerImage = `selenoid/${browserName}:${browserVersion}`
   }) => {
     limit += browserLimit;
     images.push(dockerImage);

package/lib/esm/server/telemetry.js

@@ -2,19 +2,21 @@ import path from 'path';
 import https from 'https';
 import { exec } from 'shelljs';
 import { stringify } from 'qs';
+import { set } from 'lodash';
+import { v4 } from 'uuid';
+import { isDefined } from '../types';
 const konturGitHost = 'git.skbkontur.ru';
 const trackId = 232; // front_infra
 const origin = 'http://localhost/';
-const category = 'screenshots';
-const action = 'count';
-const label = 'full_run';
-function buildPathname(info) {
+const category = 'tests_run';
+const action = 'done';
+function buildPathname(label, info) {
   return `/track-event?${stringify({
     id: trackId,
     c: category,
     a: action,
     l: label,
-    cv: JSON.stringify(info),
+    cv: typeof info == 'string' ? info : JSON.stringify(info),
     ts: new Date().toISOString(),
     url: origin
   })}`;
@@ -56,15 +58,40 @@ function tryGetCreeveyVersion() {
     return [undefined, error];
   }
 }
+function sendRequest(options) {
+  return new Promise((resolve, reject) => {
+    const req = https.request(options, res => {
+      if (res.statusCode) {
+        if (res.statusCode >= 200 && res.statusCode < 300) {
+          resolve();
+        } else if (res.statusCode >= 300 && res.statusCode < 400) {
+          reject(new Error(`Redirection error: ${res.statusCode}`));
+        } else if (res.statusCode >= 400 && res.statusCode < 500) {
+          reject(new Error(`Client error: ${res.statusCode}`));
+        } else if (res.statusCode >= 500 && res.statusCode < 600) {
+          reject(new Error(`Server error: ${res.statusCode}`));
+        } else {
+          reject(new Error(`Unexpected status code: ${res.statusCode}`));
+        }
+      } else {
+        reject(new Error('No status code received'));
+      }
+    });
+    req.on('error', reject);
+    req.end();
+  });
+}
 export async function sendScreenshotsCount(config, options, status) {
   var _config$storiesProvid;
   const [repoUrl] = tryGetRepoUrl();
   const isKonturRepo = repoUrl === null || repoUrl === void 0 ? void 0 : repoUrl.includes(konturGitHost);
   if (!isKonturRepo || config.disableTelemetry) return;
+  const uuid = v4();
   const [creeveyVersion, creeveyVersionError] = tryGetCreeveyVersion();
   const [storybookVersion, storybookVersionError] = tryGetStorybookVersion();
   const gridUrl = config.gridUrl ? sanitizeGridUrl(config.gridUrl) : undefined;
-  const info = {
+  const configMeta = {
+    runId: uuid,
     repoUrl: repoUrl ?? 'unknown',
     creeveyVersion: creeveyVersion ?? 'unknown',
     storybookVersion: storybookVersion ?? 'unknown',
@@ -76,6 +103,10 @@ export async function sendScreenshotsCount(config, options, status) {
     maxRetries: config.maxRetries,
     diffOptions: config.diffOptions,
     storiesProvider: ((_config$storiesProvid = config.storiesProvider) === null || _config$storiesProvid === void 0 ? void 0 : _config$storiesProvid.providerName) ?? 'unknown',
+    errors: [creeveyVersionError, storybookVersionError].some(Boolean) ? [creeveyVersionError ? `Error while getting creevey version: ${creeveyVersionError.message}` : undefined, storybookVersionError ? `Error while getting storybook version: ${storybookVersionError.message}` : undefined].filter(Boolean) : undefined
+  };
+  const browsersMeta = {
+    runId: uuid,
     browsers: Object.fromEntries(Object.entries(config.browsers ?? {}).map(([name, browser]) => [name, typeof browser === 'object' ? {
       name: browser.name,
       gridUrl: browser.gridUrl ? sanitizeGridUrl(browser.gridUrl) : undefined,
@@ -86,39 +117,44 @@ export async function sendScreenshotsCount(config, options, status) {
       limit: browser.limit,
       dockerImage: browser.dockerImage,
       'se:teamname': browser['se:teamname']
-    } : browser])),
-    tests: Object.values((status === null || status === void 0 ? void 0 : status.tests) ?? {}).filter(x => Boolean(x)).map(test => ({
-      id: test.id,
-      browser: test.browser,
-      testName: test.testName,
-      storyPath: test.storyPath,
-      status: test.status
-    })),
-    errors: [creeveyVersionError, storybookVersionError].some(Boolean) ? [creeveyVersionError ? `Error while getting creevey version: ${creeveyVersionError.message}` : undefined, storybookVersionError ? `Error while getting storybook version: ${storybookVersionError.message}` : undefined].filter(Boolean) : undefined
+    } : browser]))
   };
-  return new Promise((resolve, reject) => {
-    const req = https.request({
-      host: 'metrika.kontur.ru',
-      path: buildPathname(info),
-      protocol: 'https:'
-    }, res => {
-      if (res.statusCode) {
-        if (res.statusCode >= 200 && res.statusCode < 300) {
-          resolve();
-        } else if (res.statusCode >= 300 && res.statusCode < 400) {
-          reject(new Error(`Redirection error: ${res.statusCode}`));
-        } else if (res.statusCode >= 400 && res.statusCode < 500) {
-          reject(new Error(`Client error: ${res.statusCode}`));
-        } else if (res.statusCode >= 500 && res.statusCode < 600) {
-          reject(new Error(`Server error: ${res.statusCode}`));
-        } else {
-          reject(new Error(`Unexpected status code: ${res.statusCode}`));
-        }
-      } else {
-        reject(new Error('No status code received'));
-      }
-    });
-    req.on('error', reject);
-    req.end();
+  const tests = {};
+  Object.values((status === null || status === void 0 ? void 0 : status.tests) ?? {}).filter(isDefined).forEach(test => {
+    set(tests, [...test.storyPath, test.testName, test.browser].filter(isDefined), test.id);
   });
+  const testsMeta = {
+    runId: uuid,
+    tests
+  };
+  const fullPathname = buildPathname('tests', testsMeta);
+  // NOTE: Keep request path shorter than 32k symbols
+  const chunksCount = Math.ceil(fullPathname.length / 32_000);
+  let chunks = [];
+  if (chunksCount > 1) {
+    const testsString = JSON.stringify(tests);
+    const chunkSize = Math.ceil(testsString.length / chunksCount);
+    chunks = Array.from({
+      length: chunksCount
+    }).map((_, chunkIndex) => testsString.slice(chunkIndex * chunkSize, (chunkIndex + 1) * chunkSize)).map((testsPart, seq) => buildPathname('tests', {
+      runId: uuid,
+      tests: testsPart,
+      seq
+    }));
+  } else {
+    chunks = [fullPathname];
+  }
+  await Promise.all([sendRequest({
+    host: 'metrika.kontur.ru',
+    path: buildPathname('config', configMeta),
+    protocol: 'https:'
+  }), sendRequest({
+    host: 'metrika.kontur.ru',
+    path: buildPathname('browsers', browsersMeta),
+    protocol: 'https:'
+  }), ...chunks.map(chunk => sendRequest({
+    host: 'metrika.kontur.ru',
+    path: chunk,
+    protocol: 'https:'
+  }))]);
 }

package/lib/esm/server/worker/reporter.js

@@ -9,6 +9,7 @@ const testLevels = {
   ERROR: chalk.red('FAIL')
 };
 export class CreeveyReporter extends reporters.Base {
+  // TODO Output in better way, like vitest, maybe
   constructor(runner, options) {
     super(runner);
     const {

package/lib/esm/server/worker/worker.js

@@ -164,10 +164,12 @@ export default async function worker(config, options) {
   const browser = await getBrowser(config, options);
   const sessionId = (_await$browser$getSes = await (browser === null || browser === void 0 ? void 0 : browser.getSession())) === null || _await$browser$getSes === void 0 ? void 0 : _await$browser$getSes.getId();
   if (browser == null) return;
-  const interval = setInterval(() => void browser.getCurrentUrl().then(url => {
-    if (options.debug) logger.debug(`${options.browser}:${chalk.gray(sessionId)}`, 'current url', chalk.magenta(url));
-  }), 10 * 1000);
-  subscribeOn('shutdown', () => clearInterval(interval));
+  if (options.debug) {
+    const interval = setInterval(() => void browser.getCurrentUrl().then(url => {
+      logger.debug(`${options.browser}:${chalk.gray(sessionId)}`, 'current url', chalk.magenta(url));
+    }), 10 * 1000);
+    subscribeOn('shutdown', () => clearInterval(interval));
+  }
   mocha.suite.beforeAll(function () {
     this.config = config;
     this.browser = browser;
@@ -179,6 +181,18 @@ export default async function worker(config, options) {
     this.screenshots = screenshots;
   });
   mocha.suite.beforeEach(switchStory);
+  if (options.trace) {
+    mocha.suite.afterEach(async function () {
+      const types = await (browser === null || browser === void 0 ? void 0 : browser.manage().logs().getAvailableLogTypes());
+      for (const type of types ?? []) {
+        const logs = await (browser === null || browser === void 0 ? void 0 : browser.manage().logs().get(type));
+        logs.forEach(log => {
+          var _this$currentTest;
+          return logger.trace(sessionId, (_this$currentTest = this.currentTest) === null || _this$currentTest === void 0 ? void 0 : _this$currentTest.titlePath().join('/'), log.toJSON());
+        });
+      }
+    });
+  }
   subscribeOn('test', message => {
     if (message.type != 'start') return;
     const test = message.payload;

package/lib/types/types.d.ts

@@ -251,6 +251,7 @@ export interface Options {
     ui: boolean;
     update: boolean | string;
     debug: boolean;
+    trace: boolean;
     tests: boolean;
     browser?: string;
     reporter?: string;

package/package.json

@@ -13,7 +13,7 @@
     "addon",
     "test"
   ],
-  "version": "0.9.0-beta.19",
+  "version": "0.9.0-beta.20",
   "bin": "./lib/cjs/cli.js",
   "exports": {
     ".": {
@@ -125,6 +125,7 @@
     "selenium-webdriver": "^4.25.0",
     "shelljs": "^0.8.5",
     "tsconfig-paths": "^4.0.0",
+    "uuid": "^10.0.0",
     "ws": "^8.8.0"
   },
   "devDependencies": {
@@ -169,6 +170,7 @@
     "@types/resize-observer-browser": "^0.1.7",
     "@types/shelljs": "^0.8.11",
     "@types/tmp": "^0.2.3",
+    "@types/uuid": "^10",
     "@types/webpack": "^5.28.0",
     "@types/ws": "^8.5.3",
     "@typescript-eslint/eslint-plugin": "^5.30.5",