switch to os shim for safety (#1136)

* switch to os shim for safety

* Update Client.js
This commit is contained in:
Gus Caplan
2017-01-26 15:21:43 -06:00
committed by Amish Shah
parent ba11f76284
commit 87b600f78f
4 changed files with 5 additions and 4 deletions

View File

@@ -1,3 +1,4 @@
const os = require('os');
const EventEmitter = require('events').EventEmitter;
const mergeDefault = require('../util/MergeDefault');
const Constants = require('../util/Constants');
@@ -216,7 +217,7 @@ class Client extends EventEmitter {
* @readonly
*/
get browser() {
return typeof window !== 'undefined';
return os.platform() === 'browser';
}
/**

View File

@@ -1,4 +1,4 @@
const browser = typeof window !== 'undefined';
const browser = require('os').platform() === 'browser';
const EventEmitter = require('events').EventEmitter;
const Constants = require('../../util/Constants');
const convertArrayBuffer = require('../../util/ConvertArrayBuffer');

View File

@@ -46,4 +46,4 @@ module.exports = {
Constants: require('./util/Constants'),
};
if (typeof window !== 'undefined') window.Discord = module.exports; // eslint-disable-line no-undef
if (require('os').platform() === 'browser') window.Discord = module.exports; // eslint-disable-line no-undef

View File

@@ -51,7 +51,7 @@ exports.DefaultOptions = {
*/
ws: {
large_threshold: 250,
compress: typeof window === 'undefined',
compress: require('os').platform() !== 'browser',
properties: {
$os: process ? process.platform : 'discord.js',
$browser: 'discord.js',