change

src/gateway/opcodes/StreamCreate.ts

@@ -5,6 +5,7 @@ import {
 	generateStreamKey,
 } from "@spacebar/gateway";
 import {
+	Channel,
 	Config,
 	emitEvent,
 	Region,
@@ -28,6 +29,16 @@ export async function onStreamCreate(this: WebSocket, data: Payload) {
 
 	// TODO: permissions check - if it's a guild, check if user is allowed to create stream in this guild
 
+	const channel = await Channel.findOne({
+		where: { id: body.channel_id },
+	});
+
+	if (
+		!channel ||
+		(body.type === "guild" && channel.guild_id != body.guild_id)
+	)
+		return this.close(4000, "invalid channel");
+
 	// TODO: actually apply preferred_region from the event payload
 	const regions = Config.get().regions;
 	const guildRegion = regions.available.filter(

src/gateway/opcodes/StreamWatch.ts

@@ -40,6 +40,13 @@ export async function onStreamWatch(this: WebSocket, data: Payload) {
 	if (type === "guild" && stream.channel.guild_id != guildId)
 		return this.close(4000, "Invalid stream key");
 
+	const regions = Config.get().regions;
+	const guildRegion = regions.available.find(
+		(r) => r.endpoint === stream.endpoint,
+	);
+
+	if (!guildRegion) return this.close(4000, "Unknown region");
+
 	const streamSession = StreamSession.create({
 		stream_id: stream.id,
 		user_id: this.user_id,
@@ -49,13 +56,6 @@ export async function onStreamWatch(this: WebSocket, data: Payload) {
 
 	await streamSession.save();
 
-	const regions = Config.get().regions;
-	const guildRegion = regions.available.find(
-		(r) => r.endpoint === stream.endpoint,
-	);
-
-	if (!guildRegion) return this.close(4000, "Unknown region");
-
 	const viewers = await StreamSession.find({
 		where: { stream_id: stream.id },
 	});

src/webrtc/opcodes/Speaking.ts

@@ -29,16 +29,17 @@ import {
 export async function onSpeaking(this: WebRtcWebSocket, data: VoicePayload) {
 	if (!this.webRtcClient) return;
 
-	mediaServer
+	Promise.all(
-		.getClientsForRtcServer<WebRtcWebSocket>(
+		Array.from(
-			this.webRtcClient.rtc_server_id,
+			mediaServer.getClientsForRtcServer<WebRtcWebSocket>(
-		)
+				this.webRtcClient.rtc_server_id,
-		.forEach((client) => {
+			),
-			if (client.user_id === this.user_id) return;
+		).map((client) => {
+			if (client.user_id === this.user_id) return Promise.resolve();
 
 			const ssrc = client.getOutgoingStreamSSRCsForUser(this.user_id);
 
-			Send(client.websocket, {
+			return Send(client.websocket, {
 				op: VoiceOPCodes.SPEAKING,
 				d: {
 					user_id: this.user_id,
@@ -46,5 +47,6 @@ export async function onSpeaking(this: WebRtcWebSocket, data: VoicePayload) {
 					ssrc: ssrc.audio_ssrc ?? 0,
 				},
 			});
-		});
+		}),
+	);
 }

src/webrtc/opcodes/Video.ts

@@ -15,7 +15,7 @@
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-import { validateSchema, VoiceVideoSchema } from "@spacebar/util";
+import { Stream, validateSchema, VoiceVideoSchema } from "@spacebar/util";
 import {
 	mediaServer,
 	VoiceOPCodes,
@@ -32,6 +32,15 @@ export async function onVideo(this: WebRtcWebSocket, payload: VoicePayload) {
 
 	const d = validateSchema("VoiceVideoSchema", payload.d) as VoiceVideoSchema;
 
+	if (this.type === "stream") {
+		const stream = await Stream.findOne({
+			where: { id: rtc_server_id },
+		});
+
+		// only the stream owner can publish to a go live stream
+		if (stream?.owner_id != this.user_id) return;
+	}
+
 	const stream = d.streams?.find((element) => element !== undefined);
 
 	await Send(this, { op: VoiceOPCodes.MEDIA_SINK_WANTS, d: { any: 100 } });
@@ -102,22 +111,24 @@ export async function onVideo(this: WebRtcWebSocket, payload: VoicePayload) {
 		}
 	}
 
-	for (const client of clientsThatNeedUpdate) {
+	await Promise.all(
-		const ssrcs = client.getOutgoingStreamSSRCsForUser(this.user_id);
+		Array.from(clientsThatNeedUpdate).map((client) => {
+			const ssrcs = client.getOutgoingStreamSSRCsForUser(this.user_id);
 
-		Send(client.websocket, {
+			return Send(client.websocket, {
-			op: VoiceOPCodes.VIDEO,
+				op: VoiceOPCodes.VIDEO,
-			d: {
+				d: {
-				user_id: this.user_id,
+					user_id: this.user_id,
-				audio_ssrc: ssrcs.audio_ssrc ?? 0,
+					audio_ssrc: ssrcs.audio_ssrc ?? 0,
-				video_ssrc: ssrcs.video_ssrc ?? 0,
+					video_ssrc: ssrcs.video_ssrc ?? 0,
-				rtx_ssrc: ssrcs.rtx_ssrc ?? 0,
-				streams: d.streams?.map((x) => ({
-					...x,
-					ssrc: ssrcs.video_ssrc ?? 0,
 					rtx_ssrc: ssrcs.rtx_ssrc ?? 0,
-				})),
+					streams: d.streams?.map((x) => ({
-			} as VoiceVideoSchema,
+						...x,
-		});
+						ssrc: ssrcs.video_ssrc ?? 0,
-	}
+						rtx_ssrc: ssrcs.rtx_ssrc ?? 0,
+					})),
+				} as VoiceVideoSchema,
+			});
+		}),
+	);
 }