@testim/testim-cli 3.201.0 → 3.205.0

package/commons/featureFlags.js

@@ -54,6 +54,7 @@ class FeatureFlagsService {
             useSameBrowserForMultiTests: new LabFeatureFlag('labs'),
             highSpeedMode: new LabFeatureFlag(),
             usePortedHtml5DragDrop: new Rox.Flag(),
+            applitoolsNewIntegration: new Rox.Flag(),
         };
         Rox.register('default', this.flags);
     }

package/commons/getSessionPlayerRequire.js

@@ -1,10 +1,30 @@
-"use strict";
+'use strict';
 
 const perf = require('./performance-logger');
 
 perf.log('getSessionPlayerRequire start');
 const getSessionPlayerFolder = require('./prepareRunnerAndTestimStartUtils').getSessionPlayerFolder;
+
 const testimAppDataFolder = getSessionPlayerFolder();
-const sessionPlayer = require(require('path').join(testimAppDataFolder, "sessionPlayer.js"));
+/**
+ * @type {{
+        sessionPlayer: typeof import('../../../clickim/src/background/session/sessionPlayer').SessionPlayer;
+        utils: typeof import('../../../clickim/src/lib/utils').utils;
+        commonConstants: typeof import('../../../clickim/src/common/commonConstantsStrong');
+        locatorBuilderUtils: import('../../../clickim/src/locators/locatorBuilderUtils')['locatorBuilderUtils'];
+        assetService: import('../../../clickim/src/background/assetService')['assetService'];
+        localAssetService: import('../../../clickim/src/background/localAssetService');
+        urlUtils: import('../../../clickim/src/background/portMatch/urlUtils');
+        positionUtils: import('../../../clickim/src/lib/positionUtils');
+        visibilityUtils: import('../../../clickim/src/background/visibilityUtils');
+        apiCall: import('../../../clickim/src/common/playback/apiCall')['apiCall'];
+        stepParamBuilder: typeof import('../../../clickim/src/common/stepParamsBuilder').StepParamsBuilder;
+        stepParamExpressionEvaluator: import('../../../clickim/src/common/stepParamExpressionEvaluator');
+        manifestVersion: string | undefined;
+        EyeSdkBuilder: typeof import('../../../clickim/src/background/eyeSdkBuilder').EyeSdkBuilder
+    }}
+ */
+const sessionPlayer = require(require('path').join(testimAppDataFolder, 'sessionPlayer.js')); // eslint-disable-line import/no-dynamic-require
+
 module.exports = sessionPlayer;
 perf.log('getSessionPlayerRequire end');

package/commons/logger.js

@@ -1,7 +1,9 @@
 'use strict';
 
-const bunyan = require('bunyan');
+const winston = require('winston');
+const os = require('os');
 
+const hostname = os.hostname();
 const runnerVersion = getRunnerVersion();
 const config = require('./config');
 
