ziplayer 0.0.2 → 0.0.3
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/README.md +4 -0
- package/dist/plugins/BasePlugin.d.ts.map +1 -1
- package/dist/plugins/BasePlugin.js.map +1 -1
- package/dist/plugins/index.d.ts.map +1 -1
- package/dist/plugins/index.js.map +1 -1
- package/dist/structures/Player.d.ts +6 -2
- package/dist/structures/Player.d.ts.map +1 -1
- package/dist/structures/Player.js +71 -33
- package/dist/structures/Player.js.map +1 -1
- package/dist/structures/PlayerManager.d.ts +15 -4
- package/dist/structures/PlayerManager.d.ts.map +1 -1
- package/dist/structures/PlayerManager.js +23 -5
- package/dist/structures/PlayerManager.js.map +1 -1
- package/dist/structures/Queue.d.ts +4 -2
- package/dist/structures/Queue.d.ts.map +1 -1
- package/dist/structures/Queue.js +16 -1
- package/dist/structures/Queue.js.map +1 -1
- package/dist/types/index.d.ts +1 -0
- package/dist/types/index.d.ts.map +1 -1
- package/package.json +6 -3
- package/src/plugins/BasePlugin.ts +17 -20
- package/src/plugins/index.ts +19 -19
- package/src/structures/Player.ts +81 -44
- package/src/structures/PlayerManager.ts +23 -5
- package/src/structures/Queue.ts +18 -2
- package/src/types/index.ts +2 -0
- package/tsconfig.json +21 -21
package/README.md
CHANGED
|
@@ -10,6 +10,7 @@ A modular Discord voice player with plugin system for @discordjs/voice.
|
|
|
10
10
|
- 🎚️ **Volume control** - 0-200% volume range
|
|
11
11
|
- ⏯️ **Playback control** - Play, pause, resume, stop, skip
|
|
12
12
|
- 🔁 **Auto play** - Automatically replay the queue when it ends
|
|
13
|
+
- 🔂 **Loop control** - Repeat a single track or the entire queue
|
|
13
14
|
- 📊 **Progress bar** - Display playback progress with customizable icons
|
|
14
15
|
- 🔔 **Event-driven** - Rich event system for all player actions
|
|
15
16
|
- 🎭 **Multi-guild support** - Manage players across multiple Discord servers
|
|
@@ -53,6 +54,9 @@ await player.play("https://www.youtube.com/playlist?list=PL123", userId);
|
|
|
53
54
|
// Enable autoplay
|
|
54
55
|
player.queue.autoPlay(true);
|
|
55
56
|
|
|
57
|
+
// Loop the entire queue
|
|
58
|
+
player.loop("queue");
|
|
59
|
+
|
|
56
60
|
// Play a full SoundCloud playlist
|
|
57
61
|
await player.play("https://soundcloud.com/artist/sets/playlist", userId);
|
|
58
62
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BasePlugin.d.ts","sourceRoot":"","sources":["../../src/plugins/BasePlugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEzE,8BAAsB,UAAW,YAAW,YAAY;
|
|
1
|
+
{"version":3,"file":"BasePlugin.d.ts","sourceRoot":"","sources":["../../src/plugins/BasePlugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEzE,8BAAsB,UAAW,YAAW,YAAY;IACvD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAC1C,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAC1E,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC;IAErD,WAAW,CAAC,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC;IAI/C,gBAAgB,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAA;KAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAIpH,QAAQ,CAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAI/B,eAAe,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;CAGpE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BasePlugin.js","sourceRoot":"","sources":["../../src/plugins/BasePlugin.ts"],"names":[],"mappings":";;;AAEA,MAAsB,UAAU;
|
|
1
|
+
{"version":3,"file":"BasePlugin.js","sourceRoot":"","sources":["../../src/plugins/BasePlugin.ts"],"names":[],"mappings":";;;AAEA,MAAsB,UAAU;IAQ/B,WAAW,CAAE,KAAY;QACxB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IAChD,CAAC;IAED,gBAAgB,CAAE,QAAgB,EAAE,IAA6D;QAChG,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,QAAQ,CAAE,GAAW;QACpB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;IAED,eAAe,CAAE,GAAW,EAAE,WAAmB;QAChD,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;CACD;AAvBD,gCAuBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plugins/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,qBAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plugins/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,qBAAa,aAAa;IACzB,OAAO,CAAC,OAAO,CAAsC;IAErD,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IAIlC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIjC,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAIzC,MAAM,IAAI,UAAU,EAAE;IAItB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAIjD,KAAK,IAAI,IAAI;CAGb"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/plugins/index.ts"],"names":[],"mappings":";;;AAEA,2CAA0C;AAAjC,wGAAA,UAAU,OAAA;AAEnB,iBAAiB;AACjB,MAAa,aAAa;IAA1B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/plugins/index.ts"],"names":[],"mappings":";;;AAEA,2CAA0C;AAAjC,wGAAA,UAAU,OAAA;AAEnB,iBAAiB;AACjB,MAAa,aAAa;IAA1B;QACS,YAAO,GAA4B,IAAI,GAAG,EAAE,CAAC;IAyBtD,CAAC;IAvBA,QAAQ,CAAC,MAAkB;QAC1B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACvC,CAAC;IAED,UAAU,CAAC,IAAY;QACtB,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,GAAG,CAAC,IAAY;QACf,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,MAAM;QACL,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC1C,CAAC;IAED,UAAU,CAAC,KAAa;QACvB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,KAAK;QACJ,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;CACD;AA1BD,sCA0BC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { EventEmitter } from "events";
|
|
2
2
|
import { VoiceConnection, AudioPlayer as DiscordAudioPlayer } from "@discordjs/voice";
|
|
3
3
|
import { VoiceChannel } from "discord.js";
|
|
4
|
-
import { Track, PlayerOptions, PlayerEvents, SourcePlugin, SearchResult, ProgressBarOptions } from "../types";
|
|
4
|
+
import { Track, PlayerOptions, PlayerEvents, SourcePlugin, SearchResult, ProgressBarOptions, LoopMode } from "../types";
|
|
5
5
|
import { Queue } from "./Queue";
|
|
6
6
|
import { PluginManager } from "../plugins";
|
|
7
|
+
import type { PlayerManager } from "./PlayerManager";
|
|
7
8
|
export declare interface Player {
|
|
8
9
|
on<K extends keyof PlayerEvents>(event: K, listener: (...args: PlayerEvents[K]) => void): this;
|
|
9
10
|
emit<K extends keyof PlayerEvents>(event: K, ...args: PlayerEvents[K]): boolean;
|
|
@@ -19,12 +20,14 @@ export declare class Player extends EventEmitter {
|
|
|
19
20
|
options: PlayerOptions;
|
|
20
21
|
pluginManager: PluginManager;
|
|
21
22
|
userdata?: Record<string, any>;
|
|
23
|
+
private manager;
|
|
22
24
|
private leaveTimeout;
|
|
23
25
|
private currentResource;
|
|
24
26
|
private volumeInterval;
|
|
27
|
+
private skipLoop;
|
|
25
28
|
private withTimeout;
|
|
26
29
|
private debug;
|
|
27
|
-
constructor(guildId: string, options
|
|
30
|
+
constructor(guildId: string, options: PlayerOptions | undefined, manager: PlayerManager);
|
|
28
31
|
private setupEventListeners;
|
|
29
32
|
addPlugin(plugin: SourcePlugin): void;
|
|
30
33
|
removePlugin(name: string): boolean;
|
|
@@ -37,6 +40,7 @@ export declare class Player extends EventEmitter {
|
|
|
37
40
|
resume(): boolean;
|
|
38
41
|
stop(): boolean;
|
|
39
42
|
skip(): boolean;
|
|
43
|
+
loop(mode?: LoopMode): LoopMode;
|
|
40
44
|
setVolume(volume: number): boolean;
|
|
41
45
|
shuffle(): void;
|
|
42
46
|
clearQueue(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Player.d.ts","sourceRoot":"","sources":["../../src/structures/Player.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,
|
|
1
|
+
{"version":3,"file":"Player.d.ts","sourceRoot":"","sources":["../../src/structures/Player.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ class Player extends events_1.EventEmitter {
|
|
|
15
15
|
this.emit("debug", message, ...optionalParams);
|
|
16
16
|
}
|
|
17
17
|
}
|
|
18
|
-
constructor(guildId, options = {}) {
|
|
18
|
+
constructor(guildId, options = {}, manager) {
|
|
19
19
|
super();
|
|
20
20
|
this.connection = null;
|
|
21
21
|
this.volume = 100;
|
|
@@ -24,10 +24,17 @@ class Player extends events_1.EventEmitter {
|
|
|
24
24
|
this.leaveTimeout = null;
|
|
25
25
|
this.currentResource = null;
|
|
26
26
|
this.volumeInterval = null;
|
|
27
|
+
this.skipLoop = false;
|
|
27
28
|
this.debug(`[Player] Constructor called for guildId: ${guildId}`);
|
|
28
29
|
this.guildId = guildId;
|
|
29
30
|
this.queue = new Queue_1.Queue();
|
|
30
|
-
this.
|
|
31
|
+
this.manager = manager;
|
|
32
|
+
this.audioPlayer = (0, voice_1.createAudioPlayer)({
|
|
33
|
+
behaviors: {
|
|
34
|
+
noSubscriber: voice_1.NoSubscriberBehavior.Pause,
|
|
35
|
+
maxMissedFrames: 100,
|
|
36
|
+
},
|
|
37
|
+
});
|
|
31
38
|
this.pluginManager = new plugins_1.PluginManager();
|
|
32
39
|
this.options = {
|
|
33
40
|
leaveOnEnd: true,
|
|
@@ -43,34 +50,51 @@ class Player extends events_1.EventEmitter {
|
|
|
43
50
|
this.setupEventListeners();
|
|
44
51
|
}
|
|
45
52
|
setupEventListeners() {
|
|
46
|
-
this.audioPlayer.on(
|
|
47
|
-
this.debug(`[Player]
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
53
|
+
this.audioPlayer.on("stateChange", (oldState, newState) => {
|
|
54
|
+
this.debug(`[Player] AudioPlayer stateChange from ${oldState.status} to ${newState.status}`);
|
|
55
|
+
if (newState.status === voice_1.AudioPlayerStatus.Idle && oldState.status !== voice_1.AudioPlayerStatus.Idle) {
|
|
56
|
+
// Track ended
|
|
57
|
+
const track = this.queue.currentTrack;
|
|
58
|
+
if (track) {
|
|
59
|
+
this.debug(`[Player] Track ended: ${track.title}`);
|
|
60
|
+
this.emit("trackEnd", track);
|
|
61
|
+
}
|
|
62
|
+
this.playNext();
|
|
54
63
|
}
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
+
else if (newState.status === voice_1.AudioPlayerStatus.Playing &&
|
|
65
|
+
(oldState.status === voice_1.AudioPlayerStatus.Idle || oldState.status === voice_1.AudioPlayerStatus.Buffering)) {
|
|
66
|
+
// Track started
|
|
67
|
+
this.isPlaying = true;
|
|
68
|
+
this.isPaused = false;
|
|
69
|
+
const track = this.queue.currentTrack;
|
|
70
|
+
if (track) {
|
|
71
|
+
this.debug(`[Player] Track started: ${track.title}`);
|
|
72
|
+
this.emit("trackStart", track);
|
|
73
|
+
}
|
|
64
74
|
}
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
75
|
+
else if (newState.status === voice_1.AudioPlayerStatus.Paused && oldState.status !== voice_1.AudioPlayerStatus.Paused) {
|
|
76
|
+
// Track paused
|
|
77
|
+
this.isPaused = true;
|
|
78
|
+
const track = this.queue.currentTrack;
|
|
79
|
+
if (track) {
|
|
80
|
+
this.debug(`[Player] Player paused on track: ${track.title}`);
|
|
81
|
+
this.emit("playerPause", track);
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
else if (newState.status !== voice_1.AudioPlayerStatus.Paused && oldState.status === voice_1.AudioPlayerStatus.Paused) {
|
|
85
|
+
// Track resumed
|
|
86
|
+
this.isPaused = false;
|
|
87
|
+
const track = this.queue.currentTrack;
|
|
88
|
+
if (track) {
|
|
89
|
+
this.debug(`[Player] Player resumed on track: ${track.title}`);
|
|
90
|
+
this.emit("playerResume", track);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
else if (newState.status === voice_1.AudioPlayerStatus.AutoPaused) {
|
|
94
|
+
this.debug(`[Player] AudioPlayerStatus.AutoPaused`);
|
|
95
|
+
}
|
|
96
|
+
else if (newState.status === voice_1.AudioPlayerStatus.Buffering) {
|
|
97
|
+
this.debug(`[Player] AudioPlayerStatus.Buffering`);
|
|
74
98
|
}
|
|
75
99
|
});
|
|
76
100
|
this.audioPlayer.on("error", (error) => {
|
|
@@ -78,6 +102,11 @@ class Player extends events_1.EventEmitter {
|
|
|
78
102
|
this.emit("playerError", error, this.queue.currentTrack || undefined);
|
|
79
103
|
this.playNext();
|
|
80
104
|
});
|
|
105
|
+
this.audioPlayer.on("debug", (...args) => {
|
|
106
|
+
if (this.manager.debugEnabled) {
|
|
107
|
+
this.emit("debug", ...args);
|
|
108
|
+
}
|
|
109
|
+
});
|
|
81
110
|
}
|
|
82
111
|
addPlugin(plugin) {
|
|
83
112
|
this.debug(`[Player] Adding plugin: ${plugin.name}`);
|
|
@@ -90,20 +119,22 @@ class Player extends events_1.EventEmitter {
|
|
|
90
119
|
async connect(channel) {
|
|
91
120
|
try {
|
|
92
121
|
this.debug(`[Player] Connecting to voice channel: ${channel.id}`);
|
|
93
|
-
|
|
122
|
+
const connection = (0, voice_1.joinVoiceChannel)({
|
|
94
123
|
channelId: channel.id,
|
|
95
124
|
guildId: channel.guildId,
|
|
96
125
|
adapterCreator: channel.guild.voiceAdapterCreator,
|
|
97
126
|
});
|
|
98
|
-
|
|
127
|
+
await (0, voice_1.entersState)(connection, voice_1.VoiceConnectionStatus.Ready, 50000);
|
|
128
|
+
this.connection = connection;
|
|
129
|
+
connection.on(voice_1.VoiceConnectionStatus.Disconnected, () => {
|
|
99
130
|
this.debug(`[Player] VoiceConnectionStatus.Disconnected`);
|
|
100
131
|
this.destroy();
|
|
101
132
|
});
|
|
102
|
-
|
|
133
|
+
connection.on("error", (error) => {
|
|
103
134
|
this.debug(`[Player] Voice connection error:`, error);
|
|
104
135
|
this.emit("connectionError", error);
|
|
105
136
|
});
|
|
106
|
-
|
|
137
|
+
connection.subscribe(this.audioPlayer);
|
|
107
138
|
if (this.leaveTimeout) {
|
|
108
139
|
clearTimeout(this.leaveTimeout);
|
|
109
140
|
this.leaveTimeout = null;
|
|
@@ -113,6 +144,7 @@ class Player extends events_1.EventEmitter {
|
|
|
113
144
|
catch (error) {
|
|
114
145
|
this.debug(`[Player] Connection error:`, error);
|
|
115
146
|
this.emit("connectionError", error);
|
|
147
|
+
this.connection?.destroy();
|
|
116
148
|
throw error;
|
|
117
149
|
}
|
|
118
150
|
}
|
|
@@ -193,7 +225,8 @@ class Player extends events_1.EventEmitter {
|
|
|
193
225
|
}
|
|
194
226
|
async playNext() {
|
|
195
227
|
this.debug(`[Player] playNext called`);
|
|
196
|
-
const track = this.queue.next();
|
|
228
|
+
const track = this.queue.next(this.skipLoop);
|
|
229
|
+
this.skipLoop = false;
|
|
197
230
|
if (!track) {
|
|
198
231
|
if (this.queue.autoPlay()) {
|
|
199
232
|
const willnext = this.queue.willNextTrack();
|
|
@@ -277,6 +310,7 @@ class Player extends events_1.EventEmitter {
|
|
|
277
310
|
this.currentResource.volume?.setVolume(this.volume / 100);
|
|
278
311
|
this.debug(`[Player] Playing resource for track: ${track.title}`);
|
|
279
312
|
this.audioPlayer.play(this.currentResource);
|
|
313
|
+
await (0, voice_1.entersState)(this.audioPlayer, voice_1.AudioPlayerStatus.Playing, 5000);
|
|
280
314
|
return true;
|
|
281
315
|
}
|
|
282
316
|
catch (error) {
|
|
@@ -319,10 +353,14 @@ class Player extends events_1.EventEmitter {
|
|
|
319
353
|
skip() {
|
|
320
354
|
this.debug(`[Player] skip called`);
|
|
321
355
|
if (this.isPlaying || this.isPaused) {
|
|
356
|
+
this.skipLoop = true;
|
|
322
357
|
return this.audioPlayer.stop();
|
|
323
358
|
}
|
|
324
359
|
return !!this.playNext();
|
|
325
360
|
}
|
|
361
|
+
loop(mode) {
|
|
362
|
+
return this.queue.loop(mode);
|
|
363
|
+
}
|
|
326
364
|
setVolume(volume) {
|
|
327
365
|
this.debug(`[Player] setVolume called: ${volume}`);
|
|
328
366
|
if (volume < 0 || volume > 200)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Player.js","sourceRoot":"","sources":["../../src/structures/Player.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Player.js","sourceRoot":"","sources":["../../src/structures/Player.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AACtC,4CAY0B;AAK1B,mCAAgC;AAChC,wCAA2C;AAO3C,MAAa,MAAO,SAAQ,qBAAY;IAiB/B,WAAW,CAAI,OAAmB,EAAE,OAAe;QAC1D,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,IAAI,KAAK,CAAC;QACvD,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1H,CAAC;IAEO,KAAK,CAAC,OAAa,EAAE,GAAG,cAAqB;QACpD,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACrC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC,CAAC;QAChD,CAAC;IACF,CAAC;IAED,YAAY,OAAe,EAAE,UAAyB,EAAE,EAAE,OAAsB;QAC/E,KAAK,EAAE,CAAC;QA3BF,eAAU,GAA2B,IAAI,CAAC;QAG1C,WAAM,GAAW,GAAG,CAAC;QACrB,cAAS,GAAY,KAAK,CAAC;QAC3B,aAAQ,GAAY,KAAK,CAAC;QAKzB,iBAAY,GAA0B,IAAI,CAAC;QAC3C,oBAAe,GAAyB,IAAI,CAAC;QAC7C,mBAAc,GAA0B,IAAI,CAAC;QAC7C,aAAQ,GAAG,KAAK,CAAC;QAexB,IAAI,CAAC,KAAK,CAAC,4CAA4C,OAAO,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,IAAI,aAAK,EAAE,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,IAAA,yBAAiB,EAAC;YACpC,SAAS,EAAE;gBACV,YAAY,EAAE,4BAAoB,CAAC,KAAK;gBACxC,eAAe,EAAE,GAAG;aACpB;SACD,CAAC,CAAC;QAEH,IAAI,CAAC,aAAa,GAAG,IAAI,uBAAa,EAAE,CAAC;QAEzC,IAAI,CAAC,OAAO,GAAG;YACd,UAAU,EAAE,IAAI;YAChB,YAAY,EAAE,IAAI;YAClB,YAAY,EAAE,MAAM;YACpB,MAAM,EAAE,GAAG;YACX,OAAO,EAAE,MAAM;YACf,gBAAgB,EAAE,KAAK;YACvB,GAAG,OAAO;SACV,CAAC;QAEF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,GAAG,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;QACtC,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC5B,CAAC;IAEO,mBAAmB;QAC1B,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE;YACzD,IAAI,CAAC,KAAK,CAAC,yCAAyC,QAAQ,CAAC,MAAM,OAAO,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;YAC7F,IAAI,QAAQ,CAAC,MAAM,KAAK,yBAAiB,CAAC,IAAI,IAAI,QAAQ,CAAC,MAAM,KAAK,yBAAiB,CAAC,IAAI,EAAE,CAAC;gBAC9F,cAAc;gBACd,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;gBACtC,IAAI,KAAK,EAAE,CAAC;oBACX,IAAI,CAAC,KAAK,CAAC,yBAAyB,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;oBACnD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;gBAC9B,CAAC;gBACD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjB,CAAC;iBAAM,IACN,QAAQ,CAAC,MAAM,KAAK,yBAAiB,CAAC,OAAO;gBAC7C,CAAC,QAAQ,CAAC,MAAM,KAAK,yBAAiB,CAAC,IAAI,IAAI,QAAQ,CAAC,MAAM,KAAK,yBAAiB,CAAC,SAAS,CAAC,EAC9F,CAAC;gBACF,gBAAgB;gBAChB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;gBACtB,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;gBACtB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;gBACtC,IAAI,KAAK,EAAE,CAAC;oBACX,IAAI,CAAC,KAAK,CAAC,2BAA2B,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;oBACrD,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;gBAChC,CAAC;YACF,CAAC;iBAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,yBAAiB,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,yBAAiB,CAAC,MAAM,EAAE,CAAC;gBACzG,eAAe;gBACf,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;gBACrB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;gBACtC,IAAI,KAAK,EAAE,CAAC;oBACX,IAAI,CAAC,KAAK,CAAC,oCAAoC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;oBAC9D,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;gBACjC,CAAC;YACF,CAAC;iBAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,yBAAiB,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,yBAAiB,CAAC,MAAM,EAAE,CAAC;gBACzG,gBAAgB;gBAChB,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;gBACtB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;gBACtC,IAAI,KAAK,EAAE,CAAC;oBACX,IAAI,CAAC,KAAK,CAAC,qCAAqC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;oBAC/D,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;gBAClC,CAAC;YACF,CAAC;iBAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,yBAAiB,CAAC,UAAU,EAAE,CAAC;gBAC7D,IAAI,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;YACrD,CAAC;iBAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,yBAAiB,CAAC,SAAS,EAAE,CAAC;gBAC5D,IAAI,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;YACpD,CAAC;QACF,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACtC,IAAI,CAAC,KAAK,CAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC;YACjD,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,SAAS,CAAC,CAAC;YACtE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE;YACxC,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;gBAC/B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;YAC7B,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,SAAS,CAAC,MAAoB;QAC7B,IAAI,CAAC,KAAK,CAAC,2BAA2B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QACrD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;IAED,YAAY,CAAC,IAAY;QACxB,IAAI,CAAC,KAAK,CAAC,6BAA6B,IAAI,EAAE,CAAC,CAAC;QAChD,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAqB;QAClC,IAAI,CAAC;YACJ,IAAI,CAAC,KAAK,CAAC,yCAAyC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YAClE,MAAM,UAAU,GAAG,IAAA,wBAAgB,EAAC;gBACnC,SAAS,EAAE,OAAO,CAAC,EAAE;gBACrB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,cAAc,EAAE,OAAO,CAAC,KAAK,CAAC,mBAA0B;aACxD,CAAC,CAAC;YAEH,MAAM,IAAA,mBAAW,EAAC,UAAU,EAAE,6BAAqB,CAAC,KAAK,EAAE,KAAM,CAAC,CAAC;YACnE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;YAE7B,UAAU,CAAC,EAAE,CAAC,6BAAqB,CAAC,YAAY,EAAE,GAAG,EAAE;gBACtD,IAAI,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;gBAC1D,IAAI,CAAC,OAAO,EAAE,CAAC;YAChB,CAAC,CAAC,CAAC;YAEH,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBAChC,IAAI,CAAC,KAAK,CAAC,kCAAkC,EAAE,KAAK,CAAC,CAAC;gBACtD,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC;YACH,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAEvC,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACvB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAChC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;YAC1B,CAAC;YACD,OAAO,IAAI,CAAC,UAAU,CAAC;QACxB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;YAChD,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAc,CAAC,CAAC;YAC7C,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC;YAC3B,MAAM,KAAK,CAAC;QACb,CAAC;IACF,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAa,EAAE,WAAmB;QAC9C,IAAI,CAAC,KAAK,CAAC,sCAAsC,KAAK,kBAAkB,WAAW,EAAE,CAAC,CAAC;QACvF,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACpD,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,IAAI,CAAC,KAAK,CAAC,uCAAuC,KAAK,EAAE,CAAC,CAAC;YAC3D,MAAM,IAAI,KAAK,CAAC,8BAA8B,KAAK,EAAE,CAAC,CAAC;QACxD,CAAC;QAED,IAAI,CAAC;YACJ,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,EAAE,4BAA4B,CAAC,CAAC;QAChG,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;YAC5C,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,KAAc,CAAC,CAAC;YACzC,MAAM,KAAK,CAAC;QACb,CAAC;IACF,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,KAAqB,EAAE,WAAoB;QACrD,IAAI,CAAC;YACJ,IAAI,CAAC,KAAK,CAAC,oCAAoC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;YACnG,IAAI,WAAW,GAAY,EAAE,CAAC;YAE9B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC/B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,IAAI,SAAS,CAAC,CAAC;gBACxE,WAAW,GAAG,YAAY,CAAC,MAAM,CAAC;gBAElC,IAAI,YAAY,CAAC,QAAQ,EAAE,CAAC;oBAC3B,IAAI,CAAC,KAAK,CAAC,4BAA4B,YAAY,CAAC,QAAQ,CAAC,IAAI,KAAK,WAAW,CAAC,MAAM,UAAU,CAAC,CAAC;gBACrG,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,WAAW,GAAG,CAAC,KAAK,CAAC,CAAC;YACvB,CAAC;YAED,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC9B,IAAI,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;gBAChD,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;YACpC,CAAC;YAED,sBAAsB;YACtB,KAAK,MAAM,KAAK,IAAI,WAAW,EAAE,CAAC;gBACjC,IAAI,CAAC,KAAK,CAAC,mCAAmC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC7D,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBACtB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YAC9B,CAAC;YAED,uCAAuC;YACvC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACrB,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;YACxB,CAAC;YAED,OAAO,IAAI,CAAC;QACb,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;YAC1C,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,KAAc,CAAC,CAAC;YACzC,OAAO,KAAK,CAAC;QACd,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;QAE5C,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;QAC7G,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACxG,IAAI,MAAM,IAAI,OAAO,MAAM,CAAC,gBAAgB,KAAK,UAAU,EAAE,CAAC;YAC7D,IAAI,CAAC;gBACJ,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CACrC,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,GAAG,EAAE;oBACtC,KAAK,EAAE,EAAE;oBACT,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc;iBAClC,CAAC,EACF,4BAA4B,CAC5B,CAAC;gBAEF,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACnC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;oBAChE,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;oBACtF,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;oBACpC,IAAI,CAAC,KAAK,CAAC,yCAAyC,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;oBACxE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;gBAC3C,CAAC;YACF,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,IAAI,CAAC,KAAK,CAAC,kCAAkC,EAAE,GAAG,CAAC,CAAC;YACrD,CAAC;QACF,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,QAAQ;QACrB,IAAI,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QACvC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC7C,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC;gBAC3B,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;gBAC5C,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;gBAClC,IAAI,QAAQ,EAAE,CAAC;oBACd,IAAI,CAAC,KAAK,CAAC,qCAAqC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;oBAClE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;oBACnC,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACxB,CAAC;YACF,CAAC;YAED,IAAI,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;YAC9C,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;YACvB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAEtB,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;gBAC7B,IAAI,CAAC,aAAa,EAAE,CAAC;YACtB,CAAC;YACD,OAAO,KAAK,CAAC;QACd,CAAC;QAED,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAExB,IAAI,CAAC;YACJ,yCAAyC;YACzC,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAEhG,IAAI,CAAC,MAAM,EAAE,CAAC;gBACb,IAAI,CAAC,KAAK,CAAC,uCAAuC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;gBACjE,MAAM,IAAI,KAAK,CAAC,8BAA8B,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;YAC9D,CAAC;YAED,IAAI,CAAC,KAAK,CAAC,sCAAsC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;YAChE,IAAI,CAAC,KAAK,CAAC,0BAA0B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YACpD,IAAI,CAAC,KAAK,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;YACzC,IAAI,UAAU,CAAC;YACf,IAAI,CAAC;gBACJ,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,qBAAqB,CAAC,CAAC;YACrF,CAAC;YAAC,OAAO,WAAW,EAAE,CAAC;gBACtB,IAAI,CAAC,KAAK,CAAC,gDAAgD,EAAE,WAAW,CAAC,CAAC;gBAC1E,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;gBAC7C,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;oBAC1B,IAAI,OAAO,CAAC,CAAC,WAAW,KAAK,UAAU,EAAE,CAAC;wBACzC,SAAS;oBACV,CAAC;oBACD,IAAI,CAAC;wBACJ,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,oCAAoC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;wBACxG,IAAI,CAAC,UAAU,CAAC,MAAM;4BAAE,SAAS;wBACjC,IAAI,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC,IAAI,eAAe,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;wBAC7F,MAAM;oBACP,CAAC;oBAAC,OAAO,aAAa,EAAE,CAAC;wBACxB,IAAI,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC,IAAI,GAAG,EAAE,aAAa,CAAC,CAAC;oBACjF,CAAC;gBACF,CAAC;gBACD,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC;oBACzB,MAAM,IAAI,KAAK,CAAC,8CAA8C,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC9E,CAAC;gBACD,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YACxB,CAAC;YAED,SAAS,eAAe,CAAC,IAAY;gBACpC,QAAQ,IAAI,EAAE,CAAC;oBACd,KAAK,WAAW;wBACf,OAAO,kBAAU,CAAC,QAAQ,CAAC;oBAC5B,KAAK,UAAU;wBACd,OAAO,kBAAU,CAAC,OAAO,CAAC;oBAC3B,KAAK,WAAW;wBACf,OAAO,kBAAU,CAAC,SAAS,CAAC;oBAC7B;wBACC,OAAO,kBAAU,CAAC,SAAS,CAAC;gBAC9B,CAAC;YACF,CAAC;YAED,IAAI,MAAM,GAAa,UAAU,CAAC,MAAM,CAAC;YACzC,IAAI,SAAS,GAAG,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAEjD,IAAI,CAAC,eAAe,GAAG,IAAA,2BAAmB,EAAC,MAAM,EAAE;gBAClD,QAAQ,EAAE,KAAK;gBACf,SAAS;gBACT,YAAY,EAAE,IAAI;aAClB,CAAC,CAAC;YAEH,8DAA8D;YAC9D,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBACzB,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBACnC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;YAC5B,CAAC;YACD,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC;YAE1D,IAAI,CAAC,KAAK,CAAC,wCAAwC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;YAClE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAE5C,MAAM,IAAA,mBAAW,EAAC,IAAI,CAAC,WAAW,EAAE,yBAAiB,CAAC,OAAO,EAAE,IAAK,CAAC,CAAC;YAEtE,OAAO,IAAI,CAAC;QACb,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAC;YAC9C,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,KAAc,EAAE,KAAK,CAAC,CAAC;YAChD,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;QACxB,CAAC;IACF,CAAC;IAED,KAAK;QACJ,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QACpC,IAAI,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACtC,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QACjC,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,MAAM;QACL,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;QACrC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC1C,IAAI,MAAM,EAAE,CAAC;gBACZ,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;gBACtC,IAAI,KAAK,EAAE,CAAC;oBACX,IAAI,CAAC,KAAK,CAAC,qCAAqC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;oBAC/D,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;gBAClC,CAAC;YACF,CAAC;YACD,OAAO,MAAM,CAAC;QACf,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,IAAI;QACH,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;QACnC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACnB,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QACvC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACxB,OAAO,MAAM,CAAC;IACf,CAAC;IAED,IAAI;QACH,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;QACnC,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACrC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YACrB,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAChC,CAAC;QACD,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC1B,CAAC;IAED,IAAI,CAAC,IAAe;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED,SAAS,CAAC,MAAc;QACvB,IAAI,CAAC,KAAK,CAAC,8BAA8B,MAAM,EAAE,CAAC,CAAC;QACnD,IAAI,MAAM,GAAG,CAAC,IAAI,MAAM,GAAG,GAAG;YAAE,OAAO,KAAK,CAAC;QAE7C,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC;QAC9B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC;QAEpD,IAAI,cAAc,EAAE,CAAC;YACpB,IAAI,IAAI,CAAC,cAAc;gBAAE,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAE5D,MAAM,KAAK,GAAG,cAAc,CAAC,MAAM,CAAC;YACpC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC;YACjC,MAAM,KAAK,GAAG,EAAE,CAAC;YACjB,IAAI,WAAW,GAAG,CAAC,CAAC;YAEpB,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE;gBACtC,WAAW,EAAE,CAAC;gBACd,MAAM,KAAK,GAAG,KAAK,GAAG,CAAC,CAAC,MAAM,GAAG,KAAK,CAAC,GAAG,WAAW,CAAC,GAAG,KAAK,CAAC;gBAC/D,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;gBAChC,IAAI,WAAW,IAAI,KAAK,EAAE,CAAC;oBAC1B,aAAa,CAAC,IAAI,CAAC,cAAe,CAAC,CAAC;oBACpC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;gBAC5B,CAAC;YACF,CAAC,EAAE,GAAG,CAAC,CAAC;QACT,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAC7C,OAAO,IAAI,CAAC;IACb,CAAC;IAED,OAAO;QACN,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QACtC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;IACtB,CAAC;IAED,UAAU;QACT,IAAI,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,KAAa;QACnB,IAAI,CAAC,KAAK,CAAC,qCAAqC,KAAK,EAAE,CAAC,CAAC;QACzD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,KAAK,EAAE,CAAC;YACX,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QACxC,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,cAAc,CAAC,UAA8B,EAAE;QAC9C,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,OAAO,GAAG,GAAG,EAAE,YAAY,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;QAClE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC;QACtC,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ;YAAE,OAAO,EAAE,CAAC;QAEnC,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC7E,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QAE9D,MAAM,OAAO,GAAG,QAAQ,CAAC,gBAAgB,CAAC;QAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;QAC1C,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,GAAG,QAAQ,CAAC,CAAC;QAEtF,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;IACvE,CAAC;IAEO,UAAU,CAAC,EAAU;QAC5B,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;QAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC;QAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,YAAY,GAAG,EAAE,CAAC;QAClC,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,IAAI,KAAK,GAAG,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;QAC1D,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;QAC7C,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;QAC7C,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC;IAEO,aAAa;QACpB,IAAI,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;QAC5C,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;YAC5D,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;gBACnC,IAAI,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;gBAC3D,IAAI,CAAC,OAAO,EAAE,CAAC;YAChB,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC/B,CAAC;IACF,CAAC;IAED,OAAO;QACN,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QACtC,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAChC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QAC1B,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE5B,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YAC1B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACxB,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACnB,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC3B,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC3B,CAAC;IAED,UAAU;IACV,IAAI,SAAS;QACZ,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IACxB,CAAC;IAED,IAAI,YAAY;QACf,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;IAChC,CAAC;IAED,IAAI,cAAc;QACjB,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;IAC/B,CAAC;IAED,IAAI,cAAc;QACjB,OAAO,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC;IAClC,CAAC;IAED,IAAI,gBAAgB;QACnB,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACvD,CAAC;CACD;AAxhBD,wBAwhBC"}
|
|
@@ -4,13 +4,24 @@ import { PlayerManagerOptions, PlayerOptions } from "../types";
|
|
|
4
4
|
export declare class PlayerManager extends EventEmitter {
|
|
5
5
|
private players;
|
|
6
6
|
private plugins;
|
|
7
|
+
private B_debug;
|
|
7
8
|
private debug;
|
|
8
9
|
constructor(options?: PlayerManagerOptions);
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
private resolveGuildId;
|
|
11
|
+
create(guildOrId: string | {
|
|
12
|
+
id: string;
|
|
13
|
+
}, options?: PlayerOptions): Player;
|
|
14
|
+
get(guildOrId: string | {
|
|
15
|
+
id: string;
|
|
16
|
+
}): Player | undefined;
|
|
17
|
+
delete(guildOrId: string | {
|
|
18
|
+
id: string;
|
|
19
|
+
}): boolean;
|
|
20
|
+
has(guildOrId: string | {
|
|
21
|
+
id: string;
|
|
22
|
+
}): boolean;
|
|
13
23
|
get size(): number;
|
|
24
|
+
get debugEnabled(): boolean;
|
|
14
25
|
destroy(): void;
|
|
15
26
|
}
|
|
16
27
|
//# sourceMappingURL=PlayerManager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlayerManager.d.ts","sourceRoot":"","sources":["../../src/structures/PlayerManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAuB,MAAM,UAAU,CAAC;AAEpF,qBAAa,aAAc,SAAQ,YAAY;IAC9C,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,OAAO,CAAiB;
|
|
1
|
+
{"version":3,"file":"PlayerManager.d.ts","sourceRoot":"","sources":["../../src/structures/PlayerManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAuB,MAAM,UAAU,CAAC;AAEpF,qBAAa,aAAc,SAAQ,YAAY;IAC9C,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,OAAO,CAAkB;IAEjC,OAAO,CAAC,KAAK;gBASD,OAAO,GAAE,oBAAyB;IAK9C,OAAO,CAAC,cAAc;IAMtB,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,MAAM;IAqC3E,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,GAAG,SAAS;IAK3D,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO;IAWnD,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO;IAKhD,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED,OAAO,IAAI,IAAI;CAQf"}
|
|
@@ -7,19 +7,31 @@ class PlayerManager extends events_1.EventEmitter {
|
|
|
7
7
|
debug(message, ...optionalParams) {
|
|
8
8
|
if (this.listenerCount("debug") > 0) {
|
|
9
9
|
this.emit("debug", message, ...optionalParams);
|
|
10
|
+
if (!this.B_debug) {
|
|
11
|
+
this.B_debug = true;
|
|
12
|
+
}
|
|
10
13
|
}
|
|
11
14
|
}
|
|
12
15
|
constructor(options = {}) {
|
|
13
16
|
super();
|
|
14
17
|
this.players = new Map();
|
|
18
|
+
this.B_debug = false;
|
|
15
19
|
this.plugins = options.plugins || [];
|
|
16
20
|
}
|
|
17
|
-
|
|
21
|
+
resolveGuildId(guildOrId) {
|
|
22
|
+
if (typeof guildOrId === "string")
|
|
23
|
+
return guildOrId;
|
|
24
|
+
if (guildOrId && typeof guildOrId === "object" && "id" in guildOrId)
|
|
25
|
+
return guildOrId.id;
|
|
26
|
+
throw new Error("Invalid guild or guildId provided.");
|
|
27
|
+
}
|
|
28
|
+
create(guildOrId, options) {
|
|
29
|
+
const guildId = this.resolveGuildId(guildOrId);
|
|
18
30
|
if (this.players.has(guildId)) {
|
|
19
31
|
return this.players.get(guildId);
|
|
20
32
|
}
|
|
21
33
|
this.debug(`[PlayerManager] Creating player for guildId: ${guildId}`);
|
|
22
|
-
const player = new Player_1.Player(guildId, options);
|
|
34
|
+
const player = new Player_1.Player(guildId, options, this);
|
|
23
35
|
this.plugins.forEach((plugin) => player.addPlugin(plugin));
|
|
24
36
|
// Forward all player events
|
|
25
37
|
player.on("willPlay", (track, tracks) => this.emit("willPlay", player, track, tracks));
|
|
@@ -46,10 +58,12 @@ class PlayerManager extends events_1.EventEmitter {
|
|
|
46
58
|
this.players.set(guildId, player);
|
|
47
59
|
return player;
|
|
48
60
|
}
|
|
49
|
-
get(
|
|
61
|
+
get(guildOrId) {
|
|
62
|
+
const guildId = this.resolveGuildId(guildOrId);
|
|
50
63
|
return this.players.get(guildId);
|
|
51
64
|
}
|
|
52
|
-
delete(
|
|
65
|
+
delete(guildOrId) {
|
|
66
|
+
const guildId = this.resolveGuildId(guildOrId);
|
|
53
67
|
const player = this.players.get(guildId);
|
|
54
68
|
if (player) {
|
|
55
69
|
this.debug(`[PlayerManager] Deleting player for guildId: ${guildId}`);
|
|
@@ -58,12 +72,16 @@ class PlayerManager extends events_1.EventEmitter {
|
|
|
58
72
|
}
|
|
59
73
|
return false;
|
|
60
74
|
}
|
|
61
|
-
has(
|
|
75
|
+
has(guildOrId) {
|
|
76
|
+
const guildId = this.resolveGuildId(guildOrId);
|
|
62
77
|
return this.players.has(guildId);
|
|
63
78
|
}
|
|
64
79
|
get size() {
|
|
65
80
|
return this.players.size;
|
|
66
81
|
}
|
|
82
|
+
get debugEnabled() {
|
|
83
|
+
return this.B_debug;
|
|
84
|
+
}
|
|
67
85
|
destroy() {
|
|
68
86
|
this.debug(`[PlayerManager] Destroying all players`);
|
|
69
87
|
for (const player of this.players.values()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlayerManager.js","sourceRoot":"","sources":["../../src/structures/PlayerManager.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AACtC,qCAAkC;AAGlC,MAAa,aAAc,SAAQ,qBAAY;
|
|
1
|
+
{"version":3,"file":"PlayerManager.js","sourceRoot":"","sources":["../../src/structures/PlayerManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,18 @@
|
|
|
1
|
-
import { Track } from "../types";
|
|
1
|
+
import { Track, LoopMode } from "../types";
|
|
2
2
|
export declare class Queue {
|
|
3
3
|
private tracks;
|
|
4
4
|
private current;
|
|
5
5
|
private history;
|
|
6
6
|
private _autoPlay;
|
|
7
|
+
private _loop;
|
|
7
8
|
private willnext;
|
|
8
9
|
add(track: Track): void;
|
|
9
10
|
addMultiple(tracks: Track[]): void;
|
|
10
11
|
remove(index: number): Track | null;
|
|
11
|
-
next(): Track | null;
|
|
12
|
+
next(ignoreLoop?: boolean): Track | null;
|
|
12
13
|
clear(): void;
|
|
13
14
|
autoPlay(value?: boolean): boolean;
|
|
15
|
+
loop(mode?: LoopMode): LoopMode;
|
|
14
16
|
shuffle(): void;
|
|
15
17
|
get size(): number;
|
|
16
18
|
get isEmpty(): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Queue.d.ts","sourceRoot":"","sources":["../../src/structures/Queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"Queue.d.ts","sourceRoot":"","sources":["../../src/structures/Queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAE3C,qBAAa,KAAK;IACjB,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,KAAK,CAAmB;IAChC,OAAO,CAAC,QAAQ,CAAsB;IAEtC,GAAG,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAIvB,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI;IAIlC,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI;IAKnC,IAAI,CAAC,UAAU,UAAQ,GAAG,KAAK,GAAG,IAAI;IAmBtC,KAAK,IAAI,IAAI;IAIb,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO;IAOlC,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ;IAO/B,OAAO,IAAI,IAAI;IAOf,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,IAAI,YAAY,IAAI,KAAK,GAAG,IAAI,CAE/B;IAED,IAAI,cAAc,IAAI,KAAK,EAAE,CAE5B;IAED,IAAI,SAAS,IAAI,KAAK,GAAG,IAAI,CAE5B;IAED,aAAa,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,IAAI;IAQ1C,SAAS,IAAI,KAAK,EAAE;IAIpB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI;CAGrC"}
|
package/dist/structures/Queue.js
CHANGED
|
@@ -7,6 +7,7 @@ class Queue {
|
|
|
7
7
|
this.current = null;
|
|
8
8
|
this.history = [];
|
|
9
9
|
this._autoPlay = false;
|
|
10
|
+
this._loop = "off";
|
|
10
11
|
this.willnext = null;
|
|
11
12
|
}
|
|
12
13
|
add(track) {
|
|
@@ -20,14 +21,22 @@ class Queue {
|
|
|
20
21
|
return null;
|
|
21
22
|
return this.tracks.splice(index, 1)[0];
|
|
22
23
|
}
|
|
23
|
-
next() {
|
|
24
|
+
next(ignoreLoop = false) {
|
|
24
25
|
if (this.current) {
|
|
26
|
+
if (this._loop === "track" && !ignoreLoop) {
|
|
27
|
+
return this.current;
|
|
28
|
+
}
|
|
25
29
|
this.history.push(this.current);
|
|
26
30
|
if (this.history.length > 200) {
|
|
27
31
|
this.history.shift();
|
|
28
32
|
}
|
|
29
33
|
}
|
|
30
34
|
this.current = this.tracks.shift() || null;
|
|
35
|
+
if (!this.current && this._loop === "queue" && this.history.length > 0 && !ignoreLoop) {
|
|
36
|
+
this.tracks = [...this.history];
|
|
37
|
+
this.history = [];
|
|
38
|
+
this.current = this.tracks.shift() || null;
|
|
39
|
+
}
|
|
31
40
|
return this.current;
|
|
32
41
|
}
|
|
33
42
|
clear() {
|
|
@@ -39,6 +48,12 @@ class Queue {
|
|
|
39
48
|
}
|
|
40
49
|
return this._autoPlay;
|
|
41
50
|
}
|
|
51
|
+
loop(mode) {
|
|
52
|
+
if (mode) {
|
|
53
|
+
this._loop = mode;
|
|
54
|
+
}
|
|
55
|
+
return this._loop;
|
|
56
|
+
}
|
|
42
57
|
shuffle() {
|
|
43
58
|
for (let i = this.tracks.length - 1; i > 0; i--) {
|
|
44
59
|
const j = Math.floor(Math.random() * (i + 1));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Queue.js","sourceRoot":"","sources":["../../src/structures/Queue.ts"],"names":[],"mappings":";;;AAEA,MAAa,KAAK;IAAlB;QACS,WAAM,GAAY,EAAE,CAAC;QACrB,YAAO,GAAiB,IAAI,CAAC;QAC7B,YAAO,GAAY,EAAE,CAAC;QACtB,cAAS,GAAG,KAAK,CAAC;QAClB,aAAQ,GAAiB,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"Queue.js","sourceRoot":"","sources":["../../src/structures/Queue.ts"],"names":[],"mappings":"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"}
|
package/dist/types/index.d.ts
CHANGED
|
@@ -43,6 +43,7 @@ export interface ProgressBarOptions {
|
|
|
43
43
|
barChar?: string;
|
|
44
44
|
progressChar?: string;
|
|
45
45
|
}
|
|
46
|
+
export type LoopMode = "off" | "track" | "queue";
|
|
46
47
|
export interface PlayerEvents {
|
|
47
48
|
debug: [message: string, ...args: any[]];
|
|
48
49
|
willPlay: [track: Track, upcomingTracks: Track[]];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ziplayer",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.3",
|
|
4
4
|
"description": "A modular Discord voice player with plugin system",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"ZiPlayer",
|
|
7
|
-
"discord",
|
|
8
|
-
|
|
7
|
+
"discord",
|
|
8
|
+
"music",
|
|
9
|
+
"player",
|
|
10
|
+
"voice",
|
|
11
|
+
"@ziplayer/plugin"
|
|
9
12
|
],
|
|
10
13
|
"homepage": "https://github.com/ZiProject/ZiPlayer#readme",
|
|
11
14
|
"bugs": {
|
|
@@ -1,29 +1,26 @@
|
|
|
1
1
|
import { SourcePlugin, Track, SearchResult, StreamInfo } from "../types";
|
|
2
2
|
|
|
3
3
|
export abstract class BasePlugin implements SourcePlugin {
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
abstract name: string;
|
|
5
|
+
abstract version: string;
|
|
6
6
|
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
7
|
+
abstract canHandle(query: string): boolean;
|
|
8
|
+
abstract search(query: string, requestedBy: string): Promise<SearchResult>;
|
|
9
|
+
abstract getStream(track: Track): Promise<StreamInfo>;
|
|
10
10
|
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
getFallback?(track: Track): Promise<StreamInfo> {
|
|
12
|
+
throw new Error("getFallback not implemented");
|
|
13
|
+
}
|
|
14
14
|
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
): Promise<Track[]> {
|
|
19
|
-
return Promise.resolve([]);
|
|
20
|
-
}
|
|
15
|
+
getRelatedTracks?(trackURL: string, opts?: { limit?: number; offset?: number; history?: Track[] }): Promise<Track[]> {
|
|
16
|
+
return Promise.resolve([]);
|
|
17
|
+
}
|
|
21
18
|
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
19
|
+
validate?(url: string): boolean {
|
|
20
|
+
return this.canHandle(url);
|
|
21
|
+
}
|
|
25
22
|
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
23
|
+
extractPlaylist?(url: string, requestedBy: string): Promise<Track[]> {
|
|
24
|
+
return Promise.resolve([]);
|
|
25
|
+
}
|
|
29
26
|
}
|
package/src/plugins/index.ts
CHANGED
|
@@ -4,29 +4,29 @@ export { BasePlugin } from "./BasePlugin";
|
|
|
4
4
|
|
|
5
5
|
// Plugin factory
|
|
6
6
|
export class PluginManager {
|
|
7
|
-
|
|
7
|
+
private plugins: Map<string, BasePlugin> = new Map();
|
|
8
8
|
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
register(plugin: BasePlugin): void {
|
|
10
|
+
this.plugins.set(plugin.name, plugin);
|
|
11
|
+
}
|
|
12
12
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
unregister(name: string): boolean {
|
|
14
|
+
return this.plugins.delete(name);
|
|
15
|
+
}
|
|
16
16
|
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
get(name: string): BasePlugin | undefined {
|
|
18
|
+
return this.plugins.get(name);
|
|
19
|
+
}
|
|
20
20
|
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
21
|
+
getAll(): BasePlugin[] {
|
|
22
|
+
return Array.from(this.plugins.values());
|
|
23
|
+
}
|
|
24
24
|
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
25
|
+
findPlugin(query: string): BasePlugin | undefined {
|
|
26
|
+
return this.getAll().find((plugin) => plugin.canHandle(query));
|
|
27
|
+
}
|
|
28
28
|
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
29
|
+
clear(): void {
|
|
30
|
+
this.plugins.clear();
|
|
31
|
+
}
|
|
32
32
|
}
|
package/src/structures/Player.ts
CHANGED
|
@@ -2,10 +2,12 @@ import { EventEmitter } from "events";
|
|
|
2
2
|
import {
|
|
3
3
|
createAudioPlayer,
|
|
4
4
|
createAudioResource,
|
|
5
|
+
entersState,
|
|
5
6
|
AudioPlayerStatus,
|
|
6
7
|
VoiceConnection,
|
|
7
8
|
AudioPlayer as DiscordAudioPlayer,
|
|
8
9
|
VoiceConnectionStatus,
|
|
10
|
+
NoSubscriberBehavior,
|
|
9
11
|
joinVoiceChannel,
|
|
10
12
|
AudioResource,
|
|
11
13
|
StreamType,
|
|
@@ -13,10 +15,10 @@ import {
|
|
|
13
15
|
|
|
14
16
|
import { VoiceChannel } from "discord.js";
|
|
15
17
|
import { Readable } from "stream";
|
|
16
|
-
import { Track, PlayerOptions, PlayerEvents, SourcePlugin, SearchResult, ProgressBarOptions } from "../types";
|
|
18
|
+
import { Track, PlayerOptions, PlayerEvents, SourcePlugin, SearchResult, ProgressBarOptions, LoopMode } from "../types";
|
|
17
19
|
import { Queue } from "./Queue";
|
|
18
20
|
import { PluginManager } from "../plugins";
|
|
19
|
-
|
|
21
|
+
import type { PlayerManager } from "./PlayerManager";
|
|
20
22
|
export declare interface Player {
|
|
21
23
|
on<K extends keyof PlayerEvents>(event: K, listener: (...args: PlayerEvents[K]) => void): this;
|
|
22
24
|
emit<K extends keyof PlayerEvents>(event: K, ...args: PlayerEvents[K]): boolean;
|
|
@@ -33,9 +35,11 @@ export class Player extends EventEmitter {
|
|
|
33
35
|
public options: PlayerOptions;
|
|
34
36
|
public pluginManager: PluginManager;
|
|
35
37
|
public userdata?: Record<string, any>;
|
|
38
|
+
private manager: PlayerManager;
|
|
36
39
|
private leaveTimeout: NodeJS.Timeout | null = null;
|
|
37
40
|
private currentResource: AudioResource | null = null;
|
|
38
41
|
private volumeInterval: NodeJS.Timeout | null = null;
|
|
42
|
+
private skipLoop = false;
|
|
39
43
|
|
|
40
44
|
private withTimeout<T>(promise: Promise<T>, message: string): Promise<T> {
|
|
41
45
|
const timeout = this.options.extractorTimeout ?? 15000;
|
|
@@ -48,12 +52,19 @@ export class Player extends EventEmitter {
|
|
|
48
52
|
}
|
|
49
53
|
}
|
|
50
54
|
|
|
51
|
-
constructor(guildId: string, options: PlayerOptions = {}) {
|
|
55
|
+
constructor(guildId: string, options: PlayerOptions = {}, manager: PlayerManager) {
|
|
52
56
|
super();
|
|
53
57
|
this.debug(`[Player] Constructor called for guildId: ${guildId}`);
|
|
54
58
|
this.guildId = guildId;
|
|
55
59
|
this.queue = new Queue();
|
|
56
|
-
this.
|
|
60
|
+
this.manager = manager;
|
|
61
|
+
this.audioPlayer = createAudioPlayer({
|
|
62
|
+
behaviors: {
|
|
63
|
+
noSubscriber: NoSubscriberBehavior.Pause,
|
|
64
|
+
maxMissedFrames: 100,
|
|
65
|
+
},
|
|
66
|
+
});
|
|
67
|
+
|
|
57
68
|
this.pluginManager = new PluginManager();
|
|
58
69
|
|
|
59
70
|
this.options = {
|
|
@@ -72,46 +83,61 @@ export class Player extends EventEmitter {
|
|
|
72
83
|
}
|
|
73
84
|
|
|
74
85
|
private setupEventListeners(): void {
|
|
75
|
-
this.audioPlayer.on(
|
|
76
|
-
this.debug(`[Player]
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
86
|
+
this.audioPlayer.on("stateChange", (oldState, newState) => {
|
|
87
|
+
this.debug(`[Player] AudioPlayer stateChange from ${oldState.status} to ${newState.status}`);
|
|
88
|
+
if (newState.status === AudioPlayerStatus.Idle && oldState.status !== AudioPlayerStatus.Idle) {
|
|
89
|
+
// Track ended
|
|
90
|
+
const track = this.queue.currentTrack;
|
|
91
|
+
if (track) {
|
|
92
|
+
this.debug(`[Player] Track ended: ${track.title}`);
|
|
93
|
+
this.emit("trackEnd", track);
|
|
94
|
+
}
|
|
95
|
+
this.playNext();
|
|
96
|
+
} else if (
|
|
97
|
+
newState.status === AudioPlayerStatus.Playing &&
|
|
98
|
+
(oldState.status === AudioPlayerStatus.Idle || oldState.status === AudioPlayerStatus.Buffering)
|
|
99
|
+
) {
|
|
100
|
+
// Track started
|
|
101
|
+
this.isPlaying = true;
|
|
102
|
+
this.isPaused = false;
|
|
103
|
+
const track = this.queue.currentTrack;
|
|
104
|
+
if (track) {
|
|
105
|
+
this.debug(`[Player] Track started: ${track.title}`);
|
|
106
|
+
this.emit("trackStart", track);
|
|
107
|
+
}
|
|
108
|
+
} else if (newState.status === AudioPlayerStatus.Paused && oldState.status !== AudioPlayerStatus.Paused) {
|
|
109
|
+
// Track paused
|
|
110
|
+
this.isPaused = true;
|
|
111
|
+
const track = this.queue.currentTrack;
|
|
112
|
+
if (track) {
|
|
113
|
+
this.debug(`[Player] Player paused on track: ${track.title}`);
|
|
114
|
+
this.emit("playerPause", track);
|
|
115
|
+
}
|
|
116
|
+
} else if (newState.status !== AudioPlayerStatus.Paused && oldState.status === AudioPlayerStatus.Paused) {
|
|
117
|
+
// Track resumed
|
|
118
|
+
this.isPaused = false;
|
|
119
|
+
const track = this.queue.currentTrack;
|
|
120
|
+
if (track) {
|
|
121
|
+
this.debug(`[Player] Player resumed on track: ${track.title}`);
|
|
122
|
+
this.emit("playerResume", track);
|
|
123
|
+
}
|
|
124
|
+
} else if (newState.status === AudioPlayerStatus.AutoPaused) {
|
|
125
|
+
this.debug(`[Player] AudioPlayerStatus.AutoPaused`);
|
|
126
|
+
} else if (newState.status === AudioPlayerStatus.Buffering) {
|
|
127
|
+
this.debug(`[Player] AudioPlayerStatus.Buffering`);
|
|
107
128
|
}
|
|
108
129
|
});
|
|
109
|
-
|
|
110
130
|
this.audioPlayer.on("error", (error) => {
|
|
111
131
|
this.debug(`[Player] AudioPlayer error:`, error);
|
|
112
132
|
this.emit("playerError", error, this.queue.currentTrack || undefined);
|
|
113
133
|
this.playNext();
|
|
114
134
|
});
|
|
135
|
+
|
|
136
|
+
this.audioPlayer.on("debug", (...args) => {
|
|
137
|
+
if (this.manager.debugEnabled) {
|
|
138
|
+
this.emit("debug", ...args);
|
|
139
|
+
}
|
|
140
|
+
});
|
|
115
141
|
}
|
|
116
142
|
|
|
117
143
|
addPlugin(plugin: SourcePlugin): void {
|
|
@@ -127,33 +153,35 @@ export class Player extends EventEmitter {
|
|
|
127
153
|
async connect(channel: VoiceChannel): Promise<VoiceConnection> {
|
|
128
154
|
try {
|
|
129
155
|
this.debug(`[Player] Connecting to voice channel: ${channel.id}`);
|
|
130
|
-
|
|
156
|
+
const connection = joinVoiceChannel({
|
|
131
157
|
channelId: channel.id,
|
|
132
158
|
guildId: channel.guildId,
|
|
133
159
|
adapterCreator: channel.guild.voiceAdapterCreator as any,
|
|
134
160
|
});
|
|
135
161
|
|
|
136
|
-
|
|
162
|
+
await entersState(connection, VoiceConnectionStatus.Ready, 50_000);
|
|
163
|
+
this.connection = connection;
|
|
164
|
+
|
|
165
|
+
connection.on(VoiceConnectionStatus.Disconnected, () => {
|
|
137
166
|
this.debug(`[Player] VoiceConnectionStatus.Disconnected`);
|
|
138
167
|
this.destroy();
|
|
139
168
|
});
|
|
140
169
|
|
|
141
|
-
|
|
170
|
+
connection.on("error", (error) => {
|
|
142
171
|
this.debug(`[Player] Voice connection error:`, error);
|
|
143
172
|
this.emit("connectionError", error);
|
|
144
173
|
});
|
|
145
|
-
|
|
146
|
-
this.connection.subscribe(this.audioPlayer);
|
|
174
|
+
connection.subscribe(this.audioPlayer);
|
|
147
175
|
|
|
148
176
|
if (this.leaveTimeout) {
|
|
149
177
|
clearTimeout(this.leaveTimeout);
|
|
150
178
|
this.leaveTimeout = null;
|
|
151
179
|
}
|
|
152
|
-
|
|
153
180
|
return this.connection;
|
|
154
181
|
} catch (error) {
|
|
155
182
|
this.debug(`[Player] Connection error:`, error);
|
|
156
183
|
this.emit("connectionError", error as Error);
|
|
184
|
+
this.connection?.destroy();
|
|
157
185
|
throw error;
|
|
158
186
|
}
|
|
159
187
|
}
|
|
@@ -246,7 +274,8 @@ export class Player extends EventEmitter {
|
|
|
246
274
|
|
|
247
275
|
private async playNext(): Promise<boolean> {
|
|
248
276
|
this.debug(`[Player] playNext called`);
|
|
249
|
-
const track = this.queue.next();
|
|
277
|
+
const track = this.queue.next(this.skipLoop);
|
|
278
|
+
this.skipLoop = false;
|
|
250
279
|
if (!track) {
|
|
251
280
|
if (this.queue.autoPlay()) {
|
|
252
281
|
const willnext = this.queue.willNextTrack();
|
|
@@ -338,6 +367,9 @@ export class Player extends EventEmitter {
|
|
|
338
367
|
|
|
339
368
|
this.debug(`[Player] Playing resource for track: ${track.title}`);
|
|
340
369
|
this.audioPlayer.play(this.currentResource);
|
|
370
|
+
|
|
371
|
+
await entersState(this.audioPlayer, AudioPlayerStatus.Playing, 5_000);
|
|
372
|
+
|
|
341
373
|
return true;
|
|
342
374
|
} catch (error) {
|
|
343
375
|
this.debug(`[Player] playNext error:`, error);
|
|
@@ -383,11 +415,16 @@ export class Player extends EventEmitter {
|
|
|
383
415
|
skip(): boolean {
|
|
384
416
|
this.debug(`[Player] skip called`);
|
|
385
417
|
if (this.isPlaying || this.isPaused) {
|
|
418
|
+
this.skipLoop = true;
|
|
386
419
|
return this.audioPlayer.stop();
|
|
387
420
|
}
|
|
388
421
|
return !!this.playNext();
|
|
389
422
|
}
|
|
390
423
|
|
|
424
|
+
loop(mode?: LoopMode): LoopMode {
|
|
425
|
+
return this.queue.loop(mode);
|
|
426
|
+
}
|
|
427
|
+
|
|
391
428
|
setVolume(volume: number): boolean {
|
|
392
429
|
this.debug(`[Player] setVolume called: ${volume}`);
|
|
393
430
|
if (volume < 0 || volume > 200) return false;
|
|
@@ -5,10 +5,14 @@ import { PlayerManagerOptions, PlayerOptions, Track, SourcePlugin } from "../typ
|
|
|
5
5
|
export class PlayerManager extends EventEmitter {
|
|
6
6
|
private players: Map<string, Player> = new Map();
|
|
7
7
|
private plugins: SourcePlugin[];
|
|
8
|
+
private B_debug: boolean = false;
|
|
8
9
|
|
|
9
10
|
private debug(message?: any, ...optionalParams: any[]): void {
|
|
10
11
|
if (this.listenerCount("debug") > 0) {
|
|
11
12
|
this.emit("debug", message, ...optionalParams);
|
|
13
|
+
if (!this.B_debug) {
|
|
14
|
+
this.B_debug = true;
|
|
15
|
+
}
|
|
12
16
|
}
|
|
13
17
|
}
|
|
14
18
|
|
|
@@ -17,13 +21,20 @@ export class PlayerManager extends EventEmitter {
|
|
|
17
21
|
this.plugins = options.plugins || [];
|
|
18
22
|
}
|
|
19
23
|
|
|
20
|
-
|
|
24
|
+
private resolveGuildId(guildOrId: string | { id: string }): string {
|
|
25
|
+
if (typeof guildOrId === "string") return guildOrId;
|
|
26
|
+
if (guildOrId && typeof guildOrId === "object" && "id" in guildOrId) return guildOrId.id;
|
|
27
|
+
throw new Error("Invalid guild or guildId provided.");
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
create(guildOrId: string | { id: string }, options?: PlayerOptions): Player {
|
|
31
|
+
const guildId = this.resolveGuildId(guildOrId);
|
|
21
32
|
if (this.players.has(guildId)) {
|
|
22
33
|
return this.players.get(guildId)!;
|
|
23
34
|
}
|
|
24
35
|
|
|
25
36
|
this.debug(`[PlayerManager] Creating player for guildId: ${guildId}`);
|
|
26
|
-
const player = new Player(guildId, options);
|
|
37
|
+
const player = new Player(guildId, options, this);
|
|
27
38
|
this.plugins.forEach((plugin) => player.addPlugin(plugin));
|
|
28
39
|
|
|
29
40
|
// Forward all player events
|
|
@@ -53,11 +64,13 @@ export class PlayerManager extends EventEmitter {
|
|
|
53
64
|
return player;
|
|
54
65
|
}
|
|
55
66
|
|
|
56
|
-
get(
|
|
67
|
+
get(guildOrId: string | { id: string }): Player | undefined {
|
|
68
|
+
const guildId = this.resolveGuildId(guildOrId);
|
|
57
69
|
return this.players.get(guildId);
|
|
58
70
|
}
|
|
59
71
|
|
|
60
|
-
delete(
|
|
72
|
+
delete(guildOrId: string | { id: string }): boolean {
|
|
73
|
+
const guildId = this.resolveGuildId(guildOrId);
|
|
61
74
|
const player = this.players.get(guildId);
|
|
62
75
|
if (player) {
|
|
63
76
|
this.debug(`[PlayerManager] Deleting player for guildId: ${guildId}`);
|
|
@@ -67,7 +80,8 @@ export class PlayerManager extends EventEmitter {
|
|
|
67
80
|
return false;
|
|
68
81
|
}
|
|
69
82
|
|
|
70
|
-
has(
|
|
83
|
+
has(guildOrId: string | { id: string }): boolean {
|
|
84
|
+
const guildId = this.resolveGuildId(guildOrId);
|
|
71
85
|
return this.players.has(guildId);
|
|
72
86
|
}
|
|
73
87
|
|
|
@@ -75,6 +89,10 @@ export class PlayerManager extends EventEmitter {
|
|
|
75
89
|
return this.players.size;
|
|
76
90
|
}
|
|
77
91
|
|
|
92
|
+
get debugEnabled(): boolean {
|
|
93
|
+
return this.B_debug;
|
|
94
|
+
}
|
|
95
|
+
|
|
78
96
|
destroy(): void {
|
|
79
97
|
this.debug(`[PlayerManager] Destroying all players`);
|
|
80
98
|
for (const player of this.players.values()) {
|
package/src/structures/Queue.ts
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { Track } from "../types";
|
|
1
|
+
import { Track, LoopMode } from "../types";
|
|
2
2
|
|
|
3
3
|
export class Queue {
|
|
4
4
|
private tracks: Track[] = [];
|
|
5
5
|
private current: Track | null = null;
|
|
6
6
|
private history: Track[] = [];
|
|
7
7
|
private _autoPlay = false;
|
|
8
|
+
private _loop: LoopMode = "off";
|
|
8
9
|
private willnext: Track | null = null;
|
|
9
10
|
|
|
10
11
|
add(track: Track): void {
|
|
@@ -20,14 +21,22 @@ export class Queue {
|
|
|
20
21
|
return this.tracks.splice(index, 1)[0];
|
|
21
22
|
}
|
|
22
23
|
|
|
23
|
-
next(): Track | null {
|
|
24
|
+
next(ignoreLoop = false): Track | null {
|
|
24
25
|
if (this.current) {
|
|
26
|
+
if (this._loop === "track" && !ignoreLoop) {
|
|
27
|
+
return this.current;
|
|
28
|
+
}
|
|
25
29
|
this.history.push(this.current);
|
|
26
30
|
if (this.history.length > 200) {
|
|
27
31
|
this.history.shift();
|
|
28
32
|
}
|
|
29
33
|
}
|
|
30
34
|
this.current = this.tracks.shift() || null;
|
|
35
|
+
if (!this.current && this._loop === "queue" && this.history.length > 0 && !ignoreLoop) {
|
|
36
|
+
this.tracks = [...this.history];
|
|
37
|
+
this.history = [];
|
|
38
|
+
this.current = this.tracks.shift() || null;
|
|
39
|
+
}
|
|
31
40
|
return this.current;
|
|
32
41
|
}
|
|
33
42
|
|
|
@@ -42,6 +51,13 @@ export class Queue {
|
|
|
42
51
|
return this._autoPlay;
|
|
43
52
|
}
|
|
44
53
|
|
|
54
|
+
loop(mode?: LoopMode): LoopMode {
|
|
55
|
+
if (mode) {
|
|
56
|
+
this._loop = mode;
|
|
57
|
+
}
|
|
58
|
+
return this._loop;
|
|
59
|
+
}
|
|
60
|
+
|
|
45
61
|
shuffle(): void {
|
|
46
62
|
for (let i = this.tracks.length - 1; i > 0; i--) {
|
|
47
63
|
const j = Math.floor(Math.random() * (i + 1));
|
package/src/types/index.ts
CHANGED
|
@@ -52,6 +52,8 @@ export interface ProgressBarOptions {
|
|
|
52
52
|
progressChar?: string;
|
|
53
53
|
}
|
|
54
54
|
|
|
55
|
+
export type LoopMode = "off" | "track" | "queue";
|
|
56
|
+
|
|
55
57
|
export interface PlayerEvents {
|
|
56
58
|
debug: [message: string, ...args: any[]];
|
|
57
59
|
willPlay: [track: Track, upcomingTracks: Track[]];
|
package/tsconfig.json
CHANGED
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
2
|
+
"compilerOptions": {
|
|
3
|
+
"target": "ES2020",
|
|
4
|
+
"module": "commonjs",
|
|
5
|
+
"lib": ["ES2020"],
|
|
6
|
+
"outDir": "./dist",
|
|
7
|
+
"rootDir": "./src",
|
|
8
|
+
"strict": true,
|
|
9
|
+
"esModuleInterop": true,
|
|
10
|
+
"skipLibCheck": true,
|
|
11
|
+
"forceConsistentCasingInFileNames": true,
|
|
12
|
+
"declaration": true,
|
|
13
|
+
"declarationMap": true,
|
|
14
|
+
"sourceMap": true,
|
|
15
|
+
"moduleResolution": "node",
|
|
16
|
+
"allowSyntheticDefaultImports": true,
|
|
17
|
+
"experimentalDecorators": true,
|
|
18
|
+
"emitDecoratorMetadata": true,
|
|
19
|
+
"resolveJsonModule": true
|
|
20
|
+
},
|
|
21
|
+
"include": ["src/**/*"],
|
|
22
|
+
"exclude": ["node_modules", "dist", "examples"]
|
|
23
23
|
}
|