@videojs/spf 10.0.0-beta.11 → 10.0.0-beta.13

package/dist/default/core/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../../../src/core/types/index.ts"],"sourcesContent":["/**\n * Core SPF Types\n *\n * Based on CMAF-HAM (Common Media Application Format - Hypothetical Application Model)\n * Protocol-agnostic representation of streaming media content.\n *\n * @see https://github.com/AcademySoftwareFoundation/common-media-library\n */\n\n// =============================================================================\n// Base Types\n// =============================================================================\n\n/**\n * Base identifier type for all HAM objects.\n */\nexport interface Ham {\n  id: string;\n}\n\n/**\n * Addressable resource with optional byte range.\n */\nexport interface AddressableObject {\n  url: string;\n  byteRange?: {\n    start: number;\n    end: number;\n  };\n}\n\n// =============================================================================\n// Platform-agnostic Media Element\n// =============================================================================\n\n/**\n * Platform-agnostic media element interface.\n * Captures minimal shape needed for orchestration without DOM dependencies.\n * HTMLMediaElement satisfies this interface.\n */\nexport interface MediaElementLike {\n  preload: string;\n}\n\n// =============================================================================\n// Time and Duration\n// =============================================================================\n\n/**\n * Time span with start time and duration.\n * Used for segments and other timed ranges.\n */\nexport interface TimeSpan {\n  startTime: number;\n  duration: number;\n}\n\n// =============================================================================\n// Enums\n// =============================================================================\n\n/**\n * Track content type.\n */\nexport type TrackType = 'video' | 'audio' | 'text';\n\n// =============================================================================\n// Frame Rate\n// =============================================================================\n\n/**\n * Video frame rate expressed as numerator/denominator.\n *\n * Examples:\n * - 30 fps: { frameRateNumerator: 30 }\n * - 29.97 fps: { frameRateNumerator: 30000, frameRateDenominator: 1001 }\n */\nexport interface FrameRate {\n  frameRateNumerator: number;\n  frameRateDenominator?: number;\n}\n\n// =============================================================================\n// Partially Resolved Tracks (before media playlist is fetched)\n// =============================================================================\n\n/**\n * Generic type for partially resolved tracks.\n * Removes fields that come from media playlist parsing.\n *\n * @param T - Track type to make partially resolved (must extend Track)\n */\nexport type PartiallyResolved<T extends Track = Track> = Omit<T, 'segments' | 'initialization' | keyof TimeSpan> & {\n  segments?: never;\n  duration?: never;\n  startTime?: never;\n  initialization?: never;\n};\n\n/**\n * Partially resolved video track from multivariant playlist.\n * Has metadata but no segments or initialization yet (media playlist not fetched).\n */\nexport type PartiallyResolvedVideoTrack = PartiallyResolved<VideoTrack>;\n\n/**\n * Partially resolved audio track from multivariant playlist.\n * Has metadata but no segments or initialization yet (media playlist not fetched).\n */\nexport type PartiallyResolvedAudioTrack = PartiallyResolved<AudioTrack>;\n\n// =============================================================================\n// Resolved Track Types (with segments from media playlist)\n// =============================================================================\n\n/**\n * Base track type containing common properties for all resolved tracks.\n * A resolved track has segments, duration, and initialization data.\n * All URLs are fully qualified (parsers resolve relative URLs).\n */\n/**\n * Track startTime is always 0 (for future multi-period support).\n */\nexport type Track = Ham &\n  AddressableObject &\n  TimeSpan & {\n    type: TrackType;\n    codecs?: string[]; // Optional per HLS spec\n    mimeType: string;\n    language?: string | undefined;\n    bandwidth: number;\n    initialization?: AddressableObject;\n    segments: Segment[];\n  };\n\n/**\n * Resolved video track with segments.\n */\nexport type VideoTrack = Track &\n  Required<Pick<Track, 'initialization' | 'codecs'>> & {\n    type: 'video';\n\n    // Optional metadata from multivariant (per HLS spec)\n    width?: number;\n    height?: number;\n    frameRate?: FrameRate;\n    audioGroupId?: string;\n  };\n\n/**\n * Resolved audio track with segments.\n */\nexport type AudioTrack = Track &\n  Required<Pick<Track, 'initialization' | 'codecs'>> & {\n    type: 'audio';\n    groupId: string;\n    name: string;\n    sampleRate: number;\n    channels: number;\n    default?: boolean;\n    autoselect?: boolean;\n  };\n\n/**\n * Resolved text track with segments.\n */\nexport type TextTrack = Track & {\n  type: 'text';\n  groupId: string;\n  label: string;\n  kind: 'subtitles' | 'captions';\n  default?: boolean;\n  autoselect?: boolean;\n  forced?: boolean;\n};\n\n/**\n * Partially resolved text track from multivariant playlist.\n * Has metadata but no segments or initialization yet (media playlist not fetched).\n */\nexport type PartiallyResolvedTextTrack = PartiallyResolved<TextTrack>;\n\n/**\n * Unresolved text track (alias for backwards compatibility).\n\n/**\n * Union of all resolved track types.\n */\nexport type ResolvedTrack = VideoTrack | AudioTrack | TextTrack;\n\n/**\n * Union of all partially resolved track types.\n */\nexport type PartiallyResolvedTrack =\n  | PartiallyResolvedVideoTrack\n  | PartiallyResolvedAudioTrack\n  | PartiallyResolvedTextTrack;\n\n/**\n * Union of all unresolved track types (alias for backwards compatibility).\n\n// =============================================================================\n// Switching and Selection Sets\n// =============================================================================\n\n/**\n * Generic switching set type.\n * A group of tracks that can be switched between seamlessly.\n *\n * @param T - Track type (VideoTrack, AudioTrack, or TextTrack)\n */\nexport type SwitchingSetOf<T extends Track = Track> = Ham & {\n  type: T['type'];\n  tracks: (PartiallyResolved<T> | T)[];\n};\n\n/**\n * Video switching set - contains only video tracks (partially resolved or fully resolved).\n */\nexport type VideoSwitchingSet = SwitchingSetOf<VideoTrack>;\n\n/**\n * Audio switching set - contains only audio tracks (partially resolved or fully resolved).\n */\nexport type AudioSwitchingSet = SwitchingSetOf<AudioTrack>;\n\n/**\n * Text switching set - contains only text tracks (partially resolved or fully resolved).\n */\nexport type TextSwitchingSet = SwitchingSetOf<TextTrack>;\n\n/**\n * Switching set - a group of tracks that can be switched between seamlessly.\n * Discriminated by track type.\n */\nexport type SwitchingSet = VideoSwitchingSet | AudioSwitchingSet | TextSwitchingSet;\n\n/**\n * Generic selection set type.\n * Groups switching sets by track type.\n *\n * @param T - Track type (VideoTrack, AudioTrack, or TextTrack)\n */\nexport type SelectionSetOf<T extends Track = Track> = Ham & {\n  type: T['type'];\n  switchingSets: SwitchingSetOf<T>[];\n};\n\n/**\n * Video selection set - contains only video switching sets.\n */\nexport type VideoSelectionSet = SelectionSetOf<VideoTrack>;\n\n/**\n * Audio selection set - contains only audio switching sets.\n */\nexport type AudioSelectionSet = SelectionSetOf<AudioTrack>;\n\n/**\n * Text selection set - contains only text switching sets.\n */\nexport type TextSelectionSet = SelectionSetOf<TextTrack>;\n\n/**\n * Selection set - groups switching sets by track type.\n * Discriminated union ensures type-safe track access.\n */\nexport type SelectionSet = VideoSelectionSet | AudioSelectionSet | TextSelectionSet;\n\n// =============================================================================\n// Segment\n// =============================================================================\n\n/**\n * Media segment with timing information.\n * Follows CMAF-HAM composition pattern.\n */\nexport type Segment = Ham & AddressableObject & TimeSpan;\n\n// =============================================================================\n// Media Playlist Info\n// =============================================================================\n\n/**\n * Intermediate representation of a parsed media playlist.\n * Used internally before assembling into full Track structure.\n */\nexport interface MediaPlaylistInfo {\n  version: number;\n  targetDuration: number;\n  playlistType: 'VOD' | 'EVENT' | undefined;\n  initSegment: AddressableObject | null;\n  segments: Segment[];\n  duration: number;\n  endList: boolean;\n}\n\n// =============================================================================\n// Presentation\n// =============================================================================\n\n/**\n * Presentation - a single playable period of content.\n * Uses TimeSpan fields (startTime always 0, duration optional until track resolved).\n *\n * Extends AddressableObject so `url` contains the original manifest URL.\n * All URLs are fully qualified (parsers resolve relative URLs).\n */\nexport type Presentation = Ham &\n  AddressableObject &\n  Partial<TimeSpan> & {\n    selectionSets: SelectionSet[];\n  };\n\n// =============================================================================\n// Type Guards\n// =============================================================================\n\n/**\n * Check if a track is resolved (has segments).\n * Works for all track types with overloaded signatures for type narrowing.\n */\nexport function isResolvedTrack(track: PartiallyResolvedVideoTrack | VideoTrack): track is VideoTrack;\nexport function isResolvedTrack(track: PartiallyResolvedAudioTrack | AudioTrack): track is AudioTrack;\nexport function isResolvedTrack(track: PartiallyResolvedTextTrack | TextTrack): track is TextTrack;\nexport function isResolvedTrack(track: PartiallyResolvedTrack | ResolvedTrack): track is ResolvedTrack;\nexport function isResolvedTrack(track: PartiallyResolvedTrack | ResolvedTrack): track is ResolvedTrack {\n  return 'segments' in track;\n}\n\n/**\n * Check if a presentation has duration (at least one track resolved).\n * Narrows type to include required duration.\n */\nexport function hasPresentationDuration(\n  presentation: Presentation\n): presentation is Presentation & { duration: number } {\n  return presentation.duration !== undefined;\n}\n"],"mappings":";AAsUA,SAAgB,gBAAgB,OAAuE;AACrG,QAAO,cAAc;;;;;;AAOvB,SAAgB,wBACd,cACqD;AACrD,QAAO,aAAa,aAAa"}
+{"version":3,"file":"index.js","names":[],"sources":["../../../../src/core/types/index.ts"],"sourcesContent":["/**\n * Core SPF Types\n *\n * Based on CMAF-HAM (Common Media Application Format - Hypothetical Application Model)\n * Protocol-agnostic representation of streaming media content.\n *\n * @see https://github.com/AcademySoftwareFoundation/common-media-library\n */\n\n// =============================================================================\n// Base Types\n// =============================================================================\n\n/**\n * Base identifier type for all HAM objects.\n */\nexport interface Ham {\n  id: string;\n}\n\n/**\n * Addressable resource with optional byte range.\n */\nexport interface AddressableObject {\n  url: string;\n  byteRange?: {\n    start: number;\n    end: number;\n  };\n}\n\n// =============================================================================\n// Platform-agnostic Media Element\n// =============================================================================\n\n/**\n * Platform-agnostic media element interface.\n * Captures minimal shape needed for orchestration without DOM dependencies.\n * HTMLMediaElement satisfies this interface.\n */\nexport interface MediaElementLike {\n  preload: string;\n}\n\n// =============================================================================\n// Time and Duration\n// =============================================================================\n\n/**\n * Time span with start time and duration.\n * Used for segments and other timed ranges.\n */\nexport interface TimeSpan {\n  startTime: number;\n  duration: number;\n}\n\n// =============================================================================\n// Enums\n// =============================================================================\n\n/**\n * Track content type.\n */\nexport type TrackType = 'video' | 'audio' | 'text';\n\n// =============================================================================\n// Frame Rate\n// =============================================================================\n\n/**\n * Video frame rate expressed as numerator/denominator.\n *\n * Examples:\n * - 30 fps: { frameRateNumerator: 30 }\n * - 29.97 fps: { frameRateNumerator: 30000, frameRateDenominator: 1001 }\n */\nexport interface FrameRate {\n  frameRateNumerator: number;\n  frameRateDenominator?: number;\n}\n\n// =============================================================================\n// Partially Resolved Tracks (before media playlist is fetched)\n// =============================================================================\n\n/**\n * Generic type for partially resolved tracks.\n * Removes fields that come from media playlist parsing.\n *\n * @param T - Track type to make partially resolved (must extend Track)\n */\nexport type PartiallyResolved<T extends Track = Track> = Omit<T, 'segments' | 'initialization' | keyof TimeSpan> & {\n  segments?: never;\n  duration?: never;\n  startTime?: never;\n  initialization?: never;\n};\n\n/**\n * Partially resolved video track from multivariant playlist.\n * Has metadata but no segments or initialization yet (media playlist not fetched).\n */\nexport type PartiallyResolvedVideoTrack = PartiallyResolved<VideoTrack>;\n\n/**\n * Partially resolved audio track from multivariant playlist.\n * Has metadata but no segments or initialization yet (media playlist not fetched).\n */\nexport type PartiallyResolvedAudioTrack = PartiallyResolved<AudioTrack>;\n\n// =============================================================================\n// Resolved Track Types (with segments from media playlist)\n// =============================================================================\n\n/**\n * Base track type containing common properties for all resolved tracks.\n * A resolved track has segments, duration, and initialization data.\n * All URLs are fully qualified (parsers resolve relative URLs).\n */\n/**\n * Track startTime is always 0 (for future multi-period support).\n */\nexport type Track = Ham &\n  AddressableObject &\n  TimeSpan & {\n    type: TrackType;\n    codecs?: string[]; // Optional per HLS spec\n    mimeType: string;\n    language?: string | undefined;\n    bandwidth: number;\n    initialization?: AddressableObject;\n    segments: Segment[];\n  };\n\n/**\n * Resolved video track with segments.\n */\nexport type VideoTrack = Track &\n  Required<Pick<Track, 'initialization' | 'codecs'>> & {\n    type: 'video';\n\n    // Optional metadata from multivariant (per HLS spec)\n    width?: number;\n    height?: number;\n    frameRate?: FrameRate;\n    audioGroupId?: string;\n  };\n\n/**\n * Resolved audio track with segments.\n */\nexport type AudioTrack = Track &\n  Required<Pick<Track, 'initialization' | 'codecs'>> & {\n    type: 'audio';\n    groupId: string;\n    name: string;\n    sampleRate: number;\n    channels: number;\n    default?: boolean;\n    autoselect?: boolean;\n  };\n\n/**\n * Resolved text track with segments.\n */\nexport type TextTrack = Track & {\n  type: 'text';\n  groupId: string;\n  label: string;\n  kind: 'subtitles' | 'captions';\n  default?: boolean;\n  autoselect?: boolean;\n  forced?: boolean;\n};\n\n/**\n * Partially resolved text track from multivariant playlist.\n * Has metadata but no segments or initialization yet (media playlist not fetched).\n */\nexport type PartiallyResolvedTextTrack = PartiallyResolved<TextTrack>;\n\n/**\n * Unresolved text track (alias for backwards compatibility).\n\n/**\n * Union of all resolved track types.\n */\nexport type ResolvedTrack = VideoTrack | AudioTrack | TextTrack;\n\n/**\n * Union of all partially resolved track types.\n */\nexport type PartiallyResolvedTrack =\n  | PartiallyResolvedVideoTrack\n  | PartiallyResolvedAudioTrack\n  | PartiallyResolvedTextTrack;\n\n/**\n * Union of all unresolved track types (alias for backwards compatibility).\n\n// =============================================================================\n// Switching and Selection Sets\n// =============================================================================\n\n/**\n * Generic switching set type.\n * A group of tracks that can be switched between seamlessly.\n *\n * @param T - Track type (VideoTrack, AudioTrack, or TextTrack)\n */\nexport type SwitchingSetOf<T extends Track = Track> = Ham & {\n  type: T['type'];\n  tracks: (PartiallyResolved<T> | T)[];\n};\n\n/**\n * Video switching set - contains only video tracks (partially resolved or fully resolved).\n */\nexport type VideoSwitchingSet = SwitchingSetOf<VideoTrack>;\n\n/**\n * Audio switching set - contains only audio tracks (partially resolved or fully resolved).\n */\nexport type AudioSwitchingSet = SwitchingSetOf<AudioTrack>;\n\n/**\n * Text switching set - contains only text tracks (partially resolved or fully resolved).\n */\nexport type TextSwitchingSet = SwitchingSetOf<TextTrack>;\n\n/**\n * Switching set - a group of tracks that can be switched between seamlessly.\n * Discriminated by track type.\n */\nexport type SwitchingSet = VideoSwitchingSet | AudioSwitchingSet | TextSwitchingSet;\n\n/**\n * Generic selection set type.\n * Groups switching sets by track type.\n *\n * @param T - Track type (VideoTrack, AudioTrack, or TextTrack)\n */\nexport type SelectionSetOf<T extends Track = Track> = Ham & {\n  type: T['type'];\n  switchingSets: SwitchingSetOf<T>[];\n};\n\n/**\n * Video selection set - contains only video switching sets.\n */\nexport type VideoSelectionSet = SelectionSetOf<VideoTrack>;\n\n/**\n * Audio selection set - contains only audio switching sets.\n */\nexport type AudioSelectionSet = SelectionSetOf<AudioTrack>;\n\n/**\n * Text selection set - contains only text switching sets.\n */\nexport type TextSelectionSet = SelectionSetOf<TextTrack>;\n\n/**\n * Selection set - groups switching sets by track type.\n * Discriminated union ensures type-safe track access.\n */\nexport type SelectionSet = VideoSelectionSet | AudioSelectionSet | TextSelectionSet;\n\n// =============================================================================\n// Segment\n// =============================================================================\n\n/**\n * Media segment with timing information.\n * Follows CMAF-HAM composition pattern.\n */\nexport type Segment = Ham & AddressableObject & TimeSpan;\n\n// =============================================================================\n// Media Playlist Info\n// =============================================================================\n\n/**\n * Intermediate representation of a parsed media playlist.\n * Used internally before assembling into full Track structure.\n */\nexport interface MediaPlaylistInfo {\n  version: number;\n  targetDuration: number;\n  playlistType: 'VOD' | 'EVENT' | undefined;\n  initSegment: AddressableObject | null;\n  segments: Segment[];\n  duration: number;\n  endList: boolean;\n}\n\n// =============================================================================\n// Presentation\n// =============================================================================\n\n/**\n * Presentation - a single playable period of content.\n * Uses TimeSpan fields (startTime always 0, duration optional until track resolved).\n *\n * Extends AddressableObject so `url` contains the original manifest URL.\n * All URLs are fully qualified (parsers resolve relative URLs).\n */\nexport type Presentation = Ham &\n  AddressableObject &\n  Partial<TimeSpan> & {\n    selectionSets: SelectionSet[];\n  };\n\n// =============================================================================\n// Type Guards\n// =============================================================================\n\n/**\n * Check if a track is resolved (has segments).\n * Works for all track types with overloaded signatures for type narrowing.\n */\nexport function isResolvedTrack(track: PartiallyResolvedVideoTrack | VideoTrack): track is VideoTrack;\nexport function isResolvedTrack(track: PartiallyResolvedAudioTrack | AudioTrack): track is AudioTrack;\nexport function isResolvedTrack(track: PartiallyResolvedTextTrack | TextTrack): track is TextTrack;\nexport function isResolvedTrack(track: PartiallyResolvedTrack | ResolvedTrack): track is ResolvedTrack;\nexport function isResolvedTrack(track: PartiallyResolvedTrack | ResolvedTrack): track is ResolvedTrack {\n  return 'segments' in track;\n}\n\n/**\n * Check if a presentation has duration (at least one track resolved).\n * Narrows type to include required duration.\n */\nexport function hasPresentationDuration(\n  presentation: Presentation\n): presentation is Presentation & { duration: number } {\n  return presentation.duration !== undefined;\n}\n"],"mappings":";AAsUA,SAAgB,gBAAgB,OAAuE;AACrG,QAAO,cAAc;;;;;;AAOvB,SAAgB,wBACd,cACqD;AACrD,QAAO,aAAa,aAAa,KAAA"}

