start tunnel as a task

Author: parthlambdatest

src/commander/exec.ts

@@ -11,6 +11,7 @@ import exec from '../tasks/exec.js'
 import processSnapshots from '../tasks/processSnapshot.js'
 import finalizeBuild from '../tasks/finalizeBuild.js'
 import snapshotQueue from '../lib/snapshotQueue.js'
+import startTunnel from '../tasks/startTunnel.js'
 
 const command = new Command();
 
@@ -42,6 +43,7 @@ command
                 authExec(ctx),
                 startServer(ctx),
                 getGitInfo(ctx),
+                ...(ctx.config.tunnel && ctx.config.tunnel?.type === 'auto' ? [startTunnel(ctx)] : []),
                 createBuildExec(ctx),
                 exec(ctx),
                 processSnapshots(ctx),

src/lib/utils.ts

@@ -384,11 +384,12 @@ export async function startTunnelBinary(ctx: Context) {
     if (tunnelConfig?.tunnelName) {
         tunnelArguments.tunnelName = tunnelConfig.tunnelName
     } else {
-        const randomNumber = Math.floor(100000 + Math.random() * 900000);
+        const randomNumber = Math.floor(1000000 + Math.random() * 9000000);
         let randomTunnelName = `smartui-cli-Node-tunnel-${randomNumber}`
         tunnelArguments.tunnelName = randomTunnelName;
         ctx.config.tunnel.tunnelName = randomTunnelName
     }
+    tunnelArguments.environment = 'stage'
 
     ctx.log.debug(`tunnel config ${JSON.stringify(tunnelArguments)}`)
 
@@ -452,10 +453,8 @@ export async function stopTunnelHelper(ctx: Context) {
     const tunnelRunningStatus = await tunnelInstance.isRunning();
     ctx.log.debug('Running status of tunnel before stopping ? ' + tunnelRunningStatus);
 
-    if (tunnelRunningStatus) {
-        const status = await tunnelInstance.stop();
-        ctx.log.debug('Tunnel is Stopped ? ' + status);
-    }
+    const status = await tunnelInstance.stop();
+    ctx.log.debug('Tunnel is Stopped ? ' + status);
 } 
 
 

src/tasks/createBuildExec.ts

@@ -10,19 +10,7 @@ export default (ctx: Context): ListrTask<Context, ListrRendererFactory, ListrRen
         task: async (ctx, task): Promise<void> => {
             updateLogContext({task: 'createBuild'});
 
-            let errorCode = 0;
             try {
-                if (ctx.config.tunnel && ctx.config.tunnel?.type === 'auto') {
-                    try {
-                        await startTunnelBinary(ctx);
-                        ctx.isStartExec = true;
-                    } catch (error: any) {
-                        ctx.log.debug(`Error starting the tunnel: ${error.message}`);
-                        errorCode = 1; 
-                        throw new Error(`Error while starting tunnel binary: ${error.message}`);
-                    }
-                }
-
                 if (ctx.authenticatedInitially && !ctx.config.skipBuildCreation) {
                     let resp = await ctx.client.createBuild(ctx.git, ctx.config, ctx.log, ctx.build.name, ctx.isStartExec);
                     ctx.build = {
@@ -78,13 +66,8 @@ export default (ctx: Context): ListrTask<Context, ListrRendererFactory, ListrRen
                 if (ctx.config.tunnel && ctx.config.tunnel?.type === 'auto') {
                     await stopTunnelHelper(ctx)
                 }
-                if (errorCode === 1) {
-                    task.output = chalk.gray(error.message);
-                    throw new Error('Skipped SmartUI build creation');
-                } else {
-                    task.output = chalk.gray(error.message);
-                    throw new Error('SmartUI build creation failed');
-                }
+                task.output = chalk.gray(error.message);
+                throw new Error('SmartUI build creation failed');
             }
         },
         rendererOptions: { persistentOutput: true }

src/tasks/startTunnel.ts

@@ -0,0 +1,26 @@
+import { ListrTask, ListrRendererFactory } from 'listr2';
+import { Context } from '../types.js'
+import chalk from 'chalk';
+import { updateLogContext } from '../lib/logger.js';
+import { startTunnelBinary } from '../lib/utils.js';
+
+export default (ctx: Context): ListrTask<Context, ListrRendererFactory, ListrRendererFactory>  =>  {
+    return {
+        title: `Starting Tunnel`,
+        task: async (ctx, task): Promise<void> => {
+            updateLogContext({task: 'startTunnel'});
+
+            try {
+                await startTunnelBinary(ctx);
+                ctx.isStartExec = true;
+                task.title = 'Tunnel Started';
+                task.output = 'Tunnel started successfully';
+            } catch (error: any) {
+                ctx.log.debug(error);
+                task.output = chalk.gray(error.message);
+                throw new Error('Error while starting tunnel binary');
+            }
+        },
+        rendererOptions: { persistentOutput: true }
+    }
+}