api/src/party-types.ts

@@ -1,12 +1,11 @@
 import type { InferSelectModel } from "drizzle-orm";
-import type { party, partyMember, track, user } from "./db/schema";
+import type { party, partyMember, user } from "./db/schema";
 
 export type Party = Omit<InferSelectModel<typeof party>, "data"> & {
 	data: QuizState;
 };
 export type PartyMember = InferSelectModel<typeof partyMember>;
 export type User = InferSelectModel<typeof user>;
-export type Song = InferSelectModel<typeof track>;
 
 export type PartyMemberWithUser = PartyMember & { user: User | null };
 
@@ -25,7 +24,6 @@ export type PartyState = {
 
 export type PartySocketOutgoing =
 	| { type: "ping" }
-	| { type: "subscribe_party"; partyId: string }
 	| { type: "member_payload"; payload: unknown };
 
 type BaseQuestion = {
@@ -34,7 +32,6 @@ type BaseQuestion = {
 	startTimestamp: number;
 	endTimestamp: number;
 	points: number;
-	song?: Song;
 };
 
 export type Question =

api/src/party/audio-question-generator.ts

@@ -1,4 +1,3 @@
-import type { db as Db } from "../db";
 import type { Question } from "../party-types";
 import {
 	buildOptionsWithCorrect,
@@ -9,19 +8,16 @@ import {
 	getTopClusterTracks,
 	type PartyAnalytics,
 	pickRandom,
-	resolveQuestionSong,
 } from "./question-utils";
 
-export async function buildAudioMetadataQuestion(
+export function buildAudioMetadataQuestion(
-	dbClient: typeof Db,
 	analytics: PartyAnalytics,
 	index: number,
-): Promise<Question | null> {
+): Question {
 	type ChoiceQuestion = Extract<Question, { type: "choice" }>;
 	const questions: Array<
 		Omit<ChoiceQuestion, "startTimestamp" | "endTimestamp">
 	> = [];
-	const topSong = await resolveQuestionSong(dbClient, analytics);
 
 	const genreOptions = buildOrderedOptions(
 		getMostSharedGenreNames(analytics),
@@ -34,7 +30,6 @@ export async function buildAudioMetadataQuestion(
 			options: genreOptions,
 			correct: 0,
 			points: 10,
-			song: topSong ?? undefined,
 		});
 	}
 
@@ -49,7 +44,6 @@ export async function buildAudioMetadataQuestion(
 				options: artistOptions,
 				correct: 0,
 				points: 10,
-				song: topSong ?? undefined,
 			});
 		}
 	}
@@ -68,18 +62,12 @@ export async function buildAudioMetadataQuestion(
 				options: trackOptions,
 				correct: 0,
 				points: 10,
-				song: topSong ?? undefined,
 			});
 		}
 	}
 
 	const randomTopTrack = pickRandom(topTracks);
 	if (randomTopTrack) {
-		const randomTrackSong = await resolveQuestionSong(dbClient, analytics, {
-			trackName: randomTopTrack.name,
-			artistNames: randomTopTrack.artists?.map((artist) => artist.name),
-			albumName: randomTopTrack.albumName,
-		});
 		const trackArtists =
 			randomTopTrack.artists?.map((artist) => artist.name) ?? [];
 		const allArtists = topArtists.length > 0 ? topArtists : trackArtists;
@@ -97,7 +85,6 @@ export async function buildAudioMetadataQuestion(
 					options: artistOptions,
 					correct: 0,
 					points: 10,
-					song: randomTrackSong ?? topSong ?? undefined,
 				});
 			}
 
@@ -114,7 +101,6 @@ export async function buildAudioMetadataQuestion(
 					options: trackNameOptions,
 					correct: 0,
 					points: 10,
-					song: randomTrackSong ?? topSong ?? undefined,
 				});
 			}
 		}
@@ -135,14 +121,13 @@ export async function buildAudioMetadataQuestion(
 					options: albumOptions,
 					correct: 0,
 					points: 10,
-					song: randomTrackSong ?? topSong ?? undefined,
 				});
 			}
 		}
 	}
 
 	if (questions.length === 0) {
-		return null;
+		throw new Error("Question not found");
 	}
 
 	const question = questions[index % questions.length];

