Revert "Initial pass at individual brew streams"

This reverts commit 885feb31b0.

client/homebrew/pages/sharePage/sharePage.jsx

@@ -54,13 +54,12 @@ const SharePage = (props)=>{
 		fetchThemeBundle(undefined, setThemeBundle, currentBrew.renderer, currentBrew.theme);
 
 		// listen for changes in the brew version
-		const eventSource = new EventSource(`/stream/${props.brew.shareId}`);
+		const eventSource = new EventSource('/stream');
 		eventSource.addEventListener('message', (evt)=>{
 			const messageData = JSON.parse(evt.data);
 
 			if(messageData.eventType == 'brewUpdated'){
-				// Share ID check no longer required
-				if(messageData.version != currentBrew.version) {
+				if(messageData.shareId == currentBrew.shareId && messageData.version != currentBrew.version) {
 					console.log('should fetch brew');
 					fetchUpdatedBrew();
 				}
@@ -69,8 +68,7 @@ const SharePage = (props)=>{
 
 		return ()=>{
 			document.removeEventListener('keydown', handleControlKeys);
-			eventSource.removeEventListener('message');
-			// eventSource.close();
+			eventSource.close();
 		};
 	}, []);
 

server/app.js

@@ -196,27 +196,19 @@ export default async function createApp(vite) {
 
 	// Create Event Stream source for pages to listen to
 	let initStreamListener = false;
-	app.get('/stream/:id', (req, res)=>{
-		const id = req.params.id;
-
+	app.get('/stream', (req, res)=>{
 		res.writeHead(200, {
 			'Content-Type'     : 'text/event-stream',
-			'Cache-Control'    : 'no-cache, no-transform',
+			'Cache-Control'    : 'no-cache',
 			'Connection'       : 'keep-alive',
 			'Content-Encoding' : 'none'
 		});
 
-		res.write(`data: ${JSON.stringify({ init: Date.now().toString(), shareId: id, eventType: 'message' })}\n\n`);
-
 		if(!initStreamListener){
 			initStreamListener = true;
 			Stream.on('sendUpdate', (event, data)=>{
-				if(isLocalEnvironment) {
-					console.log('Event:', event, '\nData:', data);
-				}
-				if(id == data.shareId) {
-					res.write(`data: ${JSON.stringify({ ...data, eventType: event })}\n\n`);
-				};
+				if(isLocalEnvironment) { console.log('Event:', event, '\nData:', data); }
+				res.write(`data: ${JSON.stringify({ ...data, eventType: event })}\n\n`);
 			});
 		}
 	});