rx-player 4.4.0 → 4.4.1-dev.2025101500

package/src/core/{main/worker/worker_text_displayer_interface.ts → entry/core_text_displayer_interface.ts}

@@ -1,25 +1,25 @@
-import log from "../../../log";
-import type { ITextDisplayerData } from "../../../main_thread/types";
+import log from "../../log";
+import type { ITextDisplayerData } from "../../main_thread/types";
+import type { IRange } from "../../utils/ranges";
+import { CancellationError } from "../../utils/task_canceller";
+import type { ITextDisplayerInterface } from "../segment_sinks";
 import type {
-  IRemoveTextDataWorkerMessage,
-  IStopTextDisplayerWorkerMessage,
-  IResetTextDisplayerWorkerMessage,
-  IPushTextDataWorkerMessage,
-} from "../../../multithread_types";
-import { WorkerMessageType } from "../../../multithread_types";
-import type { IRange } from "../../../utils/ranges";
-import { CancellationError } from "../../../utils/task_canceller";
-import type { ITextDisplayerInterface } from "../../segment_sinks";
+  IPushTextDataCoreMessage,
+  IRemoveTextDataCoreMessage,
+  IResetTextDisplayerCoreMessage,
+  IStopTextDisplayerCoreMessage,
+} from "../types";
+import { CoreMessageType } from "../types";
 
 /**
- * Implementation of an `ITextDisplayerInterface` running in a WebWorker
- * (so, in a different thread than the `ITextDisplayer`).
+ * Implementation of an `ITextDisplayerInterface` for the Core, that can run in
+ * a WebWorker (so, in a different thread than the `ITextDisplayer`).
  *
- * @class WorkerTextDisplayerInterface
+ * @class CoreTextDisplayerInterface
  */
