f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-11-05 00:48:44 +00:00
Code Wiki Activity

Revert "Initial pass at individual brew streams"

Browse Source 
This reverts commit 885feb31b0.
This commit is contained in:
G.Ambatte
2026-10-07 18:24:44 +13:00
parent f64ffb27df
commit 9b93c799bd
2 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/homebrew/pages/sharePage/sharePage.jsx
+3 -5
View File
@@ -54,13 +54,12 @@ const SharePage = (props)=>{
fetchThemeBundle(undefined, setThemeBundle, currentBrew.renderer, currentBrew.theme); fetchThemeBundle(undefined, setThemeBundle, currentBrew.renderer, currentBrew.theme);
// listen for changes in the brew version // listen for changes in the brew version
const eventSource = new EventSource(`/stream/${props.brew.shareId}`); const eventSource = new EventSource('/stream');
eventSource.addEventListener('message', (evt)=>{ eventSource.addEventListener('message', (evt)=>{
const messageData = JSON.parse(evt.data); const messageData = JSON.parse(evt.data);
if(messageData.eventType == 'brewUpdated'){ if(messageData.eventType == 'brewUpdated'){
// Share ID check no longer required if(messageData.shareId == currentBrew.shareId && messageData.version != currentBrew.version) {
if(messageData.version != currentBrew.version) {
console.log('should fetch brew'); console.log('should fetch brew');
fetchUpdatedBrew(); fetchUpdatedBrew();
} }
@@ -69,8 +68,7 @@ const SharePage = (props)=>{
return ()=>{ return ()=>{
document.removeEventListener('keydown', handleControlKeys); document.removeEventListener('keydown', handleControlKeys);
eventSource.removeEventListener('message'); eventSource.close();
// eventSource.close();
}; };
}, []); }, []);
server/app.js
+4 -12
View File
@@ -196,27 +196,19 @@ export default async function createApp(vite) {
// Create Event Stream source for pages to listen to // Create Event Stream source for pages to listen to
let initStreamListener = false; let initStreamListener = false;
app.get('/stream/:id', (req, res)=>{ app.get('/stream', (req, res)=>{
const id = req.params.id;
res.writeHead(200, { res.writeHead(200, {
'Content-Type' : 'text/event-stream', 'Content-Type' : 'text/event-stream',
'Cache-Control' : 'no-cache, no-transform', 'Cache-Control' : 'no-cache',
'Connection' : 'keep-alive', 'Connection' : 'keep-alive',
'Content-Encoding' : 'none' 'Content-Encoding' : 'none'
}); });
res.write(`data: ${JSON.stringify({ init: Date.now().toString(), shareId: id, eventType: 'message' })}\n\n`);
if(!initStreamListener){ if(!initStreamListener){
initStreamListener = true; initStreamListener = true;
Stream.on('sendUpdate', (event, data)=>{ Stream.on('sendUpdate', (event, data)=>{
if(isLocalEnvironment) { if(isLocalEnvironment) { console.log('Event:', event, '\nData:', data); }
console.log('Event:', event, '\nData:', data); res.write(`data: ${JSON.stringify({ ...data, eventType: event })}\n\n`);
}
if(id == data.shareId) {
res.write(`data: ${JSON.stringify({ ...data, eventType: event })}\n\n`);
};
}); });
} }
}); });