djs-selfbot-v13 3.2.2 → 3.7.1

package/src/managers/UserNoteManager.js

@@ -1,53 +1,53 @@
-'use strict';
-
-const { Collection } = require('@discordjs/collection');
-const BaseManager = require('./BaseManager');
-
-/**
- * Manages API methods for Client and stores their cache.
- * @extends {BaseManager}
- */
-class UserNoteManager extends BaseManager {
-  constructor(client, data = {}) {
-    super(client);
-    /**
-     * Cache User Note
-     * @type {Collection<Snowflake, string>}
-     */
-    this.cache = new Collection(Object.entries(data));
-  }
-
-  _reload(data = {}) {
-    this.cache = new Collection(Object.entries(data));
-    return this;
-  }
-
-  async updateNote(id, note = null) {
-    await this.client.api.users['@me'].notes(id).put({ data: { note } });
-    if (!note) this.cache.delete(id, note);
-    else this.cache.set(id, note);
-    return this;
-  }
-
-  /**
-   * Obtains a user from Discord, or the user cache if it's already available.
-   * @param {UserResolvable} user The user to fetch
-   * @param {BaseFetchOptions} [options] Additional options for this fetch
-   * @returns {Promise<string>}
-   */
-  async fetch(user, { cache = true, force = false } = {}) {
-    const id = this.resolveId(user);
-    if (!force) {
-      const existing = this.cache.get(id);
-      if (existing) return existing;
-    }
-    const data = await this.client.api.users['@me'].notes[id]
-      .get()
-      .then(d => d.note)
-      .catch(() => '');
-    if (cache) this.cache.set(id, data);
-    return data;
-  }
-}
-
-module.exports = UserNoteManager;
+'use strict';
+
+const { Collection } = require('@discordjs/collection');
+const BaseManager = require('./BaseManager');
+
+/**
+ * Manages API methods for Client and stores their cache.
+ * @extends {BaseManager}
+ */
+class UserNoteManager extends BaseManager {
+  constructor(client, data = {}) {
+    super(client);
+    /**
+     * Cache User Note
+     * @type {Collection<Snowflake, string>}
+     */
+    this.cache = new Collection(Object.entries(data));
+  }
+
+  _reload(data = {}) {
+    this.cache = new Collection(Object.entries(data));
+    return this;
+  }
+
+  async updateNote(id, note = null) {
+    await this.client.api.users['@me'].notes(id).put({ data: { note } });
+    if (!note) this.cache.delete(id, note);
+    else this.cache.set(id, note);
+    return this;
+  }
+
+  /**
+   * Obtains a user from Discord, or the user cache if it's already available.
+   * @param {UserResolvable} user The user to fetch
+   * @param {BaseFetchOptions} [options] Additional options for this fetch
+   * @returns {Promise<string>}
+   */
+  async fetch(user, { cache = true, force = false } = {}) {
+    const id = this.resolveId(user);
+    if (!force) {
+      const existing = this.cache.get(id);
+      if (existing) return existing;
+    }
+    const data = await this.client.api.users['@me'].notes[id]
+      .get()
+      .then(d => d.note)
+      .catch(() => '');
+    if (cache) this.cache.set(id, data);
+    return data;
+  }
+}
+
+module.exports = UserNoteManager;

package/src/managers/VoiceStateManager.js

