Bluemedia/muse
1
0
Fork 0
mirror of https://github.com/BluemediaDev/muse.git synced 2025-05-10 20:11:37 +02:00
Code Issues Projects Releases Packages 1 Wiki Activity

Add better responses

Browse source
This commit is contained in:
Max Isom 2020-03-17 17:59:26 -05:00
parent 1a1bdfd674
commit 15d4e251f2
17 changed files with 103 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/services/player.ts
View file

@ -10,12 +10,11 @@ import Queue, {QueuedSong} from './queue';
export enum STATUS {
PLAYING,
PAUSED,
DISCONNECTED
PAUSED
}
export default class {
public status = STATUS.DISCONNECTED;
public status = STATUS.PAUSED;
public voiceConnection: VoiceConnection | null = null;
private readonly queue: Queue;
private readonly cacheDir: string;
@ -35,17 +34,24 @@ export default class {
this.voiceConnection = conn;
}
disconnect(): void {
disconnect(breakConnection = true): void {
if (this.voiceConnection) {
if (this.status === STATUS.PLAYING) {
this.pause();
}
this.voiceConnection.disconnect();
if (breakConnection) {
this.voiceConnection.disconnect();
}
this.voiceConnection = null;
this.dispatcher = null;
}
}
async seek(positionSeconds: number): Promise<void> {
this.status = STATUS.PAUSED;
if (this.voiceConnection === null) {
throw new Error('Not connected to a voice channel.');
}
@ -79,24 +85,28 @@ export default class {
throw new Error('Not connected to a voice channel.');
}
// Resume from paused state
if (this.status === STATUS.PAUSED) {
if (this.dispatcher) {
this.dispatcher.resume();
this.status = STATUS.PLAYING;
} else {
await this.seek(this.getPosition());
}
return;
}
const currentSong = this.getCurrentSong();
if (!currentSong) {
throw new Error('Queue empty.');
}
// Resume from paused state
if (this.status === STATUS.PAUSED && this.getPosition() !== 0) {
if (this.dispatcher) {
this.dispatcher.resume();
this.status = STATUS.PLAYING;
return;
}
if (!currentSong.isLive) {
await this.seek(this.getPosition());
return;
}
// Must be livestream, continue
}
if (await this.isCached(currentSong.url)) {
this.dispatcher = this.voiceConnection.play(this.getCachedPath(currentSong.url));
} else {
@ -153,7 +163,7 @@ export default class {
}
}
private async waitForCache(url: string, maxRetries = 50, retryDelay = 500): Promise<void> {
private async waitForCache(url: string, maxRetries = 500, retryDelay = 200): Promise<void> {
// eslint-disable-next-line no-async-promise-executor
return new Promise(async (resolve, reject) => {
if (await this.isCached(url)) {
@ -278,12 +288,7 @@ export default class {
}
this.voiceConnection.on('disconnect', () => {
// Automatically pause
if (this.status === STATUS.PLAYING) {
this.pause();
}
this.dispatcher = null;
this.disconnect(false);
});
if (!this.dispatcher) {