@devicecloud.dev/dcd 3.7.11 → 4.0.0

package/dist/commands/cloud.d.ts

@@ -2,68 +2,62 @@ import { Command } from '@oclif/core';
 export declare const mimeTypeLookupByExtension: Record<string, string>;
 export default class Cloud extends Command {
     static args: {
-        firstFile: import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
-        secondFile: import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
+        firstFile: import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+        secondFile: import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
     };
     static description: string;
+    static enableJsonFlag: boolean;
     static examples: string[];
     static flags: {
         'additional-app-binary-ids': import("@oclif/core/lib/interfaces").OptionFlag<string[], import("@oclif/core/lib/interfaces").CustomOptions>;
         'additional-app-files': import("@oclif/core/lib/interfaces").OptionFlag<string[], import("@oclif/core/lib/interfaces").CustomOptions>;
-        'android-api-level': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        'android-device': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        'skip-chrome-onboarding': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'show-crosshairs': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        apiKey: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'android-api-level': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'android-device': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        apiKey: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         apiUrl: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        'app-binary-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        'app-file': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'app-binary-id': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'app-file': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'artifacts-path': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         async: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        config: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        'device-locale': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        'download-artifacts': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        'artifacts-path': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        config: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         debug: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        env: import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'device-locale': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'download-artifacts': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'dry-run': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        env: import("@oclif/core/lib/interfaces").OptionFlag<string[], import("@oclif/core/lib/interfaces").CustomOptions>;
         'exclude-flows': import("@oclif/core/lib/interfaces").OptionFlag<string[], import("@oclif/core/lib/interfaces").CustomOptions>;
         'exclude-tags': import("@oclif/core/lib/interfaces").OptionFlag<string[], import("@oclif/core/lib/interfaces").CustomOptions>;
-        flows: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        flows: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         'google-play': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'include-tags': import("@oclif/core/lib/interfaces").OptionFlag<string[], import("@oclif/core/lib/interfaces").CustomOptions>;
         'ignore-sha-check': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'ios-device': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        'ios-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        'x86-arch': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'include-tags': import("@oclif/core/lib/interfaces").OptionFlag<string[], import("@oclif/core/lib/interfaces").CustomOptions>;
+        'ios-device': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'ios-version': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'json-file': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'json-file-name': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         'maestro-version': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        mitmHost: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        mitmPath: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        name: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        orientation: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        metadata: import("@oclif/core/lib/interfaces").OptionFlag<string[], import("@oclif/core/lib/interfaces").CustomOptions>;
+        mitmHost: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        mitmPath: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'moropo-v1-api-key': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        name: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        orientation: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         quiet: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        retry: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        report: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        retry: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces").CustomOptions>;
         'runner-type': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        report: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'json-file': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'moropo-v1-api-key': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        'dry-run': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'show-crosshairs': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'skip-chrome-onboarding': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'x86-arch': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
-    static enableJsonFlag: boolean;
     private versionCheck;
+    run(): Promise<any>;
     /**
-     * Generate the JSON output file path based on name or upload ID
-     * @param name - Optional custom name for the file
-     * @param uploadId - Upload ID to use if name is not provided
+     * Generate the JSON output file path based on upload ID or custom filename
+     * @param uploadId - Upload ID to use if custom filename is not provided
+     * @param jsonFileName - Optional custom filename (can include relative path)
      * @returns Path to the JSON output file
      */
     private getJsonOutputPath;
-    run(): Promise<{
-        uploadId: string;
-        consoleUrl: string;
-        status: string;
-        tests: {
-            name: string;
-            status: string;
-        }[];
-    } | undefined>;
 }

package/dist/commands/cloud.js

@@ -5,15 +5,15 @@ exports.mimeTypeLookupByExtension = void 0;
 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 path = require("node:path");
 const fs = require("node:fs");
-const os = require("os");
-const StreamZip = require("node-stream-zip");
+const os = require("node:os");
+const path = require("node:path");
+const streamZip = require("node-stream-zip");
 const constants_1 = require("../constants");
-const compatibility_1 = require("../utils/compatibility");
+const api_gateway_1 = require("../gateways/api-gateway");
 const methods_1 = require("../methods");
 const plan_1 = require("../plan");
-const ApiGateway_1 = require("../gateways/ApiGateway");
+const compatibility_1 = require("../utils/compatibility");
 exports.mimeTypeLookupByExtension = {
     apk: 'application/vnd.android.package-archive',
     yaml: 'application/x-yaml',
@@ -24,13 +24,9 @@ process.removeAllListeners('warning');
 process.on('warning', (warning) => {
     if (warning.name === 'DeprecationWarning' &&
         warning.message.includes('punycode')) {
-        return;
+        // Ignore punycode deprecation warnings
     }
 });
-const escapeShellValue = (value) => {
-    // Escape special characters that could cause shell interpretation issues
-    return value.replace(/(["\\'$`!\s\[\]{}()&|;<>*?#^~])/g, '\\$1');
-};
 class Cloud extends core_1.Command {
     static args = {
         firstFile: core_1.Args.string({
@@ -45,9 +41,9 @@ class Cloud extends core_1.Command {
         }),
     };
     static description = `Test a Flow or set of Flows on devicecloud.dev (https://devicecloud.dev)\nProvide your application file and a folder with Maestro flows to run them in parallel on multiple devices in devicecloud.dev\nThe command will block until all analyses have completed`;
+    static enableJsonFlag = true;
     static examples = ['<%= config.bin %> <%= command.id %>'];
     static flags = constants_1.flags;
-    static enableJsonFlag = true;
     versionCheck = async () => {
         const versionResponse = await fetch('https://registry.npmjs.org/@devicecloud.dev/dcd/latest');
         const versionResponseJson = await versionResponse.json();
@@ -61,15 +57,6 @@ class Cloud extends core_1.Command {
   `);
         }
     };
-    /**
-     * Generate the JSON output file path based on name or upload ID
-     * @param name - Optional custom name for the file
-     * @param uploadId - Upload ID to use if name is not provided
-     * @returns Path to the JSON output file
-     */
-    getJsonOutputPath(name, uploadId) {
-        return name ? `${name}_dcd.json` : `${uploadId}_dcd.json`;
-    }
     async run() {
         let output = null;
         // Store debug flag outside try/catch to access it in catch block
@@ -77,7 +64,9 @@ class Cloud extends core_1.Command {
         let jsonFile = false;
         try {
             const { args, flags, raw } = await this.parse(Cloud);
-            let { 'additional-app-binary-ids': nonFlatAdditionalAppBinaryIds, 'additional-app-files': nonFlatAdditionalAppFiles, 'android-api-level': androidApiLevel, 'android-device': androidDevice, apiKey: apiKeyFlag, apiUrl, 'app-binary-id': appBinaryId, 'app-file': appFile, 'artifacts-path': artifactsPath, async, config: configFile, debug, 'device-locale': deviceLocale, 'download-artifacts': downloadArtifacts, env, 'exclude-flows': excludeFlows, 'exclude-tags': excludeTags, flows, 'google-play': googlePlay, 'include-tags': includeTags, 'ignore-sha-check': ignoreShaCheck, 'ios-device': iOSDevice, 'ios-version': iOSVersion, 'maestro-version': maestroVersion, name, orientation, quiet, retry, report, 'runner-type': runnerType, 'show-crosshairs': showCrosshairs, 'x86-arch': x86Arch, json, mitmHost, mitmPath, 'moropo-v1-api-key': moropoApiKey, 'dry-run': dryRun, ...rest } = flags;
+            let { 'additional-app-binary-ids': nonFlatAdditionalAppBinaryIds, 'additional-app-files': nonFlatAdditionalAppFiles, 'android-api-level': androidApiLevel, 'android-device': androidDevice, apiKey: apiKeyFlag, apiUrl, 'app-binary-id': appBinaryId, 'app-file': appFile, 'artifacts-path': artifactsPath, 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, 'x86-arch': x86Arch, ...rest } = flags;
+            // Resolve "latest" maestro version to actual version
+            const resolvedMaestroVersion = (0, constants_1.resolveMaestroVersion)(maestroVersion);
             // Store debug flag for use in catch block
             debugFlag = debug === true;
             jsonFile = flags['json-file'] === true;
@@ -134,7 +123,9 @@ class Cloud extends core_1.Command {
                         throw new Error(`Failed to download Moropo tests: ${response.statusText}`);
                     }
                     const contentLength = response.headers.get('content-length');
-                    const totalSize = contentLength ? parseInt(contentLength, 10) : 0;
+                    const totalSize = contentLength
+                        ? Number.parseInt(contentLength, 10)
+                        : 0;
                     let downloadedSize = 0;
                     const moropoDir = path.join(os.tmpdir(), `moropo-tests-${Date.now()}`);
                     if (debug) {
@@ -151,23 +142,29 @@ class Cloud extends core_1.Command {
                     if (!reader) {
                         throw new Error('Failed to get response reader');
                     }
-                    while (true) {
-                        const { done, value } = await reader.read();
-                        if (done)
-                            break;
+                    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()));
+                    await new Promise((resolve) => {
+                        fileStream.on('finish', () => {
+                            resolve();
+                        });
+                    });
                     if (!quiet && !json) {
                         core_1.ux.action.status = 'Extracting tests...';
                     }
                     // Extract zip file
+                    const StreamZip = streamZip;
+                    // eslint-disable-next-line new-cap
                     const zip = new StreamZip.async({ file: zipPath });
                     await zip.extract(null, moropoDir);
                     await zip.close();
@@ -258,12 +255,13 @@ class Cloud extends core_1.Command {
             }
             if (iOSVersion || iOSDevice) {
                 const iOSDeviceID = iOSDevice || 'iphone-14';
-                const supportediOSVersions = compatibilityData.ios[iOSDeviceID] || [];
+                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 (!supportediOSVersions.includes(version)) {
+                if (Array.isArray(supportediOSVersions) &&
+                    !supportediOSVersions.includes(version)) {
                     throw new Error(`${iOSDeviceID} only supports these iOS versions: ${supportediOSVersions.join(', ')}`);
                 }
                 if (debug) {
@@ -277,12 +275,13 @@ class Cloud extends core_1.Command {
                 const lookup = googlePlay
                     ? compatibilityData.androidPlay
                     : compatibilityData.android;
-                const supportedAndroidVersions = lookup[androidDeviceID] || [];
+                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 (!supportedAndroidVersions.includes(version)) {
+                if (Array.isArray(supportedAndroidVersions) &&
+                    !supportedAndroidVersions.includes(version)) {
                     throw new Error(`${androidDeviceID} ${googlePlay ? '(Play Store) ' : ''}only supports these Android API levels: ${supportedAndroidVersions.join(', ')}`);
                 }
                 if (debug) {
@@ -321,7 +320,7 @@ class Cloud extends core_1.Command {
                 }
                 throw error;
             }
-            const { allExcludeTags, allIncludeTags, flowsToRun: testFileNames, flowMetadata, referencedFiles, sequence, workspaceConfig, } = executionPlan;
+            const { allExcludeTags, allIncludeTags, flowMetadata, flowsToRun: testFileNames, referencedFiles, sequence, workspaceConfig, } = executionPlan;
             if (debug) {
                 this.log(`DEBUG: All include tags: ${allIncludeTags?.join(', ') || 'none'}`);
                 this.log(`DEBUG: All exclude tags: ${allExcludeTags?.join(', ') || 'none'}`);
@@ -437,9 +436,19 @@ class Cloud extends core_1.Command {
                 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}`);
             }
@@ -459,6 +468,10 @@ class Cloud extends core_1.Command {
                 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]) => [
@@ -474,17 +487,17 @@ class Cloud extends core_1.Command {
                 autoRetriesRemaining: retry,
                 continueOnFailure,
                 deviceLocale,
-                maestroVersion,
+                maestroVersion: resolvedMaestroVersion,
+                mitmHost,
+                mitmPath,
                 orientation,
-                x86Arch,
-                report,
                 raw: JSON.stringify(raw),
+                report,
+                showCrosshairs: flags['show-crosshairs'],
+                skipChromeOnboarding: flags['skip-chrome-onboarding'],
                 uploadedBinaryIds,
                 version: this.config.version,
-                skipChromeOnboarding: flags['skip-chrome-onboarding'],
-                showCrosshairs: flags['show-crosshairs'],
-                mitmHost,
-                mitmPath,
+                x86Arch,
             };
             if (finalAdditionalBinaryIds?.length > 0) {
                 config.additionalAppBinaryIds = finalAdditionalBinaryIds;
@@ -493,6 +506,13 @@ class Cloud extends core_1.Command {
                 config.uploadedBinaryIds = uploadedBinaryIds;
             }
             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)
@@ -515,7 +535,7 @@ class Cloud extends core_1.Command {
             if (debug) {
                 this.log(`DEBUG: Submitting flow upload request to ${apiUrl}/uploads/flow`);
             }
-            const { message, results } = await ApiGateway_1.ApiGateway.uploadFlow(apiUrl, apiKey, testFormData);
+            const { message, results } = await api_gateway_1.ApiGateway.uploadFlow(apiUrl, apiKey, testFormData);
             if (debug) {
                 this.log(`DEBUG: Flow upload response received`);
                 this.log(`DEBUG: Message: ${message}`);
@@ -539,16 +559,16 @@ class Cloud extends core_1.Command {
                     this.log(`DEBUG: Async flag is set, not waiting for results`);
                 }
                 const jsonOutput = {
-                    uploadId: results[0].test_upload_id,
                     consoleUrl: url,
                     status: 'PENDING',
                     tests: results.map((r) => ({
                         name: r.test_file_name,
                         status: r.status,
                     })),
+                    uploadId: results[0].test_upload_id,
                 };
                 if (flags['json-file']) {
-                    const jsonFilePath = this.getJsonOutputPath(name, results[0].test_upload_id);
+                    const jsonFilePath = this.getJsonOutputPath(results[0].test_upload_id, jsonFileName);
                     (0, methods_1.writeJSONFile)(jsonFilePath, jsonOutput, this);
                 }
                 if (json) {
@@ -574,7 +594,7 @@ class Cloud extends core_1.Command {
                         if (debug) {
                             this.log(`DEBUG: Polling for results: ${results[0].test_upload_id}`);
                         }
-                        const { results: updatedResults } = await ApiGateway_1.ApiGateway.getResultsForUpload(apiUrl, apiKey, 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');
                         }
@@ -606,10 +626,11 @@ class Cloud extends core_1.Command {
                                     },
                                     duration: {
                                         get: (row) => row.duration_seconds
-                                            ? (0, methods_1.formatDurationSeconds)(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
@@ -628,7 +649,7 @@ class Cloud extends core_1.Command {
                                     if (debug) {
                                         this.log(`DEBUG: Downloading artifacts: ${downloadArtifacts}`);
                                     }
-                                    await ApiGateway_1.ApiGateway.downloadArtifactsZip(apiUrl, apiKey, results[0].test_upload_id, downloadArtifacts, artifactsPath);
+                                    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'}`);
                                 }
@@ -649,20 +670,20 @@ class Cloud extends core_1.Command {
                                     this.log(`DEBUG: Some tests failed, returning failed status`);
                                 }
                                 const jsonOutput = {
-                                    uploadId: results[0].test_upload_id,
                                     consoleUrl: url,
                                     status: 'FAILED',
                                     tests: resultsWithoutEarlierTries.map((r) => ({
                                         name: r.test_file_name,
                                         status: r.status,
-                                        duration_seconds: r.duration_seconds,
-                                        fail_reason: r.status === 'FAILED'
+                                        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 = this.getJsonOutputPath(name, results[0].test_upload_id);
+                                    const jsonFilePath = this.getJsonOutputPath(results[0].test_upload_id, jsonFileName);
                                     (0, methods_1.writeJSONFile)(jsonFilePath, jsonOutput, this);
                                 }
                                 if (json) {
@@ -675,20 +696,20 @@ class Cloud extends core_1.Command {
                                     this.log(`DEBUG: All tests passed, returning success status`);
                                 }
                                 const jsonOutput = {
-                                    uploadId: results[0].test_upload_id,
                                     consoleUrl: url,
                                     status: 'PASSED',
                                     tests: resultsWithoutEarlierTries.map((r) => ({
                                         name: r.test_file_name,
                                         status: r.status,
-                                        duration_seconds: r.duration_seconds,
-                                        fail_reason: r.status === 'FAILED'
+                                        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 = this.getJsonOutputPath(name, results[0].test_upload_id);
+                                    const jsonFilePath = this.getJsonOutputPath(results[0].test_upload_id, jsonFileName);
                                     (0, methods_1.writeJSONFile)(jsonFilePath, jsonOutput, this);
                                 }
                                 if (json) {
@@ -733,9 +754,22 @@ class Cloud extends core_1.Command {
         }
         finally {
             if (output) {
+                // eslint-disable-next-line no-unsafe-finally
                 return output;
             }
         }
     }
+    /**
+     * Generate the JSON output file path based on upload ID or custom filename
+     * @param uploadId - Upload ID to use if custom filename is not provided
+     * @param jsonFileName - Optional custom filename (can include relative path)
+     * @returns Path to the JSON output file
+     */
+    getJsonOutputPath(uploadId, jsonFileName) {
+        if (jsonFileName) {
+            return jsonFileName;
+        }
+        return `${uploadId}_dcd.json`;
+    }
 }
 exports.default = Cloud;

package/dist/commands/status.d.ts

@@ -1,30 +1,30 @@
 import { Command } from '@oclif/core';
 type StatusResponse = {
-    status: 'FAILED' | 'PASSED' | 'CANCELLED' | 'PENDING' | 'RUNNING';
+    appBinaryId?: string;
+    attempts?: number;
+    consoleUrl?: string;
+    error?: string;
+    status: 'CANCELLED' | 'FAILED' | 'PASSED' | 'PENDING' | 'RUNNING';
     tests: {
-        name: string;
-        status: 'FAILED' | 'PASSED' | 'CANCELLED' | 'PENDING' | 'RUNNING';
         durationSeconds?: number;
         failReason?: string;
+        name: string;
+        status: 'CANCELLED' | 'FAILED' | 'PASSED' | 'PENDING' | 'RUNNING';
     }[];
     uploadId?: string;
-    appBinaryId?: string;
-    consoleUrl?: string;
-    error?: string;
-    attempts?: number;
 };
 export default class Status extends Command {
     static description: string;
-    static examples: string[];
     static enableJsonFlag: boolean;
+    static examples: string[];
     static flags: {
-        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        name: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        'upload-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        apiKey: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        apiKey: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         apiUrl: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        name: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'upload-id': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
-    private getStatusSymbol;
     run(): Promise<StatusResponse | void>;
+    private getStatusSymbol;
 }
 export {};