Handle manual disconnect

This commit is contained in:
2022-02-27 17:15:20 +07:00
parent 17fb6d203e
commit e3307cf5c1
3 changed files with 60 additions and 5 deletions
+31 -2
View File
@@ -1,6 +1,6 @@
import playdl, { YouTubeVideo, InfoData } from "play-dl";
import { Message, VoiceChannel, Snowflake, TextChannel, StageChannel, Guild } from "discord.js";
import { AudioPlayer, VoiceConnection, createAudioPlayer, joinVoiceChannel, createAudioResource, StreamType, VoiceConnectionStatus, AudioPlayerStatus, NoSubscriberBehavior, VoiceConnectionDestroyedState, VoiceConnectionState, DiscordGatewayAdapterCreator, AudioResource } from "@discordjs/voice";
import { AudioPlayer, VoiceConnection, createAudioPlayer, joinVoiceChannel, createAudioResource, StreamType, VoiceConnectionStatus, AudioPlayerStatus, NoSubscriberBehavior, VoiceConnectionDestroyedState, VoiceConnectionState, DiscordGatewayAdapterCreator, AudioResource, AudioPlayerError } from "@discordjs/voice";
import { EventEmitter } from "stream";
import DiscordProvider from "./Discord";
@@ -37,6 +37,23 @@ export class PlayerPlayingEvent {
}
}
export class PlayerErrorEvent {
public instance: DiscordMusicPlayerInstance;
public error: Error;
constructor(instance: DiscordMusicPlayerInstance, error: Error) {
this.instance = instance;
this.error = error;
}
}
export class VoiceDisconnectedEvent {
public instance: DiscordMusicPlayerInstance;
constructor(instance: DiscordMusicPlayerInstance) {
this.instance = instance;
}
}
export class DiscordMusicPlayerInstance {
public queue: Queue;
public player: AudioPlayer;
@@ -72,6 +89,10 @@ export class DiscordMusicPlayerInstance {
this.player.on(AudioPlayerStatus.Playing, (oldState: any, newState: any) => {
this.events.emit('playing', new PlayerPlayingEvent(this));
});
this.player.on('error', (error: Error) => {
this.events.emit('error', new PlayerErrorEvent(this, error));
});
}
public isReady() {
@@ -113,7 +134,11 @@ export class DiscordMusicPlayerInstance {
});
this.voiceConnection.on(VoiceConnectionStatus.Disconnected, (oldState: VoiceConnectionState, newState: VoiceConnectionState) => {
// TODO: Handle on Disconnect by user (Right-click > Disconnect)
setTimeout(() => {
if (!DiscordProvider.client.guilds.cache.get(voiceChannel.guildId!)!.me!.voice.channelId) {
this.events.emit('disconnect', new VoiceDisconnectedEvent(this));
}
}, 1000);
});
}
@@ -184,6 +209,10 @@ export class DiscordMusicPlayerInstance {
this.voiceConnection = undefined;
}
public async _fake_error_on_player() {
this.player.emit('error', new AudioPlayerError(new Error("fake error"), null!));
}
}
class DiscordMusicPlayer {