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

Update libsodium-wrappers peer dep and fix support for the newest version

Browse Source
This commit is contained in:
Amish Shah
2017-10-22 21:59:30 +01:00
parent 0004e19eca
commit 96ce1b0945
4 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -44,7 +44,7 @@
"node-opus": "^0.2.0", "node-opus": "^0.2.0",
"opusscript": "^0.0.3", "opusscript": "^0.0.3",
"sodium": "^2.0.0", "sodium": "^2.0.0",
"libsodium-wrappers": "^0.5.0", "libsodium-wrappers": "^0.7.0",
"uws": "^8.14.0" "uws": "^8.14.0"
}, },
"devDependencies": { "devDependencies": {

2
src/client/voice/dispatcher/StreamDispatcher.js
View File

@@ -163,7 +163,7 @@ class StreamDispatcher extends VolumeInterface {
packetBuffer.writeUIntBE(this.player.voiceConnection.authentication.ssrc, 8, 4); packetBuffer.writeUIntBE(this.player.voiceConnection.authentication.ssrc, 8, 4);
packetBuffer.copy(nonce, 0, 0, 12); packetBuffer.copy(nonce, 0, 0, 12);
buffer = secretbox.close(buffer, nonce, this.player.voiceConnection.authentication.secretKey.key); buffer = secretbox.methods.close(buffer, nonce, this.player.voiceConnection.authentication.secretKey.key);
for (let i = 0; i < buffer.length; i++) packetBuffer[i + 12] = buffer[i]; for (let i = 0; i < buffer.length; i++) packetBuffer[i + 12] = buffer[i];
return packetBuffer; return packetBuffer;

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

@@ -148,7 +148,7 @@ class VoiceReceiver extends EventEmitter {
handlePacket(msg, user) { handlePacket(msg, user) {
msg.copy(nonce, 0, 0, 12); msg.copy(nonce, 0, 0, 12);
let data = secretbox.open(msg.slice(12), nonce, this.voiceConnection.authentication.secretKey.key); let data = secretbox.methods.open(msg.slice(12), nonce, this.voiceConnection.authentication.secretKey.key);
if (!data) { if (!data) {
/** /**
* Emitted whenever a voice packet experiences a problem. * Emitted whenever a voice packet experiences a problem.

19
src/client/voice/util/Secretbox.js
View File

@@ -13,10 +13,15 @@ const libs = {
}), }),
}; };
for (const libName of Object.keys(libs)) { exports.methods = {};
try {
const lib = require(libName); (async() => {
module.exports = libs[libName](lib); for (const libName of Object.keys(libs)) {
break; try {
} catch (err) {} // eslint-disable-line no-empty const lib = require(libName);
} if (libName === 'libsodium-wrappers' && lib.ready) await lib.ready;
exports.methods = libs[libName](lib);
break;
} catch (err) {} // eslint-disable-line no-empty
}
})();