@@ -24,42 +26,45 @@ function getRunnerVersion() {
 }
 
 function getStreamsAndWaitForFlushPromise() {
-    const level = config.LOGGER_DEBUG ? 'debug' : 'info';
-    const streams = [];
+    const transports = [];
 
     let waitForFlush = () => Promise.resolve();
 
     if (!config.IS_ON_PREM) {
-        const CoralogixBunyan = require('../lib/coralogix-bunyan.stream');
+        const { CoralogixTransport } = require('../lib/coralogix-winston.transport');
 
-        waitForFlush = CoralogixBunyan.CoralogixStream.waitForFlush;
-
-        CoralogixBunyan.CoralogixStream.configure(loggerConfig);
-        streams.push({
-            level,
-            stream: new CoralogixBunyan.CoralogixStream({ category: 'ROOT' }),
-            type: 'raw',
+        CoralogixTransport.configure(loggerConfig);
+        const loggerInstance = new CoralogixTransport({
+            category: 'ROOT',
         });
+        transports.push(loggerInstance);
+
+        waitForFlush = () => loggerInstance.waitForFlush();
     }
 
     if (config.LOGGER_CONSOLE) {
-        const PrettyStream = require('bunyan-prettystream');
-        const prettyStdOut = new PrettyStream();
-        prettyStdOut.pipe(process.stdout);
-        streams.push({
-            level,
-            stream: prettyStdOut,
-            type: 'raw',
-        });
+        transports.push(new winston.transports.Console({
+            format: winston.format.combine(winston.format.colorize(), winston.format.simple()),
+        }));
     }
-    return [streams, waitForFlush];
+    return [transports, waitForFlush];
 }
 
-const [streams, waitForFlush] = getStreamsAndWaitForFlushPromise();
+const [transports, waitForFlush] = getStreamsAndWaitForFlushPromise();
+const level = config.LOGGER_DEBUG ? 'debug' : 'info';
+const defaultMeta = {};
+if (isLocal.indexOf('@echo') === -1) {
+    Object.assign(defaultMeta, devFlags());
 
-const bunyanMainLogger = bunyan.createLogger({
-    name: 'runner',
-    streams,
+} else {
+    Object.assign(defaultMeta, localFlags());
+}
+
+const winstonMainLogger = winston.createLogger({
+    levels: winston.config.syslog.levels,
+    level,
+    transports,
+    defaultMeta: { name: 'runner', hostname, nodeVersion: process.version, runnerVersion, ...defaultMeta },
 });
 
 let executionId = null;
@@ -77,8 +82,8 @@ function setProxyUri(proxyUri) {
     if (config.IS_ON_PREM || !proxyUri) {
         return;
     }
-    const CoralogixBunyan = require('../lib/coralogix-bunyan.stream');
-    CoralogixBunyan.CoralogixStream.configure({ ...loggerConfig, proxyUri });
+    const { CoralogixTransport } = require('../lib/coralogix-winston.transport');
+    CoralogixTransport.configure({ ...loggerConfig, proxyUri });
 }
 
 function releaseFlags() {
@@ -102,53 +107,58 @@ function localFlags() {
     };
 }
 
-function addExecutionId(logData = {}) {
-    if (executionId && !logData.executionId) {
+function addExecutionMetadata(dataExecutionId) {
+    const logData = {};
+    if (executionId && !dataExecutionId) {
         logData.executionId = executionId;
     }
 
-    logData.runnerVersion = runnerVersion;
     logData.projectId = projectId;
-    logData.nodeVersion = process.version;
-
-    if (isLocal.indexOf('@echo') === -1) {
-        Object.assign(logData, devFlags());
-
+    logData.time = (new Date()).toISOString();
 
-        return logData;
-    }
-
-    Object.assign(logData, localFlags());
     return logData;
 }
 
 class Logger {
     constructor(logger) {
         this._logger = logger;
-    }
-
-    trace(msg, data = {}) {
-        this._logger.trace(addExecutionId(data), msg);
+        this.debug = this.debug.bind(this);
+        this.info = this.info.bind(this);
+        this.warn = this.warn.bind(this);
+        this.error = this.error.bind(this);
+        this.fatal = this.fatal.bind(this);
     }
 
     debug(msg, data = {}) {
-        this._logger.debug(addExecutionId(data), msg);
+        this.innerLog('debug', msg, data);
     }
 
     info(msg, data = {}) {
-        this._logger.info(addExecutionId(data), msg);
+        this.innerLog('info', msg, data);
     }
 
     warn(msg, data = {}) {
-        this._logger.warn(addExecutionId(data), msg);
+        this.innerLog('warning', msg, data);
     }
 
     error(msg, data = {}) {
-        this._logger.error(addExecutionId(data), msg);
+        this.innerLog('error', msg, data);
     }
 
     fatal(msg, data = {}) {
-        this._logger.fatal(addExecutionId(data), msg);
+        this.innerLog('crit', msg, data);
+    }
+
+    innerLog(level, msg, data = {}) {
+        try {
+            this._logger.log(level, Object.assign({ meta: data }, { message: msg }, addExecutionMetadata(data.executionId)));
+        } catch (err) {
+            try {
+                this._logger.log('crit', Object.assign({ message: `failed to log message ${err.message}, ${err.stack}` }, addExecutionMetadata(data.executionId)));
+            } catch (err) {
+                // well what can we do
+            }
+        }
     }
 
     waitForFlush() {
@@ -157,7 +167,7 @@ class Logger {
 }
 
 function getLogger(loggerName) {
-    return new Logger(bunyanMainLogger.child({ category: loggerName }));
+    return new Logger(winstonMainLogger.child({ category: loggerName }));
 }
 
 module.exports = {

package/commons/testimServicesApi.js

@@ -428,6 +428,19 @@ function addTestRetry({
     }), DEFAULT_REQUEST_RETRY);
 }
 
+/**
+ * @param {string} projectId
+ * @returns {Promise<import('../../../clickim/src/common/api/testimApplitoolsApi').ApplitoolsIntegrationData>}
+ */
+function getApplitoolsIntegrationData(projectId) {
+    try {
+        return getWithAuth(`/integration/applitools/v3/connected?projectId=${projectId}`);
+    } catch (err) {
+        logger.warn('could\'nt get applitools integration data.', { err });
+        return {};
+    }
+}
+
 module.exports = {
     getS3Artifact,
     getTestPlan,
@@ -459,4 +472,5 @@ module.exports = {
     getHybridGridProvider,
     loadTest,
     isTestResultCompleted,
+    getApplitoolsIntegrationData,
 };

package/lib/coralogix-winston.transport.js

@@ -0,0 +1,99 @@
+const { Log, Severity, CoralogixLogger } = require('@testim/coralogix-logger');
+const TransportStream = require('winston-transport');
+
+const severityMap = {
+    silly: Severity.verbose,
+    verbose: Severity.verbose,
+    info: Severity.info,
+    http: Severity.info,
+    warn: Severity.warning,
+    warning: Severity.warning,
+    error: Severity.error,
+    silent: Severity.verbose,
+    critical: Severity.critical,
+    crit: Severity.critical,
+    debug: Severity.debug,
+};
+
+const errorProps = ['err', 'error', 'reason', 'e'];
+
+class CoralogixTransport extends TransportStream {
+    constructor(options) {
+        options = Object.assign({}, CoralogixTransport.options, options);
+        super(options);
+        this.options = options;
+        this.logger = new CoralogixLogger(options.category);
+        this.name = 'Coralogix Transport';
+        if (options.timestamp) {
+            this.timestamp = options.timestamp;
+        }
+    }
+
+    log(info, callback) {
+        const { category, level, message: msg, meta: infoMeta = {}, ...restMeta } = info;
+        const meta = Object.assign({}, infoMeta, this.options.extraFields, restMeta);
+        const log = new Log();
+
+        log.severity = severityMap[level];
+        log.text = msg;
+        log.category = category;
+        if (meta.className) {
+            log.className = meta.className;
+        }
+        if (meta.methodName) {
+            log.methodName = meta.methodName;
+        }
+        if (meta.threadId) {
+            log.threadId = meta.threadId;
+        }
+        delete meta.className;
+        delete meta.methodName;
+        delete meta.threadId;
+        delete meta.category;
+        delete meta.level;
+        delete meta.message;
+        let errorOverride = false;
+        if (infoMeta instanceof Error) {
+            errorOverride = true;
+            meta.msg = infoMeta.message + infoMeta.stack;
+            if (msg) {
+                meta.msg = `${msg}\n${meta.msg}`;
+            }
+        }
+
+        for (const prop of errorProps) {
+            if (infoMeta[prop] instanceof Error) {
+                meta[prop] = {
+                    message: infoMeta[prop].message,
+                    stack: infoMeta[prop].stack,
+                    name: infoMeta[prop].name,
+                    type: infoMeta[prop].type,
+                    cause: infoMeta[prop].cause,
+                    ...infoMeta[prop],
+                };
+            }
+        }
+
+        // still have keys after deleting the above
+        if (Object.keys(meta).length > 0) {
+            if (msg && !errorOverride) {
+                meta.msg = msg;
+            }
+            log.text = meta;
+        }
+
+        this.logger.addLog(log);
+        callback(null, true);
+    }
+
+    waitForFlush() {
+        return this.logger.waitForFlush();
+    }
+
+    static configure(config) {
+        CoralogixLogger.configure(config);
+        CoralogixTransport.options = config;
+    }
+}
+
+module.exports.CoralogixTransport = CoralogixTransport;

package/npm-shrinkwrap.json

@@ -165,9 +165,9 @@
           }
         },
         "ws": {
-          "version": "7.5.5",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
-          "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w=="
+          "version": "7.5.6",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz",
+          "integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA=="
         }
       }
     },
@@ -607,6 +607,16 @@
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@dabh/diagnostics": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz",
+      "integrity": "sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==",
+      "requires": {
+        "colorspace": "1.1.x",
+        "enabled": "2.0.x",
+        "kuler": "^2.0.0"
+      }
+    },
     "@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -1550,9 +1560,9 @@
           }
         },
         "ws": {
-          "version": "7.5.5",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
-          "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w=="
+          "version": "7.5.6",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz",
+          "integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA=="
         }
       }
     },
