From c78924ea67f56576541a19af6b2c5d67f8b7d7f1 Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Thu, 14 Jul 2022 20:54:24 +1000
Subject: [PATCH] dumb typing stuff

---
 webrtc/package-lock.json             | Bin 35084 -> 35094 bytes
 webrtc/package.json                  |   6 +++---
 webrtc/src/opcodes/Identify.ts       |   2 +-
 webrtc/src/opcodes/SelectProtocol.ts |   2 +-
 webrtc/src/opcodes/index.ts          |   9 ++++++---
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/webrtc/package-lock.json b/webrtc/package-lock.json
index e6b10d69a1aae4278b9a6a5162cccbefadfba3ec..05a69e869901dad30a81b45759c29b0b12c8db6e 100644
GIT binary patch
delta 525
zcmeB~#58RZ(}V?lj_v_Iy2g42y7_rIl}eKpS!E{+@Uu-k{*T#I&tmck#%f0M%`Qw&
zxEakS3-X#yj^pD2vMx%>hk6AjCFNE`g+!%hq$C?<7FW4@7n|lg8~eHCWu+!on&*}{
zh8Lxjm>2q$IEHx}q#Ii1mO2(xIaZn^<yt0HR+(E?BpOBK`RhCRJ2@K#Sp+$o`jk&@
zFc6ts=_tEdfIq>S(RA_!Rs-JhVtrlx@?u?cJ&=n)Ru^R&dZrkLXXZIZn0giFS$d>q
zWx6L>Bp0OxW#$_Mrk7f1`<D0^n-%4RIGP3d6#J%xml!%$=^I))8U<!%nUw~6g!&d_
zxVj~Vcqf{KyK9H~dH78>lvmyC?)?ztKYIBzvr%&LJ4U|Aa{L0DwIVh2aQQflCO$5o
MY>*{7S*qg`0A$drJpcdz

delta 514
zcmbO>iK%B2(}V@gp25zO8&zc|Uod2!%%m$c*@lsG;+x0JCVFO*FELg#nr!xCdcr-q
zNlt%qBA@W&MJWnlDf;H&M#f%_5drxrfqqH;QGO9+IY!>vNrjGqMb5tEIT`wSrGdo(
z!GYOkZiNQ<1s?eUMWN*;#)%%qWx+|FnSlXC7XE2Q8QE@0c~yoHPHth9QGt^`Mhj2w
z7i62f%TRT*27iz>*a;IY^d|SVbAj1`9P(k2xfvcV{wBUvi7q})+P;>Rx%#;-j;2)x
zd5IAgS?0l>IUyEl7FF7w24N*t#X(7_*%hv(B_6@KspftG!A6Cy7QrRXk%4}pd1>J(
y5haQGk);-<j+5i1RW=8DKjfjOKPwxBC(F69O;+HS*lZH1p+`smZszY`X9NJkr>g1z

diff --git a/webrtc/package.json b/webrtc/package.json
index 7419ad0f..6ce121bd 100644
--- a/webrtc/package.json
+++ b/webrtc/package.json
@@ -14,7 +14,7 @@
 	"devDependencies": {
 		"@types/node": "^15.6.1",
 		"@types/sdp-transform": "^2.4.5",
-		"@types/ws": "^7.4.4",
+		"@types/ws": "^7.4.7",
 		"ts-node": "^10.4.0",
 		"typescript": "^4.3.2"
 	},
@@ -23,10 +23,10 @@
 		"dotenv": "^12.0.4",
 		"libsodium": "^0.7.10",
 		"libsodium-wrappers": "^0.7.10",
-		"mediasoup": "^3.9.5",
+		"mediasoup": "^3.9.5-1",
 		"node-turn": "^0.0.6",
 		"sdp-transform": "^2.14.1",
 		"tsconfig-paths": "^3.12.0",
-		"ws": "^7.4.6"
+		"ws": "^7.5.8"
 	}
 }
diff --git a/webrtc/src/opcodes/Identify.ts b/webrtc/src/opcodes/Identify.ts
index ef0386a7..210b5041 100644
--- a/webrtc/src/opcodes/Identify.ts
+++ b/webrtc/src/opcodes/Identify.ts
@@ -18,7 +18,7 @@ export interface IdentifyPayload extends Payload {
 	};
 }
 
-export async function onIdentify(this: Server, socket: WebSocket, data: IdentifyPayload) {
+export async function onIdentify(this: Server, socket: WebSocket, data: Payload) {
 
 	const session = await Session.findOneOrFail(
 		{ session_id: data.d.session_id, },
diff --git a/webrtc/src/opcodes/SelectProtocol.ts b/webrtc/src/opcodes/SelectProtocol.ts
index 72fb9c79..71772454 100644
--- a/webrtc/src/opcodes/SelectProtocol.ts
+++ b/webrtc/src/opcodes/SelectProtocol.ts
@@ -88,7 +88,7 @@ export interface SelectProtocolPayload extends Payload {
 }
 */
 
-export async function onSelectProtocol(this: Server, socket: WebSocket, data: SelectProtocolPayload) {
+export async function onSelectProtocol(this: Server, socket: WebSocket, data: Payload) {
 	if (data.d.sdp) {
 		const rtpCapabilities = this.mediasoupRouters[0].rtpCapabilities;
 		const codecs = rtpCapabilities.codecs as RtpCodecCapability[];
diff --git a/webrtc/src/opcodes/index.ts b/webrtc/src/opcodes/index.ts
index d0f40bc2..4d4dbc30 100644
--- a/webrtc/src/opcodes/index.ts
+++ b/webrtc/src/opcodes/index.ts
@@ -1,5 +1,6 @@
 import { WebSocket } from "@fosscord/gateway";
 import { VoiceOPCodes } from "@fosscord/util";
+import { Server } from "../Server";
 
 export interface Payload {
 	op: number;
@@ -17,9 +18,9 @@ import { onConnect } from "./Connect";
 
 import { onVersion } from "./Version";
 
-export type OPCodeHandler = (this: WebSocket, data: Payload) => any;
+export type OPCodeHandler = (this: Server, socket: WebSocket, data: Payload) => any;
 
-export default {
+const handlers: { [key: number]: OPCodeHandler } = {
 	[VoiceOPCodes.IDENTIFY]: onIdentify,				//op 0
 	[VoiceOPCodes.SELECT_PROTOCOL]: onSelectProtocol,	//op 1
 	//op 2 voice_ready
@@ -37,4 +38,6 @@ export default {
 	//op 15?
 	//op 16? empty data on client send but server sends {"voice":"0.8.24+bugfix.voice.streams.opt.branch-ffcefaff7","rtc_worker":"0.3.14-crypto-collision-copy"}
 	[VoiceOPCodes.VERSION]: onVersion,
-};
\ No newline at end of file
+};
+
+export default handlers;
\ No newline at end of file