Merge branch 'dev' of github.com:LambdaTest/smartui-cli into DOT-4051

sushobhit-lt · sushobhit-lt · commit 6cfe6a2d5d08 · 2024-11-09T16:24:17.000+05:30
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lambdatest/smartui-cli",
-  "version": "4.0.7",
+  "version": "4.0.8",
   "description": "A command line interface (CLI) to run SmartUI tests on LambdaTest",
   "files": [
     "dist/**/*"
diff --git a/src/commander/capture.ts b/src/commander/capture.ts
@@ -18,6 +18,7 @@ command
     .argument('<file>', 'Web static config file')
     .option('-P, --parallel [number]', 'Specify the number of instances per browser', parseInt)
     .option('-F, --force', 'forcefully apply the specified parallel instances per browser')
+    .option('--fetch-results [filename]', 'Fetch results and optionally specify an output file, e.g., <filename>.json')
     .action(async function(file, _, command) {
         let ctx: Context = ctxInit(command.optsWithGlobals());
         
diff --git a/src/commander/exec.ts b/src/commander/exec.ts
@@ -19,6 +19,7 @@ command
     .description('Run test commands around SmartUI')
     .argument('<command...>', 'Command supplied for running tests')
     .option('-P, --port <number>', 'Port number for the server')
+    .option('--fetch-results [filename]', 'Fetch results and optionally specify an output file, e.g., <filename>.json')
     .action(async function(execCommand, _, command) {
         let ctx: Context = ctxInit(command.optsWithGlobals());
 
diff --git a/src/commander/upload.ts b/src/commander/upload.ts
@@ -25,6 +25,7 @@ command
     .option('-i, --ignoreDir <patterns>', 'Comma-separated list of directories to ignore', val => {
         return val.split(',').map(pattern => pattern.trim());
     })
+    .option('--fetch-results [filename]', 'Fetch results and optionally specify an output file, e.g., <filename>.json')
     .action(async function(directory, _, command) {
         let ctx: Context = ctxInit(command.optsWithGlobals());
 
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
@@ -122,6 +122,10 @@ export default {
     MOBILE_ORIENTATION_PORTRAIT: 'portrait',
     MOBILE_ORIENTATION_LANDSCAPE: 'landscape',
 
+    // build status
+    BUILD_COMPLETE: 'completed',
+    BUILD_ERROR: 'error',
+
     // CI
     GITHUB_API_HOST: 'https://api.github.com',
 
diff --git a/src/lib/ctx.ts b/src/lib/ctx.ts
@@ -19,6 +19,8 @@ export default (options: Record<string, string>): Context => {
     let ignoreStripExtension: Array<string>;
     let ignoreFilePattern: Array<string>;
     let parallelObj: number;
+    let fetchResultObj: boolean;
+    let fetchResultsFileObj: string;
     try {
         if (options.config) {
             config = JSON.parse(fs.readFileSync(options.config, 'utf-8'));
@@ -44,6 +46,17 @@ export default (options: Record<string, string>): Context => {
         ignoreFilePattern = options.ignoreDir || []
 
         parallelObj = options.parallel ? options.parallel === true? 1 : options.parallel: 1;
+        if (options.fetchResults) {
+            if (options.fetchResults !== true && !options.fetchResults.endsWith('.json')) {
+                console.error("Error: The file extension for --fetch-results must be .json");
+                process.exit(1);
+            }
+            fetchResultObj = true
+            fetchResultsFileObj = options.fetchResults === true ? 'results.json' : options.fetchResults;
+        } else {
+            fetchResultObj = false
+            fetchResultsFileObj = ''
+        }
     } catch (error: any) {
         console.log(`[smartui] Error: ${error.message}`);
         process.exit();
@@ -107,6 +120,8 @@ export default (options: Record<string, string>): Context => {
             fileExtension: extensionFiles,
             stripExtension: ignoreStripExtension,
             ignorePattern: ignoreFilePattern,
+            fetchResults: fetchResultObj,
+            fetchResultsFileName: fetchResultsFileObj,
         },
         cliVersion: version,
         totalSnapshots: -1
diff --git a/src/lib/httpClient.ts b/src/lib/httpClient.ts
@@ -64,6 +64,14 @@ export default class httpClient {
         }, log)
     }
 
+    getScreenshotData(buildId: string, baseline: boolean, log: Logger) {
+        return this.request({
+            url: '/screenshot',
+            method: 'GET',
+            params: { buildId, baseline }
+        }, log);
+    }    
+
     finalizeBuild(buildId: string, totalSnapshots: number, log: Logger) {
         let params: Record<string, string | number> = {buildId};
         if (totalSnapshots > -1) params.totalSnapshots = totalSnapshots;
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
@@ -2,6 +2,9 @@ import fs from 'fs'
 import { Context } from '../types.js'
 import { chromium, firefox, webkit, Browser } from '@playwright/test'
 import constants from './constants.js';
+import chalk from 'chalk';
+
+let isPollingActive = false;
 
 export function delDir(dir: string): void {
     if (fs.existsSync(dir)) {
@@ -200,4 +203,94 @@ export function getRenderViewportsForOptions(options: any): Array<Record<string,
         ...mobileRenderViewports[constants.MOBILE_OS_IOS],
         ...mobileRenderViewports[constants.MOBILE_OS_ANDROID]
     ];
+}
+
+// Global SIGINT handler
+process.on('SIGINT', () => {
+    if (isPollingActive) {
+        console.log('Fetching results interrupted. Exiting...');
+        isPollingActive = false;
+    } else {
+        console.log('\nExiting gracefully...');
+    }
+    process.exit(0);
+});
+
+// Background polling function
+export async function startPolling(ctx: Context, task: any): Promise<void> {
+    ctx.log.info('Fetching results in progress....');
+    isPollingActive = true;
+
+    const intervalId = setInterval(async () => {
+        if (!isPollingActive) {
+            clearInterval(intervalId);
+            return;
+        }
+        
+        try {
+            const resp = await ctx.client.getScreenshotData(ctx.build.id, ctx.build.baseline, ctx.log);
+
+            if (!resp.build) {
+                ctx.log.info("Error: Build data is null.");
+                clearInterval(intervalId);
+                isPollingActive = false;
+            }
+
+            fs.writeFileSync(ctx.options.fetchResultsFileName, JSON.stringify(resp, null, 2));
+            ctx.log.debug(`Updated results in ${ctx.options.fetchResultsFileName}`);
+
+            if (resp.build.build_status_ind === constants.BUILD_COMPLETE || resp.build.build_status_ind === constants.BUILD_ERROR) {
+                clearInterval(intervalId);
+                ctx.log.info(`Fetching results completed. Final results written to ${ctx.options.fetchResultsFileName}`);
+                isPollingActive = false;
+
+
+                // Evaluating Summary
+                let totalScreenshotsWithMismatches = 0;
+                let totalVariantsWithMismatches = 0;
+                const totalScreenshots = Object.keys(resp.screenshots || {}).length;
+                let totalVariants = 0;
+
+                for (const [screenshot, variants] of Object.entries(resp.screenshots || {})) {
+                    let screenshotHasMismatch = false;
+                    let variantMismatchCount = 0;
+
+                    totalVariants += variants.length; // Add to total variants count
+
+                    for (const variant of variants) {
+                        if (variant.mismatch_percentage > 0) {
+                            screenshotHasMismatch = true;
+                            variantMismatchCount++;
+                        }
+                    }
+
+                    if (screenshotHasMismatch) {
+                        totalScreenshotsWithMismatches++;
+                        totalVariantsWithMismatches += variantMismatchCount;
+                    }
+                }
+
+                // Display summary
+                ctx.log.info(
+                    chalk.green.bold(
+                        `\nSummary of Mismatches:\n` +
+                        `${chalk.yellow('Total Variants with Mismatches:')} ${chalk.white(totalVariantsWithMismatches)} out of ${chalk.white(totalVariants)}\n` +
+                        `${chalk.yellow('Total Screenshots with Mismatches:')} ${chalk.white(totalScreenshotsWithMismatches)} out of ${chalk.white(totalScreenshots)}\n` +
+                        `${chalk.yellow('Branch Name:')} ${chalk.white(resp.build.branch)}\n` +
+                        `${chalk.yellow('Project Name:')} ${chalk.white(resp.project.name)}\n` +
+                        `${chalk.yellow('Build ID:')} ${chalk.white(resp.build.build_id)}\n`
+                    )
+                );                            
+            }
+        } catch (error: any) {
+            if (error.message.includes('ENOTFOUND')) {
+                ctx.log.error('Error: Network error occurred while fetching build results. Please check your connection and try again.');
+                clearInterval(intervalId);
+            } else {
+                ctx.log.error(`Error fetching screenshot data: ${error.message}`);
+            }
+            clearInterval(intervalId);
+            isPollingActive = false;
+        }
+    }, 5000);
 }
diff --git a/src/tasks/captureScreenshots.ts b/src/tasks/captureScreenshots.ts
@@ -3,13 +3,17 @@ import { Context } from '../types.js'
 import { captureScreenshots, captureScreenshotsConcurrent } from '../lib/screenshot.js'
 import chalk from 'chalk';
 import { updateLogContext } from '../lib/logger.js'
+import { startPolling } from '../lib/utils.js';
 
 export default (ctx: Context): ListrTask<Context, ListrRendererFactory, ListrRendererFactory>  =>  {
     return {
         title: 'Capturing screenshots',
         task: async (ctx, task): Promise<void> => {
             try {
                 ctx.task = task;
+                if (ctx.options.fetchResults) {
+                    startPolling(ctx, task);
+                }
                 updateLogContext({task: 'capture'});
 
                 if (ctx.options.parallel) {
diff --git a/src/tasks/exec.ts b/src/tasks/exec.ts
@@ -3,11 +3,17 @@ import { Context } from '../types.js'
 import chalk from 'chalk'
 import spawn from 'cross-spawn'
 import { updateLogContext } from '../lib/logger.js'
+import { startPolling } from '../lib/utils.js'
 
 export default (ctx: Context): ListrTask<Context, ListrRendererFactory, ListrRendererFactory>  =>  {
     return {
         title: `Executing '${ctx.args.execCommand?.join(' ')}'`,
         task: async (ctx, task): Promise<void> => {
+
+            if (ctx.options.fetchResults) {
+                startPolling(ctx, task);
+            }
+
             updateLogContext({task: 'exec'});
 
             return new Promise((resolve, reject) => {
diff --git a/src/tasks/uploadScreenshots.ts b/src/tasks/uploadScreenshots.ts
@@ -3,13 +3,17 @@ import { Context } from '../types.js';
 import { uploadScreenshots } from '../lib/screenshot.js';
 import chalk from 'chalk';
 import { updateLogContext } from '../lib/logger.js';
+import { startPolling } from '../lib/utils.js';
 
 export default (ctx: Context): ListrTask<Context, ListrRendererFactory, ListrRendererFactory> => {
     return {
         title: 'Uploading screenshots',
         task: async (ctx, task): Promise<void> => {
             try {
                 ctx.task = task;
+                if (ctx.options.fetchResults) {
+                    startPolling(ctx, task);
+                }
                 updateLogContext({ task: 'upload' });
 
                 await uploadScreenshots(ctx);
diff --git a/src/types.ts b/src/types.ts
@@ -44,6 +44,8 @@ export interface Context {
         fileExtension?: Array<string>,
         stripExtension?: boolean,
         ignorePattern?: Array<string>,
+        fetchResults?: boolean,
+        fetchResultsFileName?: string
     }
     cliVersion: string;
     totalSnapshots: number;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@lambdatest/smartui-cli",`
`3`		`- "version": "4.0.7",`
	`3`	`+ "version": "4.0.8",`
`4`	`4`	`"description": "A command line interface (CLI) to run SmartUI tests on LambdaTest",`
`5`	`5`	`"files": [`
`6`	`6`	`"dist/*/"`