-export default class WorkerTextDisplayerInterface implements ITextDisplayerInterface {
+export default class CoreTextDisplayerInterface implements ITextDisplayerInterface {
   private _contentId: string;
-  private _messageSender: (msg: IWorkerTextDisplayerInterfaceMessage) => void;
+  private _messageSender: (msg: ICoreTextDisplayerInterfaceMessage) => void;
   public _queues: {
     pushTextData: Array<{
       resolve: (ranges: IRange[]) => void;
@@ -37,7 +37,7 @@ export default class WorkerTextDisplayerInterface implements ITextDisplayerInter
    */
   constructor(
     contentId: string,
-    messageSender: (msg: IWorkerTextDisplayerInterfaceMessage) => void,
+    messageSender: (msg: ICoreTextDisplayerInterfaceMessage) => void,
   ) {
     this._contentId = contentId;
     this._messageSender = messageSender;
@@ -50,7 +50,7 @@ export default class WorkerTextDisplayerInterface implements ITextDisplayerInter
   public pushTextData(infos: ITextDisplayerData): Promise<IRange[]> {
     return new Promise((resolve, reject) => {
       this._messageSender({
-        type: WorkerMessageType.PushTextData,
+        type: CoreMessageType.PushTextData,
         contentId: this._contentId,
         value: infos,
       });
@@ -64,7 +64,7 @@ export default class WorkerTextDisplayerInterface implements ITextDisplayerInter
   public remove(start: number, end: number): Promise<IRange[]> {
     return new Promise((resolve, reject) => {
       this._messageSender({
-        type: WorkerMessageType.RemoveTextData,
+        type: CoreMessageType.RemoveTextData,
         contentId: this._contentId,
         value: { start, end },
       });
@@ -77,7 +77,7 @@ export default class WorkerTextDisplayerInterface implements ITextDisplayerInter
    */
   public reset(): void {
     this._messageSender({
-      type: WorkerMessageType.ResetTextDisplayer,
+      type: CoreMessageType.ResetTextDisplayer,
       contentId: this._contentId,
       value: null,
     });
@@ -89,7 +89,7 @@ export default class WorkerTextDisplayerInterface implements ITextDisplayerInter
    */
   public stop(): void {
     this._messageSender({
-      type: WorkerMessageType.StopTextDisplayer,
+      type: CoreMessageType.StopTextDisplayer,
       contentId: this._contentId,
       value: null,
     });
@@ -155,8 +155,8 @@ export default class WorkerTextDisplayerInterface implements ITextDisplayerInter
   }
 }
 
-type IWorkerTextDisplayerInterfaceMessage =
-  | IPushTextDataWorkerMessage
-  | IRemoveTextDataWorkerMessage
-  | IStopTextDisplayerWorkerMessage
-  | IResetTextDisplayerWorkerMessage;
+type ICoreTextDisplayerInterfaceMessage =
+  | IPushTextDataCoreMessage
+  | IRemoveTextDataCoreMessage
+  | IStopTextDisplayerCoreMessage
+  | IResetTextDisplayerCoreMessage;

package/src/core/{main/common → entry}/create_content_time_boundaries_observer.ts

@@ -1,13 +1,13 @@
 import type {
   ISegmentSinksStore,
   IStreamOrchestratorPlaybackObservation,
-} from "../../../core/types";
-import log from "../../../log";
-import type { IManifest, IPeriod } from "../../../manifest";
-import type { IMediaSourceInterface } from "../../../mse";
-import type { IReadOnlyPlaybackObserver } from "../../../playback_observer";
-import type { IPlayerError } from "../../../public_types";
-import type { CancellationSignal } from "../../../utils/task_canceller";
+} from "../../core/types";
+import log from "../../log";
+import type { IManifest, IPeriod } from "../../manifest";
+import type { IMediaSourceInterface } from "../../mse";
+import type { IReadOnlyPlaybackObserver } from "../../playback_observer";
+import type { IPlayerError } from "../../public_types";
+import type { CancellationSignal } from "../../utils/task_canceller";
 import ContentTimeBoundariesObserver from "./content_time_boundaries_observer";
 
 export interface IContentTimeBoundariesObserverCallbacks {

package/src/core/{main/common → entry}/get_buffered_data_per_media_buffer.ts

@@ -1,9 +1,9 @@
-import type { ITextDisplayer } from "../../../main_thread/types";
-import type { IMediaSourceInterface } from "../../../mse";
-import { SourceBufferType } from "../../../mse";
-import type { ITrackType } from "../../../public_types";
-import arrayFind from "../../../utils/array_find";
-import type { IRange } from "../../../utils/ranges";
+import type { ITextDisplayer } from "../../main_thread/types";
+import type { IMediaSourceInterface } from "../../mse";
+import { SourceBufferType } from "../../mse";
+import type { ITrackType } from "../../public_types";
+import arrayFind from "../../utils/array_find";
+import type { IRange } from "../../utils/ranges";
 
 /**
  * Returns a JS object where keys are the type of buffers (e.g. "audio",

package/src/core/{main/common → entry}/get_thumbnail_data.ts

@@ -1,8 +1,8 @@
-import type { IManifest } from "../../../manifest";
-import type { IThumbnailResponse } from "../../../transports";
-import arrayFind from "../../../utils/array_find";
-import TaskCanceller from "../../../utils/task_canceller";
-import type { IThumbnailFetcher } from "../../fetchers";
+import type { IManifest } from "../../manifest";
+import type { IThumbnailResponse } from "../../transports";
+import arrayFind from "../../utils/array_find";
+import TaskCanceller from "../../utils/task_canceller";
+import type { IThumbnailFetcher } from "../fetchers";
 
 /**
  * @param {function} fetchThumbnails

package/src/core/entry/index.ts

@@ -0,0 +1,4 @@
+import type { IMessageReceiverCallback } from "./core_entry";
+import initializeCoreEntry from "./core_entry";
+export default initializeCoreEntry;
+export type { IMessageReceiverCallback };

package/src/core/{main/common → entry}/synchronize_sinks_on_observation.ts

@@ -1,5 +1,5 @@
-import type { ICorePlaybackObservation } from "../../../main_thread/init/utils/create_core_playback_observer";
-import type SegmentSinksStore from "../../segment_sinks";
+import type { ICorePlaybackObservation } from "../../main_thread/init/utils/create_core_playback_observer";
+import type SegmentSinksStore from "../segment_sinks";
 
 /**
  * Synchronize SegmentSinks with what has been buffered.

package/src/core/{main/worker → entry}/track_choice_setter.ts

@@ -1,10 +1,10 @@
-import log from "../../../log";
-import type { ITrackUpdateChoiceObject } from "../../../multithread_types";
-import type { ITrackType } from "../../../public_types";
-import isNullOrUndefined from "../../../utils/is_null_or_undefined";
-import objectAssign from "../../../utils/object_assign";
-import SharedReference from "../../../utils/reference";
-import type { IAdaptationChoice, IRepresentationsChoice } from "../../stream";
+import log from "../../log";
+import type { ITrackUpdateChoiceObject } from "../../main_thread/types";
+import type { ITrackType } from "../../public_types";
+import isNullOrUndefined from "../../utils/is_null_or_undefined";
+import objectAssign from "../../utils/object_assign";
+import SharedReference from "../../utils/reference";
+import type { IAdaptationChoice, IRepresentationsChoice } from "../stream";
 
 export default class TrackChoiceSetter {
   /**

package/src/core/entry/utils.ts

@@ -0,0 +1,11 @@
+import { formatError } from "../../errors";
+import type { ISentError } from "../types";
+
+export function formatErrorForSender(error: unknown): ISentError {
+  const formattedError = formatError(error, {
+    defaultCode: "NONE",
+    defaultReason: "An unknown error stopped content playback.",
+  });
+
+  return formattedError.serialize();
+}

package/src/core/stream/orchestrator/stream_orchestrator.ts

@@ -399,7 +399,32 @@ export default function StreamOrchestrator(
         }
 
         const lastPosition = observation.position.getWanted();
-        const newInitialPeriod = manifest.getPeriodForTime(lastPosition);
+        let newInitialPeriod = manifest.getPeriodForTime(lastPosition);
+        if (newInitialPeriod === undefined) {
+          // If there's no Period for the current position exactly, select the next one
+          newInitialPeriod = manifest.getNextPeriod(lastPosition);
+          log.warn(
+            "Stream",
+            "No Period found for the reloading position, selecting next one instead",
+            {
+              reloadPosition: lastPosition,
+              nextPeriodStart: newInitialPeriod?.start,
+            },
+          );
+        }
+        if (newInitialPeriod === undefined) {
+          // If there's no Period after the current position, select the last one
+          newInitialPeriod = manifest.periods[manifest.periods.length - 1];
+          log.warn(
+            "Stream",
+            "No Period found for of after the reloading position, selecting the last one",
+            {
+              reloadPosition: lastPosition,
+              nextPeriodStart: newInitialPeriod?.start,
+              nextPeriodEnd: newInitialPeriod?.end,
+            },
+          );
+        }
         if (newInitialPeriod === undefined) {
           callbacks.error(
             new MediaError(