package/dist/default/core/utils/generate-id.js

@@ -15,7 +15,7 @@
 function generateId() {
 	return `${Date.now()}-${Math.floor(Math.random() * 1e6)}`;
 }
-
 //#endregion
 export { generateId };
+
 //# sourceMappingURL=generate-id.js.map

package/dist/default/core/utils/track-selection.js

@@ -8,6 +8,14 @@ const SelectedTrackIdKeyByType = {
 	text: "selectedTextTrackId"
 };
 /**
+* Map track type to buffer owner property key.
+* Used for SourceBuffer references in owners.
+*/
+const BufferKeyByType = {
+	video: "videoBuffer",
+	audio: "audioBuffer"
+};
+/**
 * Get selected track from state by type.
 * Returns properly typed track (partially or fully resolved) or undefined.
 * Type parameter T is inferred from the type argument.
@@ -25,7 +33,7 @@ function getSelectedTrack(state, type) {
 	const trackId = state[SelectedTrackIdKeyByType[type]];
 	return presentation.selectionSets.find(({ type: selectionSetType }) => selectionSetType === type)?.switchingSets[0]?.tracks.find(({ id }) => id === trackId);
 }
-
 //#endregion
-export { SelectedTrackIdKeyByType, getSelectedTrack };
+export { BufferKeyByType, SelectedTrackIdKeyByType, getSelectedTrack };
+
 //# sourceMappingURL=track-selection.js.map

package/dist/default/core/utils/track-selection.js.map

@@ -1 +1 @@
-{"version":3,"file":"track-selection.js","names":[],"sources":["../../../../src/core/utils/track-selection.ts"],"sourcesContent":["import type {\n  AddressableObject,\n  AudioTrack,\n  PartiallyResolvedAudioTrack,\n  PartiallyResolvedTextTrack,\n  PartiallyResolvedVideoTrack,\n  Presentation,\n  TextTrack,\n  TrackType,\n  VideoTrack,\n} from '../types';\n\n/**\n * State shape for track selection.\n * Minimal shape containing presentation and selected track IDs.\n */\nexport interface TrackSelectionState {\n  presentation?: AddressableObject | Presentation | undefined;\n  selectedVideoTrackId?: string | undefined;\n  selectedAudioTrackId?: string | undefined;\n  selectedTextTrackId?: string | undefined;\n}\n\n/**\n * Map track type to selected track ID property key in state.\n */\nexport const SelectedTrackIdKeyByType = {\n  video: 'selectedVideoTrackId',\n  audio: 'selectedAudioTrackId',\n  text: 'selectedTextTrackId',\n} as const;\n\n/**\n * Map track type to buffer owner property key.\n * Used for SourceBuffer references in owners.\n */\nexport const BufferKeyByType = {\n  video: 'videoBuffer',\n  audio: 'audioBuffer',\n} as const;\n\n/**\n * Get selected track from state by type.\n * Returns properly typed track (partially or fully resolved) or undefined.\n * Type parameter T is inferred from the type argument.\n *\n * @example\n * const videoTrack = getSelectedTrack(state, 'video');\n * if (videoTrack && isResolvedTrack(videoTrack)) {\n *   // videoTrack is VideoTrack\n * }\n */\nexport function getSelectedTrack<T extends TrackType>(\n  state: TrackSelectionState,\n  type: T\n): T extends 'video'\n  ? PartiallyResolvedVideoTrack | VideoTrack | undefined\n  : T extends 'audio'\n    ? PartiallyResolvedAudioTrack | AudioTrack | undefined\n    : T extends 'text'\n      ? PartiallyResolvedTextTrack | TextTrack | undefined\n      : never {\n  const { presentation } = state;\n\n  /** @TODO Consider moving and reusing isUnresolved(presentation) (CJP) */\n  if (!presentation || !('id' in presentation)) return undefined as any;\n\n  // Get track ID based on type\n  const trackIdKey = SelectedTrackIdKeyByType[type];\n  const trackId = state[trackIdKey];\n  return presentation.selectionSets\n    .find(({ type: selectionSetType }) => selectionSetType === type)\n    ?.switchingSets[0]?.tracks.find(({ id }) => id === trackId) as any;\n}\n"],"mappings":";;;;AA0BA,MAAa,2BAA2B;CACtC,OAAO;CACP,OAAO;CACP,MAAM;CACP;;;;;;;;;;;;AAsBD,SAAgB,iBACd,OACA,MAOY;CACZ,MAAM,EAAE,iBAAiB;;AAGzB,KAAI,CAAC,gBAAgB,EAAE,QAAQ,cAAe,QAAO;CAIrD,MAAM,UAAU,MADG,yBAAyB;AAE5C,QAAO,aAAa,cACjB,MAAM,EAAE,MAAM,uBAAuB,qBAAqB,KAAK,EAC9D,cAAc,IAAI,OAAO,MAAM,EAAE,SAAS,OAAO,QAAQ"}
+{"version":3,"file":"track-selection.js","names":[],"sources":["../../../../src/core/utils/track-selection.ts"],"sourcesContent":["import type {\n  AddressableObject,\n  AudioTrack,\n  PartiallyResolvedAudioTrack,\n  PartiallyResolvedTextTrack,\n  PartiallyResolvedVideoTrack,\n  Presentation,\n  TextTrack,\n  TrackType,\n  VideoTrack,\n} from '../types';\n\n/**\n * State shape for track selection.\n * Minimal shape containing presentation and selected track IDs.\n */\nexport interface TrackSelectionState {\n  presentation?: AddressableObject | Presentation | undefined;\n  selectedVideoTrackId?: string | undefined;\n  selectedAudioTrackId?: string | undefined;\n  selectedTextTrackId?: string | undefined;\n}\n\n/**\n * Map track type to selected track ID property key in state.\n */\nexport const SelectedTrackIdKeyByType = {\n  video: 'selectedVideoTrackId',\n  audio: 'selectedAudioTrackId',\n  text: 'selectedTextTrackId',\n} as const;\n\n/**\n * Map track type to buffer owner property key.\n * Used for SourceBuffer references in owners.\n */\nexport const BufferKeyByType = {\n  video: 'videoBuffer',\n  audio: 'audioBuffer',\n} as const;\n\n/**\n * Get selected track from state by type.\n * Returns properly typed track (partially or fully resolved) or undefined.\n * Type parameter T is inferred from the type argument.\n *\n * @example\n * const videoTrack = getSelectedTrack(state, 'video');\n * if (videoTrack && isResolvedTrack(videoTrack)) {\n *   // videoTrack is VideoTrack\n * }\n */\nexport function getSelectedTrack<T extends TrackType>(\n  state: TrackSelectionState,\n  type: T\n): T extends 'video'\n  ? PartiallyResolvedVideoTrack | VideoTrack | undefined\n  : T extends 'audio'\n    ? PartiallyResolvedAudioTrack | AudioTrack | undefined\n    : T extends 'text'\n      ? PartiallyResolvedTextTrack | TextTrack | undefined\n      : never {\n  const { presentation } = state;\n\n  /** @TODO Consider moving and reusing isUnresolved(presentation) (CJP) */\n  if (!presentation || !('id' in presentation)) return undefined as any;\n\n  // Get track ID based on type\n  const trackIdKey = SelectedTrackIdKeyByType[type];\n  const trackId = state[trackIdKey];\n  return presentation.selectionSets\n    .find(({ type: selectionSetType }) => selectionSetType === type)\n    ?.switchingSets[0]?.tracks.find(({ id }) => id === trackId) as any;\n}\n"],"mappings":";;;;AA0BA,MAAa,2BAA2B;CACtC,OAAO;CACP,OAAO;CACP,MAAM;CACP;;;;;AAMD,MAAa,kBAAkB;CAC7B,OAAO;CACP,OAAO;CACR;;;;;;;;;;;;AAaD,SAAgB,iBACd,OACA,MAOY;CACZ,MAAM,EAAE,iBAAiB;;AAGzB,KAAI,CAAC,gBAAgB,EAAE,QAAQ,cAAe,QAAO,KAAA;CAIrD,MAAM,UAAU,MADG,yBAAyB;AAE5C,QAAO,aAAa,cACjB,MAAM,EAAE,MAAM,uBAAuB,qBAAqB,KAAK,EAC9D,cAAc,IAAI,OAAO,MAAM,EAAE,SAAS,OAAO,QAAQ"}

package/dist/default/dom/features/end-of-stream.js

@@ -1,7 +1,7 @@
+import { effect } from "../../core/signals/effect.js";
+import { computed } from "../../core/signals/primitives.js";
 import { isResolvedTrack } from "../../core/types/index.js";
-import { combineLatest } from "../../core/reactive/combine-latest.js";
 import { getSelectedTrack } from "../../core/utils/track-selection.js";
-
 //#region src/dom/features/end-of-stream.ts
 /**
 * Check if the last segment of a track has been appended to a SourceBuffer.
@@ -14,7 +14,7 @@ function isLastSegmentAppended(segments, actor) {
 	if (segments.length === 0) return true;
 	const lastSeg = segments[segments.length - 1];
 	if (!lastSeg) return false;
-	return actor?.snapshot.context.segments.some((s) => s.id === lastSeg.id && !s.partial) ?? false;
+	return actor?.snapshot.get().context.segments.some((s) => s.id === lastSeg.id && !s.partial) ?? false;
 }
 /**
 * Check if the last segment has been appended for each selected track.
@@ -46,15 +46,15 @@ function canEndStream(state, owners) {
 */
 function shouldEndStream(state, owners) {
 	if (!canEndStream(state, owners)) return false;
-	const { mediaSource, mediaElement } = owners;
-	if (mediaSource.readyState !== "open") return false;
+	const { mediaElement } = owners;
+	if ((owners.mediaSourceReadyState?.get() ?? owners.mediaSource?.readyState) !== "open") return false;
 	if (mediaElement && mediaElement.readyState < HTMLMediaElement.HAVE_METADATA) return false;
 	const hasVideoTrack = !!state.selectedVideoTrackId;
 	const hasAudioTrack = !!state.selectedAudioTrackId;
 	if (hasVideoTrack && !owners.videoBuffer) return false;
 	if (hasAudioTrack && !owners.audioBuffer) return false;
-	if (owners.videoBufferActor?.snapshot.status === "updating") return false;
-	if (owners.audioBufferActor?.snapshot.status === "updating") return false;
+	if (owners.videoBufferActor?.snapshot.get().status === "updating") return false;
+	if (owners.audioBufferActor?.snapshot.get().status === "updating") return false;
 	if (!hasLastSegmentLoaded(state, owners)) return false;
 	if (mediaElement) {
 		const videoTrack = hasVideoTrack ? getSelectedTrack(state, "video") : void 0;
@@ -73,13 +73,18 @@ function shouldEndStream(state, owners) {
 * aligned with the same abstraction that owns all buffer operations.
 */
 function waitForSourceBuffersReady(owners) {
-	const updatingActors = [owners.videoBufferActor, owners.audioBufferActor].filter((actor) => actor !== void 0 && actor.snapshot.status === "updating");
+	const updatingActors = [owners.videoBufferActor, owners.audioBufferActor].filter((actor) => actor !== void 0 && actor.snapshot.get().status === "updating");
 	if (updatingActors.length === 0) return Promise.resolve();
 	return Promise.all(updatingActors.map((actor) => new Promise((resolve) => {
-		const unsub = actor.subscribe((snapshot) => {
-			if (snapshot.status !== "updating") {
-				unsub();
-				resolve();
+		let cleanup;
+		let resolved = false;
+		cleanup = effect(() => {
+			if (actor.snapshot.get().status !== "updating") {
+				if (!resolved) {
+					resolved = true;
+					resolve();
+				}
+				queueMicrotask(() => cleanup?.());
 			}
 		});
 	}))).then(() => void 0);
@@ -121,49 +126,20 @@ const endOfStreamTask = async ({ currentOwners }, _context) => {
 * and MediaSource.duration updates.
 */
 function endOfStream({ state, owners }) {
+	const shouldEnd = computed(() => shouldEndStream(state.get(), owners.get()));
 	let hasEnded = false;
-	let destroyed = false;
-	const activeActorUnsubs = [];
-	const runEvaluate = async () => {
-		if (destroyed) return;
-		const currentState = state.current;
-		const currentOwners = owners.current;
+	return effect(() => {
+		if (!shouldEnd.get()) return;
+		const currentOwners = owners.get();
 		if (hasEnded) {
-			if (currentOwners.mediaSource?.readyState !== "open") return;
+			if ((currentOwners.mediaSourceReadyState?.get() ?? currentOwners.mediaSource?.readyState) !== "open") return;
 			hasEnded = false;
 		}
-		if (!shouldEndStream(currentState, currentOwners)) return;
 		hasEnded = true;
-		try {
-			await endOfStreamTask({ currentOwners }, {});
-		} catch (error) {
-			console.error("Failed to call endOfStream:", error);
-		}
-	};
-	const cleanupOwners = owners.subscribe((currentOwners) => {
-		activeActorUnsubs.forEach((u) => u());
-		activeActorUnsubs.length = 0;
-		for (const actor of [currentOwners.videoBufferActor, currentOwners.audioBufferActor]) {
-			if (!actor) continue;
-			let isFirst = true;
-			activeActorUnsubs.push(actor.subscribe(() => {
-				if (isFirst) {
-					isFirst = false;
-					return;
-				}
-				runEvaluate();
-			}));
-		}
+		endOfStreamTask({ currentOwners }, {}).catch((error) => console.error("Failed to call endOfStream:", error));
 	});
-	const cleanupCombineLatest = combineLatest([state, owners]).subscribe(async () => runEvaluate());
-	return () => {
-		destroyed = true;
-		activeActorUnsubs.forEach((u) => u());
-		cleanupOwners();
-		cleanupCombineLatest();
-	};
 }
-
 //#endregion
 export { endOfStream };
+
 //# sourceMappingURL=end-of-stream.js.map

package/dist/default/dom/features/end-of-stream.js.map

@@ -1 +1 @@
-{"version":3,"file":"end-of-stream.js","names":[],"sources":["../../../../src/dom/features/end-of-stream.ts"],"sourcesContent":["import { combineLatest } from '../../core/reactive/combine-latest';\nimport type { WritableState } from '../../core/state/create-state';\nimport type { Presentation } from '../../core/types';\nimport { isResolvedTrack } from '../../core/types';\nimport { getSelectedTrack, type TrackSelectionState } from '../../core/utils/track-selection';\nimport type { SourceBufferActor } from '../media/source-buffer-actor';\n\nexport interface EndOfStreamState extends TrackSelectionState {\n  presentation?: Presentation;\n}\n\nexport interface EndOfStreamOwners {\n  mediaSource?: MediaSource;\n  mediaElement?: HTMLMediaElement | undefined;\n  videoBuffer?: SourceBuffer;\n  audioBuffer?: SourceBuffer;\n  videoBufferActor?: SourceBufferActor;\n  audioBufferActor?: SourceBufferActor;\n}\n\n// ## When to call endOfStream()\n//\n// Per the MSE spec, endOfStream() should be called once the last media\n// segments — temporally speaking — have been completely appended to all\n// active SourceBuffers. Specifically it signals two things:\n//   1. The temporally latest segments for both audio and video have been\n//      appended (i.e. the buffer covers the end of the stream content).\n//   2. The MediaSource will transition from 'open' to 'ended'. Appending\n//      additional (earlier) segments after this — e.g. for a seek-back or\n//      back-buffer refill — will re-open the MediaSource, at which point\n//      endOfStream() must be called again once loading reaches the end.\n//\n// The browser uses this signal to finalise MediaSource.duration and allow\n// the media element to fire the `ended` event. Without it, playback stalls\n// at the end of the buffered range waiting for data that will never arrive.\n//\n// The \"any track\" qualifier is intentional: per the HLS spec, all renditions\n// in a switching set are time-aligned, so the last segment of any rendition\n// covers the same end-of-stream content. We don't need to be tied to the\n// currently selected track.\n//\n// The right long-term condition is therefore:\n//   - The last segment of the video content (from any resolved video track)\n//     has been completely appended to the video SourceBuffer, AND\n//   - The last segment of the audio content (from any resolved audio track)\n//     has been completely appended to the audio SourceBuffer (when active), AND\n//   - currentTime is within the time range of that last segment.\n//\n// The currentTime gate prevents unnecessary re-invocations when back-buffer\n// refills or other mid-stream appends briefly re-open the MediaSource while\n// the user is far from the end.\n//\n/**\n * Check if the last segment of a track has been appended to a SourceBuffer.\n *\n * Checks by segment ID rather than a pipeline flag, so it is robust across\n * quality switches (different tracks have different segment IDs) and\n * back-buffer flushes (flushed segment IDs are removed from the model).\n */\nfunction isLastSegmentAppended(segments: readonly { id: string }[], actor: SourceBufferActor | undefined): boolean {\n  if (segments.length === 0) return true;\n  const lastSeg = segments[segments.length - 1];\n  if (!lastSeg) return false;\n  // A partial segment is still streaming — the last segment is not ready until\n  // its entry is present and not marked partial.\n  return actor?.snapshot.context.segments.some((s) => s.id === lastSeg.id && !s.partial) ?? false;\n}\n\n/**\n * Check if the last segment has been appended for each selected track.\n *\n * Handles video-only, audio-only, and video+audio scenarios.\n * A track with no segments (e.g. unresolved) is considered not ready.\n */\nexport function hasLastSegmentLoaded(state: EndOfStreamState, owners: EndOfStreamOwners): boolean {\n  const videoTrack = state.selectedVideoTrackId ? getSelectedTrack(state, 'video') : undefined;\n  const audioTrack = state.selectedAudioTrackId ? getSelectedTrack(state, 'audio') : undefined;\n\n  // An unresolved track means we don't yet know its segments — cannot be done.\n  // Fast-paths the quality-switch window: when selectedVideoTrackId has changed\n  // to a new (unresolved) track, we cannot yet determine if its last segment\n  // is loaded.\n  if (videoTrack && !isResolvedTrack(videoTrack)) return false;\n  if (audioTrack && !isResolvedTrack(audioTrack)) return false;\n\n  if (videoTrack && isResolvedTrack(videoTrack)) {\n    if (!isLastSegmentAppended(videoTrack.segments, owners.videoBufferActor)) return false;\n  }\n\n  if (audioTrack && isResolvedTrack(audioTrack)) {\n    if (!isLastSegmentAppended(audioTrack.segments, owners.audioBufferActor)) return false;\n  }\n\n  return true;\n}\n\n/**\n * Check if we can call endOfStream.\n */\nexport function canEndStream(state: EndOfStreamState, owners: EndOfStreamOwners): boolean {\n  return !!(owners.mediaSource && state.presentation);\n}\n\n/**\n * Check if we should call endOfStream.\n */\nexport function shouldEndStream(state: EndOfStreamState, owners: EndOfStreamOwners): boolean {\n  if (!canEndStream(state, owners)) return false;\n\n  const { mediaSource, mediaElement } = owners;\n\n  // MediaSource must be open\n  if (mediaSource!.readyState !== 'open') return false;\n\n  // CRITICAL: MediaElement must have metadata before calling endOfStream\n  // Calling endOfStream before HAVE_METADATA causes DEMUXER_ERROR\n  // https://github.com/chromium/chromium/blob/main/media/filters/chunk_demuxer.cc\n  if (mediaElement && mediaElement.readyState < HTMLMediaElement.HAVE_METADATA) {\n    return false;\n  }\n\n  // SourceBuffers must exist for selected tracks before we can end the stream\n  // (otherwise we'd close the MediaSource before SourceBuffers are created)\n  const hasVideoTrack = !!state.selectedVideoTrackId;\n  const hasAudioTrack = !!state.selectedAudioTrackId;\n\n  if (hasVideoTrack && !owners.videoBuffer) return false;\n  if (hasAudioTrack && !owners.audioBuffer) return false;\n\n  // SourceBufferActors must be idle — setting duration while a SourceBuffer is\n  // updating throws InvalidStateError. The actor subscriber in endOfStream() will\n  // re-evaluate when each actor transitions back to idle.\n  if (owners.videoBufferActor?.snapshot.status === 'updating') return false;\n  if (owners.audioBufferActor?.snapshot.status === 'updating') return false;\n\n  // Last segment must be appended for each selected track\n  if (!hasLastSegmentLoaded(state, owners)) return false;\n\n  // currentTime must have reached the last segment. Guards against re-ending\n  // the stream when a back-buffer remove() re-opens the MediaSource while the\n  // user is far from the end (remove() re-opens 'ended' → 'open' per MSE spec,\n  // same as appendBuffer()).\n  if (mediaElement) {\n    const videoTrack = hasVideoTrack ? getSelectedTrack(state, 'video') : undefined;\n    const audioTrack = hasAudioTrack ? getSelectedTrack(state, 'audio') : undefined;\n    const refTrack =\n      videoTrack && isResolvedTrack(videoTrack)\n        ? videoTrack\n        : audioTrack && isResolvedTrack(audioTrack)\n          ? audioTrack\n          : undefined;\n    if (refTrack && refTrack.segments.length > 0) {\n      const lastSeg = refTrack.segments[refTrack.segments.length - 1]!;\n      if (mediaElement.currentTime < lastSeg.startTime) return false;\n    }\n  }\n\n  return true;\n}\n\n/**\n * Wait for all currently-updating SourceBufferActors to finish.\n * Uses actor status rather than raw SourceBuffer.updating so the wait is\n * aligned with the same abstraction that owns all buffer operations.\n */\nfunction waitForSourceBuffersReady(owners: EndOfStreamOwners): Promise<void> {\n  const updatingActors = [owners.videoBufferActor, owners.audioBufferActor].filter(\n    (actor): actor is SourceBufferActor => actor !== undefined && actor.snapshot.status === 'updating'\n  );\n\n  if (updatingActors.length === 0) return Promise.resolve();\n\n  return Promise.all(\n    updatingActors.map(\n      (actor) =>\n        new Promise<void>((resolve) => {\n          const unsub = actor.subscribe((snapshot) => {\n            if (snapshot.status !== 'updating') {\n              unsub();\n              resolve();\n            }\n          });\n        })\n    )\n  ).then(() => undefined);\n}\n\n/**\n * Get the highest buffered end time across all active SourceBuffers.\n * Used to set the final duration from actual container timestamps rather\n * than playlist metadata, which handles both shorter and longer cases.\n */\nfunction getMaxBufferedEnd(owners: EndOfStreamOwners): number {\n  let max = 0;\n  for (const buf of [owners.videoBuffer, owners.audioBuffer]) {\n    if (buf && buf.buffered.length > 0) {\n      const end = buf.buffered.end(buf.buffered.length - 1);\n      if (end > max) max = end;\n    }\n  }\n  return max;\n}\n\n/**\n * End of stream task (module-level, pure).\n * Sets the final duration from actual buffered end time, then calls endOfStream().\n */\nconst endOfStreamTask = async (\n  { currentOwners }: { currentOwners: EndOfStreamOwners },\n  _context: object\n): Promise<void> => {\n  const { mediaSource } = currentOwners;\n\n  // Double-check MediaSource isn't already ended (in case of race)\n  if (mediaSource!.readyState === 'ended') {\n    return;\n  }\n\n  // Wait for any in-progress SourceBuffer operations to finish before calling\n  // endOfStream() — the MSE spec forbids it while any buffer has updating === true.\n  await waitForSourceBuffersReady(currentOwners);\n\n  // Re-check after the async wait\n  if (mediaSource!.readyState !== 'open') return;\n\n  // Set the final duration from actual buffered container timestamps.\n  // This is more accurate than the playlist-derived duration and correctly\n  // handles both shorter (common with CMAF) and longer actual media durations.\n  // Per MSE spec, endOfStream() will only *increase* duration if needed, so\n  // setting it here first ensures the value from the buffer wins in all cases.\n  const bufferedEnd = getMaxBufferedEnd(currentOwners);\n  if (bufferedEnd > 0) {\n    mediaSource!.duration = bufferedEnd;\n  }\n\n  mediaSource!.endOfStream();\n\n  // Wait a frame to allow async state updates to flush\n  await new Promise((resolve) => requestAnimationFrame(resolve));\n};\n\n/**\n * Call endOfStream when the last segment has been appended.\n * This signals to the browser that the stream is complete.\n *\n * Per the MSE spec, appendBuffer() remains valid after endOfStream() —\n * seeks that require re-appending earlier segments will still work.\n * What becomes blocked is calling endOfStream() again, addSourceBuffer(),\n * and MediaSource.duration updates.\n */\nexport function endOfStream({\n  state,\n  owners,\n}: {\n  state: WritableState<EndOfStreamState>;\n  owners: WritableState<EndOfStreamOwners>;\n}): () => void {\n  let hasEnded = false;\n  let destroyed = false;\n  const activeActorUnsubs: Array<() => void> = [];\n\n  const runEvaluate = async () => {\n    if (destroyed) return;\n    const currentState = state.current;\n    const currentOwners = owners.current;\n    if (hasEnded) {\n      // Per the MSE spec, calling appendBuffer() on a SourceBuffer when\n      // readyState is 'ended' automatically transitions it back to 'open'.\n      // This happens on seek-back after end-of-stream — allow endOfStream()\n      // to be called again once the last segment is reloaded.\n      if (currentOwners.mediaSource?.readyState !== 'open') return;\n      hasEnded = false;\n    }\n    if (!shouldEndStream(currentState, currentOwners)) return;\n\n    // Set flag before awaiting to close the re-entry window between\n    // endOfStream() being called and the async task completing.\n    hasEnded = true;\n    try {\n      await endOfStreamTask({ currentOwners }, {});\n    } catch (error) {\n      console.error('Failed to call endOfStream:', error);\n    }\n  };\n\n  // Subscribe to actor snapshot changes so endOfStream re-evaluates when a\n  // segment is appended (actor context updated), not just on state/owners changes.\n  // Re-subscribe whenever owners changes (actors may have appeared or changed).\n  const cleanupOwners = owners.subscribe((currentOwners) => {\n    activeActorUnsubs.forEach((u) => u());\n    activeActorUnsubs.length = 0;\n\n    for (const actor of [currentOwners.videoBufferActor, currentOwners.audioBufferActor]) {\n      if (!actor) continue;\n      // Skip the immediate fire — the combineLatest subscription handles the\n      // initial evaluation. Only react to subsequent snapshot changes.\n      let isFirst = true;\n      activeActorUnsubs.push(\n        actor.subscribe(() => {\n          if (isFirst) {\n            isFirst = false;\n            return;\n          }\n          runEvaluate();\n        })\n      );\n    }\n  });\n\n  const cleanupCombineLatest = combineLatest([state, owners]).subscribe(async () => runEvaluate());\n\n  return () => {\n    destroyed = true;\n    activeActorUnsubs.forEach((u) => u());\n    cleanupOwners();\n    cleanupCombineLatest();\n  };\n}\n"],"mappings":";;;;;;;;;;;;AA2DA,SAAS,sBAAsB,UAAqC,OAA+C;AACjH,KAAI,SAAS,WAAW,EAAG,QAAO;CAClC,MAAM,UAAU,SAAS,SAAS,SAAS;AAC3C,KAAI,CAAC,QAAS,QAAO;AAGrB,QAAO,OAAO,SAAS,QAAQ,SAAS,MAAM,MAAM,EAAE,OAAO,QAAQ,MAAM,CAAC,EAAE,QAAQ,IAAI;;;;;;;;AAS5F,SAAgB,qBAAqB,OAAyB,QAAoC;CAChG,MAAM,aAAa,MAAM,uBAAuB,iBAAiB,OAAO,QAAQ,GAAG;CACnF,MAAM,aAAa,MAAM,uBAAuB,iBAAiB,OAAO,QAAQ,GAAG;AAMnF,KAAI,cAAc,CAAC,gBAAgB,WAAW,CAAE,QAAO;AACvD,KAAI,cAAc,CAAC,gBAAgB,WAAW,CAAE,QAAO;AAEvD,KAAI,cAAc,gBAAgB,WAAW,EAC3C;MAAI,CAAC,sBAAsB,WAAW,UAAU,OAAO,iBAAiB,CAAE,QAAO;;AAGnF,KAAI,cAAc,gBAAgB,WAAW,EAC3C;MAAI,CAAC,sBAAsB,WAAW,UAAU,OAAO,iBAAiB,CAAE,QAAO;;AAGnF,QAAO;;;;;AAMT,SAAgB,aAAa,OAAyB,QAAoC;AACxF,QAAO,CAAC,EAAE,OAAO,eAAe,MAAM;;;;;AAMxC,SAAgB,gBAAgB,OAAyB,QAAoC;AAC3F,KAAI,CAAC,aAAa,OAAO,OAAO,CAAE,QAAO;CAEzC,MAAM,EAAE,aAAa,iBAAiB;AAGtC,KAAI,YAAa,eAAe,OAAQ,QAAO;AAK/C,KAAI,gBAAgB,aAAa,aAAa,iBAAiB,cAC7D,QAAO;CAKT,MAAM,gBAAgB,CAAC,CAAC,MAAM;CAC9B,MAAM,gBAAgB,CAAC,CAAC,MAAM;AAE9B,KAAI,iBAAiB,CAAC,OAAO,YAAa,QAAO;AACjD,KAAI,iBAAiB,CAAC,OAAO,YAAa,QAAO;AAKjD,KAAI,OAAO,kBAAkB,SAAS,WAAW,WAAY,QAAO;AACpE,KAAI,OAAO,kBAAkB,SAAS,WAAW,WAAY,QAAO;AAGpE,KAAI,CAAC,qBAAqB,OAAO,OAAO,CAAE,QAAO;AAMjD,KAAI,cAAc;EAChB,MAAM,aAAa,gBAAgB,iBAAiB,OAAO,QAAQ,GAAG;EACtE,MAAM,aAAa,gBAAgB,iBAAiB,OAAO,QAAQ,GAAG;EACtE,MAAM,WACJ,cAAc,gBAAgB,WAAW,GACrC,aACA,cAAc,gBAAgB,WAAW,GACvC,aACA;AACR,MAAI,YAAY,SAAS,SAAS,SAAS,GAAG;GAC5C,MAAM,UAAU,SAAS,SAAS,SAAS,SAAS,SAAS;AAC7D,OAAI,aAAa,cAAc,QAAQ,UAAW,QAAO;;;AAI7D,QAAO;;;;;;;AAQT,SAAS,0BAA0B,QAA0C;CAC3E,MAAM,iBAAiB,CAAC,OAAO,kBAAkB,OAAO,iBAAiB,CAAC,QACvE,UAAsC,UAAU,UAAa,MAAM,SAAS,WAAW,WACzF;AAED,KAAI,eAAe,WAAW,EAAG,QAAO,QAAQ,SAAS;AAEzD,QAAO,QAAQ,IACb,eAAe,KACZ,UACC,IAAI,SAAe,YAAY;EAC7B,MAAM,QAAQ,MAAM,WAAW,aAAa;AAC1C,OAAI,SAAS,WAAW,YAAY;AAClC,WAAO;AACP,aAAS;;IAEX;GACF,CACL,CACF,CAAC,WAAW,OAAU;;;;;;;AAQzB,SAAS,kBAAkB,QAAmC;CAC5D,IAAI,MAAM;AACV,MAAK,MAAM,OAAO,CAAC,OAAO,aAAa,OAAO,YAAY,CACxD,KAAI,OAAO,IAAI,SAAS,SAAS,GAAG;EAClC,MAAM,MAAM,IAAI,SAAS,IAAI,IAAI,SAAS,SAAS,EAAE;AACrD,MAAI,MAAM,IAAK,OAAM;;AAGzB,QAAO;;;;;;AAOT,MAAM,kBAAkB,OACtB,EAAE,iBACF,aACkB;CAClB,MAAM,EAAE,gBAAgB;AAGxB,KAAI,YAAa,eAAe,QAC9B;AAKF,OAAM,0BAA0B,cAAc;AAG9C,KAAI,YAAa,eAAe,OAAQ;CAOxC,MAAM,cAAc,kBAAkB,cAAc;AACpD,KAAI,cAAc,EAChB,aAAa,WAAW;AAG1B,aAAa,aAAa;AAG1B,OAAM,IAAI,SAAS,YAAY,sBAAsB,QAAQ,CAAC;;;;;;;;;;;AAYhE,SAAgB,YAAY,EAC1B,OACA,UAIa;CACb,IAAI,WAAW;CACf,IAAI,YAAY;CAChB,MAAM,oBAAuC,EAAE;CAE/C,MAAM,cAAc,YAAY;AAC9B,MAAI,UAAW;EACf,MAAM,eAAe,MAAM;EAC3B,MAAM,gBAAgB,OAAO;AAC7B,MAAI,UAAU;AAKZ,OAAI,cAAc,aAAa,eAAe,OAAQ;AACtD,cAAW;;AAEb,MAAI,CAAC,gBAAgB,cAAc,cAAc,CAAE;AAInD,aAAW;AACX,MAAI;AACF,SAAM,gBAAgB,EAAE,eAAe,EAAE,EAAE,CAAC;WACrC,OAAO;AACd,WAAQ,MAAM,+BAA+B,MAAM;;;CAOvD,MAAM,gBAAgB,OAAO,WAAW,kBAAkB;AACxD,oBAAkB,SAAS,MAAM,GAAG,CAAC;AACrC,oBAAkB,SAAS;AAE3B,OAAK,MAAM,SAAS,CAAC,cAAc,kBAAkB,cAAc,iBAAiB,EAAE;AACpF,OAAI,CAAC,MAAO;GAGZ,IAAI,UAAU;AACd,qBAAkB,KAChB,MAAM,gBAAgB;AACpB,QAAI,SAAS;AACX,eAAU;AACV;;AAEF,iBAAa;KACb,CACH;;GAEH;CAEF,MAAM,uBAAuB,cAAc,CAAC,OAAO,OAAO,CAAC,CAAC,UAAU,YAAY,aAAa,CAAC;AAEhG,cAAa;AACX,cAAY;AACZ,oBAAkB,SAAS,MAAM,GAAG,CAAC;AACrC,iBAAe;AACf,wBAAsB"}
+{"version":3,"file":"end-of-stream.js","names":[],"sources":["../../../../src/dom/features/end-of-stream.ts"],"sourcesContent":["import { effect } from '../../core/signals/effect';\nimport { computed, type ReadonlySignal, type Signal } from '../../core/signals/primitives';\nimport type { Presentation } from '../../core/types';\nimport { isResolvedTrack } from '../../core/types';\nimport { getSelectedTrack, type TrackSelectionState } from '../../core/utils/track-selection';\nimport type { SourceBufferActor } from '../media/source-buffer-actor';\n\nexport interface EndOfStreamState extends TrackSelectionState {\n  presentation?: Presentation;\n}\n\nexport interface EndOfStreamOwners {\n  mediaSource?: MediaSource;\n  /** Reactive mirror of `mediaSource.readyState` — updated via DOM events. */\n  mediaSourceReadyState?: ReadonlySignal<MediaSource['readyState']>;\n  mediaElement?: HTMLMediaElement | undefined;\n  videoBuffer?: SourceBuffer;\n  audioBuffer?: SourceBuffer;\n  videoBufferActor?: SourceBufferActor;\n  audioBufferActor?: SourceBufferActor;\n}\n\n// ## When to call endOfStream()\n//\n// Per the MSE spec, endOfStream() should be called once the last media\n// segments — temporally speaking — have been completely appended to all\n// active SourceBuffers. Specifically it signals two things:\n//   1. The temporally latest segments for both audio and video have been\n//      appended (i.e. the buffer covers the end of the stream content).\n//   2. The MediaSource will transition from 'open' to 'ended'. Appending\n//      additional (earlier) segments after this — e.g. for a seek-back or\n//      back-buffer refill — will re-open the MediaSource, at which point\n//      endOfStream() must be called again once loading reaches the end.\n//\n// The browser uses this signal to finalise MediaSource.duration and allow\n// the media element to fire the `ended` event. Without it, playback stalls\n// at the end of the buffered range waiting for data that will never arrive.\n//\n// The \"any track\" qualifier is intentional: per the HLS spec, all renditions\n// in a switching set are time-aligned, so the last segment of any rendition\n// covers the same end-of-stream content. We don't need to be tied to the\n// currently selected track.\n//\n// The right long-term condition is therefore:\n//   - The last segment of the video content (from any resolved video track)\n//     has been completely appended to the video SourceBuffer, AND\n//   - The last segment of the audio content (from any resolved audio track)\n//     has been completely appended to the audio SourceBuffer (when active), AND\n//   - currentTime is within the time range of that last segment.\n//\n// The currentTime gate prevents unnecessary re-invocations when back-buffer\n// refills or other mid-stream appends briefly re-open the MediaSource while\n// the user is far from the end.\n//\n/**\n * Check if the last segment of a track has been appended to a SourceBuffer.\n *\n * Checks by segment ID rather than a pipeline flag, so it is robust across\n * quality switches (different tracks have different segment IDs) and\n * back-buffer flushes (flushed segment IDs are removed from the model).\n */\nfunction isLastSegmentAppended(segments: readonly { id: string }[], actor: SourceBufferActor | undefined): boolean {\n  if (segments.length === 0) return true;\n  const lastSeg = segments[segments.length - 1];\n  if (!lastSeg) return false;\n  // A partial segment is still streaming — the last segment is not ready until\n  // its entry is present and not marked partial.\n  return actor?.snapshot.get().context.segments.some((s) => s.id === lastSeg.id && !s.partial) ?? false;\n}\n\n/**\n * Check if the last segment has been appended for each selected track.\n *\n * Handles video-only, audio-only, and video+audio scenarios.\n * A track with no segments (e.g. unresolved) is considered not ready.\n */\nexport function hasLastSegmentLoaded(state: EndOfStreamState, owners: EndOfStreamOwners): boolean {\n  const videoTrack = state.selectedVideoTrackId ? getSelectedTrack(state, 'video') : undefined;\n  const audioTrack = state.selectedAudioTrackId ? getSelectedTrack(state, 'audio') : undefined;\n\n  // An unresolved track means we don't yet know its segments — cannot be done.\n  // Fast-paths the quality-switch window: when selectedVideoTrackId has changed\n  // to a new (unresolved) track, we cannot yet determine if its last segment\n  // is loaded.\n  if (videoTrack && !isResolvedTrack(videoTrack)) return false;\n  if (audioTrack && !isResolvedTrack(audioTrack)) return false;\n\n  if (videoTrack && isResolvedTrack(videoTrack)) {\n    if (!isLastSegmentAppended(videoTrack.segments, owners.videoBufferActor)) return false;\n  }\n\n  if (audioTrack && isResolvedTrack(audioTrack)) {\n    if (!isLastSegmentAppended(audioTrack.segments, owners.audioBufferActor)) return false;\n  }\n\n  return true;\n}\n\n/**\n * Check if we can call endOfStream.\n */\nexport function canEndStream(state: EndOfStreamState, owners: EndOfStreamOwners): boolean {\n  return !!(owners.mediaSource && state.presentation);\n}\n\n/**\n * Check if we should call endOfStream.\n */\nexport function shouldEndStream(state: EndOfStreamState, owners: EndOfStreamOwners): boolean {\n  if (!canEndStream(state, owners)) return false;\n\n  const { mediaElement } = owners;\n\n  // MediaSource must be open — use reactive readyState signal when available\n  // so the computed re-evaluates when readyState changes (e.g. 'ended' → 'open' on seek-back).\n  const readyState = owners.mediaSourceReadyState?.get() ?? owners.mediaSource?.readyState;\n  if (readyState !== 'open') return false;\n\n  // CRITICAL: MediaElement must have metadata before calling endOfStream\n  // Calling endOfStream before HAVE_METADATA causes DEMUXER_ERROR\n  // https://github.com/chromium/chromium/blob/main/media/filters/chunk_demuxer.cc\n  if (mediaElement && mediaElement.readyState < HTMLMediaElement.HAVE_METADATA) {\n    return false;\n  }\n\n  // SourceBuffers must exist for selected tracks before we can end the stream\n  // (otherwise we'd close the MediaSource before SourceBuffers are created)\n  const hasVideoTrack = !!state.selectedVideoTrackId;\n  const hasAudioTrack = !!state.selectedAudioTrackId;\n\n  if (hasVideoTrack && !owners.videoBuffer) return false;\n  if (hasAudioTrack && !owners.audioBuffer) return false;\n\n  // SourceBufferActors must be idle — setting duration while a SourceBuffer is\n  // updating throws InvalidStateError. The actor subscriber in endOfStream() will\n  // re-evaluate when each actor transitions back to idle.\n  if (owners.videoBufferActor?.snapshot.get().status === 'updating') return false;\n  if (owners.audioBufferActor?.snapshot.get().status === 'updating') return false;\n\n  // Last segment must be appended for each selected track\n  if (!hasLastSegmentLoaded(state, owners)) return false;\n\n  // currentTime must have reached the last segment. Guards against re-ending\n  // the stream when a back-buffer remove() re-opens the MediaSource while the\n  // user is far from the end (remove() re-opens 'ended' → 'open' per MSE spec,\n  // same as appendBuffer()).\n  if (mediaElement) {\n    const videoTrack = hasVideoTrack ? getSelectedTrack(state, 'video') : undefined;\n    const audioTrack = hasAudioTrack ? getSelectedTrack(state, 'audio') : undefined;\n    const refTrack =\n      videoTrack && isResolvedTrack(videoTrack)\n        ? videoTrack\n        : audioTrack && isResolvedTrack(audioTrack)\n          ? audioTrack\n          : undefined;\n    if (refTrack && refTrack.segments.length > 0) {\n      const lastSeg = refTrack.segments[refTrack.segments.length - 1]!;\n      if (mediaElement.currentTime < lastSeg.startTime) return false;\n    }\n  }\n\n  return true;\n}\n\n/**\n * Wait for all currently-updating SourceBufferActors to finish.\n * Uses actor status rather than raw SourceBuffer.updating so the wait is\n * aligned with the same abstraction that owns all buffer operations.\n */\nfunction waitForSourceBuffersReady(owners: EndOfStreamOwners): Promise<void> {\n  const updatingActors = [owners.videoBufferActor, owners.audioBufferActor].filter(\n    (actor): actor is SourceBufferActor => actor !== undefined && actor.snapshot.get().status === 'updating'\n  );\n\n  if (updatingActors.length === 0) return Promise.resolve();\n\n  return Promise.all(\n    updatingActors.map(\n      (actor) =>\n        new Promise<void>((resolve) => {\n          // effect() runs its body synchronously on creation, then re-runs on the\n          // next microtask after any dependency changes. If the actor is already\n          // idle by the time effect() is called, resolve fires immediately and\n          // cleanup is scheduled via queueMicrotask to avoid unwatching during\n          // the watcher notification cycle.\n          let cleanup: (() => void) | undefined;\n          let resolved = false;\n          cleanup = effect(() => {\n            if (actor.snapshot.get().status !== 'updating') {\n              if (!resolved) {\n                resolved = true;\n                resolve();\n              }\n              queueMicrotask(() => cleanup?.());\n            }\n          });\n        })\n    )\n  ).then(() => undefined);\n}\n\n/**\n * Get the highest buffered end time across all active SourceBuffers.\n * Used to set the final duration from actual container timestamps rather\n * than playlist metadata, which handles both shorter and longer cases.\n */\nfunction getMaxBufferedEnd(owners: EndOfStreamOwners): number {\n  let max = 0;\n  for (const buf of [owners.videoBuffer, owners.audioBuffer]) {\n    if (buf && buf.buffered.length > 0) {\n      const end = buf.buffered.end(buf.buffered.length - 1);\n      if (end > max) max = end;\n    }\n  }\n  return max;\n}\n\n/**\n * End of stream task (module-level, pure).\n * Sets the final duration from actual buffered end time, then calls endOfStream().\n */\nconst endOfStreamTask = async (\n  { currentOwners }: { currentOwners: EndOfStreamOwners },\n  _context: object\n): Promise<void> => {\n  const { mediaSource } = currentOwners;\n\n  // Double-check MediaSource isn't already ended (in case of race)\n  if (mediaSource!.readyState === 'ended') {\n    return;\n  }\n\n  // Wait for any in-progress SourceBuffer operations to finish before calling\n  // endOfStream() — the MSE spec forbids it while any buffer has updating === true.\n  await waitForSourceBuffersReady(currentOwners);\n\n  // Re-check after the async wait\n  if (mediaSource!.readyState !== 'open') return;\n\n  // Set the final duration from actual buffered container timestamps.\n  // This is more accurate than the playlist-derived duration and correctly\n  // handles both shorter (common with CMAF) and longer actual media durations.\n  // Per MSE spec, endOfStream() will only *increase* duration if needed, so\n  // setting it here first ensures the value from the buffer wins in all cases.\n  const bufferedEnd = getMaxBufferedEnd(currentOwners);\n  if (bufferedEnd > 0) {\n    mediaSource!.duration = bufferedEnd;\n  }\n\n  mediaSource!.endOfStream();\n\n  // Wait a frame to allow async state updates to flush\n  await new Promise((resolve) => requestAnimationFrame(resolve));\n};\n\n/**\n * Call endOfStream when the last segment has been appended.\n * This signals to the browser that the stream is complete.\n *\n * Per the MSE spec, appendBuffer() remains valid after endOfStream() —\n * seeks that require re-appending earlier segments will still work.\n * What becomes blocked is calling endOfStream() again, addSourceBuffer(),\n * and MediaSource.duration updates.\n */\nexport function endOfStream<S extends EndOfStreamState, O extends EndOfStreamOwners>({\n  state,\n  owners,\n}: {\n  state: Signal<S>;\n  owners: Signal<O>;\n}): () => void {\n  // Derived condition. Transitively tracks through owners into each actor's\n  // snapshot signal — when owners changes and points to a new actor, this computed\n  // re-tracks to the new actor's signal on next evaluation.\n  // shouldEndStream calls actor.snapshot.get() inside the computed body, so those\n  // reads are automatically tracked by the Signal.Computed dependency graph.\n  const shouldEnd = computed(() => shouldEndStream(state.get(), owners.get()));\n\n  let hasEnded = false;\n\n  const cleanupEffect = effect(() => {\n    if (!shouldEnd.get()) return;\n    const currentOwners = owners.get();\n    if (hasEnded) {\n      // Per the MSE spec, calling appendBuffer() on a SourceBuffer when\n      // readyState is 'ended' automatically transitions it back to 'open'.\n      // This happens on seek-back after end-of-stream — allow endOfStream()\n      // to be called again once the last segment is reloaded.\n      const readyState = currentOwners.mediaSourceReadyState?.get() ?? currentOwners.mediaSource?.readyState;\n      if (readyState !== 'open') return;\n      hasEnded = false;\n    }\n\n    // Set flag before awaiting to close the re-entry window between\n    // endOfStream() being called and the async task completing.\n    hasEnded = true;\n    endOfStreamTask({ currentOwners }, {}).catch((error) => console.error('Failed to call endOfStream:', error));\n  });\n\n  return cleanupEffect;\n}\n"],"mappings":"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"}

package/dist/default/dom/features/load-segments.js

@@ -1,14 +1,12 @@
-import { createState } from "../../core/state/create-state.js";
 import { sampleBandwidth } from "../../core/abr/bandwidth-estimator.js";
 import { DEFAULT_FORWARD_BUFFER_CONFIG } from "../../core/buffer/forward-buffer.js";
+import { effect } from "../../core/signals/effect.js";
+import { computed, signal } from "../../core/signals/primitives.js";
 import { isResolvedTrack } from "../../core/types/index.js";
+import { getSelectedTrack } from "../../core/utils/track-selection.js";
 import { ChunkedStreamIterable } from "../network/chunked-stream-iterable.js";
 import { fetchResolvable } from "../network/fetch.js";
-import { combineLatest } from "../../core/reactive/combine-latest.js";
-import "../../all.js";
-import { getSelectedTrack } from "../../core/utils/track-selection.js";
 import { createSegmentLoaderActor } from "./segment-loader-actor.js";
-
 //#region src/dom/features/load-segments.ts
 const ActorKeyByType = {
 	video: "videoBufferActor",
@@ -24,9 +22,8 @@ function createTrackedFetch(throughput, onSample) {
 			let chunkStart = performance.now();
 			for await (const chunk of new ChunkedStreamIterable(body, ...minChunkSize !== void 0 ? [{ minChunkSize }] : [])) {
 				const elapsed = performance.now() - chunkStart;
-				const next = sampleBandwidth(throughput.current, elapsed, chunk.byteLength);
-				throughput.patch(next);
-				throughput.flush();
+				const next = sampleBandwidth(throughput.get(), elapsed, chunk.byteLength);
+				throughput.set(next);
 				onSample?.(next);
 				yield chunk;
 				chunkStart = performance.now();
@@ -129,8 +126,8 @@ function loadingInputsEq(prevState, curState) {
 function loadSegments({ state, owners }, config) {
 	const { type } = config;
 	const actorKey = ActorKeyByType[type];
-	const initialBandwidth = state.current.bandwidthState;
-	const throughput = createState(initialBandwidth ?? {
+	const initialBandwidth = state.get().bandwidthState;
+	const throughput = signal(initialBandwidth ?? {
 		fastEstimate: 0,
 		fastTotalWeight: 0,
 		slowEstimate: 0,
@@ -138,36 +135,43 @@ function loadSegments({ state, owners }, config) {
 		bytesSampled: 0
 	});
 	const fetchBytes = type === "video" ? createTrackedFetch(throughput, initialBandwidth !== void 0 ? (next) => {
-		state.patch({ bandwidthState: next });
-		state.flush();
+		state.set(Object.assign({}, state.get(), { bandwidthState: next }));
 	} : void 0) : fetchStream;
-	const segmentLoader = createState(void 0);
-	const unsubActorLifecycle = owners.subscribe((o) => o[actorKey], (actor) => {
-		if (actor) segmentLoader.patch(createSegmentLoaderActor(actor, fetchBytes));
-		else if (!actor && segmentLoader.current) {
-			segmentLoader.current.destroy();
-			segmentLoader.patch(void 0);
+	const segmentLoader = signal(void 0);
+	const actorSource = computed(() => owners.get()[actorKey]);
+	let currentLoader;
+	const cleanupActorLifecycle = effect(() => {
+		const actor = actorSource.get();
+		if (currentLoader) {
+			currentLoader.destroy();
+			segmentLoader.set(void 0);
+			currentLoader = void 0;
+		}
+		if (actor) {
+			const loader = createSegmentLoaderActor(actor, fetchBytes);
+			currentLoader = loader;
+			segmentLoader.set(loader);
 		}
-		return () => {
-			segmentLoader.current?.destroy();
-			segmentLoader.patch(void 0);
-		};
 	});
-	const segmentsCanLoad = createState(false);
-	const unsubscribeCanLoadSegments = combineLatest([state, segmentLoader]).subscribe(([currentState, currentSegmentLoader]) => {
-		const track = getSelectedTrack(currentState, type);
-		const trackResolved = !!track && isResolvedTrack(track);
-		const segmentLoaderActorExists = !!currentSegmentLoader;
-		segmentsCanLoad.patch(trackResolved && segmentLoaderActorExists);
+	const segmentsCanLoad = computed(() => {
+		const track = getSelectedTrack(state.get(), type);
+		return !!track && isResolvedTrack(track) && !!segmentLoader.get();
 	});
-	const unsubscribeShouldLoadSegments = combineLatest([segmentsCanLoad, state]).subscribe(([segmentsCanLoad, state]) => selectLoadingInputs([segmentsCanLoad, state], type), ({ preload, playbackInitiated, currentTime, track }) => {
+	const loadingInputs = computed(() => selectLoadingInputs([segmentsCanLoad.get(), state.get()], type));
+	let prevInputs;
+	const cleanupLoadEffect = effect(() => {
+		const inputs = loadingInputs.get();
+		if (prevInputs !== void 0 && loadingInputsEq(prevInputs, inputs)) return;
+		const { preload, playbackInitiated, currentTime, track, segmentsCanLoad: canLoad } = inputs;
+		if (!canLoad) return;
+		prevInputs = inputs;
 		if (!(preload === "auto" || !!playbackInitiated))
  /** @ts-expect-error */
-		segmentLoader.current?.send({
+		segmentLoader.get()?.send({
 			type: "load",
 			track
 		});
-		else segmentLoader.current?.send({
+		else segmentLoader.get()?.send({
 			type: "load",
 			track,
 			range: {
@@ -175,14 +179,14 @@ function loadSegments({ state, owners }, config) {
 				end: currentTime + DEFAULT_FORWARD_BUFFER_CONFIG.bufferDuration
 			}
 		});
-	}, { equalityFn: loadingInputsEq });
+	});
 	return () => {
-		unsubscribeCanLoadSegments();
-		unsubscribeShouldLoadSegments();
-		unsubActorLifecycle();
+		cleanupActorLifecycle();
+		cleanupLoadEffect();
+		currentLoader?.destroy();
 	};
 }
-
 //#endregion
 export { loadSegments };
+
 //# sourceMappingURL=load-segments.js.map

package/dist/default/dom/features/load-segments.js.map

@@ -1 +1 @@
-{"version":3,"file":"load-segments.js","names":[],"sources":["../../../../src/dom/features/load-segments.ts"],"sourcesContent":["import { combineLatest } from '../../all';\nimport { type BandwidthState, sampleBandwidth } from '../../core/abr/bandwidth-estimator';\nimport { DEFAULT_FORWARD_BUFFER_CONFIG } from '../../core/buffer/forward-buffer';\nimport { createState, type WritableState } from '../../core/state/create-state';\nimport type { AddressableObject, Presentation, ResolvedTrack } from '../../core/types';\nimport { isResolvedTrack } from '../../core/types';\nimport { getSelectedTrack, type TrackSelectionState } from '../../core/utils/track-selection';\nimport type { SourceBufferActor } from '../media/source-buffer-actor';\nimport { ChunkedStreamIterable, type ChunkedStreamIterableOptions } from '../network/chunked-stream-iterable';\nimport { fetchResolvable } from '../network/fetch';\nimport {\n  type BufferState,\n  createSegmentLoaderActor,\n  type SegmentLoaderActor,\n  type SourceBufferState,\n} from './segment-loader-actor';\nimport type { MediaTrackType } from './setup-sourcebuffer';\n\n// Re-export buffer state types for consumers that import them from this module.\nexport type { BufferState, SourceBufferState };\n\n// Map track type to SourceBufferActor owner property key.\nconst ActorKeyByType = {\n  video: 'videoBufferActor',\n  audio: 'audioBufferActor',\n} as const;\n\n// ============================================================================\n// TRACKED FETCH\n// ============================================================================\n\n/**\n * Creates a fetch function that eagerly starts the HTTP request (TTFB is\n * awaited), then returns a lazy iterable over the response body that\n * transparently samples bandwidth per chunk.\n *\n * Separating connection start from body reading ensures `fetch()` is called\n * as soon as the task begins — not deferred until the actor's append loop\n * first pulls a chunk. This makes fetch timing predictable and observable\n * (e.g. in tests that record fetched URLs) regardless of downstream consumers.\n *\n * `onSample` bridges throughput state outward; see Phase 2 comment for detail.\n */\ntype FetchOptions = RequestInit & ChunkedStreamIterableOptions;\n\nfunction createTrackedFetch(\n  throughput: WritableState<BandwidthState>,\n  onSample?: (next: BandwidthState) => void\n): (addressable: AddressableObject, options?: FetchOptions) => Promise<AsyncIterable<Uint8Array>> {\n  return async (addressable, options) => {\n    const { minChunkSize, ...fetchOptions } = options ?? {};\n    const response = await fetchResolvable(addressable, fetchOptions);\n    if (!response.body) throw new Error('Response has no body');\n    const body = response.body;\n    return {\n      [Symbol.asyncIterator]: async function* () {\n        let chunkStart = performance.now();\n        for await (const chunk of new ChunkedStreamIterable(\n          body,\n          ...(minChunkSize !== undefined ? [{ minChunkSize }] : [])\n        )) {\n          const elapsed = performance.now() - chunkStart;\n          const next = sampleBandwidth(throughput.current, elapsed, chunk.byteLength);\n          throughput.patch(next);\n          throughput.flush();\n          onSample?.(next);\n          yield chunk;\n          chunkStart = performance.now();\n        }\n      },\n    };\n  };\n}\n\n/**\n * Non-tracking fetch: eagerly starts the request and returns the response body\n * as a lazy chunk iterable. Used for audio tracks which don't sample bandwidth.\n * Pass `minChunkSize: Infinity` to accumulate the full body as a single chunk\n * (equivalent to arrayBuffer() but through the same streaming path).\n */\nasync function fetchStream(addressable: AddressableObject, options?: FetchOptions): Promise<AsyncIterable<Uint8Array>> {\n  const { minChunkSize, ...fetchOptions } = options ?? {};\n  const response = await fetchResolvable(addressable, fetchOptions);\n  if (!response.body) throw new Error('Response has no body');\n  return new ChunkedStreamIterable(response.body, ...(minChunkSize !== undefined ? [{ minChunkSize }] : []));\n}\n\n// ============================================================================\n// STATE & OWNERS\n// ============================================================================\n\n/**\n * State shape for segment loading.\n */\nexport interface SegmentLoadingState extends TrackSelectionState {\n  presentation?: Presentation;\n  preload?: string;\n  bandwidthState?: BandwidthState;\n  /** Current playback position in seconds. Defaults to 0 when undefined. */\n  currentTime?: number;\n  /** True once the user has initiated playback. Allows segment loading regardless of preload setting. */\n  playbackInitiated?: boolean;\n}\n\n/**\n * Owners shape for segment loading.\n */\nexport interface SegmentLoadingOwners {\n  videoBuffer?: SourceBuffer;\n  audioBuffer?: SourceBuffer;\n  videoBufferActor?: SourceBufferActor;\n  audioBufferActor?: SourceBufferActor;\n}\n\n// ============================================================================\n// STATE SELECTOR\n// ============================================================================\n\n/**\n * The subset of state that drives segment loading decisions.\n * A plain \"pick\" with one derived field (resolved track ID).\n */\ntype LoadingInputs = {\n  playbackInitiated: boolean | undefined;\n  preload: string | undefined;\n  currentTime: number | undefined;\n  /** @TODO cleanup type precision via inference+generics */\n  track: ReturnType<typeof getSelectedTrack>;\n  segmentsCanLoad: boolean;\n};\n\nfunction selectLoadingInputs(\n  [segmentsCanLoad, state]: [boolean, SegmentLoadingState],\n  type: MediaTrackType\n): LoadingInputs {\n  const { playbackInitiated, preload, currentTime } = state;\n  const track = getSelectedTrack(state, type);\n  return {\n    playbackInitiated,\n    preload,\n    currentTime,\n    track,\n    segmentsCanLoad,\n  };\n}\n\n/**\n * Equality function encoding the condition hierarchy for relevant changes.\n *\n * Pre-play (!playbackInitiated):\n *   Only preload changes matter. currentTime and resolvedTrackId are ignored\n *   (track changes not supported pre-play; currentTime value is used at\n *   trigger time but changes don't re-trigger).\n *\n * playbackInitiated transition:\n *   Always fires (handled in the subscriber; preload='auto' suppression\n *   applied there since equality functions have no memory of prior values).\n *\n * Post-play (playbackInitiated):\n *   resolvedTrackId changes (track switch or previously-unresolved track\n *   resolving) and currentTime changes both trigger. preload is irrelevant.\n */\nconst segmentStartFor = (currentTime: number | undefined, track: ResolvedTrack | undefined) => {\n  if (currentTime == null) return undefined;\n  return track?.segments.find(\n    ({ startTime, duration }, i, segments) =>\n      currentTime >= startTime && (currentTime < startTime + duration || i === segments.length - 1)\n  )?.startTime;\n};\n\n/**\n * Returns true when the inputs are equal (no meaningful change — don't fire).\n * Returns false when the inputs differ in a way that requires a new message.\n *\n * This IS the shouldLoadSegments logic, expressed as an equality function.\n */\nfunction loadingInputsEq(prevState: LoadingInputs, curState: LoadingInputs): boolean {\n  if (!curState.segmentsCanLoad) return true;\n  // Haven't started playback. Only care about preload changes.\n  if (!curState.playbackInitiated) {\n    if (curState.preload === 'none') return true; // blocked — equal, don't fire\n    return curState.preload === prevState.preload; // equal if preload unchanged\n  }\n  // Transition: !playbackInitiated → playbackInitiated\n  if (!prevState.playbackInitiated && curState.playbackInitiated) {\n    if (prevState.preload !== 'auto') return false; // fire — message shape changes\n    // preload was 'auto': fall through to segment comparison (suppress if same position)\n  }\n\n  // Don't treat as a change if we don't (yet) have a currently resolved track.\n  if (!curState.track || !isResolvedTrack(curState.track)) return true;\n\n  // If we *do* have a currently resolved track, treat as a change if the track ids have changed\n  if (prevState.track?.id !== curState.track.id && isResolvedTrack(curState.track)) return false;\n\n  // Finally, if playback has initiated *and* we have a resolved track, check if currentTime\n  // has changed \"significantly\" (based on segment time range boundaries) and treat as a change\n  // if so (regardless of whether or not the track has changed)\n  return (\n    segmentStartFor(prevState.currentTime, curState.track as ResolvedTrack) ===\n    segmentStartFor(curState.currentTime, curState.track as ResolvedTrack)\n  );\n}\n\n// ============================================================================\n// REACTOR\n// ============================================================================\n\n/**\n * Load segments orchestration — Reactor layer.\n *\n * Sends typed load messages to a SegmentLoaderActor when relevant conditions\n * change. Uses targeted subscriptions rather than broad combineLatest so only\n * meaningful state changes trigger evaluation.\n *\n * Condition hierarchy (see SegmentLoadingKey for detail):\n *\n *   !playbackInitiated\n *     preload==='none' (or unset)  → dormant; no trigger\n *     preload==='metadata'         → trigger on transition to 'metadata'\n *     preload==='auto'             → trigger on transition to 'auto'\n *\n *   !playbackInitiated → playbackInitiated\n *     preload !== 'auto'           → trigger (message shape changes)\n *     preload === 'auto'           → suppressed (was already full-range mode;\n *                                    let segmentStart take over post-play)\n *                                    KNOWN LIMITATION: seek-before-play with\n *                                    preload='auto' is not supported — if the\n *                                    user seeks before pressing play, the\n *                                    first re-send is delayed until the next\n *                                    segment boundary crossing post-play.\n *\n *   playbackInitiated\n *     resolvedTrackId changes      → trigger\n *     segmentStart(currentTime) changes → trigger (segment boundary only)\n *\n * @example\n * const cleanup = loadSegments({ state, owners }, { type: 'video' });\n */\nexport function loadSegments(\n  {\n    state,\n    owners,\n  }: {\n    state: WritableState<SegmentLoadingState>;\n    owners: WritableState<SegmentLoadingOwners>;\n  },\n  config: { type: MediaTrackType }\n): () => void {\n  const { type } = config;\n  const actorKey = ActorKeyByType[type];\n\n  // Local throughput state — owns BandwidthState for this track's fetch loop.\n  // Sampling is handled transparently inside fetchBytes; callers never touch it.\n  //\n  // MIGRATION BRIDGE: the onSample callback below keeps global state.bandwidthState\n  // in sync so ABR (selectVideoTrack) continues to work unchanged. Remove this\n  // bridge once ABR reads from throughput directly.\n  const initialBandwidth = state.current.bandwidthState;\n  const throughput = createState<BandwidthState>(\n    initialBandwidth ?? {\n      fastEstimate: 0,\n      fastTotalWeight: 0,\n      slowEstimate: 0,\n      slowTotalWeight: 0,\n      bytesSampled: 0,\n    }\n  );\n\n  const fetchBytes =\n    type === 'video'\n      ? createTrackedFetch(\n          throughput,\n          initialBandwidth !== undefined\n            ? (next) => {\n                state.patch({ bandwidthState: next });\n                // Flush immediately so switchQuality sees the new estimate before the\n                // next segment fetch starts, rather than waiting for the microtask queue.\n                state.flush();\n              }\n            : undefined\n        )\n      : fetchStream;\n\n  const segmentLoader = createState<SegmentLoaderActor | undefined>(undefined);\n\n  // SegmentLoaderActor lifecycle — watch only the actor key in owners so this\n  // subscription does not fire on unrelated owners changes.\n  const unsubActorLifecycle = owners.subscribe(\n    (o) => o[actorKey],\n    (actor) => {\n      if (actor) {\n        segmentLoader.patch(createSegmentLoaderActor(actor, fetchBytes));\n      } else if (!actor && segmentLoader.current) {\n        segmentLoader.current.destroy();\n        segmentLoader.patch(undefined);\n      }\n      return () => {\n        segmentLoader.current?.destroy();\n        segmentLoader.patch(undefined);\n      };\n    }\n  );\n\n  const segmentsCanLoad = createState<boolean>(false);\n  const unsubscribeCanLoadSegments = combineLatest([state, segmentLoader]).subscribe(\n    ([currentState, currentSegmentLoader]) => {\n      const track = getSelectedTrack(currentState, type);\n      const trackResolved = !!track && isResolvedTrack(track);\n      const segmentLoaderActorExists = !!currentSegmentLoader;\n      segmentsCanLoad.patch(trackResolved && segmentLoaderActorExists);\n    }\n  );\n\n  const unsubscribeShouldLoadSegments = combineLatest([segmentsCanLoad, state]).subscribe(\n    ([segmentsCanLoad, state]) => selectLoadingInputs([segmentsCanLoad, state], type),\n    ({ preload, playbackInitiated, currentTime, track }) => {\n      const fullMode = preload === 'auto' || !!playbackInitiated;\n\n      if (!fullMode) {\n        // Metadata mode: init only, no range.\n        /** @ts-expect-error */\n        segmentLoader.current?.send({ type: 'load', track });\n      } else {\n        segmentLoader.current?.send({\n          type: 'load',\n          /** @ts-expect-error */\n          track,\n          range: {\n            start: currentTime as number,\n            end: (currentTime as number) + DEFAULT_FORWARD_BUFFER_CONFIG.bufferDuration,\n          },\n        });\n      }\n    },\n    { equalityFn: loadingInputsEq }\n  );\n\n  return () => {\n    unsubscribeCanLoadSegments();\n    unsubscribeShouldLoadSegments();\n    unsubActorLifecycle();\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"load-segments.js","names":[],"sources":["../../../../src/dom/features/load-segments.ts"],"sourcesContent":["import { type BandwidthState, sampleBandwidth } from '../../core/abr/bandwidth-estimator';\nimport { DEFAULT_FORWARD_BUFFER_CONFIG } from '../../core/buffer/forward-buffer';\nimport { effect } from '../../core/signals/effect';\nimport { computed, type Signal, signal } from '../../core/signals/primitives';\nimport type { AddressableObject, Presentation, ResolvedTrack } from '../../core/types';\nimport { isResolvedTrack } from '../../core/types';\nimport { getSelectedTrack, type TrackSelectionState } from '../../core/utils/track-selection';\nimport type { SourceBufferActor } from '../media/source-buffer-actor';\nimport { ChunkedStreamIterable, type ChunkedStreamIterableOptions } from '../network/chunked-stream-iterable';\nimport { fetchResolvable } from '../network/fetch';\nimport {\n  type BufferState,\n  createSegmentLoaderActor,\n  type SegmentLoaderActor,\n  type SourceBufferState,\n} from './segment-loader-actor';\nimport type { MediaTrackType } from './setup-sourcebuffer';\n\n// Re-export buffer state types for consumers that import them from this module.\nexport type { BufferState, SourceBufferState };\n\n// Map track type to SourceBufferActor owner property key.\nconst ActorKeyByType = {\n  video: 'videoBufferActor',\n  audio: 'audioBufferActor',\n} as const;\n\n// ============================================================================\n// TRACKED FETCH\n// ============================================================================\n\n/**\n * Creates a fetch function that eagerly starts the HTTP request (TTFB is\n * awaited), then returns a lazy iterable over the response body that\n * transparently samples bandwidth per chunk.\n *\n * Separating connection start from body reading ensures `fetch()` is called\n * as soon as the task begins — not deferred until the actor's append loop\n * first pulls a chunk. This makes fetch timing predictable and observable\n * (e.g. in tests that record fetched URLs) regardless of downstream consumers.\n *\n * `onSample` bridges throughput state outward; see Phase 2 comment for detail.\n */\ntype FetchOptions = RequestInit & ChunkedStreamIterableOptions;\n\nfunction createTrackedFetch(\n  throughput: Signal<BandwidthState>,\n  onSample?: (next: BandwidthState) => void\n): (addressable: AddressableObject, options?: FetchOptions) => Promise<AsyncIterable<Uint8Array>> {\n  return async (addressable, options) => {\n    const { minChunkSize, ...fetchOptions } = options ?? {};\n    const response = await fetchResolvable(addressable, fetchOptions);\n    if (!response.body) throw new Error('Response has no body');\n    const body = response.body;\n    return {\n      [Symbol.asyncIterator]: async function* () {\n        let chunkStart = performance.now();\n        for await (const chunk of new ChunkedStreamIterable(\n          body,\n          ...(minChunkSize !== undefined ? [{ minChunkSize }] : [])\n        )) {\n          const elapsed = performance.now() - chunkStart;\n          const next = sampleBandwidth(throughput.get(), elapsed, chunk.byteLength);\n          throughput.set(next);\n          onSample?.(next);\n          yield chunk;\n          chunkStart = performance.now();\n        }\n      },\n    };\n  };\n}\n\n/**\n * Non-tracking fetch: eagerly starts the request and returns the response body\n * as a lazy chunk iterable. Used for audio tracks which don't sample bandwidth.\n * Pass `minChunkSize: Infinity` to accumulate the full body as a single chunk\n * (equivalent to arrayBuffer() but through the same streaming path).\n */\nasync function fetchStream(addressable: AddressableObject, options?: FetchOptions): Promise<AsyncIterable<Uint8Array>> {\n  const { minChunkSize, ...fetchOptions } = options ?? {};\n  const response = await fetchResolvable(addressable, fetchOptions);\n  if (!response.body) throw new Error('Response has no body');\n  return new ChunkedStreamIterable(response.body, ...(minChunkSize !== undefined ? [{ minChunkSize }] : []));\n}\n\n// ============================================================================\n// STATE & OWNERS\n// ============================================================================\n\n/**\n * State shape for segment loading.\n */\nexport interface SegmentLoadingState extends TrackSelectionState {\n  presentation?: Presentation;\n  preload?: string;\n  bandwidthState?: BandwidthState;\n  /** Current playback position in seconds. Defaults to 0 when undefined. */\n  currentTime?: number;\n  /** True once the user has initiated playback. Allows segment loading regardless of preload setting. */\n  playbackInitiated?: boolean;\n}\n\n/**\n * Owners shape for segment loading.\n */\nexport interface SegmentLoadingOwners {\n  videoBuffer?: SourceBuffer;\n  audioBuffer?: SourceBuffer;\n  videoBufferActor?: SourceBufferActor;\n  audioBufferActor?: SourceBufferActor;\n}\n\n// ============================================================================\n// STATE SELECTOR\n// ============================================================================\n\n/**\n * The subset of state that drives segment loading decisions.\n * A plain \"pick\" with one derived field (resolved track ID).\n */\ntype LoadingInputs = {\n  playbackInitiated: boolean | undefined;\n  preload: string | undefined;\n  currentTime: number | undefined;\n  /** @TODO cleanup type precision via inference+generics */\n  track: ReturnType<typeof getSelectedTrack>;\n  segmentsCanLoad: boolean;\n};\n\nfunction selectLoadingInputs(\n  [segmentsCanLoad, state]: [boolean, SegmentLoadingState],\n  type: MediaTrackType\n): LoadingInputs {\n  const { playbackInitiated, preload, currentTime } = state;\n  const track = getSelectedTrack(state, type);\n  return {\n    playbackInitiated,\n    preload,\n    currentTime,\n    track,\n    segmentsCanLoad,\n  };\n}\n\n/**\n * Equality function encoding the condition hierarchy for relevant changes.\n *\n * Pre-play (!playbackInitiated):\n *   Only preload changes matter. currentTime and resolvedTrackId are ignored\n *   (track changes not supported pre-play; currentTime value is used at\n *   trigger time but changes don't re-trigger).\n *\n * playbackInitiated transition:\n *   Always fires (handled in the subscriber; preload='auto' suppression\n *   applied there since equality functions have no memory of prior values).\n *\n * Post-play (playbackInitiated):\n *   resolvedTrackId changes (track switch or previously-unresolved track\n *   resolving) and currentTime changes both trigger. preload is irrelevant.\n */\nconst segmentStartFor = (currentTime: number | undefined, track: ResolvedTrack | undefined) => {\n  if (currentTime == null) return undefined;\n  return track?.segments.find(\n    ({ startTime, duration }, i, segments) =>\n      currentTime >= startTime && (currentTime < startTime + duration || i === segments.length - 1)\n  )?.startTime;\n};\n\n/**\n * Returns true when the inputs are equal (no meaningful change — don't fire).\n * Returns false when the inputs differ in a way that requires a new message.\n *\n * This IS the shouldLoadSegments logic, expressed as an equality function.\n */\nfunction loadingInputsEq(prevState: LoadingInputs, curState: LoadingInputs): boolean {\n  if (!curState.segmentsCanLoad) return true;\n  // Haven't started playback. Only care about preload changes.\n  if (!curState.playbackInitiated) {\n    if (curState.preload === 'none') return true; // blocked — equal, don't fire\n    return curState.preload === prevState.preload; // equal if preload unchanged\n  }\n  // Transition: !playbackInitiated → playbackInitiated\n  if (!prevState.playbackInitiated && curState.playbackInitiated) {\n    if (prevState.preload !== 'auto') return false; // fire — message shape changes\n    // preload was 'auto': fall through to segment comparison (suppress if same position)\n  }\n\n  // Don't treat as a change if we don't (yet) have a currently resolved track.\n  if (!curState.track || !isResolvedTrack(curState.track)) return true;\n\n  // If we *do* have a currently resolved track, treat as a change if the track ids have changed\n  if (prevState.track?.id !== curState.track.id && isResolvedTrack(curState.track)) return false;\n\n  // Finally, if playback has initiated *and* we have a resolved track, check if currentTime\n  // has changed \"significantly\" (based on segment time range boundaries) and treat as a change\n  // if so (regardless of whether or not the track has changed)\n  return (\n    segmentStartFor(prevState.currentTime, curState.track as ResolvedTrack) ===\n    segmentStartFor(curState.currentTime, curState.track as ResolvedTrack)\n  );\n}\n\n// ============================================================================\n// REACTOR\n// ============================================================================\n\n/**\n * Load segments orchestration — Reactor layer.\n *\n * Sends typed load messages to a SegmentLoaderActor when relevant conditions\n * change. Uses targeted subscriptions rather than broad combineLatest so only\n * meaningful state changes trigger evaluation.\n *\n * Condition hierarchy (see SegmentLoadingKey for detail):\n *\n *   !playbackInitiated\n *     preload==='none' (or unset)  → dormant; no trigger\n *     preload==='metadata'         → trigger on transition to 'metadata'\n *     preload==='auto'             → trigger on transition to 'auto'\n *\n *   !playbackInitiated → playbackInitiated\n *     preload !== 'auto'           → trigger (message shape changes)\n *     preload === 'auto'           → suppressed (was already full-range mode;\n *                                    let segmentStart take over post-play)\n *                                    KNOWN LIMITATION: seek-before-play with\n *                                    preload='auto' is not supported — if the\n *                                    user seeks before pressing play, the\n *                                    first re-send is delayed until the next\n *                                    segment boundary crossing post-play.\n *\n *   playbackInitiated\n *     resolvedTrackId changes      → trigger\n *     segmentStart(currentTime) changes → trigger (segment boundary only)\n *\n * @example\n * const cleanup = loadSegments({ state, owners }, { type: 'video' });\n */\nexport function loadSegments<S extends SegmentLoadingState, O extends SegmentLoadingOwners>(\n  { state, owners }: { state: Signal<S>; owners: Signal<O> },\n  config: { type: MediaTrackType }\n): () => void {\n  const { type } = config;\n  const actorKey = ActorKeyByType[type];\n\n  // Local throughput signal — used by createTrackedFetch to sample bandwidth\n  // per chunk and propagate back to the shared state for ABR.\n  const initialBandwidth = state.get().bandwidthState;\n  const throughput = signal<BandwidthState>(\n    initialBandwidth ?? {\n      fastEstimate: 0,\n      fastTotalWeight: 0,\n      slowEstimate: 0,\n      slowTotalWeight: 0,\n      bytesSampled: 0,\n    }\n  );\n\n  const fetchBytes =\n    type === 'video'\n      ? createTrackedFetch(\n          throughput,\n          initialBandwidth !== undefined\n            ? (next) => {\n                state.set(Object.assign({}, state.get(), { bandwidthState: next }) as S);\n              }\n            : undefined\n        )\n      : fetchStream;\n\n  // Local segment loader — signal so segmentsCanLoad can track it reactively\n  const segmentLoader = signal<SegmentLoaderActor | undefined>(undefined);\n\n  // Computed: isolates the specific actor key so the lifecycle effect only\n  // re-runs when that actor reference changes, not on unrelated owners updates.\n  const actorSource = computed<SourceBufferActor | undefined>(() => owners.get()[actorKey]);\n\n  // Actor lifecycle — destroy and recreate SegmentLoaderActor when the\n  // upstream SourceBufferActor is replaced (quality switch) or removed.\n  let currentLoader: SegmentLoaderActor | undefined;\n  const cleanupActorLifecycle = effect(() => {\n    const actor = actorSource.get();\n\n    if (currentLoader) {\n      currentLoader.destroy();\n      segmentLoader.set(undefined);\n      currentLoader = undefined;\n    }\n\n    if (actor) {\n      const loader = createSegmentLoaderActor(actor, fetchBytes);\n      currentLoader = loader;\n      segmentLoader.set(loader);\n    }\n  });\n\n  // Derived: true only when we have both a resolved track and a ready loader\n  const segmentsCanLoad = computed(() => {\n    const track = getSelectedTrack(state.get(), type);\n    return !!track && isResolvedTrack(track) && !!segmentLoader.get();\n  });\n\n  // Loading inputs — selectLoadingInputs is cheap; let the effect body apply\n  // loadingInputsEq rather than the computed, so the first run always fires\n  // regardless of the initial state.\n  const loadingInputs = computed(() => selectLoadingInputs([segmentsCanLoad.get(), state.get()], type));\n\n  // Load effect — prevInputs guards against redundant messages using the same\n  // equality semantics as the former combineLatest selector subscription.\n  // prevInputs is updated only when we actually send a message so that the\n  // transition segmentsCanLoad: false → true always fires (loadingInputsEq\n  // returns true for that transition, so we must not skip it here).\n  let prevInputs: LoadingInputs | undefined;\n  const cleanupLoadEffect = effect(() => {\n    const inputs = loadingInputs.get();\n    if (prevInputs !== undefined && loadingInputsEq(prevInputs, inputs)) return;\n\n    const { preload, playbackInitiated, currentTime, track, segmentsCanLoad: canLoad } = inputs;\n    if (!canLoad) return;\n\n    prevInputs = inputs;\n\n    const fullMode = preload === 'auto' || !!playbackInitiated;\n    if (!fullMode) {\n      // Metadata mode: init only, no range.\n      /** @ts-expect-error */\n      segmentLoader.get()?.send({ type: 'load', track });\n    } else {\n      segmentLoader.get()?.send({\n        type: 'load',\n        /** @ts-expect-error */\n        track,\n        range: {\n          start: currentTime as number,\n          end: (currentTime as number) + DEFAULT_FORWARD_BUFFER_CONFIG.bufferDuration,\n        },\n      });\n    }\n  });\n\n  return () => {\n    cleanupActorLifecycle();\n    cleanupLoadEffect();\n    currentLoader?.destroy();\n  };\n}\n"],"mappings":"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"}

package/dist/default/dom/features/load-text-track-cues.js

@@ -1,21 +1,24 @@
 import { getSegmentsToLoad } from "../../core/buffer/forward-buffer.js";
+import { effect } from "../../core/signals/effect.js";
+import { computed } from "../../core/signals/primitives.js";
 import { isResolvedTrack } from "../../core/types/index.js";
-import { combineLatest } from "../../core/reactive/combine-latest.js";
 import { parseVttSegment } from "../text/parse-vtt-segment.js";
-
 //#region src/dom/features/load-text-track-cues.ts
-function isDuplicateCue(cue, textTrack) {
-	const { cues } = textTrack;
-	if (!cues) return false;
-	for (let i = 0; i < cues.length; i++) {
-		const existing = cues[i];
-		if (existing.startTime === cue.startTime && existing.endTime === cue.endTime && existing.text === cue.text) return true;
-	}
-	return false;
+const CueKeys = [
+	"startTime",
+	"endTime",
+	"text"
+];
+function isDuplicateCue(cue, existingCues) {
+	return Array.prototype.some.call(existingCues ?? [], (existingCue) => {
+		return CueKeys.every((k) => existingCue[k] === cue[k]);
+	});
 }
-const loadVttSegmentTask = async ({ segment }, context) => {
-	const cues = await parseVttSegment(segment.url);
-	for (const cue of cues) if (!isDuplicateCue(cue, context.textTrack)) context.textTrack.addCue(cue);
+const loadVttSegmentTask = async ({ segment }, { textTrack }) => {
+	(await parseVttSegment(segment.url)).forEach((cue) => {
+		if (isDuplicateCue(cue, textTrack.cues)) return;
+		textTrack.addCue(cue);
+	});
 };
 /**
 * Load text track cues task (composite - orchestrates VTT segment subtasks).
@@ -33,12 +36,16 @@ const loadTextTrackCuesTask = async ({ currentState }, context) => {
 		if (context.signal.aborted) break;
 		try {
 			await loadVttSegmentTask({ segment }, { textTrack: context.textTrack });
-			const latest = context.state.current.textBufferState ?? {};
+			const latestState = context.state.get();
+			const latest = latestState.textBufferState ?? {};
 			const trackState = latest[trackId] ?? { segments: [] };
-			context.state.patch({ textBufferState: {
-				...latest,
-				[trackId]: { segments: [...trackState.segments, { id: segment.id }] }
-			} });
+			context.state.set({
+				...latestState,
+				textBufferState: {
+					...latest,
+					[trackId]: { segments: [...trackState.segments, { id: segment.id }] }
+				}
+			});
 		} catch (error) {
 			if (error instanceof Error && error.name === "AbortError") break;
 			console.error("Failed to load VTT segment:", error);
@@ -121,18 +128,21 @@ function loadTextTrackCues({ state, owners }) {
 	let currentTask = null;
 	let abortController = null;
 	let lastTrackId;
-	const cleanup = combineLatest([state, owners]).subscribe(async ([currentState, currentOwners]) => {
-		if (currentState.selectedTextTrackId !== lastTrackId) {
-			lastTrackId = currentState.selectedTextTrackId;
+	const selectedTrackId = computed(() => state.get().selectedTextTrackId);
+	const cleanupEffect = effect(() => {
+		const s = state.get();
+		const o = owners.get();
+		if (selectedTrackId.get() !== lastTrackId) {
+			lastTrackId = selectedTrackId.get();
 			abortController?.abort();
 			currentTask = null;
 		}
 		if (currentTask) return;
-		if (!shouldLoadTextTrackCues(currentState, currentOwners)) return;
-		const textTrack = getSelectedTextTrackFromOwners(currentState, currentOwners);
+		if (!shouldLoadTextTrackCues(s, o)) return;
+		const textTrack = getSelectedTextTrackFromOwners(s, o);
 		if (!textTrack) return;
 		abortController = new AbortController();
-		currentTask = loadTextTrackCuesTask({ currentState }, {
+		currentTask = loadTextTrackCuesTask({ currentState: s }, {
 			signal: abortController.signal,
 			textTrack,
 			state
@@ -142,10 +152,10 @@ function loadTextTrackCues({ state, owners }) {
 	});
 	return () => {
 		abortController?.abort();
-		cleanup();
+		cleanupEffect();
 	};
 }
-
 //#endregion
 export { loadTextTrackCues };
+
 //# sourceMappingURL=load-text-track-cues.js.map