@testim/testim-cli 3.282.0 → 3.283.0

package/commons/testimServicesApi.js

@@ -1,18 +1,19 @@
 'use strict';
 
+const _ = require('lodash');
 const pako = require('pako');
 const pRetry = require('p-retry');
-const _ = require('lodash');
-const testimCustomToken = require('./testimCustomToken');
-const constants = require('./constants');
+const hash = require('object-hash');
 const utils = require('../utils');
 const config = require('./config');
+const constants = require('./constants');
 const httpRequest = require('./httpRequest');
+const testimCustomToken = require('./testimCustomToken');
+const { ArgError } = require('../errors');
+const { getLogger } = require('./logger');
 
 const runnerVersion = utils.getRunnerVersion();
-const logger = require('./logger').getLogger('testim service api');
-const hash = require('object-hash');
-const { ArgError } = require('../errors');
+const logger = getLogger('testim service api');
 
 const DEFAULT_REQUEST_RETRY = 3;
 const GRID_PATH = '/grid';
@@ -515,9 +516,9 @@ function addTestRetry({
  * @param {string} projectId
  * @returns {Promise<import('../../../clickim/src/common/api/testimApplitoolsApi').ApplitoolsIntegrationData>}
  */
-function getApplitoolsIntegrationData(projectId) {
+async function getApplitoolsIntegrationData(projectId) {
     try {
-        return getWithAuth(`/integration/applitools/v3/connected?projectId=${projectId}`);
+        return await getWithAuth(`/integration/applitools/v3/connected?projectId=${projectId}`);
     } catch (err) {
         logger.warn('could\'nt get applitools integration data.', { err });
         return {};
@@ -525,25 +526,40 @@ function getApplitoolsIntegrationData(projectId) {
 }
 
 
-function getCloudflareTunnel(companyId, routes) {
+/**
+ * @param {string} companyId
+ * @param {string[]} routes
+ * @returns {Promise<{ _id?: string; token?: string; routesMapping?: { [k: string]: string; } }>}
+ */
+async function getCloudflareTunnel(companyId, routes) {
     try {
-        return putAuth('/tunnel', { companyId, routes });
+        return await putAuth('/tunnel', { companyId, routes });
     } catch (err) {
         logger.warn('could\'nt get tunnel.', { err });
         return {};
     }
 }
-function forceUpdateCloudflareTunnelRoutes(companyId, tunnelId) {
+/**
+ * @param {string} companyId
+ * @param {string} tunnelId
+ * @returns {Promise<void>}
+ */
+async function forceUpdateCloudflareTunnelRoutes(companyId, tunnelId) {
     try {
-        return postAuth({ url: `/tunnel/${tunnelId}`, body: { companyId } });
+        return await postAuth({ url: `/tunnel/${tunnelId}`, body: { companyId } });
     } catch (err) {
         logger.warn('could\'nt get tunnel.', { err });
-        return {};
+        return undefined;
     }
 }
-function deleteCloudflareTunnel(companyId, tunnelId) {
+/**
+ * @param {string} companyId
+ * @param {string} tunnelId
+ * @returns {Promise<void>}
+ */
+async function deleteCloudflareTunnel(companyId, tunnelId) {
     try {
-        return deleteAuth(`/tunnel/${tunnelId}`, { companyId });
+        return await deleteAuth(`/tunnel/${tunnelId}`, { companyId });
     } catch (err) {
         logger.warn('could\'nt get tunnel.', { err });
         return {};
@@ -566,7 +582,7 @@ async function getMobileDevicesFromGrid({ projectId, projectType, gridId, compan
     let url = `${GRID_PATH}/mobileDevices/${gridId}/${companyId}?projectType=${projectType}`;
     url = selectors ? `${url}&selectors=${encodeURIComponent(selectors)}` : url;
     try {
-        return pRetry(() => getWithAuth(url, { projectId }), { retries: DEFAULT_REQUEST_RETRY });
+        return await pRetry(() => getWithAuth(url, { projectId }), { retries: DEFAULT_REQUEST_RETRY });
     } catch (err) {
         logger.warn('could\'nt get devices from headspin grid.', { err });
         return null;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@testim/testim-cli",
-  "version": "3.282.0",
+  "version": "3.283.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@testim/testim-cli",
-      "version": "3.282.0",
+      "version": "3.283.0",
       "license": "Proprietary",
       "dependencies": {
         "@applitools/eyes-sdk-core": "13.11.21",
@@ -1194,9 +1194,9 @@
       }
     },
     "node_modules/@wdio/config/node_modules/minimatch": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.4.tgz",
-      "integrity": "sha512-U0iNYXt9wALljzfnGkhFSy5sAC6/SCR3JrHrlsdJz4kF8MvhTRQNiC59iUi1iqsitV7abrNAJWElVL9pdnoUgw==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -5201,9 +5201,9 @@
       }
     },
     "node_modules/filelist/node_modules/minimatch": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.4.tgz",
-      "integrity": "sha512-U0iNYXt9wALljzfnGkhFSy5sAC6/SCR3JrHrlsdJz4kF8MvhTRQNiC59iUi1iqsitV7abrNAJWElVL9pdnoUgw==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -7503,9 +7503,9 @@
       }
     },
     "node_modules/js-beautify/node_modules/minimatch": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.4.tgz",
-      "integrity": "sha512-U0iNYXt9wALljzfnGkhFSy5sAC6/SCR3JrHrlsdJz4kF8MvhTRQNiC59iUi1iqsitV7abrNAJWElVL9pdnoUgw==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dev": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -12555,9 +12555,9 @@
       }
     },
     "node_modules/readdir-glob/node_modules/minimatch": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.4.tgz",
-      "integrity": "sha512-U0iNYXt9wALljzfnGkhFSy5sAC6/SCR3JrHrlsdJz4kF8MvhTRQNiC59iUi1iqsitV7abrNAJWElVL9pdnoUgw==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -13627,9 +13627,9 @@
       }
     },
     "node_modules/socket.io-parser": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz",
-      "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.2.tgz",
+      "integrity": "sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==",
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1"
@@ -15350,9 +15350,9 @@
       }
     },
     "node_modules/webdriverio/node_modules/minimatch": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.4.tgz",
-      "integrity": "sha512-U0iNYXt9wALljzfnGkhFSy5sAC6/SCR3JrHrlsdJz4kF8MvhTRQNiC59iUi1iqsitV7abrNAJWElVL9pdnoUgw==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -16733,9 +16733,9 @@
           }
         },
         "minimatch": {
-          "version": "5.1.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.4.tgz",
-          "integrity": "sha512-U0iNYXt9wALljzfnGkhFSy5sAC6/SCR3JrHrlsdJz4kF8MvhTRQNiC59iUi1iqsitV7abrNAJWElVL9pdnoUgw==",
+          "version": "5.1.6",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+          "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
           "requires": {
             "brace-expansion": "^2.0.1"
           }
@@ -19918,9 +19918,9 @@
           }
         },
         "minimatch": {
-          "version": "5.1.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.4.tgz",
-          "integrity": "sha512-U0iNYXt9wALljzfnGkhFSy5sAC6/SCR3JrHrlsdJz4kF8MvhTRQNiC59iUi1iqsitV7abrNAJWElVL9pdnoUgw==",
+          "version": "5.1.6",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+          "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
           "requires": {
             "brace-expansion": "^2.0.1"
           }
@@ -21690,9 +21690,9 @@
           }
         },
         "minimatch": {
-          "version": "5.1.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.4.tgz",
-          "integrity": "sha512-U0iNYXt9wALljzfnGkhFSy5sAC6/SCR3JrHrlsdJz4kF8MvhTRQNiC59iUi1iqsitV7abrNAJWElVL9pdnoUgw==",
+          "version": "5.1.6",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+          "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
           "dev": true,
           "requires": {
             "brace-expansion": "^2.0.1"
@@ -25416,9 +25416,9 @@
           }
         },
         "minimatch": {
-          "version": "5.1.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.4.tgz",
-          "integrity": "sha512-U0iNYXt9wALljzfnGkhFSy5sAC6/SCR3JrHrlsdJz4kF8MvhTRQNiC59iUi1iqsitV7abrNAJWElVL9pdnoUgw==",
+          "version": "5.1.6",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+          "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
           "requires": {
             "brace-expansion": "^2.0.1"
           }
@@ -26282,9 +26282,9 @@
       }
     },
     "socket.io-parser": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz",
