Upload 3 files

package-lock.json

@@ -11,11 +11,10 @@
         "@babel/core": "^7.26.10",
         "@babel/preset-env": "^7.26.9",
         "express": "^4.19.2",
-        "http-proxy-middleware": "^4.2.0",
         "regenerator-runtime": "^0.14.1"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       }
     },
     "node_modules/@babel/code-frame": {
@@ -1564,9 +1563,9 @@
       }
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.11.7",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.7.tgz",
-      "integrity": "sha512-APw5YuIQAg6L9w4sHDI6j26DGFJI6RpYOhnkMPdC9lWbkKvsyPHzDsve1yd73lk21yz7Y09Kci8B2Pp9FonzWA==",
+      "version": "2.11.8",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.8.tgz",
+      "integrity": "sha512-zAgkquC2WYF0PIc6XbNYkA2uuxxFavzgmX61R+dHDUa558V8Ejf8ozTZFR6QzM24RWu4kBcRkhJ5kpz77j9fnQ==",
       "license": "Apache-2.0",
       "bin": {
         "baseline-browser-mapping": "dist/cli.cjs"
@@ -1614,18 +1613,6 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "license": "MIT"
     },
-    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "license": "MIT",
-      "dependencies": {
-        "fill-range": "^7.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/browserslist": {
       "version": "4.28.7",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.7.tgz",
@@ -1967,18 +1954,6 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "license": "MIT"
     },
-    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "license": "MIT",
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/finalhandler": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz",
@@ -2141,28 +2116,6 @@
         "url": "https://opencollective.com/express"
       }
     },
-    "node_modules/http-proxy-middleware": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-4.2.0.tgz",
-      "integrity": "sha512-ZA+oNOoM+GLoFTIzhkJptVQov73Srep2LBqhF8hG8CIPKO3nam1jonXVQ/QUH8RbwsmaaVz2SOJdzBNBHNtKbw==",
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^4.4.3",
-        "httpxy": "^0.5.4",
-        "is-glob": "^4.0.3",
-        "is-plain-obj": "^4.1.0",
-        "micromatch": "^4.0.8"
-      },
-      "engines": {
-        "node": "^22.15.0 || ^24.0.0 || >=26.0.0"
-      }
-    },
-    "node_modules/httpxy": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/httpxy/-/httpxy-0.5.5.tgz",
-      "integrity": "sha512-uDjmnPyp1q4Sgzf3w+J/Fc6UqcCEj0x4Wjp7OqK5dGhNeDgpyrAmnS6ey8QWrX3SWDon2DMKf9sBa5X9+CVyMA==",
-      "license": "MIT"
-    },
     "node_modules/iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -2205,48 +2158,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-plain-obj": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
-      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -2328,19 +2239,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-      "license": "MIT",
-      "dependencies": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
     "node_modules/mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -2449,18 +2347,6 @@
       "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
       "license": "ISC"
     },
-    "node_modules/picomatch": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
-      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
     "node_modules/proxy-addr": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -2782,18 +2668,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "license": "MIT",
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
     "node_modules/toidentifier": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",

package.json

@@ -8,13 +8,12 @@
     "start": "node server.js"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "dependencies": {
     "@babel/core": "^7.26.10",
     "@babel/preset-env": "^7.26.9",
     "express": "^4.19.2",
-    "http-proxy-middleware": "^4.2.0",
     "regenerator-runtime": "^0.14.1"
   }
 }

server.js

@@ -1,8 +1,8 @@
 const express = require('express')
 const fs = require('fs')
 const path = require('path')
+const { Readable } = require('stream')
 const babel = require('@babel/core')
-const { createProxyMiddleware } = require('http-proxy-middleware')
 
 const regeneratorRuntimeCode = fs.readFileSync(require.resolve('regenerator-runtime/runtime'), 'utf8')
 
