smueller/youtube-music
1
0
Fork 0
mirror of https://github.com/th-ch/youtube-music.git synced 2026-01-16 20:52:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(music-together): fix event order

Browse Source
This commit is contained in:
JellyBrick
2025-04-27 06:57:35 +09:00
parent 00041fd146
commit 8bfcd4a139
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/music-together/index.ts
View File

@ -68,8 +68,10 @@ export default createPlugin<
me?: Omit<Profile, 'id'>; me?: Omit<Profile, 'id'>;
profiles: Record<string, Profile>; profiles: Record<string, Profile>;
permission: Permission; permission: Permission;
videoChangeListener: (event: CustomEvent<VideoDataChanged>) => void; videoChangeListener: (
videoStateChangeListener: () => void; event: CustomEvent<VideoDataChanged>,
) => Promise<void>;
videoStateChangeListener: () => Promise<void>;
onHost: () => Promise<boolean>; onHost: () => Promise<boolean>;
onJoin: () => Promise<boolean>; onJoin: () => Promise<boolean>;
onStop: () => void; onStop: () => void;
@ -116,7 +118,7 @@ export default createPlugin<
api: null, api: null,
/* events */ /* events */
videoChangeListener(event: CustomEvent<VideoDataChanged>) { async videoChangeListener(event: CustomEvent<VideoDataChanged>) {
if (event.detail.name === 'dataloaded' || this.updateNext) { if (event.detail.name === 'dataloaded' || this.updateNext) {
if (this.connection?.mode === 'host') { if (this.connection?.mode === 'host') {
const videoList: VideoData[] = const videoList: VideoData[] =
@ -130,7 +132,7 @@ export default createPlugin<
this.queue?.setVideoList(videoList, false); this.queue?.setVideoList(videoList, false);
this.queue?.syncQueueOwner(); this.queue?.syncQueueOwner();
this.connection.broadcast('SYNC_QUEUE', { await this.connection.broadcast('SYNC_QUEUE', {
videoList, videoList,
}); });
@ -139,7 +141,7 @@ export default createPlugin<
} }
}, },
videoStateChangeListener() { async videoStateChangeListener() {
if (this.connection?.mode !== 'guest') return; if (this.connection?.mode !== 'guest') return;
if (this.ignoreChange) return; if (this.ignoreChange) return;
if (this.permission !== 'all') return; if (this.permission !== 'all') return;
@ -147,7 +149,7 @@ export default createPlugin<
const state = this.playerApi?.getPlayerState(); const state = this.playerApi?.getPlayerState();
if (state !== 1 && state !== 2) return; if (state !== 1 && state !== 2) return;
this.connection.broadcast('SYNC_PROGRESS', { await this.connection.broadcast('SYNC_PROGRESS', {
// progress: this.playerApi?.getCurrentTime(), // progress: this.playerApi?.getCurrentTime(),
state: this.playerApi?.getPlayerState(), state: this.playerApi?.getPlayerState(),
// index: this.queue?.selectedIndex ?? 0, // index: this.queue?.selectedIndex ?? 0,
@ -528,7 +530,7 @@ export default createPlugin<
rollbackList.forEach((rollback) => rollback()); rollbackList.forEach((rollback) => rollback());
}; };
this.connection.broadcast('IDENTIFY', { await this.connection.broadcast('IDENTIFY', {
profile: { profile: {
id: this.connection.id, id: this.connection.id,
handleId: this.me.handleId, handleId: this.me.handleId,
@ -537,20 +539,22 @@ export default createPlugin<
}, },
}); });
this.connection.broadcast('SYNC_PROFILE', undefined); await this.connection.broadcast('SYNC_PROFILE', undefined);
this.connection.broadcast('PERMISSION', undefined); await this.connection.broadcast('PERMISSION', undefined);
this.queue?.clear(); this.queue?.clear();
this.queue?.syncQueueOwner(); this.queue?.syncQueueOwner();
this.queue?.initQueue(); this.queue?.initQueue();
this.connection.broadcast('SYNC_QUEUE', undefined); await this.connection.broadcast('SYNC_QUEUE', undefined);
return true; return true;
}, },
onStop() { onStop() {
if (this.connection?.mode !== 'disconnected') this.connection?.disconnect(); if (this.connection?.mode !== 'disconnected') {
this.connection?.disconnect();
}
this.queue?.rollbackInjection(); this.queue?.rollbackInjection();
this.queue?.removeQueueOwner(); this.queue?.removeQueueOwner();
if (this.rollbackInjector) { if (this.rollbackInjector) {