@@ -2297,22 +2307,6 @@
       "integrity": "sha1-HEF554ak9Sl6XT6LxQlazp2RjDU=",
       "dev": true
     },
-    "bunyan": {
-      "version": "1.8.15",
-      "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.15.tgz",
-      "integrity": "sha512-0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig==",
-      "requires": {
-        "dtrace-provider": "~0.8",
-        "moment": "^2.19.3",
-        "mv": "~2",
-        "safe-json-stringify": "~1"
-      }
-    },
-    "bunyan-prettystream": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/bunyan-prettystream/-/bunyan-prettystream-0.1.3.tgz",
-      "integrity": "sha1-bDtxMmb2rTIAfHtqsemYokU0nZg="
-    },
     "bytes": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
@@ -2386,9 +2380,9 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001282",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001282.tgz",
-      "integrity": "sha512-YhF/hG6nqBEllymSIjLtR2iWDDnChvhnVJqp+vloyt2tEHFG1yBR+ac2B/rOw0qOK0m0lEXU2dv4E/sMk5P9Kg==",
+      "version": "1.0.30001283",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001283.tgz",
+      "integrity": "sha512-9RoKo841j1GQFSJz/nCXOj0sD7tHBtlowjYlrqIUS812x9/emfBLBt6IyMz1zIaYc/eRL8Cs6HPUVi2Hzq4sIg==",
       "dev": true
     },
     "caseless": {
@@ -2538,9 +2532,9 @@
           }
         },
         "ws": {
-          "version": "7.5.5",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
-          "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w=="
+          "version": "7.5.6",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz",
+          "integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA=="
         }
       }
     },
