frostpv 1.0.12 → 1.0.13

package/index.js

@@ -4,7 +4,7 @@ const path = require("path");
 const os = require("os");
 const FormData = require("form-data");
 const crypto = require("crypto");
-const { igdl, ttdl, fbdown, mediafire, capcut, gdrive, pinterest } = require("btch-downloader");
+const { igdl, ttdl, fbdown, mediafire, capcut, gdrive, pinterest, twitter } = require("btch-downloader");
 const { TwitterDL } = require("twitter-downloader");
 const btch = require("btch-downloader");
 const btchOld = require("btch-downloader-old");
@@ -886,25 +886,16 @@ const MediaDownloader = async (url, options = {}) => {
 // Function to process downloaded file
 async function processDownloadedFile(fileName, config, platform = null) {
   let processedFile = path.resolve(fileName);
-
-  // Check if file is video or image based on extension
-  const ext = path.extname(processedFile).toLowerCase();
-  const isVideo = ['.mp4', '.mov', '.webm', '.mkv'].includes(ext);
-
-  // Only apply video processing if it is a video
-  if (isVideo) {
-    if (config.rotation) {
-      processedFile = await rotateVideo(processedFile, config.rotation);
-    }
-    if (config.autocrop) {
-      processedFile = await autoCrop(processedFile);
-    }
-    processedFile = await checkAndCompressVideo(processedFile, config.limitSizeMB, platform);
-    if (config.outputFormat) {
-      processedFile = await convertVideoFormat(processedFile, String(config.outputFormat).toLowerCase());
-    }
+  if (config.rotation) {
+    processedFile = await rotateVideo(processedFile, config.rotation);
+  }
+  if (config.autocrop) {
+    processedFile = await autoCrop(processedFile);
+  }
+  processedFile = await checkAndCompressVideo(processedFile, config.limitSizeMB, platform);
+  if (config.outputFormat) {
+    processedFile = await convertVideoFormat(processedFile, String(config.outputFormat).toLowerCase());
   }
-
   return processedFile;
 }
 
@@ -1072,47 +1063,45 @@ async function downloadSmartVideo(url, config) {
       }
       case "twitter": {
         try {
-          // Validate and clean the Twitter URL
-          const cleanUrl = validateTwitterUrl(url);
-          const data = await TwitterDL(cleanUrl, {});
-
-          if (data && data.result) {
-            // Try multiple possible response structures
-            if (data.result.media && data.result.media[0] &&
-              data.result.media[0].videos && data.result.media[0].videos[0] &&
-              data.result.media[0].videos[0].url) {
-              videoUrl = data.result.media[0].videos[0].url;
-            } else if (data.result.video && data.result.video[0] && data.result.video[0].url) {
-              videoUrl = data.result.video[0].url;
-            } else if (data.result.url) {
-              videoUrl = data.result.url;
-            } else if (data.result.media && data.result.media[0] && data.result.media[0].url) {
-              videoUrl = data.result.media[0].url;
-            } else {
-              // Search for any video URL in the response
-              const findVideoUrl = (obj) => {
-                if (typeof obj === 'string' && obj.includes('http') &&
-                  (obj.includes('.mp4') || obj.includes('video') || obj.includes('media'))) {
-                  return obj;
-                }
-                if (typeof obj === 'object' && obj !== null) {
-                  for (const key in obj) {
-                    const result = findVideoUrl(obj[key]);
-                    if (result) return result;
-                  }
-                }
-                return null;
-              };
-
-              const foundUrl = findVideoUrl(data.result);
-              if (foundUrl) {
-                videoUrl = foundUrl;
+          const data = await twitter(url);
+          if (data && data.url) {
+            // Se data.url for um array, procuramos por qualidade HD
+            if (Array.isArray(data.url)) {
+              // Tentar encontrar HD especificamente
+              const hdVideo = data.url.find(v => v.hd);
+              if (hdVideo) {
+                videoUrl = hdVideo.hd;
               } else {
-                throw new Error("No video URL found in Twitter response structure");
+                // Tentar encontrar por label ou qualidade
+                const highQuality = data.url.find(v =>
+                  (v.quality && typeof v.quality === 'string' && v.quality.toUpperCase().includes('HD')) ||
+                  (v.label && typeof v.label === 'string' && v.label.toUpperCase().includes('HD'))
+                );
+
+                if (highQuality) {
+                  videoUrl = highQuality.url;
+                } else {
+                  // Fallback: pega o primeiro que tiver url
+                  const anyVideo = data.url.find(v => v.url);
+                  videoUrl = anyVideo ? anyVideo.url : data.url[0];
+                }
               }
+            } else if (typeof data.url === 'string') {
+              videoUrl = data.url;
             }
-          } else {
-            throw new Error("Invalid Twitter response structure");
+          }
+
+          if (!videoUrl) {
+            // Fallback para estrutura antiga ou diferente
+            if (Array.isArray(data) && data[0] && data[0].url) {
+              videoUrl = data[0].url;
+            } else if (data && data.HD) {
+              videoUrl = data.HD;
+            }
+          }
+
+          if (!videoUrl) {
+            throw new Error("No video URL found in btch-downloader twitter response");
           }
         } catch (error) {
           throw new Error(`Twitter download failed: ${error.message}`);
@@ -1127,7 +1116,7 @@ async function downloadSmartVideo(url, config) {
       throw new Error("Returned video URL is invalid or unavailable.");
     }
 
-    // Download the video/image with better error handling
+    // Download the video with better error handling
     const response = await axios({
       url: videoUrl,
       method: "GET",
@@ -1138,35 +1127,23 @@ async function downloadSmartVideo(url, config) {
       }
     });
 
-    // Detect file type from content-type
-    const contentType = response.headers['content-type'] || 'video/mp4';
-    let ext = 'mp4'; // default
-
-    if (contentType.includes('image/jpeg')) ext = 'jpg';
-    else if (contentType.includes('image/png')) ext = 'png';
-    else if (contentType.includes('image/webp')) ext = 'webp';
-    else if (contentType.includes('image/gif')) ext = 'gif';
-    else if (contentType.includes('video/webm')) ext = 'webm';
-    else if (contentType.includes('video/quicktime')) ext = 'mov';
-    else if (contentType.includes('video/x-matroska')) ext = 'mkv';
-
     // Create minimal unique file name in output dir
-    let fileName = path.join(OUTPUT_DIR, `v_${uuidv4().slice(0, 4)}.${ext}`);
+    let fileName = path.join(OUTPUT_DIR, `v_${uuidv4().slice(0, 4)}.mp4`);
 
-    const writer = fs.createWriteStream(fileName);
-    response.data.pipe(writer);
+    const videoWriter = fs.createWriteStream(fileName);
+    response.data.pipe(videoWriter);
 
     return new Promise((resolve, reject) => {
-      writer.on("finish", async () => {
+      videoWriter.on("finish", async () => {
         try {
           const finalFilePath = await processDownloadedFile(fileName, config, platform);
           resolve(finalFilePath);
         } catch (error) {
-          reject(new Error(`Error processing downloaded file: ${error.message}`));
+          reject(new Error(`Error processing downloaded video: ${error.message}`));
         }
       });
-      writer.on("error", (error) => {
-        reject(new Error(`Error saving file: ${error.message}`));
+      videoWriter.on("error", (error) => {
+        reject(new Error(`Error saving video: ${error.message}`));
       });
     });
   } catch (error) {
@@ -1187,35 +1164,23 @@ async function downloadDirectVideo(url, config) {
       }
     });
 
-    // Detect file type from content-type
-    const contentType = response.headers['content-type'] || 'video/mp4';
-    let ext = 'mp4'; // default
-
-    if (contentType.includes('image/jpeg')) ext = 'jpg';
-    else if (contentType.includes('image/png')) ext = 'png';
-    else if (contentType.includes('image/webp')) ext = 'webp';
-    else if (contentType.includes('image/gif')) ext = 'gif';
-    else if (contentType.includes('video/webm')) ext = 'webm';
-    else if (contentType.includes('video/quicktime')) ext = 'mov';
-    else if (contentType.includes('video/x-matroska')) ext = 'mkv';
-
     // Create minimal unique file name in output dir
-    let fileName = path.join(OUTPUT_DIR, `v_${uuidv4().slice(0, 4)}.${ext}`);
+    let fileName = path.join(OUTPUT_DIR, `v_${uuidv4().slice(0, 4)}.mp4`);
 
-    const writer = fs.createWriteStream(fileName);
-    response.data.pipe(writer);
+    const videoWriter = fs.createWriteStream(fileName);
+    response.data.pipe(videoWriter);
 
     return new Promise((resolve, reject) => {
-      writer.on("finish", async () => {
+      videoWriter.on("finish", async () => {
         try {
           const finalFilePath = await processDownloadedFile(fileName, config, "unknown");
           resolve(finalFilePath);
         } catch (error) {
-          reject(new Error(`Error processing downloaded file: ${error.message}`));
+          reject(new Error(`Error processing downloaded video: ${error.message}`));
         }
       });
-      writer.on("error", (error) => {
-        reject(new Error(`Error saving file: ${error.message}`));
+      videoWriter.on("error", (error) => {
+        reject(new Error(`Error saving video: ${error.message}`));
       });
     });
   } catch (error) {

package/package.json

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