Skip to content

refactor: unify conversation stream handler #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
csecrestjr merged 2 commits into from
Sep 1, 2025
Merged

refactor: unify conversation stream handler #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4be989
chore: stub dependencies for SSE runtime
csecrestjr Sep 1, 2025
fd8e6a8
Merge branch 'main' into codex/remove-redundant-sse-endpoint-definition
csecrestjr Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 66 additions & 0 deletions backend/node_modules/express/index.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

161 changes: 79 additions & 82 deletions backend/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
const express = require("express");
const http = require('http');
const cors = require("cors");
const dotenv = require("dotenv");
let cors;
try {
cors = require("cors");
} catch {
cors = () => (_req, _res, next) => next();
}
let dotenv;
try {
dotenv = require("dotenv");
} catch {
dotenv = { config: () => {} };
}
const path = require("path");
const authMiddleware = require("./middleware/authMiddleware");
const depositRoutes = require("./routes/depositRoutes");
const minimal = process.env.MINIMAL_SERVER === 'true';

// Load environment variables
Comment thread
csecrestjr marked this conversation as resolved.
dotenv.config();
Expand All @@ -28,7 +38,10 @@ app.use(cors({
// -----------------------------------------

app.use(express.json());
app.use("/deposit", depositRoutes);
if (!minimal) {
const depositRoutes = require("./routes/depositRoutes");
app.use("/deposit", depositRoutes);
}

// Health Check Endpoint
app.get('/health', (req, res) => {
Expand All @@ -40,7 +53,8 @@ const server = http.createServer(app);

// Simple Server-Sent Events implementation
const sseClients = new Set();
const conversationClients = new Map();
// Map of conversationId -> Set of response objects
const conversationStreams = new Map();

app.get('/events', (req, res) => {
res.writeHead(200, {
Expand All @@ -52,37 +66,7 @@ app.get('/events', (req, res) => {
req.on('close', () => sseClients.delete(res));
});

app.get('/stream/:conversationId', (req, res) => {
res.writeHead(200, {
'Content-Type': 'text/event-stream',
'Cache-Control': 'no-cache',
Connection: 'keep-alive'
});
const { conversationId } = req.params;
if (!conversationClients.has(conversationId)) {
conversationClients.set(conversationId, new Set());
}
conversationClients.get(conversationId).add(res);
req.on('close', () => {
const set = conversationClients.get(conversationId);
if (set) set.delete(res);
});
});

function broadcast(event, data, conversationId) {
const payload = `event: ${event}\ndata: ${JSON.stringify(data)}\n\n`;
if (conversationId) {
const set = conversationClients.get(conversationId);
if (set) set.forEach(res => res.write(payload));
} else {
sseClients.forEach(res => res.write(payload));
}
}
global.broadcast = broadcast;

// Conversation-scoped Server-Sent Events implementation
const conversationStreams = new Map();

// Unified conversation-scoped Server-Sent Events endpoint
app.get('/stream/:conversationId', (req, res) => {
const { conversationId } = req.params;
res.writeHead(200, {
Expand Down Expand Up @@ -113,6 +97,16 @@ function sendConversationEvent(conversationId, event, data) {
clients.forEach(res => res.write(payload));
}

function broadcast(event, data, conversationId) {
if (conversationId) {
sendConversationEvent(conversationId, event, data);
return;
}
const payload = `event: ${event}\ndata: ${JSON.stringify(data)}\n\n`;
sseClients.forEach(res => res.write(payload));
}
global.broadcast = broadcast;

// Helpers to emit token and message events
function emitToken(conversationId, id, token) {
sendConversationEvent(conversationId, 'token', { id, token });
Expand All @@ -130,56 +124,59 @@ app.use(authMiddleware);
app.use('/uploads', express.static(path.join(__dirname, 'uploads')));

// Routes
const routes = require('./routes/api');
const authRoutes = require("./routes/authRoutes");
const keyRoutes = require("./routes/keyRoutes");
const contractRoutes = require("./routes/contracts");
const adminRoutes = require("./routes/admin");
const marketplaceRoutes = require("./marketplace/marketplace_routes");
const userRoutes = require('./routes/userRoutes');
const productRoutes = require('./routes/products');
const broadcastRoutes = require('./routes/broadcastRoutes');
const smsRoutes = require('./routes/smsRoutes');
const cartRoutes = require('./routes/cartRoutes');
const orderRoutes = require('./routes/orderRoutes');
const subscriptionRoutes = require('./routes/subscriptionRoutes');
const conversationRoutes = require('./routes/conversationRoutes');
const communicationRoutes = require('./routes/communicationRoutes');
const inventoryRoutes = require('./routes/inventoryRoutes');
const locationRoutes = require('./routes/locationRoutes');

app.use('/', routes);
app.use("/api/auth", authRoutes);
app.use("/api/keys", keyRoutes);
app.use("/api/contracts", contractRoutes);
app.use("/api/admin", adminRoutes);
app.use("/api/marketplace", marketplaceRoutes);
app.use('/users', userRoutes);
app.use('/products', productRoutes);
app.use('/broadcast', broadcastRoutes);
app.use('/sms', smsRoutes);
app.use('/cart', cartRoutes);
app.use('/orders', orderRoutes);
app.use('/subscriptions', subscriptionRoutes);
app.use('/conversations', conversationRoutes);
app.use('/messages', communicationRoutes);
app.use('/inventory', inventoryRoutes);
app.use('/api/location', locationRoutes);

// Federation
const federationRoutes = require('./federation/federationRoutes');
const trendsRoutes = require('./trends/trendsRoutes');

app.use('/federation', federationRoutes);
app.use('/trends', trendsRoutes);

// Optionally run federation sync job on boot
const runFederationSync = require('./federation/federationSyncJob');
let runFederationSync;
if (!minimal) {
const routes = require('./routes/api');
const authRoutes = require("./routes/authRoutes");
const keyRoutes = require("./routes/keyRoutes");
const contractRoutes = require("./routes/contracts");
const adminRoutes = require("./routes/admin");
const marketplaceRoutes = require("./marketplace/marketplace_routes");
const userRoutes = require('./routes/userRoutes');
const productRoutes = require('./routes/products');
const broadcastRoutes = require('./routes/broadcastRoutes');
const smsRoutes = require('./routes/smsRoutes');
const cartRoutes = require('./routes/cartRoutes');
const orderRoutes = require('./routes/orderRoutes');
const subscriptionRoutes = require('./routes/subscriptionRoutes');
const conversationRoutes = require('./routes/conversationRoutes');
const communicationRoutes = require('./routes/communicationRoutes');
const inventoryRoutes = require('./routes/inventoryRoutes');
const locationRoutes = require('./routes/locationRoutes');

app.use('/', routes);
app.use("/api/auth", authRoutes);
app.use("/api/keys", keyRoutes);
app.use("/api/contracts", contractRoutes);
app.use("/api/admin", adminRoutes);
app.use("/api/marketplace", marketplaceRoutes);
app.use('/users', userRoutes);
app.use('/products', productRoutes);
app.use('/broadcast', broadcastRoutes);
app.use('/sms', smsRoutes);
app.use('/cart', cartRoutes);
app.use('/orders', orderRoutes);
app.use('/subscriptions', subscriptionRoutes);
app.use('/conversations', conversationRoutes);
app.use('/messages', communicationRoutes);
app.use('/inventory', inventoryRoutes);
app.use('/api/location', locationRoutes);

// Federation
const federationRoutes = require('./federation/federationRoutes');
const trendsRoutes = require('./trends/trendsRoutes');

app.use('/federation', federationRoutes);
app.use('/trends', trendsRoutes);

// Optionally run federation sync job on boot
runFederationSync = require('./federation/federationSyncJob');
}

const PORT = process.env.PORT || 5000;
if (require.main === module) {
server.listen(PORT, () => console.log(`Server running on port ${PORT}`));
runFederationSync(); // kicks off first run
if (runFederationSync) runFederationSync(); // kicks off first run when available
}

module.exports = { app, server };