api/src/party/numeric-question-generator.ts

@@ -10,7 +10,6 @@ import {
 	getQuestionRange,
 	type PartyAnalytics,
 	type PartyQuestionMember,
-	resolveQuestionSong,
 } from "./question-utils";
 
 type NumericQuestion = Omit<
@@ -37,9 +36,6 @@ async function getAlbumReleaseYear({
 				with: { album: true },
 			})
 		: null;
-	const song = await resolveQuestionSong(db, analytics, {
-		trackName: track?.name ?? trackName ?? undefined,
-	});
 	const correct =
 		track?.album?.release_date?.getFullYear() ??
 		new Date().getFullYear() - 1 - index;
@@ -50,7 +46,6 @@ async function getAlbumReleaseYear({
 		correct,
 		range: getQuestionRange(correct, 10, 3),
 		points: 10,
-		song: song ?? undefined,
 	};
 }
 
@@ -65,7 +60,6 @@ async function countTopTrackListeners({
 		where: { name: trackName },
 	});
 	if (!dbTrack) return null;
-	const song = await resolveQuestionSong(db, analytics, { trackName });
 	const memberIds = members.map((m) => m.userId);
 	const entries = await db
 		.select({ userId: topTrackTable.userId })
@@ -83,7 +77,6 @@ async function countTopTrackListeners({
 		correct,
 		range: { min: 0, max: members.length },
 		points: 10,
-		song: song ?? undefined,
 	};
 }
 
@@ -98,9 +91,6 @@ async function countFavouriteArtistListeners({
 		where: { name: artistName },
 	});
 	if (!dbArtist) return null;
-	const song = await resolveQuestionSong(db, analytics, {
-		artistNames: [artistName],
-	});
 	const memberIds = members.map((m) => m.userId);
 	const entries = await db
 		.select({ userId: topArtistTable.userId })
@@ -118,13 +108,12 @@ async function countFavouriteArtistListeners({
 		correct,
 		range: { min: 0, max: members.length },
 		points: 10,
-		song: song ?? undefined,
 	};
 }
 
 export async function buildNumericQuestion(
 	input: BuildNumericQuestionInput,
-): Promise<Question | null> {
+): Promise<Question> {
 	const questions: NumericQuestion[] = [];
 
 	questions.push(await getAlbumReleaseYear(input));
@@ -136,6 +125,6 @@ export async function buildNumericQuestion(
 	if (artistQ) questions.push(artistQ);
 
 	const question = questions[input.index % questions.length] ?? questions[0];
-	if (!question) return null;
+	if (!question) throw new Error("Question not found");
 	return buildQuestionWindow(question);
 }

api/src/party/question-generator.ts

@@ -22,23 +22,13 @@ export async function generatePartyQuestion({
 	quizState,
 	analytics,
 	index,
-}: GenerateQuestionInput): Promise<Question | null> {
+}: GenerateQuestionInput): Promise<Question> {
 	const members = await fetchPartyMembers(dbClient, partyId);
 	const type: PartyQuestionType =
 		index === 2 ? "numeric" : index % 2 === 0 ? "audio-metadata" : "social";
-
+	return type === "audio-metadata"
-	if (type === "audio-metadata") {
+		? buildAudioMetadataQuestion(analytics, index)
-		const q = await buildAudioMetadataQuestion(dbClient, analytics, index);
+		: type === "numeric"
-		if (q) return q;
+			? buildNumericQuestion({ db: dbClient, analytics, index, members })
-	}
+			: buildSocialQuestion(quizState, analytics, members, index);
-	if (type === "numeric") {
-		const q = await buildNumericQuestion({
-			db: dbClient,
-			analytics,
-			index,
-			members,
-		});
-		if (q) return q;
-	}
-	return buildSocialQuestion(dbClient, quizState, analytics, members, index);
 }

api/src/party/question-utils.ts

@@ -1,6 +1,4 @@
-import type { InferSelectModel } from "drizzle-orm";
 import type { db as Db } from "../db";
