Upload server.js

server.js

@@ -422,7 +422,7 @@ app.all('/r', async (req, res) => {
       signal: controller.signal
     })
 
-    const isJson = false; // ВРЕМЕННО ОТКЛЮЧЕНО: (upstream.headers.get('content-type') || '').includes('application/json');
+    const isJson = (upstream.headers.get('content-type') || '').includes('application/json');
 
     if (isJson) {
       const buffer = await upstream.arrayBuffer();
@@ -449,7 +449,7 @@ app.all('/r', async (req, res) => {
       }
       res.setHeader('access-control-allow-origin', '*');
       
-      return res.send(outBuf);
+      return res.end(outBuf);
     }
 
     res.status(upstream.status)
@@ -498,15 +498,21 @@ server.on('upgrade', (req, clientSocket, head) => {
       const options = {
         port: targetUrl.port || (targetUrl.protocol === 'wss:' ? 443 : 80),
         host: targetUrl.hostname,
-        headers: req.headers,
+        headers: Object.assign({}, req.headers), // clone headers to avoid modifying original
         path: targetUrl.pathname + targetUrl.search
       };
       
-      // Clean up headers
+      // Clean up headers and fake origin to avoid 403 Forbidden
       options.headers.host = targetUrl.hostname;
+      options.headers.origin = targetUrl.protocol.replace('ws', 'http') + '//' + targetUrl.hostname;
+      options.headers['user-agent'] = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36';
+      
       delete options.headers['x-forwarded-for'];
       delete options.headers['x-forwarded-proto'];
       delete options.headers['x-forwarded-host'];
+      delete options.headers['cf-connecting-ip'];
+      delete options.headers['cf-ray'];
+      delete options.headers['cf-visitor'];
       
       const proto = targetUrl.protocol === 'wss:' ? require('https') : require('http');
       const proxyReq = proto.request(options);
@@ -524,8 +530,16 @@ server.on('upgrade', (req, clientSocket, head) => {
         proxySocket.pipe(clientSocket);
         clientSocket.pipe(proxySocket);
       });
+
+      // Handle server rejecting the WS connection (e.g. 403 or 400)
+      proxyReq.on('response', (proxyRes) => {
+        console.error('WS Proxy rejected with status:', proxyRes.statusCode);
+        clientSocket.write(`HTTP/1.1 ${proxyRes.statusCode} ${proxyRes.statusMessage}\r\n\r\n`);
+        clientSocket.destroy();
+      });
       
       proxyReq.on('error', (err) => {
+        console.error('WS Proxy error:', err.message);
         clientSocket.destroy();
       });
       
@@ -539,6 +553,7 @@ server.on('upgrade', (req, clientSocket, head) => {
       clientSocket.destroy();
     }
   } catch(e) {
+    console.error('WS Upgrade catch error:', e.message);
     clientSocket.destroy();
   }
 })