@testim/testim-cli 3.233.0 → 3.234.0

package/commons/testimCloudflare.js

@@ -15,7 +15,7 @@ const TUNNEL_BINARY_PATHNAME = {
     linuxia32: { path: 'cloudflared-linux-386' },
     linuxx64: { path: 'cloudflared-linux-amd64' },
 };
-const TUNNEL_BINARY_DIRECTORY = `${os.tmpdir()}/cloudflared`;
+const TUNNEL_BINARY_DIRECTORY = os.tmpdir();
 const TUNNEL_BINARY_LOCATION = `${TUNNEL_BINARY_DIRECTORY}/cloudflared`;
 
 
@@ -32,11 +32,12 @@ async function prepareTunnel() {
     if (!downloadUrl) {
         throw new Error(`tunnel on ${os.platform() + os.arch()} platform is not supported.`);
     }
-    const destination = downloadUrl.extract ? path.extname(downloadUrl.path) : downloadUrl.path;
+    const destination = downloadUrl.extract ? TUNNEL_BINARY_DIRECTORY + downloadUrl.path : TUNNEL_BINARY_LOCATION;
     await downloadAndSave(`${TUNNEL_BINARY_ORIGIN}/${downloadUrl.path}`, destination);
     if (downloadUrl.extract) {
         await unzipFile(destination, TUNNEL_BINARY_DIRECTORY);
     }
+    await fse.chmodSync(TUNNEL_BINARY_LOCATION, '755');
 }
 
 const connectTunnel = async (options) => {
@@ -45,17 +46,18 @@ const connectTunnel = async (options) => {
         prepareTunnel(),
     ]);
     tunnelId = result._id;
-    tunnelProcess = spawn('./cloudflared', ['tunnel', '--no-autoupdate', 'run', '--force', '--token', result.token], { cwd: TUNNEL_BINARY_DIRECTORY, stdio: 'inherit' });
+    tunnelProcess = spawn(TUNNEL_BINARY_LOCATION, ['tunnel', '--no-autoupdate', 'run', '--force', '--token', result.token], { stdio: 'inherit' });
     await servicesApi.forceUpdateCloudflareTunnelRoutes(options.company.companyId, tunnelId);
     await fse.writeFileSync(options.tunnelRoutesOutput, JSON.stringify(result.routesMapping, null, 2));
 };
 
 const disconnectTunnel = async (options) => {
+    const promises = [];
     if (tunnelId) {
-        await servicesApi.deleteCloudflareTunnel(options.company.companyId, tunnelId);
+        promises.push(servicesApi.deleteCloudflareTunnel(options.company.companyId, tunnelId));
     }
     if (tunnelProcess) {
-        await new Promise((resolve, reject) => {
+        promises.push(new Promise((resolve, reject) => {
             tunnelProcess.on('close', (code) => {
                 if (code) {
                     reject();
@@ -63,8 +65,9 @@ const disconnectTunnel = async (options) => {
                 resolve();
             });
             tunnelProcess.kill();
-        });
+        }));
     }
+    return await Promise.all(promises);
 };
 
 module.exports = {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@testim/testim-cli",
-  "version": "3.233.0",
+  "version": "3.234.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@testim/testim-cli",
-      "version": "3.233.0",
+      "version": "3.234.0",
       "license": "Proprietary",
       "dependencies": {
         "@applitools/eyes-sdk-core": "13.2.0",

package/package.json

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

package/processHandler.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-console */
+
 'use strict';
 
 const logger = require('./commons/logger').getLogger('process-handler');
@@ -6,9 +8,12 @@ const exitHooks = [];
 const Promise = require('bluebird');
 
 module.exports = function (onExit) {
-    process.on('uncaughtException', async (err) => {
+    async function cleanup(err) {
         // give cleanup and socket reports a chance to run
         await Promise.all(exitHooks.map(x => x())).timeout(10000).catch(() => {});
+        onExit(err);
+    }
+    process.on('uncaughtException', async (err) => {
         logger.error('Caught exception', { err });
         console.log('Uncaught exception');
         if (err.message) {
@@ -17,7 +22,7 @@ module.exports = function (onExit) {
         if (err.reason) {
             console.log('Reason =', err.reason);
         }
-        onExit(err);
+        await cleanup(err);
     });
 
     process.on('unhandledRejection', (reason) => {
@@ -40,7 +45,7 @@ module.exports = function (onExit) {
         const msg = 'Runner aborted - SIGTERM event';
         const err = new Error(msg);
         logger.error(msg);
-        onExit(err);
+        cleanup(err);
         throw err;
     });
 
@@ -48,7 +53,7 @@ module.exports = function (onExit) {
         const msg = 'Runner aborted - SIGINT event';
         const err = new Error(msg);
         logger.error(msg);
-        onExit(err);
+        cleanup(err);
         throw err;
     });