@devicecloud.dev/dcd 4.1.0 → 4.1.2-beta.1

package/dist/commands/cloud.d.ts

@@ -9,8 +9,6 @@ export default class Cloud extends Command {
     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, 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>;
@@ -52,7 +50,6 @@ export default class Cloud extends Command {
         'runner-type': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         '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>;
     };
     private versionCheck;
     run(): Promise<any>;

package/dist/commands/cloud.js

@@ -71,7 +71,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, '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, 'x86-arch': x86Arch, ...rest } = flags;
+            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);
             // Store debug flag for use in catch block
@@ -236,11 +236,8 @@ class Cloud extends core_1.Command {
             if (runnerType === 'gpu1') {
                 this.log('Note: runnerType gpu1 is Android-only and requires contacting support to enable. Without support enablement, your runner type will revert to default.');
             }
-            const additionalAppBinaryIds = nonFlatAdditionalAppBinaryIds?.flat();
-            const additionalAppFiles = nonFlatAdditionalAppFiles?.flat();
             const { firstFile, secondFile } = args;
             let finalBinaryId = appBinaryId;
-            let finalAdditionalBinaryIds = additionalAppBinaryIds;
             const finalAppFile = appFile ?? firstFile;
             let flowFile = flows ?? secondFile;
             if (debug) {
@@ -249,8 +246,6 @@ class Cloud extends core_1.Command {
                 this.log(`DEBUG: App binary ID: ${appBinaryId || 'not provided'}`);
                 this.log(`DEBUG: App file: ${finalAppFile || 'not provided'}`);
                 this.log(`DEBUG: Flow file: ${flowFile || 'not provided'}`);
-                this.log(`DEBUG: Additional app binary IDs: ${additionalAppBinaryIds?.join(', ') || 'none'}`);
-                this.log(`DEBUG: Additional app files: ${additionalAppFiles?.join(', ') || 'none'}`);
             }
             if (appBinaryId) {
                 if (secondFile) {
@@ -313,7 +308,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);
+                executionPlan = await (0, plan_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}`);
@@ -368,10 +363,6 @@ class Cloud extends core_1.Command {
                     await (0, methods_1.verifyAppZip)(finalAppFile);
                 }
             }
-            if (debug && additionalAppFiles?.length) {
-                this.log(`DEBUG: Verifying additional app files: ${additionalAppFiles.join(', ')}`);
-            }
-            await (0, methods_1.verifyAdditionalAppFiles)(additionalAppFiles);
             const flagLogs = [];
             const sensitiveFlags = new Set(['api-key', 'apiKey', 'moropo-v1-api-key']);
             for (const [k, v] of Object.entries(flags)) {
@@ -401,9 +392,6 @@ class Cloud extends core_1.Command {
         Submitting new job
       → Flow(s): ${flowFile}
       → App: ${appBinaryId || finalAppFile}
-      ${additionalAppBinaryIds.length > 0 || additionalAppFiles.length > 0
-                ? `→ Additional app(s): ${additionalAppBinaryIds} ${additionalAppFiles}`
-                : ''}
 
         With options
       → ${flagLogs.join(`
@@ -439,21 +427,6 @@ class Cloud extends core_1.Command {
                     this.log(`DEBUG: Binary uploaded with ID: ${binaryId}`);
                 }
             }
-            let uploadedBinaryIds = [];
-            if (additionalAppFiles?.length) {
-                if (debug) {
-                    this.log(`DEBUG: Uploading additional binary files: ${additionalAppFiles.join(', ')}`);
-                }
-                uploadedBinaryIds = await (0, methods_1.uploadBinaries)(additionalAppFiles, apiUrl, apiKey, ignoreShaCheck, !json);
-                finalAdditionalBinaryIds = [
-                    ...finalAdditionalBinaryIds,
-                    ...uploadedBinaryIds,
-                ];
-                if (debug) {
-                    this.log(`DEBUG: Additional binaries uploaded with IDs: ${uploadedBinaryIds.join(', ')}`);
-                    this.log(`DEBUG: Final additional binary IDs: ${finalAdditionalBinaryIds.join(', ')}`);
-                }
-            }
             const testFormData = new FormData();
             // eslint-disable-next-line unicorn/no-array-reduce
             const envObject = (env ?? []).reduce((acc, cur) => {
@@ -525,16 +498,8 @@ class Cloud extends core_1.Command {
                 report,
                 showCrosshairs: flags['show-crosshairs'],
                 skipChromeOnboarding: flags['skip-chrome-onboarding'],
-                uploadedBinaryIds,
                 version: this.config.version,
-                x86Arch,
             };
-            if (finalAdditionalBinaryIds?.length > 0) {
-                config.additionalAppBinaryIds = finalAdditionalBinaryIds;
-            }
-            if (uploadedBinaryIds?.length > 0) {
-                config.uploadedBinaryIds = uploadedBinaryIds;
-            }
             testFormData.set('config', JSON.stringify(config));
             if (Object.keys(metadataObject).length > 0) {
                 const metadataPayload = { userMetadata: metadataObject };

package/dist/constants.d.ts

@@ -3,8 +3,6 @@ export declare const DEFAULT_MAESTRO_VERSION = "1.41.0";
 export declare const getLatestMaestroVersion: () => string;
 export declare const resolveMaestroVersion: (version?: string) => string;
 export declare const 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, 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>;
@@ -46,5 +44,4 @@ export declare const flags: {
     'runner-type': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
     '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>;
 };

package/dist/constants.js

@@ -27,20 +27,6 @@ const resolveMaestroVersion = (version) => {
 };
 exports.resolveMaestroVersion = resolveMaestroVersion;
 exports.flags = {
-    'additional-app-binary-ids': core_1.Flags.string({
-        default: [],
-        description: 'The ID of the additional app binary(s) previously uploaded to devicecloud.dev to install before execution',
-        multiple: true,
-        multipleNonGreedy: true,
-        parse: (input) => input.split(','),
-    }),
-    'additional-app-files': core_1.Flags.file({
-        default: [],
-        description: 'Additional app binary(s) to install before execution',
-        multiple: true,
-        multipleNonGreedy: true,
-        parse: (input) => input.split(','),
-    }),
     'android-api-level': core_1.Flags.string({
         description: '[Android only] Android API level to run your flow against',
         options: Object.values(device_types_1.EAndroidApiLevels),
@@ -177,10 +163,12 @@ exports.flags = {
     }),
     mitmHost: core_1.Flags.string({
         description: 'used for mitmproxy support, enterprise only, contact support if interested',
+        hidden: true,
     }),
     mitmPath: core_1.Flags.string({
         dependsOn: ['mitmHost'],
         description: 'used for mitmproxy support, enterprise only, contact support if interested',
+        hidden: true,
     }),
     'moropo-v1-api-key': core_1.Flags.string({
         description: 'API key for Moropo v1 integration',
@@ -191,7 +179,7 @@ exports.flags = {
     }),
     orientation: core_1.Flags.string({
         description: '[Android only] The orientation of the device to run your flow against in degrees',
-        options: ['0', '90', '180', '270'],
+        options: ['0', '90'],
     }),
     quiet: core_1.Flags.boolean({
         char: 'q',
@@ -219,8 +207,4 @@ exports.flags = {
         default: false,
         description: '[Android only] Skip Chrome browser onboarding screens when running tests',
     }),
-    'x86-arch': core_1.Flags.boolean({
-        default: false,
-        description: '[iOS only, experimental] Run your flow against x86 architecture simulator instead of arm64',
-    }),
 };

package/dist/gateways/api-gateway.js

@@ -245,7 +245,8 @@ exports.ApiGateway = {
             }
         }
         // Write the file using streaming for better memory efficiency
-        const fileStream = createWriteStream(expandedPath, { flags: 'wx' });
+        // Use 'w' flag to overwrite existing files instead of failing
+        const fileStream = createWriteStream(expandedPath, { flags: 'w' });
         await finished(Readable.fromWeb(res.body).pipe(fileStream));
     },
 };

package/dist/methods.d.ts

@@ -8,8 +8,6 @@ export declare const extractAppMetadataAndroid: (appFilePath: string) => Promise
 export declare const extractAppMetadataIosZip: (appFilePath: string) => Promise<TAppMetadata>;
 export declare const extractAppMetadataIos: (appFolderPath: string) => Promise<TAppMetadata>;
 export declare const uploadBinary: (filePath: string, apiUrl: string, apiKey: string, ignoreShaCheck?: boolean, log?: boolean) => Promise<string>;
-export declare const uploadBinaries: (finalAppFiles: string[], apiUrl: string, apiKey: string, ignoreShaCheck?: boolean, log?: boolean) => Promise<string[]>;
-export declare const verifyAdditionalAppFiles: (appFiles: string[] | undefined) => Promise<void>;
 /**
  * Writes JSON data to a file with error handling
  * @param filePath - Path to the output JSON file

package/dist/methods.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatDurationSeconds = exports.writeJSONFile = exports.verifyAdditionalAppFiles = exports.uploadBinaries = exports.uploadBinary = exports.extractAppMetadataIos = exports.extractAppMetadataIosZip = exports.extractAppMetadataAndroid = exports.verifyAppZip = exports.compressFilesFromRelativePath = exports.compressFolderToBlob = exports.toBuffer = void 0;
+exports.formatDurationSeconds = exports.writeJSONFile = exports.uploadBinary = exports.extractAppMetadataIos = exports.extractAppMetadataIosZip = exports.extractAppMetadataAndroid = exports.verifyAppZip = exports.compressFilesFromRelativePath = exports.compressFolderToBlob = exports.toBuffer = void 0;
 const core_1 = require("@oclif/core");
 // required polyfill for node 18
 const file_1 = require("@web-std/file");
@@ -201,21 +201,6 @@ const uploadBinary = async (filePath, apiUrl, apiKey, ignoreShaCheck = false, lo
     return id;
 };
 exports.uploadBinary = uploadBinary;
-const uploadBinaries = async (finalAppFiles, apiUrl, apiKey, ignoreShaCheck = false, log = true) => Promise.all(finalAppFiles.map((f) => (0, exports.uploadBinary)(f, apiUrl, apiKey, ignoreShaCheck, log)));
-exports.uploadBinaries = uploadBinaries;
-const verifyAdditionalAppFiles = async (appFiles) => {
-    if (appFiles?.length) {
-        if (!appFiles.every((f) => ['apk', '.app', '.zip'].some((ext) => f.endsWith(ext)))) {
-            throw new Error('App file must be a .apk for android or .app/.zip file for iOS');
-        }
-        await Promise.all(appFiles.map(async (f) => {
-            if (f.endsWith('.zip')) {
-                await (0, exports.verifyAppZip)(f);
-            }
-        }));
-    }
-};
-exports.verifyAdditionalAppFiles = verifyAdditionalAppFiles;
 async function getFileHashFromFile(file) {
     return new Promise((resolve, reject) => {
         const hash = (0, node_crypto_1.createHash)('sha256');

package/dist/plan.d.ts

@@ -35,5 +35,5 @@ interface IFlowSequence {
     continueOnFailure?: boolean;
     flows: string[];
 }
-export declare function plan(input: string, includeTags: string[], excludeTags: string[], excludeFlows?: string[], configFile?: string): Promise<IExecutionPlan>;
+export declare function plan(input: string, includeTags: string[], excludeTags: string[], excludeFlows?: string[], configFile?: string, debug?: boolean): Promise<IExecutionPlan>;
 export {};

package/dist/plan.js

@@ -64,7 +64,7 @@ function extractDeviceCloudOverrides(config) {
     }
     return overrides;
 }
-async function plan(input, includeTags, excludeTags, excludeFlows, configFile) {
+async function plan(input, includeTags, excludeTags, excludeFlows, configFile, debug = false) {
     const normalizedInput = path.normalize(input);
     const flowMetadata = {};
     if (!fs.existsSync(normalizedInput)) {
@@ -189,12 +189,30 @@ async function plan(input, includeTags, excludeTags, excludeFlows, configFile) {
         const config = configPerFlowFile[filePath];
         const name = config?.name || path.parse(filePath).name;
         acc[name] = filePath;
+        if (debug) {
+            console.log(`[DEBUG] Flow name mapping: "${name}" -> ${filePath}`);
+        }
         return acc;
     }, {});
+    if (debug && workspaceConfig.executionOrder?.flowsOrder) {
+        console.log('[DEBUG] executionOrder.flowsOrder:', workspaceConfig.executionOrder.flowsOrder);
+        console.log('[DEBUG] Available flow names:', Object.keys(pathsByName));
+    }
     const flowsToRunInSequence = workspaceConfig.executionOrder?.flowsOrder
-        ?.map((flowOrder) => flowOrder.replace('.yaml', '').replace('.yml', '')) // support case where ext is left on
-        ?.map((flowOrder) => (0, planMethods_1.getFlowsToRunInSequence)(pathsByName, [flowOrder]))
+        ?.map((flowOrder) => {
+        // Strip .yaml/.yml extension only from the END of the string
+        // This supports flowsOrder entries like "my_test.yml" matching "my_test"
+        // while preserving extensions in the middle like "(file.yml) Name"
+        const normalizedFlowOrder = flowOrder.replace(/\.ya?ml$/i, '');
+        if (debug && flowOrder !== normalizedFlowOrder) {
+            console.log(`[DEBUG] Stripping trailing extension: "${flowOrder}" -> "${normalizedFlowOrder}"`);
+        }
+        return (0, planMethods_1.getFlowsToRunInSequence)(pathsByName, [normalizedFlowOrder], debug);
+    })
         .flat() || [];
+    if (debug) {
+        console.log(`[DEBUG] Sequential flows resolved: ${flowsToRunInSequence.length} flow(s)`);
+    }
     const normalFlows = allFlows
         .filter((flow) => !flowsToRunInSequence.includes(flow))
         .sort((a, b) => a.localeCompare(b));

package/dist/planMethods.d.ts

@@ -1,6 +1,6 @@
 export declare function getFlowsToRunInSequence(paths: {
     [key: string]: string;
-}, flowOrder: string[]): string[];
+}, flowOrder: string[], debug?: boolean): string[];
 export declare function isFlowFile(filePath: string): boolean;
 export declare const readYamlFileAsJson: (filePath: string) => unknown;
 export declare const readTestYamlFileAsJson: (filePath: string) => {

package/dist/planMethods.js

@@ -9,25 +9,50 @@ const yaml = require("js-yaml");
 const fs = require("node:fs");
 const path = require("node:path");
 const commandsThatRequireFiles = new Set(['addMedia', 'runFlow', 'runScript']);
-function getFlowsToRunInSequence(paths, flowOrder) {
-    if (flowOrder.length === 0)
+function getFlowsToRunInSequence(paths, flowOrder, debug = false) {
+    if (flowOrder.length === 0) {
+        if (debug) {
+            console.log('[DEBUG] getFlowsToRunInSequence: flowOrder is empty, returning []');
+        }
         return [];
+    }
     const orderSet = new Set(flowOrder);
-    const namesInOrder = Object.keys(paths).filter((key) => orderSet.has(key));
-    if (namesInOrder.length === 0)
+    const availableNames = Object.keys(paths);
+    if (debug) {
+        console.log(`[DEBUG] getFlowsToRunInSequence: Looking for flows in order: [${[...orderSet].join(', ')}]`);
+        console.log(`[DEBUG] getFlowsToRunInSequence: Available flow names: [${availableNames.join(', ')}]`);
+    }
+    const namesInOrder = availableNames.filter((key) => orderSet.has(key));
+    if (debug) {
+        console.log(`[DEBUG] getFlowsToRunInSequence: Matched ${namesInOrder.length} flow(s): [${namesInOrder.join(', ')}]`);
+    }
+    if (namesInOrder.length === 0) {
+        const notFound = [...orderSet].filter((item) => !availableNames.includes(item));
+        if (debug) {
+            console.log(`[DEBUG] getFlowsToRunInSequence: No flows matched, not found: [${notFound.join(', ')}]`);
+        }
         return [];
+    }
     const result = [...orderSet].filter((item) => namesInOrder.includes(item));
     if (result.length === 0) {
-        throw new Error(`Could not find flows needed for execution in order: ${[...orderSet]
-            .filter((item) => !namesInOrder.includes(item))
-            .join(', ')}`);
+        const notFound = [...orderSet].filter((item) => !namesInOrder.includes(item));
+        throw new Error(`Could not find flows needed for execution in order: ${notFound.join(', ')}\n\nAvailable flow names:\n${availableNames.join('\n')}`);
     }
     else if (flowOrder
         .slice(0, result.length)
         .every((value, index) => value === result[index])) {
-        return result.map((item) => paths[item]);
+        const resolvedPaths = result.map((item) => paths[item]);
+        if (debug) {
+            console.log(`[DEBUG] getFlowsToRunInSequence: Order matches, returning ${resolvedPaths.length} path(s)`);
+        }
+        return resolvedPaths;
     }
     else {
+        if (debug) {
+            console.log('[DEBUG] getFlowsToRunInSequence: Order does not match, returning []');
+            console.log(`[DEBUG] Expected order: [${flowOrder.slice(0, result.length).join(', ')}]`);
+            console.log(`[DEBUG] Actual result: [${result.join(', ')}]`);
+        }
         return [];
     }
 }

package/oclif.manifest.json

@@ -25,22 +25,6 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "additional-app-binary-ids": {
-          "description": "The ID of the additional app binary(s) previously uploaded to devicecloud.dev to install before execution",
-          "name": "additional-app-binary-ids",
-          "default": [],
-          "hasDynamicHelp": false,
-          "multiple": true,
-          "type": "option"
-        },
-        "additional-app-files": {
-          "description": "Additional app binary(s) to install before execution",
-          "name": "additional-app-files",
-          "default": [],
-          "hasDynamicHelp": false,
-          "multiple": true,
-          "type": "option"
-        },
         "android-api-level": {
           "description": "[Android only] Android API level to run your flow against",
           "name": "android-api-level",
@@ -339,6 +323,7 @@
         },
         "mitmHost": {
           "description": "used for mitmproxy support, enterprise only, contact support if interested",
+          "hidden": true,
           "name": "mitmHost",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -349,6 +334,7 @@
             "mitmHost"
           ],
           "description": "used for mitmproxy support, enterprise only, contact support if interested",
+          "hidden": true,
           "name": "mitmPath",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -376,9 +362,7 @@
           "multiple": false,
           "options": [
             "0",
-            "90",
-            "180",
-            "270"
+            "90"
           ],
           "type": "option"
         },
@@ -436,12 +420,6 @@
           "name": "skip-chrome-onboarding",
           "allowNo": false,
           "type": "boolean"
-        },
-        "x86-arch": {
-          "description": "[iOS only, experimental] Run your flow against x86 architecture simulator instead of arm64",
-          "name": "x86-arch",
-          "allowNo": false,
-          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -601,5 +579,5 @@
       ]
     }
   },
-  "version": "4.1.0"
+  "version": "4.1.2-beta.1"
 }

package/package.json

@@ -72,7 +72,7 @@
     "type": "git",
     "url": "https://devicecloud.dev"
   },
-  "version": "4.1.0",
+  "version": "4.1.2-beta.1",
   "bugs": {
     "url": "https://discord.gg/gm3mJwcNw8"
   },