-import type { track as trackTable } from "../db/schema";
 
 export type PartyQuestionMember = {
 	userId: string;
@@ -25,14 +23,6 @@ export type PartyAnalytics = {
 	pairwise?: { userIdA: string; userIdB: string }[];
 } | null;
 
-export type AnalyticsTrack = {
-	name: string;
-	artists?: { name: string }[];
-	albumName?: string;
-	memberScores?: { userId: string; score: number }[];
-};
-export type QuestionSong = InferSelectModel<typeof trackTable>;
-
 export const QUESTION_DURATION_MS = 60_000;
 export const MIN_PARTY_SIZE = 2;
 export const MAX_PARTY_SIZE = 4;
@@ -110,80 +100,15 @@ export function getTopClusterArtists(analytics: PartyAnalytics): string[] {
 	);
 }
 
-export function getTopClusterTracks(
+export function getTopClusterTracks(analytics: PartyAnalytics): Array<{
-	analytics: PartyAnalytics,
+	name: string;
-): AnalyticsTrack[] {
+	artists?: { name: string }[];
+	albumName?: string;
+	memberScores?: { userId: string; score: number }[];
+}> {
 	return analytics?.storyClusters?.[0]?.tracks ?? [];
 }
 
-export function pickRelevantTrack(
-	analytics: PartyAnalytics,
-	hints: {
-		trackName?: string;
-		artistNames?: string[];
-		albumName?: string;
-	} = {},
-): AnalyticsTrack | null {
-	const tracks = getTopClusterTracks(analytics);
-	if (tracks.length === 0) return null;
-
-	const scored = tracks.map((track) => {
-		const trackArtistNames = track.artists?.map((artist) => artist.name) ?? [];
-		const matchesTrackName = hints.trackName && track.name === hints.trackName;
-		const matchesAlbum = hints.albumName && track.albumName === hints.albumName;
-		const matchesArtist =
-			hints.artistNames?.some((name) => trackArtistNames.includes(name)) ??
-			false;
-
-		return {
-			track,
-			score:
-				(matchesTrackName ? 4 : 0) +
-				(matchesAlbum ? 2 : 0) +
-				(matchesArtist ? 2 : 0),
-		};
-	});
-
-	const best = scored.sort((a, b) => b.score - a.score).at(0);
-	return best?.track ?? tracks[0] ?? null;
-}
-
-export async function resolveQuestionSong(
-	db: typeof Db,
-	analytics: PartyAnalytics,
-	hints: {
-		trackName?: string;
-		artistNames?: string[];
-		albumName?: string;
-	} = {},
-): Promise<QuestionSong | null> {
-	const trackHint = pickRelevantTrack(analytics, hints);
-	if (!trackHint?.name) return null;
-
-	const tracks = await db.query.track.findMany({
-		where: { name: trackHint.name },
-		with: { album: true, artists: true },
-	});
-	if (tracks.length === 0) return null;
-
-	const scoreTrack = (track: (typeof tracks)[number]) => {
-		const artistNames = track.artists?.map((artist) => artist.name) ?? [];
-		const matchesAlbum = trackHint.albumName
-			? track.album?.name === trackHint.albumName
-			: false;
-		const matchesArtist =
-			hints.artistNames?.some((name) => artistNames.includes(name)) ?? false;
-		return (matchesAlbum ? 2 : 0) + (matchesArtist ? 2 : 0);
-	};
-
-	const chosen = tracks
-		.slice()
-		.sort((a, b) => scoreTrack(b) - scoreTrack(a))[0];
-	if (!chosen) return null;
-	const { album: _album, artists: _artists, ...song } = chosen;
-	return song;
-}
-
 export function getTopTrackListener(
 	track: { memberScores?: { userId: string; score: number }[] },
 	members: PartyQuestionMember[],

api/src/party/social-question-generator.ts

@@ -1,4 +1,3 @@
-import type { db as Db } from "../db";
 import type { Question, QuizState } from "../party-types";
 import {
 	buildMemberOptions,
@@ -13,21 +12,18 @@ import {
 	type PartyAnalytics,
 	type PartyQuestionMember,
 	pickRandom,
-	resolveQuestionSong,
 } from "./question-utils";
 
-export async function buildSocialQuestion(
+export function buildSocialQuestion(
-	dbClient: typeof Db,
 	quizState: QuizState,
 	analytics: PartyAnalytics,
 	members: PartyQuestionMember[],
 	index: number,
-): Promise<Question | null> {
+): Question {
 	type ChoiceQuestion = Extract<Question, { type: "choice" }>;
 	const questions: Array<
 		Omit<ChoiceQuestion, "startTimestamp" | "endTimestamp">
 	> = [];
-	const topSong = await resolveQuestionSong(dbClient, analytics);
 
 	const hasMultipleMembers = members.length >= 2;
 	if (hasMultipleMembers && hasClearLeader(quizState)) {
@@ -38,7 +34,6 @@ export async function buildSocialQuestion(
 			options: buildMemberOptions(leader, members),
 			correct: 0,
 			points: 10,
-			song: topSong ?? undefined,
 		});
 	}
 
@@ -50,7 +45,6 @@ export async function buildSocialQuestion(
 			options: buildMemberOptions(diverse, members),
 			correct: 0,
 			points: 10,
-			song: topSong ?? undefined,
 		});
 
 		const aligned = getMostAlignedMember(analytics, members);
@@ -60,7 +54,6 @@ export async function buildSocialQuestion(
 			options: buildMemberOptions(aligned, members),
 			correct: 0,
 			points: 10,
-			song: topSong ?? undefined,
 		});
 	}
 
@@ -69,18 +62,12 @@ export async function buildSocialQuestion(
 	if (randomTrack && hasMultipleMembers) {
 		const topListener = getTopTrackListener(randomTrack, members);
 		if (topListener) {
-			const randomTrackSong = await resolveQuestionSong(dbClient, analytics, {
-				trackName: randomTrack.name,
-				artistNames: randomTrack.artists?.map((artist) => artist.name),
-				albumName: randomTrack.albumName,
-			});
 			questions.push({
 				type: "choice",
 				text: `Who listens the most to "${randomTrack.name}"?`,
 				options: buildMemberOptions(topListener, members),
 				correct: 0,
 				points: 10,
-				song: randomTrackSong ?? topSong ?? undefined,
 			});
 			questions.push({
 				type: "choice",
@@ -88,7 +75,6 @@ export async function buildSocialQuestion(
 				options: buildMemberOptions(topListener, members),
 				correct: 0,
 				points: 10,
-				song: randomTrackSong ?? topSong ?? undefined,
 			});
 		}
 	}
@@ -107,14 +93,13 @@ export async function buildSocialQuestion(
 					options: pairOptions,
 					correct: 0,
 					points: 10,
-					song: topSong ?? undefined,
 				});
 			}
 		}
 	}
 
 	if (questions.length === 0) {
-		return null;
+		throw new Error("Question not found");
 	}
 
 	const question = questions[index % questions.length];

