grab-url 0.9.142 → 1.0.2

package/src/{grab-url-cli.js → grab-url.ts}

@@ -7,6 +7,9 @@ import { Readable } from 'stream';
 import cliProgress from 'cli-progress';
 import chalk from 'chalk';
 import ora from 'ora';
+import Table from 'cli-table3';
+import grab, { log } from './grab-api.ts';
+import readline from 'readline';
 import { readFileSync } from 'fs';
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
@@ -17,35 +20,151 @@ const __dirname = dirname(__filename);
 
 let spinners;
 try {
-  // Try the local path first
-  spinners = JSON.parse(readFileSync(join(__dirname, 'spinners.json'), 'utf8'));
+  // Try the icons/cli path first (where it actually exists)
+  spinners = JSON.parse(readFileSync(join(__dirname, 'icons', 'cli', 'spinners.json'), 'utf8'));
 } catch (error) {
   try {
-    // Try the parent directory (src)
-    spinners = JSON.parse(readFileSync(join(__dirname, '..', 'spinners.json'), 'utf8'));
+    // Try the local path
+    spinners = JSON.parse(readFileSync(join(__dirname, 'spinners.json'), 'utf8'));
   } catch (error2) {
     try {
-      // Try the current working directory
-      spinners = JSON.parse(readFileSync(join(process.cwd(), 'src', 'spinners.json'), 'utf8'));
+      // Try the parent directory (src)
+      spinners = JSON.parse(readFileSync(join(__dirname, '..', 'spinners.json'), 'utf8'));
     } catch (error3) {
-      // Fallback to default spinners if file not found
-      console.warn('Could not load spinners.json, using defaults');
-      spinners = {
-        dots: { frames: ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'] },
-        line: { frames: ['-', '\\', '|', '/'] },
-        arrow: { frames: ['←', '↖', '↑', '↗', '→', '↘', '↓', '↙'] }
-      };
+      try {
+        // Try the current working directory
+        spinners = JSON.parse(readFileSync(join(process.cwd(), 'src', 'spinners.json'), 'utf8'));
+      } catch (error4) {
+        // Fallback to default spinners if file not found
+        console.warn('Could not load spinners.json, using defaults');
+        spinners = {
+          dots: { frames: ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'] },
+          line: { frames: ['-', '\\', '|', '/'] },
+          arrow: { frames: ['←', '↖', '↑', '↗', '→', '↘', '↓', '↙'] }
+        };
+      }
     }
   }
 }
-import readline from 'readline';
-import { GlobalKeyboardListener } from 'node-global-key-listener';
-
-
 
+// --- ArgParser from grab-cli.js ---
+class ArgParser {
+  constructor() {
+    this.commands = {};
+    this.options = {};
+    this.examples = [];
+    this.helpText = '';
+    this.versionText = '1.0.0';
+  }
+  usage(text) { this.helpText = text; return this; }
+  command(pattern, desc, handler) {
+    const match = pattern.match(/\$0 <(\w+)>/);
+    if (match) this.commands[match[1]] = { desc, handler, required: true };
+    return this;
+  }
+  option(name, opts = {}) { this.options[name] = opts; return this; }
+  example(cmd, desc) { this.examples.push({ cmd, desc }); return this; }
+  help() { return this; }
+  alias(short, long) { if (this.options[long]) this.options[long].alias = short; return this; }
+  version(v) { if (v) this.versionText = v; return this; }
+  strict() { return this; }
+  parseSync() {
+    const args = process.argv.slice(2);
+    const result = {};
+    const positional = [];
+    if (args.includes('--help') || args.includes('-h')) { this.showHelp(); process.exit(0); }
+    if (args.includes('--version')) { console.log(this.versionText); process.exit(0); }
+    for (let i = 0; i < args.length; i++) {
+      const arg = args[i];
+      if (arg.startsWith('--')) {
+        const [key, value] = arg.split('=');
+        const optName = key.slice(2);
+        if (value !== undefined) {
+          result[optName] = this.coerceValue(optName, value);
+        } else if (this.options[optName]?.type === 'boolean') {
+          result[optName] = true;
+        } else {
+          const nextArg = args[i + 1];
+          if (nextArg && !nextArg.startsWith('-')) {
+            result[optName] = this.coerceValue(optName, nextArg);
+            i++;
+          } else {
+            result[optName] = true;
+          }
+        }
+      } else if (arg.startsWith('-') && arg.length === 2) {
+        const shortFlag = arg[1];
+        const longName = this.findLongName(shortFlag);
+        if (longName) {
+          if (this.options[longName]?.type === 'boolean') {
+            result[longName] = true;
+          } else {
+            const nextArg = args[i + 1];
+            if (nextArg && !nextArg.startsWith('-')) {
+              result[longName] = this.coerceValue(longName, nextArg);
+              i++;
+            }
+          }
+        }
+      } else {
+        positional.push(arg);
+      }
+    }
+    if (positional.length > 0) result.urls = positional;
+    Object.keys(this.options).forEach(key => {
+      if (result[key] === undefined && this.options[key].default !== undefined) {
+        result[key] = this.options[key].default;
+      }
+    });
+    if ((!result.urls || result.urls.length === 0) && this.commands.url?.required) {
+      console.error('Error: Missing required argument: url');
+      this.showHelp();
+      process.exit(1);
+    }
+    return result;
+  }
+  coerceValue(optName, value) {
+    const opt = this.options[optName];
+    if (!opt) return value;
+    if (opt.coerce) return opt.coerce(value);
+    switch (opt.type) {
+      case 'number': return Number(value);
+      case 'boolean': return value === 'true' || value === '1';
+      default: return value;
+    }
+  }
+  findLongName(shortFlag) {
+    return Object.keys(this.options).find(key => this.options[key].alias === shortFlag);
+  }
+  showHelp() {
+    console.log(this.helpText || 'Usage: grab <url> [options]');
+    console.log('\nPositional arguments:');
+    Object.keys(this.commands).forEach(cmd => {
+      console.log(`  ${cmd.padEnd(20)} ${this.commands[cmd].desc}`);
+    });
+    console.log('\nOptions:');
+    Object.keys(this.options).forEach(key => {
+      const opt = this.options[key];
+      const flags = opt.alias ? `-${opt.alias}, --${key}` : `--${key}`;
+      console.log(`  ${flags.padEnd(20)} ${opt.describe || ''}`);
+    });
+    if (this.examples.length > 0) {
+      console.log('\nExamples:');
+      this.examples.forEach(ex => {
+        console.log(`  ${ex.cmd}`);
+        console.log(`    ${ex.desc}`);
+      });
+    }
+  }
+}
 
+// --- Helper: Detect if a URL is a file download ---
+function isFileUrl(url) {
+  // Heuristic: ends with a file extension (e.g., .zip, .mp4, .tar.gz, .pdf, etc)
+  return /\.[a-zA-Z0-9]{1,5}(?:\.[a-zA-Z0-9]{1,5})*$/.test(url.split('?')[0]);
+}
 
-class ColorfulFileDownloader {
+export class ColorFileDownloader {
 constructor() {
   this.progressBar = null;
   this.multiBar = null;
@@ -109,7 +228,7 @@ constructor() {
   ];
   
   // Available spinner types for random selection (from spinners.json)
-  this.spinnerTypes = Object.keys(spinners);
+  this.spinnerTypes = Object.keys(spinners.default || spinners);
   
   // Initialize state directory
   this.stateDir = this.getStateDirectory();
@@ -141,7 +260,7 @@ ensureStateDirectoryExists() {
       fs.mkdirSync(this.stateDir, { recursive: true });
     }
   } catch (error) {
-    console.log(this.colors.warning('Could not create state directory, using current directory'));
+    console.log(this.colors.warning('⚠️  Could not create state directory, using current directory'));
     this.stateDir = process.cwd();
   }
 }
@@ -166,7 +285,7 @@ cleanupStateFile(stateFilePath) {
       fs.unlinkSync(stateFilePath);
     }
   } catch (error) {
-    console.log(this.colors.warning('Could not clean up state file'));
+    console.log(this.colors.warning('⚠️  Could not clean up state file'));
   }
 }
 
@@ -175,15 +294,15 @@ cleanupStateFile(stateFilePath) {
  */
 printHeaderRow() {
   console.log(
-    this.colors.success('%'.padEnd(this.COL_PERCENT)) +
-    this.colors.yellow('File'.padEnd(this.COL_FILENAME)) +
-    this.colors.cyan(''.padEnd(this.COL_SPINNER)) +
+    this.colors.success('📈 %'.padEnd(this.COL_PERCENT)) +
+    this.colors.yellow('📁 Files'.padEnd(this.COL_FILENAME)) +
+    this.colors.cyan('🔄'.padEnd(this.COL_SPINNER)) +
     ' ' +
-    this.colors.green('Progress'.padEnd(this.COL_BAR + 1)) +
-    this.colors.info('Downloaded'.padEnd(this.COL_DOWNLOADED)) +
-    this.colors.info('Total'.padEnd(this.COL_TOTAL)) +
-    this.colors.purple('Speed'.padEnd(this.COL_SPEED)) +
-    this.colors.pink('ETA'.padEnd(this.COL_ETA))
+    this.colors.green('📊 Progress'.padEnd(this.COL_BAR + 1)) +
+    this.colors.info('📥 Downloaded'.padEnd(this.COL_DOWNLOADED)) +
+    this.colors.info('📦 Total'.padEnd(this.COL_TOTAL)) +
+    this.colors.purple('⚡ Speed'.padEnd(this.COL_SPEED)) +
+    this.colors.pink('⏱️ ETA'.padEnd(this.COL_ETA))
   );
 }
 
@@ -224,14 +343,15 @@ getRandomSpinner() {
  * @returns {array} Array of spinner frame characters
  */
 getSpinnerFrames(spinnerType) {
-  const spinner = spinners[spinnerType];
+  const spinnerData = spinners.default || spinners;
+  const spinner = spinnerData[spinnerType];
   
   if (spinner && spinner.frames) {
     return spinner.frames;
   }
   
   // Fallback to dots if spinner not found
-  return spinners.dots?.frames || ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+  return spinnerData.dots?.frames || ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 }
 
 /**
@@ -291,17 +411,11 @@ calculateBarSize(spinnerFrame, baseBarSize = 20) {
  */
 async checkServerSupport(url) {
   try {
-    // Create a timeout controller
-    const timeoutController = new AbortController();
-    const timeoutId = setTimeout(() => timeoutController.abort(), 3000); // 3 second timeout
-    
     const response = await fetch(url, { 
       method: 'HEAD',
-      signal: timeoutController.signal
+      signal: this.abortController?.signal
     });
     
-    clearTimeout(timeoutId);
-    
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
@@ -319,11 +433,7 @@ async checkServerSupport(url) {
       headers: response.headers
     };
   } catch (error) {
-    if (error.name === 'AbortError') {
-      console.log(this.colors.warning('Server check timed out, proceeding with regular download'));
-    } else {
-      console.log(this.colors.warning('Could not check server resume support, proceeding with regular download'));
-    }
+    console.log(this.colors.warning('⚠️  Could not check server resume support, proceeding with regular download'));
     return {
       supportsResume: false,
       totalSize: 0,
@@ -346,7 +456,7 @@ loadDownloadState(stateFilePath) {
       return JSON.parse(stateData);
     }
   } catch (error) {
-    console.log(this.colors.warning('Could not load download state, starting fresh'));
+    console.log(this.colors.warning('⚠️  Could not load download state, starting fresh'));
   }
   return null;
 }
@@ -360,7 +470,7 @@ saveDownloadState(stateFilePath, state) {
   try {
     fs.writeFileSync(stateFilePath, JSON.stringify(state, null, 2));
   } catch (error) {
-    console.log(this.colors.warning('Could not save download state'));
+    console.log(this.colors.warning('⚠️  Could not save download state'));
   }
 }
 
@@ -376,7 +486,7 @@ getPartialFileSize(filePath) {
       return stats.size;
     }
   } catch (error) {
-    console.log(this.colors.warning('Could not read partial file size'));
+    console.log(this.colors.warning('⚠️  Could not read partial file size'));
   }
   return 0;
 }
@@ -401,11 +511,11 @@ formatBytes(bytes, decimals = 2) {
   const dm = decimals < 0 ? 0 : decimals;
   const sizes = [
     { unit: 'B', color: this.colors.info },
-    { unit: 'K', color: this.colors.cyan },
-    { unit: 'M', color: this.colors.yellow },
-    { unit: 'G', color: this.colors.purple },
-    { unit: 'T', color: this.colors.pink },
-    { unit: 'P', color: this.colors.primary }
+    { unit: 'KB', color: this.colors.cyan },
+    { unit: 'MB', color: this.colors.yellow },
+    { unit: 'GB', color: this.colors.purple },
+    { unit: 'TB', color: this.colors.pink },
+    { unit: 'PB', color: this.colors.primary }
   ];
 
   const i = Math.floor(Math.log(bytes) / Math.log(k));
@@ -631,16 +741,16 @@ formatTotalSpeed(bytesPerSecond) {
  */
 async downloadMultipleFiles(downloads) {
   try {
-    console.log(this.colors.primary(`Starting ${downloads.length} downloads...\n`));
+    console.log(this.colors.primary(`🚀 Starting download of ${downloads.length} files...\n`));
 
     // Set up global keyboard listener for pause/resume and add URL BEFORE starting downloads
     this.setupGlobalKeyboardListener();
     
-    // Print header row
+    // Print header row with emojis
     this.printHeaderRow();
 
-    // Show keyboard shortcuts
-    console.log(this.colors.info('Press p to pause/resume, a to add URL'));
+    // Show keyboard shortcut info for pause/resume in multibar view
+    console.log(this.colors.info('💡 Press p to pause/resume downloads, a to add URL.'));
 
     // Get random colors for the multibar
     const masterBarColor = this.getRandomBarColor();
@@ -701,11 +811,10 @@ async downloadMultipleFiles(downloads) {
           individualSpeeds[i] = incrementalDownloaded / timeSinceLastUpdate;
           
           if (fileBars[i] && fileBars[i].bar) {
-            const speed = this.isPaused ? this.formatSpeed('0B') : this.formatSpeed(this.formatSpeedDisplay(individualSpeeds[i]));
-            const eta = this.isPaused ? '⏸️ [P]AUSED' : 
-              (individualSizes[i] > 0 ? 
-                this.formatETA((individualSizes[i] - individualDownloaded[i]) / individualSpeeds[i]) : 
-                this.formatETA(0));
+            const speed = this.formatSpeed(this.formatSpeedDisplay(individualSpeeds[i]));
+            const eta = individualSizes[i] > 0 ? 
+              this.formatETA((individualSizes[i] - individualDownloaded[i]) / individualSpeeds[i]) : 
+              this.formatETA(0);
             
             fileBars[i].bar.update(individualDownloaded[i], {
               speed: speed,
@@ -722,14 +831,14 @@ async downloadMultipleFiles(downloads) {
       lastSpeedUpdate = now;
       lastIndividualDownloaded = [...individualDownloaded];
       
-      // Calculate total speed (0 when paused)
-      const totalSpeedBps = this.isPaused ? 0 : individualSpeeds.reduce((sum, speed) => sum + speed, 0);
+      // Calculate total speed
+      const totalSpeedBps = individualSpeeds.reduce((sum, speed) => sum + speed, 0);
       
       // Calculate total downloaded from individual files
       const totalDownloadedFromFiles = individualDownloaded.reduce((sum, downloaded) => sum + downloaded, 0);
       
-      // Calculate time elapsed since start (only when not paused)
-      const timeElapsed = this.isPaused ? 0 : (now - individualStartTimes[0]) / 1000; // seconds since first download started
+      // Calculate time elapsed since start
+      const timeElapsed = (now - individualStartTimes[0]) / 1000; // seconds since first download started
       
       // Update master bar
       const totalEta = totalSize > 0 && totalSpeedBps > 0 ? 
@@ -743,15 +852,12 @@ async downloadMultipleFiles(downloads) {
       const discoveredTotalSize = individualSizes.reduce((sum, size) => sum + size, 0);
       const displayTotalSize = discoveredTotalSize > 0 ? discoveredTotalSize : totalSize;
       
-      // Show paused status or time elapsed
-      const etaDisplay = this.isPaused ? '⏸️ [P]AUSED' : this.formatETA(timeElapsed);
-      
       masterBar.update(totalDownloadedFromFiles, {
         speed: this.formatTotalSpeed(totalSpeedBps),
         progress: this.formatMasterProgress(totalDownloadedFromFiles, displayTotalSize),
         downloadedDisplay: this.formatBytesCompact(totalDownloadedFromFiles),
         totalDisplay: this.formatTotalDisplay(displayTotalSize),
-        etaFormatted: etaDisplay,
+        etaFormatted: this.formatETA(timeElapsed), // Show time elapsed instead of ETA
         percentage: displayTotalSize > 0 ? 
           Math.round((totalDownloadedFromFiles / displayTotalSize) * 100) : 0
       });
@@ -813,10 +919,10 @@ async downloadMultipleFiles(downloads) {
           etaFormatted: this.formatETA(0),
           percentage: '  0'.padStart(3)
         }, {
-          format: this.colors.success('{percentage}%') + ' ' +
-                  this.colors.yellow('{filename}') + ' ' +
+          format: this.colors.yellow('{filename}') + ' ' +
                   this.colors.cyan('{spinner}') + ' ' + 
                   fileBarColor + '{bar}\u001b[0m' + ' ' +
+                  this.colors.success('{percentage}%') + ' ' +
                   this.colors.info('{downloadedDisplay}') + ' ' +
                   this.colors.info('{totalDisplay}') + ' ' +
                   this.colors.purple('{speed}') + ' ' +
@@ -867,20 +973,23 @@ async downloadMultipleFiles(downloads) {
     const successful = results.filter(r => r.status === 'fulfilled' && r.value.success).length;
     const failed = results.length - successful;
 
-    console.log(this.colors.green(`Success: ${successful}/${downloads.length}`));
+    console.log(this.colors.green(`✅ Successful: ${successful}/${downloads.length}`));
     if (failed > 0) {
-      console.log(this.colors.error(`Failed: ${failed}/${downloads.length}`));
+      console.log(this.colors.error(`❌ Failed: ${failed}/${downloads.length}`));
       
       results.forEach((result, index) => {
         if (result.status === 'rejected' || !result.value.success) {
           const filename = downloads[index].filename;
           const error = result.reason || result.value?.error || 'Unknown error';
-          console.log(this.colors.error(`  ${filename}: ${error.message || error}`));
+          console.log(this.colors.error(`  • ${filename}: ${error.message || error}`));
         }
       });
     }
 
-    console.log(this.colors.success('Download completed'));
+    // Random celebration emoji
+    const celebrationEmojis = ['🥳', '🎊', '🎈', '🌟', '💯', '🚀', '✨', '🔥'];
+    const randomEmoji = celebrationEmojis[Math.floor(Math.random() * celebrationEmojis.length)];
+    console.log(this.colors.success(`${randomEmoji} Batch download completed! ${randomEmoji}`));
 
     this.clearAbortControllers();
     
@@ -889,14 +998,14 @@ async downloadMultipleFiles(downloads) {
     this.setPauseCallback(() => {
       if (!pausedMessageShown) {
         this.multiBar.stop();
-        console.log(this.colors.warning('Paused. Press p to resume, a to add URL'));
+        console.log(this.colors.warning('⏸️  Paused. Press p to resume, a to add URL.'));
         pausedMessageShown = true;
       }
     });
     
     this.setResumeCallback(() => {
       if (pausedMessageShown) {
-        console.log(this.colors.success('Resumed. Press p to pause, a to add URL'));
+        console.log(this.colors.success('▶️  Resumed. Press p to pause, a to add URL.'));
         pausedMessageShown = false;
       }
     });
@@ -970,20 +1079,12 @@ async downloadSingleFileWithBar(fileBar, masterBar, totalFiles, totalTracking) {
       headers['Range'] = `bytes=${startByte}-`;
     }
 
-    // Make the fetch request with timeout
-    const timeoutController = new AbortController();
-    const timeoutId = setTimeout(() => timeoutController.abort(), 30000); // 30 second timeout
-    
-    // Combine abort and timeout signals
-    const combinedSignal = abortController.signal;
-    
+    // Make the fetch request
     const response = await fetch(url, {
       headers,
-      signal: combinedSignal
+      signal: abortController.signal
     });
     
-    clearTimeout(timeoutId);
-    
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
@@ -1140,7 +1241,7 @@ async downloadSingleFileWithBar(fileBar, masterBar, totalFiles, totalTracking) {
       progress: this.formatMasterProgress(totalTracking.totalDownloaded, displayTotalSize),
       downloadedDisplay: this.formatBytesCompact(totalTracking.totalDownloaded),
       totalDisplay: this.formatTotalDisplay(displayTotalSize),
-      etaFormatted: this.formatETA((Date.now() - individualStartTimes[0]) / 1000) // Show time elapsed
+      etaFormatted: this.formatETA((Date.now() - (totalTracking.individualStartTimes?.[0] || Date.now())) / 1000) // Show time elapsed
     });
 
   } catch (error) {
@@ -1153,7 +1254,7 @@ async downloadSingleFileWithBar(fileBar, masterBar, totalFiles, totalTracking) {
     });
     
     // Don't clean up partial file on error - allow resume
-    console.log(this.colors.info(`Partial download saved for ${filename}. Restart to resume.`));
+    console.log(this.colors.info(`💾 Partial download saved for ${filename}. Restart to resume.`));
     throw error;
   }
 }
@@ -1174,7 +1275,7 @@ async downloadFile(url, outputPath) {
     // Start with a random ora spinner animation
     const randomOraSpinner = this.getRandomOraSpinner();
     this.loadingSpinner = ora({
-      text: this.colors.primary('Checking server capabilities...'),
+      text: this.colors.primary('🌐 Checking server capabilities...'),
       spinner: randomOraSpinner,
       color: 'cyan'
     }).start();
@@ -1201,10 +1302,10 @@ async downloadFile(url, outputPath) {
       if (fileUnchanged && partialSize < serverInfo.totalSize) {
         startByte = partialSize;
         resuming = true;
-        this.loadingSpinner.succeed(this.colors.success(`Found partial download: ${this.formatBytes(partialSize)} of ${this.formatTotal(serverInfo.totalSize)}`));
-        console.log(this.colors.info(`Resuming download from ${this.formatBytes(startByte)}`));
+        this.loadingSpinner.succeed(this.colors.success(`✅ Found partial download: ${this.formatBytes(partialSize)} of ${this.formatTotal(serverInfo.totalSize)}`));
+        console.log(this.colors.info(`🔄 Resuming download from ${this.formatBytes(startByte)}`));
       } else {
-        this.loadingSpinner.warn(this.colors.warning('File changed on server, starting fresh download'));
+        this.loadingSpinner.warn(this.colors.warning('⚠️  File changed on server, starting fresh download'));
         // Clean up partial file and state
         if (fs.existsSync(tempFilePath)) {
           fs.unlinkSync(tempFilePath);
@@ -1214,7 +1315,7 @@ async downloadFile(url, outputPath) {
     } else {
       this.loadingSpinner.stop();
       if (partialSize > 0) {
-        console.log(this.colors.warning('Server does not support resumable downloads, starting fresh'));
+        console.log(this.colors.warning('⚠️  Server does not support resumable downloads, starting fresh'));
         // Clean up partial file
         if (fs.existsSync(tempFilePath)) {
           fs.unlinkSync(tempFilePath);
@@ -1228,17 +1329,12 @@ async downloadFile(url, outputPath) {
       headers['Range'] = `bytes=${startByte}-`;
     }
 
-    // Make the fetch request with timeout
-    const timeoutController = new AbortController();
-    const timeoutId = setTimeout(() => timeoutController.abort(), 30000); // 30 second timeout
-    
+    // Make the fetch request
     const response = await fetch(url, {
       headers,
       signal: this.abortController.signal
     });
     
-    clearTimeout(timeoutId);
-    
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
@@ -1250,9 +1346,9 @@ async downloadFile(url, outputPath) {
 
     if (!resuming) {
       if (totalSize === 0) {
-        console.log(this.colors.warning('Warning: Content-Length not provided, progress will be estimated'));
+        console.log(this.colors.warning('⚠️  Warning: Content-Length not provided, progress will be estimated'));
       } else {
-        console.log(this.colors.info(`File size: ${this.formatTotal(totalSize)}`));
+        console.log(this.colors.info(`📦 File size: ${this.formatTotal(totalSize)}`));
       }
     }
 
@@ -1439,31 +1535,36 @@ async downloadFile(url, outputPath) {
     // Clean up state file
     this.cleanupStateFile(stateFilePath);
     
-    // Success message
-    console.log(this.colors.success('Download completed!'));
-    console.log(this.colors.primary('File saved to: ') + chalk.underline(outputPath));
-    console.log(this.colors.purple('Total size: ') + this.formatBytes(downloaded));
+    // Success celebration
+    console.log(this.colors.success('✅ Download completed!'));
+    console.log(this.colors.primary('📁 File saved to: ') + chalk.underline(outputPath));
+    console.log(this.colors.purple('📊 Total size: ') + this.formatBytes(downloaded));
     
     if (resuming) {
-      console.log(this.colors.info('Resumed from: ') + this.formatBytes(startByte));
-      console.log(this.colors.info('Downloaded this session: ') + this.formatBytes(sessionDownloaded));
+      console.log(this.colors.info('🔄 Resumed from: ') + this.formatBytes(startByte));
+      console.log(this.colors.info('📥 Downloaded this session: ') + this.formatBytes(sessionDownloaded));
     }
+    
+    // Random success emoji
+    const celebrationEmojis = ['🥳', '🎊', '🎈', '🌟', '💯', '🚀', '✨', '🔥'];
+    const randomEmoji = celebrationEmojis[Math.floor(Math.random() * celebrationEmojis.length)];
+    console.log(this.colors.success(`${randomEmoji} Successfully downloaded! ${randomEmoji}`));
 
   } catch (error) {
     if (this.loadingSpinner && this.loadingSpinner.isSpinning) {
-      this.loadingSpinner.fail(this.colors.error('Connection failed'));
+      this.loadingSpinner.fail(this.colors.error('❌ Connection failed'));
     }
     if (this.progressBar) {
       this.progressBar.stop();
     }
     
     // Don't clean up partial file on error - allow resume
-    console.error(this.colors.error.bold('Download failed: ') + this.colors.warning(error.message));
+    console.error(this.colors.error.bold('💥 Download failed: ') + this.colors.warning(error.message));
     
     if (error.name === 'AbortError') {
-      console.log(this.colors.info('Download state saved. You can resume later by running the same command.'));
+      console.log(this.colors.info('💾 Download state saved. You can resume later by running the same command.'));
     } else {
-      console.log(this.colors.info('Partial download saved. Restart to resume from where it left off.'));
+      console.log(this.colors.info('💾 Partial download saved. Restart to resume from where it left off.'));
     }
     
     throw error;
@@ -1718,7 +1819,7 @@ setupFallbackKeyboardListener() {
     };
     
     process.stdin.on('data', handleKeypress);
-    console.log(this.colors.info('Keyboard active: p=pause/resume, a=add URL'));
+    console.log(this.colors.info('💡 Keyboard listener active: Press p to pause/resume, a to add URL'));
   }
 }
 
@@ -1805,253 +1906,178 @@ resumeAll() {
 }
 }
 
-
-
-/**
-* Display help information
-*/
-function displayHelp() {
-console.log('\n' + chalk.blue.bold('🚀 COLORFUL FILE DOWNLOADER 🚀'));
-console.log(chalk.magenta('═'.repeat(50)));
-
-console.log(chalk.cyan.bold('\n📋 Usage:') + chalk.white(' node downloader.js <url> [output-path] [url2] [output-path2] ...'));
-
-console.log(chalk.yellow.bold('\n✨ Examples:'));
-console.log(chalk.gray('  # Single download:'));
-console.log(chalk.gray('  node downloader.js https://example.com/file.iso'));
-console.log(chalk.gray('  node downloader.js https://example.com/file.iso ./custom-name.iso'));
-console.log(chalk.gray('\n  # Multiple downloads:'));
-console.log(chalk.gray('  node downloader.js https://url1.com/file1.iso https://url2.com/file2.iso'));
-console.log(chalk.gray('  node downloader.js https://url1.com/file1.iso ./file1.iso https://url2.com/file2.iso ./file2.iso'));
-
-console.log(chalk.magenta.bold('\n🔧 Environment Variables:'));
-console.log(chalk.gray('  GRAB_DOWNLOAD_STATE_DIR - Directory to store download state files'));
-console.log(chalk.gray('                          (default: ./.grab-downloads)'));
-console.log(chalk.blue('═'.repeat(50)) + '\n');
-}
-
-/**
-* Generate output filename from URL
-* @param {string} url - Download URL
-* @returns {string} - Generated filename
-*/
-function generateFilename(url) {
-try {
-  const filename = path.basename(new URL(url).pathname);
-  return filename || 'downloaded-file';
-} catch (error) {
-  return 'downloaded-file';
-}
-}
-
-/**
-* Display file statistics
-* @param {string} filepath - Path to the downloaded file
-* @param {ColorfulFileDownloader} downloader - Downloader instance for formatting
-*/
-function displayFileStats(filepath, downloader) {
-try {
-  const stats = fs.statSync(filepath);
-  console.log(chalk.green('📈 Final file size: ') + downloader.formatBytes(stats.size));
-  console.log(chalk.cyan('📅 Created: ') + chalk.bold(stats.birthtime.toLocaleString()));
-  console.log(chalk.blue('═'.repeat(50)));
-} catch (error) {
-  console.log(chalk.yellow('⚠️  Could not read file statistics'));
-}
-}
-
-// CLI Interface with colorful output
-async function main() {
-const args = process.argv.slice(2);
-
-if (args.length < 1) {
-  displayHelp();
-  process.exit(1);
-}
-
-const downloader = new ColorfulFileDownloader();
-
-// First pass: identify all URLs and count them
-const urlIndices = [];
-for (let i = 0; i < args.length; i++) {
-  if (downloader.isValidUrl(args[i])) {
-    urlIndices.push(i);
-  }
-}
-
-if (urlIndices.length === 0) {
-  console.error(chalk.red.bold('❌ No valid URLs provided'));
-  process.exit(1);
-}
-
-// Parse URLs and their corresponding output paths
-const downloads = [];
-
-for (let i = 0; i < urlIndices.length; i++) {
-  const urlIndex = urlIndices[i];
-  const url = args[urlIndex];
-  let outputPath = null;
-  
-  // Check if there's a potential output path after this URL
-  const nextUrlIndex = urlIndices[i + 1];
-  if (nextUrlIndex !== undefined) {
-    // If there's exactly one argument between this URL and the next URL, it's an output path
-    if (nextUrlIndex - urlIndex === 2) {
-      outputPath = args[urlIndex + 1];
+// --- Main CLI logic ---
+// Only run CLI when this file is executed directly, not when imported
+if (import.meta.url === `file://${process.argv[1]}`) {
+  const argv = new ArgParser()
+    .usage('Usage: grab-url <url> [options]')
+    .command('$0 <url>', 'Fetch data from API endpoint or download files')
+    .option('no-save', {
+      type: 'boolean',
+      default: false,
+      describe: 'Don\'t save output to file, just print to console'
+    })
+    .option('output', {
+      alias: 'o',
+      type: 'string',
+      describe: 'Output filename (default: output.json)',
+      default: null
+    })
+    .option('params', {
+      alias: 'p',
+      type: 'string',
+      describe: 'JSON string of query parameters (e.g., \'{"key":"value"}\')',
+      coerce: (arg) => {
+        if (!arg) return {};
+        try { return JSON.parse(arg); } catch (e) { throw new Error(`Invalid JSON in params: ${arg}`); }
+      }
+    })
+    .help()
+    .alias('h', 'help')
+    .version('1.0.0')
+    .strict()
+    .parseSync();
+
+  const urls = argv.urls || [];
+  const params = argv.params || {};
+  const outputFile = argv.output;
+  const noSave = argv['no-save'];
+
+  // --- Mode detection ---
+  const anyFileUrl = urls.some(isFileUrl);
+  const isDownloadMode = urls.length > 1 || anyFileUrl;
+
+  (async () => {
+  if (isDownloadMode) {
+    // --- Download Mode ---
+    const downloader = new ColorFileDownloader();
+    // Prepare download objects
+    const downloads = urls.map((url, i) => {
+      let filename = null;
+      // If user provided output, use it for the first file
+      if (i === 0 && outputFile) filename = outputFile;
+      return { url, outputPath: filename };
+    });
+    // Show detected downloads in a table
+    const detectedTable = new Table({
+      head: ['#', 'URL'],
+      colWidths: [4, 80],
+      colAligns: ['right', 'left'],
+      style: { 'padding-left': 1, 'padding-right': 1, head: [], border: [] }
+    });
+    downloads.forEach((download, index) => {
+      detectedTable.push([
+        (index + 1).toString(),
+        download.url
+      ]);
+    });
+    console.log(chalk.cyan.bold(`Detected ${downloads.length} download(s):`));
+    console.log(detectedTable.toString());
+    console.log('');
+    // Prepare download objects with filenames
+    const downloadObjects = downloads.map((download, index) => {
+      let actualUrl = download.url;
+      let filename = download.outputPath;
+      if (!filename) filename = downloader.generateFilename(actualUrl);
+      const outputPath = path.isAbsolute(filename) ? filename : path.join(process.cwd(), filename);
+      const outputDir = path.dirname(outputPath);
+      try { if (!fs.existsSync(outputDir)) fs.mkdirSync(outputDir, { recursive: true }); } catch (error) {
+        console.error(chalk.red.bold('❌ Could not create output directory: ') + error.message);
+        process.exit(1);
+      }
+      return {
+        url: actualUrl,
+        outputPath,
+        filename: path.basename(filename)
+      };
+    });
+    // Show download queue in a table
+    const queueTable = new Table({
+      head: ['#', 'Filename', 'Output Path'],
+      colWidths: [4, 32, 54],
+      colAligns: ['right', 'left', 'left'],
+      style: { 'padding-left': 1, 'padding-right': 1, head: [], border: [] }
+    });
+    downloadObjects.forEach((downloadObj, index) => {
+      queueTable.push([
+        (index + 1).toString(),
+        downloadObj.filename,
+        downloadObj.outputPath
+      ]);
+    });
+    console.log(chalk.cyan.bold('\nDownload Queue:'));
+    console.log(queueTable.toString());
+    console.log('');
+    try {
+      await downloader.downloadMultipleFiles(downloadObjects);
+      // Display individual file stats in a table
+      const statsTable = new Table({
+        head: ['Filename', 'Size', 'Created'],
+        colWidths: [32, 14, 25],
+        colAligns: ['left', 'right', 'left'],
+        style: { 'padding-left': 1, 'padding-right': 1, head: [], border: [] }
+      });
+      downloadObjects.forEach((downloadObj) => {
+        try {
+          const stats = fs.statSync(downloadObj.outputPath);
+          statsTable.push([
+            downloadObj.filename,
+            downloader.formatBytes(stats.size),
+            stats.birthtime.toLocaleString()
+          ]);
+        } catch (error) {
+          statsTable.push([
+            downloadObj.filename,
+            'Error',
+            'Could not read'
+          ]);
+        }
+      });
+      console.log(chalk.cyan.bold('\nFile Details:'));
+      console.log(statsTable.toString());
+    } catch (error) {
+      console.error(chalk.red.bold('Failed to download files: ') + chalk.yellow(error.message));
+      process.exit(1);
     }
+    downloader.cleanup();
   } else {
-    // This is the last URL, check if there's an argument after it
-    if (urlIndex + 1 < args.length) {
-      outputPath = args[urlIndex + 1];
-    }
-  }
-  
-  downloads.push({ url, outputPath });
-}
-
-console.log(chalk.cyan.bold(`Detected ${downloads.length} download(s):`));
-downloads.forEach((download, index) => {
-  console.log(`  ${index + 1}. ${chalk.yellow(download.url)} (URL)`);
-});
-console.log('');
-
-// Handle multiple downloads
-if (downloads.length > 1) {
-  console.log(chalk.blue.bold(`Multiple downloads detected: ${downloads.length} files\n`));
-  
-  // Prepare download objects
-  const downloadObjects = downloads.map((download, index) => {
-    let actualUrl = download.url;
-    let filename = download.outputPath;
-    
-    // Generate filename if not provided
-    if (!filename) {
-      filename = generateFilename(actualUrl);
-    }
-    
-    const outputPath = path.isAbsolute(filename) ? filename : path.join(process.cwd(), filename);
-    
-    // Ensure output directory exists
-    const outputDir = path.dirname(outputPath);
+    // --- API Mode ---
+    const url = urls[0];
+    const startTime = process.hrtime();
     try {
-      if (!fs.existsSync(outputDir)) {
-        fs.mkdirSync(outputDir, { recursive: true });
+      const res = await grab(url, params);
+      if (res.error) log(`\n\nStatus: ❌ ${res.error}`);
+      let filePath = null;
+      let outputData;
+      let isTextData = false;
+      if (typeof res.data === 'string') { outputData = res.data; isTextData = true; }
+      else if (Buffer.isBuffer(res.data) || res.data instanceof Uint8Array) { outputData = res.data; isTextData = false; }
+      else if (res.data instanceof Blob) { const arrayBuffer = await res.data.arrayBuffer(); outputData = Buffer.from(arrayBuffer); isTextData = false; }
+      else if (res.data && typeof res.data === 'object') { outputData = JSON.stringify(res.data, null, 2); isTextData = true; }
+      else { outputData = String(res.data); isTextData = true; }
+      if (!noSave) {
+        const urlPath = new URL(url).pathname;
+        const urlExt = path.extname(urlPath);
+        const defaultExt = isTextData ? '.json' : (urlExt || '.bin');
+        filePath = outputFile ? path.resolve(outputFile) : path.resolve(process.cwd(), `output${defaultExt}`);
+        if (isTextData) fs.writeFileSync(filePath, outputData, 'utf8');
+        else fs.writeFileSync(filePath, outputData);
+        const [seconds, nanoseconds] = process.hrtime(startTime);
+        const elapsedMs = (seconds + nanoseconds / 1e9).toFixed(2);
+        const stats = fs.statSync(filePath);
+        const fileSizeMB = (stats.size / (1024 * 1024)).toFixed(1);
+        log(`⏱️ ${elapsedMs}s 📦 ${fileSizeMB}MB ✅ Saved to: ${filePath}`);
+      } else {
+        if (isTextData) {
+          log(outputData);
+        } else {
+          log(`Binary data received (${outputData.length} bytes). Use --output to save to file.`);
+        }
       }
     } catch (error) {
-      console.error(chalk.red.bold('❌ Could not create output directory: ') + error.message);
+      log(`Error: ${error.message}`, {color: 'red'});
       process.exit(1);
     }
-    
-    return {
-      url: actualUrl,
-      outputPath,
-      filename: path.basename(filename)
-    };
-  });
-  
-  // Show download queue
-      console.log(chalk.cyan.bold('\nDownload Queue:'));
-  downloadObjects.forEach((downloadObj, index) => {
-    console.log(`  ${chalk.yellow((index + 1).toString().padStart(2))}. ${chalk.green(downloadObj.filename)} ${chalk.gray('→')} ${downloadObj.outputPath}`);
-  });
-  console.log('');
-  
-  try {
-    await downloader.downloadMultipleFiles(downloadObjects);
-    
-    // Display individual file stats
-    console.log(chalk.cyan.bold('\nFile Details:'));
-    downloadObjects.forEach((downloadObj) => {
-      displayFileStats(downloadObj.outputPath, downloader);
-    });
-    
-  } catch (error) {
-    console.error(chalk.red.bold('Failed to download files: ') + chalk.yellow(error.message));
-    process.exit(1);
-  }
-  
-} else {
-  // Single download (existing logic)
-  let url = downloads[0].url;
-  let outputPath = downloads[0].outputPath;
-
-  // Generate filename if not provided
-  if (!outputPath) {
-    outputPath = generateFilename(url);
-  }
-
-  // Ensure output directory exists
-  const outputDir = path.dirname(outputPath);
-  try {
-    if (!fs.existsSync(outputDir)) {
-      fs.mkdirSync(outputDir, { recursive: true });
-    }
-  } catch (error) {
-    console.error(chalk.red.bold('❌ Could not create output directory: ') + error.message);
-    process.exit(1);
-  }
-
-  // Check if file already exists
-  if (fs.existsSync(outputPath)) {
-    console.log(chalk.yellow('File already exists: ') + outputPath);
-    console.log(chalk.gray('   Continuing will overwrite the existing file...'));
-  }
-
-  console.log(chalk.green('\nTarget: ') + chalk.bold(outputPath));
-
-  try {
-    await downloader.downloadFile(url, outputPath);
-    displayFileStats(outputPath, downloader);
-    
-  } catch (error) {
-    console.error(chalk.red.bold('Failed to download file: ') + chalk.yellow(error.message));
-    
-    // Clean up partial file if it exists
-    if (fs.existsSync(outputPath)) {
-      try {
-        fs.unlinkSync(outputPath);
-        console.log(chalk.gray('Cleaned up partial download'));
-      } catch (cleanupError) {
-                  console.log(chalk.yellow('Could not clean up partial file: ') + cleanupError.message);
-      }
-    }
-    
-    process.exit(1);
   }
-}
-
-downloader.cleanup();
-}
-
-// Handle graceful shutdown with colors
-process.on('SIGINT', () => {
-console.log(chalk.yellow.bold('\n🛑 Download cancelled by user'));
-process.exit(0);
-});
-
-process.on('SIGTERM', () => {
-console.log(chalk.yellow.bold('\n🛑 Download terminated'));
-process.exit(0);
-});
-
-// Handle uncaught exceptions
-process.on('uncaughtException', (error) => {
-console.error(chalk.red.bold('💥 Uncaught exception: ') + error.message);
-process.exit(1);
-});
-
-process.on('unhandledRejection', (reason, promise) => {
-console.error(chalk.red.bold('💥 Unhandled rejection at: ') + promise);
-console.error(chalk.red('Reason: ') + reason);
-process.exit(1);
-});
-
-// Run the CLI if there are command line arguments (indicating it's being run as a CLI tool)
-if (process.argv.length > 2) {
-main().catch((error) => {
-  console.error(chalk.red.bold('💥 Fatal error: ') + error.message);
-  process.exit(1);
-});
-}
-
-export default ColorfulFileDownloader;
+  })();
+}