fixed response headers

Author: Toasty360

src/cors.js

@@ -1,23 +1,23 @@
 async function handleCorsRequest(targetUrl, headers) {
 	try {
-		// Fetch the target URL with the specified headers
 		const response = await fetch(targetUrl, {
 			redirect: 'follow',
-			headers,
+			headers: headers,
 		});
 
-		// Stream the response body back to the client
+		const responseHeaders = new Headers(response.headers);
+		responseHeaders.set('Access-Control-Allow-Origin', '*');
+		responseHeaders.set('Content-Type', response.headers.get('Content-Type') || 'application/octet-stream');
+
 		return new Response(response.body, {
 			status: response.status,
-			headers: {
-				'Access-Control-Allow-Origin': '*', // Adjust based on your CORS policy
-				'Content-Type': response.headers.get('Content-Type') || 'application/octet-stream',
-			},
+			headers: responseHeaders,
 		});
 	} catch (error) {
 		console.error('Error fetching the webpage:', error.message);
 		return new Response('An error occurred while fetching the webpage.', {
 			status: 500,
+			headers: { 'Access-Control-Allow-Origin': '*' },
 		});
 	}
 }

src/index.js

@@ -22,7 +22,7 @@ export default {
 		if (url.pathname === '/proxy') {
 			return proxy(request);
 		} else if (url.pathname === '/cors') {
-			const [url, headers] = handleRequest(request);
+			const [url, headers, origin] = handleRequest(request);
 			return handleCorsRequest(url, headers);
 		} else if (url.pathname === '/image') {
 			const [url, headers, origin] = handleRequest(request);

src/utils/handler.js

@@ -1,19 +1,28 @@
 export const decodeHeaders = (base64Headers) => {
-	const headers = new Headers();
-	if (!base64Headers) return headers;
+	const headers = {}; // Use a plain object instead of `Headers`
+	if (!base64Headers) {
+		return headers;
+	}
+
 	try {
 		const decodedString = atob(base64Headers);
-		const headersObj = JSON.parse(decodedString);
+
+		let headersObj;
+		try {
+			headersObj = JSON.parse(decodedString);
+		} catch (error) {
+			console.error('Error parsing JSON:', error, 'Decoded string:', decodedString);
+			return headers;
+		}
 
 		Object.entries(headersObj).forEach(([key, value]) => {
-			headers.append(key, value);
+			headers[key] = value;
 		});
-		headers.append(
-			'User-Agent',
-			'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/237.84.2.178 Safari/537.36'
-		);
+		headers['User-Agent'] =
+			'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/237.84.2.178 Safari/537.36';
 		return headers;
 	} catch (error) {
+		console.error('Error decoding base64:', error);
 		return headers;
 	}
 };
@@ -36,5 +45,6 @@ export const handleRequest = (request) => {
 	}
 
 	const headers = decodeHeaders(headersBase64);
+
 	return [targetUrl, headers, url.origin];
 };