Compare commits

...

3 Commits

Author SHA1 Message Date
LuanRT
55d47e1fe6 chore: v5.7.0 release 2023-07-24 23:49:17 +00:00
LuanRT
a40abda80c chore: v5.6.0 release 2023-07-18 18:35:51 +00:00
LuanRT
e147a01ba5 chore: v5.5.0 release 2023-07-16 20:58:15 +00:00
28 changed files with 465 additions and 41 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "youtubei.js",
"version": "5.4.0",
"version": "5.7.0",
"description": "A wrapper around YouTube's private API. Supports YouTube, YouTube Music, YouTube Kids and YouTube Studio (WIP).",
"type": "module",
"types": "./dist/src/platform/lib.d.ts",
@@ -84,7 +84,7 @@
},
"license": "MIT",
"dependencies": {
"jintr": "^1.0.0",
"jintr": "^1.1.0",
"linkedom": "^0.14.12",
"tslib": "^2.5.0",
"undici": "^5.19.1"

View File

@@ -7,6 +7,8 @@ import { InnertubeError } from '../../utils/Utils.ts';
import type Format from '../../parser/classes/misc/Format.ts';
import type { INextResponse, IPlayerResponse } from '../../parser/index.ts';
import Parser from '../../parser/index.ts';
import type { DashOptions } from '../../types/DashOptions.ts';
import PlayerStoryboardSpec from '../../parser/classes/PlayerStoryboardSpec.ts';
export default class MediaInfo {
#page: [IPlayerResponse, INextResponse?];
@@ -37,10 +39,17 @@ export default class MediaInfo {
* Generates a DASH manifest from the streaming data.
* @param url_transformer - Function to transform the URLs.
* @param format_filter - Function to filter the formats.
* @param options - Additional options to customise the manifest generation
* @returns DASH manifest
*/
async toDash(url_transformer?: URLTransformer, format_filter?: FormatFilter): Promise<string> {
return FormatUtils.toDash(this.streaming_data, url_transformer, format_filter, this.#cpn, this.#actions.session.player, this.#actions);
async toDash(url_transformer?: URLTransformer, format_filter?: FormatFilter, options: DashOptions = { include_thumbnails: false }): Promise<string> {
let storyboards;
if (options.include_thumbnails && this.#page[0].storyboards?.is(PlayerStoryboardSpec)) {
storyboards = this.#page[0].storyboards;
}
return FormatUtils.toDash(this.streaming_data, url_transformer, format_filter, this.#cpn, this.#actions.session.player, this.#actions, storyboards);
}
/**

View File

@@ -15,26 +15,20 @@ export default class Button extends YTNode {
constructor(data: RawNode) {
super();
if (Reflect.has(data, 'text')) {
if (Reflect.has(data, 'text'))
this.text = new Text(data.text).toString();
}
if (Reflect.has(data, 'accessibility') && Reflect.has(data.accessibility, 'label')) {
if (Reflect.has(data, 'accessibility') && Reflect.has(data.accessibility, 'label'))
this.label = data.accessibility.label;
}
if (Reflect.has(data, 'tooltip')) {
if (Reflect.has(data, 'tooltip'))
this.tooltip = data.tooltip;
}
if (Reflect.has(data, 'icon') && Reflect.has(data.icon, 'iconType')) {
if (Reflect.has(data, 'icon') && Reflect.has(data.icon, 'iconType'))
this.icon_type = data.icon.iconType;
}
if (Reflect.has(data, 'isDisabled')) {
if (Reflect.has(data, 'isDisabled'))
this.is_disabled = data.isDisabled;
}
this.endpoint = new NavigationEndpoint(data.navigationEndpoint || data.serviceEndpoint || data.command);
}

View File

@@ -0,0 +1,16 @@
import { YTNode } from '../helpers.ts';
import type { RawNode } from '../index.ts';
import Thumbnail from './misc/Thumbnail.ts';
export default class ContentPreviewImageView extends YTNode {
static type = 'ContentPreviewImageView';
image: Thumbnail[];
style: string;
constructor(data: RawNode) {
super();
this.image = data.image.sources.map((x: any) => new Thumbnail(x)).sort((a: Thumbnail, b: Thumbnail) => b.width - a.width);
this.style = data.style;
}
}

View File

@@ -0,0 +1,13 @@
import { YTNode } from '../helpers.ts';
import type { RawNode } from '../index.ts';
export default class DynamicTextView extends YTNode {
static type = 'DynamicTextView';
text: string;
constructor(data: RawNode) {
super();
this.text = data.text.content;
}
}

View File

@@ -2,6 +2,7 @@ import { YTNode } from '../helpers.ts';
import Parser, { type RawNode } from '../index.ts';
import ContinuationItem from './ContinuationItem.ts';
import EngagementPanelTitleHeader from './EngagementPanelTitleHeader.ts';
import MacroMarkersList from './MacroMarkersList.ts';
import SectionList from './SectionList.ts';
import StructuredDescriptionContent from './StructuredDescriptionContent.ts';
@@ -9,7 +10,7 @@ export default class EngagementPanelSectionList extends YTNode {
static type = 'EngagementPanelSectionList';
header: EngagementPanelTitleHeader | null;
content: SectionList | ContinuationItem | StructuredDescriptionContent | null;
content: SectionList | ContinuationItem | StructuredDescriptionContent | MacroMarkersList | null;
target_id?: string;
panel_identifier?: string;
visibility?: string;
@@ -17,7 +18,7 @@ export default class EngagementPanelSectionList extends YTNode {
constructor(data: RawNode) {
super();
this.header = Parser.parseItem(data.header, EngagementPanelTitleHeader);
this.content = Parser.parseItem(data.content, [ SectionList, ContinuationItem, StructuredDescriptionContent ]);
this.content = Parser.parseItem(data.content, [ SectionList, ContinuationItem, StructuredDescriptionContent, MacroMarkersList ]);
this.panel_identifier = data.panelIdentifier;
this.target_id = data.targetId;
this.visibility = data.visibility;

View File

@@ -0,0 +1,28 @@
import { YTNode } from '../helpers.ts';
import type { RawNode } from '../index.ts';
import { Thumbnail } from '../misc.ts';
import NavigationEndpoint from './NavigationEndpoint.ts';
import Text from './misc/Text.ts';
export default class HashtagTile extends YTNode {
static type = 'HashtagTile';
hashtag: Text;
hashtag_info_text: Text;
hashtag_thumbnail: Thumbnail[];
endpoint: NavigationEndpoint;
hashtag_background_color: number;
hashtag_video_count: Text;
hashtag_channel_count: Text;
constructor(data: RawNode) {
super();
this.hashtag = new Text(data.hashtag);
this.hashtag_info_text = new Text(data.hashtagInfoText);
this.hashtag_thumbnail = Thumbnail.fromResponse(data.hashtagThumbnail);
this.endpoint = new NavigationEndpoint(data.onTapCommand);
this.hashtag_background_color = data.hashtagBackgroundColor;
this.hashtag_video_count = new Text(data.hashtagVideoCount);
this.hashtag_channel_count = new Text(data.hashtagChannelCount);
}
}

View File

@@ -0,0 +1,25 @@
import { YTNode } from '../helpers.ts';
import type { RawNode } from '../index.ts';
import NavigationEndpoint from './NavigationEndpoint.ts';
import Text from './misc/Text.ts';
export default class IncludingResultsFor extends YTNode {
static type = 'IncludingResultsFor';
including_results_for: Text;
corrected_query: Text;
corrected_query_endpoint: NavigationEndpoint;
search_only_for?: Text;
original_query?: Text;
original_query_endpoint?: NavigationEndpoint;
constructor(data: RawNode) {
super();
this.including_results_for = new Text(data.includingResultsFor);
this.corrected_query = new Text(data.correctedQuery);
this.corrected_query_endpoint = new NavigationEndpoint(data.correctedQueryEndpoint);
this.search_only_for = Reflect.has(data, 'searchOnlyFor') ? new Text(data.searchOnlyFor) : undefined;
this.original_query = Reflect.has(data, 'originalQuery') ? new Text(data.originalQuery) : undefined;
this.original_query_endpoint = Reflect.has(data, 'originalQueryEndpoint') ? new NavigationEndpoint(data.originalQueryEndpoint) : undefined;
}
}

View File

@@ -0,0 +1,17 @@
import { YTNode } from '../helpers.ts';
import { Parser, type RawNode } from '../index.ts';
import Menu from './menus/Menu.ts';
import Text from './misc/Text.ts';
export default class MacroMarkersInfoItem extends YTNode {
static type = 'MacroMarkersInfoItem';
info_text: Text;
menu: Menu | null;
constructor(data: RawNode) {
super();
this.info_text = new Text(data.infoText);
this.menu = Parser.parseItem(data.menu, Menu);
}
}

View File

@@ -0,0 +1,18 @@
import { YTNode, type ObservedArray } from '../helpers.ts';
import { Parser, type RawNode } from '../index.ts';
import { Text } from '../misc.ts';
import MacroMarkersInfoItem from './MacroMarkersInfoItem.ts';
import MacroMarkersListItem from './MacroMarkersListItem.ts';
export default class MacroMarkersList extends YTNode {
static type = 'MacroMarkersList';
contents: ObservedArray<MacroMarkersInfoItem | MacroMarkersListItem>;
sync_button_label: Text;
constructor(data: RawNode) {
super();
this.contents = Parser.parseArray(data.contents, [ MacroMarkersInfoItem, MacroMarkersListItem ]);
this.sync_button_label = new Text(data.syncButtonLabel);
}
}

View File

@@ -4,12 +4,14 @@ import { YTNode } from '../helpers.ts';
import Parser, { type RawNode } from '../index.ts';
import type { IParsedResponse } from '../types/ParsedResponse.ts';
import CreatePlaylistDialog from './CreatePlaylistDialog.ts';
import OpenPopupAction from './actions/OpenPopupAction.ts';
export default class NavigationEndpoint extends YTNode {
static type = 'NavigationEndpoint';
payload;
dialog?: CreatePlaylistDialog | YTNode | null;
open_popup?: OpenPopupAction | null;
metadata: {
url?: string;
@@ -24,6 +26,9 @@ export default class NavigationEndpoint extends YTNode {
if (Reflect.has(data || {}, 'innertubeCommand'))
data = data.innertubeCommand;
if (Reflect.has(data || {}, 'openPopupAction'))
this.open_popup = new OpenPopupAction(data.openPopupAction);
const name = Object.keys(data || {})
.find((item) =>
item.endsWith('Endpoint') ||
@@ -36,6 +41,7 @@ export default class NavigationEndpoint extends YTNode {
this.dialog = Parser.parseItem(this.payload.dialog || this.payload.content);
}
if (data?.serviceEndpoint) {
data = data.serviceEndpoint;
}
@@ -85,9 +91,9 @@ export default class NavigationEndpoint extends YTNode {
}
}
call<T extends IParsedResponse>(actions: Actions, args: { [ key: string ]: any; parse: true }): Promise<T>;
call(actions: Actions, args?: { [ key: string ]: any; parse?: false }): Promise<ApiResponse>;
call(actions: Actions, args?: { [ key: string ]: any; parse?: boolean }): Promise<IParsedResponse | ApiResponse> {
call<T extends IParsedResponse>(actions: Actions, args: { [key: string]: any; parse: true }): Promise<T>;
call(actions: Actions, args?: { [key: string]: any; parse?: false }): Promise<ApiResponse>;
call(actions: Actions, args?: { [key: string]: any; parse?: boolean }): Promise<IParsedResponse | ApiResponse> {
if (!actions)
throw new Error('An active caller must be provided');
if (!this.metadata.api_url)

View File

@@ -0,0 +1,16 @@
import { YTNode } from '../helpers.ts';
import Parser, { type RawNode } from '../index.ts';
import PageHeaderView from './PageHeaderView.ts';
export default class PageHeader extends YTNode {
static type = 'PageHeader';
page_title: string;
content: PageHeaderView | null;
constructor(data: RawNode) {
super();
this.page_title = data.pageTitle;
this.content = Parser.parseItem(data.content, PageHeaderView);
}
}

View File

@@ -0,0 +1,17 @@
import { YTNode } from '../helpers.ts';
import Parser, { type RawNode } from '../index.ts';
import ContentPreviewImageView from './ContentPreviewImageView.ts';
import DynamicTextView from './DynamicTextView.ts';
export default class PageHeaderView extends YTNode {
static type = 'PageHeaderView';
image: ContentPreviewImageView | null;
title: DynamicTextView | null;
constructor(data: RawNode) {
super();
this.image = Parser.parseItem(data.image, ContentPreviewImageView);
this.title = Parser.parseItem(data.title, DynamicTextView);
}
}

View File

@@ -17,10 +17,10 @@ export default class PlayerCaptionsTracklist extends YTNode {
audio_tracks?: {
audio_track_id: string;
captions_initial_state: string;
default_caption_track_index: number;
default_caption_track_index?: number;
has_default_track: boolean;
visibility: string;
caption_track_indices: number;
caption_track_indices: number[];
}[];
default_audio_track_index?: number;

View File

@@ -13,7 +13,7 @@ export default class PlayerStoryboardSpec extends YTNode {
columns: number;
rows: number;
storyboard_count: number;
};
}[];
constructor(data: RawNode) {
super();

View File

@@ -0,0 +1,18 @@
import type { ObservedArray } from '../helpers.ts';
import { YTNode } from '../helpers.ts';
import { Parser, type RawNode } from '../index.ts';
import SearchFilterGroup from './SearchFilterGroup.ts';
import Text from './misc/Text.ts';
export default class SearchFilterOptionsDialog extends YTNode {
static type = 'SearchFilterOptionsDialog';
title: Text;
groups: ObservedArray<SearchFilterGroup>;
constructor(data: RawNode) {
super();
this.title = new Text(data.title);
this.groups = Parser.parseArray(data.groups, SearchFilterGroup);
}
}

View File

@@ -0,0 +1,18 @@
import { YTNode } from '../helpers.ts';
import { Parser, type RawNode } from '../index.ts';
import Button from './Button.ts';
import ChipCloud from './ChipCloud.ts';
export default class SearchHeader extends YTNode {
static type = 'SearchHeader';
chip_bar: ChipCloud | null;
search_filter_button: Button | null;
constructor(data: RawNode) {
super();
this.chip_bar = Parser.parseItem(data.chipBar, ChipCloud);
this.search_filter_button = Parser.parseItem(data.searchFilterButton, Button);
console.log(this.search_filter_button?.endpoint.open_popup);
}
}

View File

@@ -8,14 +8,19 @@ import ToggleButton from './ToggleButton.ts';
export default class SearchSubMenu extends YTNode {
static type = 'SearchSubMenu';
title: Text;
groups: ObservedArray<SearchFilterGroup>;
button: ToggleButton | null;
title?: Text;
groups?: ObservedArray<SearchFilterGroup>;
button?: ToggleButton | null;
constructor(data: RawNode) {
super();
this.title = new Text(data.title);
this.groups = Parser.parseArray(data.groups, SearchFilterGroup);
this.button = Parser.parseItem(data.button, ToggleButton);
if (Reflect.has(data, 'title'))
this.title = new Text(data.title);
if (!Reflect.has(data, 'groups'))
this.groups = Parser.parseArray(data.groups, SearchFilterGroup);
if (Reflect.has(data, 'button'))
this.button = Parser.parseItem(data.button, ToggleButton);
}
}

View File

@@ -1,6 +1,7 @@
import { YTNode, type ObservedArray } from '../helpers.ts';
import Parser, { type RawNode } from '../index.ts';
import ExpandableVideoDescriptionBody from './ExpandableVideoDescriptionBody.ts';
import HorizontalCardList from './HorizontalCardList.ts';
import VideoDescriptionHeader from './VideoDescriptionHeader.ts';
import VideoDescriptionInfocardsSection from './VideoDescriptionInfocardsSection.ts';
import VideoDescriptionMusicSection from './VideoDescriptionMusicSection.ts';
@@ -8,10 +9,10 @@ import VideoDescriptionMusicSection from './VideoDescriptionMusicSection.ts';
export default class StructuredDescriptionContent extends YTNode {
static type = 'StructuredDescriptionContent';
items: ObservedArray<VideoDescriptionHeader | ExpandableVideoDescriptionBody | VideoDescriptionMusicSection | VideoDescriptionInfocardsSection>;
items: ObservedArray<VideoDescriptionHeader | ExpandableVideoDescriptionBody | VideoDescriptionMusicSection | VideoDescriptionInfocardsSection | HorizontalCardList>;
constructor(data: RawNode) {
super();
this.items = Parser.parseArray(data.items, [ VideoDescriptionHeader, ExpandableVideoDescriptionBody, VideoDescriptionMusicSection, VideoDescriptionInfocardsSection ]);
this.items = Parser.parseArray(data.items, [ VideoDescriptionHeader, ExpandableVideoDescriptionBody, VideoDescriptionMusicSection, VideoDescriptionInfocardsSection, HorizontalCardList ]);
}
}

View File

@@ -1,9 +1,10 @@
import Text from '../misc/Text.ts';
import Thumbnail from '../misc/Thumbnail.ts';
import CommentsSimplebox from './CommentsSimplebox.ts';
import CommentsEntryPointTeaser from './CommentsEntryPointTeaser.ts';
import { YTNode } from '../../helpers.ts';
import type { RawNode } from '../../index.ts';
import { Parser } from '../../index.ts';
import CommentsEntryPointTeaser from './CommentsEntryPointTeaser.ts';
export default class CommentsEntryPointHeader extends YTNode {
static type = 'CommentsEntryPointHeader';
@@ -12,7 +13,7 @@ export default class CommentsEntryPointHeader extends YTNode {
comment_count?: Text;
teaser_avatar?: Thumbnail[];
teaser_content?: Text;
content_renderer?: CommentsEntryPointTeaser | null;
content_renderer?: CommentsEntryPointTeaser | CommentsSimplebox | null;
simplebox_placeholder?: Text;
constructor(data: RawNode) {
@@ -35,7 +36,7 @@ export default class CommentsEntryPointHeader extends YTNode {
}
if (Reflect.has(data, 'contentRenderer')) {
this.content_renderer = Parser.parseItem(data.contentRenderer, CommentsEntryPointTeaser);
this.content_renderer = Parser.parseItem(data.contentRenderer, [ CommentsEntryPointTeaser, CommentsSimplebox ]);
}
if (Reflect.has(data, 'simpleboxPlaceholder')) {

View File

@@ -0,0 +1,17 @@
import { YTNode } from '../../helpers.ts';
import Text from '../misc/Text.ts';
import Thumbnail from '../misc/Thumbnail.ts';
import type { RawNode } from '../../index.ts';
export default class CommentsSimplebox extends YTNode {
static type = 'CommentsSimplebox';
simplebox_avatar: Thumbnail[];
simplebox_placeholder: Text;
constructor(data: RawNode) {
super();
this.simplebox_avatar = Thumbnail.fromResponse(data.simpleboxAvatar);
this.simplebox_placeholder = new Text(data.simpleboxPlaceholder);
}
}

View File

@@ -58,6 +58,7 @@ export { default as CommentsEntryPointHeader } from './classes/comments/Comments
export { default as CommentsEntryPointTeaser } from './classes/comments/CommentsEntryPointTeaser.ts';
export { default as CommentsHeader } from './classes/comments/CommentsHeader.ts';
export { default as CommentSimplebox } from './classes/comments/CommentSimplebox.ts';
export { default as CommentsSimplebox } from './classes/comments/CommentsSimplebox.ts';
export { default as CommentThread } from './classes/comments/CommentThread.ts';
export { default as CreatorHeart } from './classes/comments/CreatorHeart.ts';
export { default as EmojiPicker } from './classes/comments/EmojiPicker.ts';
@@ -70,6 +71,7 @@ export { default as CompactPlaylist } from './classes/CompactPlaylist.ts';
export { default as CompactStation } from './classes/CompactStation.ts';
export { default as CompactVideo } from './classes/CompactVideo.ts';
export { default as ConfirmDialog } from './classes/ConfirmDialog.ts';
export { default as ContentPreviewImageView } from './classes/ContentPreviewImageView.ts';
export { default as ContinuationItem } from './classes/ContinuationItem.ts';
export { default as ConversationBar } from './classes/ConversationBar.ts';
export { default as CopyLink } from './classes/CopyLink.ts';
@@ -80,6 +82,7 @@ export { default as DidYouMean } from './classes/DidYouMean.ts';
export { default as DownloadButton } from './classes/DownloadButton.ts';
export { default as Dropdown } from './classes/Dropdown.ts';
export { default as DropdownItem } from './classes/DropdownItem.ts';
export { default as DynamicTextView } from './classes/DynamicTextView.ts';
export { default as Element } from './classes/Element.ts';
export { default as EmergencyOnebox } from './classes/EmergencyOnebox.ts';
export { default as EmojiPickerCategory } from './classes/EmojiPickerCategory.ts';
@@ -115,6 +118,7 @@ export { default as GuideEntry } from './classes/GuideEntry.ts';
export { default as GuideSection } from './classes/GuideSection.ts';
export { default as GuideSubscriptionsSection } from './classes/GuideSubscriptionsSection.ts';
export { default as HashtagHeader } from './classes/HashtagHeader.ts';
export { default as HashtagTile } from './classes/HashtagTile.ts';
export { default as Heatmap } from './classes/Heatmap.ts';
export { default as HeatMarker } from './classes/HeatMarker.ts';
export { default as HeroPlaylistThumbnail } from './classes/HeroPlaylistThumbnail.ts';
@@ -124,6 +128,7 @@ export { default as HorizontalCardList } from './classes/HorizontalCardList.ts';
export { default as HorizontalList } from './classes/HorizontalList.ts';
export { default as HorizontalMovieList } from './classes/HorizontalMovieList.ts';
export { default as IconLink } from './classes/IconLink.ts';
export { default as IncludingResultsFor } from './classes/IncludingResultsFor.ts';
export { default as InfoPanelContainer } from './classes/InfoPanelContainer.ts';
export { default as InfoPanelContent } from './classes/InfoPanelContent.ts';
export { default as InfoRow } from './classes/InfoRow.ts';
@@ -178,6 +183,8 @@ export { default as LiveChatItemList } from './classes/LiveChatItemList.ts';
export { default as LiveChatMessageInput } from './classes/LiveChatMessageInput.ts';
export { default as LiveChatParticipant } from './classes/LiveChatParticipant.ts';
export { default as LiveChatParticipantsList } from './classes/LiveChatParticipantsList.ts';
export { default as MacroMarkersInfoItem } from './classes/MacroMarkersInfoItem.ts';
export { default as MacroMarkersList } from './classes/MacroMarkersList.ts';
export { default as MacroMarkersListItem } from './classes/MacroMarkersListItem.ts';
export { default as Menu } from './classes/menus/Menu.ts';
export { default as MenuNavigationItem } from './classes/menus/MenuNavigationItem.ts';
@@ -233,6 +240,8 @@ export { default as MusicTwoRowItem } from './classes/MusicTwoRowItem.ts';
export { default as MusicVisualHeader } from './classes/MusicVisualHeader.ts';
export { default as NavigationEndpoint } from './classes/NavigationEndpoint.ts';
export { default as Notification } from './classes/Notification.ts';
export { default as PageHeader } from './classes/PageHeader.ts';
export { default as PageHeaderView } from './classes/PageHeaderView.ts';
export { default as PageIntroduction } from './classes/PageIntroduction.ts';
export { default as PlayerAnnotationsExpanded } from './classes/PlayerAnnotationsExpanded.ts';
export { default as PlayerCaptionsTracklist } from './classes/PlayerCaptionsTracklist.ts';
@@ -280,6 +289,8 @@ export { default as RichShelf } from './classes/RichShelf.ts';
export { default as SearchBox } from './classes/SearchBox.ts';
export { default as SearchFilter } from './classes/SearchFilter.ts';
export { default as SearchFilterGroup } from './classes/SearchFilterGroup.ts';
export { default as SearchFilterOptionsDialog } from './classes/SearchFilterOptionsDialog.ts';
export { default as SearchHeader } from './classes/SearchHeader.ts';
export { default as SearchRefinementCard } from './classes/SearchRefinementCard.ts';
export { default as SearchSubMenu } from './classes/SearchSubMenu.ts';
export { default as SearchSuggestion } from './classes/SearchSuggestion.ts';

View File

@@ -413,6 +413,8 @@ export default class Parser {
return observe(actions.map((action: any) => {
if (action.navigateAction)
return new NavigateAction(action.navigateAction);
if (action.showMiniplayerCommand)
return new ShowMiniplayerCommand(action.showMiniplayerCommand);
if (action.reloadContinuationItemsCommand)
return new ReloadContinuationItemsCommand(action.reloadContinuationItemsCommand);
if (action.appendContinuationItemsAction)
@@ -574,6 +576,19 @@ export class NavigateAction extends YTNode {
}
}
export class ShowMiniplayerCommand extends YTNode {
static readonly type = 'showMiniplayerCommand';
miniplayer_command: NavigationEndpoint;
show_premium_branding: boolean;
constructor(data: RawNode) {
super();
this.miniplayer_command = new NavigationEndpoint(data.miniplayerCommand);
this.show_premium_branding = data.showPremiumBranding;
}
}
export class AppendContinuationItemsAction extends YTNode {
static readonly type = 'appendContinuationItemsAction';

View File

@@ -9,6 +9,7 @@ import SubscribeButton from '../classes/SubscribeButton.ts';
import ExpandableTab from '../classes/ExpandableTab.ts';
import SectionList from '../classes/SectionList.ts';
import Tab from '../classes/Tab.ts';
import PageHeader from '../classes/PageHeader.ts';
import Feed from '../../core/mixins/Feed.ts';
import FilterableFeed from '../../core/mixins/FilterableFeed.ts';
@@ -25,7 +26,7 @@ import type { ApiResponse } from '../../core/Actions.ts';
import type { IBrowseResponse } from '../types/index.ts';
export default class Channel extends TabbedFeed<IBrowseResponse> {
header?: C4TabbedHeader | CarouselHeader | InteractiveTabbedHeader;
header?: C4TabbedHeader | CarouselHeader | InteractiveTabbedHeader | PageHeader;
metadata;
subscribe_button?: SubscribeButton;
current_tab?: Tab | ExpandableTab;
@@ -33,7 +34,7 @@ export default class Channel extends TabbedFeed<IBrowseResponse> {
constructor(actions: Actions, data: ApiResponse | IBrowseResponse, already_parsed = false) {
super(actions, data, already_parsed);
this.header = this.page.header?.item()?.as(C4TabbedHeader, CarouselHeader, InteractiveTabbedHeader);
this.header = this.page.header?.item()?.as(C4TabbedHeader, CarouselHeader, InteractiveTabbedHeader, PageHeader);
const metadata = this.page.metadata?.item().as(ChannelMetadata);
const microformat = this.page.microformat?.as(MicroformatData);

View File

@@ -2,6 +2,7 @@ import Feed from '../../core/mixins/Feed.ts';
import { InnertubeError } from '../../utils/Utils.ts';
import HorizontalCardList from '../classes/HorizontalCardList.ts';
import ItemSection from '../classes/ItemSection.ts';
import SearchHeader from '../classes/SearchHeader.ts';
import SearchRefinementCard from '../classes/SearchRefinementCard.ts';
import SearchSubMenu from '../classes/SearchSubMenu.ts';
import SectionList from '../classes/SectionList.ts';
@@ -11,8 +12,8 @@ import type Actions from '../../core/Actions.ts';
import type { ApiResponse } from '../../core/Actions.ts';
import type { ObservedArray, YTNode } from '../helpers.ts';
import type { ISearchResponse } from '../types/ParsedResponse.ts';
class Search extends Feed<ISearchResponse> {
header?: SearchHeader;
results?: ObservedArray<YTNode> | null;
refinements: string[];
estimated_results: number;
@@ -30,6 +31,9 @@ class Search extends Feed<ISearchResponse> {
if (!contents)
throw new InnertubeError('No contents found in search response');
if (this.page.header)
this.header = this.page.header.item().as(SearchHeader);
this.results = contents.find((content) => content.is(ItemSection) && content.contents && content.contents.length > 0)?.as(ItemSection).contents;
this.refinements = this.page.refinements || [];

View File

@@ -99,6 +99,28 @@ class VideoInfo extends MediaInfo {
this.captions = info.captions;
this.cards = info.cards;
if (this.streaming_data) {
const default_audio_track = this.streaming_data.adaptive_formats.find((format) => format.audio_track?.audio_is_default);
if (default_audio_track) {
// The combined formats only exist for the default language, even for videos with multiple audio tracks
// So we can copy the language from the default audio track to the combined formats
this.streaming_data.formats.forEach((format) => format.language = default_audio_track.language);
} else if (typeof this.captions?.default_audio_track_index !== 'undefined' && this.captions?.audio_tracks && this.captions.caption_tracks) {
// For videos with a single audio track and captions, we can use the captions to figure out the language of the audio and combined formats
const audioTrack = this.captions.audio_tracks[this.captions.default_audio_track_index];
const defaultCaptionTrackIndex = audioTrack.default_caption_track_index;
const index = audioTrack.caption_track_indices[defaultCaptionTrackIndex ? defaultCaptionTrackIndex : 0];
const language_code = this.captions.caption_tracks[index].language_code;
this.streaming_data.adaptive_formats.forEach((format) => {
if (format.has_audio) {
format.language = language_code;
}
});
this.streaming_data.formats.forEach((format) => format.language = language_code);
}
}
const two_col = next?.contents?.item().as(TwoColumnWatchNextResults);
const results = two_col?.results;

View File

@@ -0,0 +1,9 @@
export interface DashOptions {
/**
* Include the storyboards in the DASH manifest when YouTube provides them.
* Not all players support parsing and displaying storyboards.
* If the player you are using doesn't support them you can leave this option disabled.
* They don't get included by default, as this requires making some extra requests while generating the manifest, which can slow down the manifest generation.
*/
include_thumbnails?: boolean
}

View File

@@ -3,6 +3,7 @@ import type Actions from '../core/Actions.ts';
import type Format from '../parser/classes/misc/Format.ts';
import type AudioOnlyPlayability from '../parser/classes/AudioOnlyPlayability.ts';
import type PlayerStoryboardSpec from '../parser/classes/PlayerStoryboardSpec.ts';
import type { YTNode } from '../parser/helpers.ts';
import * as Constants from './Constants.ts';
@@ -146,7 +147,7 @@ class FormatUtils {
chunk_end += chunk_size;
resolve();
return;
} catch (e: any) {
reject(e);
}
@@ -245,7 +246,7 @@ class FormatUtils {
adaptive_formats: Format[];
dash_manifest_url: string | null;
hls_manifest_url: string | null;
}, url_transformer: URLTransformer = (url) => url, format_filter?: FormatFilter, cpn?: string, player?: Player, actions?: Actions): Promise<string> {
}, url_transformer: URLTransformer = (url) => url, format_filter?: FormatFilter, cpn?: string, player?: Player, actions?: Actions, storyboards?: PlayerStoryboardSpec): Promise<string> {
if (!streaming_data)
throw new InnertubeError('Streaming data not available');
@@ -280,7 +281,7 @@ class FormatUtils {
period
]));
await this.#generateAdaptationSet(document, period, adaptive_formats, url_transformer, cpn, player, actions);
await this.#generateAdaptationSet(document, period, adaptive_formats, url_transformer, cpn, player, actions, storyboards);
return Platform.shim.serializeDOM(document);
}
@@ -297,7 +298,16 @@ class FormatUtils {
return el;
}
static async #generateAdaptationSet(document: XMLDocument, period: Element, formats: Format[], url_transformer: URLTransformer, cpn?: string, player?: Player, actions?: Actions) {
static async #generateAdaptationSet(
document: XMLDocument,
period: Element,
formats: Format[],
url_transformer: URLTransformer,
cpn?: string,
player?: Player,
actions?: Actions,
storyboards?: PlayerStoryboardSpec
) {
const mime_types: string[] = [];
const mime_objects: Format[][] = [ [] ];
@@ -491,6 +501,11 @@ class FormatUtils {
this.#hoistNumberAttributeIfPossible(set, mime_objects[i], 'audioSamplingRate', 'audio_sample_rate', hoisted);
this.#hoistAudioChannelsIfPossible(document, set, mime_objects[i], hoisted);
const language = mime_objects[i][0].language;
if (language) {
set.setAttribute('lang', language);
}
} else {
set.setAttribute('maxPlayoutRate', '1');
@@ -508,6 +523,64 @@ class FormatUtils {
}
}
}
// We need to make requests to get the image sizes, so we'll skip the storyboards if we don't have an Actions instance
if (storyboards && actions) {
const mime_types: string[] = [];
const mime_objects: {
template_url: string;
thumbnail_width: number;
thumbnail_height: number;
thumbnail_count: number;
interval: number;
columns: number;
rows: number;
storyboard_count: number;
}[][] = [ [] ];
for (const storyboard of storyboards.boards) {
const extension = new URL(storyboard.template_url).pathname.split('.').at(-1);
let mime_type = '';
switch (extension) {
case 'jpg':
mime_type = 'image/jpeg';
break;
case 'png':
mime_type = 'image/png';
break;
case 'webp':
mime_type = 'image/webp';
break;
}
const mime_type_index = mime_types.indexOf(mime_type);
if (mime_type_index > -1) {
mime_objects[mime_type_index].push(storyboard);
} else {
mime_types.push(mime_type);
mime_objects.push([]);
mime_objects[mime_types.length - 1].push(storyboard);
}
}
const duration = formats[0].approx_duration_ms / 1000;
for (let i = 0; i < mime_types.length; i++) {
const set = this.#el(document, 'AdaptationSet', {
id: `${set_id++}`,
mimeType: mime_types[i],
contentType: 'image'
});
period.appendChild(set);
for (const storyboard of mime_objects[i]) {
await this.#generateRepresentationImage(document, set, storyboard, duration, url_transformer, actions);
}
}
}
}
static #hoistCodecsIfPossible(set: Element, formats: Format[], hoisted: string[]) {
@@ -600,6 +673,75 @@ class FormatUtils {
await this.#generateSegmentInformation(document, representation, format, url_transformer(url)?.toString(), actions);
}
static async #generateRepresentationImage(document: XMLDocument, set: Element, storyboard: {
template_url: string;
thumbnail_width: number;
thumbnail_height: number;
thumbnail_count: number;
interval: number;
columns: number;
rows: number;
storyboard_count: number;
}, duration: number, url_transformer: URLTransformer, actions: Actions) {
const url = storyboard.template_url;
const response_promises: Promise<Response>[] = [];
// Set a limit so we don't take forever for long videos
const requestLimit = storyboard.storyboard_count > 10 ? 10 : storyboard.storyboard_count;
for (let i = 0; i < requestLimit; i++) {
const response_promise = actions.session.http.fetch_function(new URL(url.replace('$M', i.toString())), {
method: 'HEAD',
headers: Constants.STREAM_HEADERS
});
response_promises.push(response_promise);
}
// Run the requests in parallel to avoid causing too much delay
const responses = await Promise.all(response_promises);
const content_lengths = [];
for (const response of responses) {
content_lengths.push(parseInt(response.headers.get('Content-Length') || '0', 10));
const content_type = response.headers.get('Content-Type');
// Sometimes youtube returns webp instead of jpg despite the file extension being jpg
// So we need to update the mime type to reflect the actual mime type of the response
if (content_type && content_type.length > 0) {
if (set.getAttribute('mimeType') !== content_type) {
set.setAttribute('mimeType', content_type);
}
}
}
// This is a rough estimate, so it probably won't reflect that actual peak bitrate
// Hopefully it's close enough, because figuring out the actual peak bitrate would require downloading and analysing all storyboard tiles
const bandwidth = Math.ceil((Math.max(...content_lengths) / (storyboard.rows * storyboard.columns)) * 8);
const representation = this.#el(document, 'Representation', {
id: `thumbnails_${storyboard.thumbnail_width}x${storyboard.thumbnail_height}`,
bandwidth: bandwidth.toString(),
width: (storyboard.thumbnail_width * storyboard.columns).toString(),
height: (storyboard.thumbnail_height * storyboard.rows).toString()
}, [
this.#el(document, 'EssentialProperty', {
schemeIdUri: 'http://dashif.org/thumbnail_tile',
value: `${storyboard.columns}x${storyboard.rows}`
}),
this.#el(document, 'SegmentTemplate', {
media: url_transformer(new URL(url.replace('$M', '$Number$'))).toString(),
duration: (duration / storyboard.storyboard_count).toString(),
startNumber: '0'
})
]);
set.appendChild(representation);
}
static async #generateSegmentInformation(document: XMLDocument, representation: Element, format: Format, url: string, actions?: Actions) {
if (format.is_type_otf) {
if (!actions) {