Update server.js

server.js

@@ -121,63 +121,47 @@ async function captureDirectDownloadLink(url, opts = {}) {
     await page.goto(url, { waitUntil: 'load', timeout: 60000 });
     await page.waitForFunction(() => document.readyState === 'complete', { timeout: 30000 }).catch(() => {});
 
-    const downloadButtonId = await page.evaluate(() => {
-      const buttons = Array.from(document.querySelectorAll('button.direct-download, button.google-download'));
-      const visible = buttons.find(btn => {
-        const rect = btn.getBoundingClientRect();
-        return rect.width > 0 && rect.height > 0;
+  const directBtnId = await page.evaluate(() => {
+      const btns = Array.from(document.querySelectorAll('button.direct-download'));
+      const visible = btns.find(b => {
+        const r = b.getBoundingClientRect();
+        return r.width > 0 && r.height > 0;
       });
       return visible ? visible.id : null;
     });
 
-    if (!downloadButtonId) throw new Error('No visible download button found!');
-    console.log('Found visible download button:', downloadButtonId);
-
-
-  const popupPromise = new Promise(resolve => {
-      browser.once('targetcreated', async target => {
-        if (target.type() === 'page') {
-          const popupPage = await target.page();
-          
-          await popupPage.setRequestInterception(true);
-          popupPage.on('request', request => request.continue());
-          
-          popupPage.on('response', async (response) => {
-            const headers = response.headers();
-            const contentType = headers['content-type'] || '';
-            const contentDisposition = headers['content-disposition'] || '';
-            
-            if (contentDisposition.includes('attachment') || 
-                contentType.includes('application/octet-stream') ||
-                contentType.includes('application/zip') ||
-                contentType.includes('application/pdf')) {
-              
-              downloadUrl = response.url();
-              console.log('Download URL captured:', downloadUrl);
-              
-              setTimeout(() => popupPage.close(), 1000);
-            }
-          });
-          
-          resolve(popupPage);
-        }
-      });
-    });
+    if (!directBtnId) throw new Error('No direct-download button found!');
+    console.log('Found visible direct button:', directBtnId);
 
-    await page.click(`#${downloadButtonId}`);
-    
-    const popupPage = await Promise.race([
-      popupPromise,
-      new Promise((_, reject) => setTimeout(() => reject(new Error('Popup timeout')), 10000))
+    // Listen for new tab (popup) or navigation after click
+    const [newPage] = await Promise.all([
+      new Promise(resolve => browser.once('targetcreated', async target => {
+        const popup = await target.page().catch(() => null);
+        if (popup) resolve(popup);
+      })),
+      page.evaluate(id => document.getElementById(id).click(), directBtnId),
     ]);
 
-    await new Promise(resolve => setTimeout(resolve, 3000));
+    let finalUrl;
+    if (newPage) {
+      await newPage.bringToFront();
+      await newPage.waitForTimeout(5000); // wait for auto-download redirect
+      finalUrl = newPage.url();
+    } else {
+      // If no popup, maybe the same tab redirected
+      await page.waitForTimeout(5000);
+      finalUrl = page.url();
+    }
 
-    await page.close();
     await browser.close();
 
-    console.log('Final redirected download URL:', popupPage);
-    return { success: true, url: popupPage };
+    if (!finalUrl || finalUrl === url) {
+      throw new Error('Redirected download URL not captured');
+    }
+
+    console.log('Captured final redirected URL:', finalUrl);
+    return { success: true, url: finalUrl };
+
   } catch (err) {
     console.error('captureDirectDownloadLink error:', err);
     if (page) try { await page.close(); } catch {}