@@ -1,37 +1,59 @@
-'use strict';
-
-const CachedManager = require('./CachedManager');
-const VoiceState = require('../structures/VoiceState');
-
-/**
- * Manages API methods for VoiceStates and stores their cache.
- * @extends {CachedManager}
- */
-class VoiceStateManager extends CachedManager {
-  constructor(guild, iterable) {
-    super(guild.client, VoiceState, iterable);
-
-    /**
-     * The guild this manager belongs to
-     * @type {Guild}
-     */
-    this.guild = guild;
-  }
-
-  /**
-   * The cache of this manager
-   * @type {Collection<Snowflake, VoiceState>}
-   * @name VoiceStateManager#cache
-   */
-
-  _add(data, cache = true) {
-    const existing = this.cache.get(data.user_id);
-    if (existing) return existing._patch(data);
-
-    const entry = new this.holds(this.guild, data);
-    if (cache) this.cache.set(data.user_id, entry);
-    return entry;
-  }
-}
-
-module.exports = VoiceStateManager;
+'use strict';
+
+const CachedManager = require('./CachedManager');
+const VoiceState = require('../structures/VoiceState');
+
+/**
+ * Manages API methods for VoiceStates and stores their cache.
+ * @extends {CachedManager}
+ */
+class VoiceStateManager extends CachedManager {
+  constructor(guild, iterable) {
+    super(guild.client, VoiceState, iterable);
+
+    /**
+     * The guild this manager belongs to
+     * @type {Guild}
+     */
+    this.guild = guild;
+  }
+
+  /**
+   * The cache of this manager
+   * @type {Collection<Snowflake, VoiceState>}
+   * @name VoiceStateManager#cache
+   */
+
+  _add(data, cache = true) {
+    const existing = this.cache.get(data.user_id);
+    if (existing) return existing._patch(data);
+
+    const entry = new this.holds(this.guild, data);
+    if (cache) this.cache.set(data.user_id, entry);
+    return entry;
+  }
+
+  /**
+   * Obtains a user's voice state from discord or from the cache if it's already available.
+   * @param {GuildMemberResolvable|'@me'} member The member whose voice state is to be fetched
+   * @param {BaseFetchOptions} [options] Additional options for this fetch
+   * @returns {Promise<VoiceState>}
+   * @example
+   * // Fetch a member's voice state
+   * guild.voiceStates.fetch("66564597481480192")
+   *    .then(console.log)
+   *    .catch(console.error);
+   */
+  async fetch(member, { cache = true, force = false } = {}) {
+    if (!this.guild?.id) throw new Error('Guild is not defined');
+    const id = member === '@me' ? member : this.guild.members.resolveId(member);
+    if (!force) {
+      const existing = this.cache.get(id === '@me' ? this.client.user.id : id);
+      if (existing) return existing;
+    }
+    const data = await this.client.api.guilds(this.guild.id)['voice-states'][id].get();
+    return this._add(data, cache);
+  }
+}
+
+module.exports = VoiceStateManager;

package/src/rest/APIRequest.js

