rocketride 1.0.6 → 1.1.0

package/dist/cli/cli/rocketride.js

@@ -141,7 +141,7 @@ class Box {
     }
     boxTop() {
         const titlePart = ` ${this.title} `;
-        const remainingWidth = (this.width - 3) - titlePart.length;
+        const remainingWidth = this.width - 3 - titlePart.length;
         return CHR_TL + CHR_HORIZ + titlePart + CHR_HORIZ.repeat(Math.max(0, remainingWidth)) + CHR_TR;
     }
     boxMiddle(content) {
@@ -328,23 +328,16 @@ class StatusMonitor extends BoxMonitor {
             3: ['Online', ANSI_GREEN],
             4: ['Stopping', ANSI_YELLOW],
             5: ['Offline', ANSI_GRAY],
-            6: ['Offline', ANSI_GRAY]
+            6: ['Offline', ANSI_GRAY],
         };
         return stateMap[state] || ['Unknown', ANSI_RESET];
     }
     hasCountData(status) {
-        return ((Number(status.totalSize) || 0) > 0 ||
-            (Number(status.totalCount) || 0) > 0 ||
-            (Number(status.completedSize) || 0) > 0 ||
-            (Number(status.completedCount) || 0) > 0 ||
-            (Number(status.failedSize) || 0) > 0 ||
-            (Number(status.failedCount) || 0) > 0 ||
-            (Number(status.rateSize) || 0) > 0 ||
-            (Number(status.rateCount) || 0) > 0);
+        return (Number(status.totalSize) || 0) > 0 || (Number(status.totalCount) || 0) > 0 || (Number(status.completedSize) || 0) > 0 || (Number(status.completedCount) || 0) > 0 || (Number(status.failedSize) || 0) > 0 || (Number(status.failedCount) || 0) > 0 || (Number(status.rateSize) || 0) > 0 || (Number(status.rateCount) || 0) > 0;
     }
     hasMetricsData(status) {
         const metrics = (status.metrics || {});
-        return Object.values(metrics).some(value => typeof value === 'number' && value > 0);
+        return Object.values(metrics).some((value) => typeof value === 'number' && value > 0);
     }
     onEvent(message) {
         const eventType = message.event || '';
@@ -390,7 +383,7 @@ class StatusMonitor extends BoxMonitor {
         if (startTime > 0) {
             const startStr = new Date(startTime * 1000).toLocaleString();
             lines.push(`Started: ${startStr}`);
-            const endTime = status.completed ? (Number(status.endTime) || 0) : undefined;
+            const endTime = status.completed ? Number(status.endTime) || 0 : undefined;
             const duration = this.formatDuration(startTime, endTime);
             lines.push(`Elapsed: ${duration}`);
         }
@@ -399,7 +392,7 @@ class StatusMonitor extends BoxMonitor {
             const dataTypes = [
                 ['total', 'Total'],
                 ['completed', 'Completed'],
-                ['failed', 'Failed']
+                ['failed', 'Failed'],
             ];
             for (const [keyBase, label] of dataTypes) {
                 const count = Number(status[`${keyBase}Count`]) || 0;
@@ -424,7 +417,7 @@ class StatusMonitor extends BoxMonitor {
         const metrics = (status.metrics || {});
         for (const [key, value] of Object.entries(metrics)) {
             if (typeof value === 'number' && value > 0) {
-                const label = key.replace(/_/g, ' ').replace(/\b\w/g, l => l.toUpperCase());
+                const label = key.replace(/_/g, ' ').replace(/\b\w/g, (l) => l.toUpperCase());
                 lines.push(`${label}: ${value}`);
             }
         }
@@ -442,8 +435,7 @@ class StatusMonitor extends BoxMonitor {
                 const errType = parts[0].trim();
                 const message = parts[1].replace(/`/g, '').trim();
                 const fileInfo = parts[2].trim();
-                const filename = fileInfo.includes('\\') || fileInfo.includes('/') ?
-                    path.basename(fileInfo) : fileInfo;
+                const filename = fileInfo.includes('\\') || fileInfo.includes('/') ? path.basename(fileInfo) : fileInfo;
                 lines.push(`${color}${errType}${ANSI_RESET}: ${message}`);
                 if (filename) {
                     lines.push(`  -> ${filename}`);
@@ -459,7 +451,7 @@ class StatusMonitor extends BoxMonitor {
         if (!items || items.length === 0) {
             return [];
         }
-        return items.slice(-5).map(item => `• ${item}`);
+        return items.slice(-5).map((item) => `• ${item}`);
     }
     displayConnecting(url, attempt) {
         this.clear();
@@ -480,7 +472,7 @@ class UploadProgressMonitor extends BoxMonitor {
         this.setCommandStatus('Preparing upload...');
     }
     createProgressBar(percent, width = 30) {
-        const filledLength = Math.floor(width * percent / 100);
+        const filledLength = Math.floor((width * percent) / 100);
         const bar = CHR_BLOCK.repeat(filledLength) + CHR_LIGHT_BLOCK.repeat(width - filledLength);
         return `[${bar}] ${percent.toFixed(1).padStart(5)}%`;
     }
@@ -516,7 +508,7 @@ class UploadProgressMonitor extends BoxMonitor {
                 filepath,
                 action,
                 bytes_sent: bytesSent,
-                file_size: fileSize
+                file_size: fileSize,
             });
         }
         else if (action === 'close') {
@@ -526,7 +518,7 @@ class UploadProgressMonitor extends BoxMonitor {
                     ...existing,
                     action,
                     bytes_sent: bytesSent,
-                    file_size: fileSize
+                    file_size: fileSize,
                 });
             }
         }
@@ -535,7 +527,7 @@ class UploadProgressMonitor extends BoxMonitor {
             this.completedUploads.set(filename, {
                 filepath,
                 action,
-                file_size: fileSize
+                file_size: fileSize,
             });
         }
         else if (action === 'error') {
@@ -545,7 +537,7 @@ class UploadProgressMonitor extends BoxMonitor {
                 filepath,
                 action,
                 file_size: fileSize,
-                error: errorMessage
+                error: errorMessage,
             });
         }
         this.draw();
@@ -569,7 +561,7 @@ class UploadProgressMonitor extends BoxMonitor {
                 filepath,
                 action,
                 bytes_sent: bytesSent,
-                file_size: fileSize
+                file_size: fileSize,
             });
         }
         else if (action === 'close') {
@@ -579,7 +571,7 @@ class UploadProgressMonitor extends BoxMonitor {
                     ...existing,
                     action,
                     bytes_sent: bytesSent,
-                    file_size: fileSize
+                    file_size: fileSize,
                 });
             }
         }
@@ -588,7 +580,7 @@ class UploadProgressMonitor extends BoxMonitor {
             this.completedUploads.set(filename, {
                 filepath,
                 action,
-                file_size: fileSize
+                file_size: fileSize,
             });
         }
         else if (action === 'error') {
@@ -598,7 +590,7 @@ class UploadProgressMonitor extends BoxMonitor {
                 filepath,
                 action,
                 file_size: fileSize,
-                error: errorMessage
+                error: errorMessage,
             });
         }
         if (this.cli.isCancelled()) {
@@ -625,7 +617,7 @@ class UploadProgressMonitor extends BoxMonitor {
                 const phase = action === 'write' ? 'Writing ' : action === 'close' ? 'Finalize' : '        ';
                 const bytesSent = Number(data.bytes_sent) || 0;
                 const fileSize = Number(data.file_size) || 1;
-                const percent = fileSize > 0 ? (bytesSent / fileSize * 100) : 0;
+                const percent = fileSize > 0 ? (bytesSent / fileSize) * 100 : 0;
                 const progressBar = this.createProgressBar(percent, 12);
                 const sizeInfo = `${this.formatSize(bytesSent)}/${this.formatSize(fileSize)}`;
                 uploadLines.push(`${displayName} ${phase} ${progressBar} ${sizeInfo}`);
@@ -645,8 +637,7 @@ class UploadProgressMonitor extends BoxMonitor {
             if (this.failedUploads.size > 0) {
                 summaryLines.push(`Failed: ${this.failedUploads.size} files`);
             }
-            const totalBytes = Array.from(this.completedUploads.values())
-                .reduce((sum, data) => sum + (Number(data.file_size) || 0), 0);
+            const totalBytes = Array.from(this.completedUploads.values()).reduce((sum, data) => sum + (Number(data.file_size) || 0), 0);
             summaryLines.push(`Total size: ${this.formatSize(totalBytes)}`);
             this.addBox('Upload Summary', summaryLines);
         }
@@ -658,8 +649,7 @@ class UploadProgressMonitor extends BoxMonitor {
             for (const [filename, data] of failedEntries.slice(-displayCount)) {
                 const displayName = this.truncateFilename(filename, 25);
                 const errorStr = String(data.error || '');
-                const errorMsg = errorStr.length > 30 ?
-                    `${errorStr.substring(0, 30)}...` : errorStr;
+                const errorMsg = errorStr.length > 30 ? `${errorStr.substring(0, 30)}...` : errorStr;
                 failedLines.push(`${ANSI_RED}${CHR_CROSS}${ANSI_RESET} ${displayName} - ${errorMsg}`);
             }
             if (failedEntries.length > 5) {
@@ -697,7 +687,7 @@ class RocketRideCLI {
             total_bytes: 0,
             successful_uploads: 0,
             failed_uploads: 0,
-            upload_times: []
+            upload_times: [],
         };
         this.uri = '';
         this.connected = false;
@@ -711,25 +701,52 @@ class RocketRideCLI {
     isCancelled() {
         return this.cancelled;
     }
+    isShuttingDown() {
+        return this.signalShutdownPromise !== undefined;
+    }
+    // Resolves only when the signal handler calls process.exit, so any
+    // command/run/main flow that awaits this will stand down and let the
+    // signal handler own the exit code.
+    awaitShutdown() {
+        return this.signalShutdownPromise ?? new Promise(() => { });
+    }
     setupSignalHandlers() {
-        // TODO: Enable proper signal handling
-        // const signalHandler = () => {
-        // 	this.cancel();
-        // };
-        // process.on('SIGINT', signalHandler);
-        // process.on('SIGTERM', signalHandler);
+        const FORCE_EXIT_TIMEOUT_MS = 5000;
+        const signalHandler = async (signal) => {
+            const exitCode = 128 + (signal === 'SIGINT' ? 2 : 15);
+            if (this.signalShutdownPromise) {
+                // Second signal: force exit immediately
+                process.exit(exitCode);
+            }
+            // Park a promise that never resolves; other flows await it to
+            // stand down while the signal handler drives the exit.
+            this.signalShutdownPromise = new Promise(() => { });
+            this.cancel();
+            // Force exit if cleanup hangs
+            const forceExitTimer = setTimeout(() => {
+                console.error(`\nCleanup timed out after ${FORCE_EXIT_TIMEOUT_MS}ms, forcing exit`);
+                process.exit(exitCode);
+            }, FORCE_EXIT_TIMEOUT_MS);
+            try {
+                await this.cleanupClient();
+            }
+            catch {
+                // Ignore cleanup errors during signal handling
+            }
+            finally {
+                clearTimeout(forceExitTimer);
+            }
+            process.exit(exitCode);
+        };
+        process.on('SIGINT', () => signalHandler('SIGINT'));
+        process.on('SIGTERM', () => signalHandler('SIGTERM'));
     }
     createProgram() {
         const program = new commander_1.Command();
-        program
-            .name('rocketride')
-            .description('RocketRide Unified Pipeline and File Management CLI')
-            .version('1.3.0');
+        program.name('rocketride').description('RocketRide Unified Pipeline and File Management CLI').version('1.3.0');
         // Common options
         const addCommonOptions = (cmd) => {
-            return cmd
-                .option('--uri <uri>', 'RocketRide server URI (can use ROCKETRIDE_URI env var)', process.env.ROCKETRIDE_URI || constants_1.CONST_DEFAULT_WEB_LOCAL)
-                .option('--apikey <key>', 'API key for RocketRide server authentication (can use ROCKETRIDE_APIKEY in .env or env var)', process.env.ROCKETRIDE_APIKEY);
+            return cmd.option('--uri <uri>', 'RocketRide server URI (can use ROCKETRIDE_URI env var)', process.env.ROCKETRIDE_URI || constants_1.CONST_DEFAULT_WEB_LOCAL).option('--apikey <key>', 'API key for RocketRide server authentication (can use ROCKETRIDE_APIKEY in .env or env var)', process.env.ROCKETRIDE_APIKEY);
         };
         // Start command
         const startCmd = program
@@ -749,16 +766,20 @@ class RocketRideCLI {
                 command: 'start',
                 ...options,
                 pipeline: options.pipeline,
-                threads: parseInt(options.threads)
+                threads: parseInt(options.threads),
             };
             this.uri = options.uri;
             try {
                 const exitCode = await this.cmdStart();
-                process.exit(exitCode);
+                if (!this.isCancelled()) {
+                    process.exit(exitCode);
+                }
             }
             finally {
-                this.cancel();
-                await this.cleanupClient();
+                if (!this.isCancelled()) {
+                    this.cancel();
+                    await this.cleanupClient();
+                }
             }
         });
         addCommonOptions(startCmd);
@@ -784,16 +805,20 @@ class RocketRideCLI {
                 files,
                 threads: parseInt(options.threads),
                 max_concurrent: parseInt(options.maxConcurrent || '5'),
-                pipeline_args: options.args
+                pipeline_args: options.args,
             };
             this.uri = options.uri;
             try {
                 const exitCode = await this.cmdUpload();
-                process.exit(exitCode);
+                if (!this.isCancelled()) {
+                    process.exit(exitCode);
+                }
             }
             finally {
-                this.cancel();
-                await this.cleanupClient();
+                if (!this.isCancelled()) {
+                    this.cancel();
+                    await this.cleanupClient();
+                }
             }
         });
         addCommonOptions(uploadCmd);
@@ -815,11 +840,15 @@ class RocketRideCLI {
             this.uri = options.uri;
             try {
                 const exitCode = await this.cmdStatus();
-                process.exit(exitCode);
+                if (!this.isCancelled()) {
+                    process.exit(exitCode);
+                }
             }
             finally {
-                this.cancel();
-                await this.cleanupClient();
+                if (!this.isCancelled()) {
+                    this.cancel();
+                    await this.cleanupClient();
+                }
             }
         });
         addCommonOptions(statusCmd);
@@ -841,14 +870,213 @@ class RocketRideCLI {
             this.uri = options.uri;
             try {
                 const exitCode = await this.cmdStop();
-                process.exit(exitCode);
+                if (!this.isCancelled()) {
+                    process.exit(exitCode);
+                }
+            }
+            finally {
+                if (!this.isCancelled()) {
+                    this.cancel();
+                    await this.cleanupClient();
+                }
+            }
+        });
+        addCommonOptions(stopCmd);
+        // Store command with file system subcommands
+        const storeCmd = program.command('store').description('File store operations');
+        // store dir
+        const storeDirCmd = storeCmd
+            .command('dir [path]')
+            .description('List directory contents')
+            .action(async (path, options) => {
+            this.args = { command: 'store', subcommand: 'dir', path: path || '', ...options };
+            this.uri = options.uri;
+            try {
+                const client = await this.createAndConnectClient();
+                const result = await client.fsListDir(path || '');
+                const entries = result.entries || [];
+                if (entries.length === 0) {
+                    const stat = path ? await client.fsStat(path) : { exists: true, type: 'dir' };
+                    if (stat.exists && stat.type === 'dir') {
+                        console.log(`    ${(0).toLocaleString().padStart(8)} File(s)  ${(0).toLocaleString().padStart(14)} bytes`);
+                        console.log(`    ${(0).toLocaleString().padStart(8)} Dir(s)`);
+                    }
+                    else {
+                        console.log('File Not Found');
+                    }
+                }
+                else {
+                    let totalSize = 0;
+                    let fileCount = 0;
+                    let dirCount = 0;
+                    for (const e of entries) {
+                        let dateStr = '                   ';
+                        if (e.modified) {
+                            const d = new Date(e.modified * 1000);
+                            const mm = String(d.getUTCMonth() + 1).padStart(2, '0');
+                            const dd = String(d.getUTCDate()).padStart(2, '0');
+                            const yyyy = d.getUTCFullYear();
+                            let hh = d.getUTCHours();
+                            const min = String(d.getUTCMinutes()).padStart(2, '0');
+                            const ampm = hh >= 12 ? 'PM' : 'AM';
+                            hh = hh % 12 || 12;
+                            dateStr = `${mm}/${dd}/${yyyy}  ${String(hh).padStart(2, '0')}:${min} ${ampm}`;
+                        }
+                        if (e.type === 'dir') {
+                            console.log(`${dateStr}    <DIR>          ${e.name}`);
+                            dirCount++;
+                        }
+                        else {
+                            const size = e.size ?? 0;
+                            totalSize += size;
+                            console.log(`${dateStr}    ${size.toLocaleString().padStart(14)} ${e.name}`);
+                            fileCount++;
+                        }
+                    }
+                    console.log(`    ${fileCount.toLocaleString().padStart(8)} File(s)  ${totalSize.toLocaleString().padStart(14)} bytes`);
+                    console.log(`    ${dirCount.toLocaleString().padStart(8)} Dir(s)`);
+                }
+                process.exit(0);
             }
             finally {
                 this.cancel();
                 await this.cleanupClient();
             }
         });
-        addCommonOptions(stopCmd);
+        addCommonOptions(storeDirCmd);
+        // store type
+        const storeTypeCmd = storeCmd
+            .command('type <path>')
+            .description('Display file contents')
+            .action(async (path, options) => {
+            this.args = { command: 'store', subcommand: 'type', path, ...options };
+            this.uri = options.uri;
+            try {
+                const client = await this.createAndConnectClient();
+                const text = await client.fsReadString(path);
+                process.stdout.write(text);
+                process.exit(0);
+            }
+            finally {
+                this.cancel();
+                await this.cleanupClient();
+            }
+        });
+        addCommonOptions(storeTypeCmd);
+        // store write
+        const storeWriteCmd = storeCmd
+            .command('write <path>')
+            .description('Write a file')
+            .option('--file <localFile>', 'Local file to upload')
+            .option('--content <text>', 'Inline text content')
+            .action(async (path, options) => {
+            this.args = { command: 'store', subcommand: 'write', path, ...options };
+            this.uri = options.uri;
+            try {
+                const client = await this.createAndConnectClient();
+                if (options.file) {
+                    const nodeFs = await Promise.resolve().then(() => __importStar(require('fs')));
+                    const { handle } = await client.fsOpen(path, 'w');
+                    try {
+                        const stream = nodeFs.createReadStream(options.file);
+                        for await (const chunk of stream) {
+                            await client.fsWrite(handle, chunk);
+                        }
+                        await client.fsClose(handle, 'w');
+                    }
+                    catch (err) {
+                        try {
+                            await client.fsClose(handle, 'w');
+                        }
+                        catch {
+                            /* best-effort */
+                        }
+                        throw err;
+                    }
+                }
+                else if (options.content !== undefined) {
+                    await client.fsWriteString(path, options.content);
+                }
+                else {
+                    console.error('Error: Either --file or --content is required');
+                    process.exit(1);
+                }
+                console.log(`Written: ${path}`);
+                process.exit(0);
+            }
+            finally {
+                this.cancel();
+                await this.cleanupClient();
+            }
+        });
+        addCommonOptions(storeWriteCmd);
+        // store rm
+        const storeRmCmd = storeCmd
+            .command('rm <path>')
+            .description('Delete a file')
+            .action(async (path, options) => {
+            this.args = { command: 'store', subcommand: 'rm', path, ...options };
+            this.uri = options.uri;
+            try {
+                const client = await this.createAndConnectClient();
+                await client.fsDelete(path);
+                console.log(`Deleted: ${path}`);
+                process.exit(0);
+            }
+            finally {
+                this.cancel();
+                await this.cleanupClient();
+            }
+        });
+        addCommonOptions(storeRmCmd);
+        // store mkdir
+        const storeMkdirCmd = storeCmd
+            .command('mkdir <path>')
+            .description('Create a directory')
+            .action(async (path, options) => {
+            this.args = { command: 'store', subcommand: 'mkdir', path, ...options };
+            this.uri = options.uri;
+            try {
+                const client = await this.createAndConnectClient();
+                await client.fsMkdir(path);
+                console.log(`Created: ${path}/`);
+                process.exit(0);
+            }
+            finally {
+                this.cancel();
+                await this.cleanupClient();
+            }
+        });
+        addCommonOptions(storeMkdirCmd);
+        // store stat
+        const storeStatCmd = storeCmd
+            .command('stat <path>')
+            .description('Get file/directory metadata')
+            .action(async (path, options) => {
+            this.args = { command: 'store', subcommand: 'stat', path, ...options };
+            this.uri = options.uri;
+            try {
+                const client = await this.createAndConnectClient();
+                const result = await client.fsStat(path);
+                if (!result.exists) {
+                    console.log(`${path}: not found`);
+                }
+                else {
+                    const details = [];
+                    if (result.size !== undefined)
+                        details.push(`size: ${result.size.toLocaleString()}`);
+                    if (result.modified)
+                        details.push(`modified: ${new Date(result.modified * 1000).toISOString()}`);
+                    console.log(`${path}: ${result.type}${details.length ? ` (${details.join(', ')})` : ''}`);
+                }
+                process.exit(0);
+            }
+            finally {
+                this.cancel();
+                await this.cleanupClient();
+            }
+        });
+        addCommonOptions(storeStatCmd);
         return program;
     }
     async handleEvent(message) {
@@ -862,7 +1090,7 @@ class RocketRideCLI {
             auth: this.args.apikey,
             onEvent: this.handleEvent.bind(this),
             onConnected,
-            onDisconnected
+            onDisconnected,
         });
         await this.client.connect();
         return this.client;
@@ -874,7 +1102,7 @@ class RocketRideCLI {
             const arguments_ = { subscribe };
             const monitorRequest = this.client.buildRequest('rrext_monitor', {
                 token,
-                arguments: arguments_
+                arguments: arguments_,
             });
             const monitorResponse = await this.client.request(monitorRequest);
             return !this.client.didFail(monitorResponse);
@@ -884,17 +1112,17 @@ class RocketRideCLI {
         }
     }
     async cleanupClient() {
-        if (this.client) {
-            try {
-                await this.client.disconnect();
-            }
-            catch {
-                // Ignore cleanup errors
-            }
-            finally {
-                this.client = undefined;
-            }
+        if (this._cleanupPromise) {
+            return this._cleanupPromise;
+        }
+        const client = this.client;
+        if (!client) {
+            return;
         }
+        this.client = undefined;
+        this._cleanupPromise = client.disconnect().catch(() => { });
+        await this._cleanupPromise;
+        this._cleanupPromise = undefined;
     }
     loadPipelineConfig(pipelineFile) {
         if (!fs.existsSync(pipelineFile) || !fs.statSync(pipelineFile).isFile()) {
@@ -933,15 +1161,9 @@ class RocketRideCLI {
                 pipeline: pipelineData,
                 threads: this.args.threads,
                 token: this.args.token,
-                args: this.args.pipeline_args || []
+                args: this.args.pipeline_args || [],
             });
-            const executionLines = [
-                'Pipeline execution started successfully',
-                `Task token: ${taskToken}`,
-                '',
-                'Use the following command to monitor status:',
-                `rocketride status --token ${taskToken} --apikey ${this.args.apikey}`
-            ];
+            const executionLines = ['Pipeline execution started successfully', `Task token: ${taskToken}`, '', 'Use the following command to monitor status:', `rocketride status --token ${taskToken} --apikey ${this.args.apikey}`];
             this.monitor.setCommandStatus(executionLines);
             this.monitor.draw();
             return 0;
@@ -973,7 +1195,7 @@ class RocketRideCLI {
                 total_bytes: 0,
                 successful_uploads: 0,
                 failed_uploads: 0,
-                upload_times: []
+                upload_times: [],
             };
             let pipelineConfig;
             let taskToken;
@@ -1022,7 +1244,7 @@ class RocketRideCLI {
                 this.monitor.addBox('File Validation Errors', validationErrorLines);
                 this.monitor.draw();
                 // Wait briefly to show errors
-                await new Promise(resolve => setTimeout(resolve, 3000));
+                await new Promise((resolve) => setTimeout(resolve, 3000));
             }
             if (validFiles.length === 0) {
                 this.monitor.setCommandStatus('File validation failed');
@@ -1041,7 +1263,7 @@ class RocketRideCLI {
                     pipeline: pipelineConfig,
                     threads: this.args.threads,
                     token: 'UPLOAD_TASK',
-                    args: this.args.pipeline_args || []
+                    args: this.args.pipeline_args || [],
                 });
                 taskToken = result.token;
             }
@@ -1050,18 +1272,18 @@ class RocketRideCLI {
             this.monitor.draw();
             const startTime = Date.now();
             // Convert file paths to File objects for sendFiles
-            const fileObjects = validFiles.map(filePath => {
+            const fileObjects = validFiles.map((filePath) => {
                 const stats = fs.statSync(filePath);
                 const content = fs.readFileSync(filePath);
                 return {
                     file: new File([content], path.basename(filePath), {
                         type: 'application/octet-stream',
-                        lastModified: stats.mtimeMs
+                        lastModified: stats.mtimeMs,
                     }),
                     objinfo: {
                         filepath: filePath,
-                        size: stats.size
-                    }
+                        size: stats.size,
+                    },
                 };
             });
             // Upload files - progress events come through event subscription
@@ -1073,11 +1295,7 @@ class RocketRideCLI {
             // Cleanup pipeline if we created it
             if (shouldManagePipeline && taskToken) {
                 try {
-                    this.monitor.setCommandStatus([
-                        'Upload completed successfully',
-                        'Cleaning up...',
-                        'Terminating pipeline...'
-                    ]);
+                    this.monitor.setCommandStatus(['Upload completed successfully', 'Cleaning up...', 'Terminating pipeline...']);
                     this.monitor.draw();
                     await this.client.terminate(taskToken);
                     // Re-show results after cleanup
@@ -1121,13 +1339,13 @@ class RocketRideCLI {
                 }
                 else if (stat.isDirectory()) {
                     const dirFiles = glob.sync(path.join(fullPath, '**/*'), { nodir: true });
-                    files.push(...dirFiles.map(f => path.resolve(f)));
+                    files.push(...dirFiles.map((f) => path.resolve(f)));
                 }
             }
             catch {
                 // Try glob pattern
                 const matches = glob.sync(pattern, { nodir: true });
-                files.push(...matches.map(f => path.resolve(f)));
+                files.push(...matches.map((f) => path.resolve(f)));
             }
         }
         // Remove duplicates
@@ -1169,13 +1387,13 @@ class RocketRideCLI {
                 successfulFiles.push({
                     name: filename,
                     size: result.file_size || 0,
-                    time: result.upload_time || 0
+                    time: result.upload_time || 0,
                 });
             }
             else {
                 failedFiles.push({
                     name: filename,
-                    error: result.error || 'Unknown error'
+                    error: result.error || 'Unknown error',
                 });
                 this.uploadStats.failed_uploads++;
             }
@@ -1185,10 +1403,7 @@ class RocketRideCLI {
         const successful = this.uploadStats.successful_uploads;
         const failed = this.uploadStats.failed_uploads;
         const totalBytes = this.uploadStats.total_bytes;
-        const summaryLines = [
-            `Total files processed: ${successful + failed}`,
-            `Successful uploads: ${ANSI_GREEN}${successful}${ANSI_RESET}`
-        ];
+        const summaryLines = [`Total files processed: ${successful + failed}`, `Successful uploads: ${ANSI_GREEN}${successful}${ANSI_RESET}`];
         if (failed > 0) {
             summaryLines.push(`Failed uploads: ${ANSI_RED}${failed}${ANSI_RESET}`);
         }
@@ -1222,10 +1437,8 @@ class RocketRideCLI {
         if (failedFiles.length > 0) {
             const failureLines = [];
             for (const failedFile of failedFiles.slice(0, 10)) {
-                const filename = failedFile.name.length > 25 ?
-                    `${failedFile.name.substring(0, 25)}...` : failedFile.name;
-                const errorMsg = failedFile.error.length > 40 ?
-                    `${failedFile.error.substring(0, 40)}...` : failedFile.error;
+                const filename = failedFile.name.length > 25 ? `${failedFile.name.substring(0, 25)}...` : failedFile.name;
+                const errorMsg = failedFile.error.length > 40 ? `${failedFile.error.substring(0, 40)}...` : failedFile.error;
                 failureLines.push(`${ANSI_RED}${CHR_CROSS}${ANSI_RESET} ${filename} - ${errorMsg}`);
             }
             if (failedFiles.length > 10) {
@@ -1237,8 +1450,7 @@ class RocketRideCLI {
         if (successfulFiles.length > 0) {
             const successLines = [];
             for (const successFile of successfulFiles.slice(-5)) {
-                const truncatedName = successFile.name.length > 35 ?
-                    `${successFile.name.substring(0, 35)}...` : successFile.name;
+                const truncatedName = successFile.name.length > 35 ? `${successFile.name.substring(0, 35)}...` : successFile.name;
                 const sizeStr = this.monitor.formatSize(successFile.size);
                 const timeStr = `${successFile.time.toFixed(1)}s`;
                 successLines.push(`${ANSI_GREEN}${CHR_CHECK}${ANSI_RESET} ${truncatedName} (${sizeStr}, ${timeStr})`);
@@ -1276,11 +1488,11 @@ class RocketRideCLI {
                     }
                     catch {
                         this.attempt++;
-                        await new Promise(resolve => setTimeout(resolve, 5000));
+                        await new Promise((resolve) => setTimeout(resolve, 5000));
                         continue;
                     }
                 }
-                await new Promise(resolve => setTimeout(resolve, 1000));
+                await new Promise((resolve) => setTimeout(resolve, 1000));
             }
             return 0;
         }
@@ -1313,11 +1525,7 @@ class RocketRideCLI {
             this.monitor.setCommandStatus(`Terminating task: ${this.args.token}`);
             this.monitor.draw();
             await this.client.terminate(this.args.token);
-            const stopLines = [
-                `Task ${this.args.token} terminated successfully`,
-                '',
-                'The task has been stopped and resources cleaned up.'
-            ];
+            const stopLines = [`Task ${this.args.token} terminated successfully`, '', 'The task has been stopped and resources cleaned up.'];
             this.monitor.setCommandStatus(stopLines);
             this.monitor.draw();
             return 0;
@@ -1340,9 +1548,16 @@ class RocketRideCLI {
         // Parse command line arguments - commander will handle command routing
         try {
             await program.parseAsync(process.argv);
+            if (this.isShuttingDown()) {
+                // Signal handler owns the exit; park until it calls process.exit.
+                await this.awaitShutdown();
+            }
             return 0; // If we get here, a command was executed successfully
         }
         catch (error) {
+            if (this.isShuttingDown()) {
+                await this.awaitShutdown();
+            }
             if (error instanceof Error && error.message.includes('interrupted')) {
                 console.log('\nOperation interrupted by user');
                 return 1;
@@ -1369,12 +1584,19 @@ function formatError(e) {
     return `${e.constructor.name}: ${e.message}`;
 }
 async function main() {
+    const cli = new RocketRideCLI();
     try {
-        const cli = new RocketRideCLI();
         const exitCode = await cli.run();
+        if (cli.isShuttingDown()) {
+            // Signal handler owns the exit code; never race it to process.exit.
+            await cli.awaitShutdown();
+        }
         process.exit(exitCode);
     }
     catch (error) {
+        if (cli.isShuttingDown()) {
+            await cli.awaitShutdown();
+        }
         if (error instanceof Error && error.message.includes('interrupted')) {
             console.log('\n\nOperation interrupted by user');
         }
@@ -1386,7 +1608,7 @@ async function main() {
 }
 // Entry point when script is run directly
 if (require.main === module) {
-    main().catch(error => {
+    main().catch((error) => {
         console.error('Fatal error:', error);
         process.exit(1);
     });