revbot.js 0.1.6 → 0.1.7

package/dist/index.mjs

@@ -733,15 +733,15 @@ var User = class extends Base {
     });
   }
   avatarURL() {
-    var _a, _b;
+    var _a, _b, _c, _d;
     if (!((_a = this.avatar) == null ? void 0 : _a.id)) return void 0;
-    return `${cdnUrl}/avatars/${(_b = this.avatar) == null ? void 0 : _b.id}`;
+    return `${((_b = this.client.options.rest) == null ? void 0 : _b.instanceCDNURL) ? (_c = this.client.options.rest) == null ? void 0 : _c.instanceCDNURL : cdnUrl}/avatars/${(_d = this.avatar) == null ? void 0 : _d.id}`;
   }
   displayAvatarURL() {
     return __async(this, null, function* () {
-      var _a;
-      const defaultAvatar = `${cdnUrl}/users/${this.id}/default_avatar`;
-      return (_a = this.avatarURL()) != null ? _a : defaultAvatar;
+      var _a, _b, _c;
+      const defaultAvatar = `${((_a = this.client.options.rest) == null ? void 0 : _a.instanceCDNURL) ? (_b = this.client.options.rest) == null ? void 0 : _b.instanceCDNURL : cdnUrl}/users/${this.id}/default_avatar`;
+      return (_c = this.avatarURL()) != null ? _c : defaultAvatar;
     });
   }
   /**
@@ -3199,7 +3199,7 @@ import { EventEmitter } from "node:events";
 import { AxiosError } from "axios";
 
 // package.json
-var version = "0.1.6";
+var version = "0.1.7";
 
 // src/rest/restUtils/rateLimitQueue.ts
 import axios3 from "axios";
@@ -3297,13 +3297,13 @@ var RestClient = class {
    */
   request(method, url, body, query, retry) {
     return __async(this, null, function* () {
-      var _a;
+      var _a, _b, _c;
       try {
         if (!this.client.token) throw new Error("Token is required");
         const authHeader = this.client.bot ? "X-Bot-Token" : "X-Session-Token";
         const config = __spreadProps(__spreadValues({}, {
           method,
-          url: `${apiUrl}${url}`,
+          url: `${((_a = this.client.options.rest) == null ? void 0 : _a.instanceURL) ? (_b = this.client.options.rest) == null ? void 0 : _b.instanceURL : apiUrl}${url}`,
           params: query,
           data: body == null ? void 0 : body.body,
           headers: {
@@ -3323,7 +3323,7 @@ var RestClient = class {
           }
           if (error.status) {
             throw new Error(
-              `API call failed with status ${error.status}: ${(_a = error.response) == null ? void 0 : _a.statusText}`
+              `API call failed with status ${error.status}: ${(_c = error.response) == null ? void 0 : _c.statusText}`
             );
           }
         }
@@ -3433,12 +3433,13 @@ var CDNClient = class {
    */
   request(method, url, data, query, retry) {
     return __async(this, null, function* () {
+      var _a, _b, _c, _d;
       try {
         if (!this.client.token) throw new Error("Token is required");
         const authHeader = this.client.bot ? "X-Bot-Token" : "X-Session-Token";
         const config = __spreadProps(__spreadValues({}, {
           method,
-          url: `${cdnUrl}${url}`,
+          url: `${((_a = this.client.options.rest) == null ? void 0 : _a.instanceCDNURL) ? (_b = this.client.options.rest) == null ? void 0 : _b.instanceCDNURL : cdnUrl}${url}`,
           params: query,
           data,
           maxBodyLength: Infinity,
@@ -3448,7 +3449,7 @@ var CDNClient = class {
             "User-Agent": `RevBot.js/${version}`
           }, data.getHeaders())
         }), {
-          url: `${cdnUrl}${url}`
+          url: `${((_c = this.client.options.rest) == null ? void 0 : _c.instanceCDNURL) ? (_d = this.client.options.rest) == null ? void 0 : _d.instanceCDNURL : cdnUrl}${url}`
         });
         const response = yield this.rateLimitQueue.request(config);
         return response.data;
@@ -3517,14 +3518,26 @@ var BaseClient = class extends EventEmitter {
    * @param {clientOptions} [options={}] - The options for configuring the client.
    */
   constructor(options = {}) {
-    var _a;
+    var _a, _b, _c, _d, _e, _f, _g;
+    if (((_a = options.rest) == null ? void 0 : _a.instanceCDNURL) || ((_b = options.rest) == null ? void 0 : _b.instanceURL) || ((_c = options.ws) == null ? void 0 : _c.instanceURL)) {
+      if (!((_d = options.rest) == null ? void 0 : _d.instanceCDNURL) || !((_e = options.rest) == null ? void 0 : _e.instanceURL) || !((_f = options.ws) == null ? void 0 : _f.instanceURL)) {
+        console.error(
+          'All instance URLs must be provided (CDN, REST, WS) see docs at "https://jade3375.github.io/revbot.js/interfaces/clientOptions.html"'
+        );
+        process.exit(0);
+      } else {
+        console.warn(
+          "You are connecting to a custom instance of Revolt. compatibility with RevBot.js is not guaranteed."
+        );
+      }
+    }
     super();
     /** The authentication token for the client. */
     __privateAdd(this, _token, null);
     /** Whether the client is a bot. */
     this.bot = true;
     this.options = __spreadValues(__spreadValues({}, DEFAULT_CLIENT_OPTIONS), options);
-    this.bot = (_a = this.options.isBot) != null ? _a : true;
+    this.bot = (_g = this.options.isBot) != null ? _g : true;
     this.api = new RestClient(this);
     this.cdn = new CDNClient(this);
   }
@@ -4362,7 +4375,7 @@ var WebSocketClient = class {
    */
   connect() {
     return new Promise((resolve) => {
-      var _a, _b;
+      var _a, _b, _c, _d;
       if (((_a = this.socket) == null ? void 0 : _a.readyState) === WebSocket.OPEN && this.ready) {
         return resolve(this);
       }
@@ -4372,7 +4385,9 @@ var WebSocketClient = class {
       if (typeof this.client.token !== "string") {
         throw new Error("INVALID_TOKEN");
       }
-      const ws = this.socket = (_b = this.socket) != null ? _b : new WebSocket(`${wsUrl}`);
+      const ws = this.socket = (_d = this.socket) != null ? _d : new WebSocket(
+        `${((_b = this.client.options.ws) == null ? void 0 : _b.instanceURL) ? (_c = this.client.options.ws) == null ? void 0 : _c.instanceURL : wsUrl}`
+      );
       ws.onopen = this.onOpen.bind(this);
       ws.onmessage = this.onMessage.bind(this);
       ws.onerror = this.onError.bind(this);