djs-selfbot-v13 3.2.2 → 3.7.2

package/src/rest/DiscordAPIError.js

@@ -1,104 +1,119 @@
-'use strict';
-
-/**
- * Represents an error from the Discord API.
- * @extends Error
- */
-class DiscordAPIError extends Error {
-  constructor(error, status, request) {
-    super();
-    const flattened = this.constructor.flattenErrors(error.errors ?? error).join('\n');
-    this.name = 'DiscordAPIError';
-    this.message = error.message && flattened ? `${error.message}\n${flattened}` : error.message ?? flattened;
-
-    /**
-     * The HTTP method used for the request
-     * @type {string}
-     */
-    this.method = request.method;
-
-    /**
-     * The path of the request relative to the HTTP endpoint
-     * @type {string}
-     */
-    this.path = request.path;
-
-    /**
-     * HTTP error code returned by Discord
-     * @type {number}
-     */
-    this.code = error.code;
-
-    /**
-     * The HTTP status code
-     * @type {number}
-     */
-    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']
-     * @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;
-  }
-
-  /**
-   * Flattens an errors object returned from the API into an array.
-   * @param {APIError} obj Discord errors object
-   * @param {string} [key] Used internally to determine key names of nested fields
-   * @returns {string[]}
-   * @private
-   */
-  static flattenErrors(obj, key = '') {
-    let messages = [];
-
-    for (const [k, v] of Object.entries(obj)) {
-      if (k === 'message') continue;
-      const newKey = key ? (isNaN(k) ? `${key}.${k}` : `${key}[${k}]`) : k;
-
-      if (v._errors) {
-        messages.push(`${newKey}: ${v._errors.map(e => e.message).join(' ')}`);
-      } else if (v.code ?? v.message) {
-        messages.push(`${v.code ? `${v.code}: ` : ''}${v.message}`.trim());
-      } else if (typeof v === 'string') {
-        messages.push(v);
-      } else {
-        messages = messages.concat(this.flattenErrors(v, newKey));
-      }
-    }
-
-    return messages;
-  }
-}
-
-module.exports = DiscordAPIError;
-
-/**
- * @external APIError
- * @see {@link https://discord.com/developers/docs/reference#error-messages}
- */
+'use strict';
+
+/**
+ * Represents an error from the Discord API.
+ * @extends Error
+ */
+class DiscordAPIError extends Error {
+  constructor(error, status, request) {
+    super();
+    const flattened = this.constructor.flattenErrors(error.errors ?? error).join('\n');
+    this.name = 'DiscordAPIError';
+    this.message = error.message && flattened ? `${error.message}\n${flattened}` : error.message ?? flattened;
+
+    /**
+     * The HTTP method used for the request
+     * @type {string}
+     */
+    this.method = request.method;
+
+    /**
+     * The path of the request relative to the HTTP endpoint
+     * @type {string}
+     */
+    this.path = request.path;
+
+    /**
+     * HTTP error code returned by Discord
+     * @type {number}
+     */
+    this.code = error.code;
+
+    /**
+     * The HTTP status code
+     * @type {number}
+     */
+    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']
+     * @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;
+  }
+
+  /**
+   * A special `40333` JSON error code is returned if your request is blocked by Cloudflare.
+   * This may be due to a malformed request or improper user agent.
+   * The response resembles a normal error structure:
+   * @type {boolean}
+   * @example
+   * {
+   *  "message": "internal network error",
+   *  "code": 40333
+   * }
+   */
+  get isBlockedByCloudflare() {
+    return this.code === 40333;
+  }
+
+  /**
+   * Flattens an errors object returned from the API into an array.
+   * @param {APIError} obj Discord errors object
+   * @param {string} [key] Used internally to determine key names of nested fields
+   * @returns {string[]}
+   * @private
+   */
+  static flattenErrors(obj, key = '') {
+    let messages = [];
+
+    for (const [k, v] of Object.entries(obj)) {
+      if (k === 'message') continue;
+      const newKey = key ? (isNaN(k) ? `${key}.${k}` : `${key}[${k}]`) : k;
+
+      if (v._errors) {
+        messages.push(`${newKey}: ${v._errors.map(e => e.message).join(' ')}`);
+      } else if (v.code ?? v.message) {
+        messages.push(`${v.code ? `${v.code}: ` : ''}${v.message}`.trim());
+      } else if (typeof v === 'string') {
+        messages.push(v);
+      } else {
+        messages = messages.concat(this.flattenErrors(v, newKey));
+      }
+    }
+
+    return messages;
+  }
+}
+
+module.exports = DiscordAPIError;
+
+/**
+ * @external APIError
+ * @see {@link https://discord.com/developers/docs/reference#error-messages}
+ */

