djs-selfbot-v13 3.1.6 → 3.1.7

package/src/rest/CaptchaSolver.js

@@ -0,0 +1,132 @@
+'use strict';
+
+const proxyParser = proxy => {
+  const protocolSplit = proxy.split('://');
+  const protocol = protocolSplit.length === 1 ? null : protocolSplit[0];
+  const rest = protocolSplit.length === 1 ? protocolSplit[0] : protocolSplit[1];
+  const authSplit = rest.split('@');
+  if (authSplit.length === 1) {
+    const host = authSplit[0].split(':')[0];
+    const port = Number(authSplit[0].split(':')[1]);
+    const proxyConfig = {
+      host,
+      port,
+    };
+    if (protocol != null) {
+      proxyConfig.protocol = protocol;
+    }
+    return proxyConfig;
+  }
+  const host = authSplit[1].split(':')[0];
+  const port = Number(authSplit[1].split(':')[1]);
+  const [username, password] = authSplit[0].split(':');
+  const proxyConfig = {
+    host,
+    port,
+    auth: {
+      username,
+      password,
+    },
+  };
+  if (protocol != null) {
+    proxyConfig.protocol = protocol;
+  }
+  return proxyConfig;
+};
+
+module.exports = class CaptchaSolver {
+  constructor(service, key, defaultCaptchaSolver, proxyString = '') {
+    this.service = 'custom';
+    this.solver = undefined;
+    this.defaultCaptchaSolver = defaultCaptchaSolver;
+    this.key = null;
+    this.proxy = proxyString.length ? proxyParser(proxyString) : null;
+    this._setup(service, key);
+  }
+  _missingModule(name) {
+    return new Error(`${name} module not found, please install it with \`npm i ${name}\``);
+  }
+  _setup(service, key) {
+    switch (service) {
+      case '2captcha': {
+        if (!key || typeof key !== 'string') throw new Error('2captcha key is not provided');
+        try {
+          const lib = require('2captcha');
+          this.service = '2captcha';
+          this.key = key;
+          this.solver = new lib.Solver(key);
+          this.solve = (data, userAgent) =>
+            new Promise((resolve, reject) => {
+              const siteKey = data.captcha_sitekey;
+              let postD = {};
+              if (this.proxy !== null) {
+                postD = {
+                  proxytype: this.proxy.protocol?.toUpperCase(),
+                  proxy: `${'auth' in this.proxy ? `${this.proxy.auth.username}:${this.proxy.auth.password}@` : ''}${
+                    this.proxy.host
+                  }:${this.proxy.port}`,
+                };
+              }
+              if (data.captcha_rqdata) {
+                postD = {
+                  ...postD,
+                  data: data.captcha_rqdata,
+                  userAgent,
+                };
+              }
+              this.solver
+                .hcaptcha(siteKey, 'https://discord.com/channels/@me', postD)
+                .then(res => {
+                  resolve(res.data);
+                })
+                .catch(reject);
+            });
+          break;
+        } catch (e) {
+          throw this._missingModule('2captcha');
+        }
+      }
+      case 'capmonster': {
+        if (!key || typeof key !== 'string') throw new Error('Capmonster key is not provided');
+        try {
+          const { HCaptchaTask } = require('node-capmonster');
+          this.service = 'capmonster';
+          this.key = key;
+          const client = new HCaptchaTask(this.key);
+          this.solve = (captchaData, userAgent) =>
+            new Promise((resolve, reject) => {
+              if (userAgent) client.setUserAgent(userAgent);
+              if (this.proxy !== null) {
+                client.setProxy(
+                  this.proxy.protocol,
+                  this.proxy.host,
+                  this.proxy.port,
+                  'auth' in this.proxy ? this.proxy.auth.username : undefined,
+                  'auth' in this.proxy ? this.proxy.auth.password : undefined,
+                );
+              }
+              client
+                .createWithTask(
+                  client.task({
+                    websiteURL: 'https://discord.com/channels/@me',
+                    websiteKey: captchaData.captcha_sitekey,
+                    isInvisible: !!captchaData.captcha_rqdata,
+                    data: captchaData.captcha_rqdata,
+                  }),
+                )
+                .then(id => client.joinTaskResult(id))
+                .then(result => resolve(result.gRecaptchaResponse))
+                .catch(reject);
+            });
+        } catch (e) {
+          throw this._missingModule('node-capmonster');
+        }
+        break;
+      }
+      default: {
+        this.solve = this.defaultCaptchaSolver;
+      }
+    }
+  }
+  solve() {}
+};

