@devicecloud.dev/dcd 4.1.2 → 4.1.3

package/dist/commands/cloud.js

@@ -1,26 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mimeTypeLookupByExtension = void 0;
 /* eslint-disable complexity */
 const core_1 = require("@oclif/core");
-const cli_ux_1 = require("@oclif/core/lib/cli-ux");
 const errors_1 = require("@oclif/core/lib/errors");
-const node_child_process_1 = require("node:child_process");
-const fs = require("node:fs");
-const os = require("node:os");
 const path = require("node:path");
 const constants_1 = require("../constants");
 const api_gateway_1 = require("../gateways/api-gateway");
 const methods_1 = require("../methods");
-const plan_1 = require("../plan");
+const device_validation_service_1 = require("../services/device-validation.service");
+const execution_plan_service_1 = require("../services/execution-plan.service");
+const moropo_service_1 = require("../services/moropo.service");
+const report_download_service_1 = require("../services/report-download.service");
+const results_polling_service_1 = require("../services/results-polling.service");
+const test_submission_service_1 = require("../services/test-submission.service");
+const version_service_1 = require("../services/version.service");
 const compatibility_1 = require("../utils/compatibility");
-const connectivity_1 = require("../utils/connectivity");
-const StreamZip = require("node-stream-zip");
-exports.mimeTypeLookupByExtension = {
-    apk: 'application/vnd.android.package-archive',
-    yaml: 'application/x-yaml',
-    zip: 'application/zip',
-};
 // Suppress punycode deprecation warning (caused by whatwg, supabase dependancy)
 process.removeAllListeners('warning');
 process.on('warning', (warning) => {
@@ -46,25 +40,24 @@ class Cloud extends core_1.Command {
     static enableJsonFlag = true;
     static examples = ['<%= config.bin %> <%= command.id %>'];
     static flags = constants_1.flags;
+    deviceValidationService = new device_validation_service_1.DeviceValidationService();
+    moropoService = new moropo_service_1.MoropoService();
+    reportDownloadService = new report_download_service_1.ReportDownloadService();
+    resultsPollingService = new results_polling_service_1.ResultsPollingService();
+    testSubmissionService = new test_submission_service_1.TestSubmissionService();
     versionCheck = async () => {
-        try {
-            const latestVersion = (0, node_child_process_1.execSync)('npm view @devicecloud.dev/dcd version', {
-                encoding: 'utf8',
-                stdio: ['ignore', 'pipe', 'ignore'],
-            }).trim();
-            if (latestVersion !== this.config.version) {
-                this.log(`
+        const latestVersion = await this.versionService.checkLatestCliVersion();
+        if (latestVersion &&
+            this.versionService.isOutdated(this.config.version, latestVersion)) {
+            this.log(`
   -------------------
   A new version of the devicecloud.dev CLI is available: ${latestVersion}
   Run 'npm install -g @devicecloud.dev/dcd@latest' to update to the latest version
   -------------------
   `);
-            }
-        }
-        catch {
-            // Silently fail if npm view command fails (e.g., no network connection)
         }
     };
+    versionService = new version_service_1.VersionService();
     async run() {
         let output = null;
         // Store debug flag outside try/catch to access it in catch block
@@ -72,9 +65,7 @@ class Cloud extends core_1.Command {
         let jsonFile = false;
         try {
             const { args, flags, raw } = await this.parse(Cloud);
-            let { 'android-api-level': androidApiLevel, 'android-device': androidDevice, apiKey: apiKeyFlag, apiUrl, 'app-binary-id': appBinaryId, 'app-file': appFile, 'artifacts-path': artifactsPath, 'junit-path': junitPath, 'allure-path': allurePath, 'html-path': htmlPath, async, config: configFile, debug, 'device-locale': deviceLocale, 'download-artifacts': downloadArtifacts, 'dry-run': dryRun, env, 'exclude-flows': excludeFlows, 'exclude-tags': excludeTags, flows, 'google-play': googlePlay, 'ignore-sha-check': ignoreShaCheck, 'include-tags': includeTags, 'ios-device': iOSDevice, 'ios-version': iOSVersion, json, 'json-file-name': jsonFileName, 'maestro-version': maestroVersion, metadata, mitmHost, mitmPath, 'moropo-v1-api-key': moropoApiKey, name, orientation, quiet, report, retry, 'runner-type': runnerType, ...rest } = flags;
-            // Resolve "latest" maestro version to actual version
-            const resolvedMaestroVersion = (0, constants_1.resolveMaestroVersion)(maestroVersion);
+            let { 'android-api-level': androidApiLevel, 'android-device': androidDevice, apiKey: apiKeyFlag, apiUrl, 'app-binary-id': appBinaryId, 'app-file': appFile, 'artifacts-path': artifactsPath, 'junit-path': junitPath, 'allure-path': allurePath, 'html-path': htmlPath, async, config: configFile, debug, 'device-locale': deviceLocale, 'download-artifacts': downloadArtifacts, 'dry-run': dryRun, env, 'exclude-flows': excludeFlows, 'exclude-tags': excludeTags, flows, 'google-play': googlePlay, 'ignore-sha-check': ignoreShaCheck, 'include-tags': includeTags, 'ios-device': iOSDevice, 'ios-version': iOSVersion, json, 'json-file-name': jsonFileName, 'maestro-version': maestroVersion, metadata, mitmHost, mitmPath, 'moropo-v1-api-key': moropoApiKey, name, orientation, quiet, report, retry, 'runner-type': runnerType, } = flags;
             // Store debug flag for use in catch block
             debugFlag = debug === true;
             jsonFile = flags['json-file'] === true;
@@ -108,99 +99,14 @@ class Cloud extends core_1.Command {
             await this.versionCheck();
             // Download and expand Moropo zip if API key is present
             if (moropoApiKey) {
-                if (debug) {
-                    this.log('DEBUG: Moropo v1 API key detected, downloading tests from Moropo API');
-                }
-                if (debug) {
-                    this.log(`DEBUG: Using branch name: main`);
-                }
-                try {
-                    if (!quiet && !json) {
-                        core_1.ux.action.start('Downloading Moropo tests', 'Initializing', {
-                            stdout: true,
-                        });
-                    }
-                    const response = await fetch('https://api.moropo.com/tests', {
-                        headers: {
-                            accept: 'application/zip',
-                            'x-app-api-key': moropoApiKey,
-                            'x-branch-name': 'main',
-                        },
-                    });
-                    if (!response.ok) {
-                        throw new Error(`Failed to download Moropo tests: ${response.statusText}`);
-                    }
-                    const contentLength = response.headers.get('content-length');
-                    const totalSize = contentLength
-                        ? Number.parseInt(contentLength, 10)
-                        : 0;
-                    let downloadedSize = 0;
-                    const moropoDir = path.join(os.tmpdir(), `moropo-tests-${Date.now()}`);
-                    if (debug) {
-                        this.log(`DEBUG: Extracting Moropo tests to: ${moropoDir}`);
-                    }
-                    // Create moropo directory if it doesn't exist
-                    if (!fs.existsSync(moropoDir)) {
-                        fs.mkdirSync(moropoDir, { recursive: true });
-                    }
-                    // Write zip file to moropo directory
-                    const zipPath = path.join(moropoDir, 'moropo-tests.zip');
-                    const fileStream = fs.createWriteStream(zipPath);
-                    const reader = response.body?.getReader();
-                    if (!reader) {
-                        throw new Error('Failed to get response reader');
-                    }
-                    let readerResult = await reader.read();
-                    while (!readerResult.done) {
-                        const { value } = readerResult;
-                        downloadedSize += value.length;
-                        if (!quiet && !json && totalSize) {
-                            const progress = Math.round((downloadedSize / totalSize) * 100);
-                            core_1.ux.action.status = `Downloading: ${progress}%`;
-                        }
-                        fileStream.write(value);
-                        readerResult = await reader.read();
-                    }
-                    fileStream.end();
-                    await new Promise((resolve) => {
-                        fileStream.on('finish', () => {
-                            resolve();
-                        });
-                    });
-                    if (!quiet && !json) {
-                        core_1.ux.action.status = 'Extracting tests...';
-                    }
-                    // Extract zip file
-                    // eslint-disable-next-line new-cap
-                    const zip = new StreamZip.async({ file: zipPath });
-                    await zip.extract(null, moropoDir);
-                    await zip.close();
-                    // Delete zip file after extraction
-                    fs.unlinkSync(zipPath);
-                    if (!quiet && !json) {
-                        core_1.ux.action.stop('completed');
-                    }
-                    if (debug) {
-                        this.log('DEBUG: Successfully extracted Moropo tests');
-                    }
-                    // Create config.yaml file
-                    const configPath = path.join(moropoDir, 'config.yaml');
-                    fs.writeFileSync(configPath, 'flows:\n- ./**/*.yaml\n- ./*.yaml\n');
-                    if (debug) {
-                        this.log('DEBUG: Created config.yaml file');
-                    }
-                    // Update flows to point to the extracted directory
-                    flows = moropoDir;
-                }
-                catch (error) {
-                    if (!quiet && !json) {
-                        core_1.ux.action.stop('failed');
-                    }
-                    if (debug) {
-                        this.log(`DEBUG: Error downloading/extracting Moropo tests: ${error}`);
-                    }
-                    throw new Error(`Failed to download/extract Moropo tests: ${error}`);
-                }
+                flows = await this.moropoService.downloadAndExtract({
+                    apiKey: moropoApiKey,
+                    branchName: 'main',
+                    debug,
+                    json,
+                    logger: this.log.bind(this),
+                    quiet,
+                });
             }
             const apiKey = apiKeyFlag || process.env.DEVICE_CLOUD_API_KEY;
             if (!apiKey)
@@ -223,6 +129,11 @@ class Cloud extends core_1.Command {
             if (debug) {
                 this.log(`DEBUG: API URL: ${apiUrl}`);
             }
+            // Resolve and validate Maestro version using API data
+            const resolvedMaestroVersion = this.versionService.resolveMaestroVersion(maestroVersion, compatibilityData, {
+                debug,
+                logger: this.log.bind(this),
+            });
             if (retry && retry > 2) {
                 this.log("Retries are now free of charge but limited to 2. If you're test is still failing after 2 retries, please ask for help on Discord.");
                 flags.retry = 2;
@@ -257,44 +168,10 @@ class Cloud extends core_1.Command {
             if (!flowFile) {
                 throw new Error('You must provide a flow file');
             }
-            if (iOSVersion || iOSDevice) {
-                const iOSDeviceID = iOSDevice || 'iphone-14';
-                const supportediOSVersions = compatibilityData?.ios?.[iOSDeviceID] || [];
-                const version = iOSVersion || '17';
-                if (supportediOSVersions.length === 0) {
-                    throw new Error(`Device ${iOSDeviceID} is not supported. Please check the docs for supported devices: https://docs.devicecloud.dev/getting-started/devices-configuration`);
-                }
-                if (Array.isArray(supportediOSVersions) &&
-                    !supportediOSVersions.includes(version)) {
-                    throw new Error(`${iOSDeviceID} only supports these iOS versions: ${supportediOSVersions.join(', ')}`);
-                }
-                if (debug) {
-                    this.log(`DEBUG: iOS device: ${iOSDeviceID}`);
-                    this.log(`DEBUG: iOS version: ${version}`);
-                    this.log(`DEBUG: Supported iOS versions: ${supportediOSVersions.join(', ')}`);
-                }
-            }
-            if (androidApiLevel || androidDevice) {
-                const androidDeviceID = androidDevice || 'pixel-7';
-                const lookup = googlePlay
-                    ? compatibilityData.androidPlay
-                    : compatibilityData.android;
-                const supportedAndroidVersions = lookup?.[androidDeviceID] || [];
-                const version = androidApiLevel || '34';
-                if (supportedAndroidVersions.length === 0) {
-                    throw new Error(`We don't support that device configuration - please check the docs for supported devices: https://docs.devicecloud.dev/getting-started/devices-configuration`);
-                }
-                if (Array.isArray(supportedAndroidVersions) &&
-                    !supportedAndroidVersions.includes(version)) {
-                    throw new Error(`${androidDeviceID} ${googlePlay ? '(Play Store) ' : ''}only supports these Android API levels: ${supportedAndroidVersions.join(', ')}`);
-                }
-                if (debug) {
-                    this.log(`DEBUG: Android device: ${androidDeviceID}`);
-                    this.log(`DEBUG: Android API level: ${version}`);
-                    this.log(`DEBUG: Google Play enabled: ${googlePlay}`);
-                    this.log(`DEBUG: Supported Android versions: ${supportedAndroidVersions.join(', ')}`);
-                }
-            }
+            // Validate iOS device configuration
+            this.deviceValidationService.validateiOSDevice(iOSVersion, iOSDevice, compatibilityData, { debug, logger: this.log.bind(this) });
+            // Validate Android device configuration
+            this.deviceValidationService.validateAndroidDevice(androidApiLevel, androidDevice, googlePlay, compatibilityData, { debug, logger: this.log.bind(this) });
             flowFile = path.resolve(flowFile);
             if (!flowFile?.endsWith('.yaml') &&
                 !flowFile?.endsWith('.yml') &&
@@ -309,7 +186,7 @@ class Cloud extends core_1.Command {
                 if (debug) {
                     this.log('DEBUG: Generating execution plan...');
                 }
-                executionPlan = await (0, plan_1.plan)(flowFile, includeTags.flat(), excludeTags.flat(), excludeFlows.flat(), configFile, debug);
+                executionPlan = await (0, execution_plan_service_1.plan)(flowFile, includeTags.flat(), excludeTags.flat(), excludeFlows.flat(), configFile, debug);
                 if (debug) {
                     this.log(`DEBUG: Execution plan generated`);
                     this.log(`DEBUG: Total flow files: ${executionPlan.totalFlowFiles}`);
@@ -324,7 +201,7 @@ class Cloud extends core_1.Command {
                 }
                 throw error;
             }
-            const { allExcludeTags, allIncludeTags, flowMetadata, flowOverrides, flowsToRun: testFileNames, referencedFiles, sequence, workspaceConfig, } = executionPlan;
+            const { allExcludeTags, allIncludeTags, flowOverrides, flowsToRun: testFileNames, referencedFiles, sequence, } = executionPlan;
             if (debug) {
                 this.log(`DEBUG: All include tags: ${allIncludeTags?.join(', ') || 'none'}`);
                 this.log(`DEBUG: All exclude tags: ${allExcludeTags?.join(', ') || 'none'}`);
@@ -428,106 +305,39 @@ class Cloud extends core_1.Command {
                     this.log(`DEBUG: Binary uploaded with ID: ${binaryId}`);
                 }
             }
-            const testFormData = new FormData();
-            // eslint-disable-next-line unicorn/no-array-reduce
-            const envObject = (env ?? []).reduce((acc, cur) => {
-                const [key, ...value] = cur.split('=');
-                // handle case where value includes an equals sign
-                acc[key] = value.join('=');
-                return acc;
-            }, {});
-            // eslint-disable-next-line unicorn/no-array-reduce
-            const metadataObject = (metadata ?? []).reduce((acc, cur) => {
-                const [key, ...value] = cur.split('=');
-                // handle case where value includes an equals sign
-                acc[key] = value.join('=');
-                return acc;
-            }, {});
-            if (debug && Object.keys(envObject).length > 0) {
-                this.log(`DEBUG: Environment variables: ${JSON.stringify(envObject)}`);
-            }
-            if (debug && Object.keys(metadataObject).length > 0) {
-                this.log(`DEBUG: User metadata: ${JSON.stringify(metadataObject)}`);
-            }
-            if (debug) {
-                this.log(`DEBUG: Compressing files from path: ${flowFile}`);
-            }
-            const buffer = await (0, methods_1.compressFilesFromRelativePath)(flowFile?.endsWith('.yaml') || flowFile?.endsWith('.yml')
-                ? path.dirname(flowFile)
-                : flowFile, [
-                ...new Set([
-                    ...referencedFiles,
-                    ...testFileNames,
-                    ...sequentialFlows,
-                ]),
-            ], commonRoot);
-            if (debug) {
-                this.log(`DEBUG: Compressed file size: ${buffer.length} bytes`);
-            }
-            const blob = new Blob([buffer], {
-                type: exports.mimeTypeLookupByExtension.zip,
-            });
-            testFormData.set('file', blob, 'flowFile.zip');
             // finalBinaryId should always be defined after validation - fail fast if not
             if (!finalBinaryId) {
                 throw new Error('Internal error: finalBinaryId should be defined after validation');
             }
-            testFormData.set('appBinaryId', finalBinaryId);
-            testFormData.set('testFileNames', JSON.stringify(testFileNames.map((t) => t.replaceAll(commonRoot, '.').split(path.sep).join('/'))));
-            testFormData.set('flowMetadata', JSON.stringify(Object.fromEntries(Object.entries(flowMetadata).map(([key, value]) => [
-                key.replaceAll(commonRoot, '.').split(path.sep).join('/'),
-                value,
-            ]))));
-            testFormData.set('testFileOverrides', JSON.stringify(Object.fromEntries(Object.entries(flowOverrides).map(([key, value]) => [
-                key.replaceAll(commonRoot, '.').split(path.sep).join('/'),
-                value,
-            ]))));
-            testFormData.set('sequentialFlows', JSON.stringify(sequentialFlows.map((t) => t.replaceAll(commonRoot, '.').split(path.sep).join('/'))));
-            testFormData.set('env', JSON.stringify(envObject));
-            testFormData.set('googlePlay', googlePlay ? 'true' : 'false');
-            const config = {
-                allExcludeTags,
-                allIncludeTags,
-                autoRetriesRemaining: retry,
+            const testFormData = await this.testSubmissionService.buildTestFormData({
+                androidApiLevel,
+                androidDevice,
+                appBinaryId: finalBinaryId,
+                cliVersion: this.config.version,
+                commonRoot,
                 continueOnFailure,
+                debug,
                 deviceLocale,
+                env,
+                executionPlan,
+                flowFile,
+                googlePlay,
+                iOSDevice,
+                iOSVersion,
+                logger: this.log.bind(this),
                 maestroVersion: resolvedMaestroVersion,
+                metadata,
                 mitmHost,
                 mitmPath,
+                name,
                 orientation,
-                raw: JSON.stringify(raw),
+                raw,
                 report,
+                retry,
+                runnerType,
                 showCrosshairs: flags['show-crosshairs'],
                 skipChromeOnboarding: flags['skip-chrome-onboarding'],
-                version: this.config.version,
-            };
-            testFormData.set('config', JSON.stringify(config));
-            if (Object.keys(metadataObject).length > 0) {
-                const metadataPayload = { userMetadata: metadataObject };
-                testFormData.set('metadata', JSON.stringify(metadataPayload));
-                if (debug) {
-                    this.log(`DEBUG: Sending metadata to API: ${JSON.stringify(metadataPayload)}`);
-                }
-            }
-            if (androidApiLevel)
-                testFormData.set('androidApiLevel', androidApiLevel.toString());
-            if (androidDevice)
-                testFormData.set('androidDevice', androidDevice.toString());
-            if (iOSVersion)
-                testFormData.set('iOSVersion', iOSVersion.toString());
-            if (iOSDevice)
-                testFormData.set('iOSDevice', iOSDevice.toString());
-            if (name)
-                testFormData.set('name', name.toString());
-            if (runnerType)
-                testFormData.set('runnerType', runnerType.toString());
-            if (workspaceConfig)
-                testFormData.set('workspaceConfig', JSON.stringify(workspaceConfig));
-            for (const [key, value] of Object.entries(rest)) {
-                if (value) {
-                    testFormData.set(key, value);
-                }
-            }
+            });
             if (debug) {
                 this.log(`DEBUG: Submitting flow upload request to ${apiUrl}/uploads/flow`);
             }
@@ -573,215 +383,69 @@ class Cloud extends core_1.Command {
                 this.log('Not waiting for results as async flag is set to true');
                 return;
             }
-            // poll for the run status every 5 seconds
-            if (!json) {
-                core_1.ux.action.start('Waiting for results', 'Initializing', {
-                    stdout: true,
-                });
-                this.log('\nYou can safely close this terminal and the tests will continue\n');
-            }
-            let sequentialPollFaillures = 0;
-            let previousSummary = '';
-            if (debug) {
-                this.log(`DEBUG: Starting polling loop for results`);
-            }
-            await new Promise((resolve, reject) => {
-                const intervalId = setInterval(async () => {
-                    try {
-                        if (debug) {
-                            this.log(`DEBUG: Polling for results: ${results[0].test_upload_id}`);
-                        }
-                        const { results: updatedResults } = await api_gateway_1.ApiGateway.getResultsForUpload(apiUrl, apiKey, results[0].test_upload_id);
-                        if (!updatedResults) {
-                            throw new Error('no results');
-                        }
-                        if (debug) {
-                            this.log(`DEBUG: Poll received ${updatedResults.length} results`);
-                            for (const result of updatedResults) {
-                                this.log(`DEBUG: Result status: ${result.test_file_name} - ${result.status}`);
-                            }
-                        }
-                        // Calculate summary statistics
-                        const statusCounts = {};
-                        for (const result of updatedResults) {
-                            statusCounts[result.status] = (statusCounts[result.status] || 0) + 1;
-                        }
-                        const passed = statusCounts.PASSED || 0;
-                        const failed = statusCounts.FAILED || 0;
-                        const pending = statusCounts.PENDING || 0;
-                        const running = statusCounts.RUNNING || 0;
-                        const total = updatedResults.length;
-                        const completed = passed + failed;
-                        // Display quantitative summary in quiet mode only
-                        const summary = `${completed}/${total} | ✓ ${passed} | ✗ ${failed} | ▶ ${running} | ⏸ ${pending}`;
-                        if (!json) {
-                            if (quiet) {
-                                // Only update status when the summary changes in quiet mode
-                                if (summary !== previousSummary) {
-                                    core_1.ux.action.status = summary;
-                                    previousSummary = summary;
-                                }
-                            }
-                            else {
-                                // Show detailed table in non-quiet mode (no summary)
-                                core_1.ux.action.status =
-                                    '\nStatus      Test\n─────────── ───────────────';
-                                for (const { retry_of: isRetry, status, test_file_name: test, } of updatedResults) {
-                                    core_1.ux.action.status += `\n${status.padEnd(10, ' ')}  ${test} ${isRetry ? '(retry)' : ''}`;
-                                }
-                            }
-                        }
-                        if (updatedResults.every((result) => !['PENDING', 'RUNNING'].includes(result.status))) {
-                            if (debug) {
-                                this.log(`DEBUG: All tests completed, stopping poll`);
-                            }
-                            if (!json) {
-                                core_1.ux.action.stop('completed');
-                                this.log('\n');
-                                const hasFailedTests = updatedResults.some((result) => result.status === 'FAILED');
-                                (0, cli_ux_1.table)(updatedResults, {
-                                    status: { get: (row) => row.status },
-                                    test: {
-                                        get: (row) => `${row.test_file_name} ${row.retry_of ? '(retry)' : ''}`,
-                                    },
-                                    duration: {
-                                        get: (row) => row.duration_seconds
-                                            ? (0, methods_1.formatDurationSeconds)(Number(row.duration_seconds))
-                                            : '-',
-                                    },
-                                    ...(hasFailedTests && {
-                                        // eslint-disable-next-line camelcase
-                                        fail_reason: {
-                                            get: (row) => row.status === 'FAILED' && row.fail_reason
-                                                ? row.fail_reason
-                                                : '',
-                                        },
-                                    }),
-                                }, { printLine: this.log.bind(this) });
-                                this.log('\n');
-                                this.log('Run completed, you can access the results at:');
-                                this.log(url);
-                                this.log('\n');
-                            }
-                            clearInterval(intervalId);
-                            if (downloadArtifacts) {
-                                try {
-                                    if (debug) {
-                                        this.log(`DEBUG: Downloading artifacts: ${downloadArtifacts}`);
-                                    }
-                                    await api_gateway_1.ApiGateway.downloadArtifactsZip(apiUrl, apiKey, results[0].test_upload_id, downloadArtifacts, artifactsPath);
-                                    this.log('\n');
-                                    this.log(`Test artifacts have been downloaded to ${artifactsPath || './artifacts.zip'}`);
-                                }
-                                catch (error) {
-                                    if (debug) {
-                                        this.log(`DEBUG: Error downloading artifacts: ${error}`);
-                                    }
-                                    this.warn('Failed to download artifacts');
-                                }
-                            }
-                            // Handle report downloads based on --report flag
-                            if (report && ['allure', 'html', 'junit'].includes(report)) {
-                                await this.handleReportDownloads(report, apiUrl, apiKey, results[0].test_upload_id, junitPath, allurePath, htmlPath, debug);
-                            }
-                            const resultsWithoutEarlierTries = updatedResults.filter((result) => {
-                                const originalTryId = result.retry_of || result.id;
-                                const tries = updatedResults.filter((r) => r.retry_of === originalTryId || r.id === originalTryId);
-                                return result.id === Math.max(...tries.map((t) => t.id));
-                            });
-                            if (resultsWithoutEarlierTries.some((result) => result.status === 'FAILED')) {
-                                if (debug) {
-                                    this.log(`DEBUG: Some tests failed, returning failed status`);
-                                }
-                                const jsonOutput = {
-                                    consoleUrl: url,
-                                    status: 'FAILED',
-                                    tests: resultsWithoutEarlierTries.map((r) => ({
-                                        name: r.test_file_name,
-                                        status: r.status,
-                                        durationSeconds: r.duration_seconds,
-                                        failReason: r.status === 'FAILED'
-                                            ? r.fail_reason || 'No reason provided'
-                                            : undefined,
-                                    })),
-                                    uploadId: results[0].test_upload_id,
-                                };
-                                if (flags['json-file']) {
-                                    const jsonFilePath = jsonFileName || `${results[0].test_upload_id}_dcd.json`;
-                                    (0, methods_1.writeJSONFile)(jsonFilePath, jsonOutput, this);
-                                }
-                                if (json) {
-                                    output = jsonOutput;
-                                }
-                                reject(new Error('RUN_FAILED'));
-                            }
-                            else {
-                                if (debug) {
-                                    this.log(`DEBUG: All tests passed, returning success status`);
-                                }
-                                const jsonOutput = {
-                                    consoleUrl: url,
-                                    status: 'PASSED',
-                                    tests: resultsWithoutEarlierTries.map((r) => ({
-                                        name: r.test_file_name,
-                                        status: r.status,
-                                        durationSeconds: r.duration_seconds,
-                                        failReason: r.status === 'FAILED'
-                                            ? r.fail_reason || 'No reason provided'
-                                            : undefined,
-                                    })),
-                                    uploadId: results[0].test_upload_id,
-                                };
-                                if (flags['json-file']) {
-                                    const jsonFilePath = jsonFileName || `${results[0].test_upload_id}_dcd.json`;
-                                    (0, methods_1.writeJSONFile)(jsonFilePath, jsonOutput, this);
-                                }
-                                if (json) {
-                                    output = jsonOutput;
-                                }
-                            }
-                            sequentialPollFaillures = 0;
-                            resolve();
-                        }
+            // Poll for results until completion
+            const pollingResult = await this.resultsPollingService
+                .pollUntilComplete(results, {
+                apiKey,
+                apiUrl,
+                consoleUrl: url,
+                debug,
+                json,
+                logger: this.log.bind(this),
+                quiet,
+                uploadId: results[0].test_upload_id,
+            })
+                .catch((error) => {
+                if (error instanceof results_polling_service_1.RunFailedError) {
+                    // Handle failed test run
+                    const jsonOutput = error.result;
+                    if (flags['json-file']) {
+                        const jsonFilePath = jsonFileName || `${results[0].test_upload_id}_dcd.json`;
+                        (0, methods_1.writeJSONFile)(jsonFilePath, jsonOutput, this);
                     }
-                    catch (error) {
-                        sequentialPollFaillures++;
-                        if (debug) {
-                            this.log(`DEBUG: Error polling for results: ${error}`);
-                            this.log(`DEBUG: Sequential poll failures: ${sequentialPollFaillures}`);
-                        }
-                        if (sequentialPollFaillures > 10) {
-                            // dropped poll requests shouldn't err user CI
-                            clearInterval(intervalId);
-                            // Check if the failure is due to internet connectivity issues
-                            if (debug) {
-                                this.log('DEBUG: Checking internet connectivity...');
-                            }
-                            const connectivityCheck = await (0, connectivity_1.checkInternetConnectivity)();
-                            if (debug) {
-                                this.log(`DEBUG: ${connectivityCheck.message}`);
-                                for (const result of connectivityCheck.endpointResults) {
-                                    if (result.success) {
-                                        this.log(`DEBUG: ✓ ${result.endpoint} - ${result.statusCode} (${result.latencyMs}ms)`);
-                                    }
-                                    else {
-                                        this.log(`DEBUG: ✗ ${result.endpoint} - ${result.error} (${result.latencyMs}ms)`);
-                                    }
-                                }
-                            }
-                            if (!connectivityCheck.connected) {
-                                // Build detailed error message with endpoint diagnostics
-                                const endpointDetails = connectivityCheck.endpointResults
-                                    .map((r) => `  - ${r.endpoint}: ${r.error} (${r.latencyMs}ms)`)
-                                    .join('\n');
-                                throw new Error(`Unable to fetch results after 10 attempts.\n\nInternet connectivity check failed - all test endpoints unreachable:\n${endpointDetails}\n\nPlease verify your network connection and DNS resolution.`);
-                            }
-                            throw new Error('unable to fetch results after 10 attempts');
-                        }
-                        this.log('unable to fetch results, trying again...');
+                    if (json) {
+                        output = jsonOutput;
                     }
-                }, 5000);
+                    throw new Error('RUN_FAILED');
+                }
+                throw error;
             });
+            // Handle successful completion
+            if (downloadArtifacts) {
+                await this.reportDownloadService.downloadArtifacts({
+                    apiKey,
+                    apiUrl,
+                    artifactsPath,
+                    debug,
+                    downloadType: downloadArtifacts,
+                    logger: this.log.bind(this),
+                    uploadId: results[0].test_upload_id,
+                    warnLogger: this.warn.bind(this),
+                });
+            }
+            // Handle report downloads based on --report flag
+            if (report && ['allure', 'html', 'junit'].includes(report)) {
+                await this.reportDownloadService.downloadReports({
+                    allurePath,
+                    apiKey,
+                    apiUrl,
+                    debug,
+                    htmlPath,
+                    junitPath,
+                    logger: this.log.bind(this),
+                    reportType: report,
+                    uploadId: results[0].test_upload_id,
+                    warnLogger: this.warn.bind(this),
+                });
+            }
+            const jsonOutput = pollingResult;
+            if (flags['json-file']) {
+                const jsonFilePath = jsonFileName || `${results[0].test_upload_id}_dcd.json`;
+                (0, methods_1.writeJSONFile)(jsonFilePath, jsonOutput, this);
+            }
+            if (json) {
+                output = jsonOutput;
+            }
         }
         catch (error) {
             if (debugFlag && error instanceof Error) {
@@ -806,65 +470,5 @@ class Cloud extends core_1.Command {
             }
         }
     }
-    /**
-     * Handle downloading reports based on the report type specified
-     * @param reportType The type of report to download ('junit', 'allure', or 'html')
-     * @param apiUrl The base URL for the API server
-     * @param apiKey The API key for authentication
-     * @param uploadId The unique identifier for the test upload
-     * @param junitPath Optional file path where the JUnit report should be saved
-     * @param allurePath Optional file path where the Allure report should be saved
-     * @param htmlPath Optional file path where the HTML report should be saved
-     * @param debug Whether debug logging is enabled
-     * @returns Promise that resolves when all reports have been downloaded
-     */
-    // eslint-disable-next-line max-params
-    async handleReportDownloads(reportType, apiUrl, apiKey, uploadId, junitPath, allurePath, htmlPath, debug) {
-        const downloadReport = async (type, filePath) => {
-            try {
-                if (debug) {
-                    this.log(`DEBUG: Downloading ${type.toUpperCase()} report`);
-                }
-                await api_gateway_1.ApiGateway.downloadReportGeneric(apiUrl, apiKey, uploadId, type, filePath);
-                this.log(`${type.toUpperCase()} test report has been downloaded to ${filePath}`);
-            }
-            catch (error) {
-                if (debug) {
-                    this.log(`DEBUG: Error downloading ${type.toUpperCase()} report: ${error}`);
-                }
-                const errorMessage = error instanceof Error ? error.message : String(error);
-                this.warn(`Failed to download ${type.toUpperCase()} report: ${errorMessage}`);
-                if (errorMessage.includes('404')) {
-                    this.warn(`No ${type.toUpperCase()} reports found for this upload. Make sure your tests generated results.`);
-                }
-                else if (errorMessage.includes('EACCES') || errorMessage.includes('EPERM')) {
-                    this.warn('Permission denied. Check write permissions for the current directory.');
-                }
-                else if (errorMessage.includes('ENOENT')) {
-                    this.warn('Directory does not exist. Make sure you have write access to the current directory.');
-                }
-            }
-        };
-        switch (reportType) {
-            case 'junit': {
-                const reportPath = path.resolve(process.cwd(), junitPath || 'report.xml');
-                await downloadReport('junit', reportPath);
-                break;
-            }
-            case 'allure': {
-                const reportPath = path.resolve(process.cwd(), allurePath || 'report.html');
-                await downloadReport('allure', reportPath);
-                break;
-            }
-            case 'html': {
-                const htmlReportPath = path.resolve(process.cwd(), htmlPath || 'report.html');
-                await downloadReport('html', htmlReportPath);
-                break;
-            }
-            default: {
-                this.warn(`Unknown report type: ${reportType}`);
-            }
-        }
-    }
 }
 exports.default = Cloud;