frostpv 1.0.9 → 1.0.10

package/index.js

@@ -1151,41 +1151,83 @@ async function downloadSmartVideo(url, config) {
         try {
           const data = await youtube(url);
           // Try to find the video URL in the response
-          // Common patterns: data.url, data.mp4, data.link, or direct string
 
           if (!data) throw new Error("No data returned from youtube downloader");
 
-          // Recursive function to find a valid video URL in the object
-          const findVideoUrl = (obj) => {
-            if (!obj) return null;
-            if (typeof obj === 'string' && obj.startsWith('http')) return obj;
+          // 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;
+          };
 
-            if (Array.isArray(obj)) {
-              for (const item of obj) {
-                const found = findVideoUrl(item);
-                if (found) return found;
+          // 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);
+                }
               }
-            } else if (typeof obj === 'object') {
-              // Prioritize certain keys
-              const priorities = ['url', 'link', 'download', 'mp4', 'video', 'src'];
+            }
+          };
+
+          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]) {
-                  const found = findVideoUrl(obj[key]);
-                  if (found) return found;
-                }
+                if (obj[key] && isVideoUrl(obj[key])) return obj[key];
               }
-              // If not found in priorities, check all keys
-              for (const key of Object.keys(obj)) {
-                if (!priorities.includes(key)) {
-                  const found = findVideoUrl(obj[key]);
+              for (const key in obj) {
+                if (typeof obj[key] === 'object') {
+                  const found = findSimple(obj[key]);
                   if (found) return found;
                 }
               }
-            }
-            return null;
-          };
+              return null;
+            };
+            bestUrl = findSimple(data);
+          }
 
-          videoUrl = findVideoUrl(data);
+          videoUrl = bestUrl;
 
           if (!videoUrl) {
             console.log('YouTube data dump:', JSON.stringify(data, null, 2)); // Debug log since we can't test

package/package.json

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