package/src/rest/DiscordAPIError.js

@@ -25,7 +25,7 @@ class DiscordAPIError extends Error {
 
     /**
      * HTTP error code returned by Discord
-     * @type {number}
+     * @type {number | string}
      */
     this.code = error.code;
 
@@ -35,22 +35,6 @@ class DiscordAPIError extends Error {
      */
     this.httpStatus = status;
 
-    /**
-     * The data associated with the request that caused this error
-     * @type {HTTPErrorData}
-     */
-    this.requestData = {
-      json: request.options.data,
-      files: request.options.files ?? [],
-      headers: request.options.headers,
-    };
-
-    /**
-     * The number of times this request has been retried
-     * @type {number}
-     */
-    this.retries = request.retries;
-
     /**
      * @typedef {Object} Captcha
      * @property {Array<string>} captcha_key ['message']
@@ -65,6 +49,21 @@ class DiscordAPIError extends Error {
      * @type {Captcha | null}
      */
     this.captcha = error?.captcha_service ? error : null;
+
+    /**
+     * The data associated with the request that caused this error
+     * @type {HTTPErrorData}
+     */
+    this.requestData = {
+      json: request.options.data,
+      files: request.options.files ?? [],
+    };
+
+    /**
+     * The number of times this request has been retried
+     * @type {number}
+     */
+    this.retries = request.retries;
   }
 
   /**

package/src/rest/RESTManager.js

@@ -4,6 +4,7 @@ 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');
@@ -22,6 +23,17 @@ 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() {
@@ -29,8 +41,16 @@ 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 token?.replace(/Bot /g, '');
+    if (token) return `Bot ${token}`;
+     */
     throw new Error('TOKEN_MISSING');
   }
 

package/src/rest/RequestHandler.js

@@ -2,12 +2,13 @@
 
 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 },
+  Events: { DEBUG, RATE_LIMIT, INVALID_REQUEST_WARNING, API_RESPONSE, API_REQUEST, CAPTCHA_REQUIRED },
 } = require('../util/Constants');
 
 const captchaMessage = [
@@ -18,13 +19,11 @@ 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();
+  return res.arrayBuffer(); // Cre: TheDevYellowy
 }
 
 function getAPIOffset(serverDate) {
@@ -355,63 +354,50 @@ class RequestHandler {
       let data;
       try {
         data = await parseResponse(res);
-        // Captcha
+        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);
+        }
         if (
           data?.captcha_service &&
-          typeof this.manager.client.options.captchaSolver == 'function' &&
+          this.manager.client.options.captchaService &&
           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 (${data.captcha_key.join(', ')})
+            `Hit a captcha while executing a request. Solving captcha ...
     Method  : ${request.method}
     Path    : ${request.path}
     Route   : ${request.route}
-    Sitekey : ${data.captcha_sitekey}
-    rqToken : ${data.captcha_rqtoken}`,
+    Info    : ${inspect(data, { depth: null })}`,
+          );
+          const captcha = await this.manager.captchaService.solve(
+            data,
+            this.manager.client.options.http.headers['User-Agent'],
           );
-          const captcha = await this.manager.client.options.captchaSolver(data, request.fullUserAgent);
+          // Sleep: await this.manager.client.sleep(5_000);
           this.manager.client.emit(
             DEBUG,
             `Captcha details:
     Method  : ${request.method}
     Path    : ${request.path}
     Route   : ${request.route}
-    Key     : ${captcha ? `${captcha.slice(0, 120)}...` : '[Captcha not solved]'}
+    Key     : ${captcha ? `${captcha.slice(0, 30)}...` : '[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);
     }