@@ -2558,9 +2552,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "16.11.9",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.9.tgz",
-          "integrity": "sha512-MKmdASMf3LtPzwLyRrFjtFFZ48cMf8jmX5VRYrDQiJa8Ybu5VAmkqBWqKU8fdCwD8ysw4mQ9nrEHvzg6gunR7A=="
+          "version": "16.11.10",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.10.tgz",
+          "integrity": "sha512-3aRnHa1KlOEEhJ6+CvyHKK5vE9BcLGjtUpwvqYLRvYNQKMfabu3BwfJaA/SLW8dxe28LsNDjtHwePTuzn3gmOA=="
         },
         "mkdirp": {
           "version": "0.5.5",
@@ -2569,14 +2563,6 @@
           "requires": {
             "minimist": "^1.2.5"
           }
-        },
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "requires": {
-            "glob": "^7.1.3"
-          }
         }
       }
     },
@@ -2734,6 +2720,30 @@
         "object-visit": "^1.0.0"
       }
     },
+    "color": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
+      "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
+      "requires": {
+        "color-convert": "^1.9.3",
+        "color-string": "^1.6.0"
+      },
+      "dependencies": {
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+        }
+      }
+    },
     "color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -2747,12 +2757,35 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
+    "color-string": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.7.4.tgz",
+      "integrity": "sha512-nVdUvPVgZMpRQad5dcsCMOSB5BXLljklTiaxS6ehhKxDsAI5sD7k5VmFuBt1y3Rlym8uulc/ANUN/bMWtBu6Sg==",
+      "requires": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
     "color-support": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
       "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
       "dev": true
     },
+    "colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="
+    },
+    "colorspace": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz",
+      "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==",
+      "requires": {
+        "color": "^3.1.3",
+        "text-hex": "1.0.x"
+      }
+    },
     "combine-source-map": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz",
@@ -3445,15 +3478,6 @@
         }
       }
     },
-    "dtrace-provider": {
-      "version": "0.8.8",
-      "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.8.tgz",
-      "integrity": "sha512-b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg==",
-      "optional": true,
-      "requires": {
-        "nan": "^2.14.0"
-      }
-    },
     "duplexify": {
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
@@ -3530,9 +3554,9 @@
       "integrity": "sha512-GJCAeDBKfREgkBtgrYSf9hQy9kTb3helv0zGdzqhM7iAkW8FA/ZF97VQDbwFiwIT8MQLLOe5VlPZOEvZAqtUAQ=="
     },
     "electron-to-chromium": {
-      "version": "1.3.904",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.904.tgz",
-      "integrity": "sha512-x5uZWXcVNYkTh4JubD7KSC1VMKz0vZwJUqVwY3ihsW0bst1BXDe494Uqbg3Y0fDGVjJqA8vEeGuvO5foyH2+qw==",
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.4.tgz",
+      "integrity": "sha512-teHtgwcmVcL46jlFvAaqjyiTLWuMrUQO1JqV303JKB4ysXG6m8fXSFhbjal9st0r9mNskI22AraJZorb1VcLVg==",
       "dev": true
     },
     "emoji-regex": {
@@ -3541,6 +3565,11 @@
       "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
       "dev": true
     },
