frostpv 1.0.10 → 1.0.12

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, youtube } = require("btch-downloader");
+const { igdl, ttdl, fbdown, mediafire, capcut, gdrive, pinterest } = require("btch-downloader");
 const { TwitterDL } = require("twitter-downloader");
 const btch = require("btch-downloader");
 const btchOld = require("btch-downloader-old");
@@ -58,13 +58,7 @@ const videoPlatforms = [
   "https://twitter.com",
   "https://www.twitter.com",
   "https://vm.tiktok.com/",
-  "https://vt.tiktok.com/",
-  "https://www.youtube.com",
-  "https://youtube.com",
-  "https://youtu.be",
-  "https://m.youtube.com",
-  "https://www.youtube.com/watch?"
-
+  "https://vt.tiktok.com/"
 ];
 
 // Blacklist links
@@ -375,39 +369,11 @@ function getPlatformType(url) {
   if (lowerUrl.includes("facebook.com") || lowerUrl.includes("fb.watch") || lowerUrl.includes("fb.com")) return "facebook";
   if (lowerUrl.includes("mediafire.com")) return "mediafire";
   if (lowerUrl.includes("x.com") || lowerUrl.includes("twitter.com")) return "twitter";
-  if (lowerUrl.includes("youtube.com") || lowerUrl.includes("youtu.be") || lowerUrl.includes("m.youtube.com")) return "youtube";
+  if (lowerUrl.includes("youtube.com") || lowerUrl.includes("you112t12u.be") || lowerUrl.includes("m.y11outu314be.com")) return "youtu1354be";
 
   return "unknown";
 }
 
