@devicecloud.dev/dcd 3.6.9 → 3.6.11

package/dist/commands/cloud.d.ts

@@ -66,6 +66,8 @@ export default class Cloud extends Command {
         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>;
     };
     static enableJsonFlag: boolean;
     private versionCheck;

package/dist/commands/cloud.js

@@ -6,6 +6,9 @@ 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 constants_1 = require("../constants");
 const methods_1 = require("../methods");
 const plan_1 = require("../plan");
@@ -96,7 +99,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, ...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, '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;
@@ -125,6 +128,96 @@ class Cloud extends core_1.Command {
                 throw new Error(`You are using node version ${major}. DCD requires node version 18 or later`);
             }
             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');
+                }
+                const branchName = process.env.GITHUB_REF_NAME || 'main';
+                if (debug) {
+                    this.log(`DEBUG: Using branch name: ${branchName}`);
+                }
+                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': branchName,
+                        },
+                    });
+                    if (!response.ok) {
+                        throw new Error(`Failed to download Moropo tests: ${response.statusText}`);
+                    }
+                    const contentLength = response.headers.get('content-length');
+                    const totalSize = contentLength ? 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');
+                    }
+                    while (true) {
+                        const { done, value } = await reader.read();
+                        if (done)
+                            break;
+                        downloadedSize += value.length;
+                        if (!quiet && !json && totalSize) {
+                            const progress = Math.round((downloadedSize / totalSize) * 100);
+                            core_1.ux.action.status = `Downloading: ${progress}%`;
+                        }
+                        fileStream.write(value);
+                    }
+                    fileStream.end();
+                    await new Promise((resolve) => fileStream.on('finish', resolve));
+                    if (!quiet && !json) {
+                        core_1.ux.action.status = 'Extracting tests...';
+                    }
+                    // Extract zip file
+                    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}`);
+                }
+            }
             const apiKey = apiKeyFlag || process.env.DEVICE_CLOUD_API_KEY;
             if (!apiKey)
                 throw new Error('You must provide an API key via --api-key flag or DEVICE_CLOUD_API_KEY environment variable');
@@ -300,6 +393,23 @@ class Cloud extends core_1.Command {
       → `)}
 
       `);
+            if (dryRun) {
+                this.log('\nDry run mode - no tests were actually triggered\n');
+                this.log('The following tests would have been run:');
+                this.log('─────────────────────────────────────────');
+                for (const test of testFileNames) {
+                    this.log(`• ${test}`);
+                }
+                if (sequentialFlows.length > 0) {
+                    this.log('\nSequential flows:');
+                    this.log('────────────────');
+                    for (const flow of sequentialFlows) {
+                        this.log(`• ${flow}`);
+                    }
+                }
+                this.log('\n');
+                return;
+            }
             if (!finalBinaryId) {
                 if (!finalAppFile)
                     throw new Error('You must provide either an app binary id or an app file');

package/dist/constants.d.ts

@@ -36,6 +36,8 @@ export declare const flags: {
     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>;
 };
 export declare const iOSCompatibilityLookup: {
     [k in EiOSDevices]: string[];

package/dist/constants.js

@@ -200,6 +200,14 @@ exports.flags = {
         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',
         required: false,
     }),
+    'moropo-v1-api-key': core_1.Flags.string({
+        description: 'API key for Moropo v1 integration',
+        required: false,
+    }),
+    'dry-run': core_1.Flags.boolean({
+        description: 'Simulate the run without actually triggering the upload/test, useful for debugging workflow issues.',
+        default: false,
+    }),
 };
 exports.iOSCompatibilityLookup = {
     'ipad-pro-6th-gen': ['16', '17', '18'],

package/dist/methods.js

@@ -155,9 +155,18 @@ const parseInfoPlist = async (buffer) => {
 const extractAppMetadataIosZip = async (appFilePath) => new Promise((resolve, reject) => {
     const zip = new StreamZip({ file: appFilePath });
     zip.on('ready', () => {
-        const infoPlist = Object.values(zip.entries()).find((e) => e.name.endsWith('.app/Info.plist'));
+        // Get all entries and sort them by path depth
+        const entries = Object.values(zip.entries());
+        const sortedEntries = entries.sort((a, b) => {
+            const aDepth = a.name.split('/').length;
+            const bDepth = b.name.split('/').length;
+            return aDepth - bDepth;
+        });
+        // Find the first Info.plist in the shallowest directory
+        const infoPlist = sortedEntries.find((e) => e.name.endsWith('.app/Info.plist'));
         if (!infoPlist) {
             reject(new Error('Failed to find info plist'));
+            return;
         }
         const buffer = zip.entryDataSync(infoPlist.name);
         parseInfoPlist(buffer)

package/dist/plan.js

@@ -118,7 +118,6 @@ async function plan(input, includeTags, excludeTags, excludeFlows, configFile) {
         acc[filePath] = config;
         return acc;
     }, {});
-    const allFiles = await Promise.all(unfilteredFlowFiles.map((filePath) => checkDependencies(filePath))).then((results) => [...new Set(results.flat())]);
     const allIncludeTags = [
         ...includeTags,
         ...(workspaceConfig.includeTags || []),
@@ -138,6 +137,8 @@ async function plan(input, includeTags, excludeTags, excludeFlows, configFile) {
     if (allFlows.length === 0) {
         throw new Error(`Include / Exclude tags did not match any Flows:\n\nInclude Tags:\n${allIncludeTags.join('\n')}\n\nExclude Tags:\n${allExcludeTags.join('\n')}`);
     }
+    // Check dependencies only for the filtered flows
+    const allFiles = await Promise.all(allFlows.map((filePath) => checkDependencies(filePath))).then((results) => [...new Set(results.flat())]);
     // eslint-disable-next-line unicorn/no-array-reduce
     const pathsByName = allFlows.reduce((acc, filePath) => {
         const config = configPerFlowFile[filePath];

package/oclif.manifest.json

@@ -378,6 +378,20 @@
           "required": false,
           "allowNo": false,
           "type": "boolean"
+        },
+        "moropo-v1-api-key": {
+          "description": "API key for Moropo v1 integration",
+          "name": "moropo-v1-api-key",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "dry-run": {
+          "description": "Simulate the run without actually triggering the upload/test, useful for debugging workflow issues.",
+          "name": "dry-run",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -537,5 +551,5 @@
       ]
     }
   },
-  "version": "3.6.9"
+  "version": "3.6.11"
 }

package/package.json

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