+    "enabled": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz",
+      "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="
+    },
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
@@ -4095,6 +4124,11 @@
         "pend": "~1.2.0"
       }
     },
+    "fecha": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz",
+      "integrity": "sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q=="
+    },
     "figures": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
@@ -4351,6 +4385,11 @@
         "readable-stream": "^2.3.6"
       }
     },
+    "fn.name": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
+      "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="
+    },
     "follow-redirects": {
       "version": "1.14.5",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz",
@@ -5780,15 +5819,6 @@
             "semver": "^6.0.0"
           }
         },
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -6068,9 +6098,9 @@
           }
         },
         "ws": {
-          "version": "7.5.5",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
-          "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w=="
+          "version": "7.5.6",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz",
+          "integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA=="
         }
       }
     },
@@ -6200,6 +6230,11 @@
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="
     },
+    "kuler": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
+      "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="
+    },
     "last-run": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
@@ -6484,6 +6519,18 @@
         }
       }
     },
+    "logform": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/logform/-/logform-2.3.0.tgz",
+      "integrity": "sha512-graeoWUH2knKbGthMtuG1EfaSPMZFZBIrhuJHhkS5ZseFBrc7DupCzihOQAzsK/qIKPQaPJ/lFQFctILUY5ARQ==",
+      "requires": {
+        "colors": "^1.2.1",
+        "fecha": "^4.2.0",
+        "ms": "^2.1.1",
+        "safe-stable-stringify": "^1.1.0",
+        "triple-beam": "^1.3.0"
+      }
+    },
     "lru-cache": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
@@ -7180,32 +7227,11 @@
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
       "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
     },
-    "mv": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
-      "integrity": "sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=",
-      "optional": true,
-      "requires": {
-        "mkdirp": "~0.5.1",
-        "ncp": "~2.0.0",
-        "rimraf": "~2.4.0"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "optional": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        }
-      }
-    },
     "nan": {
       "version": "2.15.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
       "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==",
+      "dev": true,
       "optional": true
     },
     "nanomatch": {
@@ -7232,12 +7258,6 @@
       "resolved": "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz",
       "integrity": "sha1-IKMYwwy0X3H+et+/eyHJnBRy7xE="
     },
-    "ncp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
-      "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
-      "optional": true
-    },
     "negotiator": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
@@ -10691,15 +10711,6 @@
           "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
           "dev": true
         },
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
         "safe-buffer": {
           "version": "5.1.2",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -10948,6 +10959,14 @@
         "wrappy": "1"
       }
     },
+    "one-time": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz",
+      "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==",
+      "requires": {
+        "fn.name": "1.x.x"
+      }
+    },
     "onetime": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
@@ -12101,27 +12120,11 @@
       "integrity": "sha512-vKz+kzolWbL3rke/xeTE2+6vHmZnNxGyDnaVW4OckntAIcc7DcZzWkQSfxMDwqHS8vhgySnIFyBUH7lIk6PxvQ=="
     },
     "rimraf": {
-      "version": "2.4.5",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
-      "integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=",
-      "optional": true,
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
       "requires": {
-        "glob": "^6.0.1"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "6.0.4",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
-          "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
-          "optional": true,
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        }
+        "glob": "^7.1.3"
       }
     },
     "rox-node": {
@@ -12160,12 +12163,6 @@
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
       "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
     },
-    "safe-json-stringify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz",
-      "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==",
-      "optional": true
-    },
     "safe-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
@@ -12175,6 +12172,11 @@
         "ret": "~0.1.10"
       }
     },
+    "safe-stable-stringify": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz",
+      "integrity": "sha512-ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw=="
+    },
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -12356,6 +12358,21 @@
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
       "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="
     },
+    "simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+      "requires": {
+        "is-arrayish": "^0.3.1"
+      },
+      "dependencies": {
+        "is-arrayish": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+          "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
+        }
+      }
+    },
     "sinon": {
       "version": "9.0.2",
       "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.0.2.tgz",
@@ -12677,15 +12694,6 @@
             "semver": "^6.0.0"
           }
         },
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -12941,9 +12949,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.2",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+          "version": "4.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
           "requires": {
             "ms": "2.1.2"
           }