@@ -1,160 +1,154 @@
-'use strict';
-
-const Buffer = require('node:buffer').Buffer;
-const https = require('node:https');
-const { setTimeout } = require('node:timers');
-const makeFetchCookie = require('fetch-cookie');
-const FormData = require('form-data');
-const fetchOriginal = require('node-fetch');
-const { CookieJar } = require('tough-cookie');
-const { ciphers } = require('../util/Constants');
-const Util = require('../util/Util');
-
-const cookieJar = new CookieJar();
-const fetch = makeFetchCookie(fetchOriginal, cookieJar);
-
-let agent = null;
-
-class APIRequest {
-  constructor(rest, method, path, options) {
-    this.rest = rest;
-    this.client = rest.client;
-    this.method = method;
-    this.route = options.route;
-    this.options = options;
-    this.retries = 0;
-
-    this.fullUserAgent = this.client.options.http.headers['User-Agent'];
-
-    this.client.options.ws.properties.browser_user_agent = this.fullUserAgent;
-
-    let queryString = '';
-    if (options.query) {
-      const query = Object.entries(options.query)
-        .filter(([, value]) => value !== null && typeof value !== 'undefined')
-        .flatMap(([key, value]) => (Array.isArray(value) ? value.map(v => [key, v]) : [[key, value]]));
-      queryString = new URLSearchParams(query).toString();
-    }
-    this.path = `${path}${queryString && `?${queryString}`}`;
-  }
-
-  make(captchaKey, captchaRqToken) {
-    if (!agent) {
-      if (Util.verifyProxyAgent(this.client.options.http.agent)) {
-        // Bad code
-        for (const [k, v] of Object.entries({
-          keepAlive: true,
-          honorCipherOrder: true,
-          secureProtocol: 'TLSv1_2_method',
-          ciphers: ciphers.join(':'),
-        })) {
-          this.client.options.http.agent.options[k] = v;
-          this.client.options.http.agent.httpsAgent.options.options[k] = v;
-        }
-        agent = this.client.options.http.agent;
-      } else {
-        agent = new https.Agent({
-          ...this.client.options.http.agent,
-          keepAlive: true,
-          honorCipherOrder: true,
-          secureProtocol: 'TLSv1_2_method',
-          ciphers: ciphers.join(':'),
-        });
-      }
-    }
-
-    const API =
-      this.options.versioned === false
-        ? this.client.options.http.api
-        : `${this.client.options.http.api}/v${this.client.options.http.version}`;
-    const url = API + this.path;
-
-    let headers = {
-      authority: 'discord.com',
-      accept: '*/*',
-      'accept-language': 'en-US',
-      'sec-ch-ua': '"Not?A_Brand";v="8", "Chromium";v="108"',
-      'sec-ch-ua-mobile': '?0',
-      'sec-ch-ua-platform': '"Windows"',
-      'sec-fetch-dest': 'empty',
-      'sec-fetch-mode': 'cors',
-      'sec-fetch-site': 'same-origin',
-      'x-debug-options': 'bugReporterEnabled',
-      'x-discord-locale': 'en-US',
-      'x-discord-timezone': 'Asia/Saigon',
-      'x-super-properties': `${Buffer.from(JSON.stringify(this.client.options.ws.properties), 'ascii').toString(
-        'base64',
-      )}`,
-      Referer: 'https://discord.com/channels/@me',
-      origin: 'https://discord.com',
-      'Referrer-Policy': 'strict-origin-when-cross-origin',
-      ...this.client.options.http.headers,
-      'User-Agent': this.fullUserAgent,
-    };
-
-    if (this.options.auth !== false) headers.Authorization = this.rest.getAuth();
-    if (this.options.reason) headers['X-Audit-Log-Reason'] = encodeURIComponent(this.options.reason);
-    if (this.options.headers) headers = Object.assign(headers, this.options.headers);
-
-    // Delete all headers if undefined
-    for (const [key, value] of Object.entries(headers)) {
-      if (value === undefined) delete headers[key];
-    }
-    if (this.options.webhook === true) {
-      headers = {
-        'User-Agent': this.client.options.http.headers['User-Agent'],
-      };
-    }
-
-    // Some options
-    if (this.options.DiscordContext) {
-      headers['X-Context-Properties'] = Buffer.from(JSON.stringify(this.options.DiscordContext), 'utf8').toString(
-        'base64',
-      );
-    }
-    if (this.options.mfaToken) {
-      headers['X-Discord-Mfa-Authorization'] = this.options.mfaToken;
-    }
-
-    let body;
-    if (this.options.files?.length) {
-      body = new FormData();
-      for (const [index, file] of this.options.files.entries()) {
-        if (file?.file) body.append(file.key ?? `files[${index}]`, file.file, file.name);
-      }
-      if (typeof this.options.data !== 'undefined') {
-        if (this.options.dontUsePayloadJSON) {
-          for (const [key, value] of Object.entries(this.options.data)) body.append(key, value);
-        } else {
-          body.append('payload_json', JSON.stringify(this.options.data));
-        }
-      }
-      headers = Object.assign(headers, body.getHeaders());
-      // eslint-disable-next-line eqeqeq
-    } else if (this.options.data != null) {
-      if (this.options.usePayloadJSON) {
-        body = new FormData();
-        body.append('payload_json', JSON.stringify(this.options.data));
-      } else {
-        body = JSON.stringify(this.options.data);
-        headers['Content-Type'] = 'application/json';
-      }
-    }
-
-    // Captcha
-    if (captchaKey && typeof captchaKey == 'string') headers['X-Captcha-Key'] = captchaKey;
-    if (captchaRqToken && typeof captchaRqToken == 'string') headers['X-Captcha-Rqtoken'] = captchaRqToken;
-
-    const controller = new AbortController();
-    const timeout = setTimeout(() => controller.abort(), this.client.options.restRequestTimeout).unref();
-    return fetch(url, {
-      method: this.method,
-      headers,
-      agent,
-      body,
-      signal: controller.signal,
-    }).finally(() => clearTimeout(timeout));
-  }
-}
-
-module.exports = APIRequest;
+'use strict';
+
+const Buffer = require('node:buffer').Buffer;
+const { setTimeout } = require('node:timers');
+const { FormData, buildConnector, Client, ProxyAgent } = require('undici');
+const { ciphers } = require('../util/Constants');
+const Util = require('../util/Util');
+
+let agent = null;
+
+class APIRequest {
+  constructor(rest, method, path, options) {
+    this.rest = rest;
+    this.client = rest.client;
+    this.method = method;
+    this.route = options.route;
+    this.options = options;
+    this.retries = 0;
+
+    this.fullUserAgent = this.client.options.http.headers['User-Agent'];
+
+    this.client.options.ws.properties.browser_user_agent = this.fullUserAgent;
+
+    let queryString = '';
+    if (options.query) {
+      const query = Object.entries(options.query)
+        .filter(([, value]) => value !== null && typeof value !== 'undefined')
+        .flatMap(([key, value]) => (Array.isArray(value) ? value.map(v => [key, v]) : [[key, value]]));
+      queryString = new URLSearchParams(query).toString();
+    }
+    this.path = `${path}${queryString && `?${queryString}`}`;
+  }
+
+  make(captchaKey, captchaRqToken) {
+    if (!agent) {
+      const r_ = Util.checkUndiciProxyAgent(this.client.options.http.agent);
+      if (!r_) {
+        agent = new Client('https://discord.com', {
+          connect: buildConnector({ ciphers: ciphers.join(':') }),
+        });
+      } else {
+        agent = new ProxyAgent({
+          ...r_,
+          ciphers: ciphers.join(':'),
+        });
+      }
+    }
+
+    const API =
+      this.options.versioned === false
+        ? this.client.options.http.api
+        : `${this.client.options.http.api}/v${this.client.options.http.version}`;
+    const url = API + this.path;
+
+    let headers = {
+      accept: '*/*',
+      'accept-language': 'en-US',
+      priority: 'u=1, i',
+      referer: 'https://discord.com/channels/@me',
+      'sec-ch-ua': '"Not:A-Brand";v="24", "Chromium";v="134"',
+      'sec-ch-ua-mobile': '?0',
+      'sec-ch-ua-platform': '"Windows"',
+      'sec-fetch-dest': 'empty',
+      'sec-fetch-mode': 'cors',
+      'sec-fetch-site': 'same-origin',
+      'x-discord-locale': 'en-US',
+      'x-discord-timezone': Intl.DateTimeFormat().resolvedOptions().timeZone,
+      'x-super-properties': `${Buffer.from(JSON.stringify(this.client.options.ws.properties), 'ascii').toString(
+        'base64',
+      )}`,
+      origin: 'https://discord.com',
+      'x-debug-options': 'bugReporterEnabled',
+      ...this.client.options.http.headers,
+      'User-Agent': this.fullUserAgent,
+    };
+
+    if (this.options.auth !== false) headers.Authorization = this.rest.getAuth();
+    if (this.options.reason) headers['X-Audit-Log-Reason'] = encodeURIComponent(this.options.reason);
+    if (this.options.headers) headers = Object.assign(headers, this.options.headers);
+
+    // Delete all headers if undefined
+    for (const [key, value] of Object.entries(headers)) {
+      if (value === undefined) delete headers[key];
+    }
+    if (this.options.webhook === true) {
+      headers = {
+        'User-Agent': this.client.options.http.headers['User-Agent'],
+      };
+    }
+
+    // Some options
+    if (this.options.DiscordContext) {
+      headers['X-Context-Properties'] = Buffer.from(JSON.stringify(this.options.DiscordContext), 'utf8').toString(
+        'base64',
+      );
+    }
+
+    if (this.options.mfaToken) {
+      headers['X-Discord-Mfa-Authorization'] = this.options.mfaToken;
+    }
+
+    // Captcha
+    if (captchaKey && typeof captchaKey == 'string') headers['X-Captcha-Key'] = captchaKey;
+    if (captchaRqToken && typeof captchaRqToken == 'string') headers['X-Captcha-Rqtoken'] = captchaRqToken;
+
+    let body;
+    if (this.options.files?.length) {
+      body = new FormData();
+      for (const [index, file] of this.options.files.entries()) {
+        // Why undici#FormData doesn't support file stream?
+        // Hacky way to support file stream
+        if (file?.file) {
+          body.set(file.key ?? `files[${index}]`, {
+            [Symbol.toStringTag]: 'File',
+            name: file.name,
+            stream: () => file.file,
+          });
+        }
+      }
+      if (typeof this.options.data !== 'undefined') {
+        if (this.options.dontUsePayloadJSON) {
+          for (const [key, value] of Object.entries(this.options.data)) body.append(key, value);
+        } else {
+          body.append('payload_json', JSON.stringify(this.options.data));
+        }
+      }
+      // eslint-disable-next-line eqeqeq
+    } else if (this.options.data != null) {
+      if (this.options.usePayloadJSON) {
+        body = new FormData();
+        body.append('payload_json', JSON.stringify(this.options.data));
+      } else {
+        body = JSON.stringify(this.options.data);
+        headers['Content-Type'] = 'application/json';
+      }
+    }
+
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), this.client.options.restRequestTimeout).unref();
+    return this.rest
+      .fetch(url, {
+        method: this.method.toUpperCase(), // Undici doesn't normalize "patch" into "PATCH" (which surprisingly follows the spec).
+        headers,
+        body,
+        signal: controller.signal,
+        redirect: 'follow',
+        dispatcher: agent,
+        credentials: 'include',
+      })
+      .finally(() => clearTimeout(timeout));
+  }
+}
+
+module.exports = APIRequest;