-// Function to get direct video URL from Twitter using yt-dlp
-async function downloadTwitterWithYtDlp(url) {
-  return new Promise(async (resolve, reject) => {
-    try {
-      const ytdlp = new YtDlp({ ffmpegPath });
-      // Use -g to get URL, -f "best[ext=mp4]/best" to get best quality single file if possible
-      const args = [
-        url,
-        '-g',
-        '-f', 'best[ext=mp4]/best'
-      ];
-
-      const result = await ytdlp.execAsync(args);
-      // yt-dlp might return multiple lines if it finds separate audio/video streams
-      // We take the first one, but for Twitter it is usually a single mp4 file
-      const videoUrl = result.trim().split('\n')[0];
-
-      if (videoUrl && videoUrl.startsWith('http')) {
-        resolve(videoUrl);
-      } else {
-        reject(new Error('yt-dlp did not return a valid URL'));
-      }
-    } catch (error) {
-      reject(error);
-    }
-  });
-}
-
 // Enhanced fallback download function with platform-specific methods
 async function tryFallbackDownload(url, maxRetries = 3) {
   const platform = getPlatformType(url);
@@ -555,12 +521,8 @@ async function tryFallbackDownload(url, maxRetries = 3) {
         }
 
         case "twitter": {
-          // Try using yt-dlp first (Most reliable), then fallback to existing methods
+          // Try multiple Twitter methods with better response handling
           const methods = [
-            async () => {
-              // Priority 1: yt-dlp
-              return await downloadTwitterWithYtDlp(url);
-            },
             async () => {
               const cleanUrl = validateTwitterUrl(url);
               const data = await TwitterDL(cleanUrl, {});
@@ -873,8 +835,9 @@ const MediaDownloader = async (url, options = {}) => {
 
   // Verificar se é YouTube e lançar erro customizado
   const platform = getPlatformType(url);
-  // YouTube is now supported
-
+  if (platform === "youtube") {
+    throw new Error("This URL is not from a supported platform. Supported platforms: Instagram, X(Twitter), TikTok, Facebook");
+  }
 
   await cleanupTempFiles(); // Clean up previous temp files
 
@@ -887,7 +850,7 @@ const MediaDownloader = async (url, options = {}) => {
     } catch (error) {
       const platform = getPlatformType(url);
 
-      // YouTube doesn't use fallback method - it has its own specific implementation in downloadSmartVideo
+      // YouTube doesn't use fallback method - it has its own specific implementation
       if (platform === "youtube") {
         throw new Error(`YouTube download failed: ${error.message}`);
       }
@@ -923,16 +886,25 @@ const MediaDownloader = async (url, options = {}) => {
 // Function to process downloaded file
 async function processDownloadedFile(fileName, config, platform = null) {
   let processedFile = path.resolve(fileName);
-  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());
+
+  // 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());
+    }
   }
+
   return processedFile;
 }
 
@@ -1147,98 +1119,6 @@ async function downloadSmartVideo(url, config) {
         }
         break;
       }
-      case "youtube": {
-        try {
-          const data = await youtube(url);
-          // Try to find the video URL in the response
-
-          if (!data) throw new Error("No data returned from youtube downloader");
-
-          // Helper to check if a value looks like a video URL
-          const isVideoUrl = (val) => typeof val === 'string' && val.startsWith('http') && !val.includes('.mp3');
-
-          let bestUrl = null;
-          let bestScore = -1;
-
-          // Function to score keys based on quality
-          const getScore = (key) => {
-            const k = key.toLowerCase();
-            if (k.includes('1080')) return 100;
-            if (k.includes('720')) return 80;
-            if (k.includes('480')) return 60;
-            if (k.includes('hd')) return 90;
-            if (k.includes('sd')) return 50;
-            if (k.includes('360')) return 40;
-            if (k.includes('mp4')) return 30;
-            if (k.includes('video')) return 20;
-            return 10;
-          };
-
-          // Recursive function to gather all candidates
-          const gatherCandidates = (obj) => {
-            if (!obj) return;
-
-            if (typeof obj === 'object') {
-              for (const key in obj) {
-                const val = obj[key];
-                if (isVideoUrl(val)) {
-                  const score = getScore(key);
-                  if (score > bestScore) {
-                    bestScore = score;
-                    bestUrl = val;
-                  }
-                } else if (typeof val === 'object') {
-                  // Check if this object represents a format (e.g. { quality: '720p', url: '...' })
-                  if (val.url && isVideoUrl(val.url)) {
-                    let score = getScore(key); // Score from key name
-                    if (val.quality || val.resolution) {
-                      score = Math.max(score, getScore(String(val.quality || val.resolution)));
-                    }
-                    if (score > bestScore) {
-                      bestScore = score;
-                      bestUrl = val.url;
-                    }
-                  }
-                  // Recurse
-                  gatherCandidates(val);
-                }
-              }
-            }
-          };
-
-          gatherCandidates(data);
-
-          // If no scored candidate found, try direct simple extraction with priority keys
-          if (!bestUrl) {
-            const priorities = ['mp4', 'url', 'link', 'download', 'video'];
-            const findSimple = (obj) => {
-              if (!obj) return null;
-              for (const key of priorities) {
-                if (obj[key] && isVideoUrl(obj[key])) return obj[key];
-              }
-              for (const key in obj) {
-                if (typeof obj[key] === 'object') {
-                  const found = findSimple(obj[key]);
-                  if (found) return found;
-                }
-              }
-              return null;
-            };
-            bestUrl = findSimple(data);
-          }
-
-          videoUrl = bestUrl;
-
-          if (!videoUrl) {
-            console.log('YouTube data dump:', JSON.stringify(data, null, 2)); // Debug log since we can't test
-            throw new Error("Could not extract video URL from YouTube response");
-          }
-
-        } catch (error) {
-          throw new Error(`YouTube download failed: ${error.message}`);
-        }
-        break;
-      }
       default:
         throw new Error("Platform not supported or invalid link.");
     }
@@ -1247,7 +1127,7 @@ async function downloadSmartVideo(url, config) {
       throw new Error("Returned video URL is invalid or unavailable.");
     }
 
-    // Download the video with better error handling
+    // Download the video/image with better error handling
     const response = await axios({
       url: videoUrl,
       method: "GET",
@@ -1258,23 +1138,35 @@ 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)}.mp4`);
+    let fileName = path.join(OUTPUT_DIR, `v_${uuidv4().slice(0, 4)}.${ext}`);
 
-    const videoWriter = fs.createWriteStream(fileName);
-    response.data.pipe(videoWriter);
+    const writer = fs.createWriteStream(fileName);
+    response.data.pipe(writer);
 
     return new Promise((resolve, reject) => {
-      videoWriter.on("finish", async () => {
+      writer.on("finish", async () => {
         try {
           const finalFilePath = await processDownloadedFile(fileName, config, platform);
           resolve(finalFilePath);
         } catch (error) {
-          reject(new Error(`Error processing downloaded video: ${error.message}`));
+          reject(new Error(`Error processing downloaded file: ${error.message}`));
         }
       });
-      videoWriter.on("error", (error) => {
-        reject(new Error(`Error saving video: ${error.message}`));
+      writer.on("error", (error) => {
+        reject(new Error(`Error saving file: ${error.message}`));
       });
     });
   } catch (error) {
@@ -1295,23 +1187,35 @@ 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)}.mp4`);
+    let fileName = path.join(OUTPUT_DIR, `v_${uuidv4().slice(0, 4)}.${ext}`);
 
-    const videoWriter = fs.createWriteStream(fileName);
-    response.data.pipe(videoWriter);
+    const writer = fs.createWriteStream(fileName);
+    response.data.pipe(writer);
 
     return new Promise((resolve, reject) => {
-      videoWriter.on("finish", async () => {
+      writer.on("finish", async () => {
         try {
           const finalFilePath = await processDownloadedFile(fileName, config, "unknown");
           resolve(finalFilePath);
         } catch (error) {
-          reject(new Error(`Error processing downloaded video: ${error.message}`));
+          reject(new Error(`Error processing downloaded file: ${error.message}`));
         }
       });
-      videoWriter.on("error", (error) => {
-        reject(new Error(`Error saving video: ${error.message}`));
+      writer.on("error", (error) => {
+        reject(new Error(`Error saving file: ${error.message}`));
       });
     });
   } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frostpv",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "downloads",
   "main": "index.js",
   "scripts": {
@@ -13,7 +13,7 @@
   "license": "ISC",
   "dependencies": {
     "axios": "1.12.0",
-    "btch-downloader": "6.0.23",
+    "btch-downloader": "6.0.25",
     "btch-downloader-old": "npm:btch-downloader@4.0.15",
     "express": "^5.1.0",
     "ffmpeg-ffprobe-static": "^6.1.1-rc.5",
@@ -22,7 +22,7 @@
     "path": "^0.12.7",
     "twitter-downloader": "^1.1.8",
     "uuid": "^11.1.0",
-    "@tobyg74/tiktok-api-dl": "^1.3.2",
+    "@tobyg74/tiktok-api-dl": "^1.3.7",
     "ytdlp-nodejs": "2.3.4"
   }
 }