Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
},
"dependencies": {
"quickjs-emscripten": "^0.31.0",
"youtubei.js": "github:alexeichhorn/YouTube.js#feat/android-sdkless-client"
"youtubei.js": "github:alexeichhorn/YouTube.js#4f74d89a"
}
}
17 changes: 14 additions & 3 deletions src/youtube/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -261,18 +261,29 @@ export class YouTubeService {
}
}

// TODO: remove duplicate itags
// TODO: parallelize it

if (allStreams.length === 0) {
try {
return await this.getStreamsForClient(innertube, fallbackClient);
return this.deduplicateStreams(await this.getStreamsForClient(innertube, fallbackClient));
} catch (error) {
console.error(`Failed to get streams for fallback client ${fallbackClient}:`, error);
}
}

return allStreams;
return this.deduplicateStreams(allStreams);
}

private deduplicateStreams(streams: RemoteStream[]): RemoteStream[] {
const streamsByItag = new Map<number, RemoteStream>();

for (const stream of streams) {
if (!streamsByItag.has(stream.itag)) {
streamsByItag.set(stream.itag, stream);
}
}

return Array.from(streamsByItag.values());
}

private async getStreamsForClient(innertube: Innertube, client: AvailableInnertubeClient): Promise<RemoteStream[]> {
Expand Down
Loading