Upload server.js

server.js

@@ -60,23 +60,36 @@ function readBody(req) {
 }
 
 async function fetchRaw(url, headers = {}) {
-    let retries = 2;
+    let retries = 3;
     while (retries > 0) {
         try {
             return await new Promise((resolve, reject) => {
-                const pu = new URL(url);
+                let pu;
+                try {
+                    pu = new URL(url);
+                } catch (e) {
+                    return reject(new Error('Invalid URL: ' + url));
+                }
                 const mod = pu.protocol === 'https:' ? https : http;
                 const req = mod.get(url, {
                     headers: {
                         'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+                        'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8',
+                        'accept-language': 'ru-RU,ru;q=0.9,en-US;q=0.8,en;q=0.7',
                         'connection': 'close',
                         ...headers
                     },
-                    timeout: 10000
+                    timeout: 15000
                 }, (res) => {
-                    let data = '';
-                    res.on('data', (chunk) => data += chunk);
-                    res.on('end', () => resolve(data));
+                    if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
+                        let loc = res.headers.location;
+                        if (!loc.startsWith('http')) loc = new URL(loc, url).href;
+                        resolve(fetchRaw(loc, headers));
+                        return;
+                    }
+                    let data = [];
+                    res.on('data', (chunk) => data.push(chunk));
+                    res.on('end', () => resolve(Buffer.concat(data).toString('utf8')));
                 });
                 req.on('error', reject);
                 req.on('timeout', () => { req.destroy(); reject(new Error('timeout')); });
@@ -85,7 +98,7 @@ async function fetchRaw(url, headers = {}) {
             console.log(`[fetchRaw] error for ${url}: ${e.message}, retries left: ${retries - 1}`);
             retries--;
             if (retries === 0) throw e;
-            await new Promise(r => setTimeout(r, 1000));
+            await new Promise(r => setTimeout(r, 1500));
         }
     }
 }
@@ -392,10 +405,14 @@ function handleHls(req, res) {
             port: pu.port || (pu.protocol === 'https:' ? 443 : 80),
             path: pu.pathname + pu.search,
             headers: {
-                'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/144.0.0.0 Safari/537.36',
+                'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
                 'accept': '*/*',
-                'origin':  isCinemap ? 'https://uakinogo.io' : isObrut ? 'https://kinojump.com' : isAlloha ? 'https://streamalloha.live' : isRstprg ? 'https://veoveo.ru' : 'https://streamalloha.live',
-                'referer': isCinemap ? 'https://uakinogo.io/' : isObrut ? 'https://kinojump.com/' : isAlloha ? 'https://streamalloha.live/' : isRstprg ? 'https://veoveo.ru/' : 'https://streamalloha.live/',
+                'accept-language': 'ru-RU,ru;q=0.9,en-US;q=0.8,en;q=0.7',
+                'origin':  isCinemap ? 'https://uakinogo.io' : isObrut ? 'https://kinojump.com' : isAlloha ? 'https://streamalloha.live' : isRstprg ? 'https://tv-1-kinoserial.net' : 'https://streamalloha.live',
+                'referer': isCinemap ? 'https://uakinogo.io/' : isObrut ? 'https://kinojump.com/' : isAlloha ? 'https://streamalloha.live/' : isRstprg ? 'https://tv-1-kinoserial.net/' : 'https://streamalloha.live/',
+                'sec-fetch-dest': isRstprg ? 'video' : 'empty',
+                'sec-fetch-mode': 'cors',
+                'sec-fetch-site': 'cross-site',
             },
         };
         if (req.headers['range']) opts.headers['range'] = req.headers['range'];
@@ -466,12 +483,18 @@ const server = http.createServer(async (req, res) => {
         if (!embedUrl || !embedUrl.includes('kinoserial')) {
             jsonResp(res, { ok: false, error: 'invalid url' }, 400); return;
         }
+        console.log('[veoveo/embed] fetching:', embedUrl);
         fetchRaw(embedUrl, {
-            'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
             'referer': 'https://veoveo.ru/',
             'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8',
-            'connection': 'keep-alive'
+            'sec-fetch-dest': 'document',
+            'sec-fetch-mode': 'navigate',
+            'sec-fetch-site': 'cross-site',
         }).then(text => {
+            if (text.includes('id="cf-challenge"') || text.includes('cf-browser-verification')) {
+                console.log('[veoveo/embed] Cloudflare challenge detected');
+                // Could potentially fallback to puppeteer here if needed
+            }
             res.writeHead(200, {
                 'Access-Control-Allow-Origin': '*',
                 'Content-Type': 'text/html; charset=utf-8'
@@ -487,10 +510,13 @@ const server = http.createServer(async (req, res) => {
     if (pathname === '/veoveo/balancer') {
         const contentId = query.id;
         if (!contentId) { jsonResp(res, { ok: false, error: 'no id' }, 400); return; }
+        console.log('[veoveo/balancer] contentId:', contentId);
         fetchRaw('https://api.rstprgapipt.com/balancer-api/proxy/playlists/catalog-api/episodes?content-id=' + contentId, {
             'referer': 'https://veoveo.ru/',
-            'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
-            'accept': 'application/json, text/plain, */*'
+            'accept': 'application/json, text/plain, */*',
+            'sec-fetch-dest': 'empty',
+            'sec-fetch-mode': 'cors',
+            'sec-fetch-site': 'cross-site',
         }).then(text => {
             res.writeHead(200, {
                 'Access-Control-Allow-Origin': '*',