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

Add webpack building (#907)

Browse Source 
* friggin webpack tho

* probably important

* add all the stuff to the package.json

* add minify builds and a nice package.json script to run it all

* clean up

* use uglify harmony branch so we can actually run minify builds that work

* update build system

* make test better

* clean up

* fix issues with compression

* ‮

* c++ requirements in a node lib? whaaaaat?

* fix travis yml?

* put railings on voice connections

* 🖕🏻

* aaaaaa

* handle arraybuffers in the unlikely event one is sent

* support arraybuffers in resolvebuffer

* this needs to be fixed at some point

* this was fixed

* disable filename versioning if env VERSIONED is set to false

* Update ClientDataResolver.js

* Update ClientVoiceManager.js

* Update WebSocketManager.js

* Update ConvertArrayBuffer.js

* Update webpack.html

* enable compression for browser and fix ws error handler

* Update WebSocketManager.js

* everything will be okay gawdl3y

* compression is slower in browser, so rip the last three hours of my life

* Update Constants.js

* Update .gitignore
This commit is contained in:
Gus Caplan
2016-11-20 18:38:16 -06:00
committed by Schuyler Cebulskie
parent b3e795d0b0
commit 2440a4a2c8
14 changed files with 162 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,10 @@
const WebSocket = require('ws');
const browser = typeof window !== 'undefined';
const WebSocket = browser ? window.WebSocket : require('ws'); // eslint-disable-line no-undef
const EventEmitter = require('events').EventEmitter;
const Constants = require('../../util/Constants');
const zlib = require('zlib');
const inflate = browser ? require('zlibjs').inflateSync : require('zlib').inflateSync;
const PacketManager = require('./packets/WebSocketPacketManager');
const convertArrayBuffer = require('../../util/ConvertArrayBuffer');
/**
* The WebSocket Manager of the Client
@@ -78,6 +80,7 @@ class WebSocketManager extends EventEmitter {
this.normalReady = false;
if (this.status !== Constants.Status.RECONNECTING) this.status = Constants.Status.CONNECTING;
this.ws = new WebSocket(gateway);
if (browser) this.ws.binaryType = 'arraybuffer';
this.ws.onopen = () => this.eventOpen();
this.ws.onclose = (d) => this.eventClose(d);
this.ws.onmessage = (e) => this.eventMessage(e);
@@ -193,11 +196,11 @@ class WebSocketManager extends EventEmitter {
*/
eventClose(event) {
this.emit('close', event);
this.client.clearInterval(this.client.manager.heartbeatInterval);
/**
* Emitted whenever the client websocket is disconnected
* @event Client#disconnect
*/
clearInterval(this.client.manager.heartbeatInterval);
if (!this.reconnecting) this.client.emit(Constants.Events.DISCONNECT);
if (event.code === 4004) return;
if (event.code === 4010) return;
@@ -211,10 +214,13 @@ class WebSocketManager extends EventEmitter {
* @returns {boolean}
*/
eventMessage(event) {
let packet;
let packet = event.data;
try {
if (event.binary) event.data = zlib.inflateSync(event.data).toString();
packet = JSON.parse(event.data);
if (typeof packet !== 'string') {
if (packet instanceof ArrayBuffer) packet = convertArrayBuffer(packet);
packet = inflate(packet).toString();
}
packet = JSON.parse(packet);
} catch (e) {
return this.eventError(new Error(Constants.Errors.BAD_WS_MESSAGE));
}
@@ -236,7 +242,7 @@ class WebSocketManager extends EventEmitter {
* @param {Error} error The encountered error
*/
if (this.client.listenerCount('error') > 0) this.client.emit('error', err);
this.tryReconnect();
this.ws.close();
}
_emitReady(normal = true) {