@devicecloud.dev/dcd 1.0.3 → 1.0.5

package/README.md

@@ -1,17 +1,19 @@
-devicecloud.dev CLI
-=================
+# devicecloud.dev CLI
+
+---
 
 One line swap out for Maestro Cloud
 
 Install:
+
 ```sh-session
 $ npm install -g @devicecloud.dev/dcd
 ```
 
 Use:
+
 ```sh-session
 # maestro cloud --apiKey <apiKey> <appFile> .myFlows/
-
 $ dcd cloud --apiKey <apiKey> <appFile> .myFlows/
 ```
 

package/dist/commands/cloud.d.ts

@@ -40,6 +40,7 @@ export default class Cloud extends Command {
         'include-tags': import("@oclif/core/lib/interfaces").OptionFlag<string[], import("@oclif/core/lib/interfaces").CustomOptions>;
         '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>;
+        'legacy-upload': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         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>;
     };

package/dist/commands/cloud.js

@@ -5,6 +5,7 @@ exports.EiOSDevices = 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 supabase_js_1 = require("@supabase/supabase-js");
 const promises_1 = require("node:fs/promises");
 const path = require("node:path");
 const constants_1 = require("../constants");
@@ -53,15 +54,16 @@ class Cloud extends core_1.Command {
         try {
             await (0, methods_1.versionCheck)(this.config.version);
             const { args, flags, raw } = await this.parse(Cloud);
-            const { 'android-api-level': androidApiLevel, 'android-device': androidDevice, apiKey, apiUrl, 'app-binary-id': appBinaryId, 'app-file': appFile, arm64, async, env, 'exclude-flows': excludeFlows, 'exclude-tags': excludeTags, flows, 'google-play': googlePlay, 'include-tags': includeTags, 'ios-device': iOSDevice, 'ios-version': iOSVersion, name, orientation, ...rest } = flags;
+            const { 'android-api-level': androidApiLevel, 'android-device': androidDevice, apiKey, apiUrl, 'app-binary-id': appBinaryId, 'app-file': appFile, arm64, async, env, 'exclude-flows': excludeFlows, 'exclude-tags': excludeTags, flows, 'google-play': googlePlay, 'include-tags': includeTags, 'ios-device': iOSDevice, 'ios-version': iOSVersion, 'legacy-upload': legacyUpload, name, orientation, ...rest } = flags;
             if (arm64) {
                 (0, cli_ux_1.info)('Contact hello@devicecloud.dev to enquire about arm64 devices');
                 (0, cli_ux_1.exit)();
             }
             const { firstFile, secondFile } = args;
             let finalBinaryId = appBinaryId;
-            const finalAppFile = appFile ?? firstFile;
+            let finalAppFile = appFile ?? firstFile;
             let flowFile = flows ?? secondFile;
+            let metadata;
             if (appBinaryId) {
                 if (secondFile) {
                     throw new Error('You cannot provide both an appBinaryId and a binary file');
@@ -125,27 +127,91 @@ class Cloud extends core_1.Command {
       `);
             if (!finalBinaryId) {
                 core_1.ux.action.start('Uploading binary', 'Initializing', { stdout: true });
-                const binaryFormData = new FormData();
-                if (finalAppFile?.endsWith('.app')) {
-                    const zippedAppBlob = await (0, methods_1.compressFolderToBlob)(finalAppFile);
-                    binaryFormData.set('file', zippedAppBlob, finalAppFile + '.zip');
+                if (legacyUpload) {
+                    const binaryFormData = new FormData();
+                    if (finalAppFile?.endsWith('.app')) {
+                        const zippedAppBlob = await (0, methods_1.compressFolderToBlob)(finalAppFile);
+                        finalAppFile += '.zip';
+                        binaryFormData.set('file', zippedAppBlob, finalAppFile);
+                    }
+                    else {
+                        const binaryBlob = new Blob([await (0, promises_1.readFile)(finalAppFile)], {
+                            type: mimeTypeLookupByExtension[finalAppFile.split('.').pop()],
+                        });
+                        binaryFormData.set('file', binaryBlob, finalAppFile);
+                    }
+                    const options = {
+                        body: binaryFormData,
+                        headers: { 'x-app-api-key': apiKey },
+                    };
+                    core_1.ux.action.status = `Uploading`;
+                    const { binaryId, message } = await (0, methods_1.typeSafePost)(apiUrl, '/uploads/binary', options);
+                    if (!binaryId)
+                        throw new Error(message);
+                    finalBinaryId = binaryId;
                 }
                 else {
-                    const binaryBlob = new Blob([await (0, promises_1.readFile)(finalAppFile)], {
-                        type: mimeTypeLookupByExtension[finalAppFile.split('.').pop()],
+                    const { id, message, path, token } = await (0, methods_1.typeSafePost)(apiUrl, '/uploads/getBinaryUploadUrl', {
+                        body: JSON.stringify({
+                            platform: finalAppFile?.endsWith('.apk') ? 'android' : 'ios',
+                        }),
+                        headers: {
+                            'content-type': 'application/json',
+                            'x-app-api-key': apiKey,
+                        },
+                    });
+                    finalBinaryId = id;
+                    if (!path)
+                        throw new Error(message);
+                    let file;
+                    if (finalAppFile?.endsWith('.app')) {
+                        const zippedAppBlob = await (0, methods_1.compressFolderToBlob)(finalAppFile);
+                        const filePath = finalAppFile + '.zip';
+                        file = new File([zippedAppBlob], filePath);
+                    }
+                    else {
+                        const binaryBlob = new Blob([await (0, promises_1.readFile)(finalAppFile)], {
+                            type: mimeTypeLookupByExtension[finalAppFile.split('.').pop()],
+                        });
+                        file = new File([binaryBlob], finalAppFile);
+                    }
+                    try {
+                        metadata = finalAppFile?.endsWith('.apk')
+                            ? await (0, methods_1.extractAppMetadataAndroid)(finalAppFile)
+                            : await (0, methods_1.extractAppMetadataIos)(finalAppFile);
+                    }
+                    catch {
+                        this.warn('Failed to extact app metadata, please share with support@devicecloud.dev so we can improve our parsing.');
+                    }
+                    // this needs to made nicer by using envs or maybe fetching the keys from the getSignedURL call
+                    const SB = {
+                        dev: {
+                            SUPABASE_KEY: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImxibXNvd2VodGp3bnFsdXJwZW1iIiwicm9sZSI6ImFub24iLCJpYXQiOjE3MDkyMTg0ODcsImV4cCI6MjAyNDc5NDQ4N30.zeLTMAuZ_WwYvGdeP0kdvL_Zrs-RQee5APPyxmWq7qQ',
+                            SUPABASE_URL: 'https://lbmsowehtjwnqlurpemb.supabase.co',
+                        },
+                        prod: {
+                            SUPABASE_KEY: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InBneWRucGhiaW1ldGluc2dma2JvIiwicm9sZSI6ImFub24iLCJpYXQiOjE3MDc1OTQzNDYsImV4cCI6MjAyMzE3MDM0Nn0.hAYOMFxxwX1exkQkY9xyQJGC_GhGnyogkj2N-kBkMI8',
+                            SUPABASE_URL: 'https://pgydnphbimetinsgfkbo.supabase.co',
+                        },
+                    };
+                    const { SUPABASE_KEY, SUPABASE_URL } = SB[apiUrl === 'https://api.devicecloud.dev' ? 'prod' : 'dev'];
+                    const supabase = (0, supabase_js_1.createClient)(SUPABASE_URL, SUPABASE_KEY);
+                    const uploadToUrl = await supabase.storage
+                        .from('organizations')
+                        .uploadToSignedUrl(path, token, file);
+                    if (uploadToUrl.error)
+                        throw new Error(uploadToUrl.error);
+                    const { error } = await (0, methods_1.typeSafePost)(apiUrl, '/uploads/finaliseUpload', {
+                        body: JSON.stringify({ id, metadata, path }),
+                        headers: {
+                            'content-type': 'application/json',
+                            'x-app-api-key': apiKey,
+                        },
                     });
-                    binaryFormData.set('file', binaryBlob, finalAppFile);
+                    if (error)
+                        throw new Error(error);
                 }
-                const options = {
-                    body: binaryFormData,
-                    headers: { 'x-app-api-key': apiKey },
-                };
-                core_1.ux.action.status = `Uploading`;
-                const { binaryId, message } = await (0, methods_1.typeSafePost)(apiUrl, '/uploads/binary', options);
-                if (!binaryId)
-                    throw new Error(message);
-                core_1.ux.action.stop(`\nBinary uploaded with id: ${binaryId}`);
-                finalBinaryId = binaryId;
+                core_1.ux.action.stop(`\nBinary uploaded with id: ${finalBinaryId}`);
             }
             const testFormData = new FormData();
             // eslint-disable-next-line unicorn/no-array-reduce
@@ -190,6 +256,8 @@ class Cloud extends core_1.Command {
                 testFormData.set('iOSDevice', iOSDevice.toString());
             if (name)
                 testFormData.set('name', name.toString());
+            if (metadata)
+                testFormData.set('metadata', JSON.stringify(metadata));
             for (const [key, value] of Object.entries(rest)) {
                 if (value) {
                     testFormData.set(key, value);

package/dist/constants.d.ts

@@ -16,6 +16,7 @@ export declare const flags: {
     'include-tags': import("@oclif/core/lib/interfaces").OptionFlag<string[], import("@oclif/core/lib/interfaces").CustomOptions>;
     '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>;
+    'legacy-upload': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     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>;
 };

package/dist/constants.js

@@ -103,6 +103,10 @@ exports.flags = {
         description: '[iOS only] iOS version to run your flow against',
         options: ['15', '16', '17'],
     }),
+    'legacy-upload': core_1.Flags.boolean({
+        default: false,
+        description: 'Use the legacy direct upload method',
+    }),
     name: core_1.Flags.string({
         description: 'A custom name for your upload (useful for tagging commits etc)',
     }),

package/dist/methods.d.ts

@@ -1,9 +1,10 @@
 /// <reference types="node" />
 import * as archiver from 'archiver';
 import { paths } from '../../api/schema.types';
+import { TAppMetadata } from './types';
 export declare const versionCheck: (currentVersion: string) => Promise<void>;
 export declare const typeSafePost: <T extends keyof paths>(baseUrl: string, path: string, init?: {
-    body?: FormData;
+    body?: BodyInit;
     headers?: HeadersInit;
 }) => Promise<paths[T]["post"]["responses"]["201"]["content"]["application/json"]>;
 export declare const typeSafeGet: <T extends keyof paths>(baseUrl: string, path: string, init?: {
@@ -15,3 +16,5 @@ export declare const compressDir: (sourceDir: string) => Promise<Buffer>;
 export declare const compressFolderToBlob: (sourceDir: string) => Promise<Blob>;
 export declare const compressFilesFromRelativePath: (path: string, files: string[]) => Promise<Buffer>;
 export declare const verifyAppZip: (zipPath: string) => Promise<void>;
+export declare const extractAppMetadataAndroid: (appFilePath: string) => Promise<TAppMetadata>;
+export declare const extractAppMetadataIos: (appFilePath: string) => Promise<TAppMetadata>;

package/dist/methods.js

@@ -1,12 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyAppZip = exports.compressFilesFromRelativePath = exports.compressFolderToBlob = exports.compressDir = exports.toBuffer = exports.typeSafeGet = exports.typeSafePost = exports.versionCheck = void 0;
+exports.extractAppMetadataIos = exports.extractAppMetadataAndroid = exports.verifyAppZip = exports.compressFilesFromRelativePath = exports.compressFolderToBlob = exports.compressDir = exports.toBuffer = exports.typeSafeGet = exports.typeSafePost = exports.versionCheck = void 0;
 const cli_ux_1 = require("@oclif/core/lib/cli-ux");
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+const AppInfoParser = require("app-info-parser");
 const archiver = require("archiver");
+const bplist_parser_1 = require("bplist-parser");
 // import { writeFile } from 'node:fs/promises';
 const nodePath = require("node:path");
 const node_stream_1 = require("node:stream");
 const StreamZip = require("node-stream-zip");
+const plist_1 = require("plist");
 const PERMITTED_EXTENSIONS = new Set([
     'yml',
     'yaml',
@@ -35,7 +40,6 @@ const typeSafePost = async (baseUrl, path, init) => {
     const res = await fetch(baseUrl + path, {
         ...init,
         method: 'POST',
-        signal: AbortSignal.timeout(3000000),
     });
     if (!res.ok) {
         throw new Error(await res.text());
@@ -129,3 +133,40 @@ const verifyAppZip = async (zipPath) => {
     zip.close();
 };
 exports.verifyAppZip = verifyAppZip;
+const extractAppMetadataAndroid = async (appFilePath) => {
+    const parser = new AppInfoParser(appFilePath);
+    const result = await parser.parse();
+    return { appId: result.package, platform: 'android' };
+};
+exports.extractAppMetadataAndroid = extractAppMetadataAndroid;
+const extractAppMetadataIos = 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.includes('Info.plist'));
+        if (!infoPlist) {
+            reject(new Error('Failed to find info plist'));
+        }
+        const buffer = zip.entryDataSync(infoPlist.name);
+        let data;
+        const bufferType = buffer[0];
+        if (bufferType === 60 ||
+            bufferType === '<' ||
+            bufferType === 239) {
+            data = (0, plist_1.parse)(buffer.toString());
+        }
+        else if (bufferType === 98) {
+            data = (0, bplist_parser_1.parseBuffer)(buffer)[0];
+        }
+        else {
+            reject(new Error('Unknown plist buffer type.'));
+        }
+        const appId = data.CFBundleIdentifier;
+        zip.close();
+        resolve({ appId, platform: 'ios' });
+    });
+    zip.on('error', (err) => {
+        console.error(err);
+        reject(err);
+    });
+});
+exports.extractAppMetadataIos = extractAppMetadataIos;

package/dist/types.d.ts

@@ -0,0 +1,4 @@
+export type TAppMetadata = {
+    appId: string;
+    platform: 'android' | 'ios';
+};

package/dist/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/oclif.manifest.json

@@ -189,6 +189,12 @@
           ],
           "type": "option"
         },
+        "legacy-upload": {
+          "description": "Use the legacy direct upload method",
+          "name": "legacy-upload",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "name": {
           "description": "A custom name for your upload (useful for tagging commits etc)",
           "name": "name",
@@ -226,5 +232,5 @@
       ]
     }
   },
-  "version": "1.0.3"
+  "version": "1.0.5"
 }

package/package.json

@@ -11,10 +11,14 @@
     "@oclif/plugin-plugins": "^4",
     "@oclif/plugin-update": "^4.1.11",
     "@oclif/plugin-warn-if-update-available": "^3.0.10",
+    "@supabase/supabase-js": "^2.45.1",
+    "app-info-parser": "^1.1.6",
     "archiver": "^6.0.1",
+    "bplist-parser": "^0.3.2",
     "glob": "^10.3.10",
     "js-yaml": "^4.1.0",
-    "node-stream-zip": "^1.15.0"
+    "node-stream-zip": "^1.15.0",
+    "plist": "^3.1.0"
   },
   "description": "Better cloud maestro testing",
   "devDependencies": {
@@ -25,6 +29,7 @@
     "@types/glob-to-regexp": "^0.4.4",
     "@types/js-yaml": "^4.0.9",
     "@types/mocha": "^9.0.0",
+    "@types/plist": "^3.0.5",
     "chai": "^4",
     "eslint": "^8.56.0",
     "eslint-config-oclif": "^5",
@@ -37,7 +42,7 @@
     "typescript": "^5"
   },
   "engines": {
-    "node": ">=21.0.0"
+    "node": ">=20.0.0"
   },
   "files": [
     "/bin",
@@ -73,7 +78,7 @@
     "test": "mocha --forbid-only \"test/**/*.test.ts\"",
     "version": "oclif readme && git add README.md"
   },
-  "version": "1.0.3",
+  "version": "1.0.5",
   "bugs": {
     "url": "https://discord.gg/gm3mJwcNw8"
   },