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

rebuilt files

Browse Source
This commit is contained in:
Amish Shah
2015-11-22 15:01:42 +00:00
parent cf33df18cf
commit 68b60c5464
27 changed files with 1023 additions and 1746 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
lib/Voice/AudioEncoder.js
View File

@@ -1,7 +1,5 @@
"use strict";
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
var cpoc = require("child_process");
var opus;
@@ -12,41 +10,26 @@ try {
}
var VoicePacket = require("./VoicePacket.js");
var AudioEncoder = (function () {
function AudioEncoder() {
_classCallCheck(this, AudioEncoder);
class AudioEncoder {
constructor() {
if (opus) {
this.opus = new opus.OpusEncoder(48000, 1);
}
this.choice = false;
}
AudioEncoder.prototype.opusBuffer = function opusBuffer(buffer) {
opusBuffer(buffer) {
return this.opus.encode(buffer, 1920);
};
}
AudioEncoder.prototype.getCommand = function getCommand(force) {
getCommand(force) {
if (this.choice && force) return choice;
var choices = ["avconv", "ffmpeg"];
for (var _iterator = choices, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
var _ref;
if (_isArray) {
if (_i >= _iterator.length) break;
_ref = _iterator[_i++];
} else {
_i = _iterator.next();
if (_i.done) break;
_ref = _i.value;
}
var choice = _ref;
for (var choice of choices) {
var p = cpoc.spawnSync(choice);
if (!p.error) {
this.choice = choice;
@@ -55,13 +38,11 @@ var AudioEncoder = (function () {
}
return "help";
};
AudioEncoder.prototype.encodeStream = function encodeStream(stream) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, buffer) {} : arguments[1];
}
encodeStream(stream, callback = function (err, buffer) {}) {
var self = this;
return new Promise(function (resolve, reject) {
return new Promise((resolve, reject) => {
var enc = cpoc.spawn(self.getCommand(), ["-f", "s16le", "-ar", "48000", "-ac", "1", // this can be 2 but there's no point, discord makes it mono on playback, wasted bandwidth.
"-af", "volume=1", "pipe:1", "-i", "-"]);
@@ -90,13 +71,11 @@ var AudioEncoder = (function () {
reject("close");
});
});
};
AudioEncoder.prototype.encodeFile = function encodeFile(file) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, buffer) {} : arguments[1];
}
encodeFile(file, callback = function (err, buffer) {}) {
var self = this;
return new Promise(function (resolve, reject) {
return new Promise((resolve, reject) => {
var enc = cpoc.spawn(self.getCommand(), ["-f", "s16le", "-ar", "48000", "-ac", "1", // this can be 2 but there's no point, discord makes it mono on playback, wasted bandwidth.
"-af", "volume=1", "pipe:1", "-i", file]);
@@ -121,9 +100,7 @@ var AudioEncoder = (function () {
reject("close");
});
});
};
return AudioEncoder;
})();
}
}
module.exports = AudioEncoder;

22
lib/Voice/StreamIntent.js
View File

@@ -1,22 +1,12 @@
"use strict";
"use strict"
// represents an intent of streaming music
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
;
var EventEmitter = require("events");
var StreamIntent = (function (_EventEmitter) {
_inherits(StreamIntent, _EventEmitter);
function StreamIntent() {
_classCallCheck(this, StreamIntent);
_EventEmitter.call(this);
class StreamIntent extends EventEmitter {
constructor() {
super();
}
return StreamIntent;
})(EventEmitter);
}
module.exports = StreamIntent;

107
lib/Voice/VoiceConnection.js
View File

@@ -1,4 +1,4 @@
"use strict";
"use strict"
/*
Major credit to izy521 who is the creator of
https://github.com/izy521/discord.io,
@@ -7,10 +7,7 @@
been possible!
*/
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
;
var WebSocket = require("ws");
var dns = require("dns");
var udp = require("dgram");
@@ -20,13 +17,9 @@ var VoicePacket = require("./VoicePacket.js");
var StreamIntent = require("./StreamIntent.js");
var EventEmitter = require("events");
var VoiceConnection = (function (_EventEmitter) {
_inherits(VoiceConnection, _EventEmitter);
function VoiceConnection(channel, client, session, token, server, endpoint) {
_classCallCheck(this, VoiceConnection);
_EventEmitter.call(this);
class VoiceConnection extends EventEmitter {
constructor(channel, client, session, token, server, endpoint) {
super();
this.id = channel.id;
this.voiceChannel = channel;
this.client = client;
@@ -47,7 +40,7 @@ var VoiceConnection = (function (_EventEmitter) {
this.init();
}
VoiceConnection.prototype.destroy = function destroy() {
destroy() {
this.stopPlaying();
if (this.KAI) clearInterval(this.KAI);
this.vWS.close();
@@ -61,18 +54,18 @@ var VoiceConnection = (function (_EventEmitter) {
self_deaf: false
}
});
};
}
VoiceConnection.prototype.stopPlaying = function stopPlaying() {
stopPlaying() {
this.playing = false;
this.playingIntent = null;
if (this.instream) {
this.instream.end();
this.instream.destroy();
}
};
}
VoiceConnection.prototype.playStream = function playStream(stream) {
playStream(stream) {
var self = this;
@@ -123,7 +116,7 @@ var VoiceConnection = (function (_EventEmitter) {
sequence + 10 < 65535 ? sequence += 1 : sequence = 0;
time + 9600 < 4294967295 ? time += 960 : time = 0;
self.sendBuffer(buffer, sequence, time, function (e) {});
self.sendBuffer(buffer, sequence, time, e => {});
var nextTime = startTime + count * length;
@@ -141,9 +134,9 @@ var VoiceConnection = (function (_EventEmitter) {
send();
return retStream;
};
}
VoiceConnection.prototype.setSpeaking = function setSpeaking(value) {
setSpeaking(value) {
this.playing = value;
if (this.vWS.readyState === WebSocket.OPEN) this.vWS.send(JSON.stringify({
op: 5,
@@ -152,11 +145,9 @@ var VoiceConnection = (function (_EventEmitter) {
delay: 0
}
}));
};
VoiceConnection.prototype.sendPacket = function sendPacket(packet) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
}
sendPacket(packet, callback = function (err) {}) {
var self = this;
self.playing = true;
try {
@@ -166,9 +157,9 @@ var VoiceConnection = (function (_EventEmitter) {
callback(e);
return false;
}
};
}
VoiceConnection.prototype.sendBuffer = function sendBuffer(rawbuffer, sequence, timestamp, callback) {
sendBuffer(rawbuffer, sequence, timestamp, callback) {
var self = this;
self.playing = true;
try {
@@ -186,68 +177,54 @@ var VoiceConnection = (function (_EventEmitter) {
self.emit("error", e);
return false;
}
};
}
VoiceConnection.prototype.test = function test() {
this.playFile("C:/users/amish/desktop/audio.mp3").then(function (stream) {
stream.on("time", function (time) {
test() {
this.playFile("C:/users/amish/desktop/audio.mp3").then(stream => {
stream.on("time", time => {
console.log("Time", time);
});
});
};
VoiceConnection.prototype.playFile = function playFile(stream) {
var _this = this;
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, str) {} : arguments[1];
}
playFile(stream, callback = function (err, str) {}) {
var self = this;
return new Promise(function (resolve, reject) {
_this.encoder.encodeFile(stream)["catch"](error).then(function (data) {
return new Promise((resolve, reject) => {
this.encoder.encodeFile(stream).catch(error).then(data => {
self.streamProc = data.proc;
var intent = self.playStream(data.stream);
resolve(intent);
callback(null, intent);
});
function error() {
var e = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0];
function error(e = true) {
reject(e);
callback(e);
}
});
};
VoiceConnection.prototype.playRawStream = function playRawStream(stream) {
var _this2 = this;
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, str) {} : arguments[1];
}
playRawStream(stream, callback = function (err, str) {}) {
var self = this;
return new Promise(function (resolve, reject) {
_this2.encoder.encodeStream(stream)["catch"](error).then(function (data) {
return new Promise((resolve, reject) => {
this.encoder.encodeStream(stream).catch(error).then(data => {
self.streamProc = data.proc;
self.instream = data.instream;
var intent = self.playStream(data.stream);
resolve(intent);
callback(null, intent);
});
function error() {
var e = arguments.length <= 0 || arguments[0] === undefined ? true : arguments[0];
function error(e = true) {
reject(e);
callback(e);
}
});
};
VoiceConnection.prototype.init = function init() {
var _this3 = this;
}
init() {
var self = this;
dns.lookup(this.endpoint, function (err, address, family) {
dns.lookup(this.endpoint, (err, address, family) => {
self.endpoint = address;
var vWS = self.vWS = new WebSocket("wss://" + _this3.endpoint, null, { rejectUnauthorized: false });
var vWS = self.vWS = new WebSocket("wss://" + this.endpoint, null, { rejectUnauthorized: false });
var udpClient = self.udp = udp.createSocket("udp4");
var firstPacket = true;
@@ -280,7 +257,7 @@ var VoiceConnection = (function (_EventEmitter) {
}
});
vWS.on("open", function () {
vWS.on("open", () => {
vWS.send(JSON.stringify({
op: 0,
d: {
@@ -294,13 +271,13 @@ var VoiceConnection = (function (_EventEmitter) {
var KAI;
vWS.on("message", function (msg) {
vWS.on("message", msg => {
var data = JSON.parse(msg);
switch (data.op) {
case 2:
self.vWSData = data.d;
KAI = setInterval(function () {
KAI = setInterval(() => {
if (vWS && vWS.readyState === WebSocket.OPEN) vWS.send(JSON.stringify({
op: 3,
d: null
@@ -310,7 +287,7 @@ var VoiceConnection = (function (_EventEmitter) {
var udpPacket = new Buffer(70);
udpPacket.writeUIntBE(data.d.ssrc, 0, 4);
udpClient.send(udpPacket, 0, udpPacket.length, data.d.port, self.endpoint, function (err) {
udpClient.send(udpPacket, 0, udpPacket.length, data.d.port, self.endpoint, err => {
if (err) self.emit("error", err);
});
break;
@@ -324,9 +301,7 @@ var VoiceConnection = (function (_EventEmitter) {
}
});
});
};
return VoiceConnection;
})(EventEmitter);
}
}
module.exports = VoiceConnection;

33
lib/Voice/VoicePacket.js
View File

@@ -1,26 +1,25 @@
"use strict";
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
class VoicePacket {
constructor(data, sequence, time, ssrc) {
var VoicePacket = function VoicePacket(data, sequence, time, ssrc) {
_classCallCheck(this, VoicePacket);
var audioBuffer = data,
returnBuffer = new Buffer(audioBuffer.length + 12);
var audioBuffer = data,
returnBuffer = new Buffer(audioBuffer.length + 12);
returnBuffer.fill(0);
returnBuffer[0] = 0x80;
returnBuffer[1] = 0x78;
returnBuffer.fill(0);
returnBuffer[0] = 0x80;
returnBuffer[1] = 0x78;
returnBuffer.writeUIntBE(sequence, 2, 2);
returnBuffer.writeUIntBE(time, 4, 4);
returnBuffer.writeUIntBE(ssrc, 8, 4);
returnBuffer.writeUIntBE(sequence, 2, 2);
returnBuffer.writeUIntBE(time, 4, 4);
returnBuffer.writeUIntBE(ssrc, 8, 4);
for (var i = 0; i < audioBuffer.length; i++) {
returnBuffer[i + 12] = audioBuffer[i];
}
for (var i = 0; i < audioBuffer.length; i++) {
returnBuffer[i + 12] = audioBuffer[i];
}
return returnBuffer;
};
return returnBuffer;
}
}
module.exports = VoicePacket;