-      "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.2.tgz",
+      "integrity": "sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==",
       "requires": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1"
@@ -27696,9 +27696,9 @@
           }
         },
         "minimatch": {
-          "version": "5.1.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.4.tgz",
-          "integrity": "sha512-U0iNYXt9wALljzfnGkhFSy5sAC6/SCR3JrHrlsdJz4kF8MvhTRQNiC59iUi1iqsitV7abrNAJWElVL9pdnoUgw==",
+          "version": "5.1.6",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+          "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
           "requires": {
             "brace-expansion": "^2.0.1"
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testim/testim-cli",
-  "version": "3.282.0",
+  "version": "3.283.0",
   "description": "Command line interface for running Testing on your CI",
   "author": "Oren Rubin",
   "contributors": [{

package/runners/ParallelWorkerManager.js

@@ -93,9 +93,11 @@ class ParallelWorkerManager {
             const companyPlan = options.company?.planType;
             const isStartUp = options.company?.isStartUp;
             const projectName = options.projectData?.name;
+            const projectType = options.projectData?.type;
             const lightweightMode = options.lightweightMode;
             const sessionType = utils.getSessionType(options);
 
+
             /**
              * @param {number} wid
              * @param {string} testId
@@ -120,6 +122,7 @@ class ParallelWorkerManager {
                     user,
                     lightweightMode,
                     isStartUp,
+                    projectType,
                 });
                 return testStatus.testStartAndReport(wid, executionId, resultId, isRerun, testRetryKey);
             };
@@ -193,6 +196,7 @@ class ParallelWorkerManager {
                     lightweightMode,
                     logger,
                     isStartUp,
+                    projectType,
                 });
                 if (stopOnError && !testResult.success) {
                     executionQueue.stop();

package/services/analyticsService.js

@@ -31,7 +31,7 @@ function setLightweightAnalytics(properties, lightweightMode) {
 }
 
 function analyticsTestStart({
-    executionId, projectId, testId, resultId, companyId, companyName, projectName, companyPlan, sessionType, source, user, lightweightMode, isStartUp,
+    executionId, projectId, testId, resultId, companyId, companyName, projectName, companyPlan, sessionType, source, user, lightweightMode, isStartUp, projectType,
 }) {
     const properties = setLightweightAnalytics({
         executionId,
@@ -45,13 +45,14 @@ function analyticsTestStart({
         sessionType,
         source: calcSource(source, user),
         isStartUp,
+        projectType,
     }, lightweightMode);
     analytics.trackWithCIUser('test-run-ci', properties);
 }
 
 function analyticsTestEnd({
     executionId, projectId, testId, resultId, result, companyId, companyName, projectName, companyPlan, sessionType, source, user, lightweightMode,
-    logger, isStartUp,
+    logger, isStartUp, projectType,
 }) {
     try {
         const properties = setLightweightAnalytics({
@@ -67,6 +68,7 @@ function analyticsTestEnd({
             mockNetworkEnabled: result.wasMockNetworkActivated,
             source: calcSource(source, user),
             isStartUp,
+            projectType,
         }, lightweightMode);
 
         if (result.success) {
@@ -79,8 +81,6 @@ function analyticsTestEnd({
     }
 }
 
-
-
 function analyticsExecsStart({ executionId, projectId, sessionType }) {
     analytics.trackWithCIUser('batch-run-ci', {
         executionId,