@devicecloud.dev/dcd 3.7.0 → 3.7.3

package/dist/commands/cloud.js

@@ -12,6 +12,7 @@ const StreamZip = require("node-stream-zip");
 const constants_1 = require("../constants");
 const methods_1 = require("../methods");
 const plan_1 = require("../plan");
+const ApiGateway_1 = require("../gateways/ApiGateway");
 exports.mimeTypeLookupByExtension = {
     apk: 'application/vnd.android.package-archive',
     yaml: 'application/x-yaml',
@@ -124,8 +125,11 @@ class Cloud extends core_1.Command {
                 };
             }
             const [major] = process.versions.node.split('.').map(Number);
-            if (major < 18) {
-                throw new Error(`You are using node version ${major}. DCD requires node version 18 or later`);
+            if (major < 20) {
+                this.warn(`WARNING: You are using node version ${major}. DeviceCloud requires node version 20 or later`);
+                if (major < 18) {
+                    throw new Error('Invalid node version');
+                }
             }
             await this.versionCheck();
             // Download and expand Moropo zip if API key is present
@@ -518,11 +522,7 @@ class Cloud extends core_1.Command {
             if (debug) {
                 this.log(`DEBUG: Submitting flow upload request to ${apiUrl}/uploads/flow`);
             }
-            const options = {
-                body: testFormData,
-                headers: { 'x-app-api-key': apiKey },
-            };
-            const { message, results } = await (0, methods_1.typeSafePost)(apiUrl, '/uploads/flow', options);
+            const { message, results } = await ApiGateway_1.ApiGateway.uploadFlow(apiUrl, apiKey, testFormData);
             if (debug) {
                 this.log(`DEBUG: Flow upload response received`);
                 this.log(`DEBUG: Message: ${message}`);
@@ -581,9 +581,7 @@ class Cloud extends core_1.Command {
                         if (debug) {
                             this.log(`DEBUG: Polling for results: ${results[0].test_upload_id}`);
                         }
-                        const { results: updatedResults } = await (0, methods_1.typeSafeGet)(apiUrl, `/results/${results[0].test_upload_id}`, {
-                            headers: { 'x-app-api-key': apiKey },
-                        });
+                        const { results: updatedResults } = await ApiGateway_1.ApiGateway.getResultsForUpload(apiUrl, apiKey, results[0].test_upload_id);
                         if (!updatedResults) {
                             throw new Error('no results');
                         }
@@ -607,11 +605,24 @@ class Cloud extends core_1.Command {
                             if (!json) {
                                 core_1.ux.action.stop('completed');
                                 this.log('\n');
+                                const hasFailedTests = updatedResults.some((result) => result.status === 'FAILED');
                                 (0, cli_ux_1.table)(updatedResults, {
                                     status: { get: (row) => row.status },
                                     test: {
                                         get: (row) => `${row.test_file_name} ${row.retry_of ? '(retry)' : ''}`,
                                     },
+                                    duration: {
+                                        get: (row) => row.duration_seconds
+                                            ? (0, methods_1.formatDurationSeconds)(row.duration_seconds)
+                                            : '',
+                                    },
+                                    ...(hasFailedTests && {
+                                        fail_reason: {
+                                            get: (row) => row.status === 'FAILED' && row.fail_reason
+                                                ? row.fail_reason
+                                                : '',
+                                        },
+                                    }),
                                 }, { printLine: this.log.bind(this) });
                                 this.log('\n');
                                 this.log('Run completed, you can access the results at:');
@@ -624,13 +635,7 @@ class Cloud extends core_1.Command {
                                     if (debug) {
                                         this.log(`DEBUG: Downloading artifacts: ${downloadArtifacts}`);
                                     }
-                                    await (0, methods_1.typeSafePostDownload)(apiUrl, `/results/${results[0].test_upload_id}/download`, {
-                                        body: JSON.stringify({ results: downloadArtifacts }),
-                                        headers: {
-                                            'content-type': 'application/json',
-                                            'x-app-api-key': apiKey,
-                                        },
-                                    }, artifactsPath);
+                                    await ApiGateway_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'}`);
                                 }
@@ -657,6 +662,10 @@ class Cloud extends core_1.Command {
                                     tests: resultsWithoutEarlierTries.map((r) => ({
                                         name: r.test_file_name,
                                         status: r.status,
+                                        duration_seconds: r.duration_seconds,
+                                        fail_reason: r.status === 'FAILED'
+                                            ? r.fail_reason || 'No reason provided'
+                                            : undefined,
                                     })),
                                 };
                                 if (flags['json-file']) {
@@ -679,6 +688,10 @@ class Cloud extends core_1.Command {
                                     tests: resultsWithoutEarlierTries.map((r) => ({
                                         name: r.test_file_name,
                                         status: r.status,
+                                        duration_seconds: r.duration_seconds,
+                                        fail_reason: r.status === 'FAILED'
+                                            ? r.fail_reason || 'No reason provided'
+                                            : undefined,
                                     })),
                                 };
                                 if (flags['json-file']) {

package/dist/commands/status.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const constants_1 = require("../constants");
+const ApiGateway_1 = require("../gateways/ApiGateway");
 const methods_1 = require("../methods");
 class Status extends core_1.Command {
     static description = 'Get the status of an upload by name or upload ID';
@@ -52,7 +53,7 @@ class Status extends core_1.Command {
             return;
         }
         try {
-            const status = (await (0, methods_1.getUploadStatus)(apiUrl, apiKey, {
+            const status = (await ApiGateway_1.ApiGateway.getUploadStatus(apiUrl, apiKey, {
                 name,
                 uploadId,
             }));
@@ -85,14 +86,7 @@ class Status extends core_1.Command {
                             this.log(`   Fail reason: ${item.failReason}`);
                         }
                         if (item.durationSeconds) {
-                            const minutes = Math.floor(item.durationSeconds / 60);
-                            const seconds = item.durationSeconds % 60;
-                            if (minutes > 0) {
-                                this.log(`   Duration: ${minutes}m ${seconds}s`);
-                            }
-                            else {
-                                this.log(`   Duration: ${item.durationSeconds}s`);
-                            }
+                            this.log(`   Duration: ${(0, methods_1.formatDurationSeconds)(item.durationSeconds)}`);
                         }
                         this.log('');
                     });

package/dist/gateways/ApiGateway.d.ts

@@ -0,0 +1,35 @@
+import { TAppMetadata } from '../types';
+export declare class ApiGateway {
+    static getResultsForUpload: (baseUrl: string, apiKey: string, uploadId: string) => Promise<{
+        statusCode?: number;
+        results?: import("../../../api/schema.types").components["schemas"]["TResultResponse"][];
+    }>;
+    static getUploadStatus: (baseUrl: string, apiKey: string, options: {
+        uploadId?: string;
+        name?: string;
+    }) => Promise<{
+        status: "PASSED" | "FAILED" | "CANCELLED" | "PENDING";
+        tests: Array<{
+            name: string;
+            status: "PASSED" | "FAILED" | "CANCELLED" | "PENDING";
+            durationSeconds?: number;
+            failReason?: string;
+        }>;
+    }>;
+    static downloadArtifactsZip: (baseUrl: string, apiKey: string, uploadId: string, results: "ALL" | "FAILED", artifactsPath?: string) => Promise<void>;
+    static uploadFlow: (baseUrl: string, apiKey: string, testFormData: FormData) => Promise<{
+        message?: string;
+        results?: import("../../../api/schema.types").components["schemas"]["IDBResult"][];
+    }>;
+    static finaliseUpload: (baseUrl: string, apiKey: string, id: string, metadata: TAppMetadata, path: string, sha: string) => Promise<Record<string, never>>;
+    static getBinaryUploadUrl: (baseUrl: string, apiKey: string, platform: "android" | "ios") => Promise<{
+        message: string;
+        path: string;
+        token: string;
+        id: string;
+    }>;
+    static checkForExistingUpload: (baseUrl: string, apiKey: string, sha: string) => Promise<{
+        appBinaryId: string;
+        exists: boolean;
+    }>;
+}

package/dist/gateways/ApiGateway.js

@@ -0,0 +1,123 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ApiGateway = void 0;
+class ApiGateway {
+    static getResultsForUpload = async (baseUrl, apiKey, uploadId) => {
+        // todo: merge with getUploadStatus
+        const res = await fetch(`${baseUrl}/results/${uploadId}`, {
+            headers: { 'x-app-api-key': apiKey },
+        });
+        if (!res.ok) {
+            throw new Error(await res.text());
+        }
+        return res.json();
+    };
+    static getUploadStatus = async (baseUrl, apiKey, options) => {
+        const queryParams = new URLSearchParams();
+        if (options.uploadId) {
+            queryParams.append('uploadId', options.uploadId);
+        }
+        if (options.name) {
+            queryParams.append('name', options.name);
+        }
+        const response = await fetch(`${baseUrl}/uploads/status?${queryParams}`, {
+            headers: {
+                'x-app-api-key': apiKey,
+            },
+        });
+        if (!response.ok) {
+            throw new Error(`Failed to fetch status: ${response.statusText}`);
+        }
+        return response.json();
+    };
+    static downloadArtifactsZip = async (baseUrl, apiKey, uploadId, results, artifactsPath = './artifacts.zip') => {
+        const res = await fetch(`${baseUrl}/results/${uploadId}/download`, {
+            method: 'POST',
+            headers: {
+                'x-app-api-key': apiKey,
+                'content-type': 'application/json',
+            },
+            body: JSON.stringify({ results }),
+        });
+        if (!res.ok) {
+            throw new Error(await res.text());
+        }
+        // Handle tilde expansion for home directory
+        if (artifactsPath.startsWith('~/') || artifactsPath === '~') {
+            artifactsPath = artifactsPath.replace(/^~(?=$|\/|\\)/, require('os').homedir());
+        }
+        // Create directory structure if it doesn't exist
+        const { dirname } = require('node:path');
+        const { mkdirSync, createWriteStream } = require('node:fs');
+        const { finished } = require('node:stream/promises');
+        const { Readable } = require('node:stream');
+        const directory = dirname(artifactsPath);
+        if (directory !== '.') {
+            try {
+                mkdirSync(directory, { recursive: true });
+            }
+            catch (error) {
+                // Ignore if directory already exists
+                if (error.code !== 'EEXIST') {
+                    throw error;
+                }
+            }
+        }
+        const fileStream = createWriteStream(artifactsPath, { flags: 'wx' });
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        await finished(Readable.fromWeb(res.body).pipe(fileStream));
+    };
+    static uploadFlow = async (baseUrl, apiKey, testFormData) => {
+        const res = await fetch(`${baseUrl}/uploads/flow`, {
+            method: 'POST',
+            body: testFormData,
+            headers: {
+                'x-app-api-key': apiKey,
+            },
+        });
+        if (!res.ok) {
+            throw new Error(await res.text());
+        }
+        return res.json();
+    };
+    static finaliseUpload = async (baseUrl, apiKey, id, metadata, path, sha) => {
+        const res = await fetch(`${baseUrl}/uploads/finaliseUpload`, {
+            method: 'POST',
+            body: JSON.stringify({ id, metadata, path, sha }),
+            headers: {
+                'content-type': 'application/json',
+                'x-app-api-key': apiKey,
+            },
+        });
+        if (!res.ok) {
+            throw new Error(await res.text());
+        }
+        return res.json();
+    };
+    static getBinaryUploadUrl = async (baseUrl, apiKey, platform) => {
+        const res = await fetch(`${baseUrl}/uploads/getBinaryUploadUrl`, {
+            method: 'POST',
+            body: JSON.stringify({ platform }),
+            headers: {
+                'content-type': 'application/json',
+                'x-app-api-key': apiKey,
+            },
+        });
+        if (!res.ok) {
+            throw new Error(await res.text());
+        }
+        return res.json();
+    };
+    static checkForExistingUpload = async (baseUrl, apiKey, sha) => {
+        const res = await fetch(`${baseUrl}/uploads/checkForExistingUpload`, {
+            method: 'POST',
+            body: JSON.stringify({ sha }),
+            headers: {
+                'content-type': 'application/json',
+                'x-app-api-key': apiKey,
+            },
+        });
+        return res.json();
+    };
+}
+exports.ApiGateway = ApiGateway;

package/dist/gateways/SupabaseGateway.d.ts

@@ -0,0 +1,11 @@
+export declare class SupabaseGateway {
+    private static SB;
+    static getSupabaseKeys(env: 'prod' | 'dev'): {
+        SUPABASE_PUBLIC_KEY: string;
+        SUPABASE_URL: string;
+    } | {
+        SUPABASE_PUBLIC_KEY: string;
+        SUPABASE_URL: string;
+    };
+    static uploadToSignedUrl(env: 'prod' | 'dev', path: string, token: string, file: File): Promise<void>;
+}

package/dist/gateways/SupabaseGateway.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SupabaseGateway = void 0;
+const supabase_js_1 = require("@supabase/supabase-js");
+class SupabaseGateway {
+    static SB = {
+        dev: {
+            SUPABASE_PUBLIC_KEY: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImxibXNvd2VodGp3bnFsdXJwZW1iIiwicm9sZSI6ImFub24iLCJpYXQiOjE3MDkyMTg0ODcsImV4cCI6MjAyNDc5NDQ4N30.zeLTMAuZ_WwYvGdeP0kdvL_Zrs-RQee5APPyxmWq7qQ',
+            SUPABASE_URL: 'https://lbmsowehtjwnqlurpemb.supabase.co',
+        },
+        prod: {
+            SUPABASE_PUBLIC_KEY: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InBneWRucGhiaW1ldGluc2dma2JvIiwicm9sZSI6ImFub24iLCJpYXQiOjE3MDc1OTQzNDYsImV4cCI6MjAyMzE3MDM0Nn0.hAYOMFxxwX1exkQkY9xyQJGC_GhGnyogkj2N-kBkMI8',
+            SUPABASE_URL: 'https://pgydnphbimetinsgfkbo.supabase.co',
+        },
+    };
+    static getSupabaseKeys(env) {
+        return this.SB[env];
+    }
+    static async uploadToSignedUrl(env, path, token, file) {
+        const { SUPABASE_URL, SUPABASE_PUBLIC_KEY } = this.getSupabaseKeys(env);
+        const supabase = (0, supabase_js_1.createClient)(SUPABASE_URL, SUPABASE_PUBLIC_KEY);
+        const uploadToUrl = await supabase.storage
+            .from('organizations')
+            .uploadToSignedUrl(path, token, file);
+        if (uploadToUrl.error)
+            throw new Error(uploadToUrl.error);
+    }
+}
+exports.SupabaseGateway = SupabaseGateway;

package/dist/methods.d.ts

@@ -1,18 +1,5 @@
 import * as archiver from 'archiver';
-import { paths } from '../../api/schema.types';
 import { TAppMetadata } from './types';
-export declare const typeSafePost: <T extends keyof paths>(baseUrl: string, path: string, init?: {
-    body?: BodyInit;
-    headers?: HeadersInit;
-}) => Promise<paths[T]["post"]["responses"]["201"]["content"]["application/json"]>;
-export declare const typeSafePostDownload: (baseUrl: string, path: string, init?: {
-    body?: BodyInit;
-    headers?: HeadersInit;
-}, artifactsPath?: string) => Promise<void>;
-export declare const typeSafeGet: <T extends keyof paths>(baseUrl: string, path: string, init?: {
-    body?: FormData;
-    headers?: HeadersInit;
-}) => Promise<paths[T]["get"]["responses"]["200"]["content"]["application/json"]>;
 export declare const toBuffer: (archive: archiver.Archiver) => Promise<Buffer<ArrayBuffer>>;
 export declare const compressFolderToBlob: (sourceDir: string) => Promise<Blob>;
 export declare const compressFilesFromRelativePath: (path: string, files: string[], commonRoot: string) => Promise<Buffer<ArrayBuffer>>;
@@ -23,18 +10,6 @@ export declare const extractAppMetadataIos: (appFolderPath: string) => Promise<T
 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>;
-export declare const getUploadStatus: (apiUrl: string, apiKey: string, options: {
-    uploadId?: string;
-    name?: string;
-}) => Promise<{
-    status: "PASSED" | "FAILED" | "CANCELLED" | "PENDING";
-    tests: Array<{
-        name: string;
-        status: "PASSED" | "FAILED" | "CANCELLED" | "PENDING";
-        durationSeconds?: number;
-        failReason?: string;
-    }>;
-}>;
 /**
  * Writes JSON data to a file with error handling
  * @param filePath - Path to the output JSON file
@@ -46,3 +21,9 @@ export declare const writeJSONFile: (filePath: string, data: any, logger: {
     log: (message: string) => void;
     warn: (message: string) => void;
 }) => void;
+/**
+ * Formats duration in seconds into a human readable string
+ * @param durationSeconds - Duration in seconds
+ * @returns Formatted duration string (e.g. "2m 30s" or "45s")
+ */
+export declare const formatDurationSeconds: (durationSeconds: number) => string;

package/dist/methods.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeJSONFile = exports.getUploadStatus = exports.verifyAdditionalAppFiles = exports.uploadBinaries = exports.uploadBinary = exports.extractAppMetadataIos = exports.extractAppMetadataIosZip = exports.extractAppMetadataAndroid = exports.verifyAppZip = exports.compressFilesFromRelativePath = exports.compressFolderToBlob = exports.toBuffer = exports.typeSafeGet = exports.typeSafePostDownload = exports.typeSafePost = void 0;
+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;
 const core_1 = require("@oclif/core");
-const supabase_js_1 = require("@supabase/supabase-js");
 // required polyfill for node 18
 const file_1 = require("@web-std/file");
 // @ts-ignore
@@ -13,64 +12,13 @@ const node_fs_1 = require("node:fs");
 const promises_1 = require("node:fs/promises");
 const nodePath = require("node:path");
 const node_stream_1 = require("node:stream");
-const promises_2 = require("node:stream/promises");
 const StreamZip = require("node-stream-zip");
 const plist_1 = require("plist");
 const node_crypto_1 = require("node:crypto");
 const path = require("path");
-const node_path_1 = require("node:path");
-const os = require("node:os");
 const cloud_1 = require("./commands/cloud");
-const typeSafePost = async (baseUrl, path, init) => {
-    const res = await fetch(baseUrl + path, {
-        ...init,
-        method: 'POST',
-    });
-    if (!res.ok) {
-        throw new Error(await res.text());
-    }
-    return res.json();
-};
-exports.typeSafePost = typeSafePost;
-const typeSafePostDownload = async (baseUrl, path, init, artifactsPath) => {
-    const res = await fetch(baseUrl + path, {
-        ...init,
-        method: 'POST',
-    });
-    if (!res.ok) {
-        throw new Error(await res.text());
-    }
-    let outputPath = artifactsPath || './artifacts.zip';
-    // Handle tilde expansion for home directory
-    if (outputPath.startsWith('~/') || outputPath === '~') {
-        outputPath = outputPath.replace(/^~(?=$|\/|\\)/, os.homedir());
-    }
-    // Create directory structure if it doesn't exist
-    const directory = (0, node_path_1.dirname)(outputPath);
-    if (directory !== '.') {
-        try {
-            (0, node_fs_1.mkdirSync)(directory, { recursive: true });
-        }
-        catch (error) {
-            // Ignore if directory already exists
-            if (error.code !== 'EEXIST') {
-                throw error;
-            }
-        }
-    }
-    const fileStream = (0, node_fs_1.createWriteStream)(outputPath, { flags: 'wx' });
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    await (0, promises_2.finished)(node_stream_1.Readable.fromWeb(res.body).pipe(fileStream));
-};
-exports.typeSafePostDownload = typeSafePostDownload;
-const typeSafeGet = async (baseUrl, path, init) => {
-    const res = await fetch(baseUrl + path, init);
-    if (!res.ok) {
-        throw new Error(await res.text());
-    }
-    return res.json();
-};
-exports.typeSafeGet = typeSafeGet;
+const SupabaseGateway_1 = require("./gateways/SupabaseGateway");
+const ApiGateway_1 = require("./gateways/ApiGateway");
 const toBuffer = async (archive) => {
     const chunks = [];
     const writable = new node_stream_1.Writable();
@@ -216,13 +164,7 @@ const uploadBinary = async (filePath, apiUrl, apiKey, ignoreShaCheck = false, lo
     }
     if (!ignoreShaCheck && sha) {
         try {
-            const { appBinaryId, exists } = await (0, exports.typeSafePost)(apiUrl, '/uploads/checkForExistingUpload', {
-                body: JSON.stringify({ sha }),
-                headers: {
-                    'content-type': 'application/json',
-                    'x-app-api-key': apiKey,
-                },
-            });
+            const { appBinaryId, exists } = await ApiGateway_1.ApiGateway.checkForExistingUpload(apiUrl, apiKey, sha);
             if (exists) {
                 if (log) {
                     core_1.ux.info(`sha hash matches existing binary with id: ${appBinaryId}, skipping upload. Force upload with --ignore-sha-check`);
@@ -235,15 +177,7 @@ const uploadBinary = async (filePath, apiUrl, apiKey, ignoreShaCheck = false, lo
             // ignore error
         }
     }
-    const { id, message, path, token } = await (0, exports.typeSafePost)(apiUrl, '/uploads/getBinaryUploadUrl', {
-        body: JSON.stringify({
-            platform: filePath?.endsWith('.apk') ? 'android' : 'ios',
-        }),
-        headers: {
-            'content-type': 'application/json',
-            'x-app-api-key': apiKey,
-        },
-    });
+    const { id, message, path, token } = await ApiGateway_1.ApiGateway.getBinaryUploadUrl(apiUrl, apiKey, filePath?.endsWith('.apk') ? 'android' : 'ios');
     if (!path)
         throw new Error(message);
     let metadata;
@@ -259,33 +193,9 @@ const uploadBinary = async (filePath, apiUrl, apiKey, ignoreShaCheck = false, lo
             core_1.ux.warn('Failed to extract 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_PUBLIC_KEY: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImxibXNvd2VodGp3bnFsdXJwZW1iIiwicm9sZSI6ImFub24iLCJpYXQiOjE3MDkyMTg0ODcsImV4cCI6MjAyNDc5NDQ4N30.zeLTMAuZ_WwYvGdeP0kdvL_Zrs-RQee5APPyxmWq7qQ',
-            SUPABASE_URL: 'https://lbmsowehtjwnqlurpemb.supabase.co',
-        },
-        prod: {
-            SUPABASE_PUBLIC_KEY: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InBneWRucGhiaW1ldGluc2dma2JvIiwicm9sZSI6ImFub24iLCJpYXQiOjE3MDc1OTQzNDYsImV4cCI6MjAyMzE3MDM0Nn0.hAYOMFxxwX1exkQkY9xyQJGC_GhGnyogkj2N-kBkMI8',
-            SUPABASE_URL: 'https://pgydnphbimetinsgfkbo.supabase.co',
-        },
-    };
-    const { SUPABASE_PUBLIC_KEY, SUPABASE_URL } = SB[apiUrl === 'https://api.devicecloud.dev' ? 'prod' : 'dev'];
-    const supabase = (0, supabase_js_1.createClient)(SUPABASE_URL, SUPABASE_PUBLIC_KEY);
-    const uploadToUrl = await supabase.storage
-        .from('organizations')
-        .uploadToSignedUrl(path, token, file);
-    if (uploadToUrl.error)
-        throw new Error(uploadToUrl.error);
-    const { error } = await (0, exports.typeSafePost)(apiUrl, '/uploads/finaliseUpload', {
-        body: JSON.stringify({ id, metadata, path, sha }),
-        headers: {
-            'content-type': 'application/json',
-            'x-app-api-key': apiKey,
-        },
-    });
-    if (error)
-        throw new Error(error);
+    const env = apiUrl === 'https://api.devicecloud.dev' ? 'prod' : 'dev';
+    await SupabaseGateway_1.SupabaseGateway.uploadToSignedUrl(env, path, token, file);
+    await ApiGateway_1.ApiGateway.finaliseUpload(apiUrl, apiKey, id, metadata, path, sha);
     if (log) {
         core_1.ux.action.stop(`\nBinary uploaded with id: ${id}`);
     }
@@ -329,25 +239,6 @@ async function getFileHashFromFile(file) {
         processChunks();
     });
 }
-const getUploadStatus = async (apiUrl, apiKey, options) => {
-    const queryParams = new URLSearchParams();
-    if (options.uploadId) {
-        queryParams.append('uploadId', options.uploadId);
-    }
-    if (options.name) {
-        queryParams.append('name', options.name);
-    }
-    const response = await fetch(`${apiUrl}/uploads/status?${queryParams}`, {
-        headers: {
-            'x-app-api-key': apiKey,
-        },
-    });
-    if (!response.ok) {
-        throw new Error(`Failed to fetch status: ${response.statusText}`);
-    }
-    return response.json();
-};
-exports.getUploadStatus = getUploadStatus;
 /**
  * Writes JSON data to a file with error handling
  * @param filePath - Path to the output JSON file
@@ -367,3 +258,17 @@ const writeJSONFile = (filePath, data, logger) => {
     }
 };
 exports.writeJSONFile = writeJSONFile;
+/**
+ * Formats duration in seconds into a human readable string
+ * @param durationSeconds - Duration in seconds
+ * @returns Formatted duration string (e.g. "2m 30s" or "45s")
+ */
+const formatDurationSeconds = (durationSeconds) => {
+    const minutes = Math.floor(durationSeconds / 60);
+    const seconds = durationSeconds % 60;
+    if (minutes > 0) {
+        return `${minutes}m ${seconds}s`;
+    }
+    return `${durationSeconds}s`;
+};
+exports.formatDurationSeconds = formatDurationSeconds;

package/oclif.manifest.json

@@ -544,5 +544,5 @@
       ]
     }
   },
-  "version": "3.7.0"
+  "version": "3.7.3"
 }

package/package.json

@@ -43,7 +43,7 @@
     "typescript": "^5"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "files": [
     "/bin",
@@ -79,7 +79,7 @@
     "prepare": "yarn build",
     "version": "oclif readme && git add README.md"
   },
-  "version": "3.7.0",
+  "version": "3.7.3",
   "bugs": {
     "url": "https://discord.gg/gm3mJwcNw8"
   },