feat(CaptchaHandler): Must not use due to safety concerns

src/client/Client.js

@@ -850,11 +850,17 @@ class Client extends BaseClient {
    * @returns {Promise<boolean>}
    */
   async authorizeURL(url, options = {}) {
-    const reg = /^https:\/\/discord.com\/(api\/)*oauth2\/authorize(\W+)/gim;
+    const reg = /(api\/)*oauth2\/authorize/gim;
+    let searchParams = {};
     const checkURL = () => {
       try {
         // eslint-disable-next-line no-new
-        new URL(url);
+        const url_ = new URL(url);
+        if (!['discord.com', 'canary.discord.com', 'ptb.discord.com'].includes(url_.hostname)) return false;
+        if (!reg.test(url_.pathname)) return false;
+        for (const [key, value] of url_.searchParams.entries()) {
+          searchParams[key] = value;
+        }
         return true;
       } catch (e) {
         return false;
@@ -867,10 +873,11 @@ class Client extends BaseClient {
       },
       options,
     );
-    if (!url || !checkURL() || !reg.test(url)) {
+    if (!url || !checkURL()) {
       throw new Error('INVALID_URL', url);
     }
-    await this.api.oauth2.authorize[`?${url.replace(reg, '')}`].post({
+    await this.api.oauth2.authorize.post({
+      query: searchParams,
       data: options,
     });
     return true;
@@ -885,6 +892,7 @@ class Client extends BaseClient {
    * @private
    */
   _validateOptions(options = this.options) {
+    const captchaService = ['2captcha'];
     if (typeof options.intents === 'undefined') {
       throw new TypeError('CLIENT_MISSING_INTENTS');
     } else {
@@ -902,6 +910,12 @@ class Client extends BaseClient {
     if (options && typeof options.autoRedeemNitro !== 'boolean') {
       throw new TypeError('CLIENT_INVALID_OPTION', 'autoRedeemNitro', 'a boolean');
     }
+    if (options && options.captchaService && !captchaService.includes(options.captchaService)) {
+      throw new TypeError('CLIENT_INVALID_OPTION', 'captchaService', captchaService.join(', '));
+    }
+    if (options && captchaService.includes(options.captchaService) && typeof options.captchaKey !== 'string') {
+      throw new TypeError('CLIENT_INVALID_OPTION', 'captchaKey', 'a string');
+    }
     if (options && typeof options.DMSync !== 'boolean') {
       throw new TypeError('CLIENT_INVALID_OPTION', 'DMSync', 'a boolean');
     }

src/rest/APIRequest.js

@@ -34,7 +34,7 @@ class APIRequest {
     this.path = `${path}${queryString && `?${queryString}`}`;
   }
 
-  make() {
+  make(captchaKey = undefined) {
     agent ??=
       typeof this.client.options.proxy === 'string' && this.client.options.proxy.length > 0
         ? new proxy(this.client.options.proxy)
@@ -101,6 +101,12 @@ class APIRequest {
       headers = Object.assign(headers, body.getHeaders());
     }
 
+    if (headers['Content-Type'] === 'application/json' && captchaKey && typeof captchaKey == 'string' && body) {
+      body = JSON.parse(body);
+      body.captcha_key = captchaKey;
+      body = JSON.stringify(body);
+    }
+
     const controller = new AbortController();
     const timeout = setTimeout(() => controller.abort(), this.client.options.restRequestTimeout).unref();
     return fetch(url, {

src/rest/CaptchaSolver.js

@@ -0,0 +1,33 @@
+'use strict';
+module.exports = class CaptchaSolver {
+  constructor(service, key) {
+    this.service = '';
+    this.solver = undefined;
+    this._setup(service, key);
+  }
+  _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.solver = new lib.Solver(key);
+          this.solve = siteKey =>
+            new Promise((resolve, reject) => {
+              this.solver
+                .hcaptcha(siteKey, 'discord.com')
+                .then(res => {
+                  resolve(res.data);
+                })
+                .catch(reject);
+            });
+          break;
+        } catch (e) {
+          throw new Error('2captcha module not found, please install it with `npm i 2captcha`');
+        }
+      }
+    }
+  }
+  solve() {}
+};

src/rest/DiscordAPIError.js

@@ -38,7 +38,7 @@ class DiscordAPIError extends Error {
     /**
      * @typedef {Object} Captcha
      * @property {Array<string>} captcha_key ['message']
-     * @property {string} captcha_sitekey Captcha code ???
+     * @property {string} captcha_sitekey Captcha sitekey (hcaptcha)
      * @property {string} captcha_service hcaptcha
      * @property {string} [captcha_rqdata]
      * @property {string} [captcha_rqtoken]

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,12 @@ 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);
   }
 
   get api() {

src/rest/RequestHandler.js

@@ -103,7 +103,7 @@ class RequestHandler {
     }
   }
 
-  async execute(request) {
+  async execute(request, captchaKey) {
     /*
      * After calculations have been done, pre-emptively stop further requests
      * Potentially loop until this task can run if e.g. the global rate limit is hit twice
@@ -194,7 +194,7 @@ class RequestHandler {
     // Perform the request
     let res;
     try {
-      res = await request.make();
+      res = await request.make(captchaKey);
     } catch (error) {
       // Retry the specified number of times for request abortions
       if (request.retries === this.manager.client.options.retryLimit) {
@@ -343,6 +343,27 @@ class RequestHandler {
       let data;
       try {
         data = await parseResponse(res);
+        if (data?.captcha_service && this.manager.client.options.captchaService) {
+          // Retry the request after a captcha is solved
+          this.manager.client.emit(
+            DEBUG,
+            `Hit a captcha while executing a request. Solving captcha ...
+    Method  : ${request.method}
+    Path    : ${request.path}
+    Route   : ${request.route}
+    Sitekey : ${data.captcha_sitekey}`,
+          );
+          const captcha = await this.manager.captchaService.solve(data.captcha_sitekey);
+          this.manager.client.emit(
+            DEBUG,
+            `Captcha solved.
+    Method  : ${request.method}
+    Path    : ${request.path}
+    Route   : ${request.route}
+    Key     : ${captcha}`,
+          );
+          return this.execute(request, captcha);
+        }
       } catch (err) {
         throw new HTTPError(err.message, err.constructor.name, err.status, request);
       }

src/util/Options.js

@@ -39,6 +39,8 @@ const { randomUA } = require('../util/Constants');
  * @property {boolean} [readyStatus=true] Sync state with Discord Client
  * @property {boolean} [autoCookie=true] Automatically add Cookies to Request on startup
  * @property {boolean} [patchVoice=false] Automatically patch @discordjs/voice module (support for call)
+ * @property {string} [captchaService=null] Captcha service to use for solving captcha
+ * @property {string} [captchaKey=null] Captcha service key
  * @property {boolean} [autoRedeemNitro=false] Automaticlly redeems nitro codes <NOTE: there is no cooldown on the auto redeem>
  * @property {string} [proxy] Proxy to use for the WebSocket + REST connection (proxy-agent uri type) {@link https://www.npmjs.com/package/proxy-agent}.
  * @property {boolean} [DMSync=false] Automatically synchronize call status (DM and group) at startup (event synchronization) [Warning: May cause rate limit to gateway)
@@ -148,6 +150,8 @@ class Options extends null {
       readyStatus: true,
       autoCookie: true,
       autoRedeemNitro: false,
+      captchaService: '',
+      captchaKey: null,
       DMSync: false,
       patchVoice: false,
       waitGuildTimeout: 15_000,