magmastream 2.10.2-dev.3 → 2.10.2

package/dist/structures/Manager.js

@@ -16,6 +16,11 @@ const Enums_1 = require("./Enums");
 const package_json_1 = require("../../package.json");
 const MagmastreamError_1 = require("./MagmastreamError");
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+const YOUTUBE_URL_PATTERN = /(youtube\.com|youtu\.be)/;
+const BLOCKED_WORDS_PATTERN = new RegExp(`\\b(${blockedWords_1.blockedWords.map(escapeRegExp).join("|")})\\b`, "gi");
 /**
  * The main hub for interacting with Lavalink and using Magmastream.
  */
@@ -258,7 +263,7 @@ class Manager extends events_1.EventEmitter {
             }
             if (this.options.normalizeYouTubeTitles && "tracks" in result) {
                 const processTrack = (track) => {
-                    if (!/(youtube\.com|youtu\.be)/.test(track.uri))
+                    if (!YOUTUBE_URL_PATTERN.test(track.uri))
                         return track;
                     const { cleanTitle, cleanAuthor } = this.parseYouTubeTitle(track.title, track.author);
                     track.title = cleanTitle;
@@ -267,7 +272,7 @@ class Manager extends events_1.EventEmitter {
                 };
                 result.tracks = result.tracks.map(processTrack);
                 if ("playlist" in result && result.playlist) {
-                    result.playlist.tracks = result.playlist.tracks.map(processTrack);
+                    result.playlist.tracks = result.tracks;
                 }
             }
             const summary = "tracks" in result ? result.tracks.map((t) => Object.fromEntries(Object.entries(t).filter(([key]) => key !== "requester"))) : [];
@@ -780,9 +785,7 @@ class Manager extends events_1.EventEmitter {
         const cleanAuthor = originalAuthor.replace("- Topic", "").trim();
         title = title.replace("Topic -", "").trim();
         // Remove blocked words and phrases
-        const escapedBlockedWords = blockedWords_1.blockedWords.map((word) => this.escapeRegExp(word));
-        const blockedWordsPattern = new RegExp(`\\b(${escapedBlockedWords.join("|")})\\b`, "gi");
-        title = title.replace(blockedWordsPattern, "").trim();
+        title = title.replace(BLOCKED_WORDS_PATTERN, "").trim();
         // Remove empty brackets and balance remaining brackets
         title = title
             .replace(/[([{]\s*[)\]}]/g, "") // Empty brackets
@@ -847,10 +850,6 @@ class Manager extends events_1.EventEmitter {
      * @param string - The string to escape.
      * @returns The escaped string.
      */
-    escapeRegExp(string) {
-        // Replace special regex characters with their escaped counterparts
-        return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    }
     /**
      * Checks if the given data is a voice update.
      * @param data The data to check.

package/dist/structures/Node.js

@@ -1125,7 +1125,7 @@ class Node {
             });
         }
         try {
-            await this.rest.put(`/v4/sessions/${this.sessionId}/players/${player.guildId}/sponsorblock/categories`, Utils_1.JSONUtils.safe(segments.map((v) => v.toLowerCase()), 2));
+            await this.rest.put(`/v4/sessions/${this.sessionId}/players/${player.guildId}/sponsorblock/categories`, segments.map((v) => v.toLowerCase()));
         }
         catch (err) {
             throw err instanceof MagmastreamError_1.MagmaStreamError

package/dist/structures/Rest.js

@@ -104,8 +104,6 @@ class Rest {
      */
     async request(method, endpoint, body) {
         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[REST] ${method} request to ${endpoint} with body: ${Utils_1.JSONUtils.safe(body, 2)}`);
-        const controller = new AbortController();
-        const timeoutHandle = setTimeout(() => controller.abort(), this.node.options.apiRequestTimeoutMs);
         let response = null;
         try {
             response = await (0, undici_1.fetch)(this.url + endpoint, {
@@ -115,11 +113,11 @@ class Rest {
                     Authorization: this.password,
                 },
                 body: body !== undefined ? JSON.stringify(body) : undefined,
-                signal: controller.signal,
+                signal: AbortSignal.timeout(this.node.options.apiRequestTimeoutMs),
             });
         }
         catch (e) {
-            const isTimeout = e instanceof Error && e.name === "AbortError";
+            const isTimeout = e instanceof Error && (e.name === "AbortError" || e.name === "TimeoutError");
             const message = e instanceof Error ? e.message : "Unknown error";
             const error = new MagmastreamError_1.MagmaStreamError({
                 code: Enums_1.MagmaStreamErrorCode.REST_REQUEST_FAILED,
@@ -128,9 +126,6 @@ class Rest {
             this.manager.emit(Enums_1.ManagerEventTypes.NodeError, this.node, error);
             return null;
         }
-        finally {
-            clearTimeout(timeoutHandle);
-        }
         const { status } = response;
         const data = status !== 204 ? await response.json() : null;
         if (status >= 200 && status < 300) {

package/dist/wrappers/discord.js.js

@@ -15,7 +15,7 @@ class DiscordJSManager extends Manager_1.Manager {
     constructor(client, options) {
         super(options, true);
         this.client = client;
-        const { version: djsVersion } = moduleRequire("discord.js/package.json");
+        const { version: djsVersion } = moduleRequire("discord.js");
         const [major, minor] = djsVersion.split(".").map(Number);
         if (!this.client.options.intents.has(GUILD_VOICE_STATES_INTENT)) {
             throw new MagmastreamError_1.MagmaStreamError({

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "magmastream",
-    "version": "2.10.2-dev.3",
+    "version": "2.10.2",
     "description": "A user-friendly Lavalink client designed for NodeJS.",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -8,7 +8,7 @@
         "dist"
     ],
     "scripts": {
-        "prepare": "npm run build",
+        "prepare": "npm run build && npm run types",
         "build": "tsc",
         "types": "rtb --dist dist",
         "format": "prettier --write .",
@@ -16,14 +16,16 @@
         "lint": "eslint \"src/**/*.{ts,js}\"",
         "lint:fix": "eslint --fix \"src/**/*.{ts,js}\"",
         "ci": "run-s format:check lint build types",
-        "release:alpha": "npm run format && npm run lint:fix && npm run ci && npm version prerelease --preid=alpha && npm publish --tag alpha && git push && git push --follow-tags",
-        "release:dev": "npm run format && npm run lint:fix && npm run ci && npm version prerelease --preid=dev && npm publish --tag dev && git push && git push --follow-tags"
+        "version:alpha": "node scripts/prerelease-version.cjs alpha",
+        "version:dev": "node scripts/prerelease-version.cjs dev",
+        "release:alpha": "npm run format && npm run lint:fix && npm run ci && npm run version:alpha && npm publish --tag alpha && git push && git push --follow-tags",
+        "release:dev": "npm run format && npm run lint:fix && npm run ci && npm run version:dev && npm publish --tag dev && git push && git push --follow-tags"
     },
     "devDependencies": {
         "@favware/rollup-type-bundler": "^4.0.0",
         "@types/jsdom": "^28.0.0",
         "@types/lodash": "^4.17.24",
-        "@types/node": "^25.3.5",
+        "@types/node": "^25.9.1",
         "@types/ws": "^8.18.1",
         "@typescript-eslint/eslint-plugin": "^8.56.1",
         "@typescript-eslint/parser": "^8.56.1",
@@ -104,4 +106,4 @@
     "homepage": "https://docs.magmastream.com",
     "author": "Abel Purnwasy",
     "license": "Apache-2.0"
-}
+}

package/dist/config/blockedWords.d.ts

@@ -1 +0,0 @@
-export declare const blockedWords: string[];

package/dist/statestorage/JsonQueue.d.ts

@@ -1,173 +0,0 @@
-import { Manager } from "../structures/Manager";
-import { IQueue, Track } from "../structures/Types";
-/**
- * The player's queue, the `current` property is the currently playing track, think of the rest as the up-coming tracks.
- */
-export declare class JsonQueue implements IQueue {
-    readonly guildId: string;
-    readonly manager: Manager;
-    /**
-     * The base path for the queue files.
-     */
-    private basePath;
-    /**
-     * Whether the queue has been destroyed.
-     */
-    private destroyed;
-    /**
-     * @param guildId The guild ID.
-     * @param manager The manager.
-     */
-    constructor(guildId: string, manager: Manager);
-    /**
-     * @param track The track or tracks to add. Can be a single `Track` or an array of `Track`s.
-     * @param [offset=null] The position to add the track(s) at. If not provided, the track(s) will be added at the end of the queue.
-     */
-    add(track: Track | Track[], offset?: number): Promise<void>;
-    /**
-     * @param track The track to add.
-     */
-    addPrevious(track: Track | Track[]): Promise<void>;
-    /**
-     * Clears the queue.
-     */
-    clear(): Promise<void>;
-    /**
-     * Clears the previous tracks.
-     */
-    clearPrevious(): Promise<void>;
-    /**
-     * Removes the first track from the queue.
-     */
-    dequeue(): Promise<Track | undefined>;
-    /**
-     * Destroys the queue and releases all resources.
-     * After calling this method, the queue must not be used again.
-     */
-    destroy(): Promise<void>;
-    /**
-     * @returns The total duration of the queue.
-     */
-    duration(): Promise<number>;
-    /**
-     * Adds a track to the front of the queue.
-     */
-    enqueueFront(track: Track | Track[]): Promise<void>;
-    /**
-     * Tests whether all elements in the queue pass the test implemented by the provided function.
-     */
-    everyAsync(callback: (track: Track, index: number, array: Track[]) => boolean): Promise<boolean>;
-    /**
-     * Filters the queue.
-     */
-    filterAsync(callback: (track: Track, index: number, array: Track[]) => boolean): Promise<Track[]>;
-    /**
-     * Finds the first track in the queue that satisfies the provided testing function.
-     */
-    findAsync(callback: (track: Track, index: number, array: Track[]) => boolean): Promise<Track | undefined>;
-    /**
-     * @returns The current track.
-     */
-    getCurrent(): Promise<Track | null>;
-    /**
-     * @returns The previous tracks.
-     */
-    getPrevious(): Promise<Track[]>;
-    /**
-     * @returns The tracks in the queue from start to end.
-     */
-    getSlice(start?: number, end?: number): Promise<Track[]>;
-    /**
-     * @returns The tracks in the queue.
-     */
-    getTracks(): Promise<Track[]>;
-    /**
-     * Maps the queue to a new array.
-     */
-    mapAsync<T>(callback: (track: Track, index: number, array: Track[]) => T): Promise<T[]>;
-    /**
-     * Modifies the queue at the specified index.
-     */
-    modifyAt(start: number, deleteCount?: number, ...items: Track[]): Promise<Track[]>;
-    /**
-     * @returns The newest track.
-     */
-    popPrevious(): Promise<Track | null>;
-    /**
-     * Removes a track from the queue.
-     * @param position The position to remove the track at.
-     * @param end The end position to remove the track at.
-     */
-    remove(position?: number): Promise<Track[]>;
-    remove(start: number, end: number): Promise<Track[]>;
-    /**
-     * Shuffles the queue by round-robin.
-     */
-    roundRobinShuffle(): Promise<void>;
-    /**
-     * @param track The track to set.
-     */
-    setCurrent(track: Track | null): Promise<void>;
-    /**
-     * @param track The track to set.
-     */
-    setPrevious(track: Track | Track[]): Promise<void>;
-    /**
-     * Shuffles the queue.
-     */
-    shuffle(): Promise<void>;
-    /**
-     * @returns The size of the queue.
-     */
-    size(): Promise<number>;
-    /**
-     * Tests whether at least one element in the queue passes the test implemented by the provided function.
-     */
-    someAsync(callback: (track: Track, index: number, array: Track[]) => boolean): Promise<boolean>;
-    /**
-     * @returns The total size of the queue.
-     */
-    totalSize(): Promise<number>;
-    /**
-     * Shuffles the queue by user.
-     */
-    userBlockShuffle(): Promise<void>;
-    /**
-     * @returns The current path.
-     */
-    private get currentPath();
-    /**
-     * @param filePath The file path.
-     */
-    private deleteFile;
-    /**
-     * Ensures the directory exists.
-     */
-    private ensureDir;
-    /**
-     * @returns The queue.
-     */
-    private getQueue;
-    /**
-     * @returns The previous path.
-     */
-    private get previousPath();
-    /**
-     * @returns The queue path.
-     */
-    private get queuePath();
-    /**
-     * @param filePath The file path.
-     * @returns The JSON data.
-     */
-    private readJSON;
-    /**
-     * @param queue The queue.
-     */
-    private setQueue;
-    /**
-     * @param filePath The file path.
-     * @param data The data to write.
-     */
-    private writeJSON;
-}

package/dist/statestorage/MemoryQueue.d.ts

@@ -1,154 +0,0 @@
-import { Manager } from "../structures/Manager";
-import { IQueue, Track } from "../structures/Types";
-/**
- * The player's queue, the `current` property is the currently playing track, think of the rest as the up-coming tracks.
- */
-export declare class MemoryQueue extends Array<Track> implements IQueue {
-    /** The current track */
-    current: Track | null;
-    /** The previous tracks */
-    previous: Track[];
-    /** The Manager instance. */
-    manager: Manager;
-    /** The guild ID property. */
-    guildId: string;
-    /**
-     * Whether the queue has been destroyed.
-     */
-    private destroyed;
-    /**
-     * Constructs a new Queue.
-     * @param guildId The guild ID.
-     * @param manager The Manager instance.
-     */
-    constructor(guildId: string, manager: Manager);
-    /**
-     * Adds a track to the queue.
-     * @param track The track or tracks to add. Can be a single `Track` or an array of `Track`s.
-     * @param [offset=null] The position to add the track(s) at. If not provided, the track(s) will be added at the end of the queue.
-     */
-    add(track: Track | Track[], offset?: number): void;
-    /**
-     * Adds a track to the previous tracks.
-     * @param track The track or tracks to add. Can be a single `Track` or an array of `Track`s.
-     */
-    addPrevious(track: Track | Track[]): void;
-    /**
-     * Clears the queue.
-     * This will remove all tracks from the queue and emit a state update event.
-     */
-    clear(): void;
-    /**
-     * Clears the previous tracks.
-     */
-    clearPrevious(): void;
-    /**
-     * Removes the first element from the queue.
-     */
-    dequeue(): Track | undefined;
-    /**
-     * Destroys the queue and releases all resources.
-     * After calling this method, the queue must not be used again.
-     */
-    destroy(): void;
-    /**
-     * The total duration of the queue in milliseconds.
-     * This includes the duration of the currently playing track.
-     */
-    duration(): number;
-    /**
-     * Adds the specified track or tracks to the front of the queue.
-     * @param track The track or tracks to add.
-     */
-    enqueueFront(track: Track | Track[]): void;
-    /**
-     * @returns Whether all elements in the queue satisfy the provided testing function.
-     */
-    everyAsync(callback: (track: Track, index: number, array: Track[]) => boolean): boolean;
-    /**
-     * @returns A new array with all elements that pass the test implemented by the provided function.
-     */
-    filterAsync(callback: (track: Track, index: number, array: Track[]) => boolean): Track[];
-    /**
-     * @returns The first element in the queue that satisfies the provided testing function.
-     */
-    findAsync(callback: (track: Track, index: number, array: Track[]) => boolean): Track | undefined;
-    /**
-     * @returns The current track.
-     */
-    getCurrent(): Track | null;
-    /**
-     * @returns The previous tracks.
-     */
-    getPrevious(): Track[];
-    /**
-     * @returns The tracks in the queue from start to end.
-     */
-    getSlice(start?: number, end?: number): Track[];
-    /**
-     * @returns The tracks in the queue.
-     */
-    getTracks(): Track[];
-    /**
-     * @returns A new array with the results of calling a provided function on every element in the queue.
-     */
-    mapAsync<T>(callback: (track: Track, index: number, array: Track[]) => T): T[];
-    /**
-     * Modifies the queue at the specified index.
-     * @param start The index at which to start modifying the queue.
-     * @param deleteCount The number of elements to remove from the queue.
-     * @param items The elements to add to the queue.
-     * @returns The modified queue.
-     */
-    modifyAt(start: number, deleteCount?: number, ...items: Track[]): Track[];
-    /**
-     * @returns The newest track.
-     */
-    popPrevious(): Track | null;
-    /**
-     * Removes track(s) from the queue.
-     * @param startOrPosition If a single number is provided, it will be treated as the position of the track to remove.
-     *                         If two numbers are provided, they will be used as the start and end of a range of tracks to remove.
-     * @param end Optional, end of the range of tracks to remove.
-     * @returns The removed track(s).
-     */
-    remove(position?: number): Track[];
-    remove(start: number, end: number): Track[];
-    /**
-     * Shuffles the queue to play tracks requested by each user one by one.
-     */
-    roundRobinShuffle(): void;
-    /**
-     * @param track The track to set.
-     */
-    setCurrent(track: Track | null): void;
-    /**
-     * @param tracks The tracks to set.
-     */
-    setPrevious(tracks: Track[]): void;
-    /**
-     * Shuffles the queue.
-     * This will randomize the order of the tracks in the queue and emit a state update event.
-     */
-    shuffle(): void;
-    /**
-     * The size of tracks in the queue.
-     * This does not include the currently playing track.
-     * @returns The size of tracks in the queue.
-     */
-    size(): number;
-    /**
-     * @returns Whether at least one element in the queue satisfies the provided testing function.
-     */
-    someAsync(callback: (track: Track, index: number, array: Track[]) => boolean): boolean;
-    /**
-     * The total size of tracks in the queue including the current track.
-     * This includes the current track if it is not null.
-     * @returns The total size of tracks in the queue including the current track.
-     */
-    totalSize(): number;
-    /**
-     * Shuffles the queue to play tracks requested by each user one block at a time.
-     */
-    userBlockShuffle(): void;
-}

package/dist/statestorage/RedisQueue.d.ts

@@ -1,178 +0,0 @@
-import { Manager } from "../structures/Manager";
-import { IQueue, Track } from "../structures/Types";
-/**
- * The player's queue, the `current` property is the currently playing track, think of the rest as the up-coming tracks.
- */
-export declare class RedisQueue implements IQueue {
-    readonly guildId: string;
-    readonly manager: Manager;
-    /**
-     * The prefix for the Redis keys.
-     */
-    redisPrefix: string;
-    /**
-     * The Redis instance.
-     */
-    private redis;
-    /**
-     * Whether the queue has been destroyed.
-     */
-    private destroyed;
-    /**
-     * Constructs a new RedisQueue.
-     * @param guildId The guild ID.
-     * @param manager The Manager instance.
-     */
-    constructor(guildId: string, manager: Manager);
-    /**
-     * Adds a track or tracks to the queue.
-     * @param track The track or tracks to add. Can be a single `Track` or an array of `Track`s.
-     * @param [offset=null] The position to add the track(s) at. If not provided, the track(s) will be added at the end of the queue.
-     */
-    add(track: Track | Track[], offset?: number): Promise<void>;
-    /**
-     * Adds a track or tracks to the previous tracks.
-     * @param track The track or tracks to add.
-     */
-    addPrevious(track: Track | Track[]): Promise<void>;
-    /**
-     * Clears the queue.
-     */
-    clear(): Promise<void>;
-    /**
-     * Clears the previous tracks.
-     */
-    clearPrevious(): Promise<void>;
-    /**
-     * Removes the first track from the queue.
-     */
-    dequeue(): Promise<Track | undefined>;
-    /**
-     * Destroys the queue and releases all resources.
-     * After calling this method, the queue must not be used again.
-     */
-    destroy(): Promise<void>;
-    /**
-     * @returns The total duration of the queue in milliseconds.
-     * This includes the duration of the currently playing track.
-     */
-    duration(): Promise<number>;
-    /**
-     * Adds a track to the front of the queue.
-     * @param track The track or tracks to add.
-     */
-    enqueueFront(track: Track | Track[]): Promise<void>;
-    /**
-     * Whether all tracks in the queue match the specified condition.
-     * @param callback The condition to match.
-     * @returns Whether all tracks in the queue match the specified condition.
-     */
-    everyAsync(callback: (track: Track, index: number, array: Track[]) => boolean): Promise<boolean>;
-    /**
-     * Filters the tracks in the queue.
-     * @param callback The condition to match.
-     * @returns The tracks that match the condition.
-     */
-    filterAsync(callback: (track: Track, index: number, array: Track[]) => boolean): Promise<Track[]>;
-    /**
-     * Finds the first track in the queue that matches the specified condition.
-     * @param callback The condition to match.
-     * @returns The first track that matches the condition.
-     */
-    findAsync(callback: (track: Track, index: number, array: Track[]) => boolean): Promise<Track | undefined>;
-    /**
-     * @returns The current track.
-     */
-    getCurrent(): Promise<Track | null>;
-    /**
-     * @returns The previous tracks.
-     */
-    getPrevious(): Promise<Track[]>;
-    /**
-     * @returns The tracks in the queue from the start to the end.
-     */
-    getSlice(start?: number, end?: number): Promise<Track[]>;
-    /**
-     * @returns The tracks in the queue.
-     */
-    getTracks(): Promise<Track[]>;
-    /**
-     * Maps the tracks in the queue.
-     * @returns The tracks in the queue after the specified index.
-     */
-    mapAsync<T>(callback: (track: Track, index: number, array: Track[]) => T): Promise<T[]>;
-    /**
-     * Modifies the queue at the specified index.
-     * @param start The start index.
-     * @param deleteCount The number of tracks to delete.
-     * @param items The tracks to insert.
-     * @returns The removed tracks.
-     */
-    modifyAt(start: number, deleteCount?: number, ...items: Track[]): Promise<Track[]>;
-    /**
-     * Removes the newest track.
-     * @returns The newest track.
-     */
-    popPrevious(): Promise<Track | null>;
-    /**
-     * Removes the track at the specified index.
-     * @param position The position to remove the track at.
-     * @param end The end position to remove the track at.
-     */
-    remove(position?: number): Promise<Track[]>;
-    remove(start: number, end: number): Promise<Track[]>;
-    /**
-     * Shuffles the queue round-robin style.
-     */
-    roundRobinShuffle(): Promise<void>;
-    /**
-     * Sets the current track.
-     * @param track The track to set.
-     */
-    setCurrent(track: Track | null): Promise<void>;
-    /**
-     * Sets the previous track(s).
-     * @param track The track to set.
-     */
-    setPrevious(track: Track | Track[]): Promise<void>;
-    /**
-     * Shuffles the queue.
-     */
-    shuffle(): Promise<void>;
-    /**
-     * @returns The size of the queue.
-     */
-    size(): Promise<number>;
-    /**
-     * @returns Whether any tracks in the queue match the specified condition.
-     */
-    someAsync(callback: (track: Track, index: number, array: Track[]) => boolean): Promise<boolean>;
-    /**
-     * @returns The total size of tracks in the queue including the current track.
-     */
-    totalSize(): Promise<number>;
-    /**
-     * Shuffles the queue, but keeps the tracks of the same user together.
-     */
-    userBlockShuffle(): Promise<void>;
-    /**
-     * @returns The current key.
-     */
-    private get currentKey();
-    /**
-     * Deserializes a track from a string.
-     */
-    private deserialize;
-    /**
-     * @returns The previous key.
-     */
-    private get previousKey();
-    /**
-     * @returns The queue key.
-     */
-    private get queueKey();
-    /**
-     * Helper to serialize/deserialize Track
-     */
-    private serialize;
-}