@@ -124,6 +124,7 @@ function jsWrapper(serverBase, baseUrl, transpiledCode, needRegenerator) {
     'allow[origin(__es5_base)]=1;' +
     'function proxyJs(u){var a=abs(u);var o=origin(a);if(__es5_active)allow[o]=1;allow[o]=1;if(allow[o]&&__es5_server){try{var testUrl=new URL(a);if(testUrl.protocol==="http:"||testUrl.protocol==="https:")return __es5_server + "/p?url=" + encodeURIComponent(a).replace(/%3A/gi, ":").replace(/%2F/gi, "/");}catch(e){}}return a;}' +
     'function proxyCss(u){var a=abs(u);var o=origin(a);if(__es5_active)allow[o]=1;if(allow[o]&&__es5_server)return __es5_server + "/s?url=" + encodeURIComponent(a).replace(/%3A/gi, ":").replace(/%2F/gi, "/");return a;}' +
+    'function proxyRaw(u){var a=abs(u);if(!/^https?:\\/\\//i.test(a))return u;if(__es5_server&&a.indexOf(__es5_server)===-1){return __es5_server+"/r?url="+encodeURIComponent(a).replace(/%3A/gi, ":").replace(/%2F/gi, "/");}return a;}' +
     'function mapArr(items, fn){if(!items||!items.length)return items;for(var i=0;i<items.length;i++){items[i]=fn(items[i]);}return items;}' +
     'try{' +
     'if(window.Lampa&&Lampa.Utils){' +
@@ -151,6 +152,27 @@ function jsWrapper(serverBase, baseUrl, transpiledCode, needRegenerator) {
     '}' +
     '}catch(e){}' +
     'try{if(window.__es5CssVarsApply)window.__es5CssVarsApply();}catch(e){}' +
+    // Локальные (не глобальные!) fetch/XMLHttpRequest — видны только коду плагина,
+    // который выполняется ниже в этой же функции (transpiledCode вставлен прямо сюда).
+    // Остальная Лампа продолжает использовать настоящие window.fetch / window.XMLHttpRequest.
+    'var _origFetch=window.fetch;' +
+    'var fetch=function(input,init){' +
+    'try{' +
+    'if(typeof input==="string"){input=proxyRaw(input);}' +
+    'else if(input&&input.url){input=new Request(proxyRaw(input.url),input);}' +
+    '}catch(e){}' +
+    'return _origFetch.call(window,input,init);' +
+    '};' +
+    'var _RealXHR=window.XMLHttpRequest;' +
+    'var XMLHttpRequest=function(){' +
+    'var xhr=new _RealXHR();' +
+    'var origOpen=xhr.open;' +
+    'xhr.open=function(method,u,async,user,pass){' +
+    'try{u=proxyRaw(u);}catch(e){}' +
+    'return origOpen.call(xhr,method,u,(async===undefined?true:async),user,pass);' +
+    '};' +
+    'return xhr;' +
+    '};' +
     'try{' +
     'var __mock_script = document.createElement("script");' +
     '__mock_script.src = __es5_base;' +
@@ -226,7 +248,7 @@ async function cssInline(url, depth, clientUA) {
 
 app.use((req, res, next) => {
   res.setHeader('Access-Control-Allow-Origin', '*');
-  res.setHeader('Access-Control-Allow-Methods', 'GET, OPTIONS');
+  res.setHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, PATCH, HEAD, OPTIONS');
   res.setHeader('Access-Control-Allow-Headers', '*');
   next();
 })
@@ -302,15 +324,78 @@ app.get('/p', async (req, res) => {
   }
 })
 
-// Проксируем весь остальной трафик на оригинальный сайт, чтобы обойти проблему с TLS сертификатами на старых ТВ
-// Таким образом, телик будет заходить по HTTP на твой сервер, а сервер будет тянуть HTTPS с tv.alcopa.cc
-app.use(createProxyMiddleware({
-  target: 'https://tv.alcopa.cc',
-  changeOrigin: true,
-  onProxyRes: function (proxyRes, req, res) {
-    proxyRes.headers['access-control-allow-origin'] = '*';
+// Универсальный "сырой" прокси: любые данные как есть — JSON от API источника,
+// картинки, m3u8/mp4-потоки и т.д. Без Babel и без лимита в MAX_BYTES, со стримингом
+// и поддержкой Range (нужно для перемотки видео).
+const RAW_METHODS = ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS']
+const REQ_HEADERS_PASS = ['range', 'if-range', 'accept', 'accept-language', 'content-type', 'referer', 'origin']
+const RES_HEADERS_PASS = [
+  'content-type', 'content-length', 'content-range', 'accept-ranges',
+  'cache-control', 'expires', 'last-modified', 'etag'
+]
+
+app.all('/r', async (req, res) => {
+  let rawUrl = req.query.url
+  if (rawUrl && (rawUrl.indexOf('%3A') !== -1 || rawUrl.indexOf('%3a') !== -1)) {
+    try { rawUrl = decodeURIComponent(rawUrl) } catch (e) {}
+  }
+
+  const source = normalizeUrl(rawUrl)
+  if (!source) return res.status(400).type('text/plain').send('Bad url')
+
+  const method = (req.method || 'GET').toUpperCase()
+  if (RAW_METHODS.indexOf(method) === -1) {
+    return res.status(405).type('text/plain').send('Method not allowed')
+  }
+  if (method === 'OPTIONS') return res.sendStatus(204)
+
+  const controller = new AbortController()
+  req.on('close', () => controller.abort())
+
+  const headers = {}
+  for (const h of REQ_HEADERS_PASS) {
+    if (req.headers[h]) headers[h] = req.headers[h]
   }
-}));
+  headers['user-agent'] = req.headers['user-agent']
+    ? req.headers['user-agent'] + ' Lampa'
+    : 'Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.79 Safari/537.36 Lampa'
+
+  let body
+  if (method !== 'GET' && method !== 'HEAD') {
+    const chunks = []
+    for await (const chunk of req) chunks.push(chunk)
+    if (chunks.length) body = Buffer.concat(chunks)
+  }
+
+  try {
+    const upstream = await fetch(source, {
+      method,
+      headers,
+      body,
+      redirect: 'follow',
+      signal: controller.signal
+    })
+
+    res.status(upstream.status)
+    for (const h of RES_HEADERS_PASS) {
+      const v = upstream.headers.get(h)
+      if (v) res.setHeader(h, v)
+    }
+    res.setHeader('access-control-allow-origin', '*')
+
+    if (!upstream.body) return res.end()
+    Readable.fromWeb(upstream.body).pipe(res)
+  } catch (e) {
+    if (!res.headersSent) {
+      const code = e && e.status ? e.status : 502
+      res.status(code).type('text/plain').send('Proxy error')
+    } else {
+      try { res.end() } catch (e2) {}
+    }
+  }
+})
+
+app.options('*', (req, res) => res.sendStatus(204))
 
 const port = Number(process.env.PORT || 7860)
 app.listen(port, () => {