testplane 9.0.0-rc.4 → 9.0.1

package/build/package.json

@@ -1,6 +1,6 @@
 {
     "name": "testplane",
-    "version": "9.0.0-rc.4",
+    "version": "9.0.1",
     "description": "Tests framework based on mocha and wdio",
     "main": "build/src/index.js",
     "files": [
@@ -30,14 +30,16 @@
         "lint": "eslint --cache . && prettier --check .",
         "reformat": "eslint --fix . && prettier --write .",
         "prettier-watch": "onchange '**' --exclude-path .prettierignore -- prettier --write {{changed}}",
-        "test-unit": "_mocha \"test/!(integration|e2e|browser-env)/**/*.[jt]s\"",
-        "test-unit:coverage": "c8 --all --src=src --reporter=html --reporter=text-summary --exclude=\"build/**\" --exclude=\"test/**\" --exclude=\"**/*.d.ts\" _mocha \"test/!(integration|browser-env|e2e)/**/*.[jt]s\"",
+        "test-unit": "node scripts/run-node-without-type-stripping.js ./node_modules/mocha/bin/_mocha \"test/!(integration|e2e|browser-env|fixtures)/**/*.[jt]s\"",
+        "test-unit:coverage": "c8 --all --src=src --reporter=html --reporter=text-summary --exclude=\"build/**\" --exclude=\"test/**\" --exclude=\"**/*.d.ts\" node scripts/run-node-without-type-stripping.js ./node_modules/mocha/bin/_mocha \"test/!(integration|browser-env|e2e)/**/*.[jt]s\"",
         "test-unit:generate-fixtures": "TS_NODE_PROJECT=test/tsconfig.json node -r ts-node/register -r tsconfig-paths/register test/src/browser/screen-shooter/composite-image/fixtures/generate.ts generate",
         "test": "npm run test-unit && npm run check-types && npm run lint",
-        "test-integration": "TS_NODE_TRANSPILE_ONLY=1 mocha -r ts-node/register test/integration/*/**",
-        "test-e2e": "npm run test-e2e:generate-fixtures && npm run test-e2e:run-tests",
-        "test-e2e:run-tests": "node bin/testplane --config test/e2e/testplane.config.ts",
-        "test-e2e:generate-fixtures": "node bin/testplane --config test/e2e/fixtures/basic-report/testplane.config.ts || true",
+        "test-integration": "TS_NODE_TRANSPILE_ONLY=1 node scripts/run-node-without-type-stripping.js ./node_modules/mocha/bin/_mocha -r ts-node/register test/integration/*/**",
+        "test-e2e": "npm run test-e2e-mocha && npm run test-e2e-testplane",
+        "test-e2e-mocha": "_mocha \"test/e2e/**/*.test.js\" --ignore \"test/e2e/**/fixture-project/**\"",
+        "test-e2e-testplane": "npm run test-e2e-testplane:generate-fixtures && npm run test-e2e-testplane:run-tests",
+        "test-e2e-testplane:run-tests": "node bin/testplane --config test/e2e/testplane.config.ts",
+        "test-e2e-testplane:generate-fixtures": "node bin/testplane --config test/e2e/fixtures/basic-report/testplane.config.ts || true",
         "test-e2e:gui": "node bin/testplane --config test/e2e/testplane.config.ts gui",
         "test-browser-env": "TS_NODE_PROJECT=./test/browser-env/tsconfig.json node bin/testplane -r tsconfig-paths/register --config test/browser-env/testplane.config.ts",
         "test-browser-env:gui": "TS_NODE_PROJECT=./test/browser-env/tsconfig.json node bin/testplane gui -r tsconfig-paths/register --config test/browser-env/testplane.config.ts",
@@ -57,7 +59,7 @@
     },
     "homepage": "https://testplane.io/",
     "engines": {
-        "node": ">= 18.0.0"
+        "node": ">= 22"
     },
     "keywords": [
         "testplane",
@@ -76,11 +78,10 @@
         "@gemini-testing/commander": "2.15.4",
         "@jspm/core": "2.0.1",
         "@jsquash/png": "3.1.1",
-        "@puppeteer/browsers": "2.7.1",
-        "@testplane/devtools": "8.32.5",
+        "@puppeteer/browsers": "3.0.4",
         "@testplane/wdio-protocols": "9.4.7",
         "@testplane/wdio-utils": "9.5.4",
-        "@testplane/webdriverio": "9.5.23",
+        "@testplane/webdriverio": "9.5.28",
         "@vitest/spy": "2.1.4",
         "buffer-crc32": "1.0.0",
         "chalk": "2.4.2",
@@ -91,8 +92,6 @@
         "error-stack-parser": "2.1.4",
         "esbuild": "0.25.8",
         "expect-webdriverio": "3.6.0",
-        "extract-zip": "2.0.1",
-        "fastq": "1.13.0",
         "fs-extra": "7.0.1",
         "geckodriver": "4.5.0",
         "gemini-configparser": "1.4.2",
@@ -103,6 +102,7 @@
         "looks-same": "10.0.1",
         "micromatch": "4.0.5",
         "mocha": "10.2.0",
+        "p-limit": "3.1.0",
         "pirates": "4.0.7",
         "plugins-loader": "1.3.4",
         "png-validator": "1.1.0",
@@ -133,7 +133,7 @@
         "@rrweb/record": "2.0.0-alpha.18",
         "@sinonjs/fake-timers": "10.3.0",
         "@swc/core": "1.13.3",
-        "@testplane/wdio-types": "9.5.4",
+        "@testplane/wdio-types": "9.5.5",
         "@types/babel__code-frame": "7.0.6",
         "@types/browserify": "12.0.40",
         "@types/chai": "4.3.4",
@@ -147,7 +147,7 @@
         "@types/lodash": "4.14.191",
         "@types/micromatch": "4.0.9",
         "@types/mocha": "10.0.1",
-        "@types/node": "18.19.3",
+        "@types/node": "24.13.1",
         "@types/proper-lockfile": "4.1.4",
         "@types/proxyquire": "1.3.28",
         "@types/set-cookie-parser": "2.4.10",

package/build/src/base-testplane.d.ts

@@ -5,9 +5,13 @@ import { ConfigInput } from "./config/types";
 export declare abstract class BaseTestplane extends AsyncEmitter {
     protected _interceptors: Interceptor[];
     protected _config: Config;
-    static create<T extends BaseTestplane>(this: new (config?: string | ConfigInput) => T, config?: string | ConfigInput): T;
+    protected _initEventEmited: boolean;
+    private _pendingConfig?;
+    static create<T extends BaseTestplane>(this: new (config?: string | ConfigInput) => T, config?: string | ConfigInput): Promise<T>;
     protected constructor(config?: string | ConfigInput);
-    protected _init(): Promise<void>;
+    protected _setup(): Promise<void>;
+    /** @note Only the first call returns a promise to wait for INIT handlers to complete, subsequent calls return immediately to avoid deadlocks */
+    protected _emitInitEventOnce(): Promise<void>;
     get config(): Config;
     get events(): Events;
     get errors(): typeof Errors;

package/build/src/base-testplane.js

@@ -10,22 +10,35 @@ const config_1 = require("./config");
 const events_1 = require("./events");
 const errors_1 = __importDefault(require("./errors"));
 const typescript_1 = require("./utils/typescript");
+const repl_module_hooks_1 = require("./utils/repl-module-hooks");
 class BaseTestplane extends events_1.AsyncEmitter {
-    static create(config) {
-        return new this(config);
+    static async create(config) {
+        const instance = new this(config);
+        await instance._setup();
+        return instance;
     }
     constructor(config) {
         super();
         this._interceptors = [];
+        this._initEventEmited = false;
         this._interceptors = [];
+        this._pendingConfig = config;
+    }
+    async _setup() {
+        (0, repl_module_hooks_1.registerReplModuleHooks)();
         (0, typescript_1.registerTransformHook)(this.isWorker());
-        this._config = config_1.Config.create(config);
+        this._config = await config_1.Config.create(this._pendingConfig);
+        this._pendingConfig = undefined;
         (0, typescript_1.updateTransformHook)(this._config);
         this._setLogLevel();
         this._loadPlugins();
     }
-    async _init() {
-        this._init = () => Promise.resolve(); // init only once
+    /** @note Only the first call returns a promise to wait for INIT handlers to complete, subsequent calls return immediately to avoid deadlocks */
+    async _emitInitEventOnce() {
+        if (this._initEventEmited) {
+            return;
+        }
+        this._initEventEmited = true;
         await this.emitAndWait(events_1.MasterEvents.INIT);
     }
     get config() {

package/build/src/base-testplane.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-testplane.js","sourceRoot":"","sources":["../../src/base-testplane.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,oEAA2C;AAC3C,qCAAkC;AAClC,qCAQkB;AAClB,sDAA8B;AAC9B,mDAAgF;AAGhF,MAAsB,aAAc,SAAQ,qBAAY;IAIpD,MAAM,CAAC,MAAM,CAET,MAA6B;QAE7B,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED,YAAsB,MAA6B;QAC/C,KAAK,EAAE,CAAC;QAXF,kBAAa,GAAkB,EAAE,CAAC;QAaxC,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QAExB,IAAA,kCAAqB,EAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,OAAO,GAAG,eAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACrC,IAAA,gCAAmB,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAElC,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,YAAY,EAAE,CAAC;IACxB,CAAC;IAES,KAAK,CAAC,KAAK;QACjB,IAAI,CAAC,KAAK,GAAG,GAAkB,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,iBAAiB;QACtE,MAAM,IAAI,CAAC,WAAW,CAAC,qBAAY,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,IAAI,MAAM;QACN,OAAO,gBAAC,CAAC,MAAM,CAAC,EAAE,EAAE,qBAAY,EAAE,qBAAY,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,MAAM;QACN,OAAO,gBAAM,CAAC;IAClB,CAAC;IAED,SAAS,CAAC,KAAuB,EAAE,OAAyB;QACxD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QAE5C,OAAO,IAAI,CAAC;IAChB,CAAC;IAIS,YAAY;QAClB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,gBAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;QAC/F,CAAC;IACL,CAAC;IAES,YAAY;QAClB,wBAAa,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC/D,CAAC;CACJ;AA1DD,sCA0DC"}
+{"version":3,"file":"base-testplane.js","sourceRoot":"","sources":["../../src/base-testplane.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,oEAA2C;AAC3C,qCAAkC;AAClC,qCAQkB;AAClB,sDAA8B;AAC9B,mDAAgF;AAChF,iEAAoE;AAGpE,MAAsB,aAAc,SAAQ,qBAAY;IAMpD,MAAM,CAAC,KAAK,CAAC,MAAM,CAEf,MAA6B;QAE7B,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC;QAElC,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC;QAExB,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,YAAsB,MAA6B;QAC/C,KAAK,EAAE,CAAC;QAjBF,kBAAa,GAAkB,EAAE,CAAC;QAElC,qBAAgB,GAAY,KAAK,CAAC;QAiBxC,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;IACjC,CAAC;IAES,KAAK,CAAC,MAAM;QAClB,IAAA,2CAAuB,GAAE,CAAC;QAC1B,IAAA,kCAAqB,EAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,OAAO,GAAG,MAAM,eAAM,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACxD,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;QAChC,IAAA,gCAAmB,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAElC,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,YAAY,EAAE,CAAC;IACxB,CAAC;IAED,gJAAgJ;IACtI,KAAK,CAAC,kBAAkB;QAC9B,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,OAAO;QACX,CAAC;QAED,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,MAAM,IAAI,CAAC,WAAW,CAAC,qBAAY,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,IAAI,MAAM;QACN,OAAO,gBAAC,CAAC,MAAM,CAAC,EAAE,EAAE,qBAAY,EAAE,qBAAY,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,MAAM;QACN,OAAO,gBAAM,CAAC;IAClB,CAAC;IAED,SAAS,CAAC,KAAuB,EAAE,OAAyB;QACxD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QAE5C,OAAO,IAAI,CAAC;IAChB,CAAC;IAIS,YAAY;QAClB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,gBAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;QAC/F,CAAC;IACL,CAAC;IAES,YAAY;QAClB,wBAAa,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC/D,CAAC;CACJ;AA1ED,sCA0EC"}

package/build/src/browser/browser.d.ts

@@ -31,6 +31,7 @@ export declare class Browser {
     protected _customCommands: Set<CustomCommand>;
     protected _wdPool?: WebdriverPool;
     protected _wdProcess: WdProcess | null;
+    protected _exitError?: Error;
     /** This Promise is awaited after test is finished. Can be used for cleanup.
        Right now is used to wait for time travel snapshots to finish collecting */
     protected _snapshotsPromiseRef: history.PromiseRef;
@@ -58,4 +59,5 @@ export declare class Browser {
     get snapshotsPromiseRef(): history.PromiseRef;
     get customCommands(): CustomCommand[];
     get emitter(): AsyncEmitter;
+    get exitError(): Error | undefined;
 }

package/build/src/browser/browser.js

@@ -109,11 +109,12 @@ class Browser {
                     if (!lodash_1.default.isNull(this._config[optName])) {
                         req = this._config[optName](req);
                     }
-                    if (!req.headers["X-Request-ID"]) {
-                        req.headers["X-Request-ID"] = `${this.state.testXReqId}${browser_1.X_REQUEST_ID_DELIMITER}${crypto_1.default.randomUUID()}`;
+                    const requestHeaders = req.headers;
+                    if (!requestHeaders["X-Request-ID"]) {
+                        requestHeaders["X-Request-ID"] = `${this.state.testXReqId}${browser_1.X_REQUEST_ID_DELIMITER}${crypto_1.default.randomUUID()}`;
                     }
-                    if (!req.headers["traceparent"] && this.state.traceparent) {
-                        req.headers["traceparent"] = this.state.traceparent;
+                    if (!requestHeaders["traceparent"] && this.state.traceparent) {
+                        requestHeaders["traceparent"] = this.state.traceparent;
                     }
                     return req;
                 };
@@ -166,6 +167,9 @@ class Browser {
     get emitter() {
         return this._emitter;
     }
+    get exitError() {
+        return this._exitError;
+    }
 }
 exports.Browser = Browser;
 //# sourceMappingURL=browser.js.map

package/build/src/browser/browser.js.map

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

package/build/src/browser/calibrator.js

@@ -52,8 +52,11 @@ class Calibrator {
         const image = await browser.captureViewportImage();
         const { innerWidth, pixelRatio } = features;
         const hasPixelRatio = Boolean(pixelRatio && pixelRatio > 1.0);
-        const screenshotSize = (await image.getSize());
-        const imageFeatures = await this._findMarkerAreaInImage(image);
+        const screenshotSize = image.getSize();
+        const searchColor = image.hasICCPChunk
+            ? await image.getRGB(Math.floor(screenshotSize.width / 2), Math.floor(screenshotSize.height / 2))
+            : { R: 148, G: 250, B: 0 };
+        const imageFeatures = await this._findMarkerAreaInImage(image, searchColor);
         if (!imageFeatures) {
             const screenshotPath = path_1.default.join(node_os_1.default.tmpdir(), "testplane-calibration-page.png");
             await image.save(screenshotPath);
@@ -71,11 +74,11 @@ class Calibrator {
         this._cache[browser.id] = calibratedFeatures;
         return calibratedFeatures;
     }
-    async _findMarkerAreaInImage(image) {
-        const imageHeight = (await image.getSize()).height;
+    async _findMarkerAreaInImage(image, searchColor) {
+        const imageHeight = image.getSize().height;
         let topPart = null;
         for (let y = 0; y < imageHeight; y++) {
-            const result = await findMarkerXBandInRow(y, image);
+            const result = await findMarkerXBandInRow(y, image, searchColor);
             if (result) {
                 topPart = {
                     top: y,
@@ -90,7 +93,7 @@ class Calibrator {
             return null;
         }
         for (let y = (imageHeight - 1); y >= 0; y--) {
-            const result = await findMarkerXBandInRow(y, image);
+            const result = await findMarkerXBandInRow(y, image, searchColor);
             if (result) {
                 const bottomPart = {
                     top: 0,
@@ -105,12 +108,12 @@ class Calibrator {
     }
 }
 exports.Calibrator = Calibrator;
-async function findMarkerXBandInRow(row, image) {
-    const markerStart = await findMarkerStartInRow(row, image);
+async function findMarkerXBandInRow(row, image, searchColor) {
+    const markerStart = await findMarkerStartInRow(row, image, searchColor);
     if (markerStart === null) {
         return null;
     }
-    const markerEnd = await findMarkerEndInRow(row, image);
+    const markerEnd = await findMarkerEndInRow(row, image, searchColor);
     if (markerEnd === null) {
         return null;
     }
@@ -119,24 +122,23 @@ async function findMarkerXBandInRow(row, image) {
         width: (0, isomorphic_1.getWidth)(markerStart, (markerEnd + 1)),
     };
 }
-async function isMarkerColorAtPoint(image, x, y) {
-    const searchColor = { R: 148, G: 250, B: 0 };
+async function isMarkerColorAtPoint(image, x, y, searchColor) {
     const color = await image.getRGB(x, y);
     return looks_same_1.default.colors(color, searchColor);
 }
-async function findMarkerStartInRow(row, image) {
-    const imageWidth = (await image.getSize()).width;
+async function findMarkerStartInRow(row, image, searchColor) {
+    const imageWidth = image.getSize().width;
     for (let x = 0; x < imageWidth; x++) {
-        if (await isMarkerColorAtPoint(image, x, row)) {
+        if (await isMarkerColorAtPoint(image, x, row, searchColor)) {
             return x;
         }
     }
     return null;
 }
-async function findMarkerEndInRow(row, image) {
-    const imageWidth = (await image.getSize()).width;
+async function findMarkerEndInRow(row, image, searchColor) {
+    const imageWidth = image.getSize().width;
     for (let x = (imageWidth - 1); x >= 0; x--) {
-        if (await isMarkerColorAtPoint(image, x, row)) {
+        if (await isMarkerColorAtPoint(image, x, row, searchColor)) {
             return x;
         }
     }

package/build/src/browser/calibrator.js.map

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

package/build/src/browser/camera/index.d.ts

@@ -1,11 +1,15 @@
 import { Image } from "../../image";
+import type { CropMargins } from "./utils";
 import { type Point, type Rect, type Size } from "../isomorphic/geometry";
 export type ScreenshotMode = "fullpage" | "viewport" | "auto";
+export type { CropMargins } from "./utils";
 export interface CaptureViewportImageOpts {
     viewportOffset: Point<"page", "device">;
     viewportSize: Size<"device">;
     /** Delay before taking the screenshot, in milliseconds. */
     screenshotDelay?: number;
+    /** Additional raw screenshot margins to crop, in physical pixels. */
+    cropMargins?: CropMargins;
 }
 export declare class Camera {
     private _screenshotMode;
@@ -15,8 +19,8 @@ export declare class Camera {
     private _debugTmpDir;
     static create(screenshotMode: ScreenshotMode, takeScreenshot: () => Promise<string>): Camera;
     constructor(screenshotMode: ScreenshotMode, takeScreenshot: () => Promise<string>);
-    calibrate(calibratedArea: Rect<"image", "device">, screenshotSize?: Size<"device">): void;
+    calibrate(calibratedArea: Rect<"image", "device">, screenshotSize: Size<"device">): void;
     captureViewportImage(opts?: CaptureViewportImageOpts): Promise<Image>;
-    private _cropAreaToCalibratedArea;
+    private _cropAreaToIntersection;
     private _cropAreaToViewport;
 }

package/build/src/browser/camera/index.js

@@ -54,7 +54,7 @@ class Camera {
     calibrate(calibratedArea, screenshotSize) {
         debug("Setting calibrated area: %O for screenshot size: %O", calibratedArea, screenshotSize ?? null);
         this._calibratedArea = calibratedArea;
-        this._calibrationScreenshotSize = screenshotSize ?? null;
+        this._calibrationScreenshotSize = screenshotSize;
     }
     async captureViewportImage(opts) {
         if (opts?.screenshotDelay) {
@@ -62,35 +62,39 @@ class Camera {
         }
         const base64 = await this._takeScreenshot();
         const image = image_1.Image.fromBase64(base64);
-        const { width, height } = (await image.getSize());
+        const { width, height } = image.getSize();
         const imageArea = {
             left: 0,
             top: 0,
             width,
             height,
         };
-        const shouldApplyCalibration = this._calibrationScreenshotSize === null ||
-            (this._calibrationScreenshotSize.width === width && this._calibrationScreenshotSize.height === height);
+        const shouldApplyCalibration = this._calibrationScreenshotSize !== null &&
+            this._calibrationScreenshotSize.width === width &&
+            this._calibrationScreenshotSize.height === height;
         const calibrationArea = shouldApplyCalibration ? this._calibratedArea : null;
-        if (!shouldApplyCalibration) {
-            debug("Skipping calibration due to screenshot size mismatch.\n  calibrationScreenshotSize: %O\n  screenshotSize: %O", this._calibrationScreenshotSize, { width, height });
+        const calibratedImageArea = this._cropAreaToIntersection(imageArea, calibrationArea);
+        const cropMarginsArea = utils.cropMarginsToRect(imageArea, opts?.cropMargins);
+        const croppedImageArea = (0, geometry_1.getIntersection)(calibratedImageArea, cropMarginsArea);
+        if (croppedImageArea === null) {
+            throw new Error(`Invalid cropMargins option: resulting screenshot crop area is empty. ` +
+                `imageSize: ${(0, geometry_1.prettySize)(imageArea)}, cropMargins: ${JSON.stringify(opts?.cropMargins)}`);
         }
-        const calibratedArea = this._cropAreaToCalibratedArea(imageArea, calibrationArea);
-        const viewportCroppedArea = this._cropAreaToViewport(calibratedArea, { width, height }, calibrationArea, opts);
-        await utils.saveViewportImageForDebugIfNeeded(image, calibratedArea, this._debugTmpDir);
+        const viewportCroppedArea = this._cropAreaToViewport(croppedImageArea, { width, height }, croppedImageArea, opts);
+        await utils.saveViewportImageForDebugIfNeeded(image, croppedImageArea, this._debugTmpDir);
         if (viewportCroppedArea.width !== width || viewportCroppedArea.height !== height) {
             await image.crop(viewportCroppedArea);
         }
         return image;
     }
-    _cropAreaToCalibratedArea(imageArea, calibrationArea) {
-        if (!calibrationArea) {
+    _cropAreaToIntersection(imageArea, cropArea) {
+        if (!cropArea) {
             return imageArea;
         }
-        const intersection = (0, geometry_1.getIntersection)(imageArea, calibrationArea);
+        const intersection = (0, geometry_1.getIntersection)(imageArea, cropArea);
         if (intersection === null) {
-            logger.warn(`No intersection found between image area and calibrated viewport area, falling back to original image area.\n` +
-                `imageArea: ${(0, geometry_1.prettyRect)(imageArea)}, calibratedViewportArea: ${(0, geometry_1.prettyRect)(calibrationArea)}\n` +
+            logger.warn(`No intersection found between image area and crop area, falling back to original image area.\n` +
+                `imageArea: ${(0, geometry_1.prettyRect)(imageArea)}, cropArea: ${(0, geometry_1.prettyRect)(cropArea)}\n` +
                 `This likely means Testplane incorrectly determined area free of system UI elements. You can let us know at ${help_1.NEW_ISSUE_LINK}, providing this log and browser used.`);
             return imageArea;
         }

package/build/src/browser/camera/index.js.map

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

package/build/src/browser/camera/utils.d.ts

@@ -1,5 +1,15 @@
-import { ScreenshotMode } from ".";
+import type { ScreenshotMode } from ".";
 import { Image } from "../../image";
 import { Rect, Size } from "../isomorphic/geometry";
+export interface CropMargins {
+    top?: number;
+    right?: number;
+    bottom?: number;
+    left?: number;
+}
+type NormalizedCropMargins = Required<CropMargins>;
 export declare const isFullPage: (imageSize: Rect<"image", "device">, viewportSize: Size<"device">, calibratedArea: Rect<"image", "device">, screenshotMode: ScreenshotMode) => boolean;
+export declare const normalizeCropMargins: (cropMargins?: CropMargins) => NormalizedCropMargins;
+export declare const cropMarginsToRect: (imageArea: Rect<"image", "device">, cropMargins?: CropMargins) => Rect<"image", "device">;
 export declare function saveViewportImageForDebugIfNeeded(viewportImage: Image, viewportCroppedArea: Rect<"image", "device">, debugDir: string | null): Promise<void>;
+export {};

package/build/src/browser/camera/utils.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.saveViewportImageForDebugIfNeeded = exports.isFullPage = void 0;
+exports.saveViewportImageForDebugIfNeeded = exports.cropMarginsToRect = exports.normalizeCropMargins = exports.isFullPage = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const geometry_1 = require("../isomorphic/geometry");
@@ -21,6 +21,32 @@ const isFullPage = (imageSize, viewportSize, calibratedArea, screenshotMode) =>
     }
 };
 exports.isFullPage = isFullPage;
+const normalizeCropMargins = (cropMargins) => {
+    const result = {
+        top: cropMargins?.top ?? 0,
+        right: cropMargins?.right ?? 0,
+        bottom: cropMargins?.bottom ?? 0,
+        left: cropMargins?.left ?? 0,
+    };
+    for (const side of ["top", "right", "bottom", "left"]) {
+        const value = result[side];
+        if (typeof value !== "number" || !Number.isFinite(value) || value < 0 || Math.floor(value) !== value) {
+            throw new Error(`Invalid cropMargins.${side} option: expected a non-negative integer, got ${String(value)}`);
+        }
+    }
+    return result;
+};
+exports.normalizeCropMargins = normalizeCropMargins;
+const cropMarginsToRect = (imageArea, cropMargins) => {
+    const margins = (0, exports.normalizeCropMargins)(cropMargins);
+    return {
+        top: margins.top,
+        left: margins.left,
+        width: imageArea.width - margins.left - margins.right,
+        height: imageArea.height - margins.top - margins.bottom,
+    };
+};
+exports.cropMarginsToRect = cropMarginsToRect;
 async function saveViewportImageForDebugIfNeeded(viewportImage, viewportCroppedArea, debugDir) {
     if (!process.env.TESTPLANE_DEBUG_SCREENSHOTS || !debugDir) {
         return;

package/build/src/browser/camera/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/browser/camera/utils.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,4CAAoB;AAGpB,qDAA+D;AAC/D,+EAAgG;AAEzF,MAAM,UAAU,GAAG,CACtB,SAAkC,EAClC,YAA4B,EAC5B,cAAuC,EACvC,cAA8B,EACvB,EAAE;IACT,0FAA0F;IAC1F,MAAM,cAAc,GAAG,cAAc,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,IAAA,oBAAS,EAAC,cAAc,CAAC,CAAC,CAAC;IAE3F,QAAQ,cAAc,EAAE,CAAC;QACrB,KAAK,UAAU;YACX,OAAO,IAAI,CAAC;QAChB,KAAK,UAAU;YACX,OAAO,KAAK,CAAC;QACjB,KAAK,MAAM;YACP,OAAO,SAAS,CAAC,MAAM,GAAG,YAAY,CAAC,MAAM,GAAG,cAAc,CAAC;IACvE,CAAC;AACL,CAAC,CAAC;AAjBW,QAAA,UAAU,cAiBrB;AAEK,KAAK,UAAU,iCAAiC,CACnD,aAAoB,EACpB,mBAA4C,EAC5C,QAAuB;IAEvB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B,IAAI,CAAC,QAAQ,EAAE,CAAC;QACxD,OAAO;IACX,CAAC;IAED,IAAI,CAAC;QACD,YAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE5C,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5D,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,SAAS,IAAI,QAAQ,MAAM,CAAC,CAAC;QAEhF,MAAM,IAAA,6CAA+B,EACjC,aAAa,EACb;YACI;gBACI,IAAI,EAAE,mBAA4D;gBAClE,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE;aACxC;SACJ,EACD,UAAU,CACb,CAAC;IACN,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,IAAI,CAAC,gDAAgD,EAAE,KAAK,CAAC,CAAC;IAC1E,CAAC;AACL,CAAC;AA7BD,8EA6BC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/browser/camera/utils.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,4CAAoB;AAGpB,qDAA+D;AAC/D,+EAAgG;AAWzF,MAAM,UAAU,GAAG,CACtB,SAAkC,EAClC,YAA4B,EAC5B,cAAuC,EACvC,cAA8B,EACvB,EAAE;IACT,0FAA0F;IAC1F,MAAM,cAAc,GAAG,cAAc,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,IAAA,oBAAS,EAAC,cAAc,CAAC,CAAC,CAAC;IAE3F,QAAQ,cAAc,EAAE,CAAC;QACrB,KAAK,UAAU;YACX,OAAO,IAAI,CAAC;QAChB,KAAK,UAAU;YACX,OAAO,KAAK,CAAC;QACjB,KAAK,MAAM;YACP,OAAO,SAAS,CAAC,MAAM,GAAG,YAAY,CAAC,MAAM,GAAG,cAAc,CAAC;IACvE,CAAC;AACL,CAAC,CAAC;AAjBW,QAAA,UAAU,cAiBrB;AAEK,MAAM,oBAAoB,GAAG,CAAC,WAAyB,EAAyB,EAAE;IACrF,MAAM,MAAM,GAAG;QACX,GAAG,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAC1B,KAAK,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC;QAC9B,MAAM,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC;QAChC,IAAI,EAAE,WAAW,EAAE,IAAI,IAAI,CAAC;KAC/B,CAAC;IAEF,KAAK,MAAM,IAAI,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAU,EAAE,CAAC;QAC7D,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,KAAK,EAAE,CAAC;YACnG,MAAM,IAAI,KAAK,CACX,uBAAuB,IAAI,iDAAiD,MAAM,CAAC,KAAK,CAAC,EAAE,CAC9F,CAAC;QACN,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAlBW,QAAA,oBAAoB,wBAkB/B;AAEK,MAAM,iBAAiB,GAAG,CAC7B,SAAkC,EAClC,WAAyB,EACF,EAAE;IACzB,MAAM,OAAO,GAAG,IAAA,4BAAoB,EAAC,WAAW,CAAC,CAAC;IAElD,OAAO;QACH,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,KAAK,EAAE,SAAS,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,KAAK;QACrD,MAAM,EAAE,SAAS,CAAC,MAAM,GAAG,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,MAAM;KAC/B,CAAC;AACjC,CAAC,CAAC;AAZW,QAAA,iBAAiB,qBAY5B;AAEK,KAAK,UAAU,iCAAiC,CACnD,aAAoB,EACpB,mBAA4C,EAC5C,QAAuB;IAEvB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B,IAAI,CAAC,QAAQ,EAAE,CAAC;QACxD,OAAO;IACX,CAAC;IAED,IAAI,CAAC;QACD,YAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE5C,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5D,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,SAAS,IAAI,QAAQ,MAAM,CAAC,CAAC;QAEhF,MAAM,IAAA,6CAA+B,EACjC,aAAa,EACb;YACI;gBACI,IAAI,EAAE,mBAA4D;gBAClE,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE;aACxC;SACJ,EACD,UAAU,CACb,CAAC;IACN,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,IAAI,CAAC,gDAAgD,EAAE,KAAK,CAAC,CAAC;IAC1E,CAAC;AACL,CAAC;AA7BD,8EA6BC"}

package/build/src/browser/cdp/connection.d.ts

@@ -3,50 +3,13 @@ import type { Browser } from "../types";
 type OnEventMessageFn = (cdpEventMessage: CDPEvent) => unknown;
 export declare class CDPConnection {
     onEventMessage: OnEventMessageFn | null;
-    private readonly _cdpWsEndpoint;
-    private readonly _headers?;
-    private _onPong;
-    private _pingInterval;
-    private _pingSubsequentFails;
-    private _onConnectionCloseFn;
-    private _wsConnectionStatus;
-    private _wsConnection;
-    private _wsConnectionPromise;
-    private _requestId;
-    private _pendingRequests;
+    private readonly _wsConnection;
     private constructor();
     /** @description Creates CDPConnection without establishing it */
     static create(browser: Browser): Promise<CDPConnection>;
-    /** @description Tries to establish ws connection with timeout */
-    private _tryToEstablishWsConnection;
-    /**
-     * @description creates ws connection with retries or returns existing one
-     * @note Concurrent requests with same params produce same ws connection
-     */
-    private _getWsConnection;
-    /** @description Handles websocket incoming messages, resolving pending requests */
+    close(): void;
     private _onMessage;
-    /**
-     * @description Produces connection-"uniq" request ids
-     * @note Theoretically, it can collide, but given "CDP_MAX_REQUEST_ID" is INT32_MAX, it wont
-     */
-    private _getRequestId;
-    /** @description establishes ws connection, sends request with timeout and waits for response */
-    private _tryToSendRequest;
     /** @description Performs high-level CDP request with retries and timeouts */
     request<T = void>(method: CDPRequest["method"], { params, sessionId }?: Omit<CDPRequest, "id" | "method">): Promise<T>;
-    private _closeWsConnection;
-    /**
-     * @description Tries to re-establish connection after network drops
-     * @note Silently gives up after failed "CDP_CONNECTION_RETRIES" attempts
-     */
-    private _tryToReconnect;
-    /** @description Used to abort all pending requests when connection is closed */
-    private _abortPendingRequests;
-    /** @description Closes websocket connection, terminating all pending requests */
-    close(): void;
-    private _pingHealthCheckStop;
-    private _isWebSocketActive;
-    private _pingHealthCheckStart;
 }
 export {};