api/src/routes/party-socket.ts

@@ -29,40 +29,6 @@ export const pubsub = {
 	},
 };
 
-async function subscribeWsToParty(
-	ws: {
-		subscribe: (topic: string) => void;
-		unsubscribe: (topic: string) => void;
-		send: (message: string) => void;
-	},
-	userId: string,
-) {
-	const membership = await getMemberRecord(db, userId);
-	if (!membership) return null;
-
-	const nextPartyId = membership.partyId;
-	const currentPartyId = socketPartyId.get(ws as object);
-	if (currentPartyId && currentPartyId !== nextPartyId) {
-		ws.unsubscribe(partyTopic(currentPartyId));
-	}
-
-	socketPartyId.set(ws as object, nextPartyId);
-	ws.subscribe(partyTopic(nextPartyId));
-
-	const snapshot = await getPartyStatus(nextPartyId);
-	if (snapshot) {
-		ws.send(
-			JSON.stringify({
-				type: "party_status",
-				party: snapshot.party,
-				members: snapshot.members,
-			} satisfies PartySocketEvent),
-		);
-	}
-
-	return nextPartyId;
-}
-
 export async function broadcastQuizState(
 	ws: { publish: (topic: string, message: string) => void },
 	partyId: string,
@@ -107,8 +73,8 @@ export const partySocketApp = new Elysia()
 
 					ws.subscribe(userTopic(user.id));
 
-					const subscribedPartyId = await subscribeWsToParty(ws, user.id);
+					const membership = await getMemberRecord(db, user.id);
-					if (!subscribedPartyId) {
+					if (!membership) {
 						ws.send(
 							JSON.stringify({
 								type: "party_status",
@@ -119,7 +85,21 @@ export const partySocketApp = new Elysia()
 						return;
 					}
 
-					await broadcastQuizState(ws, subscribedPartyId);
+					socketPartyId.set(ws, membership.partyId);
+					ws.subscribe(partyTopic(membership.partyId));
+
+					const snapshot = await getPartyStatus(membership.partyId);
+					if (snapshot) {
+						ws.send(
+							JSON.stringify({
+								type: "party_status",
+								party: snapshot.party,
+								members: snapshot.members,
+							} as PartySocketEvent),
+						);
+
+						await broadcastQuizState(ws, membership.partyId);
+					}
 				},
 				message: async (ws, message) => {
 					const data = ws.data;
@@ -141,16 +121,6 @@ export const partySocketApp = new Elysia()
 						return;
 					}
 
-					if (parsed.type === "subscribe_party") {
-						const payload = parsed as {
-							type: "subscribe_party";
-							partyId: string;
-						};
-						if (typeof payload.partyId !== "string") return;
-						await subscribeWsToParty(ws, user.id);
-						return;
-					}
-
 					if (parsed.type !== "member_payload") return;
 
 					const MAX_MEMBER_PAYLOAD_SIZE = 8_000;

api/src/routes/quiz.ts

@@ -3,8 +3,8 @@ import { eq } from "drizzle-orm";
 import Elysia, { t } from "elysia";
 import { betterAuthElysia } from "../auth";
 import { db } from "../db";
-import { party } from "../db/schema";
+import { party, partyMember } from "../db/schema";
-import { getMemberRecord, getPartyStatus } from "../party-data";
+import { getMemberRecord } from "../party-data";
 import type { QuizState } from "../party-types";
 import { QuizWorkflow, quizQueue } from "../workflows/quiz";
 import { pubsub } from "./party-socket";
@@ -49,17 +49,22 @@ export const quizRoutes = new Elysia()
 						})
 						.where(eq(party.id, params.partyId));
 
-					const status = await getPartyStatus(params.partyId);
+					const members = await db
-					if (status) {
+						.select({
+							id: partyMember.id,
+							userId: partyMember.userId,
+						})
+						.from(partyMember)
+						.where(eq(partyMember.partyId, params.partyId));
+
 					pubsub.publish(
 						`party:${params.partyId}`,
 						JSON.stringify({
 							type: "party_status",
-								party: status.party,
+							party: { status: "started" },
-								members: status.members,
+							members,
 						}),
 					);
-					}
 
 					return {
 						message: "Quiz started",

api/src/workflows/quiz.ts

@@ -155,17 +155,13 @@ export class QuizWorkflow extends ConfiguredInstance {
 			},
 		});
 		const analytics = (partyRecord?.analysisData ?? null) as PartyAnalytics;
-		const question = await generatePartyQuestion({
+		return generatePartyQuestion({
 			db,
 			partyId,
 			quizState,
 			analytics,
 			index,
 		});
-		if (!question) {
-			throw new Error("Failed to generate quiz question");
-		}
-		return question;
 	}
 
 	private static scoreRound(round: QuizRound): Array<[string, number]> {

esp32/src/main.rs

@@ -137,7 +137,7 @@ pub async fn main_loop() {
     println!("Main loop started");
     let mut last = (String::new(), String::new());
     loop {
-        embassy_time::Timer::after_millis(300).await;
+        embassy_time::Timer::after_millis(100).await;
         let mut state = STATE.lock().await;
         state.tick();
         let lines = state.render_lines();
@@ -198,7 +198,7 @@ async fn main(spawner: Spawner) -> ! {
                 p.GPIO26.degrade(),
                 GpioInputConfig::default().with_pull(Pull::Up),
             ),
-            0,
+            1,
         )
         .expect("spawn btn1"),
     );
@@ -208,7 +208,7 @@ async fn main(spawner: Spawner) -> ! {
                 p.GPIO25.degrade(),
                 GpioInputConfig::default().with_pull(Pull::Up),
             ),
-            1,
+            2,
         )
         .expect("spawn btn2"),
     );
@@ -218,7 +218,7 @@ async fn main(spawner: Spawner) -> ! {
                 p.GPIO33.degrade(),
                 GpioInputConfig::default().with_pull(Pull::Up),
             ),
-            2,
+            3,
         )
         .expect("spawn btn3"),
     );
