mirror of
https://github.com/discordjs/discord.js.git
synced 2026-03-10 08:33:30 +01:00
Redesign voice receiving, still needs cleaning up
This commit is contained in:
@@ -3,7 +3,7 @@ const VoiceUDP = require('./VoiceUDPClient');
|
||||
const Util = require('../../util/Util');
|
||||
const { OPCodes, VoiceOPCodes, VoiceStatus } = require('../../util/Constants');
|
||||
const AudioPlayer = require('./player/AudioPlayer');
|
||||
const VoiceReceiver = require('./receiver/VoiceReceiver');
|
||||
const VoiceReceiver = require('./receiver/Receiver');
|
||||
const EventEmitter = require('events');
|
||||
const { Error } = require('../../errors');
|
||||
|
||||
|
||||
@@ -1,8 +1,18 @@
|
||||
const nonce = Buffer.alloc(24);
|
||||
const Readable = require('./VoiceReadable');
|
||||
const secretbox = require('../util/Secretbox');
|
||||
|
||||
class PacketHandler {
|
||||
constructor(receiver) {
|
||||
this.receiver = receiver;
|
||||
this.streams = new Map();
|
||||
}
|
||||
|
||||
makeStream(user) {
|
||||
if (this.streams.has(user)) return this.streams.get(user);
|
||||
const stream = new Readable();
|
||||
this.streams.set(user, stream);
|
||||
return stream;
|
||||
}
|
||||
|
||||
parseBuffer(buffer) {
|
||||
@@ -36,8 +46,11 @@ class PacketHandler {
|
||||
const ssrc = buffer.readUInt32BE(8);
|
||||
const user = this.userFromSSRC(ssrc);
|
||||
if (!user) return;
|
||||
const stream = this.streams.get(user.id);
|
||||
if (!stream) return;
|
||||
const opusPacket = this.parseBuffer(buffer);
|
||||
if (opusPacket instanceof Error) return;
|
||||
stream.push(opusPacket);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,15 +1,30 @@
|
||||
const EventEmitter = require('events');
|
||||
const prism = require('prism-media');
|
||||
const PacketHandler = require('./PacketHandler');
|
||||
|
||||
class VoiceReceiver extends EventEmitter {
|
||||
constructor(connection) {
|
||||
super();
|
||||
this.connection = connection;
|
||||
this.packets = new PacketHandler(this);
|
||||
this.packets = new PacketHandler(this);
|
||||
this.connection.sockets.udp.socket.on('message', buffer => this.packets.push(buffer));
|
||||
}
|
||||
|
||||
createStream(user, pcm=false) {
|
||||
user = this.connection.client.users.resolve(user);
|
||||
if (!user) throw new Error('VOICE_USER_MISSING');
|
||||
console.log('making stream for', user.tag);
|
||||
const stream = this.packets.makeStream(user.id);
|
||||
if (pcm) {
|
||||
const decoder = new prism.opus.Decoder({ channels: 2, rate: 48000, frameSize: 1920 });
|
||||
stream.pipe(decoder);
|
||||
return decoder;
|
||||
}
|
||||
return stream;
|
||||
}
|
||||
|
||||
stoppedSpeaking() {
|
||||
console.log('remember to remove this :)');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user