distube 4.0.5 → 4.0.6

package/dist/index.d.ts

@@ -456,7 +456,7 @@ declare class DisTubeVoiceManager extends GuildIdManager<DisTubeVoice> {
     leave(guild: GuildIdResolvable): void;
 }
 
-declare class FilterManager extends BaseManager<FilterResolvable> {
+declare class FilterManager extends BaseManager<Filter> {
     #private;
     queue: Queue;
     constructor(queue: Queue);
@@ -466,7 +466,8 @@ declare class FilterManager extends BaseManager<FilterResolvable> {
     remove(filterOrFilters: FilterResolvable | FilterResolvable[]): this;
     has(filter: FilterResolvable): boolean;
     get names(): string[];
-    get values(): string[];
+    get values(): Filter[];
+    get ffmpegArgs(): string[];
     toString(): string;
 }
 

package/dist/index.js

@@ -63,7 +63,7 @@ var require_package = __commonJS({
   "package.json"(exports, module2) {
     module2.exports = {
       name: "distube",
-      version: "4.0.5",
+      version: "4.0.6",
       description: "A Discord.js module to simplify your music commands and play songs with audio filters on Discord without any API key.",
       main: "./dist/index.js",
       types: "./dist/index.d.ts",
@@ -124,12 +124,12 @@ var require_package = __commonJS({
       ],
       homepage: "https://distube.js.org/",
       dependencies: {
-        "@distube/ytdl-core": "^4.11.12",
+        "@distube/ytdl-core": "^4.11.17",
         "@distube/ytpl": "^1.1.1",
         "@distube/ytsr": "^1.1.9",
-        "prism-media": "https://codeload.github.com/distubejs/prism-media/tar.gz/main#workaround.tar.gz",
+        "prism-media": "npm:@distube/prism-media@latest",
         "tiny-typed-emitter": "^2.1.0",
-        tslib: "^2.6.0",
+        tslib: "^2.6.1",
         undici: "^5.22.1"
       },
       devDependencies: {
@@ -144,21 +144,21 @@ var require_package = __commonJS({
         "@discordjs/voice": "^0.16.0",
         "@distubejs/docgen": "distubejs/docgen",
         "@types/jest": "^29.5.3",
-        "@types/node": "^20.4.2",
-        "@typescript-eslint/eslint-plugin": "^6.1.0",
-        "@typescript-eslint/parser": "^6.1.0",
-        "babel-jest": "^29.6.1",
+        "@types/node": "^20.4.5",
+        "@typescript-eslint/eslint-plugin": "^6.2.0",
+        "@typescript-eslint/parser": "^6.2.0",
+        "babel-jest": "^29.6.2",
         "discord.js": "^14.11.0",
         eslint: "^8.45.0",
         "eslint-config-distube": "^1.6.4",
-        "eslint-config-prettier": "^8.8.0",
-        "eslint-plugin-deprecation": "^1.4.1",
-        "eslint-plugin-jsdoc": "^46.4.4",
+        "eslint-config-prettier": "^8.9.0",
+        "eslint-plugin-deprecation": "^1.5.0",
+        "eslint-plugin-jsdoc": "^46.4.5",
         husky: "^8.0.3",
-        jest: "^29.6.1",
+        jest: "^29.6.2",
         "jsdoc-babel": "^0.5.0",
         "nano-staged": "^0.8.0",
-        "npm-check-updates": "^16.10.16",
+        "npm-check-updates": "^16.10.17",
         pinst: "^3.0.0",
         prettier: "^3.0.0",
         tsup: "^7.1.0",
@@ -1155,17 +1155,14 @@ var _DisTubeStream = class _DisTubeStream {
       "2",
       "-f"
     ];
-    if (!options.type) {
+    if (!options.type)
       args.push("opus", "-acodec", "libopus");
-    } else {
+    else
       args.push("s16le");
-    }
-    if (typeof options.seek === "number" && options.seek > 0) {
+    if (typeof options.seek === "number" && options.seek > 0)
       args.unshift("-ss", options.seek.toString());
-    }
-    if (Array.isArray(options.ffmpegArgs)) {
+    if (Array.isArray(options.ffmpegArgs) && options.ffmpegArgs.length)
       args.push(...options.ffmpegArgs);
-    }
     this.stream = new import_prism_media.FFmpeg({ args, shell: false });
     this.stream._readableState && (this.stream._readableState.highWaterMark = 1 << 25);
   }
@@ -1768,17 +1765,15 @@ __name(_DisTubeVoiceManager, "DisTubeVoiceManager");
 var DisTubeVoiceManager = _DisTubeVoiceManager;
 
 // src/core/manager/FilterManager.ts
-var _validate, validate_fn, _resolveName, resolveName_fn, _resolveValue, resolveValue_fn, _apply, apply_fn, _removeFn, removeFn_get;
+var _resolve, resolve_fn, _apply, apply_fn, _removeFn, removeFn_fn;
 var _FilterManager = class _FilterManager extends BaseManager {
   constructor(queue) {
     super(queue.distube);
-    __privateAdd(this, _validate);
-    __privateAdd(this, _resolveName);
-    __privateAdd(this, _resolveValue);
+    __privateAdd(this, _resolve);
     __privateAdd(this, _apply);
     __privateAdd(this, _removeFn);
     /**
-     * Collection of {@link FilterResolvable}.
+     * Collection of {@link Filter}.
      * @name FilterManager#collection
      * @type {Discord.Collection<string, DisTubeVoice>}
      */
@@ -1793,28 +1788,18 @@ var _FilterManager = class _FilterManager extends BaseManager {
    */
   add(filterOrFilters, override = false) {
     if (Array.isArray(filterOrFilters)) {
-      const resolvedFilters = filterOrFilters.map((f) => __privateMethod(this, _validate, validate_fn).call(this, f));
-      const newFilters = resolvedFilters.reduceRight((unique, o) => {
-        if (!unique.some((obj) => obj === o && obj.name === o) && !unique.some((obj) => obj !== o.name && obj.name !== o.name)) {
-          if (!this.has(o))
-            unique.push(o);
-          if (this.has(o) && override) {
-            this.remove(o);
-            unique.push(o);
-          }
-        }
-        return unique;
-      }, []).reverse();
-      return this.set([...this.collection.values(), ...newFilters]);
-    } else if (typeof filterOrFilters === "string") {
-      return this.set([...this.collection.values(), filterOrFilters]);
+      for (const filter of filterOrFilters) {
+        const f = __privateMethod(this, _resolve, resolve_fn).call(this, filter);
+        if (override || !this.has(f))
+          this.collection.set(f.name, f);
+      }
+    } else {
+      const f = __privateMethod(this, _resolve, resolve_fn).call(this, filterOrFilters);
+      if (override || !this.has(f))
+        this.collection.set(f.name, f);
     }
-    throw new DisTubeError(
-      "INVALID_TYPE",
-      ["FilterResolvable", "Array<FilterResolvable>"],
-      filterOrFilters,
-      "filterOrFilters"
-    );
+    __privateMethod(this, _apply, apply_fn).call(this);
+    return this;
   }
   /**
    * Clear enabled filters of the manager
@@ -1832,9 +1817,9 @@ var _FilterManager = class _FilterManager extends BaseManager {
     if (!Array.isArray(filters))
       throw new DisTubeError("INVALID_TYPE", "Array<FilterResolvable>", filters, "filters");
     this.collection.clear();
-    for (const filter of filters) {
-      const resolved = __privateMethod(this, _validate, validate_fn).call(this, filter);
-      this.collection.set(__privateMethod(this, _resolveName, resolveName_fn).call(this, resolved), resolved);
+    for (const f of filters) {
+      const filter = __privateMethod(this, _resolve, resolve_fn).call(this, f);
+      this.collection.set(filter.name, filter);
     }
     __privateMethod(this, _apply, apply_fn).call(this);
     return this;
@@ -1845,18 +1830,10 @@ var _FilterManager = class _FilterManager extends BaseManager {
    * @returns {FilterManager}
    */
   remove(filterOrFilters) {
-    if (Array.isArray(filterOrFilters)) {
-      filterOrFilters.map(__privateGet(this, _removeFn, removeFn_get));
-    } else if (typeof filterOrFilters === "string") {
-      __privateGet(this, _removeFn, removeFn_get).call(this, filterOrFilters);
-    } else {
-      throw new DisTubeError(
-        "INVALID_TYPE",
-        ["FilterResolvable", "Array<FilterResolvable>"],
-        filterOrFilters,
-        "filterOrFilters"
-      );
-    }
+    if (Array.isArray(filterOrFilters))
+      filterOrFilters.map((f) => __privateMethod(this, _removeFn, removeFn_fn).call(this, f));
+    else
+      __privateMethod(this, _removeFn, removeFn_fn).call(this, filterOrFilters);
     __privateMethod(this, _apply, apply_fn).call(this);
     return this;
   }
@@ -1866,46 +1843,52 @@ var _FilterManager = class _FilterManager extends BaseManager {
    * @returns {boolean}
    */
   has(filter) {
-    return this.collection.has(__privateMethod(this, _resolveName, resolveName_fn).call(this, filter));
+    return this.collection.has(typeof filter === "string" ? filter : __privateMethod(this, _resolve, resolve_fn).call(this, filter).name);
   }
   /**
-   * Array of enabled filter name
+   * Array of enabled filter names
    * @type {Array<string>}
    * @readonly
    */
   get names() {
-    return this.collection.map((f) => __privateMethod(this, _resolveName, resolveName_fn).call(this, f));
+    return [...this.collection.keys()];
   }
+  /**
+   * Array of enabled filters
+   * @type {Array<Filter>}
+   * @readonly
+   */
   get values() {
-    return this.collection.map((f) => __privateMethod(this, _resolveValue, resolveValue_fn).call(this, f));
+    return [...this.collection.values()];
+  }
+  get ffmpegArgs() {
+    return this.size ? ["-af", this.values.map((f) => f.value).join(",")] : [];
   }
   toString() {
     return this.names.toString();
   }
 };
-_validate = new WeakSet();
-validate_fn = /* @__PURE__ */ __name(function(filter) {
-  if (typeof filter === "string" && Object.prototype.hasOwnProperty.call(this.distube.filters, filter) || typeof filter === "object" && typeof filter.name === "string" && typeof filter.value === "string") {
+_resolve = new WeakSet();
+resolve_fn = /* @__PURE__ */ __name(function(filter) {
+  if (typeof filter === "object" && typeof filter.name === "string" && typeof filter.value === "string") {
     return filter;
   }
+  if (typeof filter === "string" && Object.prototype.hasOwnProperty.call(this.distube.filters, filter)) {
+    return {
+      name: filter,
+      value: this.distube.filters[filter]
+    };
+  }
   throw new DisTubeError("INVALID_TYPE", "FilterResolvable", filter, "filter");
-}, "#validate");
-_resolveName = new WeakSet();
-resolveName_fn = /* @__PURE__ */ __name(function(filter) {
-  return typeof filter === "string" ? filter : filter.name;
-}, "#resolveName");
-_resolveValue = new WeakSet();
-resolveValue_fn = /* @__PURE__ */ __name(function(filter) {
-  return typeof filter === "string" ? this.distube.filters[filter] : filter.value;
-}, "#resolveValue");
+}, "#resolve");
 _apply = new WeakSet();
 apply_fn = /* @__PURE__ */ __name(function() {
   this.queue.beginTime = this.queue.currentTime;
   this.queues.playSong(this.queue);
 }, "#apply");
 _removeFn = new WeakSet();
-removeFn_get = /* @__PURE__ */ __name(function() {
-  return (f) => this.collection.delete(__privateMethod(this, _resolveName, resolveName_fn).call(this, __privateMethod(this, _validate, validate_fn).call(this, f)));
+removeFn_fn = /* @__PURE__ */ __name(function(f) {
+  return this.collection.delete(__privateMethod(this, _resolve, resolve_fn).call(this, f).name);
 }, "#removeFn");
 __name(_FilterManager, "FilterManager");
 var FilterManager = _FilterManager;
@@ -1987,9 +1970,12 @@ var _QueueManager = class _QueueManager extends GuildIdManager {
    */
   createStream(queue) {
     const { duration, formats, isLive, source, streamURL } = queue.songs[0];
-    const ffmpegArgs = queue.filters.size ? ["-af", queue.filters.values.join(",")] : void 0;
-    const seek = duration ? queue.beginTime : void 0;
-    const streamOptions = { ffmpegArgs, seek, isLive, type: this.options.streamType };
+    const streamOptions = {
+      ffmpegArgs: queue.filters.ffmpegArgs,
+      seek: duration ? queue.beginTime : void 0,
+      isLive,
+      type: this.options.streamType
+    };
     if (source === "youtube")
       return DisTubeStream.YouTube(formats, streamOptions);
     return DisTubeStream.DirectLink(streamURL, streamOptions);