frostpv 1.0.25 → 1.0.26

package/index.js

@@ -798,7 +798,7 @@ const MediaDownloader = async (url, options = {}) => {
   // Verificar se é YouTube e lançar erro customizado
   const platform = getPlatformType(url);
   if (platform === "youtube") {
-      throw new Error("This URL is not from a supported platform. Supported platforms: Instagram, X(Twitter), TikTok, Facebook");
+    throw new Error("This URL is not from a supported platform. Supported platforms: Instagram, X(Twitter), TikTok, Facebook");
   }
 
   // No longer cleanup at start to avoid race conditions during concurrent downloads
@@ -811,17 +811,17 @@ const MediaDownloader = async (url, options = {}) => {
     // 1. Try primary download method
     try {
       downloadedFilePath = await downloadSmartVideo(url, config, signal);
-      
+
       // Verify integrity of primary download
       if (downloadedFilePath) {
-         try {
-            const stats = fs.statSync(downloadedFilePath);
-            if (stats.size < 500) {
-               throw new Error(`Downloaded file is too small, likely corrupted.`);
-            }
-         } catch (statError) {
-            throw new Error(`Failed to verify file integrity`);
-         }
+        try {
+          const stats = fs.statSync(downloadedFilePath);
+          if (stats.size < 500) {
+            throw new Error(`Downloaded file is too small, likely corrupted.`);
+          }
+        } catch (statError) {
+          throw new Error(`Failed to verify file integrity`);
+        }
       }
     } catch (error) {
       if (signal?.aborted || error.message?.includes("AbortError")) throw error;
@@ -831,13 +831,13 @@ const MediaDownloader = async (url, options = {}) => {
 
     // 2. If primary failed OR file was invalid, try fallback
     if (!downloadedFilePath) {
-       const platform = getPlatformType(url);
-       // YouTube doesn't use fallback method - it has its own specific implementation
-       if (platform === "youtube") {
-         throw new Error(`YouTube download failed: ${primaryError?.message || 'Unknown error'}`);
-       }
+      const platform = getPlatformType(url);
+      // YouTube doesn't use fallback method - it has its own specific implementation
+      if (platform === "youtube") {
+        throw new Error(`YouTube download failed: ${primaryError?.message || 'Unknown error'}`);
+      }
 
-       try {
+      try {
         const fallbackUrl = await tryFallbackDownload(url);
 
         // Validate fallback URL
@@ -847,14 +847,14 @@ const MediaDownloader = async (url, options = {}) => {
         }
 
         downloadedFilePath = await downloadDirectVideo(fallbackUrl, config, signal);
-        
+
         // Verify integrity of fallback download
         if (downloadedFilePath) {
-            const stats = fs.statSync(downloadedFilePath);
-            if (stats.size < 500) {
-               await safeUnlinkWithRetry(downloadedFilePath); // Clean up bad file
-               throw new Error(`Fallback downloaded file is too small, likely corrupted.`);
-            }
+          const stats = fs.statSync(downloadedFilePath);
+          if (stats.size < 500) {
+            await safeUnlinkWithRetry(downloadedFilePath); // Clean up bad file
+            throw new Error(`Fallback downloaded file is too small, likely corrupted.`);
+          }
         }
 
       } catch (fallbackError) {
@@ -1139,7 +1139,7 @@ async function downloadSmartVideo(url, config, signal = null) {
         'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
       }
     });
-    
+
     // Check content-length early if available
     const contentLength = parseInt(response.headers['content-length']);
     if (!isNaN(contentLength) && contentLength > ABSOLUTE_MAX_BYTES) {
@@ -1153,7 +1153,7 @@ async function downloadSmartVideo(url, config, signal = null) {
     let fileName = path.join(OUTPUT_DIR, `v_${uuidv4().replace(/-/g, '').slice(0, 12)}.mp4`);
 
     const videoWriter = fs.createWriteStream(fileName);
-    
+
     // Byte counter to abort if stream exceeds limit
     let downloadedBytes = 0;
     response.data.on('data', (chunk) => {
@@ -1179,23 +1179,25 @@ async function downloadSmartVideo(url, config, signal = null) {
         response.data.destroy();
         videoWriter.destroy();
         safeUnlink(fileName);
-        reject(new Error("AbortError"));
-        return;
+        throw new Error("AbortError");
       }
-      signal.addEventListener('abort', () => {
-        response.data.destroy();
-        videoWriter.destroy();
-        safeUnlink(fileName);
-        // We don't reject here because the writer error/finish will handle it or the outer timeout will catch it
-        // But rejecting helps propagate the abort faster
-      });
     }
 
     return new Promise((resolve, reject) => {
+      // Handle abort inside the Promise so reject is in scope
+      if (signal) {
+        signal.addEventListener('abort', () => {
+          response.data.destroy();
+          videoWriter.destroy();
+          safeUnlink(fileName);
+          reject(new Error("AbortError"));
+        }, { once: true });
+      }
+
       videoWriter.on("finish", async () => {
         try {
           if (downloadedBytes > ABSOLUTE_MAX_BYTES) {
-             throw new Error("Video exceeded 1GB limit.");
+            throw new Error("Video exceeded 1GB limit.");
           }
 
           // Check if file is empty
@@ -1235,7 +1237,7 @@ async function downloadDirectVideo(url, config, signal = null) {
         'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
       }
     });
-    
+
     // Check content-length early if available
     const contentLength = parseInt(response.headers['content-length']);
     if (!isNaN(contentLength) && contentLength > ABSOLUTE_MAX_BYTES) {
@@ -1269,14 +1271,17 @@ async function downloadDirectVideo(url, config, signal = null) {
 
     response.data.pipe(videoWriter);
 
-    if (signal) {
-      signal.addEventListener('abort', () => {
-        videoWriter.destroy();
-        safeUnlink(fileName);
-      });
-    }
-
     return new Promise((resolve, reject) => {
+      // Handle abort inside the Promise so reject is in scope
+      if (signal) {
+        signal.addEventListener('abort', () => {
+          response.data.destroy();
+          videoWriter.destroy();
+          safeUnlink(fileName);
+          reject(new Error("AbortError"));
+        }, { once: true });
+      }
+
       videoWriter.on("finish", async () => {
         try {
           if (downloadedBytes > ABSOLUTE_MAX_BYTES) {
@@ -1376,7 +1381,7 @@ async function rotateVideo(fileName, rotation, signal = null) {
         ff.kill('SIGKILL');
         safeUnlink(outputPath);
         reject(new Error("AbortError"));
-      });
+      }, { once: true });
     }
 
     ff.on('end', async () => {
@@ -1413,31 +1418,55 @@ async function deleteTempVideos() {
 
 // Enhanced cleanup function for all temporary files
 async function cleanupTempFiles() {
+  // Clean TEMP_DIR (_compressed files)
   try {
-    if (!fs.existsSync(TEMP_DIR)) return;
-    const files = fs.readdirSync(TEMP_DIR);
-    const tempFiles = files.filter(file =>
-       /_compressed\.mp4$/.test(file)
-    );
-    const now = Date.now();
-    const GRACE_PERIOD_MS = 10 * 60 * 1000; // 10 minutes
-
-    for (const file of tempFiles) {
-      const full = path.join(TEMP_DIR, file);
-      try {
-        const st = fs.statSync(full);
-        if (now - st.mtimeMs > GRACE_PERIOD_MS) {
-          await safeUnlinkWithRetry(full);
-        }
-      } catch (_) { }
+    if (fs.existsSync(TEMP_DIR)) {
+      const files = fs.readdirSync(TEMP_DIR);
+      const tempFiles = files.filter(file => /_compressed\.mp4$/.test(file));
+      const now = Date.now();
+      const GRACE_PERIOD_MS = 5 * 60 * 1000; // 5 minutes
+
+      for (const file of tempFiles) {
+        const full = path.join(TEMP_DIR, file);
+        try {
+          const st = fs.statSync(full);
+          if (now - st.mtimeMs > GRACE_PERIOD_MS) {
+            await safeUnlinkWithRetry(full);
+          }
+        } catch (_) { }
+      }
     }
-    triggerGC();
   } catch (error) {
+    if (error && error.code !== 'ENOENT') {
+      console.error(`Error during temp file cleanup (TEMP_DIR): ${error.message}`);
+    }
+  }
 
+  // Also clean OUTPUT_DIR orphan files (v_, vr_, vc_, vx_, vf_, a_ prefixed)
+  try {
+    if (fs.existsSync(OUTPUT_DIR)) {
+      const files = fs.readdirSync(OUTPUT_DIR);
+      const now = Date.now();
+      const GRACE_PERIOD_MS = 5 * 60 * 1000; // 5 minutes
+
+      for (const file of files) {
+        if (!/^(v_|vr_|vc_|vx_|vf_|a_)[0-9a-f]{12}/i.test(file)) continue;
+        const full = path.join(OUTPUT_DIR, file);
+        try {
+          const st = fs.statSync(full);
+          if (now - st.mtimeMs > GRACE_PERIOD_MS) {
+            await safeUnlinkWithRetry(full);
+          }
+        } catch (_) { }
+      }
+    }
+  } catch (error) {
     if (error && error.code !== 'ENOENT') {
-      console.error(`Error during temp file cleanup: ${error.message}`);
+      console.error(`Error during temp file cleanup (OUTPUT_DIR): ${error.message}`);
     }
   }
+
+  triggerGC();
 }
 
 // Cleanup files in output folder older than OUTPUT_RETENTION_MIN
@@ -1465,11 +1494,11 @@ async function cleanupOutputFiles() {
 }
 
 
-// Schedule periodic cleanup (every 10 minutes)
+// Schedule periodic cleanup (every 5 minutes)
 setInterval(() => {
   cleanupTempFiles();
   cleanupOutputFiles();
-}, 60 * 1000);
+}, 5 * 60 * 1000);
 // Run once at startup
 cleanupOutputFiles();
 
@@ -1493,7 +1522,7 @@ async function autoCrop(fileName, signal = null) {
       signal.addEventListener('abort', () => {
         ffDetect.kill('SIGKILL');
         reject(new Error("AbortError"));
-      });
+      }, { once: true });
     }
 
     ffDetect.on('stderr', function (stderrLine) {
@@ -1517,7 +1546,7 @@ async function autoCrop(fileName, signal = null) {
             ffCrop.kill('SIGKILL');
             safeUnlink(outputPath);
             reject(new Error("AbortError"));
-          });
+          }, { once: true });
         }
 
         ffCrop.on('end', async () => {
@@ -1567,7 +1596,7 @@ async function checkAndCompressVideo(filePath, limitSizeMB, platform = null, sig
         ff.kill('SIGKILL');
         safeUnlink(outputPath);
         reject(new Error("AbortError"));
-      });
+      }, { once: true });
     }
 
     ff.on('end', async () => {
@@ -1770,13 +1799,17 @@ const AudioDownloader = async (url, options = {}) => {
 
 async function extractAudioMp3(videoPath, signal = null) {
   return new Promise((resolve, reject) => {
-    const audioPath = path.join(OUTPUT_DIR, `a_${uuidv4().replace(/-/g, '').slice(0, 12)}.mp3`);
+    const fileName = `a_${uuidv4().replace(/-/g, '').slice(0, 12)}.mp3`;
+    const audioPath = path.join(OUTPUT_DIR, fileName);
+
+    // We remove the hardcoded 'libmp3lame' codec which can cause "Invalid argument" 
+    // on some statically compiled ffmpeg versions and let it auto-select based on format.
     const ff = ffmpeg(videoPath)
-      .noVideo()
-      .audioCodec('libmp3lame')
-      .audioBitrate(192)
-      .format('mp3')
-      .save(audioPath);
+      .outputOptions([
+        '-vn',           // No video
+        '-b:a', '192k'   // Audio bitrate
+      ])
+      .format('mp3');
 
     if (signal) {
       if (signal.aborted) {
@@ -1784,20 +1817,22 @@ async function extractAudioMp3(videoPath, signal = null) {
         return;
       }
       signal.addEventListener('abort', () => {
-        ff.kill();
+        ff.kill('SIGKILL');
         safeUnlink(audioPath);
         reject(new Error("AbortError"));
-      });
+      }, { once: true });
     }
 
+    // Attach events BEFORE calling run or save
     ff.on('end', () => {
       triggerGC();
       resolve(audioPath);
     })
-
       .on('error', (err) => {
         reject(new Error(`Error extracting audio: ${err.message}`));
-      });
+      })
+      .output(audioPath)
+      .run();
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frostpv",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "description": "downloads",
   "main": "index.js",
   "scripts": {