@@ -228,7 +228,7 @@ async fn main(spawner: Spawner) -> ! {
                 p.GPIO32.degrade(),
                 GpioInputConfig::default().with_pull(Pull::Up),
             ),
-            3,
+            4,
         )
         .expect("spawn btn4"),
     );

web/src/hooks/use-party-socket.ts

@@ -1,8 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import type {
+import type { PartySocketEvent } from "../../../api/src/party-types";
-	PartySocketEvent,
-	PartySocketOutgoing,
-} from "../../../api/src/party-types";
 
 type Handler = (event: PartySocketEvent) => void;
 
@@ -27,12 +24,6 @@ export function usePartySocket({
 	const reconnectAttemptRef = useRef(0);
 	const handlerRef = useRef(onMessage);
 
-	const send = useCallback((message: PartySocketOutgoing) => {
-		const ws = wsRef.current;
-		if (!ws || ws.readyState !== WebSocket.OPEN) return;
-		ws.send(JSON.stringify(message));
-	}, []);
-
 	useEffect(() => {
 		handlerRef.current = onMessage;
 	}, [onMessage]);
@@ -51,6 +42,7 @@ export function usePartySocket({
 
 			ws.onmessage = (event) => {
 				const parsed = JSON.parse(event.data) as PartySocketEvent;
+				console.log(parsed);
 				handlerRef.current?.(parsed);
 			};
 
@@ -128,9 +120,8 @@ export function usePartySocket({
 			isConnected: connectionState === "connected",
 			isConnecting: connectionState === "connecting",
 			isReconnecting: connectionState === "reconnecting",
-			send,
 		}),
-		[connectionState, send],
+		[connectionState],
 	);
 
 	return state;

web/src/hooks/use-party.ts

@@ -6,7 +6,6 @@ import {
 	useContext,
 	useEffect,
 	useMemo,
-	useRef,
 	useState,
 } from "react";
 import type {
@@ -76,11 +75,6 @@ export function PartyProvider({ children }: { children: ReactNode }) {
 		if (!url) return null;
 		return url;
 	}, []);
-	const subscribedPartyIdRef = useRef<string | null>(null);
-	const wsState = usePartySocket({
-		apiUrl: userId ? apiUrl : null,
-		onMessage: userId ? handleMessage : null,
-	});
 
 	const resetParty = useCallback(() => {
 		setState(emptyPartyState);
@@ -90,21 +84,10 @@ export function PartyProvider({ children }: { children: ReactNode }) {
 		if (!userId) resetParty();
 	}, [resetParty, userId]);
 
-	useEffect(() => {
+	const wsState = usePartySocket({
-		if (wsState.connectionState !== "connected") {
+		apiUrl: userId ? apiUrl : null,
-			subscribedPartyIdRef.current = null;
+		onMessage: userId ? handleMessage : null,
-			return;
-		}
-
-		if (!userId || !state.party?.id) return;
-		if (subscribedPartyIdRef.current === state.party.id) return;
-
-		wsState.send({
-			type: "subscribe_party",
-			partyId: state.party.id,
 	});
-		subscribedPartyIdRef.current = state.party.id;
-	}, [state.party?.id, userId, wsState.connectionState, wsState.send]);
 
 	const value = useMemo(
 		() => ({