@devicecloud.dev/dcd 3.7.3 → 3.7.5

package/dist/commands/cloud.d.ts

@@ -35,6 +35,7 @@ export default class Cloud extends Command {
         '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>;
         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>;

package/dist/commands/cloud.js

@@ -100,7 +100,7 @@ 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, '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, 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;
             // Store debug flag for use in catch block
             debugFlag = debug === true;
             jsonFile = flags['json-file'] === true;
@@ -187,7 +187,7 @@ class Cloud extends core_1.Command {
                         fileStream.write(value);
                     }
                     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...';
                     }
@@ -229,12 +229,6 @@ class Cloud extends core_1.Command {
                 this.log(`DEBUG: API URL: ${apiUrl}`);
                 this.log(`DEBUG: API Key provided: ${apiKey ? 'Yes' : 'No'}`);
             }
-            const [maestroMajorString, maestroMinorString] = maestroVersion.split('.');
-            if (report === 'html' &&
-                maestroMajorString === '1' &&
-                Number(maestroMinorString) < 39) {
-                throw new Error('HTML report is not supported for Maestro 1.38 and below. Please use --maestro-version flag to specify a newer runtime.');
-            }
             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;
@@ -333,7 +327,7 @@ class Cloud extends core_1.Command {
                 }
                 throw error;
             }
