some cleanup

Author: devsnek

src/client.js

@@ -58,7 +58,12 @@ class RPCClient extends EventEmitter {
         headers: {
           Authorization: `Bearer ${this.accessToken}`,
         },
-      }).then((r) => r.json());
+      }).then((r) => {
+        if (!r.ok) {
+          throw new Error(r.status);
+        }
+        return r.json();
+      });
 
     this.fetch.endpoint = 'https://discord.com/api';
 
@@ -212,7 +217,6 @@ class RPCClient extends EventEmitter {
       scopes,
       client_id: this.clientId,
       rpc_token: rpcToken,
-      redirect_uri: redirectUri,
     });
 
     const response = await this.fetch('POST', '/oauth2/token', {

src/transports/ipc.js

@@ -47,10 +47,10 @@ async function findEndpoint(tries = 0) {
   const endpoint = `http://127.0.0.1:${6463 + (tries % 10)}`;
   try {
     const r = await fetch(endpoint);
-    if (r.status !== 401) {
-      return findEndpoint(tries + 1);
+    if (r.status === 404) {
+      return endpoint;
     }
-    return endpoint;
+    return findEndpoint(tries + 1);
   } catch (e) {
     return findEndpoint(tries + 1);
   }

src/transports/websocket.js

@@ -17,14 +17,17 @@ class WebSocketTransport extends EventEmitter {
     this.tries = 0;
   }
 
-  async connect(options, tries = this.tries) {
+  async connect(tries = this.tries) {
     if (this.connected) {
       return;
     }
     const port = 6463 + (tries % 10);
     this.hostAndPort = `127.0.0.1:${port}`;
     const ws = this.ws = new WebSocket(
       `ws://${this.hostAndPort}/?v=1&client_id=${this.client.clientId}`,
+      {
+        origin: this.client.options.origin,
+      },
     );
     ws.onopen = this.onOpen.bind(this);
     ws.onclose = ws.onerror = this.onClose.bind(this);
@@ -65,7 +68,7 @@ class WebSocketTransport extends EventEmitter {
     }
     if (!derr) {
       // eslint-disable-next-line no-plusplus
-      setTimeout(() => this.connect(undefined, e.code === 1006 ? ++this.tries : 0), 250);
+      setTimeout(() => this.connect(e.code === 1006 ? ++this.tries : 0), 250);
     }
   }
 }