discord-self-lite 0.1.10 → 0.1.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "discord-self-lite",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "description": "Lightweight Discord selfbot library",
   "keywords": [
     "discord",

package/src/classes/Channel.js

@@ -55,6 +55,7 @@ class Channel {
    */
   async send(payload) {
     const data = await this.rest.sendMessage(this.id, payload);
+    if (!data) return null;
     return new Message(this.client, data);
   }
 
@@ -134,7 +135,7 @@ class Channel {
    * @returns {Guild|null} The guild instance or null if not a guild channel
    */
   getGuild() {
-    const guildId = this.data.guild_id;
+    const guildId = this.guildId;
     if (!guildId) return null;
     return this.client.getGuild(guildId);
   }
@@ -144,7 +145,7 @@ class Channel {
    * @returns {Promise<Guild|null>} The guild instance or null if not a guild channel
    */
   async fetchGuild() {
-    const guildId = this.data.guild_id;
+    const guildId = this.guildId;
     if (!guildId) return null;
     return await this.client.fetchGuild(guildId);
   }
@@ -213,7 +214,7 @@ class Channel {
     if (this.isDM() || this.isGroupDM()) {
       return `https://discord.com/channels/@me/${this.id}`;
     }
-    const guildId = this.data.guild_id;
+    const guildId = this.guildId;
     return `https://discord.com/channels/${guildId}/${this.id}`;
   }
 
@@ -234,8 +235,8 @@ class Channel {
     }
 
     // Apply channel permission overwrites
-    if (this.data.permission_overwrites) {
-      const overwrites = this.data.permission_overwrites;
+    if (this.permissionOverwrites) {
+      const overwrites = this.permissionOverwrites;
 
       // Role overwrites (deny takes precedence over allow)
       const memberRoles = member.roles || [];
@@ -244,7 +245,7 @@ class Channel {
           // Role overwrite
           if (
             memberRoles.includes(overwrite.id) ||
-            overwrite.id === this.data.guild_id
+            overwrite.id === this.guildId
           ) {
             permissions &= ~toBigInt(overwrite.deny || 0);
             permissions |= toBigInt(overwrite.allow || 0);

package/src/classes/Client.js

@@ -49,7 +49,27 @@ class Client extends EventEmitter {
   async login(token) {
     this.token = token;
     this.rest = new RestManager(this.token, this.options.apiVersion || 9);
-    await this.connect();
+
+    return new Promise((resolve, reject) => {
+      const onReady = () => {
+        this.removeListener("error", onError);
+        resolve();
+      };
+
+      const onError = (msg) => {
+        this.removeListener("ready", onReady);
+        reject(new Error(msg));
+      };
+
+      this.once("ready", onReady);
+      this.once("error", onError);
+
+      this.connect().catch((err) => {
+        this.removeListener("ready", onReady);
+        this.removeListener("error", onError);
+        reject(err);
+      });
+    });
   }
 
   /**

package/src/classes/Guild.js

@@ -105,10 +105,10 @@ class Guild {
    * @returns {string|null} The icon URL or null if no icon
    */
   getIconURL(options = {}) {
-    if (!this.data.icon) return null;
+    if (!this.icon) return null;
     const size = options.size || 512;
     const format = options.format || "png";
-    return `https://cdn.discordapp.com/icons/${this.id}/${this.data.icon}.${format}?size=${size}`;
+    return `https://cdn.discordapp.com/icons/${this.id}/${this.icon}.${format}?size=${size}`;
   }
 
   /**
@@ -119,10 +119,10 @@ class Guild {
    * @returns {string|null} The banner URL or null if no banner
    */
   getBannerURL(options = {}) {
-    if (!this.data.banner) return null;
+    if (!this.banner) return null;
     const size = options.size || 512;
     const format = options.format || "png";
-    return `https://cdn.discordapp.com/banners/${this.id}/${this.data.banner}.${format}?size=${size}`;
+    return `https://cdn.discordapp.com/banners/${this.id}/${this.banner}.${format}?size=${size}`;
   }
 
   /**

package/src/classes/Message.js

@@ -1,6 +1,21 @@
-const WebSocketError = require("./WebSocketError");
 const User = require("./User");
 
+function camelCaseKeys(obj) {
+  if (Array.isArray(obj)) {
+    return obj.map((item) => camelCaseKeys(item));
+  } else if (obj !== null && typeof obj === "object") {
+    const newObj = {};
+    for (const [key, value] of Object.entries(obj)) {
+      const camelKey = key.replace(/_([a-z])/g, (_, letter) =>
+        letter.toUpperCase(),
+      );
+      newObj[camelKey] = camelCaseKeys(value);
+    }
+    return newObj;
+  }
+  return obj;
+}
+
 /**
  * Represents a Discord message
  */
@@ -32,12 +47,13 @@ class Message {
       }
     }
 
-    this.components = this.components || [];
+    this.components = camelCaseKeys(this.components || []);
     this.attachments = this.attachments || [];
-    this.embeds = this.embeds || [];
+    this.embeds = camelCaseKeys(this.embeds || []);
     this.mentions = this.mentions || [];
     this.mentionRoles = this.mentionRoles || [];
     this.reactions = this.reactions || [];
+    this.url = `https://discord.com/channels/${this.guildId ? this.guildId : "@me"}/${this.channelId}/${this.id}`;
   }
 
   /**
@@ -65,9 +81,9 @@ class Message {
       this[camelKey] = value;
     }
 
-    this.components = this.components || [];
+    this.components = camelCaseKeys(this.components || []);
     this.attachments = this.attachments || [];
-    this.embeds = this.embeds || [];
+    this.embeds = camelCaseKeys(this.embeds || []);
     this.mentions = this.mentions || [];
     this.mentionRoles = this.mentionRoles || [];
     this.reactions = this.reactions || [];
@@ -117,11 +133,11 @@ class Message {
 
     // Get all buttons from components
     const buttons = [];
-    if (this.data.components && Array.isArray(this.data.components)) {
-      for (const row of this.data.components) {
+    if (this.components && Array.isArray(this.components)) {
+      for (const row of this.components) {
         if (row.components && Array.isArray(row.components)) {
           for (const component of row.components) {
-            if (component.type === 2 && component.custom_id) {
+            if (component.type === 2 && component.customId) {
               // Type 2 is button
               buttons.push(component);
             }
@@ -137,7 +153,7 @@ class Message {
     // Handle different input types
     if (input === null) {
       // No input: click first button
-      customId = buttons[0].custom_id;
+      customId = buttons[0].customId;
     } else if (typeof input === "number") {
       // Integer input: click button at that index
       if (input < 0 || input >= buttons.length) {
@@ -147,21 +163,21 @@ class Message {
           } button(s) (0-${buttons.length - 1})`,
         );
       }
-      customId = buttons[input].custom_id;
+      customId = buttons[input].customId;
     } else if (typeof input === "string") {
-      // String input: use as custom_id directly (preserving original behavior)
+      // String input: use as customId directly
       customId = input;
     } else {
       throw new Error("Invalid input type. Expected null, number, or string.");
     }
 
     // Get required data for button interaction
-    const applicationId = this.data.application_id || this.author.id;
-    const messageFlags = this.data.flags || 0;
+    const applicationId = this.applicationId || this.author.id;
+    const messageFlags = this.flags || 0;
 
     if (!this.client.sessionId) {
-      throw new WebSocketError(
-        "No session ID available - client not properly connected",
+      throw new Error(
+        "No session ID available - client not properly connected (yet).",
       );
     }
 
@@ -197,7 +213,7 @@ class Message {
    * Returns the referenced `Message` instance or `null` if not available.
    */
   async fetchReference() {
-    const ref = this.messageReference || this.data?.message_reference;
+    const ref = this.data?.message_reference;
     if (!ref) return null;
 
     const messageId = ref.messageId || ref.message_id;
@@ -207,13 +223,15 @@ class Message {
     let channel;
     try {
       channel = await this.client.resolveChannel(channelId);
-    } catch {
+    } catch (error) {
+      console.error(error);
       return null;
     }
 
     try {
       return await channel.fetchMessage(messageId);
-    } catch {
+    } catch (error) {
+      console.error(error);
       return null;
     }
   }

package/src/connection/rest/RestManager.js

@@ -74,7 +74,7 @@ class RestManager {
       });
 
       console.log(
-        `⏸️ Suspending route ${routeKey} for 2 minutes (pre-emptive)`,
+        `⏸️  Suspending route ${routeKey} for 2 minutes (pre-emptive)`,
       );
 
       // Clear queued requests for this route
@@ -192,7 +192,7 @@ class RestManager {
           });
 
           console.log(
-            `⏸️ Suspending route ${routeKey} for 2 minutes (queue processing)`,
+            `⏸️  Suspending route ${routeKey} for 2 minutes (queue processing)`,
           );
 
           // Clear remaining queued requests for this route
@@ -267,15 +267,14 @@ class RestManager {
               `⏳ Global rate limit set, waiting ${retryAfter + 2000}ms`,
             );
           } else {
-            // Immediately suspend the route for 2 minutes on first 429
-            const suspensionTime = 2 * 60 * 1000;
+            const suspensionTime = retryAfter + 500;
             this.suspendedRoutes.set(routeKey, {
               suspendedUntil: Date.now() + suspensionTime,
               reason: `429 response on attempt ${attempt + 1}`,
             });
 
             console.log(
-              `⏸️ Suspending route ${routeKey} for 2 minutes (429 response)`,
+              `⏸️  Suspending route ${routeKey} for ${suspensionTime}ms (429 response)`,
             );
 
             // Clear queue for this route
@@ -353,6 +352,15 @@ class RestManager {
 
         return await response.json();
       } catch (error) {
+        // Do not retry on Missing Permissions (50013)
+        if (
+          error.name === "DiscordAPIError" &&
+          error.fullError &&
+          error.fullError.code === 50013
+        ) {
+          throw error;
+        }
+
         if (attempt === maxRetries - 1) {
           throw error;
         }
@@ -672,7 +680,19 @@ class RestManager {
    * @returns {Promise<object>} Message data
    */
   async fetchMessage(channelId, messageId) {
-    return await this.request(`/channels/${channelId}/messages/${messageId}`);
+    const messages = await this.request(
+      `/channels/${channelId}/messages?limit=1&around=${messageId}`,
+    );
+    if (Array.isArray(messages)) {
+      const message = messages.find((m) => m.id === messageId);
+      if (message) return message;
+    }
+    throw new DiscordAPIError(
+      "Unknown Message",
+      404,
+      `/channels/${channelId}/messages/${messageId}`,
+      { message: "Unknown Message", code: 10008 },
+    );
   }
 
   /**

package/src/connection/ws/WebSocket.js

@@ -4,8 +4,6 @@ const Message = require("../../classes/Message");
 const Guild = require("../../classes/Guild");
 const Channel = require("../../classes/Channel");
 const ClientUser = require("../../classes/ClientUser");
-const WebSocketError = require("../../classes/WebSocketError");
-
 class DiscordWebSocket extends EventEmitter {
   constructor(client, token, options = {}) {
     super();
@@ -31,7 +29,7 @@ class DiscordWebSocket extends EventEmitter {
     this.ws = new WebSocket(this.gatewayUrl);
 
     this.ws.on("open", () => {
-      console.log("WebSocket connected");
+      this.client.emit("debug", "WebSocket connected");
       this.client.emit("connected");
     });
 
@@ -40,23 +38,47 @@ class DiscordWebSocket extends EventEmitter {
     });
 
     this.ws.on("close", (code, reason) => {
-      console.log(`WebSocket closed: ${code} - ${reason}`);
+      this.client.emit("debug", `WebSocket closed: ${code} - ${reason}`);
       this.ready = false;
       if (this.heartbeatInterval) {
         clearInterval(this.heartbeatInterval);
         this.heartbeatInterval = null;
       }
       this.client.emit("disconnected", code, reason);
+      const terminalCodes = [4004, 4010, 4011, 4012, 4013, 4014];
+
+      if (terminalCodes.includes(code)) {
+        if (code === 4004) {
+          try {
+            if (this.ws) this.ws.terminate();
+          } catch {
+            /* ignore */
+          }
+          this.ws = null;
+          this.client.emit(
+            "error",
+            `Authentication failed (close code ${code}). Please check your token and try again.`,
+          );
+          return;
+        }
+
+        this.client.emit(
+          "debug",
+          `Terminal error received (${code}). Connection will not be restarted. (Reason: ${reason})`,
+        );
+        return;
+      }
+
       if (code !== 1000) {
-        // Not a clean close
         this.reconnect();
       }
     });
 
     this.ws.on("error", (error) => {
-      const wsError = new WebSocketError(`WebSocket error: ${error.message}`);
-      console.error(wsError);
-      this.client.emit("error", wsError);
+      this.client.emit(
+        "error",
+        `WebSocket error: ${error && error.message ? error.message : String(error)}`,
+      );
     });
   }
 
@@ -87,7 +109,7 @@ class DiscordWebSocket extends EventEmitter {
         this.handleDispatch(message);
         break;
       default:
-        console.log("Unhandled op:", message.op);
+        this.client.emit("debug", `Unhandled op: ${message.op}`);
     }
   }
 
@@ -185,9 +207,9 @@ class DiscordWebSocket extends EventEmitter {
         const member = new GuildMember(this.client, memberData, guild);
         guild._members.set(this.client.user.id, member);
       } catch (err) {
-        console.warn(
-          `Failed to fetch member for guild ${guild.id}:`,
-          err.message,
+        this.client.emit(
+          "debug",
+          `Failed to fetch member for guild ${guild.id}: ${err && err.message ? err.message : String(err)}`,
         );
       }
     }
@@ -197,16 +219,14 @@ class DiscordWebSocket extends EventEmitter {
 
   reconnect() {
     if (this.reconnectAttempts >= this.maxReconnectAttempts) {
-      const err = new WebSocketError("Max reconnect attempts reached");
-      console.error(err);
-      this.client.emit("error", err);
+      this.client.emit("error", "Max reconnect attempts reached");
       this.client.emit("maxReconnects");
       return;
     }
 
     this.reconnectAttempts++;
     const delay = Math.min(1000 * Math.pow(2, this.reconnectAttempts), 30000); // Exponential backoff
-    console.log(`Reconnecting in ${delay}ms...`);
+    this.client.emit("debug", `Reconnecting in ${delay}ms...`);
     setTimeout(() => {
       this.connect();
     }, delay);

package/src/classes/WebSocketError.js

@@ -1,18 +0,0 @@
-/**
- * Represents an error related to the WebSocket connection
- * @extends Error
- */
-class WebSocketError extends Error {
-  /**
-   * Create a new WebSocketError
-   * @param {string} message - The error message
-   * @param {number} [code] - The WebSocket close code
-   */
-  constructor(message, code) {
-    super(message);
-    this.name = "WebSocketError";
-    this.code = code;
-  }
-}
-
-module.exports = WebSocketError;