Filter crew events to only be visible for crew

server/api/account.delete.ts

@@ -2,6 +2,7 @@ import {
 	readAccounts, readSessions, readSubscriptions,
 	writeAccounts, writeSessions, writeSubscriptions,
  } from "~/server/database";
+import { cancelAccountStreams } from "~/server/streams";
 
 export default defineEventHandler(async (event) => {
 	const accountSession = await requireAccountSession(event);
@@ -24,6 +25,7 @@ export default defineEventHandler(async (event) => {
 		}
 		return true;
 	});
+	cancelAccountStreams(accountSession.accountId);
 	await writeSessions(sessions);
 	await deleteCookie(event, "session");
 

server/api/auth/session.delete.ts

@@ -1,4 +1,5 @@
 import { readAccounts } from "~/server/database";
+import { cancelSessionStreams } from "~/server/streams";
 
 export default defineEventHandler(async (event) => {
 	const session = await getAccountSession(event);
@@ -15,5 +16,8 @@ export default defineEventHandler(async (event) => {
 		}
 	}
 
+	if (session) {
+		cancelSessionStreams(session.id);
+	}
 	await clearAccountSession(event);
 })

server/api/create-event.post.ts

@@ -25,7 +25,7 @@ export default defineEventHandler(async (event) => {
 			}
 		]
 	});
-	broadcastUpdate(schedule);
+	await broadcastUpdate(schedule);
 	await writeSchedule(schedule);
 	await sendPush("New event", `${name} will start at ${start}`);
 });

server/api/delete-event.post.ts

@@ -11,6 +11,6 @@ export default defineEventHandler(async (event) => {
 		throw Error("No such event");
 	}
 	schedule.events.splice(index, 1);
-	broadcastUpdate(schedule);
+	await broadcastUpdate(schedule);
 	await writeSchedule(schedule);
 });

server/api/events.ts

@@ -1,7 +1,15 @@
 import { pipeline } from "node:stream";
 import { addStream, deleteStream } from "~/server/streams";
+import { readAccounts } from "~/server/database";
 
 export default defineEventHandler(async (event) => {
+	const session = await getAccountSession(event);
+	let accountId: number | undefined;
+	if (session) {
+		const accounts = await readAccounts()
+		accountId = accounts.find(account => account.id === session.accountId)?.id;
+	}
+
 	const encoder = new TextEncoder();
 	const source = event.headers.get("x-forwarded-for");
 	console.log(`starting event stream for ${source}`)
@@ -19,12 +27,11 @@ export default defineEventHandler(async (event) => {
 			deleteStream(stream.writable);
 		}
 	})
-	addStream(stream.writable);
+	addStream(stream.writable, session?.id, accountId);
 
 	// Workaround to properly handle stream errors. See https://github.com/unjs/h3/issues/986
 	setHeader(event, "Access-Control-Allow-Origin", "*");
 	setHeader(event, "Content-Type", "text/event-stream");
-	event.node.res.write("data: connected\n\n"); // Produce a response immediately to avoid the reply waiting for content.
 	pipeline(stream.readable as unknown as NodeJS.ReadableStream, event.node.res, (err) => { /* ignore */ });
 	event._handled = true;
 });

server/api/modify-event.post.ts

@@ -30,7 +30,7 @@ export default defineEventHandler(async (event) => {
 			}
 		]
 	};
-	broadcastUpdate(schedule);
+	await broadcastUpdate(schedule);
 	await writeSchedule(schedule);
 	if (timeChanged)
 		await sendPush(`New time for ${name}`, `${name} will now start at ${start}`);

server/api/schedule.ts

@@ -1,5 +1,14 @@
-import { readSchedule } from "~/server/database";
+import { readAccounts, readSchedule } from "~/server/database";
+import { Account } from "~/shared/types/account";
+import { canSeeCrew } from "../utils/schedule";
 
 export default defineEventHandler(async (event) => {
-	return await readSchedule();
+	const session = await getAccountSession(event);
+	let account: Account | undefined;
+	if (session) {
+		const accounts = await readAccounts()
+		account = accounts.find(account => account.id === session.accountId);
+	}
+	const schedule = await readSchedule();
+	return canSeeCrew(account?.type) ? schedule : filterSchedule(schedule);
 })