lavalink-client 1.1.4 → 1.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/structures/LavalinkManager.d.ts +2 -2
- package/dist/cjs/structures/LavalinkManager.js +1 -1
- package/dist/cjs/structures/Queue.js +1 -1
- package/dist/cjs/structures/Utils.d.ts +1 -1
- package/dist/cjs/structures/Utils.js +5 -5
- package/dist/esm/structures/LavalinkManager.d.ts +2 -2
- package/dist/esm/structures/LavalinkManager.js +2 -2
- package/dist/esm/structures/Queue.js +2 -2
- package/dist/esm/structures/Utils.d.ts +1 -1
- package/dist/esm/structures/Utils.js +3 -3
- package/dist/structures/LavalinkManager.d.ts +2 -2
- package/dist/structures/Utils.d.ts +2 -2
- package/dist/types/structures/LavalinkManager.d.ts +2 -2
- package/dist/types/structures/Utils.d.ts +1 -1
- package/package.json +1 -1
|
@@ -2,13 +2,13 @@
|
|
|
2
2
|
import { EventEmitter } from "events";
|
|
3
3
|
import { NodeManager } from "./NodeManager";
|
|
4
4
|
import { ManagerQueueOptions } from "./Queue";
|
|
5
|
-
import { GuildShardPayload,
|
|
5
|
+
import { GuildShardPayload, ManagerUtils, MiniMap, SearchPlatform, TrackEndEvent, TrackExceptionEvent, TrackStartEvent, TrackStuckEvent, VoicePacket, VoiceServer, VoiceState, WebSocketClosedEvent } from "./Utils";
|
|
6
6
|
import { LavalinkNodeOptions } from "./Node";
|
|
7
7
|
import { DestroyReasonsType, Player, PlayerJson, PlayerOptions } from "./Player";
|
|
8
8
|
import { Track, UnresolvedTrack } from "./Track";
|
|
9
9
|
export interface LavalinkManager {
|
|
10
10
|
nodeManager: NodeManager;
|
|
11
|
-
utils:
|
|
11
|
+
utils: ManagerUtils;
|
|
12
12
|
}
|
|
13
13
|
export interface BotClientOptions {
|
|
14
14
|
/** Bot Client Id */
|
|
@@ -90,7 +90,7 @@ class LavalinkManager extends events_1.EventEmitter {
|
|
|
90
90
|
throw new SyntaxError("No Manager Options Provided");
|
|
91
91
|
// create options
|
|
92
92
|
this.options = options;
|
|
93
|
-
this.utils = new Utils_1.
|
|
93
|
+
this.utils = new Utils_1.ManagerUtils(this);
|
|
94
94
|
// use the validators
|
|
95
95
|
this.validateAndApply(options);
|
|
96
96
|
this.applyDefaultOptions();
|
|
@@ -50,7 +50,7 @@ class Queue {
|
|
|
50
50
|
options = { maxPreviousTracks: 25 };
|
|
51
51
|
guildId = "";
|
|
52
52
|
QueueSaver = null;
|
|
53
|
-
managerUtils = new Utils_1.
|
|
53
|
+
managerUtils = new Utils_1.ManagerUtils();
|
|
54
54
|
queueChanges;
|
|
55
55
|
constructor(guildId, data = {}, QueueSaver, queueOptions) {
|
|
56
56
|
this.queueChanges = queueOptions.queueChangesWatcher || null;
|
|
@@ -37,7 +37,7 @@ export interface SearchResult {
|
|
|
37
37
|
playlist: PlaylistInfo | null;
|
|
38
38
|
tracks: Track[];
|
|
39
39
|
}
|
|
40
|
-
export declare class
|
|
40
|
+
export declare class ManagerUtils {
|
|
41
41
|
LavalinkManager: LavalinkManager | null;
|
|
42
42
|
constructor(LavalinkManager?: LavalinkManager);
|
|
43
43
|
buildTrack(data: LavalinkTrack | Track, requester: unknown): Track;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.queueTrackEnd = exports.MiniMap = exports.
|
|
3
|
+
exports.queueTrackEnd = exports.MiniMap = exports.ManagerUtils = exports.NodeSymbol = exports.QueueSymbol = exports.UnresolvedTrackSymbol = exports.TrackSymbol = void 0;
|
|
4
4
|
const LavalinkManagerStatics_1 = require("./LavalinkManagerStatics");
|
|
5
5
|
exports.TrackSymbol = Symbol("LC-Track");
|
|
6
6
|
exports.UnresolvedTrackSymbol = Symbol("LC-Track-Unresolved");
|
|
@@ -8,7 +8,7 @@ exports.QueueSymbol = Symbol("LC-Queue");
|
|
|
8
8
|
exports.NodeSymbol = Symbol("LC-Node");
|
|
9
9
|
/** @hidden */
|
|
10
10
|
const escapeRegExp = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
11
|
-
class
|
|
11
|
+
class ManagerUtils {
|
|
12
12
|
LavalinkManager = null;
|
|
13
13
|
constructor(LavalinkManager) {
|
|
14
14
|
this.LavalinkManager = LavalinkManager;
|
|
@@ -197,7 +197,7 @@ class ManagerUitls {
|
|
|
197
197
|
validateSourceString(node, sourceString) {
|
|
198
198
|
if (!sourceString)
|
|
199
199
|
throw new Error(`No SourceString was provided`);
|
|
200
|
-
const source = LavalinkManagerStatics_1.DefaultSources[sourceString.toLowerCase()
|
|
200
|
+
const source = LavalinkManagerStatics_1.DefaultSources[sourceString.toLowerCase().trim()];
|
|
201
201
|
if (!source)
|
|
202
202
|
throw new Error(`Lavalink Node SearchQuerySource: '${sourceString}' is not available`);
|
|
203
203
|
if (source === "amsearch" && !node.info.sourceManagers.includes("applemusic")) {
|
|
@@ -224,7 +224,7 @@ class ManagerUitls {
|
|
|
224
224
|
if (source === "tts" && !node.info.sourceManagers.includes("tts")) {
|
|
225
225
|
throw new Error("Lavalink Node has not 'tts' enabled, which is required to have 'tts' work");
|
|
226
226
|
}
|
|
227
|
-
if (source === "ftts" && !node.info.sourceManagers.includes("ftts")) {
|
|
227
|
+
if (source === "ftts" && !node.info.sourceManagers.includes("ftts") && !node.info.sourceManagers.includes("flowerytts")) {
|
|
228
228
|
console.log(node.info.sourceManagers);
|
|
229
229
|
throw new Error("Lavalink Node has not 'ftts' enabled, which is required to have 'ftts' work");
|
|
230
230
|
}
|
|
@@ -240,7 +240,7 @@ class ManagerUitls {
|
|
|
240
240
|
return;
|
|
241
241
|
}
|
|
242
242
|
}
|
|
243
|
-
exports.
|
|
243
|
+
exports.ManagerUtils = ManagerUtils;
|
|
244
244
|
class MiniMap extends Map {
|
|
245
245
|
constructor(data = []) {
|
|
246
246
|
super(data);
|
|
@@ -2,13 +2,13 @@
|
|
|
2
2
|
import { EventEmitter } from "events";
|
|
3
3
|
import { NodeManager } from "./NodeManager";
|
|
4
4
|
import { ManagerQueueOptions } from "./Queue";
|
|
5
|
-
import { GuildShardPayload,
|
|
5
|
+
import { GuildShardPayload, ManagerUtils, MiniMap, SearchPlatform, TrackEndEvent, TrackExceptionEvent, TrackStartEvent, TrackStuckEvent, VoicePacket, VoiceServer, VoiceState, WebSocketClosedEvent } from "./Utils";
|
|
6
6
|
import { LavalinkNodeOptions } from "./Node";
|
|
7
7
|
import { DestroyReasonsType, Player, PlayerJson, PlayerOptions } from "./Player";
|
|
8
8
|
import { Track, UnresolvedTrack } from "./Track";
|
|
9
9
|
export interface LavalinkManager {
|
|
10
10
|
nodeManager: NodeManager;
|
|
11
|
-
utils:
|
|
11
|
+
utils: ManagerUtils;
|
|
12
12
|
}
|
|
13
13
|
export interface BotClientOptions {
|
|
14
14
|
/** Bot Client Id */
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { EventEmitter } from "events";
|
|
2
2
|
import { NodeManager } from "./NodeManager";
|
|
3
3
|
import { DefaultQueueStore } from "./Queue";
|
|
4
|
-
import {
|
|
4
|
+
import { ManagerUtils, MiniMap } from "./Utils";
|
|
5
5
|
import { DefaultSources, SourceLinksRegexes } from "./LavalinkManagerStatics";
|
|
6
6
|
import { DestroyReasons, Player } from "./Player";
|
|
7
7
|
export class LavalinkManager extends EventEmitter {
|
|
@@ -87,7 +87,7 @@ export class LavalinkManager extends EventEmitter {
|
|
|
87
87
|
throw new SyntaxError("No Manager Options Provided");
|
|
88
88
|
// create options
|
|
89
89
|
this.options = options;
|
|
90
|
-
this.utils = new
|
|
90
|
+
this.utils = new ManagerUtils(this);
|
|
91
91
|
// use the validators
|
|
92
92
|
this.validateAndApply(options);
|
|
93
93
|
this.applyDefaultOptions();
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ManagerUtils, MiniMap } from "./Utils";
|
|
2
2
|
export class QueueSaver {
|
|
3
3
|
constructor(options) {
|
|
4
4
|
this._ = options?.queueStore || new DefaultQueueStore();
|
|
@@ -45,7 +45,7 @@ export class Queue {
|
|
|
45
45
|
options = { maxPreviousTracks: 25 };
|
|
46
46
|
guildId = "";
|
|
47
47
|
QueueSaver = null;
|
|
48
|
-
managerUtils = new
|
|
48
|
+
managerUtils = new ManagerUtils();
|
|
49
49
|
queueChanges;
|
|
50
50
|
constructor(guildId, data = {}, QueueSaver, queueOptions) {
|
|
51
51
|
this.queueChanges = queueOptions.queueChangesWatcher || null;
|
|
@@ -37,7 +37,7 @@ export interface SearchResult {
|
|
|
37
37
|
playlist: PlaylistInfo | null;
|
|
38
38
|
tracks: Track[];
|
|
39
39
|
}
|
|
40
|
-
export declare class
|
|
40
|
+
export declare class ManagerUtils {
|
|
41
41
|
LavalinkManager: LavalinkManager | null;
|
|
42
42
|
constructor(LavalinkManager?: LavalinkManager);
|
|
43
43
|
buildTrack(data: LavalinkTrack | Track, requester: unknown): Track;
|
|
@@ -5,7 +5,7 @@ export const QueueSymbol = Symbol("LC-Queue");
|
|
|
5
5
|
export const NodeSymbol = Symbol("LC-Node");
|
|
6
6
|
/** @hidden */
|
|
7
7
|
const escapeRegExp = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
8
|
-
export class
|
|
8
|
+
export class ManagerUtils {
|
|
9
9
|
LavalinkManager = null;
|
|
10
10
|
constructor(LavalinkManager) {
|
|
11
11
|
this.LavalinkManager = LavalinkManager;
|
|
@@ -194,7 +194,7 @@ export class ManagerUitls {
|
|
|
194
194
|
validateSourceString(node, sourceString) {
|
|
195
195
|
if (!sourceString)
|
|
196
196
|
throw new Error(`No SourceString was provided`);
|
|
197
|
-
const source = DefaultSources[sourceString.toLowerCase()
|
|
197
|
+
const source = DefaultSources[sourceString.toLowerCase().trim()];
|
|
198
198
|
if (!source)
|
|
199
199
|
throw new Error(`Lavalink Node SearchQuerySource: '${sourceString}' is not available`);
|
|
200
200
|
if (source === "amsearch" && !node.info.sourceManagers.includes("applemusic")) {
|
|
@@ -221,7 +221,7 @@ export class ManagerUitls {
|
|
|
221
221
|
if (source === "tts" && !node.info.sourceManagers.includes("tts")) {
|
|
222
222
|
throw new Error("Lavalink Node has not 'tts' enabled, which is required to have 'tts' work");
|
|
223
223
|
}
|
|
224
|
-
if (source === "ftts" && !node.info.sourceManagers.includes("ftts")) {
|
|
224
|
+
if (source === "ftts" && !node.info.sourceManagers.includes("ftts") && !node.info.sourceManagers.includes("flowerytts")) {
|
|
225
225
|
console.log(node.info.sourceManagers);
|
|
226
226
|
throw new Error("Lavalink Node has not 'ftts' enabled, which is required to have 'ftts' work");
|
|
227
227
|
}
|
|
@@ -3,12 +3,12 @@ import { EventEmitter } from "node:events";
|
|
|
3
3
|
import { NodeManager } from "./NodeManager";
|
|
4
4
|
import { ManagerQueueOptions, QueueStoreManager } from "./Queue";
|
|
5
5
|
import { PlayerManager } from "./PlayerManager";
|
|
6
|
-
import { GuildShardPayload,
|
|
6
|
+
import { GuildShardPayload, ManagerUtils, SearchPlatform } from "./Utils";
|
|
7
7
|
import { LavalinkNodeOptions } from "./Node";
|
|
8
8
|
export interface LavalinkManager {
|
|
9
9
|
playerManager: PlayerManager;
|
|
10
10
|
nodeManager: NodeManager;
|
|
11
|
-
utilManager:
|
|
11
|
+
utilManager: ManagerUtils;
|
|
12
12
|
}
|
|
13
13
|
export interface BotClientOptions {
|
|
14
14
|
shards?: number | "auto";
|
|
@@ -31,11 +31,11 @@ export interface SearchResult {
|
|
|
31
31
|
playlist: PlaylistInfo | null;
|
|
32
32
|
tracks: Track[];
|
|
33
33
|
}
|
|
34
|
-
export interface
|
|
34
|
+
export interface ManagerUtils {
|
|
35
35
|
/** @private */
|
|
36
36
|
manager: LavalinkManager;
|
|
37
37
|
}
|
|
38
|
-
export declare class
|
|
38
|
+
export declare class ManagerUtils {
|
|
39
39
|
constructor(LavalinkManager: LavalinkManager);
|
|
40
40
|
buildTrack(data: any, requester: any): Track;
|
|
41
41
|
}
|
|
@@ -2,13 +2,13 @@
|
|
|
2
2
|
import { EventEmitter } from "events";
|
|
3
3
|
import { NodeManager } from "./NodeManager";
|
|
4
4
|
import { ManagerQueueOptions } from "./Queue";
|
|
5
|
-
import { GuildShardPayload,
|
|
5
|
+
import { GuildShardPayload, ManagerUtils, MiniMap, SearchPlatform, TrackEndEvent, TrackExceptionEvent, TrackStartEvent, TrackStuckEvent, VoicePacket, VoiceServer, VoiceState, WebSocketClosedEvent } from "./Utils";
|
|
6
6
|
import { LavalinkNodeOptions } from "./Node";
|
|
7
7
|
import { DestroyReasonsType, Player, PlayerJson, PlayerOptions } from "./Player";
|
|
8
8
|
import { Track, UnresolvedTrack } from "./Track";
|
|
9
9
|
export interface LavalinkManager {
|
|
10
10
|
nodeManager: NodeManager;
|
|
11
|
-
utils:
|
|
11
|
+
utils: ManagerUtils;
|
|
12
12
|
}
|
|
13
13
|
export interface BotClientOptions {
|
|
14
14
|
/** Bot Client Id */
|
|
@@ -37,7 +37,7 @@ export interface SearchResult {
|
|
|
37
37
|
playlist: PlaylistInfo | null;
|
|
38
38
|
tracks: Track[];
|
|
39
39
|
}
|
|
40
|
-
export declare class
|
|
40
|
+
export declare class ManagerUtils {
|
|
41
41
|
LavalinkManager: LavalinkManager | null;
|
|
42
42
|
constructor(LavalinkManager?: LavalinkManager);
|
|
43
43
|
buildTrack(data: LavalinkTrack | Track, requester: unknown): Track;
|
package/package.json
CHANGED