Upload server.js

server.js

@@ -53,7 +53,7 @@ async function fetchText(url, timeoutMs, clientUA) {
       redirect: 'follow',
       signal: controller.signal,
       headers: {
-        'user-agent': clientUA ? (clientUA + ' Lampa') : 'Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.79 Safari/537.36 Lampa'
+        'user-agent': clientUA ? clientUA : 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36'
       }
     })
 
@@ -81,7 +81,7 @@ async function fetchText(url, timeoutMs, clientUA) {
   }
 }
 
-function jsWrapper(serverBase, baseUrl, transpiledCode, needRegenerator) {
+function jsWrapper(serverBase, baseUrl, transpiledCode, needRegenerator, useVpn, useEs5) {
   const safeServer = JSON.stringify(String(serverBase || ''))
   const safeBaseUrl = JSON.stringify(String(baseUrl || ''))
 
@@ -123,7 +123,7 @@ function jsWrapper(serverBase, baseUrl, transpiledCode, needRegenerator) {
     'function origin(u){try{var a=document.createElement("a");a.href=u;return (a.protocol? a.protocol:"") + "//" + (a.host||"");}catch(e){return "";}}' +
     'var allow=window.__es5ProxyAllow||{};window.__es5ProxyAllow=allow;' +
     '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 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, "/") + "&es5=' + (useEs5?'1':'0') + '&vpn=' + (useVpn?'1':'0') + '";}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;}' +
@@ -139,7 +139,7 @@ function jsWrapper(serverBase, baseUrl, transpiledCode, needRegenerator) {
     'var origInsertBefore=Element.prototype.insertBefore;' +
     'function patchNode(node){' +
     'if(node&&node.tagName==="SCRIPT"&&node.src){' +
-    'var a=abs(node.src);var o2=origin(a);if(__es5_active)allow[o2]=1;allow[o2]=1;if(allow[o2]&&__es5_server&&node.src.indexOf(__es5_server)===-1){try{var testUrl=new URL(a);if(testUrl.protocol==="http:"||testUrl.protocol==="https:"){node.src=__es5_server+"/p?url="+encodeURIComponent(a).replace(/%3A/gi, ":").replace(/%2F/gi, "/");}}catch(e){}}' +
+    'var a=abs(node.src);var o2=origin(a);if(__es5_active)allow[o2]=1;allow[o2]=1;if(allow[o2]&&__es5_server&&node.src.indexOf(__es5_server)===-1){try{var testUrl=new URL(a);if(testUrl.protocol==="http:"||testUrl.protocol==="https:"){node.src=__es5_server+"/p?url="+encodeURIComponent(a).replace(/%3A/gi, ":").replace(/%2F/gi, "/")+"&es5=' + (useEs5?'1':'0') + '&vpn=' + (useVpn?'1':'0') + '";}}catch(e){}}' +
     '}' +
     '}' +
     'Element.prototype.appendChild=function(node){' +
@@ -152,10 +152,8 @@ function jsWrapper(serverBase, baseUrl, transpiledCode, needRegenerator) {
     '};' +
     '}' +
     '}catch(e){}' +
-    'try{if(window.__es5CssVarsApply)window.__es5CssVarsApply();}catch(e){}' +
-    // Локальные (не глобальные!) fetch/XMLHttpRequest — видны только коду плагина,
-    // который выполняется ниже в этой же функции (transpiledCode вставлен прямо сюда).
-    // Остальная Лампа продолжает использовать настоящие window.fetch / window.XMLHttpRequest.
+    (useEs5 ? 'try{if(window.__es5CssVarsApply)window.__es5CssVarsApply();}catch(e){}' : '') +
+    (useVpn ? (
     'var _origFetch=window.fetch;' +
     'var fetch=function(input,init){' +
     'try{' +
@@ -174,9 +172,6 @@ function jsWrapper(serverBase, baseUrl, transpiledCode, needRegenerator) {
     '};' +
     'return xhr;' +
     '};' +
-    // Локальный шим Lampa.Reguest — только для кода этого плагина.
-    // network.silent(url,...) / network["native"](url,...) — основной способ,
-    // которым плагины (в т.ч. этот) реально ходят за данными, минуя fetch/XHR напрямую.
     'try{' +
     'if(Lampa&&Lampa.Reguest){' +
     'var _RealReguest=Lampa.Reguest;' +
@@ -200,7 +195,8 @@ function jsWrapper(serverBase, baseUrl, transpiledCode, needRegenerator) {
     'Lampa=Object.create(Lampa);' +
     'Lampa.Reguest=ReguestShim;' +
     '}' +
-    '}catch(e){}' +
+    '}catch(e){}'
+    ) : '') +
     'try{' +
     'var __mock_script = document.createElement("script");' +
     '__mock_script.src = __es5_base;' +
@@ -217,13 +213,15 @@ function jsWrapper(serverBase, baseUrl, transpiledCode, needRegenerator) {
     'try { if(__orig_cs_desc) Object.defineProperty(document, "currentScript", __orig_cs_desc); else delete document.currentScript; } catch(e_cs2) {}' +
     '}' +
     '__es5_active=false;' +
-    'try{if(window.__es5CssVarsApply)window.__es5CssVarsApply();}catch(e){}' +
+    (useEs5 ? 'try{if(window.__es5CssVarsApply)window.__es5CssVarsApply();}catch(e){}' : '') +
     '})();'
 
   const parts = []
-  parts.push(fetchPolyfill)
-  if (needRegenerator) parts.push(regeneratorRuntimeCode)
-  parts.push(cssVarsPonyfill)
+  if (useEs5) {
+    parts.push(fetchPolyfill)
+    if (needRegenerator) parts.push(regeneratorRuntimeCode)
+    parts.push(cssVarsPonyfill)
+  }
   parts.push(patchLoaders)
   return parts.join('\n')
 }
@@ -316,32 +314,41 @@ app.get('/p', async (req, res) => {
   const source = normalizeUrl(rawUrl)
   if (!source) return res.status(400).type('text/plain').send('Bad url')
 
+  const useEs5 = req.query.es5 !== '0';
+  const useVpn = req.query.vpn !== '0';
+
   try {
     const { text } = await fetchText(source, 25_000, req.headers['user-agent'])
-    const result = await babel.transformAsync(text, {
-      babelrc: false,
-      configFile: false,
-      sourceType: 'script',
-      compact: true,
-      comments: false,
-      presets: [
-        [
-          require('@babel/preset-env'),
-          {
-            targets: { chrome: '38' },
-            bugfixes: true,
-            loose: true,
-            modules: false
-          }
+    let code = text;
+    let needRegenerator = false;
+
+    if (useEs5) {
+      const result = await babel.transformAsync(text, {
+        babelrc: false,
+        configFile: false,
+        sourceType: 'script',
+        compact: true,
+        comments: false,
+        presets: [
+          [
+            require('@babel/preset-env'),
+            {
+              targets: { chrome: '38' },
+              bugfixes: true,
+              loose: true,
+              modules: false
+            }
+          ]
         ]
-      ]
-    })
-
-    const code = (result && result.code) ? result.code : ''
-    const needRegenerator = code.indexOf('regeneratorRuntime') !== -1
+      })
+      if (result && result.code) {
+        code = result.code;
+        needRegenerator = code.indexOf('regeneratorRuntime') !== -1;
+      }
+    }
 
     const serverBase = getSelfBase(req)
-    const out = jsWrapper(serverBase, source, code, needRegenerator)
+    const out = jsWrapper(serverBase, source, code, needRegenerator, useVpn, useEs5)
 
     res.setHeader('content-type', 'application/javascript; charset=utf-8')
     res.setHeader('cache-control', 'public, max-age=600')
@@ -361,7 +368,8 @@ const RAW_METHODS = ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS']
 const REQ_HEADERS_SKIP = new Set([
   'host', 'connection', 'content-length', 'accept-encoding',
   'x-forwarded-for', 'x-forwarded-proto', 'x-forwarded-host',
-  'cf-connecting-ip', 'cf-ray', 'cf-visitor', 'x-real-ip'
+  'cf-connecting-ip', 'cf-ray', 'cf-visitor', 'x-real-ip',
+  'origin', 'referer'
 ])
 const RES_HEADERS_PASS = [
   'content-type', 'content-length', 'content-range', 'accept-ranges',
@@ -393,8 +401,8 @@ app.all('/r', async (req, res) => {
     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'
+    ? req.headers['user-agent']
+    : 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36'
 
   let body
   if (method !== 'GET' && method !== 'HEAD') {
@@ -414,6 +422,12 @@ app.all('/r', async (req, res) => {
 
     res.status(upstream.status)
     for (const h of RES_HEADERS_PASS) {
+      if (h === 'content-length') {
+        const ct = upstream.headers.get('content-type') || '';
+        if (!ct.includes('video/') && !ct.includes('audio/') && !upstream.headers.has('content-range')) {
+          continue; // fetch decompresses gzip/br, so original content-length is invalid for text/json
+        }
+      }
       const v = upstream.headers.get(h)
       if (v) res.setHeader(h, v)
     }