-            const { allExcludeTags, allIncludeTags, flowsToRun: testFileNames, referencedFiles, sequence, workspaceConfig, } = executionPlan;
+            const { allExcludeTags, allIncludeTags, flowsToRun: testFileNames, flowMetadata, referencedFiles, sequence, workspaceConfig, } = executionPlan;
             if (debug) {
                 this.log(`DEBUG: All include tags: ${allIncludeTags?.join(', ') || 'none'}`);
                 this.log(`DEBUG: All exclude tags: ${allExcludeTags?.join(', ') || 'none'}`);
@@ -473,6 +467,10 @@ class Cloud extends core_1.Command {
             testFormData.set('file', blob, 'flowFile.zip');
             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('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');
@@ -490,6 +488,7 @@ class Cloud extends core_1.Command {
                 uploadedBinaryIds,
                 version: this.config.version,
                 skipChromeOnboarding: flags['skip-chrome-onboarding'],
+                showCrosshairs: flags['show-crosshairs'],
                 mitmHost,
                 mitmPath,
             };

package/dist/constants.d.ts

@@ -5,6 +5,7 @@ export declare const flags: {
     '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>;
     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>;

package/dist/constants.js

@@ -35,6 +35,10 @@ exports.flags = {
         description: '[Android only] Skip Chrome browser onboarding screens when running tests',
         default: false,
     }),
+    'show-crosshairs': core_1.Flags.boolean({
+        description: '[Android only] Display crosshairs for screen interactions during test execution',
+        default: false,
+    }),
     apiKey: core_1.Flags.string({
         aliases: ['api-key'],
         description: 'API key for devicecloud.dev (find this in the console UI). You can also set the DEVICE_CLOUD_API_KEY environment variable.',
@@ -145,7 +149,19 @@ exports.flags = {
         aliases: ['maestroVersion'],
         default: '1.39.5',
         description: 'Maestro version to run your flow against',
-        options: ['1.39.0', '1.39.1', '1.39.2', '1.39.4', '1.39.5', '1.39.7'],
+        options: [
+            '1.39.0',
+            '1.39.1',
+            '1.39.2',
+            '1.39.4',
+            '1.39.5',
+            '1.39.7',
+            '1.40.0',
+            '1.40.1',
+            '1.40.2',
+            '1.40.3',
+            '1.41.0',
+        ],
     }),
     mitmHost: core_1.Flags.string({
         description: 'used for mitmproxy support, enterprise only, contact support if interested',
@@ -183,7 +199,7 @@ exports.flags = {
         description: 'Output results in JSON format - note: will always provide exit code 0',
     }),
     'json-file': core_1.Flags.boolean({
-        description: 'Write JSON output to a file with name <run_name>_dcd.json or <upload_id>_dcd.json if no name is provided - note: will always provide exit code 0',
+        description: 'Write JSON output to a file. If you supply the --name flag, file <name>_dcd.json will be written, otherwise file <upload_id>_dcd.json will be written - note: will always exit with code 0',
         required: false,
     }),
     'moropo-v1-api-key': core_1.Flags.string({
@@ -218,9 +234,9 @@ exports.AndroidCompatibilityLookup = {
     'pixel-7-pro': ['33', '34', '35'],
 };
 exports.AndroidCompatibilityLookupPlay = {
-    'generic-tablet': ['33', '34', '35'],
+    'generic-tablet': [],
     'pixel-6': ['34', '35'],
     'pixel-6-pro': [],
     'pixel-7': ['34', '35'],
-    'pixel-7-pro': ['34', '35'],
+    'pixel-7-pro': [],
 };

package/dist/plan.d.ts

@@ -17,6 +17,7 @@ interface IExecutionPlan {
     allIncludeTags?: null | string[];
     flowsToRun: string[];
     referencedFiles: string[];
+    flowMetadata: Record<string, Record<string, unknown>>;
     sequence?: IFlowSequence | null;
     totalFlowFiles: number;
     workspaceConfig?: IWorkspaceConfig;

package/dist/plan.js

@@ -54,6 +54,7 @@ function getWorkspaceConfig(input, unfilteredFlowFiles) {
 }
 async function plan(input, includeTags, excludeTags, excludeFlows, configFile) {
     const normalizedInput = path.normalize(input);
+    const flowMetadata = {};
     if (!fs.existsSync(normalizedInput)) {
         throw new Error(`Flow path does not exist: ${path.resolve(normalizedInput)}`);
     }
@@ -62,10 +63,15 @@ async function plan(input, includeTags, excludeTags, excludeFlows, configFile) {
             normalizedInput.endsWith('config.yml')) {
             throw new Error('If using config.yaml, pass the workspace folder path, not the config file or a custom path via --config');
         }
+        const { config } = (0, planMethods_1.readTestYamlFileAsJson)(normalizedInput);
+        if (config) {
+            flowMetadata[normalizedInput] = config;
+        }
         const checkedDependancies = await checkDependencies(normalizedInput);
         return {
             flowsToRun: [normalizedInput],
             referencedFiles: [...new Set(checkedDependancies)],
+            flowMetadata,
             totalFlowFiles: 1,
         };
     }
@@ -129,6 +135,9 @@ async function plan(input, includeTags, excludeTags, excludeFlows, configFile) {
     const allFlows = unfilteredFlowFiles.filter((filePath) => {
         const config = configPerFlowFile[filePath];
         const tags = config?.tags || [];
+        if (config) {
+            flowMetadata[filePath] = config;
+        }
         return ((allIncludeTags.length === 0 ||
             tags.some((tag) => allIncludeTags.includes(tag))) &&
             (allExcludeTags.length === 0 ||
@@ -158,6 +167,7 @@ async function plan(input, includeTags, excludeTags, excludeFlows, configFile) {
         allIncludeTags,
         flowsToRun: normalFlows,
         referencedFiles: [...new Set(allFiles)],
+        flowMetadata,
         sequence: {
             continueOnFailure: workspaceConfig.executionOrder?.continueOnFailure,
             flows: flowsToRunInSequence,

package/oclif.manifest.json

@@ -77,6 +77,12 @@
           "allowNo": false,
           "type": "boolean"
         },
+        "show-crosshairs": {
+          "description": "[Android only] Display crosshairs for screen interactions during test execution",
+          "name": "show-crosshairs",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "apiKey": {
           "aliases": [
             "api-key"
@@ -283,7 +289,12 @@
             "1.39.2",
             "1.39.4",
             "1.39.5",
-            "1.39.7"
+            "1.39.7",
+            "1.40.0",
+            "1.40.1",
+            "1.40.2",
+            "1.40.3",
+            "1.41.0"
           ],
           "type": "option"
         },
@@ -366,7 +377,7 @@
           "type": "option"
         },
         "json-file": {
-          "description": "Write JSON output to a file with name <run_name>_dcd.json or <upload_id>_dcd.json if no name is provided - note: will always provide exit code 0",
+          "description": "Write JSON output to a file. If you supply the --name flag, file <name>_dcd.json will be written, otherwise file <upload_id>_dcd.json will be written - note: will always exit with code 0",
           "name": "json-file",
           "required": false,
           "allowNo": false,
@@ -544,5 +555,5 @@
       ]
     }
   },
-  "version": "3.7.3"
+  "version": "3.7.5"
 }

package/package.json

@@ -79,7 +79,7 @@
     "prepare": "yarn build",
     "version": "oclif readme && git add README.md"
   },
-  "version": "3.7.3",
+  "version": "3.7.5",
   "bugs": {
     "url": "https://discord.gg/gm3mJwcNw8"
   },