@testingbot/cli 1.0.0 → 1.0.2

package/dist/providers/xcuitest.d.ts

@@ -1,5 +1,11 @@
 import XCUITestOptions from '../models/xcuitest_options';
 import Credentials from '../models/credentials';
+import BaseProvider from './base_provider';
+export interface XCUITestRunEnvironment {
+    device?: string;
+    name?: string;
+    version?: string;
+}
 export interface XCUITestRunInfo {
     id: number;
     status: 'WAITING' | 'READY' | 'DONE' | 'FAILED';
@@ -8,6 +14,7 @@ export interface XCUITestRunInfo {
         platformName: string;
         version?: string;
     };
+    environment?: XCUITestRunEnvironment;
     success: number;
     report?: string;
 }
@@ -24,23 +31,13 @@ export interface XCUITestSocketMessage {
     id: number;
     payload: string;
 }
-export default class XCUITest {
-    private readonly URL;
-    private readonly POLL_INTERVAL_MS;
-    private readonly MAX_POLL_ATTEMPTS;
-    private credentials;
-    private options;
-    private upload;
-    private appId;
-    private activeRunIds;
-    private isShuttingDown;
-    private signalHandler;
+export default class XCUITest extends BaseProvider<XCUITestOptions> {
+    protected readonly URL = "https://api.testingbot.com/v1/app-automate/xcuitest";
     private socket;
     private updateServer;
     private updateKey;
     constructor(credentials: Credentials, options: XCUITestOptions);
     private validate;
-    private ensureOutputDirectory;
     run(): Promise<XCUITestResult>;
     private uploadApp;
     private uploadTestApp;
@@ -48,17 +45,13 @@ export default class XCUITest {
     private getStatus;
     private waitForCompletion;
     private displayRunStatus;
-    private clearLine;
-    private formatElapsedTime;
+    /**
+     * Get the display name for a run, preferring environment.name over capabilities.deviceName
+     * This shows the actual device used when a wildcard (*) was specified
+     */
+    private getRunDisplayName;
     private getStatusInfo;
     private fetchReports;
-    private sleep;
-    private extractErrorMessage;
-    private setupSignalHandlers;
-    private removeSignalHandlers;
-    private handleShutdown;
-    private stopActiveRuns;
-    private stopRun;
     private connectToUpdateServer;
     private disconnectFromUpdateServer;
     private handleXCUITestData;

package/dist/providers/xcuitest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xcuitest.d.ts","sourceRoot":"","sources":["../../src/providers/xcuitest.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,4BAA4B,CAAC;AAEzD,OAAO,WAAW,MAAM,uBAAuB,CAAC;AAUhD,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,QAAQ,CAAC;IAChD,YAAY,EAAE;QACZ,UAAU,EAAE,MAAM,CAAC;QACnB,YAAY,EAAE,MAAM,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,eAAe,EAAE,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,eAAe,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,CAAC,OAAO,OAAO,QAAQ;IAC3B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAyD;IAC7E,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAQ;IACzC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAO;IAEzC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,OAAO,CAAkB;IACjC,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,KAAK,CAAiC;IAC9C,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,CAAC,SAAS,CAAuB;gBAErB,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe;YAMvD,QAAQ;YAuCR,qBAAqB;IA6BtB,GAAG,IAAI,OAAO,CAAC,cAAc,CAAC;YA4D7B,SAAS;YAaT,aAAa;YAYb,QAAQ;YAsDR,SAAS;YAoBT,iBAAiB;IAwE/B,OAAO,CAAC,gBAAgB;IAmCxB,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,aAAa;YAkBP,YAAY;IAsD1B,OAAO,CAAC,KAAK;IAIb,OAAO,CAAC,mBAAmB;IAiD3B,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,oBAAoB;IAO5B,OAAO,CAAC,cAAc;YAuBR,cAAc;YAgBd,OAAO;IA8BrB,OAAO,CAAC,qBAAqB;IAqC7B,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,mBAAmB;CAa5B"}
+{"version":3,"file":"xcuitest.d.ts","sourceRoot":"","sources":["../../src/providers/xcuitest.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,4BAA4B,CAAC;AAEzD,OAAO,WAAW,MAAM,uBAAuB,CAAC;AAOhD,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAE3C,MAAM,WAAW,sBAAsB;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,QAAQ,CAAC;IAChD,YAAY,EAAE;QACZ,UAAU,EAAE,MAAM,CAAC;QACnB,YAAY,EAAE,MAAM,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,WAAW,CAAC,EAAE,sBAAsB,CAAC;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,eAAe,EAAE,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,eAAe,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,YAAY,CAAC,eAAe,CAAC;IACjE,SAAS,CAAC,QAAQ,CAAC,GAAG,yDACkC;IAExD,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,CAAC,SAAS,CAAuB;gBAErB,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe;YAIvD,QAAQ;IAuCT,GAAG,IAAI,OAAO,CAAC,cAAc,CAAC;YA+D7B,SAAS;YAaT,aAAa;YAYb,QAAQ;YA0DR,SAAS;YA4BT,iBAAiB;IAwE/B,OAAO,CAAC,gBAAgB;IAmCxB;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,aAAa;YAkBP,YAAY;IA2D1B,OAAO,CAAC,qBAAqB;IAqC7B,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,mBAAmB;CAa5B"}

package/dist/providers/xcuitest.js

@@ -10,26 +10,14 @@ const node_path_1 = __importDefault(require("node:path"));
 const socket_io_client_1 = require("socket.io-client");
 const testingbot_error_1 = __importDefault(require("../models/testingbot_error"));
 const utils_1 = __importDefault(require("../utils"));
-const upload_1 = __importDefault(require("../upload"));
-const platform_1 = __importDefault(require("../utils/platform"));
-class XCUITest {
+const base_provider_1 = __importDefault(require("./base_provider"));
+class XCUITest extends base_provider_1.default {
     URL = 'https://api.testingbot.com/v1/app-automate/xcuitest';
-    POLL_INTERVAL_MS = 5000;
-    MAX_POLL_ATTEMPTS = 720; // 1 hour max with 5s interval
-    credentials;
-    options;
-    upload;
-    appId = undefined;
-    activeRunIds = [];
-    isShuttingDown = false;
-    signalHandler = null;
     socket = null;
     updateServer = null;
     updateKey = null;
     constructor(credentials, options) {
-        this.credentials = credentials;
-        this.options = options;
-        this.upload = new upload_1.default();
+        super(credentials, options);
     }
     async validate() {
         if (this.options.app === undefined) {
@@ -59,35 +47,13 @@ class XCUITest {
         }
         return true;
     }
-    async ensureOutputDirectory(dirPath) {
-        try {
-            const stat = await node_fs_1.default.promises.stat(dirPath);
-            if (!stat.isDirectory()) {
-                throw new testingbot_error_1.default(`Report output path exists but is not a directory: ${dirPath}`);
-            }
-        }
-        catch (error) {
-            if (error.code === 'ENOENT') {
-                try {
-                    await node_fs_1.default.promises.mkdir(dirPath, { recursive: true });
-                }
-                catch (mkdirError) {
-                    throw new testingbot_error_1.default(`Failed to create report output directory: ${dirPath}`, { cause: mkdirError });
-                }
-            }
-            else if (error instanceof testingbot_error_1.default) {
-                throw error;
-            }
-            else {
-                throw new testingbot_error_1.default(`Failed to access report output directory: ${dirPath}`, { cause: error });
-            }
-        }
-    }
     async run() {
         if (!(await this.validate())) {
             return { success: false, runs: [] };
         }
         try {
+            // Quick connectivity check before starting uploads
+            await this.ensureConnectivity();
             if (!this.options.quiet) {
                 logger_1.default.info('Uploading XCUITest App');
             }
@@ -158,9 +124,11 @@ class XCUITest {
         try {
             const capabilities = this.options.getCapabilities();
             const xcuitestOptions = this.options.getXCUITestOptions();
+            const metadata = this.options.metadata;
             const response = await axios_1.default.post(`${this.URL}/${this.appId}/run`, {
                 capabilities: [capabilities],
                 ...(xcuitestOptions && { options: xcuitestOptions }),
+                ...(metadata && { metadata }),
             }, {
                 headers: {
                     'Content-Type': 'application/json',
@@ -170,6 +138,7 @@ class XCUITest {
                     username: this.credentials.userName,
                     password: this.credentials.accessKey,
                 },
+                timeout: 30000, // 30 second timeout
             });
             // Check for version update notification
             const latestVersion = response.headers?.['x-testingbotctl-version'];
@@ -192,28 +161,30 @@ class XCUITest {
             if (error instanceof testingbot_error_1.default) {
                 throw error;
             }
-            throw new testingbot_error_1.default(`Running XCUITest failed`, {
-                cause: error,
-            });
+            throw await this.handleErrorWithDiagnostics(error, 'Running XCUITest failed');
         }
     }
     async getStatus() {
         try {
-            const response = await axios_1.default.get(`${this.URL}/${this.appId}`, {
-                headers: {
-                    'User-Agent': utils_1.default.getUserAgent(),
-                },
-                auth: {
-                    username: this.credentials.userName,
-                    password: this.credentials.accessKey,
-                },
+            return await this.withRetry('Getting XCUITest status', async () => {
+                const response = await axios_1.default.get(`${this.URL}/${this.appId}`, {
+                    headers: {
+                        'User-Agent': utils_1.default.getUserAgent(),
+                    },
+                    auth: {
+                        username: this.credentials.userName,
+                        password: this.credentials.accessKey,
+                    },
+                    timeout: 30000, // 30 second timeout
+                });
+                // Check for version update notification
+                const latestVersion = response.headers?.['x-testingbotctl-version'];
+                utils_1.default.checkForUpdate(latestVersion);
+                return response.data;
             });
-            return response.data;
         }
         catch (error) {
-            throw new testingbot_error_1.default(`Failed to get XCUITest status`, {
-                cause: error,
-            });
+            throw await this.handleErrorWithDiagnostics(error, 'Failed to get XCUITest status');
         }
     }
     async waitForCompletion() {
@@ -240,7 +211,7 @@ class XCUITest {
                     for (const run of status.runs) {
                         const statusEmoji = run.success === 1 ? '✅' : '❌';
                         const statusText = run.success === 1 ? 'Test completed successfully' : 'Test failed';
-                        console.log(`  ${statusEmoji} Run ${run.id} (${run.capabilities.deviceName}): ${statusText}`);
+                        console.log(`  ${statusEmoji} Run ${run.id} (${this.getRunDisplayName(run)}): ${statusText}`);
                     }
                 }
                 const allSucceeded = status.runs.every((run) => run.success === 1);
@@ -253,7 +224,7 @@ class XCUITest {
                     const failedRuns = status.runs.filter((run) => run.success !== 1);
                     logger_1.default.error(`${failedRuns.length} test run(s) failed:`);
                     for (const run of failedRuns) {
-                        logger_1.default.error(`  - Run ${run.id} (${run.capabilities.deviceName}): ${run.report || 'No report available'}`);
+                        logger_1.default.error(`  - Run ${run.id} (${this.getRunDisplayName(run)}): ${run.report || 'No report available'}`);
                     }
                 }
                 // Fetch reports if requested
@@ -284,24 +255,20 @@ class XCUITest {
             previousStatus.set(run.id, run.status);
             const statusInfo = this.getStatusInfo(run.status);
             if (run.status === 'WAITING' || run.status === 'READY') {
-                const message = `  ${statusInfo.emoji} Run ${run.id} (${run.capabilities.deviceName}): ${statusInfo.text} (${elapsedStr})`;
+                const message = `  ${statusInfo.emoji} Run ${run.id} (${this.getRunDisplayName(run)}): ${statusInfo.text} (${elapsedStr})`;
                 process.stdout.write(`\r${message}`);
             }
             else if (statusChanged) {
-                console.log(`  ${statusInfo.emoji} Run ${run.id} (${run.capabilities.deviceName}): ${statusInfo.text}`);
+                console.log(`  ${statusInfo.emoji} Run ${run.id} (${this.getRunDisplayName(run)}): ${statusInfo.text}`);
             }
         }
     }
-    clearLine() {
-        platform_1.default.clearLine();
-    }
-    formatElapsedTime(seconds) {
-        if (seconds < 60) {
-            return `${seconds}s`;
-        }
-        const minutes = Math.floor(seconds / 60);
-        const remainingSeconds = seconds % 60;
-        return `${minutes}m ${remainingSeconds}s`;
+    /**
+     * Get the display name for a run, preferring environment.name over capabilities.deviceName
+     * This shows the actual device used when a wildcard (*) was specified
+     */
+    getRunDisplayName(run) {
+        return run.environment?.name || run.capabilities.deviceName;
     }
     getStatusInfo(status) {
         switch (status) {
@@ -340,7 +307,11 @@ class XCUITest {
                         password: this.credentials.accessKey,
                     },
                     responseType: reportFormat === 'html' ? 'arraybuffer' : 'text',
+                    timeout: 30000, // 30 second timeout
                 });
+                // Check for version update notification
+                const latestVersion = response.headers?.['x-testingbotctl-version'];
+                utils_1.default.checkForUpdate(latestVersion);
                 const reportContent = response.data;
                 if (!reportContent) {
                     logger_1.default.error(`No report content received for run ${run.id}`);
@@ -359,106 +330,6 @@ class XCUITest {
             }
         }
     }
-    sleep(ms) {
-        return new Promise((resolve) => setTimeout(resolve, ms));
-    }
-    extractErrorMessage(cause) {
-        if (typeof cause === 'string') {
-            return cause;
-        }
-        if (Array.isArray(cause)) {
-            return cause.join('\n');
-        }
-        if (cause && typeof cause === 'object') {
-            const axiosError = cause;
-            if (axiosError.response?.data?.errors) {
-                return axiosError.response.data.errors.join('\n');
-            }
-            if (axiosError.response?.data?.error) {
-                return axiosError.response.data.error;
-            }
-            if (axiosError.response?.data?.message) {
-                return axiosError.response.data.message;
-            }
-            if (cause instanceof Error) {
-                return cause.message;
-            }
-            const obj = cause;
-            if (obj.errors) {
-                return obj.errors.join('\n');
-            }
-            if (obj.error) {
-                return obj.error;
-            }
-            if (obj.message) {
-                return obj.message;
-            }
-        }
-        return null;
-    }
-    setupSignalHandlers() {
-        this.signalHandler = () => {
-            this.handleShutdown();
-        };
-        platform_1.default.setupSignalHandlers(this.signalHandler);
-    }
-    removeSignalHandlers() {
-        if (this.signalHandler) {
-            platform_1.default.removeSignalHandlers(this.signalHandler);
-            this.signalHandler = null;
-        }
-    }
-    handleShutdown() {
-        if (this.isShuttingDown) {
-            logger_1.default.warn('Force exiting...');
-            process.exit(1);
-        }
-        this.isShuttingDown = true;
-        this.clearLine();
-        logger_1.default.warn('Received interrupt signal, stopping test runs...');
-        this.stopActiveRuns()
-            .then(() => {
-            logger_1.default.info('All test runs have been stopped.');
-            process.exit(1);
-        })
-            .catch((error) => {
-            logger_1.default.error(`Failed to stop some test runs: ${error instanceof Error ? error.message : error}`);
-            process.exit(1);
-        });
-    }
-    async stopActiveRuns() {
-        if (!this.appId || this.activeRunIds.length === 0) {
-            return;
-        }
-        const stopPromises = this.activeRunIds.map((runId) => this.stopRun(runId).catch((error) => {
-            logger_1.default.error(`Failed to stop run ${runId}: ${error instanceof Error ? error.message : error}`);
-        }));
-        await Promise.all(stopPromises);
-    }
-    async stopRun(runId) {
-        if (!this.appId) {
-            return;
-        }
-        try {
-            await axios_1.default.post(`${this.URL}/${this.appId}/${runId}/stop`, {}, {
-                headers: {
-                    'User-Agent': utils_1.default.getUserAgent(),
-                },
-                auth: {
-                    username: this.credentials.userName,
-                    password: this.credentials.accessKey,
-                },
-            });
-            if (!this.options.quiet) {
-                logger_1.default.info(`  Stopped run ${runId}`);
-            }
-        }
-        catch (error) {
-            throw new testingbot_error_1.default(`Failed to stop run ${runId}`, {
-                cause: error,
-            });
-        }
-    }
     connectToUpdateServer() {
         if (!this.updateServer || !this.updateKey || this.options.quiet) {
             return;

package/dist/upload.d.ts

@@ -6,16 +6,23 @@ export interface UploadOptions {
     credentials: Credentials;
     contentType: ContentType;
     showProgress?: boolean;
+    checksum?: string;
 }
 export interface UploadResult {
     id: number;
 }
 export default class Upload {
-    private lastProgressPercent;
     upload(options: UploadOptions): Promise<UploadResult>;
+    private drawProgressBar;
+    /**
+     * Format file size in human-readable format (KB for small files, MB for larger)
+     */
+    private formatFileSize;
     private validateFile;
-    private handleProgress;
-    private displayProgress;
-    private clearProgressLine;
+    /**
+     * Calculate MD5 checksum of a file, returning base64-encoded result
+     * This matches ActiveStorage's checksum format
+     */
+    calculateChecksum(filePath: string): Promise<string>;
 }
 //# sourceMappingURL=upload.d.ts.map

package/dist/upload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../src/upload.ts"],"names":[],"mappings":"AAIA,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAI/C,MAAM,MAAM,WAAW,GACnB,yCAAyC,GACzC,0BAA0B,GAC1B,iBAAiB,CAAC;AAEtB,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,WAAW,CAAC;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,CAAC,OAAO,OAAO,MAAM;IACzB,OAAO,CAAC,mBAAmB,CAAa;IAE3B,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;YA+DpD,YAAY;IAQ1B,OAAO,CAAC,cAAc;IAetB,OAAO,CAAC,eAAe;IAmBvB,OAAO,CAAC,iBAAiB;CAI1B"}
+{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../src/upload.ts"],"names":[],"mappings":"AAMA,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAK/C,MAAM,MAAM,WAAW,GACnB,yCAAyC,GACzC,0BAA0B,GAC1B,iBAAiB,CAAC;AAEtB,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,WAAW,CAAC;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,CAAC,OAAO,OAAO,MAAM;IACZ,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;IA6FlE,OAAO,CAAC,eAAe;IAmBvB;;OAEG;IACH,OAAO,CAAC,cAAc;YAUR,YAAY;IAQ1B;;;OAGG;IACU,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAUlE"}

package/dist/upload.js

@@ -4,26 +4,51 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = __importDefault(require("axios"));
+const node_crypto_1 = __importDefault(require("node:crypto"));
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const form_data_1 = __importDefault(require("form-data"));
+const progress_stream_1 = __importDefault(require("progress-stream"));
 const testingbot_error_1 = __importDefault(require("./models/testingbot_error"));
 const utils_1 = __importDefault(require("./utils"));
+const error_helpers_1 = require("./utils/error-helpers");
 class Upload {
-    lastProgressPercent = 0;
     async upload(options) {
-        const { filePath, url, credentials, contentType, showProgress = false, } = options;
+        const { filePath, url, credentials, showProgress = false } = options;
         await this.validateFile(filePath);
         const fileName = node_path_1.default.basename(filePath);
         const fileStats = await node_fs_1.default.promises.stat(filePath);
+        const totalSize = fileStats.size;
+        const progressTracker = (0, progress_stream_1.default)({
+            length: totalSize,
+            time: 100, // Emit progress every 100ms
+        });
+        let lastPercent = 0;
+        if (showProgress) {
+            this.drawProgressBar(fileName, totalSize, 0);
+            progressTracker.on('progress', (prog) => {
+                const percent = Math.round(prog.percentage);
+                if (percent !== lastPercent) {
+                    lastPercent = percent;
+                    this.drawProgressBar(fileName, totalSize, percent);
+                }
+            });
+        }
         const fileStream = node_fs_1.default.createReadStream(filePath);
+        const trackedStream = fileStream.pipe(progressTracker);
         const formData = new form_data_1.default();
-        formData.append('file', fileStream);
+        formData.append('file', trackedStream, {
+            filename: fileName,
+            contentType: options.contentType,
+            knownLength: totalSize,
+        });
+        if (options.checksum) {
+            formData.append('checksum', options.checksum);
+        }
         try {
             const response = await axios_1.default.post(url, formData, {
                 headers: {
-                    'Content-Type': contentType,
-                    'Content-Disposition': `attachment; filename=${fileName}`,
+                    ...formData.getHeaders(),
                     'User-Agent': utils_1.default.getUserAgent(),
                 },
                 auth: {
@@ -32,32 +57,61 @@ class Upload {
                 },
                 maxContentLength: Infinity,
                 maxBodyLength: Infinity,
-                onUploadProgress: showProgress
-                    ? (progressEvent) => {
-                        this.handleProgress(progressEvent, fileStats.size, fileName);
-                    }
-                    : undefined,
+                maxRedirects: 0, // Recommended for stream uploads to avoid buffering
             });
+            // Check for version update notification
+            const latestVersion = response.headers?.['x-testingbotctl-version'];
+            utils_1.default.checkForUpdate(latestVersion);
             const result = response.data;
             if (result.id) {
                 if (showProgress) {
-                    this.clearProgressLine();
+                    this.drawProgressBar(fileName, totalSize, 100);
+                    console.log('');
                 }
                 return { id: result.id };
             }
             else {
+                if (showProgress) {
+                    console.log(' Failed');
+                }
                 throw new testingbot_error_1.default(`Upload failed: ${result.error || 'Unknown error'}`);
             }
         }
         catch (error) {
+            if (showProgress) {
+                console.log(' Failed');
+            }
             if (error instanceof testingbot_error_1.default) {
                 throw error;
             }
             if (axios_1.default.isAxiosError(error)) {
-                const message = error.response?.data?.error || error.message;
-                throw new testingbot_error_1.default(`Upload failed: ${message}`);
+                throw (0, error_helpers_1.handleAxiosError)(error, 'Upload failed');
             }
-            throw new testingbot_error_1.default(`Upload failed: ${error instanceof Error ? error.message : 'Unknown error'}`);
+            throw new testingbot_error_1.default(`Upload failed: ${error instanceof Error ? error.message : 'Unknown error'}`, { cause: error instanceof Error ? error : undefined });
+        }
+    }
+    drawProgressBar(fileName, totalBytes, percent) {
+        const barWidth = 30;
+        const filled = Math.round((barWidth * percent) / 100);
+        const empty = barWidth - filled;
+        const bar = '█'.repeat(filled) + '░'.repeat(empty);
+        const transferredBytes = (percent / 100) * totalBytes;
+        const transferred = this.formatFileSize(transferredBytes);
+        const total = this.formatFileSize(totalBytes);
+        process.stdout.write(`\r  ${fileName}: [${bar}] ${percent}% (${transferred}/${total})`);
+    }
+    /**
+     * Format file size in human-readable format (KB for small files, MB for larger)
+     */
+    formatFileSize(bytes) {
+        if (bytes < 1024) {
+            return `${bytes} B`;
+        }
+        else if (bytes < 1024 * 1024) {
+            return `${(bytes / 1024).toFixed(1)} KB`;
+        }
+        else {
+            return `${(bytes / (1024 * 1024)).toFixed(2)} MB`;
         }
     }
     async validateFile(filePath) {
@@ -68,27 +122,18 @@ class Upload {
             throw new testingbot_error_1.default(`File not found or not readable: ${filePath}`);
         }
     }
-    handleProgress(progressEvent, totalSize, fileName) {
-        const loaded = progressEvent.loaded;
-        const total = progressEvent.total || totalSize;
-        const percent = Math.round((loaded / total) * 100);
-        if (percent !== this.lastProgressPercent) {
-            this.lastProgressPercent = percent;
-            this.displayProgress(fileName, percent, loaded, total);
-        }
-    }
-    displayProgress(fileName, percent, loaded, total) {
-        const barWidth = 30;
-        const filledWidth = Math.round((percent / 100) * barWidth);
-        const emptyWidth = barWidth - filledWidth;
-        const bar = '█'.repeat(filledWidth) + '░'.repeat(emptyWidth);
-        const loadedMB = (loaded / (1024 * 1024)).toFixed(2);
-        const totalMB = (total / (1024 * 1024)).toFixed(2);
-        process.stdout.write(`\r  ${fileName}: [${bar}] ${percent}% (${loadedMB}/${totalMB} MB)`);
-    }
-    clearProgressLine() {
-        process.stdout.write('\r' + ' '.repeat(80) + '\r');
-        this.lastProgressPercent = 0;
+    /**
+     * Calculate MD5 checksum of a file, returning base64-encoded result
+     * This matches ActiveStorage's checksum format
+     */
+    async calculateChecksum(filePath) {
+        return new Promise((resolve, reject) => {
+            const hash = node_crypto_1.default.createHash('md5');
+            const stream = node_fs_1.default.createReadStream(filePath);
+            stream.on('data', (chunk) => hash.update(chunk));
+            stream.on('end', () => resolve(hash.digest('base64')));
+            stream.on('error', (err) => reject(err));
+        });
     }
 }
 exports.default = Upload;

package/dist/utils/connectivity.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Utility for checking internet connectivity using third-party endpoints
+ */
+export interface EndpointResult {
+    endpoint: string;
+    success: boolean;
+    statusCode?: number;
+    latencyMs: number;
+    error?: string;
+}
+export interface ConnectivityCheckResult {
+    connected: boolean;
+    endpointResults: EndpointResult[];
+    message: string;
+}
+/**
+ * Check if the system has internet connectivity by testing against
+ * multiple reliable third-party endpoints with detailed diagnostics.
+ */
+export declare function checkInternetConnectivity(): Promise<ConnectivityCheckResult>;
+/**
+ * Format connectivity check results for display
+ */
+export declare function formatConnectivityResults(result: ConnectivityCheckResult): string;
+//# sourceMappingURL=connectivity.d.ts.map

package/dist/utils/connectivity.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"connectivity.d.ts","sourceRoot":"","sources":["../../src/utils/connectivity.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAsB,yBAAyB,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAmFlF;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,uBAAuB,GAC9B,MAAM,CAuBR"}