Skip to content

Commit

Permalink
fix: use networkManager.fetch instead of fetch
Browse files Browse the repository at this point in the history
  • Loading branch information
JellyBrick committed Dec 26, 2024
1 parent 22fdfe3 commit 80471b0
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 26 deletions.
25 changes: 20 additions & 5 deletions src/plugins/music-together/queue/queue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { t } from '@/i18n';
import type { ConnectionEventUnion } from '@/plugins/music-together/connection';
import type { Profile, VideoData } from '../types';
import type { QueueItem } from '@/types/datahost-get-state';
import type { QueueElement } from '@/types/queue';
import type { QueueElement, Store } from '@/types/queue';

const getHeaderPayload = (() => {
let payload: {
Expand Down Expand Up @@ -266,7 +266,8 @@ export class Queue {
}

if (this.originalDispatch)
this.queue.queue.store.store.dispatch = this.originalDispatch;
this.queue.queue.store.store.dispatch = this
.originalDispatch as Store['dispatch'];
}

injection() {
Expand Down Expand Up @@ -295,7 +296,11 @@ export class Queue {
videoId: it!.videoId,
ownerId: this.owner!.id,
}) satisfies VideoData,
event.payload!.items!,
(
event.payload! as {
items: QueueItem[];
}
).items,
);
const index = this._videoList.length + videoList.length - 1;

Expand Down Expand Up @@ -334,7 +339,11 @@ export class Queue {
videoId: it!.videoId,
ownerId: this.owner!.id,
}) satisfies VideoData,
event.payload!.items!,
(
event.payload! as {
items: QueueItem[];
}
).items,
),
},
});
Expand Down Expand Up @@ -407,7 +416,13 @@ export class Queue {
},
},
};
this.originalDispatch?.call(fakeContext, event);
this.originalDispatch?.call(
fakeContext,
event as {
type: string;
payload?: { items?: QueueItem[] | undefined } | undefined;
},
);
};
}

Expand Down
17 changes: 8 additions & 9 deletions src/plugins/synced-lyrics/providers/YTMusic.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { LyricProvider, LyricResult, SearchSongInfo } from '../types';
import type { YouTubeMusicAppElement } from '@/types/youtube-music-app-element';

const headers = {
'Accept': 'application/json',
Expand Down Expand Up @@ -102,19 +103,17 @@ export class YTMusic implements LyricProvider {
.padStart(2, '0')}.${remaining.toString().padStart(2, '0')}`;
}

private ENDPOINT = 'https://youtubei.googleapis.com/youtubei/v1/';
// RATE LIMITED (2 req per sec)
private PROXIED_ENDPOINT = 'https://ytmbrowseproxy.zvz.be/';

private fetchNext(videoId: string) {
return fetch(this.ENDPOINT + 'next?prettyPrint=false', {
headers,
method: 'POST',
body: JSON.stringify({
videoId,
context: { client },
}),
}).then((res) => res.json()) as Promise<NextData>;
const app = document.querySelector<YouTubeMusicAppElement>('ytmusic-app');

if (!app) return null;

return app.networkManager.fetch('/next?prettyPrint=false', {
videoId,
}) as Promise<NextData>;
}

private fetchBrowse(browseId: string) {
Expand Down
13 changes: 2 additions & 11 deletions src/renderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import type { PluginConfig } from '@/types/plugins';
import type { YoutubePlayer } from '@/types/youtube-player';
import type { QueueElement } from '@/types/queue';
import type { QueueResponse } from '@/types/youtube-music-desktop-internal';
import type { YouTubeMusicAppElement } from '@/types/youtube-music-app-element';
import type { SearchBoxElement } from '@/types/search-box-element';

let api: (Element & YoutubePlayer) | null = null;
let isPluginLoaded = false;
Expand All @@ -41,17 +43,6 @@ async function listenForApiLoad() {
}
}

interface YouTubeMusicAppElement extends HTMLElement {
navigate(page: string): void;
networkManager: {
fetch: (url: string, data: unknown) => Promise<unknown>;
};
}

interface SearchBoxElement extends HTMLElement {
getSearchboxStats(): unknown;
}

async function onApiLoaded() {
// Workaround for #2459
document
Expand Down
2 changes: 1 addition & 1 deletion src/types/queue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { YoutubePlayer } from '@/types/youtube-player';
import type { GetState, QueueItem } from '@/types/datahost-get-state';

type StoreState = GetState;
type Store = {
export type Store = {
dispatch: (obj: { type: string; payload?: unknown }) => void;

getState: () => StoreState;
Expand Down
3 changes: 3 additions & 0 deletions src/types/search-box-element.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export interface SearchBoxElement extends HTMLElement {
getSearchboxStats(): unknown;
}
6 changes: 6 additions & 0 deletions src/types/youtube-music-app-element.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export interface YouTubeMusicAppElement extends HTMLElement {
navigate(page: string): void;
networkManager: {
fetch: (url: string, data: unknown) => Promise<unknown>;
};
}

0 comments on commit 80471b0

Please sign in to comment.