Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-17 12:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement voice encryption support

Browse Source
This commit is contained in:
qeled
2016-03-18 06:32:35 +03:00
parent 27a0361afc
commit 4d6cca72f4
5 changed files with 97 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/Voice/VoiceConnection.js
View File

@@ -51,6 +51,9 @@ var _unpipe = require("unpipe");
var _unpipe2 = _interopRequireDefault(_unpipe);
var MODE_xsalsa20_poly1305 = "xsalsa20_poly1305";
var MODE_plain = "plain";
var VoiceConnection = (function (_EventEmitter) {
_inherits(VoiceConnection, _EventEmitter);
@@ -77,6 +80,10 @@ var VoiceConnection = (function (_EventEmitter) {
this.KAI = null;
this.timestamp = 0;
this.sequence = 0;
this.mode = null;
this.secret = null;
this.volume = new _VolumeTransformer2["default"]();
this.init();
}
@@ -232,7 +239,7 @@ var VoiceConnection = (function (_EventEmitter) {
}
var buffer = self.encoder.opusBuffer(rawbuffer);
var packet = new _VoicePacket2["default"](buffer, sequence, timestamp, self.vWSData.ssrc);
var packet = new _VoicePacket2["default"](buffer, sequence, timestamp, self.vWSData.ssrc, self.secret);
return self.sendPacket(packet, callback);
} catch (e) {
self.playing = false;
@@ -361,6 +368,13 @@ var VoiceConnection = (function (_EventEmitter) {
}
discordPort = msg.readUIntLE(msg.length - 2, 2).toString(10);
var modes = self.vWSData.modes;
var mode = MODE_xsalsa20_poly1305;
if (modes.indexOf(MODE_xsalsa20_poly1305) < 0) {
mode = MODE_plain;
self.client.emit("debug", "Encrypted mode not reported as supported by the server, using 'plain'");
}
vWS.send(JSON.stringify({
"op": 1,
"d": {
@@ -368,7 +382,7 @@ var VoiceConnection = (function (_EventEmitter) {
"data": {
"address": discordIP,
"port": Number(discordPort),
"mode": self.vWSData.modes[0] //Plain
"mode": mode
}
}
}));
@@ -410,6 +424,13 @@ var VoiceConnection = (function (_EventEmitter) {
});
break;
case 4:
if (data.d.secret_key && data.d.secret_key.length > 0) {
var buffer = new ArrayBuffer(data.d.secret_key.length);
self.secret = new Uint8Array(buffer);
for (var i = 0; i < _this4.secret.length; i++) {
self.secret[i] = data.d.secret_key[i];
}
}
self.ready = true;
self.mode = data.d.mode;