revbot.js 0.1.10 → 0.2.1

package/dist/index.mjs

@@ -449,9 +449,7 @@ var DEFAULT_CLIENT_OPTIONS = {
     reconnect: true
   }
 };
-var wsUrl = "wss://ws.revolt.chat?version=1&format=json";
-var apiUrl = "https://api.revolt.chat";
-var cdnUrl = "https://cdn.revoltusercontent.com";
+var apiUrl = "https://api.stoat.chat";
 var SYSTEM_USER_ID = "0".repeat(UUID.TIME_LENGTH + UUID.RANDOM_LENGTH);
 
 // src/utils/permissions.ts
@@ -736,15 +734,15 @@ var User = class extends Base {
     });
   }
   avatarURL() {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     if (!((_a = this.avatar) == null ? void 0 : _a.id)) return void 0;
-    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}`;
+    return `${(_b = this.client.options.rest) == null ? void 0 : _b.instanceCDNURL}/avatars/${(_c = this.avatar) == null ? void 0 : _c.id}`;
   }
   displayAvatarURL() {
     return __async(this, null, function* () {
-      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;
+      var _a, _b;
+      const defaultAvatar = `${(_a = this.client.options.rest) == null ? void 0 : _a.instanceCDNURL}/users/${this.id}/default_avatar`;
+      return (_b = this.avatarURL()) != null ? _b : defaultAvatar;
     });
   }
   /**
@@ -3227,10 +3225,10 @@ var ServerMemberManager = class extends BaseManager {
 import { EventEmitter } from "node:events";
 
 // src/rest/restClient.ts
-import { AxiosError } from "axios";
+import axios4, { AxiosError } from "axios";
 
 // package.json
-var version = "0.1.10";
+var version = "0.2.0";
 
 // src/rest/restUtils/rateLimitQueue.ts
 import axios3 from "axios";
@@ -3364,6 +3362,26 @@ var RestClient = class {
       }
     });
   }
+  getConfig() {
+    return __async(this, null, function* () {
+      var _a, _b;
+      try {
+        const response = yield axios4.get(
+          `${((_a = this.client.options.rest) == null ? void 0 : _a.instanceURL) ? (_b = this.client.options.rest) == null ? void 0 : _b.instanceURL : apiUrl}/`
+        );
+        const config = response.data;
+        this.client.options.rest = __spreadProps(__spreadValues({}, this.client.options.rest), {
+          instanceCDNURL: config.features.autumn.url
+        });
+        this.client.options.ws = __spreadProps(__spreadValues({}, this.client.options.ws), {
+          instanceURL: config.ws
+        });
+      } catch (error) {
+        console.error("Failed to fetch configuration:", error);
+        process.exit(1);
+      }
+    });
+  }
   retryRequest(attempt = 0, method, url, body, query) {
     return __async(this, null, function* () {
       var _a, _b;
@@ -3464,13 +3482,13 @@ var CDNClient = class {
    */
   request(method, url, data, query, retry) {
     return __async(this, null, function* () {
-      var _a, _b, _c, _d;
+      var _a, _b;
       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: `${((_a = this.client.options.rest) == null ? void 0 : _a.instanceCDNURL) ? (_b = this.client.options.rest) == null ? void 0 : _b.instanceCDNURL : cdnUrl}${url}`,
+          url: `${(_a = this.client.options.rest) == null ? void 0 : _a.instanceCDNURL}${url}`,
           params: query,
           data,
           maxBodyLength: Infinity,
@@ -3480,7 +3498,7 @@ var CDNClient = class {
             "User-Agent": `RevBot.js/${version}`
           }, data.getHeaders())
         }), {
-          url: `${((_c = this.client.options.rest) == null ? void 0 : _c.instanceCDNURL) ? (_d = this.client.options.rest) == null ? void 0 : _d.instanceCDNURL : cdnUrl}${url}`
+          url: `${(_b = this.client.options.rest) == null ? void 0 : _b.instanceCDNURL}${url}`
         });
         const response = yield this.rateLimitQueue.request(config);
         return response.data;
@@ -3548,11 +3566,11 @@ var BaseClient = class extends EventEmitter {
    * @param {clientOptions} [options={}] - The options for configuring the client.
    */
   constructor(options = {}) {
-    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)) {
+    var _a, _b, _c;
+    if ((_a = options.rest) == null ? void 0 : _a.instanceURL) {
+      if (!((_b = options.rest) == null ? void 0 : _b.instanceURL)) {
         console.error(
-          'All instance URLs must be provided (CDN, REST, WS) see docs at "https://jade3375.github.io/revbot.js/interfaces/clientOptions.html"'
+          'instance URLs must be provided (REST) see docs at "https://jade3375.github.io/revbot.js/interfaces/clientOptions.html"'
         );
         process.exit(0);
       } else {
@@ -3567,7 +3585,7 @@ var BaseClient = class extends EventEmitter {
     /** Whether the client is a bot. */
     this.bot = true;
     this.options = __spreadValues(__spreadValues({}, DEFAULT_CLIENT_OPTIONS), options);
-    this.bot = (_g = this.options.isBot) != null ? _g : true;
+    this.bot = (_c = this.options.isBot) != null ? _c : true;
     this.api = new RestClient(this);
     this.cdn = new CDNClient(this);
   }
@@ -3775,6 +3793,9 @@ var Message = class extends Event {
   handle(data) {
     return __async(this, null, function* () {
       var _a;
+      if (data.system) {
+        return {};
+      }
       const channel = this.client.channels.cache.get(data.channel);
       if (channel == null ? void 0 : channel.isText()) {
         if (((_a = data.user) == null ? void 0 : _a.bot) && this.client.options.ignoreBots) {
@@ -4407,7 +4428,7 @@ var WebSocketClient = class {
    * @returns {Promise<this>} A promise that resolves when the connection is established.
    */
   connect() {
-    return new Promise((resolve) => {
+    return new Promise((resolve) => __async(this, null, function* () {
       var _a, _b, _c, _d;
       if (((_a = this.socket) == null ? void 0 : _a.readyState) === WebSocket.OPEN && this.ready) {
         return resolve(this);
@@ -4418,15 +4439,16 @@ var WebSocketClient = class {
       if (typeof this.client.token !== "string") {
         throw new Error("INVALID_TOKEN");
       }
-      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}`
-      );
+      yield this.client.init();
+      if (!((_b = this.client.options.ws) == null ? void 0 : _b.instanceURL))
+        return Promise.reject(new Error("WebSocket instance URL not set."));
+      const ws = this.socket = (_d = this.socket) != null ? _d : new WebSocket((_c = this.client.options.ws) == null ? void 0 : _c.instanceURL);
       ws.onopen = this.onOpen.bind(this);
       ws.onmessage = this.onMessage.bind(this);
       ws.onerror = this.onError.bind(this);
       ws.onclose = this.onClose.bind(this);
       ws.addEventListener("open", () => resolve(this));
-    });
+    }));
   }
   /**
    * Destroys the WebSocket connection and clears its state.
@@ -4472,6 +4494,15 @@ var client2 = class extends BaseClient {
     /** The timestamp when the client became ready, or `null` if not ready. */
     this.readyAt = null;
   }
+  /**
+   * Initializes the client.
+   * @private
+   */
+  init() {
+    return __async(this, null, function* () {
+      yield this.api.getConfig();
+    });
+  }
   /**
    * Gets the timestamp when the client became ready.
    *
@@ -4592,8 +4623,6 @@ export {
   VoiceChannel,
   WSEvents,
   apiUrl,
-  cdnUrl,
-  client2 as client,
-  wsUrl
+  client2 as client
 };
 //# sourceMappingURL=index.mjs.map