Upload cinemar.js

cinemar.js

@@ -1,6 +1,6 @@
 /**
- * Cinemar (cinemar.cc) stream extractor using Cloudflare Worker proxy
- * cinemar.cc uses Cloudflare — use worker to bypass IP blocking
+ * Cinemar (cinemar.cc) stream extractor using Puppeteer
+ * cinemar.cc now uses Cloudflare Rocket Loader — data only available after JS execution
  */
 const { getBrowser } = require('./alloha');
 const https = require('https');
@@ -104,7 +104,7 @@ function parseSubs(subtitle) {
     return subs;
 }
 
-// ── Get HTML via Puppeteer (fallback only) ────────────────────────────────────
+// ── Get HTML via Puppeteer (bypasses Cloudflare Rocket Loader) ────────────────
 async function getEmbedHtmlViaPuppeteer(embedUrl) {
     const browser = await getBrowser();
     const page = await browser.newPage();
@@ -194,7 +194,6 @@ function parseCinemarData(html) {
     if (!buf || buf.length < 20) return null;
 
     const isSerial = buf.indexOf(FOLDER_MARKER_BUF) >= 0;
-    console.log('[cinemar/parse] buf length:', buf.length, 'isSerial:', isSerial);
 
     if (!isSerial) {
         try {
@@ -241,17 +240,12 @@ function parseCinemarData(html) {
         allEpPositions.push({ id: fullId, seasonId: seasonMatch[1], epNum: parseInt(seasonMatch[2], 10), title: t ? t.str : ('Серия ' + seasonMatch[2]), pos });
     });
 
-    console.log('[cinemar/parse] found', allEpPositions.length, 'episode positions');
-
     const seasonMap = {};
     allEpPositions.forEach(ep => {
         if (!seasonMap[ep.seasonId]) seasonMap[ep.seasonId] = [];
         if (!seasonMap[ep.seasonId].find(e => e.id === ep.id)) seasonMap[ep.seasonId].push(ep);
     });
     const seasonIds = Object.keys(seasonMap).sort((a, b) => parseInt(a.substring(1)) - parseInt(b.substring(1)));
-    
-    console.log('[cinemar/parse] seasonIds:', seasonIds.length, seasonIds.slice(0, 3));
-    
     if (!seasonIds.length) return null;
 
     const episodes = {};
@@ -288,24 +282,68 @@ async function getCinemarStream(pageUrl) {
     });
     
     console.log('[cinemar] page HTML length:', pageHtml.length);
+    console.log('[cinemar] page has embedUrl:', pageHtml.includes('embedUrl'));
+    console.log('[cinemar] page has cinemar.cc:', pageHtml.includes('cinemar.cc'));
     
     const em = pageHtml.match(/"embedUrl"\s*:\s*"(https:\/\/cinemar\.cc\/embed\/[^"]+)"/);
     if (!em) {
         console.log('[cinemar] ERROR: embedUrl not found in page');
+        console.log('[cinemar] Page snippet:', pageHtml.substring(0, 500));
         throw new Error('embed_url not found');
     }
     const embedUrl = em[1];
     console.log('[cinemar] embed URL:', embedUrl.substring(0, 80));
 
-    // Step 2: get embed HTML via Cloudflare Worker (bypasses IP blocking)
-    const WORKER_URL = 'https://proxy.recycleactor.workers.dev/cinemar/proxy';
-    
-    console.log('[cinemar] fetching via Cloudflare Worker (bypass Cloudflare IP block)');
+    // Step 2: get embed HTML via Puppeteer (Cloudflare blocks plain HTTP)
+    let embedHtml = null;
+    let attempts = 0;
+    const maxAttempts = 3;
     
-    // Try worker proxy with parallel requests for better data coverage
-    const BATCH = 5, MAX_BATCHES = 4;
+    while (attempts < maxAttempts) {
+        attempts++;
+        console.log(`[cinemar] Puppeteer attempt ${attempts}/${maxAttempts}`);
+        
+        try {
+            embedHtml = await getEmbedHtmlViaPuppeteer(embedUrl);
+            
+            if (embedHtml && embedHtml.includes('"file"') && embedHtml.includes('W3s')) {
+                console.log('[cinemar] Puppeteer success on attempt', attempts);
+                break;
+            }
+            
+            console.log('[cinemar] Puppeteer attempt', attempts, 'failed, no file data');
+            
+            if (attempts < maxAttempts) {
+                const delay = 2000 * attempts;
+                console.log(`[cinemar] waiting ${delay}ms before retry...`);
+                await new Promise(r => setTimeout(r, delay));
+            }
+        } catch(e) {
+            console.log(`[cinemar] Puppeteer attempt ${attempts} error:`, e.message);
+            if (attempts >= maxAttempts) throw e;
+        }
+    }
+
+    if (!embedHtml || !embedHtml.includes('"file"')) {
+        console.log('[cinemar] ERROR: no file data after all attempts');
+        console.log('[cinemar] embed HTML length:', embedHtml ? embedHtml.length : 0);
+        console.log('[cinemar] embed HTML snippet:', embedHtml ? embedHtml.substring(0, 500) : 'null');
+        throw new Error('no file data in embed (Cloudflare blocked?)');
+    }
+
+    // Step 3: parse data
+    const parsed = parseCinemarData(embedHtml);
+    if (!parsed) throw new Error('failed to parse cinemar data');
+
+    if (!parsed.isSerial) {
+        const voices = parsed.items.map(item => ({
+            label: item.title, url: item.file, subtitles: parseSubs(item.subtitle)
+        }));
+        return { content_type: 'movie', embed_url: embedUrl, voices, serial: null, stream: voices[0] ? voices[0].url : null };
+    }
+
+    // Serial: fetch multiple times and merge
     const merged = {};
-    
     const addEpisodes = (data) => {
         if (!data || !data.isSerial) return;
         data.seasonIds.forEach(sid => {
@@ -317,120 +355,28 @@ async function getCinemarStream(pageUrl) {
         });
     };
 
-    let firstParsed = null;
-    
+    addEpisodes(parsed);
+
+    // Fetch more in parallel to get all episodes
+    const BATCH = 5, MAX_BATCHES = 4;
     for (let b = 0; b < MAX_BATCHES; b++) {
         const prevCount = Object.keys(merged).length;
-        
         const htmls = await Promise.all(
             Array.from({ length: BATCH }, () =>
-                fetchRaw(WORKER_URL + '?url=' + encodeURIComponent(embedUrl), {
-                    'user-agent': 'Mozilla/5.0 Chrome/120',
-                    'accept': 'text/html'
-                }).then(html => {
-                    console.log('[cinemar] worker response len:', html.length, 'hasFile:', html.includes('"file"'));
-                    return html;
-                }).catch(e => {
-                    console.log('[cinemar] worker request failed:', e.message);
+                getEmbedHtmlViaPuppeteer(embedUrl).then(html => {
+                    if (html && html.includes('"file"')) return html;
                     return null;
-                })
+                }).catch(() => null)
             )
         );
-        
-        htmls.filter(Boolean).forEach(html => {
-            const parsed = parseCinemarData(html);
-            if (parsed) {
-                if (!firstParsed) firstParsed = parsed;
-                addEpisodes(parsed);
-            }
-        });
-        
+        htmls.filter(Boolean).forEach(html => addEpisodes(parseCinemarData(html)));
         const newCount = Object.keys(merged).length;
         console.log(`[cinemar] batch ${b+1}: ${newCount} eps (+${newCount - prevCount})`);
-        
-        // For movies, one successful fetch is enough
-        if (firstParsed && !firstParsed.isSerial) break;
-        
-        // For serials, stop if no new episodes found
         if (newCount === prevCount && b >= 1) break;
-        
         if (b < MAX_BATCHES - 1) await new Promise(r => setTimeout(r, 200));
     }
 
-    if (!firstParsed) {
-        console.log('[cinemar] worker proxy failed, trying Puppeteer fallback...');
-        
-        // Fallback: try Puppeteer
-        let embedHtml = null;
-        let attempts = 0;
-        const maxAttempts = 3;
-        
-        while (attempts < maxAttempts) {
-            attempts++;
-            console.log(`[cinemar] Puppeteer attempt ${attempts}/${maxAttempts}`);
-            
-            try {
-                embedHtml = await getEmbedHtmlViaPuppeteer(embedUrl);
-                
-                if (embedHtml && embedHtml.includes('"file"') && embedHtml.includes('W3s')) {
-                    console.log('[cinemar] Puppeteer success on attempt', attempts);
-                    firstParsed = parseCinemarData(embedHtml);
-                    if (firstParsed) {
-                        // Add Puppeteer data to merged episodes for serials
-                        addEpisodes(firstParsed);
-                        break;
-                    }
-                }
-                
-                console.log('[cinemar] Puppeteer attempt', attempts, 'failed, no file data');
-                
-                if (attempts < maxAttempts) {
-                    const delay = 2000 * attempts;
-                    console.log(`[cinemar] waiting ${delay}ms before retry...`);
-                    await new Promise(r => setTimeout(r, delay));
-                }
-            } catch(e) {
-                console.log(`[cinemar] Puppeteer attempt ${attempts} error:`, e.message);
-                if (attempts >= maxAttempts) throw e;
-            }
-        }
-        
-        if (!firstParsed) {
-            throw new Error('no file data after worker and Puppeteer attempts (Cloudflare blocked?)');
-        }
-    }
-    
-    // If serial and we have Puppeteer data, try to get more episodes via Puppeteer
-    if (firstParsed && firstParsed.isSerial && Object.keys(merged).length > 0) {
-        console.log('[cinemar] serial detected, fetching more episodes via Puppeteer...');
-        const PUPBATCH = 3;
-        for (let pb = 0; pb < PUPBATCH; pb++) {
-            const prevCount = Object.keys(merged).length;
-            try {
-                const moreHtml = await getEmbedHtmlViaPuppeteer(embedUrl);
-                if (moreHtml && moreHtml.includes('"file"')) {
-                    const moreParsed = parseCinemarData(moreHtml);
-                    if (moreParsed) addEpisodes(moreParsed);
-                }
-            } catch(e) {
-                console.log('[cinemar] Puppeteer batch', pb+1, 'error:', e.message);
-            }
-            const newCount = Object.keys(merged).length;
-            console.log(`[cinemar] Puppeteer batch ${pb+1}: ${newCount} eps (+${newCount - prevCount})`);
-            if (newCount === prevCount) break;
-            await new Promise(r => setTimeout(r, 500));
-        }
-    }
-
-    // Step 3: build response
-    if (!firstParsed.isSerial) {
-        const voices = firstParsed.items.map(item => ({
-            label: item.title, url: item.file, subtitles: parseSubs(item.subtitle)
-        }));
-        return { content_type: 'movie', embed_url: embedUrl, voices, serial: null, stream: voices[0] ? voices[0].url : null };
-    }
-
-    // Serial: build structure from merged episodes
+    // Build serial structure
     const seasonMap = {};
     Object.values(merged).forEach(ep => {
         if (!seasonMap[ep.seasonId]) seasonMap[ep.seasonId] = [];