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

refactor: make use of destructuring for Constants (#1942)

Browse Source
This commit is contained in:
SpaceEEC
2017-09-16 20:31:36 +02:00
committed by Crawl
parent 25ece1882b
commit ec4c98704f
66 changed files with 262 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/BaseClient.js
View File

@@ -1,7 +1,7 @@
const EventEmitter = require('events'); const EventEmitter = require('events');
const RESTManager = require('../rest/RESTManager'); const RESTManager = require('../rest/RESTManager');
const Util = require('../util/Util'); const Util = require('../util/Util');
const Constants = require('../util/Constants'); const { DefaultOptions } = require('../util/Constants');
/** /**
* The base class for all clients. * The base class for all clients.
@@ -15,7 +15,7 @@ class BaseClient extends EventEmitter {
* The options the client was instantiated with * The options the client was instantiated with
* @type {ClientOptions} * @type {ClientOptions}
*/ */
this.options = Util.mergeDefault(Constants.DefaultOptions, options); this.options = Util.mergeDefault(DefaultOptions, options);
/** /**
* The REST manager of the client * The REST manager of the client

6
src/client/Client.js
View File

@@ -17,7 +17,7 @@ const ChannelStore = require('../stores/ChannelStore');
const GuildStore = require('../stores/GuildStore'); const GuildStore = require('../stores/GuildStore');
const ClientPresenceStore = require('../stores/ClientPresenceStore'); const ClientPresenceStore = require('../stores/ClientPresenceStore');
const EmojiStore = require('../stores/EmojiStore'); const EmojiStore = require('../stores/EmojiStore');
const Constants = require('../util/Constants'); const { Events } = require('../util/Constants');
const DataResolver = require('../util/DataResolver'); const DataResolver = require('../util/DataResolver');
const { Error, TypeError, RangeError } = require('../errors'); const { Error, TypeError, RangeError } = require('../errors');
@@ -334,7 +334,7 @@ class Client extends BaseClient {
throw new TypeError('CLIENT_INVALID_OPTION', 'Lifetime', 'a number'); throw new TypeError('CLIENT_INVALID_OPTION', 'Lifetime', 'a number');
} }
if (lifetime <= 0) { if (lifetime <= 0) {
this.emit(Constants.Events.DEBUG, 'Didn\'t sweep messages - lifetime is unlimited'); this.emit(Events.DEBUG, 'Didn\'t sweep messages - lifetime is unlimited');
return -1; return -1;
} }
@@ -355,7 +355,7 @@ class Client extends BaseClient {
} }
} }
this.emit(Constants.Events.DEBUG, this.emit(Events.DEBUG,
`Swept ${messages} messages older than ${lifetime} seconds in ${channels} text-based channels`); `Swept ${messages} messages older than ${lifetime} seconds in ${channels} text-based channels`);
return messages; return messages;
} }

10
src/client/ClientManager.js
View File

@@ -1,4 +1,4 @@
const Constants = require('../util/Constants'); const { Events, Status } = require('../util/Constants');
const { Error } = require('../errors'); const { Error } = require('../errors');
/** /**
@@ -25,7 +25,7 @@ class ClientManager {
* @type {number} * @type {number}
*/ */
get status() { get status() {
return this.connection ? this.connection.status : Constants.Status.IDLE; return this.connection ? this.connection.status : Status.IDLE;
} }
/** /**
@@ -35,19 +35,19 @@ class ClientManager {
* @param {Function} reject Function to run when connection fails * @param {Function} reject Function to run when connection fails
*/ */
connectToWebSocket(token, resolve, reject) { connectToWebSocket(token, resolve, reject) {
this.client.emit(Constants.Events.DEBUG, `Authenticated using token ${token}`); this.client.emit(Events.DEBUG, `Authenticated using token ${token}`);
this.client.token = token; this.client.token = token;
const timeout = this.client.setTimeout(() => reject(new Error('TOKEN_INVALID')), 1000 * 300); const timeout = this.client.setTimeout(() => reject(new Error('TOKEN_INVALID')), 1000 * 300);
this.client.api.gateway.get().then(res => { this.client.api.gateway.get().then(res => {
const gateway = `${res.url}/`; const gateway = `${res.url}/`;
this.client.emit(Constants.Events.DEBUG, `Using gateway ${gateway}`); this.client.emit(Events.DEBUG, `Using gateway ${gateway}`);
this.client.ws.connect(gateway); this.client.ws.connect(gateway);
this.client.ws.connection.once('close', event => { this.client.ws.connection.once('close', event => {
if (event.code === 4004) reject(new Error('TOKEN_INVALID')); if (event.code === 4004) reject(new Error('TOKEN_INVALID'));
if (event.code === 4010) reject(new Error('SHARDING_INVALID')); if (event.code === 4010) reject(new Error('SHARDING_INVALID'));
if (event.code === 4011) reject(new Error('SHARDING_REQUIRED')); if (event.code === 4011) reject(new Error('SHARDING_REQUIRED'));
}); });
this.client.once(Constants.Events.READY, () => { this.client.once(Events.READY, () => {
resolve(token); resolve(token);
this.client.clearTimeout(timeout); this.client.clearTimeout(timeout);
}); });

4
src/client/actions/ChannelCreate.js
View File

@@ -1,5 +1,5 @@
const Action = require('./Action'); const Action = require('./Action');
const Constants = require('../../util/Constants'); const { Events } = require('../../util/Constants');
class ChannelCreateAction extends Action { class ChannelCreateAction extends Action {
handle(data) { handle(data) {
@@ -7,7 +7,7 @@ class ChannelCreateAction extends Action {
const existing = client.channels.has(data.id); const existing = client.channels.has(data.id);
const channel = client.channels.create(data); const channel = client.channels.create(data);
if (!existing && channel) { if (!existing && channel) {
client.emit(Constants.Events.CHANNEL_CREATE, channel); client.emit(Events.CHANNEL_CREATE, channel);
} }
return { channel }; return { channel };
} }

4
src/client/actions/ChannelDelete.js
View File

@@ -1,5 +1,5 @@
const Action = require('./Action'); const Action = require('./Action');
const Constants = require('../../util/Constants'); const { Events } = require('../../util/Constants');
class ChannelDeleteAction extends Action { class ChannelDeleteAction extends Action {
constructor(client) { constructor(client) {
@@ -13,7 +13,7 @@ class ChannelDeleteAction extends Action {
if (channel) { if (channel) {
client.channels.remove(channel.id); client.channels.remove(channel.id);
client.emit(Constants.Events.CHANNEL_DELETE, channel); client.emit(Events.CHANNEL_DELETE, channel);
} }
return { channel }; return { channel };

4
src/client/actions/GuildBanRemove.js
View File

@@ -1,12 +1,12 @@
const Action = require('./Action'); const Action = require('./Action');
const Constants = require('../../util/Constants'); const { Events } = require('../../util/Constants');
class GuildBanRemove extends Action { class GuildBanRemove extends Action {
handle(data) { handle(data) {
const client = this.client; const client = this.client;
const guild = client.guilds.get(data.guild_id); const guild = client.guilds.get(data.guild_id);
const user = client.users.create(data.user); const user = client.users.create(data.user);
if (guild && user) client.emit(Constants.Events.GUILD_BAN_REMOVE, guild, user); if (guild && user) client.emit(Events.GUILD_BAN_REMOVE, guild, user);
} }
} }

6
src/client/actions/GuildDelete.js
View File

@@ -1,5 +1,5 @@
const Action = require('./Action'); const Action = require('./Action');
const Constants = require('../../util/Constants'); const { Events } = require('../../util/Constants');
class GuildDeleteAction extends Action { class GuildDeleteAction extends Action {
constructor(client) { constructor(client) {
@@ -19,7 +19,7 @@ class GuildDeleteAction extends Action {
if (guild.available && data.unavailable) { if (guild.available && data.unavailable) {
// Guild is unavailable // Guild is unavailable
guild.available = false; guild.available = false;
client.emit(Constants.Events.GUILD_UNAVAILABLE, guild); client.emit(Events.GUILD_UNAVAILABLE, guild);
// Stops the GuildDelete packet thinking a guild was actually deleted, // Stops the GuildDelete packet thinking a guild was actually deleted,
// handles emitting of event itself // handles emitting of event itself
@@ -30,7 +30,7 @@ class GuildDeleteAction extends Action {
// Delete guild // Delete guild
client.guilds.remove(guild.id); client.guilds.remove(guild.id);
client.emit(Constants.Events.GUILD_DELETE, guild); client.emit(Events.GUILD_DELETE, guild);
this.deleted.set(guild.id, guild); this.deleted.set(guild.id, guild);
this.scheduleForDeletion(guild.id); this.scheduleForDeletion(guild.id);
} else { } else {

4
src/client/actions/GuildEmojiCreate.js
View File

@@ -1,10 +1,10 @@
const Action = require('./Action'); const Action = require('./Action');
const Constants = require('../../util/Constants'); const { Events } = require('../../util/Constants');
class GuildEmojiCreateAction extends Action { class GuildEmojiCreateAction extends Action {
handle(guild, createdEmoji) { handle(guild, createdEmoji) {
const emoji = guild.emojis.create(createdEmoji); const emoji = guild.emojis.create(createdEmoji);
this.client.emit(Constants.Events.GUILD_EMOJI_CREATE, emoji); this.client.emit(Events.GUILD_EMOJI_CREATE, emoji);
return { emoji }; return { emoji };
} }
} }

4
src/client/actions/GuildEmojiDelete.js
View File

@@ -1,10 +1,10 @@
const Action = require('./Action'); const Action = require('./Action');
const Constants = require('../../util/Constants'); const { Events } = require('../../util/Constants');
class GuildEmojiDeleteAction extends Action { class GuildEmojiDeleteAction extends Action {
handle(emoji) { handle(emoji) {
emoji.guild.emojis.remove(emoji.id); emoji.guild.emojis.remove(emoji.id);
this.client.emit(Constants.Events.GUILD_EMOJI_DELETE, emoji); this.client.emit(Events.GUILD_EMOJI_DELETE, emoji);
return { emoji }; return { emoji };
} }
} }

4
src/client/actions/GuildEmojiUpdate.js
View File

@@ -1,10 +1,10 @@
const Action = require('./Action'); const Action = require('./Action');
const Constants = require('../../util/Constants'); const { Events } = require('../../util/Constants');
class GuildEmojiUpdateAction extends Action { class GuildEmojiUpdateAction extends Action {
handle(current, data) { handle(current, data) {
const old = current._update(data); const old = current._update(data);
this.client.emit(Constants.Events.GUILD_EMOJI_UPDATE, old, current); this.client.emit(Events.GUILD_EMOJI_UPDATE, old, current);
return { emoji: current }; return { emoji: current };
} }
} }

4
src/client/actions/GuildMemberRemove.js
View File

@@ -1,5 +1,5 @@
const Action = require('./Action'); const Action = require('./Action');
const Constants = require('../../util/Constants'); const { Events, Status } = require('../../util/Constants');
class GuildMemberRemoveAction extends Action { class GuildMemberRemoveAction extends Action {
handle(data) { handle(data) {
@@ -11,7 +11,7 @@ class GuildMemberRemoveAction extends Action {
if (member) { if (member) {
guild.memberCount--; guild.memberCount--;
guild.members.remove(member.id); guild.members.remove(member.id);
if (client.status === Constants.Status.READY) client.emit(Constants.Events.GUILD_MEMBER_REMOVE, member); if (client.status === Status.READY) client.emit(Events.GUILD_MEMBER_REMOVE, member);
} }
} }
return { guild, member }; return { guild, member };

4
src/client/actions/GuildRoleCreate.js
View File

@@ -1,5 +1,5 @@
const Action = require('./Action'); const Action = require('./Action');
const Constants = require('../../util/Constants'); const { Events } = require('../../util/Constants');
class GuildRoleCreate extends Action { class GuildRoleCreate extends Action {
handle(data) { handle(data) {
@@ -9,7 +9,7 @@ class GuildRoleCreate extends Action {
if (guild) { if (guild) {
const already = guild.roles.has(data.role.id); const already = guild.roles.has(data.role.id);
role = guild.roles.create(data.role); role = guild.roles.create(data.role);
if (!already) client.emit(Constants.Events.GUILD_ROLE_CREATE, role); if (!already) client.emit(Events.GUILD_ROLE_CREATE, role);
} }
return { role }; return { role };
} }

4
src/client/actions/GuildRoleDelete.js
View File

@@ -1,5 +1,5 @@
const Action = require('./Action'); const Action = require('./Action');
const Constants = require('../../util/Constants'); const { Events } = require('../../util/Constants');
class GuildRoleDeleteAction extends Action { class GuildRoleDeleteAction extends Action {
handle(data) { handle(data) {
@@ -11,7 +11,7 @@ class GuildRoleDeleteAction extends Action {
role = guild.roles.get(data.role_id); role = guild.roles.get(data.role_id);
if (role) { if (role) {
guild.roles.remove(data.role_id); guild.roles.remove(data.role_id);
client.emit(Constants.Events.GUILD_ROLE_DELETE, role); client.emit(Events.GUILD_ROLE_DELETE, role);
} }
} }

4
src/client/actions/GuildRoleUpdate.js
View File

@@ -1,5 +1,5 @@
const Action = require('./Action'); const Action = require('./Action');
const Constants = require('../../util/Constants'); const { Events } = require('../../util/Constants');
class GuildRoleUpdateAction extends Action { class GuildRoleUpdateAction extends Action {
handle(data) { handle(data) {
@@ -12,7 +12,7 @@ class GuildRoleUpdateAction extends Action {
const role = guild.roles.get(data.role.id); const role = guild.roles.get(data.role.id);
if (role) { if (role) {
old = role._update(data.role); old = role._update(data.role);
client.emit(Constants.Events.GUILD_ROLE_UPDATE, old, role); client.emit(Events.GUILD_ROLE_UPDATE, old, role);
} }
return { return {

4
src/client/actions/GuildUpdate.js
View File

@@ -1,5 +1,5 @@
const Action = require('./Action'); const Action = require('./Action');
const Constants = require('../../util/Constants'); const { Events } = require('../../util/Constants');
class GuildUpdateAction extends Action { class GuildUpdateAction extends Action {
handle(data) { handle(data) {
@@ -8,7 +8,7 @@ class GuildUpdateAction extends Action {
const guild = client.guilds.get(data.id); const guild = client.guilds.get(data.id);
if (guild) { if (guild) {
const old = guild._update(data); const old = guild._update(data);
client.emit(Constants.Events.GUILD_UPDATE, old, guild); client.emit(Events.GUILD_UPDATE, old, guild);
return { return {
old, old,
updated: guild, updated: guild,

4
src/client/actions/MessageCreate.js
View File

@@ -1,5 +1,5 @@
const Action = require('./Action'); const Action = require('./Action');
const Constants = require('../../util/Constants'); const { Events } = require('../../util/Constants');
class MessageCreateAction extends Action { class MessageCreateAction extends Action {
handle(data) { handle(data) {
@@ -22,7 +22,7 @@ class MessageCreateAction extends Action {
member.lastMessage = message; member.lastMessage = message;
} }
client.emit(Constants.Events.MESSAGE_CREATE, message); client.emit(Events.MESSAGE_CREATE, message);
return { message }; return { message };
} }

4
src/client/actions/MessageDelete.js
View File

@@ -1,5 +1,5 @@
const Action = require('./Action'); const Action = require('./Action');
const Constants = require('../../util/Constants'); const { Events } = require('../../util/Constants');
class MessageDeleteAction extends Action { class MessageDeleteAction extends Action {
handle(data) { handle(data) {
@@ -11,7 +11,7 @@ class MessageDeleteAction extends Action {
message = channel.messages.get(data.id); message = channel.messages.get(data.id);
if (message) { if (message) {
channel.messages.delete(message.id); channel.messages.delete(message.id);
client.emit(Constants.Events.MESSAGE_DELETE, message); client.emit(Events.MESSAGE_DELETE, message);
} }
} }

4
src/client/actions/MessageDeleteBulk.js
View File

@@ -1,6 +1,6 @@
const Action = require('./Action'); const Action = require('./Action');
const Collection = require('../../util/Collection'); const Collection = require('../../util/Collection');
const Constants = require('../../util/Constants'); const { Events } = require('../../util/Constants');
class MessageDeleteBulkAction extends Action { class MessageDeleteBulkAction extends Action {
handle(data) { handle(data) {
@@ -15,7 +15,7 @@ class MessageDeleteBulkAction extends Action {
if (message) messages.set(message.id, message); if (message) messages.set(message.id, message);
} }
if (messages.size > 0) client.emit(Constants.Events.MESSAGE_BULK_DELETE, messages); if (messages.size > 0) client.emit(Events.MESSAGE_BULK_DELETE, messages);
return { messages }; return { messages };
} }
return {}; return {};

4
src/client/actions/MessageReactionRemove.js
View File

@@ -1,5 +1,5 @@
const Action = require('./Action'); const Action = require('./Action');
const Constants = require('../../util/Constants'); const { Events } = require('../../util/Constants');
/* /*
{ user_id: 'id', { user_id: 'id',
@@ -24,7 +24,7 @@ class MessageReactionRemove extends Action {
const reaction = message.reactions.get(emojiID); const reaction = message.reactions.get(emojiID);
if (!reaction) return false; if (!reaction) return false;
reaction._remove(user); reaction._remove(user);
this.client.emit(Constants.Events.MESSAGE_REACTION_REMOVE, reaction, user); this.client.emit(Events.MESSAGE_REACTION_REMOVE, reaction, user);
return { message, reaction, user }; return { message, reaction, user };
} }

4
src/client/actions/MessageReactionRemoveAll.js
View File

@@ -1,5 +1,5 @@
const Action = require('./Action'); const Action = require('./Action');
const Constants = require('../../util/Constants'); const { Events } = require('../../util/Constants');
class MessageReactionRemoveAll extends Action { class MessageReactionRemoveAll extends Action {
handle(data) { handle(data) {
@@ -10,7 +10,7 @@ class MessageReactionRemoveAll extends Action {
if (!message) return false; if (!message) return false;
message.reactions.clear(); message.reactions.clear();
this.client.emit(Constants.Events.MESSAGE_REACTION_REMOVE_ALL, message); this.client.emit(Events.MESSAGE_REACTION_REMOVE_ALL, message);
return { message }; return { message };
} }

4
src/client/actions/UserNoteUpdate.js
View File

@@ -1,5 +1,5 @@
const Action = require('./Action'); const Action = require('./Action');
const Constants = require('../../util/Constants'); const { Events } = require('../../util/Constants');
class UserNoteUpdateAction extends Action { class UserNoteUpdateAction extends Action {
handle(data) { handle(data) {
@@ -10,7 +10,7 @@ class UserNoteUpdateAction extends Action {
client.user.notes.set(data.id, note); client.user.notes.set(data.id, note);
client.emit(Constants.Events.USER_NOTE_UPDATE, data.id, oldNote, note); client.emit(Events.USER_NOTE_UPDATE, data.id, oldNote, note);
return { return {
old: oldNote, old: oldNote,

4
src/client/actions/UserUpdate.js
View File

@@ -1,5 +1,5 @@
const Action = require('./Action'); const Action = require('./Action');
const Constants = require('../../util/Constants'); const { Events } = require('../../util/Constants');
class UserUpdateAction extends Action { class UserUpdateAction extends Action {
handle(data) { handle(data) {
@@ -14,7 +14,7 @@ class UserUpdateAction extends Action {
} }
const oldUser = client.user._update(data); const oldUser = client.user._update(data);
client.emit(Constants.Events.USER_UPDATE, oldUser, client.user); client.emit(Events.USER_UPDATE, oldUser, client.user);
return { return {
old: oldUser, old: oldUser,
updated: client.user, updated: client.user,

4
src/client/voice/ClientVoiceManager.js
View File

@@ -1,5 +1,5 @@
const Collection = require('../../util/Collection'); const Collection = require('../../util/Collection');
const Constants = require('../../util/Constants'); const { VoiceStatus } = require('../../util/Constants');
const VoiceConnection = require('./VoiceConnection'); const VoiceConnection = require('./VoiceConnection');
const { Error } = require('../../errors'); const { Error } = require('../../errors');
@@ -33,7 +33,7 @@ class ClientVoiceManager {
onVoiceStateUpdate({ guild_id, session_id, channel_id }) { onVoiceStateUpdate({ guild_id, session_id, channel_id }) {
const connection = this.connections.get(guild_id); const connection = this.connections.get(guild_id);
if (!connection) return; if (!connection) return;
if (!channel_id && connection.status !== Constants.VoiceStatus.DISCONNECTED) { if (!channel_id && connection.status !== VoiceStatus.DISCONNECTED) {
connection._disconnect(); connection._disconnect();
return; return;
} }

30
src/client/voice/VoiceConnection.js
View File

@@ -1,7 +1,7 @@
const VoiceWebSocket = require('./VoiceWebSocket'); const VoiceWebSocket = require('./VoiceWebSocket');
const VoiceUDP = require('./VoiceUDPClient'); const VoiceUDP = require('./VoiceUDPClient');
const Util = require('../../util/Util'); const Util = require('../../util/Util');
const Constants = require('../../util/Constants'); const { OPCodes, VoiceOPCodes, VoiceStatus } = require('../../util/Constants');
const AudioPlayer = require('./player/AudioPlayer'); const AudioPlayer = require('./player/AudioPlayer');
const VoiceReceiver = require('./receiver/VoiceReceiver'); const VoiceReceiver = require('./receiver/VoiceReceiver');
const EventEmitter = require('events'); const EventEmitter = require('events');
@@ -56,7 +56,7 @@ class VoiceConnection extends EventEmitter {
* The current status of the voice connection * The current status of the voice connection
* @type {VoiceStatus} * @type {VoiceStatus}
*/ */
this.status = Constants.VoiceStatus.AUTHENTICATING; this.status = VoiceStatus.AUTHENTICATING;
/** /**
* Whether we're currently transmitting audio * Whether we're currently transmitting audio
@@ -134,10 +134,10 @@ class VoiceConnection extends EventEmitter {
*/ */
setSpeaking(value) { setSpeaking(value) {
if (this.speaking === value) return; if (this.speaking === value) return;
if (this.status !== Constants.VoiceStatus.CONNECTED) return; if (this.status !== VoiceStatus.CONNECTED) return;
this.speaking = value; this.speaking = value;
this.sockets.ws.sendPacket({ this.sockets.ws.sendPacket({
op: Constants.VoiceOPCodes.SPEAKING, op: VoiceOPCodes.SPEAKING,
d: { d: {
speaking: true, speaking: true,
delay: 0, delay: 0,
@@ -161,7 +161,7 @@ class VoiceConnection extends EventEmitter {
}, options); }, options);
this.client.ws.send({ this.client.ws.send({
op: Constants.OPCodes.VOICE_STATE_UPDATE, op: OPCodes.VOICE_STATE_UPDATE,
d: options, d: options,
}); });
} }
@@ -191,7 +191,7 @@ class VoiceConnection extends EventEmitter {
return; return;
} }
if (this.status === Constants.VoiceStatus.AUTHENTICATING) { if (this.status === VoiceStatus.AUTHENTICATING) {
this.authentication.token = token; this.authentication.token = token;
this.authentication.endpoint = endpoint; this.authentication.endpoint = endpoint;
this.checkAuthenticated(); this.checkAuthenticated();
@@ -211,7 +211,7 @@ class VoiceConnection extends EventEmitter {
return; return;
} }
if (this.status === Constants.VoiceStatus.AUTHENTICATING) { if (this.status === VoiceStatus.AUTHENTICATING) {
this.authentication.sessionID = sessionID; this.authentication.sessionID = sessionID;
this.checkAuthenticated(); this.checkAuthenticated();
} else if (sessionID !== this.authentication.sessionID) { } else if (sessionID !== this.authentication.sessionID) {
@@ -234,7 +234,7 @@ class VoiceConnection extends EventEmitter {
if (token && endpoint && sessionID) { if (token && endpoint && sessionID) {
clearTimeout(this.connectTimeout); clearTimeout(this.connectTimeout);
this.status = Constants.VoiceStatus.CONNECTING; this.status = VoiceStatus.CONNECTING;
/** /**
* Emitted when we successfully initiate a voice connection. * Emitted when we successfully initiate a voice connection.
* @event VoiceConnection#authenticated * @event VoiceConnection#authenticated
@@ -251,7 +251,7 @@ class VoiceConnection extends EventEmitter {
*/ */
authenticateFailed(reason) { authenticateFailed(reason) {
clearTimeout(this.connectTimeout); clearTimeout(this.connectTimeout);
if (this.status === Constants.VoiceStatus.AUTHENTICATING) { if (this.status === VoiceStatus.AUTHENTICATING) {
/** /**
* Emitted when we fail to initiate a voice connection. * Emitted when we fail to initiate a voice connection.
* @event VoiceConnection#failed * @event VoiceConnection#failed
@@ -261,7 +261,7 @@ class VoiceConnection extends EventEmitter {
} else { } else {
this.emit('error', new Error(reason)); this.emit('error', new Error(reason));
} }
this.status = Constants.VoiceStatus.DISCONNECTED; this.status = VoiceStatus.DISCONNECTED;
} }
/** /**
@@ -294,7 +294,7 @@ class VoiceConnection extends EventEmitter {
this.authentication.token = token; this.authentication.token = token;
this.authentication.endpoint = endpoint; this.authentication.endpoint = endpoint;
this.status = Constants.VoiceStatus.RECONNECTING; this.status = VoiceStatus.RECONNECTING;
/** /**
* Emitted when the voice connection is reconnecting (typically after a region change). * Emitted when the voice connection is reconnecting (typically after a region change).
* @event VoiceConnection#reconnecting * @event VoiceConnection#reconnecting
@@ -320,7 +320,7 @@ class VoiceConnection extends EventEmitter {
*/ */
_disconnect() { _disconnect() {
this.cleanup(); this.cleanup();
this.status = Constants.VoiceStatus.DISCONNECTED; this.status = VoiceStatus.DISCONNECTED;
/** /**
* Emitted when the voice connection disconnects. * Emitted when the voice connection disconnects.
* @event VoiceConnection#disconnect * @event VoiceConnection#disconnect
@@ -356,7 +356,7 @@ class VoiceConnection extends EventEmitter {
* @private * @private
*/ */
connect() { connect() {
if (this.status !== Constants.VoiceStatus.RECONNECTING) { if (this.status !== VoiceStatus.RECONNECTING) {
if (this.sockets.ws) throw new Error('WS_CONNECTION_EXISTS'); if (this.sockets.ws) throw new Error('WS_CONNECTION_EXISTS');
if (this.sockets.udp) throw new Error('UDP_CONNECTION_EXISTS'); if (this.sockets.udp) throw new Error('UDP_CONNECTION_EXISTS');
} }
@@ -407,7 +407,7 @@ class VoiceConnection extends EventEmitter {
this.authentication.encryptionMode = mode; this.authentication.encryptionMode = mode;
this.authentication.secretKey = secret; this.authentication.secretKey = secret;
this.status = Constants.VoiceStatus.CONNECTED; this.status = VoiceStatus.CONNECTED;
/** /**
* Emitted once the connection is ready, when a promise to join a voice channel resolves, * Emitted once the connection is ready, when a promise to join a voice channel resolves,
* the connection will already be ready. * the connection will already be ready.
@@ -436,7 +436,7 @@ class VoiceConnection extends EventEmitter {
* @param {User} user The user that has started/stopped speaking * @param {User} user The user that has started/stopped speaking
* @param {boolean} speaking Whether or not the user is speaking * @param {boolean} speaking Whether or not the user is speaking
*/ */
if (this.status === Constants.VoiceStatus.CONNECTED) this.emit('speaking', user, speaking); if (this.status === VoiceStatus.CONNECTED) this.emit('speaking', user, speaking);
guild._memberSpeakUpdate(user_id, speaking); guild._memberSpeakUpdate(user_id, speaking);
} }

4
src/client/voice/VoiceUDPClient.js
View File

@@ -1,6 +1,6 @@
const udp = require('dgram'); const udp = require('dgram');
const dns = require('dns'); const dns = require('dns');
const Constants = require('../../util/Constants'); const { VoiceOPCodes } = require('../../util/Constants');
const EventEmitter = require('events'); const EventEmitter = require('events');
const { Error } = require('../../errors'); const { Error } = require('../../errors');
@@ -113,7 +113,7 @@ class VoiceConnectionUDPClient extends EventEmitter {
this.localPort = packet.port; this.localPort = packet.port;
this.voiceConnection.sockets.ws.sendPacket({ this.voiceConnection.sockets.ws.sendPacket({
op: Constants.VoiceOPCodes.SELECT_PROTOCOL, op: VoiceOPCodes.SELECT_PROTOCOL,
d: { d: {
protocol: 'udp', protocol: 'udp',
data: { data: {

12
src/client/voice/VoiceWebSocket.js
View File

@@ -1,4 +1,4 @@
const Constants = require('../../util/Constants'); const { OPCodes, VoiceOPCodes } = require('../../util/Constants');
const SecretKey = require('./util/SecretKey'); const SecretKey = require('./util/SecretKey');
const EventEmitter = require('events'); const EventEmitter = require('events');
const { Error } = require('../../errors'); const { Error } = require('../../errors');
@@ -109,7 +109,7 @@ class VoiceWebSocket extends EventEmitter {
*/ */
onOpen() { onOpen() {
this.sendPacket({ this.sendPacket({
op: Constants.OPCodes.DISPATCH, op: OPCodes.DISPATCH,
d: { d: {
server_id: this.voiceConnection.channel.guild.id, server_id: this.voiceConnection.channel.guild.id,
user_id: this.client.user.id, user_id: this.client.user.id,
@@ -155,7 +155,7 @@ class VoiceWebSocket extends EventEmitter {
*/ */
onPacket(packet) { onPacket(packet) {
switch (packet.op) { switch (packet.op) {
case Constants.VoiceOPCodes.READY: case VoiceOPCodes.READY:
this.setHeartbeat(packet.d.heartbeat_interval); this.setHeartbeat(packet.d.heartbeat_interval);
/** /**
* Emitted once the voice WebSocket receives the ready packet. * Emitted once the voice WebSocket receives the ready packet.
@@ -164,7 +164,7 @@ class VoiceWebSocket extends EventEmitter {
*/ */
this.emit('ready', packet.d); this.emit('ready', packet.d);
break; break;
case Constants.VoiceOPCodes.SESSION_DESCRIPTION: case VoiceOPCodes.SESSION_DESCRIPTION:
/** /**
* Emitted once the Voice Websocket receives a description of this voice session. * Emitted once the Voice Websocket receives a description of this voice session.
* @param {string} encryptionMode The type of encryption being used * @param {string} encryptionMode The type of encryption being used
@@ -173,7 +173,7 @@ class VoiceWebSocket extends EventEmitter {
*/ */
this.emit('sessionDescription', packet.d.mode, new SecretKey(packet.d.secret_key)); this.emit('sessionDescription', packet.d.mode, new SecretKey(packet.d.secret_key));
break; break;
case Constants.VoiceOPCodes.SPEAKING: case VoiceOPCodes.SPEAKING:
/** /**
* Emitted whenever a speaking packet is received. * Emitted whenever a speaking packet is received.
* @param {Object} data * @param {Object} data
@@ -229,7 +229,7 @@ class VoiceWebSocket extends EventEmitter {
* Sends a heartbeat packet. * Sends a heartbeat packet.
*/ */
sendHeartbeat() { sendHeartbeat() {
this.sendPacket({ op: Constants.VoiceOPCodes.HEARTBEAT, d: null }).catch(() => { this.sendPacket({ op: VoiceOPCodes.HEARTBEAT, d: null }).catch(() => {
this.emit('warn', 'Tried to send heartbeat, but connection is not open'); this.emit('warn', 'Tried to send heartbeat, but connection is not open');
this.clearHeartbeat(); this.clearHeartbeat();
}); });

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

@@ -1,6 +1,6 @@
const VolumeInterface = require('../util/VolumeInterface'); const VolumeInterface = require('../util/VolumeInterface');
const VoiceBroadcast = require('../VoiceBroadcast'); const VoiceBroadcast = require('../VoiceBroadcast');
const Constants = require('../../../util/Constants'); const { VoiceStatus } = require('../../../util/Constants');
const secretbox = require('../util/Secretbox'); const secretbox = require('../util/Secretbox');
@@ -109,7 +109,7 @@ class StreamDispatcher extends VolumeInterface {
setSpeaking(value) { setSpeaking(value) {
if (this.speaking === value) return; if (this.speaking === value) return;
if (this.player.voiceConnection.status !== Constants.VoiceStatus.CONNECTED) return; if (this.player.voiceConnection.status !== VoiceStatus.CONNECTED) return;
this.speaking = value; this.speaking = value;
/** /**
* Emitted when the dispatcher starts/stops speaking. * Emitted when the dispatcher starts/stops speaking.

46
src/client/websocket/WebSocketConnection.js
View File

@@ -1,5 +1,5 @@
const EventEmitter = require('events'); const EventEmitter = require('events');
const Constants = require('../../util/Constants'); const { DefaultOptions, Events, OPCodes, Status, WSCodes } = require('../../util/Constants');
const PacketManager = require('./packets/WebSocketPacketManager'); const PacketManager = require('./packets/WebSocketPacketManager');
const WebSocket = require('../../WebSocket'); const WebSocket = require('../../WebSocket');
@@ -42,7 +42,7 @@ class WebSocketConnection extends EventEmitter {
* The current status of the client * The current status of the client
* @type {number} * @type {number}
*/ */
this.status = Constants.Status.IDLE; this.status = Status.IDLE;
/** /**
* The Packet Manager of the connection * The Packet Manager of the connection
@@ -93,7 +93,7 @@ class WebSocketConnection extends EventEmitter {
* @returns {void} * @returns {void}
*/ */
triggerReady() { triggerReady() {
if (this.status === Constants.Status.READY) { if (this.status === Status.READY) {
this.debug('Tried to mark self as ready, but already ready'); this.debug('Tried to mark self as ready, but already ready');
return; return;
} }
@@ -101,8 +101,8 @@ class WebSocketConnection extends EventEmitter {
* Emitted when the client becomes ready to start working. * Emitted when the client becomes ready to start working.
* @event Client#ready * @event Client#ready
*/ */
this.status = Constants.Status.READY; this.status = Status.READY;
this.client.emit(Constants.Events.READY); this.client.emit(Events.READY);
this.packetManager.handleQueue(); this.packetManager.handleQueue();
} }
@@ -111,13 +111,13 @@ class WebSocketConnection extends EventEmitter {
* @returns {void} * @returns {void}
*/ */
checkIfReady() { checkIfReady() {
if (this.status === Constants.Status.READY || this.status === Constants.Status.NEARLY) return false; if (this.status === Status.READY || this.status === Status.NEARLY) return false;
let unavailableGuilds = 0; let unavailableGuilds = 0;
for (const guild of this.client.guilds.values()) { for (const guild of this.client.guilds.values()) {
if (!guild.available) unavailableGuilds++; if (!guild.available) unavailableGuilds++;
} }
if (unavailableGuilds === 0) { if (unavailableGuilds === 0) {
this.status = Constants.Status.NEARLY; this.status = Status.NEARLY;
if (!this.client.options.fetchAllMembers) return this.triggerReady(); if (!this.client.options.fetchAllMembers) return this.triggerReady();
// Fetch all members before marking self as ready // Fetch all members before marking self as ready
const promises = this.client.guilds.map(g => g.members.fetch()); const promises = this.client.guilds.map(g => g.members.fetch());
@@ -208,12 +208,12 @@ class WebSocketConnection extends EventEmitter {
this.expectingClose = false; this.expectingClose = false;
this.gateway = gateway; this.gateway = gateway;
this.debug(`Connecting to ${gateway}`); this.debug(`Connecting to ${gateway}`);
const ws = this.ws = WebSocket.create(gateway, { v: Constants.DefaultOptions.ws.version }); const ws = this.ws = WebSocket.create(gateway, { v: DefaultOptions.ws.version });
ws.onmessage = this.onMessage.bind(this); ws.onmessage = this.onMessage.bind(this);
ws.onopen = this.onOpen.bind(this); ws.onopen = this.onOpen.bind(this);
ws.onerror = this.onError.bind(this); ws.onerror = this.onError.bind(this);
ws.onclose = this.onClose.bind(this); ws.onclose = this.onClose.bind(this);
this.status = Constants.Status.CONNECTING; this.status = Status.CONNECTING;
return true; return true;
} }
@@ -232,7 +232,7 @@ class WebSocketConnection extends EventEmitter {
ws.close(1000); ws.close(1000);
this.packetManager.handleQueue(); this.packetManager.handleQueue();
this.ws = null; this.ws = null;
this.status = Constants.Status.DISCONNECTED; this.status = Status.DISCONNECTED;
this.ratelimit.remaining = this.ratelimit.total; this.ratelimit.remaining = this.ratelimit.total;
return true; return true;
} }
@@ -273,18 +273,18 @@ class WebSocketConnection extends EventEmitter {
return false; return false;
} }
switch (packet.op) { switch (packet.op) {
case Constants.OPCodes.HELLO: case OPCodes.HELLO:
return this.heartbeat(packet.d.heartbeat_interval); return this.heartbeat(packet.d.heartbeat_interval);
case Constants.OPCodes.RECONNECT: case OPCodes.RECONNECT:
return this.reconnect(); return this.reconnect();
case Constants.OPCodes.INVALID_SESSION: case OPCodes.INVALID_SESSION:
if (!packet.d) this.sessionID = null; if (!packet.d) this.sessionID = null;
this.sequence = -1; this.sequence = -1;
this.debug('Session invalidated -- will identify with a new session'); this.debug('Session invalidated -- will identify with a new session');
return this.identify(packet.d ? 2500 : 0); return this.identify(packet.d ? 2500 : 0);
case Constants.OPCodes.HEARTBEAT_ACK: case OPCodes.HEARTBEAT_ACK:
return this.ackHeartbeat(); return this.ackHeartbeat();
case Constants.OPCodes.HEARTBEAT: case OPCodes.HEARTBEAT:
return this.heartbeat(); return this.heartbeat();
default: default:
return this.packetManager.handle(packet); return this.packetManager.handle(packet);
@@ -310,7 +310,7 @@ class WebSocketConnection extends EventEmitter {
* Emitted whenever the client tries to reconnect to the WebSocket. * Emitted whenever the client tries to reconnect to the WebSocket.
* @event Client#reconnecting * @event Client#reconnecting
*/ */
this.client.emit(Constants.Events.RECONNECTING); this.client.emit(Events.RECONNECTING);
this.connect(this.gateway, 5500, true); this.connect(this.gateway, 5500, true);
} }
@@ -328,7 +328,7 @@ class WebSocketConnection extends EventEmitter {
* @event Client#error * @event Client#error
* @param {Error} error The encountered error * @param {Error} error The encountered error
*/ */
this.client.emit(Constants.Events.ERROR, error); this.client.emit(Events.ERROR, error);
} }
/** /**
@@ -347,15 +347,15 @@ class WebSocketConnection extends EventEmitter {
this.emit('close', event); this.emit('close', event);
this.heartbeat(-1); this.heartbeat(-1);
// Should we reconnect? // Should we reconnect?
if (event.code === 1000 ? this.expectingClose : Constants.WSCodes[event.code]) { if (event.code === 1000 ? this.expectingClose : WSCodes[event.code]) {
this.expectingClose = false; this.expectingClose = false;
/** /**
* Emitted when the client's WebSocket disconnects and will no longer attempt to reconnect. * Emitted when the client's WebSocket disconnects and will no longer attempt to reconnect.
* @event Client#disconnect * @event Client#disconnect
* @param {CloseEvent} event The WebSocket close event * @param {CloseEvent} event The WebSocket close event
*/ */
this.client.emit(Constants.Events.DISCONNECT, event); this.client.emit(Events.DISCONNECT, event);
this.debug(Constants.WSCodes[event.code]); this.debug(WSCodes[event.code]);
this.destroy(); this.destroy();
return; return;
} }
@@ -392,7 +392,7 @@ class WebSocketConnection extends EventEmitter {
this.debug('Sending a heartbeat'); this.debug('Sending a heartbeat');
this.lastPingTimestamp = Date.now(); this.lastPingTimestamp = Date.now();
this.send({ this.send({
op: Constants.OPCodes.HEARTBEAT, op: OPCodes.HEARTBEAT,
d: this.sequence, d: this.sequence,
}); });
} }
@@ -426,7 +426,7 @@ class WebSocketConnection extends EventEmitter {
// Send the payload // Send the payload
this.debug('Identifying as a new session'); this.debug('Identifying as a new session');
this.send({ op: Constants.OPCodes.IDENTIFY, d }); this.send({ op: OPCodes.IDENTIFY, d });
} }
/** /**
@@ -447,7 +447,7 @@ class WebSocketConnection extends EventEmitter {
}; };
return this.send({ return this.send({
op: Constants.OPCodes.RESUME, op: OPCodes.RESUME,
d, d,
}); });
} }

8
src/client/websocket/WebSocketManager.js
View File

@@ -1,5 +1,5 @@
const EventEmitter = require('events'); const EventEmitter = require('events');
const Constants = require('../../util/Constants'); const { Events, Status } = require('../../util/Constants');
const WebSocketConnection = require('./WebSocketConnection'); const WebSocketConnection = require('./WebSocketConnection');
/** /**
@@ -37,7 +37,7 @@ class WebSocketManager extends EventEmitter {
* @returns {void} * @returns {void}
*/ */
debug(message) { debug(message) {
return this.client.emit(Constants.Events.DEBUG, `[ws] ${message}`); return this.client.emit(Events.DEBUG, `[ws] ${message}`);
} }
/** /**
@@ -76,8 +76,8 @@ class WebSocketManager extends EventEmitter {
return true; return true;
} }
switch (this.connection.status) { switch (this.connection.status) {
case Constants.Status.IDLE: case Status.IDLE:
case Constants.Status.DISCONNECTED: case Status.DISCONNECTED:
this.connection.connect(gateway, 5500); this.connection.connect(gateway, 5500);
return true; return true;
default: default:

100
src/client/websocket/packets/WebSocketPacketManager.js
View File

@@ -1,13 +1,13 @@
const Constants = require('../../../util/Constants'); const { OPCodes, Status, WSEvents } = require('../../../util/Constants');
const BeforeReadyWhitelist = [ const BeforeReadyWhitelist = [
Constants.WSEvents.READY, WSEvents.READY,
Constants.WSEvents.RESUMED, WSEvents.RESUMED,
Constants.WSEvents.GUILD_CREATE, WSEvents.GUILD_CREATE,
Constants.WSEvents.GUILD_DELETE, WSEvents.GUILD_DELETE,
Constants.WSEvents.GUILD_MEMBERS_CHUNK, WSEvents.GUILD_MEMBERS_CHUNK,
Constants.WSEvents.GUILD_MEMBER_ADD, WSEvents.GUILD_MEMBER_ADD,
Constants.WSEvents.GUILD_MEMBER_REMOVE, WSEvents.GUILD_MEMBER_REMOVE,
]; ];
class WebSocketPacketManager { class WebSocketPacketManager {
@@ -16,43 +16,43 @@ class WebSocketPacketManager {
this.handlers = {}; this.handlers = {};
this.queue = []; this.queue = [];
this.register(Constants.WSEvents.READY, require('./handlers/Ready')); this.register(WSEvents.READY, require('./handlers/Ready'));
this.register(Constants.WSEvents.RESUMED, require('./handlers/Resumed')); this.register(WSEvents.RESUMED, require('./handlers/Resumed'));
this.register(Constants.WSEvents.GUILD_CREATE, require('./handlers/GuildCreate')); this.register(WSEvents.GUILD_CREATE, require('./handlers/GuildCreate'));
this.register(Constants.WSEvents.GUILD_DELETE, require('./handlers/GuildDelete')); this.register(WSEvents.GUILD_DELETE, require('./handlers/GuildDelete'));
this.register(Constants.WSEvents.GUILD_UPDATE, require('./handlers/GuildUpdate')); this.register(WSEvents.GUILD_UPDATE, require('./handlers/GuildUpdate'));
this.register(Constants.WSEvents.GUILD_BAN_ADD, require('./handlers/GuildBanAdd')); this.register(WSEvents.GUILD_BAN_ADD, require('./handlers/GuildBanAdd'));
this.register(Constants.WSEvents.GUILD_BAN_REMOVE, require('./handlers/GuildBanRemove')); this.register(WSEvents.GUILD_BAN_REMOVE, require('./handlers/GuildBanRemove'));
this.register(Constants.WSEvents.GUILD_MEMBER_ADD, require('./handlers/GuildMemberAdd')); this.register(WSEvents.GUILD_MEMBER_ADD, require('./handlers/GuildMemberAdd'));
this.register(Constants.WSEvents.GUILD_MEMBER_REMOVE, require('./handlers/GuildMemberRemove')); this.register(WSEvents.GUILD_MEMBER_REMOVE, require('./handlers/GuildMemberRemove'));
this.register(Constants.WSEvents.GUILD_MEMBER_UPDATE, require('./handlers/GuildMemberUpdate')); this.register(WSEvents.GUILD_MEMBER_UPDATE, require('./handlers/GuildMemberUpdate'));
this.register(Constants.WSEvents.GUILD_ROLE_CREATE, require('./handlers/GuildRoleCreate')); this.register(WSEvents.GUILD_ROLE_CREATE, require('./handlers/GuildRoleCreate'));
this.register(Constants.WSEvents.GUILD_ROLE_DELETE, require('./handlers/GuildRoleDelete')); this.register(WSEvents.GUILD_ROLE_DELETE, require('./handlers/GuildRoleDelete'));
this.register(Constants.WSEvents.GUILD_ROLE_UPDATE, require('./handlers/GuildRoleUpdate')); this.register(WSEvents.GUILD_ROLE_UPDATE, require('./handlers/GuildRoleUpdate'));
this.register(Constants.WSEvents.GUILD_EMOJIS_UPDATE, require('./handlers/GuildEmojisUpdate')); this.register(WSEvents.GUILD_EMOJIS_UPDATE, require('./handlers/GuildEmojisUpdate'));
this.register(Constants.WSEvents.GUILD_MEMBERS_CHUNK, require('./handlers/GuildMembersChunk')); this.register(WSEvents.GUILD_MEMBERS_CHUNK, require('./handlers/GuildMembersChunk'));
this.register(Constants.WSEvents.CHANNEL_CREATE, require('./handlers/ChannelCreate')); this.register(WSEvents.CHANNEL_CREATE, require('./handlers/ChannelCreate'));
this.register(Constants.WSEvents.CHANNEL_DELETE, require('./handlers/ChannelDelete')); this.register(WSEvents.CHANNEL_DELETE, require('./handlers/ChannelDelete'));
this.register(Constants.WSEvents.CHANNEL_UPDATE, require('./handlers/ChannelUpdate')); this.register(WSEvents.CHANNEL_UPDATE, require('./handlers/ChannelUpdate'));
this.register(Constants.WSEvents.CHANNEL_PINS_UPDATE, require('./handlers/ChannelPinsUpdate')); this.register(WSEvents.CHANNEL_PINS_UPDATE, require('./handlers/ChannelPinsUpdate'));
this.register(Constants.WSEvents.PRESENCE_UPDATE, require('./handlers/PresenceUpdate')); this.register(WSEvents.PRESENCE_UPDATE, require('./handlers/PresenceUpdate'));
this.register(Constants.WSEvents.USER_UPDATE, require('./handlers/UserUpdate')); this.register(WSEvents.USER_UPDATE, require('./handlers/UserUpdate'));
this.register(Constants.WSEvents.USER_NOTE_UPDATE, require('./handlers/UserNoteUpdate')); this.register(WSEvents.USER_NOTE_UPDATE, require('./handlers/UserNoteUpdate'));
this.register(Constants.WSEvents.USER_SETTINGS_UPDATE, require('./handlers/UserSettingsUpdate')); this.register(WSEvents.USER_SETTINGS_UPDATE, require('./handlers/UserSettingsUpdate'));
this.register(Constants.WSEvents.USER_GUILD_SETTINGS_UPDATE, require('./handlers/UserGuildSettingsUpdate')); this.register(WSEvents.USER_GUILD_SETTINGS_UPDATE, require('./handlers/UserGuildSettingsUpdate'));
this.register(Constants.WSEvents.VOICE_STATE_UPDATE, require('./handlers/VoiceStateUpdate')); this.register(WSEvents.VOICE_STATE_UPDATE, require('./handlers/VoiceStateUpdate'));
this.register(Constants.WSEvents.TYPING_START, require('./handlers/TypingStart')); this.register(WSEvents.TYPING_START, require('./handlers/TypingStart'));
this.register(Constants.WSEvents.MESSAGE_CREATE, require('./handlers/MessageCreate')); this.register(WSEvents.MESSAGE_CREATE, require('./handlers/MessageCreate'));
this.register(Constants.WSEvents.MESSAGE_DELETE, require('./handlers/MessageDelete')); this.register(WSEvents.MESSAGE_DELETE, require('./handlers/MessageDelete'));
this.register(Constants.WSEvents.MESSAGE_UPDATE, require('./handlers/MessageUpdate')); this.register(WSEvents.MESSAGE_UPDATE, require('./handlers/MessageUpdate'));
this.register(Constants.WSEvents.MESSAGE_DELETE_BULK, require('./handlers/MessageDeleteBulk')); this.register(WSEvents.MESSAGE_DELETE_BULK, require('./handlers/MessageDeleteBulk'));
this.register(Constants.WSEvents.VOICE_SERVER_UPDATE, require('./handlers/VoiceServerUpdate')); this.register(WSEvents.VOICE_SERVER_UPDATE, require('./handlers/VoiceServerUpdate'));
this.register(Constants.WSEvents.GUILD_SYNC, require('./handlers/GuildSync')); this.register(WSEvents.GUILD_SYNC, require('./handlers/GuildSync'));
this.register(Constants.WSEvents.RELATIONSHIP_ADD, require('./handlers/RelationshipAdd')); this.register(WSEvents.RELATIONSHIP_ADD, require('./handlers/RelationshipAdd'));
this.register(Constants.WSEvents.RELATIONSHIP_REMOVE, require('./handlers/RelationshipRemove')); this.register(WSEvents.RELATIONSHIP_REMOVE, require('./handlers/RelationshipRemove'));
this.register(Constants.WSEvents.MESSAGE_REACTION_ADD, require('./handlers/MessageReactionAdd')); this.register(WSEvents.MESSAGE_REACTION_ADD, require('./handlers/MessageReactionAdd'));
this.register(Constants.WSEvents.MESSAGE_REACTION_REMOVE, require('./handlers/MessageReactionRemove')); this.register(WSEvents.MESSAGE_REACTION_REMOVE, require('./handlers/MessageReactionRemove'));
this.register(Constants.WSEvents.MESSAGE_REACTION_REMOVE_ALL, require('./handlers/MessageReactionRemoveAll')); this.register(WSEvents.MESSAGE_REACTION_REMOVE_ALL, require('./handlers/MessageReactionRemoveAll'));
} }
get client() { get client() {
@@ -71,19 +71,19 @@ class WebSocketPacketManager {
} }
handle(packet, queue = false) { handle(packet, queue = false) {
if (packet.op === Constants.OPCodes.HEARTBEAT_ACK) { if (packet.op === OPCodes.HEARTBEAT_ACK) {
this.ws.client._pong(this.ws.client._pingTimestamp); this.ws.client._pong(this.ws.client._pingTimestamp);
this.ws.lastHeartbeatAck = true; this.ws.lastHeartbeatAck = true;
this.ws.client.emit('debug', 'Heartbeat acknowledged'); this.ws.client.emit('debug', 'Heartbeat acknowledged');
} else if (packet.op === Constants.OPCodes.HEARTBEAT) { } else if (packet.op === OPCodes.HEARTBEAT) {
this.client.ws.send({ this.client.ws.send({
op: Constants.OPCodes.HEARTBEAT, op: OPCodes.HEARTBEAT,
d: this.client.ws.sequence, d: this.client.ws.sequence,
}); });
this.ws.client.emit('debug', 'Received gateway heartbeat'); this.ws.client.emit('debug', 'Received gateway heartbeat');
} }
if (this.ws.status === Constants.Status.RECONNECTING) { if (this.ws.status === Status.RECONNECTING) {
this.ws.reconnecting = false; this.ws.reconnecting = false;
this.ws.checkIfReady(); this.ws.checkIfReady();
} }
@@ -92,7 +92,7 @@ class WebSocketPacketManager {
if (this.ws.disabledEvents[packet.t] !== undefined) return false; if (this.ws.disabledEvents[packet.t] !== undefined) return false;
if (this.ws.status !== Constants.Status.READY) { if (this.ws.status !== Status.READY) {
if (BeforeReadyWhitelist.indexOf(packet.t) === -1) { if (BeforeReadyWhitelist.indexOf(packet.t) === -1) {
this.queue.push(packet); this.queue.push(packet);
return false; return false;

4
src/client/websocket/packets/handlers/ChannelPinsUpdate.js
View File

@@ -1,5 +1,5 @@
const AbstractHandler = require('./AbstractHandler'); const AbstractHandler = require('./AbstractHandler');
const Constants = require('../../../../util/Constants'); const { Events } = require('../../../../util/Constants');
/* /*
{ t: 'CHANNEL_PINS_UPDATE', { t: 'CHANNEL_PINS_UPDATE',
@@ -16,7 +16,7 @@ class ChannelPinsUpdate extends AbstractHandler {
const data = packet.d; const data = packet.d;
const channel = client.channels.get(data.channel_id); const channel = client.channels.get(data.channel_id);
const time = new Date(data.last_pin_timestamp); const time = new Date(data.last_pin_timestamp);
if (channel && time) client.emit(Constants.Events.CHANNEL_PINS_UPDATE, channel, time); if (channel && time) client.emit(Events.CHANNEL_PINS_UPDATE, channel, time);
} }
} }

4
src/client/websocket/packets/handlers/ChannelUpdate.js
View File

@@ -1,11 +1,11 @@
const AbstractHandler = require('./AbstractHandler'); const AbstractHandler = require('./AbstractHandler');
const Constants = require('../../../../util/Constants'); const { Events } = require('../../../../util/Constants');
class ChannelUpdateHandler extends AbstractHandler { class ChannelUpdateHandler extends AbstractHandler {
handle(packet) { handle(packet) {
const { old, updated } = this.packetManager.client.actions.ChannelUpdate.handle(packet.d); const { old, updated } = this.packetManager.client.actions.ChannelUpdate.handle(packet.d);
if (old && updated) { if (old && updated) {
this.packetManager.client.emit(Constants.Events.CHANNEL_UPDATE, old, updated); this.packetManager.client.emit(Events.CHANNEL_UPDATE, old, updated);
} }
} }
} }

4
src/client/websocket/packets/handlers/GuildBanAdd.js
View File

@@ -1,7 +1,7 @@
// ##untested handler## // ##untested handler##
const AbstractHandler = require('./AbstractHandler'); const AbstractHandler = require('./AbstractHandler');
const Constants = require('../../../../util/Constants'); const { Events } = require('../../../../util/Constants');
class GuildBanAddHandler extends AbstractHandler { class GuildBanAddHandler extends AbstractHandler {
handle(packet) { handle(packet) {
@@ -9,7 +9,7 @@ class GuildBanAddHandler extends AbstractHandler {
const data = packet.d; const data = packet.d;
const guild = client.guilds.get(data.guild_id); const guild = client.guilds.get(data.guild_id);
const user = client.users.get(data.user.id); const user = client.users.get(data.user.id);
if (guild && user) client.emit(Constants.Events.GUILD_BAN_ADD, guild, user); if (guild && user) client.emit(Events.GUILD_BAN_ADD, guild, user);
} }
} }

6
src/client/websocket/packets/handlers/GuildCreate.js
View File

@@ -1,5 +1,5 @@
const AbstractHandler = require('./AbstractHandler'); const AbstractHandler = require('./AbstractHandler');
const Constants = require('../../../../util/Constants'); const { Events, Status } = require('../../../../util/Constants');
class GuildCreateHandler extends AbstractHandler { class GuildCreateHandler extends AbstractHandler {
async handle(packet) { async handle(packet) {
@@ -16,7 +16,7 @@ class GuildCreateHandler extends AbstractHandler {
} else { } else {
// A new guild // A new guild
guild = client.guilds.create(data); guild = client.guilds.create(data);
const emitEvent = client.ws.connection.status === Constants.Status.READY; const emitEvent = client.ws.connection.status === Status.READY;
if (emitEvent) { if (emitEvent) {
/** /**
* Emitted whenever the client joins a guild. * Emitted whenever the client joins a guild.
@@ -24,7 +24,7 @@ class GuildCreateHandler extends AbstractHandler {
* @param {Guild} guild The created guild * @param {Guild} guild The created guild
*/ */
if (client.options.fetchAllMembers) await guild.members.fetch(); if (client.options.fetchAllMembers) await guild.members.fetch();
client.emit(Constants.Events.GUILD_CREATE, guild); client.emit(Events.GUILD_CREATE, guild);
} }
} }
} }

6
src/client/websocket/packets/handlers/GuildMemberAdd.js
View File

@@ -1,7 +1,7 @@
// ##untested handler## // ##untested handler##
const AbstractHandler = require('./AbstractHandler'); const AbstractHandler = require('./AbstractHandler');
const Constants = require('../../../../util/Constants'); const { Events, Status } = require('../../../../util/Constants');
class GuildMemberAddHandler extends AbstractHandler { class GuildMemberAddHandler extends AbstractHandler {
handle(packet) { handle(packet) {
@@ -11,8 +11,8 @@ class GuildMemberAddHandler extends AbstractHandler {
if (guild) { if (guild) {
guild.memberCount++; guild.memberCount++;
const member = guild.members.create(data); const member = guild.members.create(data);
if (client.ws.connection.status === Constants.Status.READY) { if (client.ws.connection.status === Status.READY) {
client.emit(Constants.Events.GUILD_MEMBER_ADD, member); client.emit(Events.GUILD_MEMBER_ADD, member);
} }
} }
} }

6
src/client/websocket/packets/handlers/GuildMemberUpdate.js
View File

@@ -1,7 +1,7 @@
// ##untested handler## // ##untested handler##
const AbstractHandler = require('./AbstractHandler'); const AbstractHandler = require('./AbstractHandler');
const Constants = require('../../../../util/Constants'); const { Events, Status } = require('../../../../util/Constants');
class GuildMemberUpdateHandler extends AbstractHandler { class GuildMemberUpdateHandler extends AbstractHandler {
handle(packet) { handle(packet) {
@@ -12,14 +12,14 @@ class GuildMemberUpdateHandler extends AbstractHandler {
const member = guild.members.get(data.user.id); const member = guild.members.get(data.user.id);
if (member) { if (member) {
const old = member._update(data); const old = member._update(data);
if (client.ws.connection.status === Constants.Status.READY) { if (client.ws.connection.status === Status.READY) {
/** /**
* Emitted whenever a guild member changes - i.e. new role, removed role, nickname. * Emitted whenever a guild member changes - i.e. new role, removed role, nickname.
* @event Client#guildMemberUpdate * @event Client#guildMemberUpdate
* @param {GuildMember} oldMember The member before the update * @param {GuildMember} oldMember The member before the update
* @param {GuildMember} newMember The member after the update * @param {GuildMember} newMember The member after the update
*/ */
client.emit(Constants.Events.GUILD_MEMBER_UPDATE, old, member); client.emit(Events.GUILD_MEMBER_UPDATE, old, member);
} }
} }
} }

4
src/client/websocket/packets/handlers/GuildMembersChunk.js
View File

@@ -1,5 +1,5 @@
const AbstractHandler = require('./AbstractHandler'); const AbstractHandler = require('./AbstractHandler');
const Constants = require('../../../../util/Constants'); const { Events } = require('../../../../util/Constants');
const Collection = require('../../../../util/Collection'); const Collection = require('../../../../util/Collection');
class GuildMembersChunkHandler extends AbstractHandler { class GuildMembersChunkHandler extends AbstractHandler {
@@ -12,7 +12,7 @@ class GuildMembersChunkHandler extends AbstractHandler {
for (const member of data.members) members.set(member.user.id, guild.members.create(member)); for (const member of data.members) members.set(member.user.id, guild.members.create(member));
client.emit(Constants.Events.GUILD_MEMBERS_CHUNK, members, guild); client.emit(Events.GUILD_MEMBERS_CHUNK, members, guild);
client.ws.lastHeartbeatAck = true; client.ws.lastHeartbeatAck = true;
} }

4
src/client/websocket/packets/handlers/MessageReactionAdd.js
View File

@@ -1,12 +1,12 @@
const AbstractHandler = require('./AbstractHandler'); const AbstractHandler = require('./AbstractHandler');
const Constants = require('../../../../util/Constants'); const { Events } = require('../../../../util/Constants');
class MessageReactionAddHandler extends AbstractHandler { class MessageReactionAddHandler extends AbstractHandler {
handle(packet) { handle(packet) {
const client = this.packetManager.client; const client = this.packetManager.client;
const data = packet.d; const data = packet.d;
const { user, reaction } = client.actions.MessageReactionAdd.handle(data); const { user, reaction } = client.actions.MessageReactionAdd.handle(data);
if (reaction) client.emit(Constants.Events.MESSAGE_REACTION_ADD, reaction, user); if (reaction) client.emit(Events.MESSAGE_REACTION_ADD, reaction, user);
} }
} }

4
src/client/websocket/packets/handlers/MessageUpdate.js
View File

@@ -1,11 +1,11 @@
const AbstractHandler = require('./AbstractHandler'); const AbstractHandler = require('./AbstractHandler');
const Constants = require('../../../../util/Constants'); const { Events } = require('../../../../util/Constants');
class MessageUpdateHandler extends AbstractHandler { class MessageUpdateHandler extends AbstractHandler {
handle(packet) { handle(packet) {
const { old, updated } = this.packetManager.client.actions.MessageUpdate.handle(packet.d); const { old, updated } = this.packetManager.client.actions.MessageUpdate.handle(packet.d);
if (old && updated) { if (old && updated) {
this.packetManager.client.emit(Constants.Events.MESSAGE_UPDATE, old, updated); this.packetManager.client.emit(Events.MESSAGE_UPDATE, old, updated);
} }
} }
} }

10
src/client/websocket/packets/handlers/PresenceUpdate.js
View File

@@ -1,5 +1,5 @@
const AbstractHandler = require('./AbstractHandler'); const AbstractHandler = require('./AbstractHandler');
const Constants = require('../../../../util/Constants'); const { Events } = require('../../../../util/Constants');
class PresenceUpdateHandler extends AbstractHandler { class PresenceUpdateHandler extends AbstractHandler {
handle(packet) { handle(packet) {
@@ -19,7 +19,7 @@ class PresenceUpdateHandler extends AbstractHandler {
const oldUser = user._update(data.user); const oldUser = user._update(data.user);
if (!user.equals(oldUser)) { if (!user.equals(oldUser)) {
client.emit(Constants.Events.USER_UPDATE, oldUser, user); client.emit(Events.USER_UPDATE, oldUser, user);
} }
if (guild) { if (guild) {
@@ -31,10 +31,10 @@ class PresenceUpdateHandler extends AbstractHandler {
deaf: false, deaf: false,
mute: false, mute: false,
}); });
client.emit(Constants.Events.GUILD_MEMBER_AVAILABLE, member); client.emit(Events.GUILD_MEMBER_AVAILABLE, member);
} }
if (member) { if (member) {
if (client.listenerCount(Constants.Events.PRESENCE_UPDATE) === 0) { if (client.listenerCount(Events.PRESENCE_UPDATE) === 0) {
guild.presences.create(data); guild.presences.create(data);
return; return;
} }
@@ -43,7 +43,7 @@ class PresenceUpdateHandler extends AbstractHandler {
oldMember.frozenPresence = member.presence._clone(); oldMember.frozenPresence = member.presence._clone();
} }
guild.presences.create(data); guild.presences.create(data);
client.emit(Constants.Events.PRESENCE_UPDATE, oldMember, member); client.emit(Events.PRESENCE_UPDATE, oldMember, member);
} else { } else {
guild.presences.create(data); guild.presences.create(data);
} }

4
src/client/websocket/packets/handlers/Ready.js
View File

@@ -1,5 +1,5 @@
const AbstractHandler = require('./AbstractHandler'); const AbstractHandler = require('./AbstractHandler');
const Constants = require('../../../../util/Constants'); const { Events } = require('../../../../util/Constants');
const ClientUser = require('../../../../structures/ClientUser'); const ClientUser = require('../../../../structures/ClientUser');
class ReadyHandler extends AbstractHandler { class ReadyHandler extends AbstractHandler {
@@ -69,7 +69,7 @@ class ReadyHandler extends AbstractHandler {
ws.sessionID = data.session_id; ws.sessionID = data.session_id;
ws._trace = data._trace; ws._trace = data._trace;
client.emit(Constants.Events.DEBUG, `READY ${ws._trace.join(' -> ')} ${ws.sessionID}`); client.emit(Events.DEBUG, `READY ${ws._trace.join(' -> ')} ${ws.sessionID}`);
ws.checkIfReady(); ws.checkIfReady();
} }
} }

6
src/client/websocket/packets/handlers/Resumed.js
View File

@@ -1,5 +1,5 @@
const AbstractHandler = require('./AbstractHandler'); const AbstractHandler = require('./AbstractHandler');
const Constants = require('../../../../util/Constants'); const { Events, Status } = require('../../../../util/Constants');
class ResumedHandler extends AbstractHandler { class ResumedHandler extends AbstractHandler {
handle(packet) { handle(packet) {
@@ -8,13 +8,13 @@ class ResumedHandler extends AbstractHandler {
ws._trace = packet.d._trace; ws._trace = packet.d._trace;
ws.status = Constants.Status.READY; ws.status = Status.READY;
this.packetManager.handleQueue(); this.packetManager.handleQueue();
const replayed = ws.sequence - ws.closeSequence; const replayed = ws.sequence - ws.closeSequence;
ws.debug(`RESUMED ${ws._trace.join(' -> ')} | replayed ${replayed} events.`); ws.debug(`RESUMED ${ws._trace.join(' -> ')} | replayed ${replayed} events.`);
client.emit(Constants.Events.RESUMED, replayed); client.emit(Events.RESUMED, replayed);
ws.heartbeat(); ws.heartbeat();
} }
} }

8
src/client/websocket/packets/handlers/TypingStart.js
View File

@@ -1,5 +1,5 @@
const AbstractHandler = require('./AbstractHandler'); const AbstractHandler = require('./AbstractHandler');
const Constants = require('../../../../util/Constants'); const { Events } = require('../../../../util/Constants');
class TypingStartHandler extends AbstractHandler { class TypingStartHandler extends AbstractHandler {
handle(packet) { handle(packet) {
@@ -11,7 +11,7 @@ class TypingStartHandler extends AbstractHandler {
if (channel && user) { if (channel && user) {
if (channel.type === 'voice') { if (channel.type === 'voice') {
client.emit(Constants.Events.WARN, `Discord sent a typing packet to voice channel ${channel.id}`); client.emit(Events.WARN, `Discord sent a typing packet to voice channel ${channel.id}`);
return; return;
} }
if (channel._typing.has(user.id)) { if (channel._typing.has(user.id)) {
@@ -20,7 +20,7 @@ class TypingStartHandler extends AbstractHandler {
typing.resetTimeout(tooLate(channel, user)); typing.resetTimeout(tooLate(channel, user));
} else { } else {
channel._typing.set(user.id, new TypingData(client, timestamp, timestamp, tooLate(channel, user))); channel._typing.set(user.id, new TypingData(client, timestamp, timestamp, tooLate(channel, user)));
client.emit(Constants.Events.TYPING_START, channel, user); client.emit(Events.TYPING_START, channel, user);
} }
} }
} }
@@ -46,7 +46,7 @@ class TypingData {
function tooLate(channel, user) { function tooLate(channel, user) {
return channel.client.setTimeout(() => { return channel.client.setTimeout(() => {
channel.client.emit(Constants.Events.TYPING_STOP, channel, user, channel._typing.get(user.id)); channel.client.emit(Events.TYPING_STOP, channel, user, channel._typing.get(user.id));
channel._typing.delete(user.id); channel._typing.delete(user.id);
}, 6000); }, 6000);
} }

4
src/client/websocket/packets/handlers/UserGuildSettingsUpdate.js
View File

@@ -1,5 +1,5 @@
const AbstractHandler = require('./AbstractHandler'); const AbstractHandler = require('./AbstractHandler');
const Constants = require('../../../../util/Constants'); const { Events } = require('../../../../util/Constants');
const ClientUserGuildSettings = require('../../../../structures/ClientUserGuildSettings'); const ClientUserGuildSettings = require('../../../../structures/ClientUserGuildSettings');
class UserGuildSettingsUpdateHandler extends AbstractHandler { class UserGuildSettingsUpdateHandler extends AbstractHandler {
@@ -8,7 +8,7 @@ class UserGuildSettingsUpdateHandler extends AbstractHandler {
const settings = client.user.guildSettings.get(packet.d.guild_id); const settings = client.user.guildSettings.get(packet.d.guild_id);
if (settings) settings.patch(packet.d); if (settings) settings.patch(packet.d);
else client.user.guildSettings.set(packet.d.guild_id, new ClientUserGuildSettings(this.client, packet.d)); else client.user.guildSettings.set(packet.d.guild_id, new ClientUserGuildSettings(this.client, packet.d));
client.emit(Constants.Events.USER_GUILD_SETTINGS_UPDATE, client.user.guildSettings.get(packet.d.guild_id)); client.emit(Events.USER_GUILD_SETTINGS_UPDATE, client.user.guildSettings.get(packet.d.guild_id));
} }
} }

4
src/client/websocket/packets/handlers/UserSettingsUpdate.js
View File

@@ -1,11 +1,11 @@
const AbstractHandler = require('./AbstractHandler'); const AbstractHandler = require('./AbstractHandler');
const Constants = require('../../../../util/Constants'); const { Events } = require('../../../../util/Constants');
class UserSettingsUpdateHandler extends AbstractHandler { class UserSettingsUpdateHandler extends AbstractHandler {
handle(packet) { handle(packet) {
const client = this.packetManager.client; const client = this.packetManager.client;
client.user.settings.patch(packet.d); client.user.settings.patch(packet.d);
client.emit(Constants.Events.USER_SETTINGS_UPDATE, client.user.settings); client.emit(Events.USER_SETTINGS_UPDATE, client.user.settings);
} }
} }

4
src/client/websocket/packets/handlers/VoiceStateUpdate.js
View File

@@ -1,6 +1,6 @@
const AbstractHandler = require('./AbstractHandler'); const AbstractHandler = require('./AbstractHandler');
const Constants = require('../../../../util/Constants'); const { Events } = require('../../../../util/Constants');
class VoiceStateUpdateHandler extends AbstractHandler { class VoiceStateUpdateHandler extends AbstractHandler {
handle(packet) { handle(packet) {
@@ -20,7 +20,7 @@ class VoiceStateUpdateHandler extends AbstractHandler {
guild.voiceStates.set(member.user.id, data); guild.voiceStates.set(member.user.id, data);
client.emit(Constants.Events.VOICE_STATE_UPDATE, oldMember, member); client.emit(Events.VOICE_STATE_UPDATE, oldMember, member);
} }
} }
} }

4
src/rest/RESTManager.js
View File

@@ -3,7 +3,7 @@ const handlers = require('./handlers');
const APIRequest = require('./APIRequest'); const APIRequest = require('./APIRequest');
const routeBuilder = require('./APIRouter'); const routeBuilder = require('./APIRouter');
const { Error } = require('../errors'); const { Error } = require('../errors');
const Constants = require('../util/Constants'); const { Endpoints } = require('../util/Constants');
class RESTManager { class RESTManager {
constructor(client, tokenPrefix = 'Bot') { constructor(client, tokenPrefix = 'Bot') {
@@ -29,7 +29,7 @@ class RESTManager {
} }
get cdn() { get cdn() {
return Constants.Endpoints.CDN(this.client.options.http.cdn); return Endpoints.CDN(this.client.options.http.cdn);
} }
destroy() { destroy() {

6
src/rest/UserAgentManager.js
View File

@@ -1,4 +1,4 @@
const Constants = require('../util/Constants'); const { Package } = require('../util/Constants');
class UserAgentManager { class UserAgentManager {
constructor() { constructor() {
@@ -18,8 +18,8 @@ class UserAgentManager {
} }
UserAgentManager.DEFAULT = { UserAgentManager.DEFAULT = {
url: Constants.Package.homepage.split('#')[0], url: Package.homepage.split('#')[0],
version: Constants.Package.version, version: Package.version,
}; };
module.exports = UserAgentManager; module.exports = UserAgentManager;

6
src/sharding/ShardClientUtil.js
View File

@@ -1,5 +1,5 @@
const Util = require('../util/Util'); const Util = require('../util/Util');
const Constants = require('../util/Constants'); const { Events } = require('../util/Constants');
const { Error } = require('../errors'); const { Error } = require('../errors');
/** /**
@@ -124,7 +124,7 @@ class ShardClientUtil {
_respond(type, message) { _respond(type, message) {
this.send(message).catch(err => { this.send(message).catch(err => {
err.message = `Error when sending ${type} response to master process: ${err.message}`; err.message = `Error when sending ${type} response to master process: ${err.message}`;
this.client.emit(Constants.Events.ERROR, err); this.client.emit(Events.ERROR, err);
}); });
} }
@@ -137,7 +137,7 @@ class ShardClientUtil {
if (!this._singleton) { if (!this._singleton) {
this._singleton = new this(client); this._singleton = new this(client);
} else { } else {
client.emit(Constants.Events.WARN, client.emit(Events.WARN,
'Multiple clients created in child process; only the first will handle sharding helpers.'); 'Multiple clients created in child process; only the first will handle sharding helpers.');
} }
return this._singleton; return this._singleton;

4
src/stores/ChannelStore.js
View File

@@ -1,6 +1,6 @@
const DataStore = require('./DataStore'); const DataStore = require('./DataStore');
const Channel = require('../structures/Channel'); const Channel = require('../structures/Channel');
const Constants = require('../util/Constants'); const { Events } = require('../util/Constants');
const kLru = Symbol('LRU'); const kLru = Symbol('LRU');
const lruable = ['group', 'dm']; const lruable = ['group', 'dm'];
@@ -58,7 +58,7 @@ class ChannelStore extends DataStore {
const channel = Channel.create(this.client, data, guild); const channel = Channel.create(this.client, data, guild);
if (!channel) { if (!channel) {
this.client.emit(Constants.Events.DEBUG, `Failed to find guild for channel ${data.id} ${data.type}`); this.client.emit(Events.DEBUG, `Failed to find guild for channel ${data.id} ${data.type}`);
return null; return null;
} }

6
src/stores/ClientPresenceStore.js
View File

@@ -1,6 +1,6 @@
const PresenceStore = require('./PresenceStore'); const PresenceStore = require('./PresenceStore');
const Collection = require('../util/Collection'); const Collection = require('../util/Collection');
const Constants = require('../util/Constants'); const { ActivityTypes, OPCodes } = require('../util/Constants');
const { Presence } = require('../structures/Presence'); const { Presence } = require('../structures/Presence');
const { TypeError } = require('../errors'); const { TypeError } = require('../errors');
@@ -34,7 +34,7 @@ class ClientPresenceStore extends PresenceStore {
since: since != null ? since : null, // eslint-disable-line eqeqeq since: since != null ? since : null, // eslint-disable-line eqeqeq
status: status || this.clientPresence.status, status: status || this.clientPresence.status,
game: activity ? { game: activity ? {
type: typeof activity.type === 'number' ? activity.type : Constants.ActivityTypes.indexOf(activity.type), type: typeof activity.type === 'number' ? activity.type : ActivityTypes.indexOf(activity.type),
name: activity.name, name: activity.name,
url: activity.url, url: activity.url,
details: activity.details || undefined, details: activity.details || undefined,
@@ -54,7 +54,7 @@ class ClientPresenceStore extends PresenceStore {
}; };
this.clientPresence.patch(packet); this.clientPresence.patch(packet);
this.client.ws.send({ op: Constants.OPCodes.STATUS_UPDATE, d: packet }); this.client.ws.send({ op: OPCodes.STATUS_UPDATE, d: packet });
return this.clientPresence; return this.clientPresence;
} }
} }

10
src/stores/GuildMemberStore.js
View File

@@ -1,6 +1,6 @@
const DataStore = require('./DataStore'); const DataStore = require('./DataStore');
const GuildMember = require('../structures/GuildMember'); const GuildMember = require('../structures/GuildMember');
const Constants = require('../util/Constants'); const { Events, OPCodes } = require('../util/Constants');
const Collection = require('../util/Collection'); const Collection = require('../util/Collection');
const { Error } = require('../errors'); const { Error } = require('../errors');
@@ -112,7 +112,7 @@ class GuildMemberStore extends DataStore {
return; return;
} }
this.guild.client.ws.send({ this.guild.client.ws.send({
op: Constants.OPCodes.REQUEST_GUILD_MEMBERS, op: OPCodes.REQUEST_GUILD_MEMBERS,
d: { d: {
guild_id: this.guild.id, guild_id: this.guild.id,
query, query,
@@ -128,13 +128,13 @@ class GuildMemberStore extends DataStore {
if (this.guild.memberCount <= this.size || if (this.guild.memberCount <= this.size ||
((query || limit) && members.size < 1000) || ((query || limit) && members.size < 1000) ||
(limit && fetchedMembers.size >= limit)) { (limit && fetchedMembers.size >= limit)) {
this.guild.client.removeListener(Constants.Events.GUILD_MEMBERS_CHUNK, handler); this.guild.client.removeListener(Events.GUILD_MEMBERS_CHUNK, handler);
resolve(query || limit ? fetchedMembers : this); resolve(query || limit ? fetchedMembers : this);
} }
}; };
this.guild.client.on(Constants.Events.GUILD_MEMBERS_CHUNK, handler); this.guild.client.on(Events.GUILD_MEMBERS_CHUNK, handler);
this.guild.client.setTimeout(() => { this.guild.client.setTimeout(() => {
this.guild.client.removeListener(Constants.Events.GUILD_MEMBERS_CHUNK, handler); this.guild.client.removeListener(Events.GUILD_MEMBERS_CHUNK, handler);
reject(new Error('GUILD_MEMBERS_TIMEOUT')); reject(new Error('GUILD_MEMBERS_TIMEOUT'));
}, 120e3); }, 120e3);
}); });

15
src/structures/Channel.js
View File

@@ -1,6 +1,6 @@
const Snowflake = require('../util/Snowflake'); const Snowflake = require('../util/Snowflake');
const Base = require('./Base'); const Base = require('./Base');
const Constants = require('../util/Constants'); const { ChannelTypes } = require('../util/Constants');
/** /**
* Represents any channel on Discord. * Represents any channel on Discord.
@@ -10,7 +10,7 @@ class Channel extends Base {
constructor(client, data) { constructor(client, data) {
super(client); super(client);
const type = Object.keys(Constants.ChannelTypes)[data.type]; const type = Object.keys(ChannelTypes)[data.type];
/** /**
* The type of the channel, either: * The type of the channel, either:
* * `dm` - a DM channel * * `dm` - a DM channel
@@ -72,23 +72,22 @@ class Channel extends Base {
const VoiceChannel = require('./VoiceChannel'); const VoiceChannel = require('./VoiceChannel');
const CategoryChannel = require('./CategoryChannel'); const CategoryChannel = require('./CategoryChannel');
const GuildChannel = require('./GuildChannel'); const GuildChannel = require('./GuildChannel');
const types = Constants.ChannelTypes;
let channel; let channel;
if (data.type === types.DM) { if (data.type === ChannelTypes.DM) {
channel = new DMChannel(client, data); channel = new DMChannel(client, data);
} else if (data.type === types.GROUP) { } else if (data.type === ChannelTypes.GROUP) {
channel = new GroupDMChannel(client, data); channel = new GroupDMChannel(client, data);
} else { } else {
guild = guild || client.guilds.get(data.guild_id); guild = guild || client.guilds.get(data.guild_id);
if (guild) { if (guild) {
switch (data.type) { switch (data.type) {
case types.TEXT: case ChannelTypes.TEXT:
channel = new TextChannel(guild, data); channel = new TextChannel(guild, data);
break; break;
case types.VOICE: case ChannelTypes.VOICE:
channel = new VoiceChannel(guild, data); channel = new VoiceChannel(guild, data);
break; break;
case types.CATEGORY: case ChannelTypes.CATEGORY:
channel = new CategoryChannel(guild, data); channel = new CategoryChannel(guild, data);
break; break;
default: default:

8
src/structures/ClientApplication.js
View File

@@ -1,5 +1,5 @@
const Snowflake = require('../util/Snowflake'); const Snowflake = require('../util/Snowflake');
const Constants = require('../util/Constants'); const { ClientApplicationAssetTypes, Endpoints } = require('../util/Constants');
const DataResolver = require('../util/DataResolver'); const DataResolver = require('../util/DataResolver');
const Base = require('./Base'); const Base = require('./Base');
@@ -140,7 +140,7 @@ class ClientApplication extends Base {
*/ */
coverImage({ format, size } = {}) { coverImage({ format, size } = {}) {
if (!this.cover) return null; if (!this.cover) return null;
return Constants.Endpoints return Endpoints
.CDN(this.client.options.http.cdn) .CDN(this.client.options.http.cdn)
.AppIcon(this.id, this.cover, { format, size }); .AppIcon(this.id, this.cover, { format, size });
} }
@@ -154,7 +154,7 @@ class ClientApplication extends Base {
.then(assets => assets.map(a => ({ .then(assets => assets.map(a => ({
id: a.id, id: a.id,
name: a.name, name: a.name,
type: Object.keys(Constants.ClientApplicationAssetTypes)[a.type - 1], type: Object.keys(ClientApplicationAssetTypes)[a.type - 1],
}))); })));
} }
@@ -170,7 +170,7 @@ class ClientApplication extends Base {
this.client.api.applications(this.id).assets.post({ data: { this.client.api.applications(this.id).assets.post({ data: {
name, name,
data: b64, data: b64,
type: Constants.ClientApplicationAssetTypes[type.toUpperCase()], type: ClientApplicationAssetTypes[type.toUpperCase()],
} })); } }));
} }

8
src/structures/ClientUser.js
View File

@@ -2,7 +2,7 @@ const User = require('./User');
const Collection = require('../util/Collection'); const Collection = require('../util/Collection');
const ClientUserSettings = require('./ClientUserSettings'); const ClientUserSettings = require('./ClientUserSettings');
const ClientUserGuildSettings = require('./ClientUserGuildSettings'); const ClientUserGuildSettings = require('./ClientUserGuildSettings');
const Constants = require('../util/Constants'); const { Events } = require('../util/Constants');
const Util = require('../util/Util'); const Util = require('../util/Util');
const DataResolver = require('../util/DataResolver'); const DataResolver = require('../util/DataResolver');
const Guild = require('./Guild'); const Guild = require('./Guild');
@@ -278,15 +278,15 @@ class ClientUser extends User {
const handleGuild = guild => { const handleGuild = guild => {
if (guild.id === data.id) { if (guild.id === data.id) {
this.client.removeListener(Constants.Events.GUILD_CREATE, handleGuild); this.client.removeListener(Events.GUILD_CREATE, handleGuild);
this.client.clearTimeout(timeout); this.client.clearTimeout(timeout);
resolve(guild); resolve(guild);
} }
}; };
this.client.on(Constants.Events.GUILD_CREATE, handleGuild); this.client.on(Events.GUILD_CREATE, handleGuild);
const timeout = this.client.setTimeout(() => { const timeout = this.client.setTimeout(() => {
this.client.removeListener(Constants.Events.GUILD_CREATE, handleGuild); this.client.removeListener(Events.GUILD_CREATE, handleGuild);
resolve(this.client.guilds.create(data)); resolve(this.client.guilds.create(data));
}, 10000); }, 10000);
return undefined; return undefined;

4
src/structures/ClientUserChannelOverride.js
View File

@@ -1,4 +1,4 @@
const Constants = require('../util/Constants'); const { UserChannelOverrideMap } = require('../util/Constants');
/** /**
* A wrapper around the ClientUser's channel overrides. * A wrapper around the ClientUser's channel overrides.
@@ -14,7 +14,7 @@ class ClientUserChannelOverride {
* @private * @private
*/ */
patch(data) { patch(data) {
for (const [key, value] of Object.entries(Constants.UserChannelOverrideMap)) { for (const [key, value] of Object.entries(UserChannelOverrideMap)) {
if (!data.hasOwnProperty(key)) continue; if (!data.hasOwnProperty(key)) continue;
if (typeof value === 'function') { if (typeof value === 'function') {
this[value.name] = value(data[key]); this[value.name] = value(data[key]);

4
src/structures/ClientUserGuildSettings.js
View File

@@ -1,4 +1,4 @@
const Constants = require('../util/Constants'); const { UserGuildSettingsMap } = require('../util/Constants');
const Collection = require('../util/Collection'); const Collection = require('../util/Collection');
const ClientUserChannelOverride = require('./ClientUserChannelOverride'); const ClientUserChannelOverride = require('./ClientUserChannelOverride');
@@ -29,7 +29,7 @@ class ClientUserGuildSettings {
* @private * @private
*/ */
patch(data) { patch(data) {
for (const [key, value] of Object.entries(Constants.UserGuildSettingsMap)) { for (const [key, value] of Object.entries(UserGuildSettingsMap)) {
if (!data.hasOwnProperty(key)) continue; if (!data.hasOwnProperty(key)) continue;
if (key === 'channel_overrides') { if (key === 'channel_overrides') {
for (const channel of data[key]) { for (const channel of data[key]) {

4
src/structures/ClientUserSettings.js
View File

@@ -1,4 +1,4 @@
const Constants = require('../util/Constants'); const { UserSettingsMap } = require('../util/Constants');
const Util = require('../util/Util'); const Util = require('../util/Util');
const { Error } = require('../errors'); const { Error } = require('../errors');
@@ -17,7 +17,7 @@ class ClientUserSettings {
* @private * @private
*/ */
patch(data) { patch(data) {
for (const [key, value] of Object.entries(Constants.UserSettingsMap)) { for (const [key, value] of Object.entries(UserSettingsMap)) {
if (!data.hasOwnProperty(key)) continue; if (!data.hasOwnProperty(key)) continue;
if (typeof value === 'function') { if (typeof value === 'function') {
this[value.name] = value(data[key]); this[value.name] = value(data[key]);

8
src/structures/Guild.js
View File

@@ -3,7 +3,7 @@ const GuildAuditLogs = require('./GuildAuditLogs');
const Webhook = require('./Webhook'); const Webhook = require('./Webhook');
const GuildMember = require('./GuildMember'); const GuildMember = require('./GuildMember');
const VoiceRegion = require('./VoiceRegion'); const VoiceRegion = require('./VoiceRegion');
const Constants = require('../util/Constants'); const { ChannelTypes, Events } = require('../util/Constants');
const Collection = require('../util/Collection'); const Collection = require('../util/Collection');
const Util = require('../util/Util'); const Util = require('../util/Util');
const DataResolver = require('../util/DataResolver'); const DataResolver = require('../util/DataResolver');
@@ -923,7 +923,7 @@ class Guild extends Base {
return this.client.api.guilds(this.id).channels.post({ return this.client.api.guilds(this.id).channels.post({
data: { data: {
name, name,
type: Constants.ChannelTypes[type.toUpperCase()], type: ChannelTypes[type.toUpperCase()],
permission_overwrites: overwrites, permission_overwrites: overwrites,
}, },
reason, reason,
@@ -1128,7 +1128,7 @@ class Guild extends Base {
* @param {GuildMember} member The member that started/stopped speaking * @param {GuildMember} member The member that started/stopped speaking
* @param {boolean} speaking Whether or not the member is speaking * @param {boolean} speaking Whether or not the member is speaking
*/ */
this.client.emit(Constants.Events.GUILD_MEMBER_SPEAKING, member, speaking); this.client.emit(Events.GUILD_MEMBER_SPEAKING, member, speaking);
} }
} }
@@ -1137,7 +1137,7 @@ class Guild extends Base {
} }
_sortedChannels(channel) { _sortedChannels(channel) {
const category = channel.type === Constants.ChannelTypes.CATEGORY; const category = channel.type === ChannelTypes.CATEGORY;
return Util.discordSort(this.channels.filter(c => return Util.discordSort(this.channels.filter(c =>
c.type === channel.type && (category || c.parent === channel.parent))); c.type === channel.type && (category || c.parent === channel.parent)));
} }

4
src/structures/GuildChannel.js
View File

@@ -5,7 +5,7 @@ const PermissionOverwrites = require('./PermissionOverwrites');
const Util = require('../util/Util'); const Util = require('../util/Util');
const Permissions = require('../util/Permissions'); const Permissions = require('../util/Permissions');
const Collection = require('../util/Collection'); const Collection = require('../util/Collection');
const Constants = require('../util/Constants'); const { MessageNotificationTypes } = require('../util/Constants');
const { Error, TypeError } = require('../errors'); const { Error, TypeError } = require('../errors');
/** /**
@@ -474,7 +474,7 @@ class GuildChannel extends Channel {
try { try {
return this.client.user.guildSettings.get(this.guild.id).channelOverrides.get(this.id).messageNotifications; return this.client.user.guildSettings.get(this.guild.id).channelOverrides.get(this.id).messageNotifications;
} catch (err) { } catch (err) {
return Constants.MessageNotificationTypes[3]; return MessageNotificationTypes[3];
} }
} }

4
src/structures/Invite.js
View File

@@ -1,4 +1,4 @@
const Constants = require('../util/Constants'); const { Endpoints } = require('../util/Constants');
const Base = require('./Base'); const Base = require('./Base');
/** /**
@@ -127,7 +127,7 @@ class Invite extends Base {
* @readonly * @readonly
*/ */
get url() { get url() {
return Constants.Endpoints.invite(this.client.options.http.invite, this.code); return Endpoints.invite(this.client.options.http.invite, this.code);
} }
/** /**

4
src/structures/Message.js
View File

@@ -6,7 +6,7 @@ const ClientApplication = require('./ClientApplication');
const Util = require('../util/Util'); const Util = require('../util/Util');
const Collection = require('../util/Collection'); const Collection = require('../util/Collection');
const ReactionStore = require('../stores/ReactionStore'); const ReactionStore = require('../stores/ReactionStore');
const Constants = require('../util/Constants'); const { MessageTypes } = require('../util/Constants');
const Permissions = require('../util/Permissions'); const Permissions = require('../util/Permissions');
const GuildMember = require('./GuildMember'); const GuildMember = require('./GuildMember');
const Base = require('./Base'); const Base = require('./Base');
@@ -40,7 +40,7 @@ class Message extends Base {
* The type of the message * The type of the message
* @type {MessageType} * @type {MessageType}
*/ */
this.type = Constants.MessageTypes[data.type]; this.type = MessageTypes[data.type];
/** /**
* The content of the message * The content of the message

13
src/structures/MessageCollector.js
View File

@@ -1,4 +1,5 @@
const Collector = require('./interfaces/Collector'); const Collector = require('./interfaces/Collector');
const { Events } = require('../util/Constants');
/** /**
* @typedef {CollectorOptions} MessageCollectorOptions * @typedef {CollectorOptions} MessageCollectorOptions
@@ -36,14 +37,14 @@ class MessageCollector extends Collector {
for (const message of messages.values()) this.handleDispose(message); for (const message of messages.values()) this.handleDispose(message);
}).bind(this); }).bind(this);
this.client.on('message', this.handleCollect); this.client.on(Events.MESSAGE_CREATE, this.handleCollect);
this.client.on('messageDelete', this.handleDispose); this.client.on(Events.MESSAGE_DELETE, this.handleDispose);
this.client.on('messageDeleteBulk', bulkDeleteListener); this.client.on(Events.MESSAGE_BULK_DELETE, bulkDeleteListener);
this.once('end', () => { this.once('end', () => {
this.client.removeListener('message', this.handleCollect); this.client.removeListener(Events.MESSAGE_CREATE, this.handleCollect);
this.client.removeListener('messageDelete', this.handleDispose); this.client.removeListener(Events.MESSAGE_DELETE, this.handleDispose);
this.client.removeListener('messageDeleteBulk', bulkDeleteListener); this.client.removeListener(Events.MESSAGE_BULK_DELETE, bulkDeleteListener);
}); });
} }

4
src/structures/Presence.js
View File

@@ -1,4 +1,4 @@
const Constants = require('../util/Constants'); const { ActivityTypes } = require('../util/Constants');
/** /**
* Represents a user's presence. * Represents a user's presence.
@@ -67,7 +67,7 @@ class Activity {
* The type of the activity status * The type of the activity status
* @type {ActivityType} * @type {ActivityType}
*/ */
this.type = Constants.ActivityTypes[data.type]; this.type = ActivityTypes[data.type];
/** /**
* If the activity is being streamed, a link to the stream * If the activity is being streamed, a link to the stream

13
src/structures/ReactionCollector.js
View File

@@ -1,5 +1,6 @@
const Collector = require('./interfaces/Collector'); const Collector = require('./interfaces/Collector');
const Collection = require('../util/Collection'); const Collection = require('../util/Collection');
const { Events } = require('../util/Constants');
/** /**
* @typedef {CollectorOptions} ReactionCollectorOptions * @typedef {CollectorOptions} ReactionCollectorOptions
@@ -41,14 +42,14 @@ class ReactionCollector extends Collector {
this.empty = this.empty.bind(this); this.empty = this.empty.bind(this);
this.client.on('messageReactionAdd', this.handleCollect); this.client.on(Events.MESSAGE_REACTION_ADD, this.handleCollect);
this.client.on('messageReactionRemove', this.handleDispose); this.client.on(Events.MESSAGE_REACTION_REMOVE, this.handleDispose);
this.client.on('messageReactionRemoveAll', this.empty); this.client.on(Events.MESSAGE_REACTION_REMOVE_ALL, this.empty);
this.once('end', () => { this.once('end', () => {
this.client.removeListener('messageReactionAdd', this.handleCollect); this.client.removeListener(Events.MESSAGE_REACTION_ADD, this.handleCollect);
this.client.removeListener('messageReactionRemove', this.handleDispose); this.client.removeListener(Events.MESSAGE_REACTION_REMOVE, this.handleDispose);
this.client.removeListener('messageReactionRemoveAll', this.empty); this.client.removeListener(Events.MESSAGE_REACTION_REMOVE_ALL, this.empty);
}); });
this.on('collect', (collected, reaction, user) => { this.on('collect', (collected, reaction, user) => {

7
src/util/Util.js
View File

@@ -1,7 +1,6 @@
const Long = require('long'); const Long = require('long');
const snekfetch = require('snekfetch'); const snekfetch = require('snekfetch');
const Constants = require('./Constants'); const { Colors, DefaultOptions, Endpoints } = require('./Constants');
const ConstantsHttp = Constants.DefaultOptions.http;
const { Error: DiscordError, RangeError, TypeError } = require('../errors'); const { Error: DiscordError, RangeError, TypeError } = require('../errors');
const has = (o, k) => Object.prototype.hasOwnProperty.call(o, k); const has = (o, k) => Object.prototype.hasOwnProperty.call(o, k);
@@ -60,7 +59,7 @@ class Util {
static fetchRecommendedShards(token, guildsPerShard = 1000) { static fetchRecommendedShards(token, guildsPerShard = 1000) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (!token) throw new DiscordError('TOKEN_MISSING'); if (!token) throw new DiscordError('TOKEN_MISSING');
snekfetch.get(`${ConstantsHttp.api}/v${ConstantsHttp.version}${Constants.Endpoints.botGateway}`) snekfetch.get(`${DefaultOptions.http.api}/v${DefaultOptions.http.version}${Endpoints.botGateway}`)
.set('Authorization', `Bot ${token.replace(/^Bot\s*/i, '')}`) .set('Authorization', `Bot ${token.replace(/^Bot\s*/i, '')}`)
.end((err, res) => { .end((err, res) => {
if (err) reject(err); if (err) reject(err);
@@ -278,7 +277,7 @@ class Util {
static resolveColor(color) { static resolveColor(color) {
if (typeof color === 'string') { if (typeof color === 'string') {
if (color === 'RANDOM') return Math.floor(Math.random() * (0xFFFFFF + 1)); if (color === 'RANDOM') return Math.floor(Math.random() * (0xFFFFFF + 1));
color = Constants.Colors[color] || parseInt(color.replace('#', ''), 16); color = Colors[color] || parseInt(color.replace('#', ''), 16);
} else if (color instanceof Array) { } else if (color instanceof Array) {
color = (color[0] << 16) + (color[1] << 8) + color[2]; color = (color[0] << 16) + (color[1] << 8) + color[2];
} }