package/src/rest/APIRouter.js

@@ -1,53 +1,53 @@
-'use strict';
-
-const noop = () => {}; // eslint-disable-line no-empty-function
-const methods = ['get', 'post', 'delete', 'patch', 'put'];
-const reflectors = [
-  'toString',
-  'valueOf',
-  'inspect',
-  'constructor',
-  Symbol.toPrimitive,
-  Symbol.for('nodejs.util.inspect.custom'),
-];
-
-function buildRoute(manager) {
-  const route = [''];
-  const handler = {
-    get(target, name) {
-      if (reflectors.includes(name)) return () => route.join('/');
-      if (methods.includes(name)) {
-        const routeBucket = [];
-        for (let i = 0; i < route.length; i++) {
-          // Reactions routes and sub-routes all share the same bucket
-          if (route[i - 1] === 'reactions') break;
-          // Literal ids should only be taken account if they are the Major id (the Channel/Guild id)
-          if (/\d{16,19}/g.test(route[i]) && !/channels|guilds/.test(route[i - 1])) routeBucket.push(':id');
-          // All other parts of the route should be considered as part of the bucket identifier
-          else routeBucket.push(route[i]);
-        }
-        return options =>
-          manager.request(
-            name,
-            route.join('/'),
-            Object.assign(
-              {
-                versioned: manager.versioned,
-                route: routeBucket.join('/'),
-              },
-              options,
-            ),
-          );
-      }
-      route.push(name);
-      return new Proxy(noop, handler);
-    },
-    apply(target, _, args) {
-      route.push(...args.filter(x => x != null)); // eslint-disable-line eqeqeq
-      return new Proxy(noop, handler);
-    },
-  };
-  return new Proxy(noop, handler);
-}
-
-module.exports = buildRoute;
+'use strict';
+
+const noop = () => {}; // eslint-disable-line no-empty-function
+const methods = ['get', 'post', 'delete', 'patch', 'put'];
+const reflectors = [
+  'toString',
+  'valueOf',
+  'inspect',
+  'constructor',
+  Symbol.toPrimitive,
+  Symbol.for('nodejs.util.inspect.custom'),
+];
+
+function buildRoute(manager) {
+  const route = [''];
+  const handler = {
+    get(target, name) {
+      if (reflectors.includes(name)) return () => route.join('/');
+      if (methods.includes(name)) {
+        const routeBucket = [];
+        for (let i = 0; i < route.length; i++) {
+          // Reactions routes and sub-routes all share the same bucket
+          if (route[i - 1] === 'reactions') break;
+          // Literal ids should only be taken account if they are the Major id (the Channel/Guild id)
+          if (/\d{16,19}/g.test(route[i]) && !/channels|guilds/.test(route[i - 1])) routeBucket.push(':id');
+          // All other parts of the route should be considered as part of the bucket identifier
+          else routeBucket.push(route[i]);
+        }
+        return options =>
+          manager.request(
+            name,
+            route.join('/'),
+            Object.assign(
+              {
+                versioned: manager.versioned,
+                route: routeBucket.join('/'),
+              },
+              options,
+            ),
+          );
+      }
+      route.push(name);
+      return new Proxy(noop, handler);
+    },
+    apply(target, _, args) {
+      route.push(...args.filter(x => x != null)); // eslint-disable-line eqeqeq
+      return new Proxy(noop, handler);
+    },
+  };
+  return new Proxy(noop, handler);
+}
+
+module.exports = buildRoute;