grab-url 0.9.139 → 0.9.141

package/package.json

@@ -2,7 +2,7 @@
   "name": "grab-url",
   "description": "📥 Generate Request to API from Browser",
   "type": "module",
-  "version": "0.9.139",
+  "version": "0.9.141",
   "author": "vtempest",
   "license": "rights.institute/prosper",
   "repository": {

package/src/grab-url-cli.js

@@ -141,7 +141,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 +166,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'));
   }
 }
 
@@ -291,11 +291,17 @@ calculateBarSize(spinnerFrame, baseBarSize = 20) {
  */
 async checkServerSupport(url) {
   try {
+    // Create a timeout controller
+    const timeoutController = new AbortController();
+    const timeoutId = setTimeout(() => timeoutController.abort(), 10000); // 10 second timeout
+    
     const response = await fetch(url, { 
       method: 'HEAD',
-      signal: this.abortController?.signal
+      signal: timeoutController.signal
     });
     
+    clearTimeout(timeoutId);
+    
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
@@ -313,7 +319,11 @@ async checkServerSupport(url) {
       headers: response.headers
     };
   } catch (error) {
-    console.log(this.colors.warning('⚠️  Could not check server resume support, proceeding with regular download'));
+    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'));
+    }
     return {
       supportsResume: false,
       totalSize: 0,
@@ -336,7 +346,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;
 }
@@ -350,7 +360,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'));
   }
 }
 
@@ -366,7 +376,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;
 }
@@ -960,12 +970,20 @@ async downloadSingleFileWithBar(fileBar, masterBar, totalFiles, totalTracking) {
       headers['Range'] = `bytes=${startByte}-`;
     }
 
-    // Make the fetch request
+    // 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;
+    
     const response = await fetch(url, {
       headers,
-      signal: abortController.signal
+      signal: combinedSignal
     });
     
+    clearTimeout(timeoutId);
+    
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
@@ -1135,7 +1153,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;
   }
 }
@@ -1156,7 +1174,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();
@@ -1183,10 +1201,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);
@@ -1196,7 +1214,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);
@@ -1210,12 +1228,17 @@ async downloadFile(url, outputPath) {
       headers['Range'] = `bytes=${startByte}-`;
     }
 
-    // Make the fetch request
+    // Make the fetch request with timeout
+    const timeoutController = new AbortController();
+    const timeoutId = setTimeout(() => timeoutController.abort(), 30000); // 30 second timeout
+    
     const response = await fetch(url, {
       headers,
       signal: this.abortController.signal
     });
     
+    clearTimeout(timeoutId);
+    
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
@@ -1227,9 +1250,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)}`));
       }
     }
 
@@ -1416,36 +1439,31 @@ async downloadFile(url, outputPath) {
     // Clean up state file
     this.cleanupStateFile(stateFilePath);
     
-    // 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));
+    // 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));
     
     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;
@@ -1891,7 +1909,7 @@ for (let i = 0; i < urlIndices.length; i++) {
   downloads.push({ url, outputPath });
 }
 
-console.log(chalk.cyan.bold(`🔍 Detected ${downloads.length} download(s):`));
+console.log(chalk.cyan.bold(`Detected ${downloads.length} download(s):`));
 downloads.forEach((download, index) => {
   console.log(`  ${index + 1}. ${chalk.yellow(download.url)} (URL)`);
 });
@@ -1899,7 +1917,7 @@ console.log('');
 
 // Handle multiple downloads
 if (downloads.length > 1) {
-  console.log(chalk.blue.bold(`🚀 Multiple downloads detected: ${downloads.length} files\n`));
+  console.log(chalk.blue.bold(`Multiple downloads detected: ${downloads.length} files\n`));
   
   // Prepare download objects
   const downloadObjects = downloads.map((download, index) => {
@@ -1932,7 +1950,7 @@ if (downloads.length > 1) {
   });
   
   // Show download queue
-  console.log(chalk.cyan.bold('\n📋 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}`);
   });
@@ -1942,13 +1960,13 @@ if (downloads.length > 1) {
     await downloader.downloadMultipleFiles(downloadObjects);
     
     // Display individual file stats
-    console.log(chalk.cyan.bold('\n📊 File Details:'));
+    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));
+    console.error(chalk.red.bold('Failed to download files: ') + chalk.yellow(error.message));
     process.exit(1);
   }
   
@@ -1975,26 +1993,26 @@ if (downloads.length > 1) {
 
   // Check if file already exists
   if (fs.existsSync(outputPath)) {
-    console.log(chalk.yellow('⚠️  File already exists: ') + outputPath);
+    console.log(chalk.yellow('File already exists: ') + outputPath);
     console.log(chalk.gray('   Continuing will overwrite the existing file...'));
   }
 
-  console.log(chalk.green('\n🎯 Target: ') + chalk.bold(outputPath));
+  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));
+    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'));
+        console.log(chalk.gray('Cleaned up partial download'));
       } catch (cleanupError) {
-        console.log(chalk.yellow('⚠️  Could not clean up partial file: ') + cleanupError.message);
+                  console.log(chalk.yellow('Could not clean up partial file: ') + cleanupError.message);
       }
     }