@@ -13061,6 +13069,11 @@
         "minimatch": "^3.0.4"
       }
     },
+    "text-hex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
+      "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="
+    },
     "threads": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/threads/-/threads-0.12.0.tgz",
@@ -13221,6 +13234,11 @@
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
       "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
     },
+    "triple-beam": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz",
+      "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="
+    },
     "ts-node": {
       "version": "8.10.1",
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.10.1.tgz",
@@ -13796,6 +13814,53 @@
         "string-width": "^1.0.2 || 2 || 3 || 4"
       }
     },
+    "winston": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz",
+      "integrity": "sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw==",
+      "requires": {
+        "@dabh/diagnostics": "^2.0.2",
+        "async": "^3.1.0",
+        "is-stream": "^2.0.0",
+        "logform": "^2.2.0",
+        "one-time": "^1.0.0",
+        "readable-stream": "^3.4.0",
+        "stack-trace": "0.0.x",
+        "triple-beam": "^1.3.0",
+        "winston-transport": "^4.4.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-3.2.2.tgz",
+          "integrity": "sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g=="
+        },
+        "is-stream": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+          "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
+    "winston-transport": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.0.tgz",
+      "integrity": "sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw==",
+      "requires": {
+        "readable-stream": "^2.3.7",
+        "triple-beam": "^1.2.0"
+      }
+    },
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testim/testim-cli",
-  "version": "3.201.0",
+  "version": "3.205.0",
   "description": "Command line interface for running Testing on your CI",
   "author": "Oren Rubin",
   "contributors": [{
@@ -60,8 +60,8 @@
     "bluebird": "3.7.2",
     "bluebird-retry": "0.11.0",
     "body-parser": "1.19.0",
-    "bunyan": "1.8.15",
-    "bunyan-prettystream": "0.1.3",
+    "winston": "3.3.3",
+    "winston-transport": "4.4.0",
     "chalk": "4.1.0",
     "chrome-launcher": "0.13.4",
     "combine-source-map": "0.8.0",

package/player/stepActions/pixelValidationStepAction.js

@@ -9,19 +9,22 @@ class PixelValidationStepAction extends StepAction {
     async performAction() {
         const { shouldUseVisualGrid, applitoolsSdkConfig: config, testResultId } = this.context;
         this.runContext = this.context.getRunContext(undefined);
-        const eyeManager = await eyeSdkService.getManager(shouldUseVisualGrid, this.context.config.applitoolsConcurrency || 5, testResultId);
+        const batchId = (config.batch && config.batch.id) || testResultId;
+        const eyeManager = await eyeSdkService.getManager(shouldUseVisualGrid, this.context.config.applitoolsConcurrency || 5, batchId, this.runContext.applitoolsIntegrationData);
         const targetElementData = this.getTarget() || {};
+        let result;
         try {
             const openedEye = await eyeManager.openEyes({ driver: this.driver.client, config });
             const region = (this.step.action === 'element' && targetElementData.seleniumElement) || undefined;
             await openedEye.check({ settings: { region, fully: this.step.action === 'stitched' } });
             const eyesResults = await openedEye.close();
 
-            return { isApplitoolsSdkResult: true, success: true, eyesResults };
+            result = { isApplitoolsSdkResult: true, success: true, eyesResults };
         } catch (err) {
             logger.error('Applitools SDK step failed', { err, info: err.info });
-            return { isApplitoolsSdkResult: true, success: false, err };
+            result = { isApplitoolsSdkResult: true, success: false, err };
         }
+        return await eyeSdkService.handleApplitoolsSdkResult(this.context, result);
     }
 }
 

package/player/utils/eyeSdkService.js

@@ -1,9 +1,10 @@
-// https://github.com/applitools/eyes.sdk.javascript1/blob/master/packages/eyes-webdriverio-4/src/spec-driver.ts
-
 /**
- * @type {{ EyeSdkBuilder: typeof import('../../../../clickim/src/background/eyeSdkBuilder').EyeSdkBuilder }}
+ * @typedef {typeof import('../../../../clickim/src/background/eyeSdkBuilder').EyeSdkBuilder} EyeSdkBuilder
+ * @typedef {import('@applitools/types').SpecDriver} SpecDriver
+ * @typedef {import('@applitools/types').Core} Core
  */
-const sessionPlayer = require('../../commons/getSessionPlayerRequire');
+
+const { EyeSdkBuilder } = require('../../commons/getSessionPlayerRequire');
 const { makeSDK } = require('@applitools/eyes-sdk-core');
 const { W3C_ELEMENT_ID } = require('../constants');
 const _ = require('lodash');
@@ -31,7 +32,8 @@ function getValueOrFallbackIfNullOrUndefined(value, fallback) {
 }
 
 /**
- * @typedef {import('@applitools/types').SpecDriver} SpecDriver
+ * Applitools Spec Driver for webdriverIO 4.
+ * @see https://github.com/applitools/eyes.sdk.javascript1/blob/master/packages/eyes-webdriverio-4/src/spec-driver.ts
  * @implements {SpecDriver}
  */
 class EyesSpec {
@@ -215,20 +217,19 @@ class EyesSpec {
 
 class EyeSdkService {
     constructor() {
-        /**
-         * @typedef {import('@applitools/types').Core} Core
-         * @type {Core}
-         */
+        /** @type {Core} */
         this.sdk = makeSDK({
             name: 'Testim.io',
             version: '4.0.0',
             spec: new EyesSpec(),
             VisualGridClient: require('@applitools/visual-grid-client'),
         });
+        /** @type {EyeSdkBuilder['handleApplitoolsSdkResult']} */
+        this.handleApplitoolsSdkResult = EyeSdkBuilder.handleApplitoolsSdkResult;
     }
-    async getManager(useVisualGrid, concurrency, batchId) {
+    async getManager(useVisualGrid, concurrency, batchId, applitoolsIntegrationData) {
         const manager = await this.sdk.makeManager({ type: useVisualGrid ? 'vg' : 'classic', concurrency });
-        sessionPlayer.EyeSdkBuilder.rememberCreatedBatch(batchId);
+        EyeSdkBuilder.rememberCreatedBatch(batchId, applitoolsIntegrationData);
         return manager;
     }
 }

package/runners/TestPlanRunner.js

@@ -19,6 +19,7 @@ const { getSuite, calcTestResultStatus, validateConfig } = require('./runnerUtil
 const { StopRunOnError, ArgError } = require('../errors');
 const Logger = require('../commons/logger');
 const perf = require('../commons/performance-logger');
+const featureFlags = require('../commons/featureFlags');
 
 const guid = utils.guid;
 const logger = Logger.getLogger('test-plan-runner');
@@ -75,6 +76,34 @@ class TestPlanRunner {
                     return catchBeforeTestsFailed(executionId);
                 }
                 throw err;
+            })
+            .finally(async () => {
+                if ((tpOptions.lightweightMode && tpOptions.lightweightMode.disablePixelValidation) || !featureFlags.flags.applitoolsNewIntegration.isEnabled()) {
+                    return;
+                }
+                // When sessionPlayer is available, use it - as it only attempts to close batches that exist.
+                if (tpOptions.mode === constants.CLI_MODE.SELENIUM) {
+                    const { EyeSdkBuilder } = require('../commons/getSessionPlayerRequire');
+                    await EyeSdkBuilder.closeBatch(executionId);
+                    return;
+                }
+                try {
+                    if (!tpOptions.company || !tpOptions.company.activePlan || !tpOptions.company.activePlan.premiumFeatures || !tpOptions.company.activePlan.premiumFeatures.applitools) {
+                        return;
+                    }
+                    const applitoolsIntegrationData = await testimServicesApi.getApplitoolsIntegrationData(tpOptions.project);
+                    if (_.isEmpty(applitoolsIntegrationData)) {
+                        return;
+                    }
+                    const { runKey: apiKey, url: serverUrl } = applitoolsIntegrationData;
+                    const tmpSDK = require('@applitools/eyes-sdk-core').makeSDK({ name: 'Testim.io', version: '4.0.0', spec: {} });
+                    await tmpSDK.closeBatches({ batchIds: [executionId], serverUrl, apiKey });
+                } catch (err) {
+                    if (err.message && err.message.startsWith('Request failed with status code 404')) { // If a batch with this name did not exist, do not log an error.
+                        return;
+                    }
+                    logger.error('Failed closing batch in extension mode', { err, projectId: tpOptions.project });
+                }
             });
     }
 

package/services/gridService.js

@@ -50,13 +50,12 @@ function getSerializableObject(grid) {
         (tunnel && grid.hybrid.external && grid.hybrid.external[grid.hybrid.tunnel] && grid.hybrid.external[grid.hybrid.tunnel].user) : user;
     const tunnelKey = type === gridTypes.HYBRID ?
         (tunnel && grid.hybrid.external && grid.hybrid.external[grid.hybrid.tunnel] && grid.hybrid.external[grid.hybrid.tunnel].key) : key;
-    const arn = (grid && grid.external && grid.external.arn) || (tunnel && grid.hybrid.external && grid.hybrid.external[grid.hybrid.tunnel] && grid.hybrid.external[grid.hybrid.tunnel].arn);
     const name = grid && grid.name;
     const gridId = grid && (grid._id || grid.gridId);
     const provider = grid && grid.provider;
 
     return {
-        host, port, path, protocol, accessToken, slotId, gridId, tunnel, user, key, type, name, arn, provider, tunnelUser, tunnelKey,
+        host, port, path, protocol, accessToken, slotId, gridId, tunnel, user, key, type, name, provider, tunnelUser, tunnelKey,
     };
 }
 

package/testRunHandler.js

@@ -237,6 +237,12 @@ TestRun.prototype.clearTestResult = function () {
     if (this._options.mockNetworkRules) {
         runData.mockNetworkRules = this._options.mockNetworkRules;
     }
+    const mustClearPreviousStepResults = !this.isAllowReportTestResultRetries() && (this._timeoutRetryCount > 1 || this._retryCount > 1);
+
+    if (this._options.lightweightMode && this._options.lightweightMode.disableResults &&
+        !mustClearPreviousStepResults) {
+        return Promise.resolve();
+    }
 
     this.clearTestResultFinished = testimServicesApi.uploadRunDataArtifact(this._options.project, this._testId, this._testResultId, runData)
         .catch(err => {

package/workers/BaseWorker.js

@@ -90,9 +90,7 @@ class BaseWorker {
             resultId: testRunHandler.getTestResultId(),
             seleniumSession: player.getSessionId(),
         });
-        if (this.options.lightweightMode && this.options.lightweightMode.disableResults) {
-            return undefined;
-        }
+
         return await testRunHandler.clearTestResult();
     }
 

package/lib/coralogix-bunyan.stream.js

@@ -1,56 +0,0 @@
-'use strict';
-
-// This is copied from coralogix-bunyan-stream pacakge and altered to expose waitForFlush
-
-const coralogixLogger = require('@testim/coralogix-logger');
-
-const sevMap = {
-    10: coralogixLogger.Severity.debug,
-    30: coralogixLogger.Severity.info,
-    40: coralogixLogger.Severity.warning,
-    50: coralogixLogger.Severity.error,
-    60: coralogixLogger.Severity.critical,
-    20: coralogixLogger.Severity.debug,
-};
-const CoralogixStream = (function () {
-    function CoralogixStream(options) {
-        if (!options) options = {};
-        CoralogixStream.logger = this.logger = new coralogixLogger.CoralogixLogger(options.category);
-    }
-    CoralogixStream.waitForFlush = function () {
-        return CoralogixStream.logger.waitForFlush();
-    };
-    CoralogixStream.prototype.write = function (rec) {
-        const log = new coralogixLogger.Log();
-        log.severity = sevMap[rec.level];
-        log.category = rec.category;
-        if (rec.className) log.className = rec.className;
-        if (rec.methodName) log.methodName = rec.methodName;
-        if (rec.threadId) log.threadId = rec.threadId;
-        log.text = this.removeStaticFields(rec);
-        this.logger.addLog(log);
-    };
-    CoralogixStream.prototype.removeStaticFields = function (json) {
-        delete json.threadId;
-        delete json.methodName;
-        delete json.className;
-        delete json.category;
-        return JSON.stringify(json, this.replaceErrors);
-    };
-    CoralogixStream.prototype.replaceErrors = function (key, value) {
-        if (value instanceof Error) {
-            const error = {};
-            Object.getOwnPropertyNames(value).forEach((key) => {
-                error[key] = value[key];
-            });
-            return error;
-        }
-        return value;
-    };
-    CoralogixStream.configure = function (config) {
-        coralogixLogger.CoralogixLogger.configure(config);
-    };
-    return CoralogixStream;
-}());
-
-module.exports = { CoralogixStream };