Upload server.js

server.js

@@ -154,6 +154,17 @@ function jsWrapper(serverBase, baseUrl, transpiledCode, needRegenerator, useVpn,
     '}catch(e){}' +
     (useEs5 ? 'try{if(window.__es5CssVarsApply)window.__es5CssVarsApply();}catch(e){}' : '') +
     (useVpn ? (
+    'var _RealWS=window.WebSocket;' +
+    'window.WebSocket=function(url, protocols){' +
+    'try{' +
+    'if(typeof url==="string" && url.indexOf(__es5_server)===-1 && /^wss?:\\/\\//i.test(url)){' +
+    'var wsBase=__es5_server.replace(/^http/,"ws");' +
+    'url=wsBase+"/ws?url="+encodeURIComponent(url);' +
+    '}' +
+    '}catch(e){}' +
+    'return protocols ? new _RealWS(url, protocols) : new _RealWS(url);' +
+    '};' +
+    'if(_RealWS.prototype) window.WebSocket.prototype=_RealWS.prototype;' +
     'var _origFetch=window.fetch;' +
     'var fetch=function(input,init){' +
     'try{' +
@@ -206,8 +217,12 @@ function jsWrapper(serverBase, baseUrl, transpiledCode, needRegenerator, useVpn,
     'Lampa.Player=Object.create(_RealPlayer);' +
     'Lampa.Player.play=function(data){' +
     'try{' +
-    'if(data&&data.url&&typeof data.url==="string"&&data.url.indexOf(__es5_server)===-1&&data.url.indexOf("warp.cfhttp.top")===-1){' +
-    'data.url=__es5_server+"/r?url="+encodeURIComponent(data.url).replace(/%3A/gi, ":").replace(/%2F/gi, "/");' +
+    'function px(u){if(typeof u==="string"&&u.indexOf(__es5_server)===-1&&u.indexOf("warp.cfhttp.top")===-1){return __es5_server+"/r?url="+encodeURIComponent(u).replace(/%3A/gi, ":").replace(/%2F/gi, "/");}return u;}' +
+    'if(data){' +
+    'if(data.url) data.url=px(data.url);' +
+    'if(data.file) data.file=px(data.file);' +
+    'if(data.video&&data.video.url) data.video.url=px(data.video.url);' +
+    'if(Array.isArray(data.url)){for(var i=0;i<data.url.length;i++){if(data.url[i].file)data.url[i].file=px(data.url[i].file);}}' +
     '}' +
     '}catch(e){}' +
     'return _RealPlayer.play.apply(this,arguments);' +
@@ -443,46 +458,7 @@ app.all('/r', async (req, res) => {
       signal: controller.signal
     })
 
-    const isJson = (upstream.headers.get('content-type') || '').includes('application/json');
-
-    if (isJson) {
-      const buffer = await upstream.arrayBuffer();
-      let text = Buffer.from(buffer).toString('utf8');
-
-      // Replace wss:// urls to go through our proxy
-      const serverBase = getSelfBase(req);
-      const wsBase = serverBase.replace(/^http/, 'ws');
-      
-      text = text.replace(/wss:\/\/[^"'\s]+/g, (match) => {
-        return wsBase + '/ws?url=' + encodeURIComponent(match);
-      });
 
-      const outBuf = Buffer.from(text, 'utf8');
-      
-      res.status(upstream.status);
-      for (const h of RES_HEADERS_PASS) {
-        if (h === 'content-length') {
-          res.setHeader(h, outBuf.length);
-          continue;
-        }
-        
-        let v;
-        if (h === 'set-cookie') {
-          const cookies = upstream.headers.getSetCookie ? upstream.headers.getSetCookie() : [];
-          if (cookies.length) {
-            // Strip domain from cookies so they apply to our proxy's domain
-            v = cookies.map(c => c.replace(/domain=[^;]+;?\s*/gi, ''));
-          }
-        } else {
-          v = upstream.headers.get(h);
-        }
-        
-        if (v) res.setHeader(h, v);
-      }
-      res.setHeader('access-control-allow-origin', '*');
-      
-      return res.end(outBuf);
-    }
 
     res.status(upstream.status)
     for (const h of RES_HEADERS_PASS) {