djs-selfbot-v13 3.1.7 → 3.2.2

package/src/rest/DiscordAPIError.js

@@ -25,7 +25,7 @@ class DiscordAPIError extends Error {
 
     /**
      * HTTP error code returned by Discord
-     * @type {number | string}
+     * @type {number}
      */
     this.code = error.code;
 
@@ -35,21 +35,6 @@ class DiscordAPIError extends Error {
      */
     this.httpStatus = status;
 
-    /**
-     * @typedef {Object} Captcha
-     * @property {Array<string>} captcha_key ['message']
-     * @property {string} captcha_sitekey Captcha sitekey (hcaptcha)
-     * @property {string} captcha_service hcaptcha
-     * @property {string} [captcha_rqdata]
-     * @property {string} [captcha_rqtoken]
-     */
-
-    /**
-     * Captcha response data if the request requires a captcha
-     * @type {Captcha | null}
-     */
-    this.captcha = error?.captcha_service ? error : null;
-
     /**
      * The data associated with the request that caused this error
      * @type {HTTPErrorData}
@@ -57,6 +42,7 @@ class DiscordAPIError extends Error {
     this.requestData = {
       json: request.options.data,
       files: request.options.files ?? [],
+      headers: request.options.headers,
     };
 
     /**
@@ -64,6 +50,21 @@ class DiscordAPIError extends Error {
      * @type {number}
      */
     this.retries = request.retries;
+
+    /**
+     * @typedef {Object} Captcha
+     * @property {Array<string>} captcha_key ['message']
+     * @property {string} captcha_sitekey Captcha sitekey (hcaptcha)
+     * @property {string} captcha_service hcaptcha
+     * @property {string} [captcha_rqdata]
+     * @property {string} [captcha_rqtoken]
+     */
+
+    /**
+     * Captcha response data if the request requires a captcha
+     * @type {Captcha | null}
+     */
+    this.captcha = error?.captcha_service ? error : null;
   }
 
   /**

package/src/rest/RESTManager.js

@@ -4,7 +4,6 @@ const { setInterval } = require('node:timers');
 const { Collection } = require('@discordjs/collection');
 const APIRequest = require('./APIRequest');
 const routeBuilder = require('./APIRouter');
-const CaptchaSolver = require('./CaptchaSolver');
 const RequestHandler = require('./RequestHandler');
 const { Error } = require('../errors');
 const { Endpoints } = require('../util/Constants');
@@ -23,17 +22,6 @@ class RESTManager {
         this.handlers.sweep(handler => handler._inactive);
       }, client.options.restSweepInterval * 1_000).unref();
     }
-    this.captchaService = null;
-    this.setup();
-  }
-
-  setup() {
-    this.captchaService = new CaptchaSolver(
-      this.client.options.captchaService,
-      this.client.options.captchaKey,
-      this.client.options.captchaSolver,
-      this.client.options.captchaWithProxy ? this.client.options.proxy : '',
-    );
   }
 
   get api() {
@@ -41,16 +29,8 @@ class RESTManager {
   }
 
   getAuth() {
-    if ((this.client.token && this.client.user && this.client.user.bot) || this.client.accessToken) {
-      return `Bot ${this.client.token}`;
-    } else if (this.client.token) {
-      return this.client.token;
-    }
-    /*
-    // v13.7
     const token = this.client.token ?? this.client.accessToken;
-    if (token) return `Bot ${token}`;
-     */
+    if (token) return token?.replace(/Bot /g, '');
     throw new Error('TOKEN_MISSING');
   }
 

package/src/rest/RequestHandler.js

@@ -2,13 +2,12 @@
 
 const { setTimeout } = require('node:timers');
 const { setTimeout: sleep } = require('node:timers/promises');
