From aa0357e06015a900aa6757ab9b0eef968eb02052 Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Sun, 16 Jan 2022 03:35:30 +1100
Subject: messing around with things I don't understand

---
 webrtc/src/opcodes/Connect.ts        | 3 ++-
 webrtc/src/opcodes/Heartbeat.ts      | 3 ++-
 webrtc/src/opcodes/Identify.ts       | 7 +++++--
 webrtc/src/opcodes/Resume.ts         | 3 ++-
 webrtc/src/opcodes/SelectProtocol.ts | 5 +++--
 webrtc/src/opcodes/Speaking.ts       | 3 ++-
 6 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'webrtc/src/opcodes')

diff --git a/webrtc/src/opcodes/Connect.ts b/webrtc/src/opcodes/Connect.ts
index 5cc66506..5db11638 100644
--- a/webrtc/src/opcodes/Connect.ts
+++ b/webrtc/src/opcodes/Connect.ts
@@ -1,5 +1,6 @@
 import { WebSocket } from "@fosscord/gateway";
 import { Payload } from "./index";
+import { Server } from "../Server"
 
-export async function onConnect(socket: WebSocket, data: Payload) {
+export async function onConnect(this: Server, socket: WebSocket, data: Payload) {
 }
\ No newline at end of file
diff --git a/webrtc/src/opcodes/Heartbeat.ts b/webrtc/src/opcodes/Heartbeat.ts
index 04150e36..06d6bcb1 100644
--- a/webrtc/src/opcodes/Heartbeat.ts
+++ b/webrtc/src/opcodes/Heartbeat.ts
@@ -1,7 +1,8 @@
 import { WebSocket } from "@fosscord/gateway";
 import { Payload } from "./index";
 import { setHeartbeat } from "./../util";
+import { Server } from "../Server"
 
-export async function onHeartbeat(socket: WebSocket, data: Payload) {
+export async function onHeartbeat(this: Server, socket: WebSocket, data: Payload) {
 	await setHeartbeat(socket);
 }
\ No newline at end of file
diff --git a/webrtc/src/opcodes/Identify.ts b/webrtc/src/opcodes/Identify.ts
index 2026d7c9..6043a460 100644
--- a/webrtc/src/opcodes/Identify.ts
+++ b/webrtc/src/opcodes/Identify.ts
@@ -1,14 +1,17 @@
 import { WebSocket } from "@fosscord/gateway";
 import { Payload } from "./index"
 import { VoiceOPCodes } from "@fosscord/util";
+import { Server } from "../Server"
 
-export async function onIdentify(socket: WebSocket, data: Payload) {
+export async function onIdentify(this: Server, socket: WebSocket, data: Payload) {
 	socket.send(JSON.stringify({
 		op: VoiceOPCodes.READY,
 		d: {
 			ssrc: 1,
 			ip: "127.0.0.1",
-			port: 3005,
+
+			//@ts-ignore
+			port: this.mediasoupTransports[0].iceCandidates.port,
 			modes: [
 				"xsalsa20_poly1305",
 				"xsalsa20_poly1305_suffix",
diff --git a/webrtc/src/opcodes/Resume.ts b/webrtc/src/opcodes/Resume.ts
index de21eba6..dcd4f4cd 100644
--- a/webrtc/src/opcodes/Resume.ts
+++ b/webrtc/src/opcodes/Resume.ts
@@ -1,5 +1,6 @@
 import { WebSocket } from "@fosscord/gateway";
 import { Payload } from "./index";
+import { Server } from "../Server"
 
-export async function onResume(socket: WebSocket, data: Payload) {
+export async function onResume(this: Server, socket: WebSocket, data: Payload) {
 }
\ No newline at end of file
diff --git a/webrtc/src/opcodes/SelectProtocol.ts b/webrtc/src/opcodes/SelectProtocol.ts
index f1732dd9..fcc45855 100644
--- a/webrtc/src/opcodes/SelectProtocol.ts
+++ b/webrtc/src/opcodes/SelectProtocol.ts
@@ -1,15 +1,16 @@
 import { WebSocket } from "@fosscord/gateway";
 import { Payload } from "./index";
 import { VoiceOPCodes } from "@fosscord/util";
+import { Server } from "../Server"
 
-export async function onSelectProtocol(socket: WebSocket, data: Payload) {
+export async function onSelectProtocol(this: Server, socket: WebSocket, data: Payload) {
 	socket.send(JSON.stringify({
 		op: VoiceOPCodes.SESSION_DESCRIPTION,
 		d: {
 			video_codec: "H264",
 			secret_key: new Array(32).fill(null).map(x => Math.random() * 256),
 			mode: "aead_aes256_gcm_rtpsize",
-			media_session_id: "d8eb5c84d987c6642ec4ce72ffa97f00",
+			media_session_id: this.mediasoupTransports[0].id,
 			audio_codec: "opus",
 		}
 	}));
diff --git a/webrtc/src/opcodes/Speaking.ts b/webrtc/src/opcodes/Speaking.ts
index 14f86b3c..861a7c3d 100644
--- a/webrtc/src/opcodes/Speaking.ts
+++ b/webrtc/src/opcodes/Speaking.ts
@@ -1,6 +1,7 @@
 import { WebSocket } from "@fosscord/gateway";
 import { Payload } from "./index"
 import { VoiceOPCodes } from "@fosscord/util";
+import { Server } from "../Server"
 
-export async function onSpeaking(socket: WebSocket, data: Payload) {
+export async function onSpeaking(this: Server, socket: WebSocket, data: Payload) {
 }
\ No newline at end of file
-- 
cgit 1.5.1