Fix handing request body & timeout support

materialious/static/nodejs-android/index.js

@@ -34,7 +34,12 @@ function fetchWithRedirects(targetUrl, options, redirectCount = 0) {
             resolve(res); // Resolve with the final response if not a redirect
         });
 
-        req.on('error', (error) => reject(error)); // Better error handling for request
+        if (options.body && (req.method === 'POST' || req.method === 'PUT')) {
+            req.write(options.body);
+        }
+
+        req.setTimeout(10000, () => reject(new Error('Request timeout')), req.end());
+        req.on('error', (error) => reject(error), req.end());
         req.end();
     });
 }
@@ -65,30 +70,51 @@ const server = http.createServer(async (req, res) => {
         return res.end(`Invalid URL: ${error.message}`);
     }
 
-    const options = {
-        method: req.method,
-        headers: {
-            ...req.headers,
-            host: parsedTarget.hostname, // Ensure correct host header
-        },
-    };
+    let body = '';
+    req.on('data', chunk => {
+        body += chunk;
+    });
 
-    try {
-        const proxyRes = await fetchWithRedirects(parsedTarget, options);
-        res.writeHead(proxyRes.statusCode, {
-            ...proxyRes.headers,
-            'Access-Control-Allow-Origin': ORIGIN,
-            'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, OPTIONS',
-            'Access-Control-Allow-Headers': '*',
-            'Access-Control-Allow-Credentials': 'true',
-        });
+    req.on('end', async () => {
+        const options = {
+            method: req.method,
+            headers: {
+                ...req.headers,
+                host: parsedTarget.hostname, // Ensure correct host header
+            }
+        };
 
-        proxyRes.pipe(res); // Pipe response data back to the client
-    } catch (error) {
-        console.error('Proxy error:', error);
-        res.writeHead(500, { 'Content-Type': 'text/plain' });
-        res.end(`Error: ${error.message}`);
-    }
+        // For POST and PUT methods, pass the body to the outgoing request
+        if (req.method === 'POST' || req.method === 'PUT') {
+            options.headers['Content-Length'] = Buffer.byteLength(body);
+            options.body = body;
+        }
+
+        try {
+            const proxyRes = await fetchWithRedirects(parsedTarget, options);
+
+            req.on('close', () => {
+                console.log('Request canceled by the client.');
+                proxyRes.destroy();
+            });
+
+            res.writeHead(proxyRes.statusCode, {
+                ...proxyRes.headers,
+                'Access-Control-Allow-Origin': ORIGIN,
+                'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, OPTIONS',
+                'Access-Control-Allow-Headers': '*',
+                'Access-Control-Allow-Credentials': 'true',
+            });
+
+            // Pipe response data back to the client
+            proxyRes.pipe(res);
+
+        } catch (error) {
+            console.error('Proxy error:', error);
+            res.writeHead(500, { 'Content-Type': 'text/plain' });
+            res.end(`Error: ${error.message}`);
+        }
+    });
 });
 
 server.listen(PORT, () => {