-const { inspect } = require('util');
 const { AsyncQueue } = require('@sapphire/async-queue');
 const DiscordAPIError = require('./DiscordAPIError');
 const HTTPError = require('./HTTPError');
 const RateLimitError = require('./RateLimitError');
 const {
-  Events: { DEBUG, RATE_LIMIT, INVALID_REQUEST_WARNING, API_RESPONSE, API_REQUEST, CAPTCHA_REQUIRED },
+  Events: { DEBUG, RATE_LIMIT, INVALID_REQUEST_WARNING, API_RESPONSE, API_REQUEST },
 } = require('../util/Constants');
 
 const captchaMessage = [
@@ -19,11 +18,13 @@ const captchaMessage = [
   'invalid-response',
   'You need to update your app',
   'response-already-used-error',
+  'rqkey-mismatch',
+  'sitekey-secret-mismatch',
 ];
 
 function parseResponse(res) {
   if (res.headers.get('content-type')?.startsWith('application/json')) return res.json();
-  return res.arrayBuffer(); // Cre: TheDevYellowy
+  return res.arrayBuffer();
 }
 
 function getAPIOffset(serverDate) {
@@ -354,50 +355,63 @@ class RequestHandler {
       let data;
       try {
         data = await parseResponse(res);
-        if (data?.captcha_service) {
-          /**
-           * Emitted when a request is blocked by a captcha
-           * @event Client#captchaRequired
-           * @param {Request} request The request that was blocked
-           * @param {Captcha} data The data returned by Discord
-           */
-          this.manager.client.emit(CAPTCHA_REQUIRED, request, data);
-        }
+        // Captcha
         if (
           data?.captcha_service &&
-          this.manager.client.options.captchaService &&
+          typeof this.manager.client.options.captchaSolver == 'function' &&
           request.retries < this.manager.client.options.captchaRetryLimit &&
           captchaMessage.some(s => data.captcha_key[0].includes(s))
         ) {
           // Retry the request after a captcha is solved
           this.manager.client.emit(
             DEBUG,
-            `Hit a captcha while executing a request. Solving captcha ...
+            `Hit a captcha while executing a request (${data.captcha_key.join(', ')})
     Method  : ${request.method}
     Path    : ${request.path}
     Route   : ${request.route}
-    Info    : ${inspect(data, { depth: null })}`,
-          );
-          const captcha = await this.manager.captchaService.solve(
-            data,
-            this.manager.client.options.http.headers['User-Agent'],
+    Sitekey : ${data.captcha_sitekey}
+    rqToken : ${data.captcha_rqtoken}`,
           );
-          // Sleep: await this.manager.client.sleep(5_000);
+          const captcha = await this.manager.client.options.captchaSolver(data, request.fullUserAgent);
           this.manager.client.emit(
             DEBUG,
             `Captcha details:
     Method  : ${request.method}
     Path    : ${request.path}
     Route   : ${request.route}
-    Key     : ${captcha ? `${captcha.slice(0, 30)}...` : '[Captcha not solved]'}
+    Key     : ${captcha ? `${captcha.slice(0, 120)}...` : '[Captcha not solved]'}
     rqToken : ${data.captcha_rqtoken}`,
           );
           request.retries++;
           return this.execute(request, captcha, data.captcha_rqtoken);
         }
+        // Two factor
+        if (data?.code && data.code == 60003 && request.options.mfaCode && request.retries < 1) {
+          this.manager.client.emit(
+            DEBUG,
+            `${data.message}
+    Method  : ${request.method}
+    Path    : ${request.path}
+    Route   : ${request.route}
+    mfaCode : ${request.options.mfaCode}`,
+          );
+          // Get ticket
+          const mfaData = data.mfa;
+          const mfaPost = await this.manager.client.api.mfa.finish.post({
+            data: {
+              ticket: mfaData.ticket,
+              data: request.options.mfaCode,
+              mfa_type: 'totp',
+            },
+          });
+          request.options.mfaToken = mfaPost.token;
+          request.retries++;
+          return this.execute(request);
+        }
       } catch (err) {
         throw new HTTPError(err.message, err.constructor.name, err.status, request);
       }
+
       throw new DiscordAPIError(data, res.status, request);
     }