feat(Browser): remove browser � (#5113)

src/WebSocket.js

@@ -1,7 +1,5 @@
 'use strict';
 
-const { browser } = require('./util/Constants');
-
 let erlpack;
 
 try {
@@ -9,15 +7,7 @@ try {
   if (!erlpack.pack) erlpack = null;
 } catch {} // eslint-disable-line no-empty
 
-let TextDecoder;
-
-if (browser) {
-  TextDecoder = window.TextDecoder; // eslint-disable-line no-undef
-  exports.WebSocket = window.WebSocket; // eslint-disable-line no-undef
-} else {
-  TextDecoder = require('util').TextDecoder;
-  exports.WebSocket = require('ws');
-}
+exports.WebSocket = require('ws');
 
 const ab = new TextDecoder();
 
@@ -42,7 +32,6 @@ exports.create = (gateway, query = {}, ...args) => {
   query = new URLSearchParams(query);
   if (q) new URLSearchParams(q).forEach((v, k) => query.set(k, v));
   const ws = new exports.WebSocket(`${g}?${query}`, ...args);
-  if (browser) ws.binaryType = 'arraybuffer';
   return ws;
 };
 

src/client/Client.js

@@ -17,7 +17,7 @@ const Invite = require('../structures/Invite');
 const VoiceRegion = require('../structures/VoiceRegion');
 const Webhook = require('../structures/Webhook');
 const Collection = require('../util/Collection');
-const { Events, browser, DefaultOptions } = require('../util/Constants');
+const { Events, DefaultOptions } = require('../util/Constants');
 const DataResolver = require('../util/DataResolver');
 const Intents = require('../util/Intents');
 const Permissions = require('../util/Permissions');
@@ -89,19 +89,18 @@ class Client extends BaseClient {
     this.actions = new ActionsManager(this);
 
     /**
-     * The voice manager of the client (`null` in browsers)
-     * @type {?ClientVoiceManager}
+     * The voice manager of the client
+     * @type {ClientVoiceManager}
      */
-    this.voice = !browser ? new ClientVoiceManager(this) : null;
+    this.voice = new ClientVoiceManager(this);
 
     /**
      * Shard helpers for the client (only if the process was spawned from a {@link ShardingManager})
      * @type {?ShardClientUtil}
      */
-    this.shard =
-      !browser && process.env.SHARDING_MANAGER
-        ? ShardClientUtil.singleton(this, process.env.SHARDING_MANAGER_MODE)
-        : null;
+    this.shard = process.env.SHARDING_MANAGER
+      ? ShardClientUtil.singleton(this, process.env.SHARDING_MANAGER_MODE)
+      : null;
 
     /**
      * All of the {@link User} objects that have been cached at any point, mapped by their IDs
@@ -134,7 +133,7 @@ class Client extends BaseClient {
     this.presence = new ClientPresence(this, options.presence);
 
     Object.defineProperty(this, 'token', { writable: true });
-    if (!browser && !this.token && 'DISCORD_TOKEN' in process.env) {
+    if (!this.token && 'DISCORD_TOKEN' in process.env) {
       /**
        * Authorization token for the logged in bot.
        * If present, this defaults to `process.env.DISCORD_TOKEN` when instantiating the client

src/client/websocket/WebSocketShard.js

@@ -2,18 +2,16 @@
 
 const EventEmitter = require('events');
 const WebSocket = require('../../WebSocket');
-const { browser, Status, Events, ShardEvents, OPCodes, WSEvents } = require('../../util/Constants');
+const { Status, Events, ShardEvents, OPCodes, WSEvents } = require('../../util/Constants');
 
 const STATUS_KEYS = Object.keys(Status);
 const CONNECTION_STATE = Object.keys(WebSocket.WebSocket);
 
 let zlib;
 
-if (!browser) {
-  try {
-    zlib = require('zlib-sync');
-  } catch {} // eslint-disable-line no-empty
-}
+try {
+  zlib = require('zlib-sync');
+} catch {} // eslint-disable-line no-empty
 
 /**
  * Represents a Shard's WebSocket connection

src/errors/Messages.js

@@ -50,7 +50,6 @@ const Messages = {
   VOICE_TOKEN_ABSENT: 'Token not provided from voice server packet.',
   VOICE_SESSION_ABSENT: 'Session ID not supplied.',
   VOICE_INVALID_ENDPOINT: 'Invalid endpoint received.',
-  VOICE_NO_BROWSER: 'Voice connections are not available in browsers.',
   VOICE_CONNECTION_ATTEMPTS_EXCEEDED: attempts => `Too many connection attempts (${attempts}).`,
   VOICE_JOIN_SOCKET_CLOSED: 'Tried to send join packet, but the WebSocket is not open.',
   VOICE_PLAY_INTERFACE_NO_BROADCAST: 'A broadcast cannot be played in this context.',

src/rest/APIRequest.js

@@ -4,7 +4,7 @@ const https = require('https');
 const FormData = require('@discordjs/form-data');
 const AbortController = require('abort-controller');
 const fetch = require('node-fetch');
-const { browser, UserAgent } = require('../util/Constants');
+const { UserAgent } = require('../util/Constants');
 
 if (https.Agent) var agent = new https.Agent({ keepAlive: true });
 
@@ -37,7 +37,7 @@ class APIRequest {
 
     if (this.options.auth !== false) headers.Authorization = this.rest.getAuth();
     if (this.options.reason) headers['X-Audit-Log-Reason'] = encodeURIComponent(this.options.reason);
-    if (!browser) headers['User-Agent'] = UserAgent;
+    headers['User-Agent'] = UserAgent;
     if (this.options.headers) headers = Object.assign(headers, this.options.headers);
 
     let body;
@@ -45,7 +45,7 @@ class APIRequest {
       body = new FormData();
       for (const file of this.options.files) if (file && file.file) body.append(file.name, file.file, file.name);
       if (typeof this.options.data !== 'undefined') body.append('payload_json', JSON.stringify(this.options.data));
-      if (!browser) headers = Object.assign(headers, body.getHeaders());
+      headers = Object.assign(headers, body.getHeaders());
       // eslint-disable-next-line eqeqeq
     } else if (this.options.data != null) {
       body = JSON.stringify(this.options.data);

src/rest/RequestHandler.js

@@ -5,13 +5,11 @@ const DiscordAPIError = require('./DiscordAPIError');
 const HTTPError = require('./HTTPError');
 const {
   Events: { RATE_LIMIT },
-  browser,
 } = require('../util/Constants');
 const Util = require('../util/Util');
 
 function parseResponse(res) {
   if (res.headers.get('content-type').startsWith('application/json')) return res.json();
-  if (browser) return res.blob();
   return res.buffer();
 }
 

src/structures/APIMessage.js

@@ -3,7 +3,6 @@
 const MessageAttachment = require('./MessageAttachment');
 const MessageEmbed = require('./MessageEmbed');
 const { RangeError } = require('../errors');
-const { browser } = require('../util/Constants');
 const DataResolver = require('../util/DataResolver');
 const MessageFlags = require('../util/MessageFlags');
 const Util = require('../util/Util');
@@ -272,9 +271,7 @@ class APIMessage {
     };
 
     const ownAttachment =
-      typeof fileLike === 'string' ||
-      fileLike instanceof (browser ? ArrayBuffer : Buffer) ||
-      typeof fileLike.pipe === 'function';
+      typeof fileLike === 'string' || fileLike instanceof Buffer || typeof fileLike.pipe === 'function';
     if (ownAttachment) {
       attachment = fileLike;
       name = findName(attachment);

src/structures/Guild.js

@@ -18,7 +18,6 @@ const RoleManager = require('../managers/RoleManager');
 const VoiceStateManager = require('../managers/VoiceStateManager');
 const Collection = require('../util/Collection');
 const {
-  browser,
   ChannelTypes,
   DefaultMessageNotifications,
   PartialTypes,
@@ -991,7 +990,7 @@ class Guild extends Base {
     }
     const data = await this.client.api.guilds(this.id).members(user).put({ data: options });
     // Data is an empty buffer if the member is already part of the guild.
-    return data instanceof (browser ? ArrayBuffer : Buffer) ? this.members.fetch(user) : this.members.add(data);
+    return data instanceof Buffer ? this.members.fetch(user) : this.members.add(data);
   }
 
   /**

src/structures/VoiceChannel.js

@@ -1,9 +1,7 @@
 'use strict';
 
 const GuildChannel = require('./GuildChannel');
-const { Error } = require('../errors');
 const Collection = require('../util/Collection');
-const { browser } = require('../util/Constants');
 const Permissions = require('../util/Permissions');
 
 /**
@@ -74,7 +72,6 @@ class VoiceChannel extends GuildChannel {
    * @readonly
    */
   get joinable() {
-    if (browser) return false;
     if (!this.viewable) return false;
     if (!this.permissionsFor(this.client.user).has(Permissions.FLAGS.CONNECT, false)) return false;
     if (this.full && !this.permissionsFor(this.client.user).has(Permissions.FLAGS.MOVE_MEMBERS, false)) return false;
@@ -130,7 +127,6 @@ class VoiceChannel extends GuildChannel {
    *   .catch(console.error);
    */
   join() {
-    if (browser) return Promise.reject(new Error('VOICE_NO_BROWSER'));
     return this.client.voice.joinChannel(this);
   }
 
@@ -141,7 +137,6 @@ class VoiceChannel extends GuildChannel {
    * voiceChannel.leave();
    */
   leave() {
-    if (browser) return;
     const connection = this.client.voice.connections.get(this.guild.id);
     if (connection && connection.channel.id === this.id) connection.disconnect();
   }

src/structures/VoiceState.js

@@ -2,7 +2,6 @@
 
 const Base = require('./Base');
 const { Error, TypeError } = require('../errors');
-const { browser } = require('../util/Constants');
 
 /**
  * Represents the voice state for a Guild Member.
@@ -95,7 +94,7 @@ class VoiceState extends Base {
    * @readonly
    */
   get connection() {
-    if (browser || this.id !== this.client.user.id) return null;
+    if (this.id !== this.client.user.id) return null;
     return this.client.voice.connections.get(this.guild.id) || null;
   }
 

src/util/Constants.js

@@ -2,7 +2,6 @@
 
 const Package = (exports.Package = require('../../package.json'));
 const { Error, RangeError } = require('../errors');
-const browser = (exports.browser = typeof window !== 'undefined');
 
 /**
  * Options for a client.
@@ -65,7 +64,7 @@ exports.DefaultOptions = {
     large_threshold: 50,
     compress: false,
     properties: {
-      $os: browser ? 'browser' : process.platform,
+      $os: process.platform,
       $browser: 'discord.js',
       $device: 'discord.js',
     },
@@ -90,9 +89,7 @@ exports.DefaultOptions = {
   },
 };
 
-exports.UserAgent = browser
-  ? null
-  : `DiscordBot (${Package.homepage.split('#')[0]}, ${Package.version}) Node.js/${process.version}`;
+exports.UserAgent = `DiscordBot (${Package.homepage.split('#')[0]}, ${Package.version}) Node.js/${process.version}`;
 
 exports.WSCodes = {
   1000: 'WS_CLOSE_REQUESTED',

src/util/DataResolver.js

@@ -5,8 +5,6 @@ const path = require('path');
 const stream = require('stream');
 const fetch = require('node-fetch');
 const { Error: DiscordError, TypeError } = require('../errors');
-const { browser } = require('../util/Constants');
-const Util = require('../util/Util');
 
 /**
  * The DataResolver identifies different objects and tries to resolve a specific piece of information from them.
@@ -110,26 +108,21 @@ class DataResolver {
    * @returns {Promise<Buffer|Stream>}
    */
   static async resolveFile(resource) {
-    if (!browser && Buffer.isBuffer(resource)) return resource;
-    if (browser && resource instanceof ArrayBuffer) return Util.convertToBuffer(resource);
-    // eslint-disable-next-line no-undef
-    if (browser && resource instanceof Blob) return resource;
-    if (resource instanceof stream.Readable) return resource;
-
+    if (Buffer.isBuffer(resource) || resource instanceof stream.Readable) return resource;
     if (typeof resource === 'string') {
       if (/^https?:\/\//.test(resource)) {
         const res = await fetch(resource);
-        return browser ? res.blob() : res.body;
-      } else if (!browser) {
-        return new Promise((resolve, reject) => {
-          const file = path.resolve(resource);
-          fs.stat(file, (err, stats) => {
-            if (err) return reject(err);
-            if (!stats.isFile()) return reject(new DiscordError('FILE_NOT_FOUND', file));
-            return resolve(fs.createReadStream(file));
-          });
-        });
+        return res.body;
       }
+
+      return new Promise((resolve, reject) => {
+        const file = path.resolve(resource);
+        fs.stat(file, (err, stats) => {
+          if (err) return reject(err);
+          if (!stats.isFile()) return reject(new DiscordError('FILE_NOT_FOUND', file));
+          return resolve(fs.createReadStream(file));
+        });
+      });
     }
 
     throw new TypeError('REQ_RESOURCE_TYPE');