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

Add voice receiving again \o/

Browse Source
This commit is contained in:
Amish Shah
2016-10-25 19:41:54 +01:00
parent b50bec8a44
commit f77af72d71
2 changed files with 49 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/client/voice/receiver/VoiceReceiver.js
View File

@@ -34,10 +34,10 @@ class VoiceReceiver extends EventEmitter {
* The VoiceConnection that instantiated this
* @type {VoiceConnection}
*/
this.connection = connection;
this.voiceConnection = connection;
this._listener = (msg => {
const ssrc = +msg.readUInt32BE(8).toString(10);
const user = this.connection.ssrcMap.get(ssrc);
const user = this.voiceConnection.ssrcMap.get(ssrc);
if (!user) {
if (!this.queues.has(ssrc)) this.queues.set(ssrc, []);
this.queues.get(ssrc).push(msg);
@@ -51,7 +51,7 @@ class VoiceReceiver extends EventEmitter {
this.handlePacket(msg, user);
}
}).bind(this);
this.connection.udp.udpSocket.on('message', this._listener);
this.voiceConnection.sockets.udp.socket.on('message', this._listener);
}
/**
@@ -61,7 +61,7 @@ class VoiceReceiver extends EventEmitter {
*/
recreate() {
if (!this.destroyed) return;
this.connection.udp.udpSocket.on('message', this._listener);
this.voiceConnection.sockets.udp.socket.on('message', this._listener);
this.destroyed = false;
return;
}
@@ -70,7 +70,7 @@ class VoiceReceiver extends EventEmitter {
* Destroy this VoiceReceiver, also ending any streams that it may be controlling.
*/
destroy() {
this.connection.udp.udpSocket.removeListener('message', this._listener);
this.voiceConnection.sockets.udp.socket.removeListener('message', this._listener);
for (const stream of this.pcmStreams) {
stream[1]._push(null);
this.pcmStreams.delete(stream[0]);
@@ -89,7 +89,7 @@ class VoiceReceiver extends EventEmitter {
* @returns {ReadableStream}
*/
createOpusStream(user) {
user = this.connection.manager.client.resolver.resolveUser(user);
user = this.voiceConnection.voiceManager.client.resolver.resolveUser(user);
if (!user) throw new Error('Couldn\'t resolve the user to create Opus stream.');
if (this.opusStreams.get(user.id)) throw new Error('There is already an existing stream for that user.');
const stream = new Readable();
@@ -104,7 +104,7 @@ class VoiceReceiver extends EventEmitter {
* @returns {ReadableStream}
*/
createPCMStream(user) {
user = this.connection.manager.client.resolver.resolveUser(user);
user = this.voiceConnection.voiceManager.client.resolver.resolveUser(user);
if (!user) throw new Error('Couldn\'t resolve the user to create PCM stream.');
if (this.pcmStreams.get(user.id)) throw new Error('There is already an existing stream for that user.');
const stream = new Readable();
@@ -114,7 +114,7 @@ class VoiceReceiver extends EventEmitter {
handlePacket(msg, user) {
msg.copy(nonce, 0, 0, 12);
let data = NaCl.secretbox.open(msg.slice(12), nonce, this.connection.data.secret);
let data = NaCl.secretbox.open(msg.slice(12), nonce, this.voiceConnection.authentication.secretKey.key);
if (!data) {
/**
* Emitted whenever a voice packet cannot be decrypted
@@ -141,7 +141,7 @@ class VoiceReceiver extends EventEmitter {
* @param {User} user The user that is sending the buffer (is speaking)
* @param {Buffer} buffer The decoded buffer
*/
const pcm = this.connection.player.opusEncoder.decode(data);
const pcm = this.voiceConnection.player.opusEncoder.decode(data);
if (this.pcmStreams.get(user.id)) this.pcmStreams.get(user.id)._push(pcm);
this.emit('pcm', user, pcm);
}