package/src/rest/HTTPError.js

@@ -1,62 +1,62 @@
-'use strict';
-
-/**
- * Represents an HTTP error from a request.
- * @extends Error
- */
-class HTTPError extends Error {
-  constructor(message, name, code, request) {
-    super(message);
-
-    /**
-     * The name of the error
-     * @type {string}
-     */
-    this.name = name;
-
-    /**
-     * HTTP error code returned from the request
-     * @type {number}
-     */
-    this.code = code ?? 500;
-
-    /**
-     * The HTTP method used for the request
-     * @type {string}
-     */
-    this.method = request.method;
-
-    /**
-     * The path of the request relative to the HTTP endpoint
-     * @type {string}
-     */
-    this.path = request.path;
-
-    /**
-     * The HTTP data that was sent to Discord
-     * @typedef {Object} HTTPErrorData
-     * @property {*} json The JSON data that was sent
-     * @property {HTTPAttachmentData[]} files The files that were sent with this request, if any
-     */
-
-    /**
-     * The attachment data that is sent to Discord
-     * @typedef {Object} HTTPAttachmentData
-     * @property {string|Buffer|Stream} attachment The source of this attachment data
-     * @property {string} name The file name
-     * @property {Buffer|Stream} file The file buffer
-     */
-
-    /**
-     * 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,
-    };
-  }
-}
-
-module.exports = HTTPError;
+'use strict';
+
+/**
+ * Represents an HTTP error from a request.
+ * @extends Error
+ */
+class HTTPError extends Error {
+  constructor(message, name, code, request) {
+    super(message);
+
+    /**
+     * The name of the error
+     * @type {string}
+     */
+    this.name = name;
+
+    /**
+     * HTTP error code returned from the request
+     * @type {number}
+     */
+    this.code = code ?? 500;
+
+    /**
+     * The HTTP method used for the request
+     * @type {string}
+     */
+    this.method = request.method;
+
+    /**
+     * The path of the request relative to the HTTP endpoint
+     * @type {string}
+     */
+    this.path = request.path;
+
+    /**
+     * The HTTP data that was sent to Discord
+     * @typedef {Object} HTTPErrorData
+     * @property {*} json The JSON data that was sent
+     * @property {HTTPAttachmentData[]} files The files that were sent with this request, if any
+     */
+
+    /**
+     * The attachment data that is sent to Discord
+     * @typedef {Object} HTTPAttachmentData
+     * @property {string|Buffer|Stream} attachment The source of this attachment data
+     * @property {string} name The file name
+     * @property {Buffer|Stream} file The file buffer
+     */
+
+    /**
+     * 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,
+    };
+  }
+}
+
+module.exports = HTTPError;

package/src/rest/RESTManager.js

@@ -1,62 +1,67 @@
-'use strict';
-
-const { setInterval } = require('node:timers');
-const { Collection } = require('@discordjs/collection');
-const APIRequest = require('./APIRequest');
-const routeBuilder = require('./APIRouter');
-const RequestHandler = require('./RequestHandler');
-const { Error } = require('../errors');
-const { Endpoints } = require('../util/Constants');
-
-class RESTManager {
-  constructor(client) {
-    this.client = client;
-    this.handlers = new Collection();
-    this.versioned = true;
-    this.globalLimit = client.options.restGlobalRateLimit > 0 ? client.options.restGlobalRateLimit : Infinity;
-    this.globalRemaining = this.globalLimit;
-    this.globalReset = null;
-    this.globalDelay = null;
-    if (client.options.restSweepInterval > 0) {
-      this.sweepInterval = setInterval(() => {
-        this.handlers.sweep(handler => handler._inactive);
-      }, client.options.restSweepInterval * 1_000).unref();
-    }
-  }
-
-  get api() {
-    return routeBuilder(this);
-  }
-
-  getAuth() {
-    const token = this.client.token ?? this.client.accessToken;
-    if (token) return token?.replace(/Bot /g, '');
-    throw new Error('TOKEN_MISSING');
-  }
-
-  get cdn() {
-    return Endpoints.CDN(this.client.options.http.cdn);
-  }
-
-  request(method, url, options = {}) {
-    const apiRequest = new APIRequest(this, method, url, options);
-    let handler = this.handlers.get(apiRequest.route);
-
-    if (!handler) {
-      handler = new RequestHandler(this);
-      this.handlers.set(apiRequest.route, handler);
-    }
-
-    return handler.push(apiRequest);
-  }
-
-  get endpoint() {
-    return this.client.options.http.api;
-  }
-
-  set endpoint(endpoint) {
-    this.client.options.http.api = endpoint;
-  }
-}
-
-module.exports = RESTManager;
+'use strict';
+
+const { setInterval } = require('node:timers');
+const { Collection } = require('@discordjs/collection');
+const makeFetchCookie = require('fetch-cookie');
+const { CookieJar } = require('tough-cookie');
+const { fetch: fetchOriginal } = require('undici');
+const APIRequest = require('./APIRequest');
+const routeBuilder = require('./APIRouter');
+const RequestHandler = require('./RequestHandler');
+const { Error } = require('../errors');
+const { Endpoints } = require('../util/Constants');
+
+class RESTManager {
+  constructor(client) {
+    this.client = client;
+    this.handlers = new Collection();
+    this.versioned = true;
+    this.globalLimit = client.options.restGlobalRateLimit > 0 ? client.options.restGlobalRateLimit : Infinity;
+    this.globalRemaining = this.globalLimit;
+    this.globalReset = null;
+    this.globalDelay = null;
+    this.cookieJar = new CookieJar();
+    this.fetch = makeFetchCookie.default(fetchOriginal, this.cookieJar);
+    if (client.options.restSweepInterval > 0) {
+      this.sweepInterval = setInterval(() => {
+        this.handlers.sweep(handler => handler._inactive);
+      }, client.options.restSweepInterval * 1_000).unref();
+    }
+  }
+
+  get api() {
+    return routeBuilder(this);
+  }
+
+  getAuth() {
+    const token = this.client.token ?? this.client.accessToken;
+    if (token) return token?.replace(/Bot /g, '');
+    throw new Error('TOKEN_MISSING');
+  }
+
+  get cdn() {
+    return Endpoints.CDN(this.client.options.http.cdn);
+  }
+
+  request(method, url, options = {}) {
+    const apiRequest = new APIRequest(this, method, url, options);
+    let handler = this.handlers.get(apiRequest.route);
+
+    if (!handler) {
+      handler = new RequestHandler(this);
+      this.handlers.set(apiRequest.route, handler);
+    }
+
+    return handler.push(apiRequest);
+  }
+
+  get endpoint() {
+    return this.client.options.http.api;
+  }
+
+  set endpoint(endpoint) {
+    this.client.options.http.api = endpoint;
+  }
+}
+
+module.exports = RESTManager;

package/src/rest/RateLimitError.js

@@ -1,55 +1,55 @@
-'use strict';
-
-/**
- * Represents a RateLimit error from a request.
- * @extends Error
- */
-class RateLimitError extends Error {
-  constructor({ timeout, limit, method, path, route, global }) {
-    super(`A ${global ? 'global ' : ''}rate limit was hit on route ${route}`);
-
-    /**
-     * The name of the error
-     * @type {string}
-     */
-    this.name = 'RateLimitError';
-
-    /**
-     * Time until this rate limit ends, in milliseconds
-     * @type {number}
-     */
-    this.timeout = timeout;
-
-    /**
-     * The HTTP method used for the request
-     * @type {string}
-     */
-    this.method = method;
-
-    /**
-     * The path of the request relative to the HTTP endpoint
-     * @type {string}
-     */
-    this.path = path;
-
-    /**
-     * The route of the request relative to the HTTP endpoint
-     * @type {string}
-     */
-    this.route = route;
-
-    /**
-     * Whether this rate limit is global
-     * @type {boolean}
-     */
-    this.global = global;
-
-    /**
-     * The maximum amount of requests of this endpoint
-     * @type {number}
-     */
-    this.limit = limit;
-  }
-}
-
-module.exports = RateLimitError;
+'use strict';
+
+/**
+ * Represents a RateLimit error from a request.
+ * @extends Error
+ */
+class RateLimitError extends Error {
+  constructor({ timeout, limit, method, path, route, global }) {
+    super(`A ${global ? 'global ' : ''}rate limit was hit on route ${route}`);
+
+    /**
+     * The name of the error
+     * @type {string}
+     */
+    this.name = 'RateLimitError';
+
+    /**
+     * Time until this rate limit ends, in milliseconds
+     * @type {number}
+     */
+    this.timeout = timeout;
+
+    /**
+     * The HTTP method used for the request
+     * @type {string}
+     */
+    this.method = method;
+
+    /**
+     * The path of the request relative to the HTTP endpoint
+     * @type {string}
+     */
+    this.path = path;
+
+    /**
+     * The route of the request relative to the HTTP endpoint
+     * @type {string}
+     */
+    this.route = route;
+
+    /**
+     * Whether this rate limit is global
+     * @type {boolean}
+     */
+    this.global = global;
+
+    /**
+     * The maximum amount of requests of this endpoint
+     * @type {number}
+     */
+    this.limit = limit;
+  }
+}
+
+module.exports = RateLimitError;