rx-player 4.4.1-dev.2025101500 → 4.4.1

package/dist/es2017/core/{entry/core_entry.js → main/worker/worker_main.js}

@@ -1,51 +1,31 @@
-import config from "../../config";
-import { MediaError, OtherError } from "../../errors";
-import features from "../../features";
-import log from "../../log";
-import Manifest, { Adaptation, Period, Representation } from "../../manifest/classes";
-import { ObservationPosition } from "../../playback_observer";
-import CorePlaybackObserver from "../../playback_observer/core_playback_observer";
-import arrayFind from "../../utils/array_find";
-import assert, { assertUnreachable } from "../../utils/assert";
-import { scaleTimestamp } from "../../utils/monotonic_timestamp";
-import objectAssign from "../../utils/object_assign";
-import SharedReference from "../../utils/reference";
-import TaskCanceller from "../../utils/task_canceller";
-import StreamOrchestrator from "../stream";
+import config from "../../../config";
+import { MediaError, OtherError } from "../../../errors";
+import features from "../../../features";
+import log from "../../../log";
+import Manifest, { Adaptation, Period, Representation } from "../../../manifest/classes";
+import DashJsParser from "../../../parsers/manifest/dash/js-parser";
+import DashWasmParser from "../../../parsers/manifest/dash/wasm-parser";
+import { ObservationPosition } from "../../../playback_observer";
+import WorkerPlaybackObserver from "../../../playback_observer/worker_playback_observer";
+import createDashPipelines from "../../../transports/dash";
+import arrayFind from "../../../utils/array_find";
+import assert, { assertUnreachable } from "../../../utils/assert";
+import globalScope from "../../../utils/global_scope";
+import { scaleTimestamp } from "../../../utils/monotonic_timestamp";
+import objectAssign from "../../../utils/object_assign";
+import SharedReference from "../../../utils/reference";
+import TaskCanceller from "../../../utils/task_canceller";
+import StreamOrchestrator from "../../stream";
+import createContentTimeBoundariesObserver from "../common/create_content_time_boundaries_observer";
+import getBufferedDataPerMediaBuffer from "../common/get_buffered_data_per_media_buffer";
+import getThumbnailData from "../common/get_thumbnail_data";
+import synchronizeSegmentSinksOnObservation from "../common/synchronize_sinks_on_observation";
 import ContentPreparer from "./content_preparer";
-import createContentTimeBoundariesObserver from "./create_content_time_boundaries_observer";
-import getBufferedDataPerMediaBuffer from "./get_buffered_data_per_media_buffer";
-import getThumbnailData from "./get_thumbnail_data";
-import synchronizeSegmentSinksOnObservation from "./synchronize_sinks_on_observation";
-import { formatErrorForSender } from "./utils";
-/**
- * Initialize a `CoreEntry`, which is the part of the RxPlayer acting as an
- * entry point to all its "core" code.
- *
- * Its role is to receive and react to messages coming from "main thead", which
- * may include loading and playing a content, and to send back messages for the main
- * thread.
- * @param {Function} setMessageReceiver - Declares the function that will
- * receive messages coming from the "main thread" part of the RxPlayer logic.
- * @param {Function} sendMessage - Function allowing to send messages to the
- * "main thread" part of the RxPlayer logic.
- */
-export default function initializeCoreEntry(setMessageReceiver, sendMessage) {
-    const { DEFAULT_WANTED_BUFFER_AHEAD, DEFAULT_MAX_VIDEO_BUFFER_SIZE, DEFAULT_MAX_BUFFER_AHEAD, DEFAULT_MAX_BUFFER_BEHIND, } = config.getCurrent();
-    const refs = {
-        wantedBufferAhead: new SharedReference(DEFAULT_WANTED_BUFFER_AHEAD),
-        maxVideoBufferSize: new SharedReference(DEFAULT_MAX_VIDEO_BUFFER_SIZE),
-        maxBufferAhead: new SharedReference(DEFAULT_MAX_BUFFER_AHEAD),
-        maxBufferBehind: new SharedReference(DEFAULT_MAX_BUFFER_BEHIND),
-        limitVideoResolution: new SharedReference({
-            height: undefined,
-            width: undefined,
-            pixelRatio: 1,
-        }),
-        throttleVideoBitrate: new SharedReference(Infinity),
-    };
+import { limitVideoResolution, maxBufferAhead, maxBufferBehind, maxVideoBufferSize, throttleVideoBitrate, wantedBufferAhead, } from "./globals";
+import sendMessage, { formatErrorForSender } from "./send_message";
+export default function initializeWorkerMain() {
     /**
-     * `true` once the CoreEntry has been initialized.
+     * `true` once the worker has been initialized.
      * Allow to enforce the fact that it is only initialized once.
      */
     let isInitialized = false;
@@ -61,42 +41,46 @@ export default function initializeCoreEntry(setMessageReceiver, sendMessage) {
      * `null` if there's no content loaded currently.
      */
     let currentContentHandle = null;
+    // Initialize Manually a `DashWasmParser` and add the feature.
+    // TODO allow worker-side feature-switching? Not sure how
+    const dashWasmParser = new DashWasmParser();
+    features.dashParsers.wasm = dashWasmParser;
+    features.dashParsers.js = DashJsParser;
+    features.transports.dash = createDashPipelines;
     /**
      * When set, emit playback observation made on the main thread.
      */
     let playbackObservationRef = null;
-    setMessageReceiver((e) => {
+    globalScope.onmessageerror = (_msg) => {
+        log.error("Core", "Error when receiving message from main thread.");
+    };
+    onmessage = function (e) {
         var _a, _b;
         log.debug("Core", "received message", { name: e.data.type });
         const msg = e.data;
         switch (msg.type) {
             case "init" /* MainThreadMessageType.Init */:
-                {
-                    assert(!isInitialized);
-                    isInitialized = true;
-                    scaleTimestamp(msg.value);
-                    updateLoggerLevel(msg.value.logLevel, msg.value.logFormat, msg.value.sendBackLogs);
-                    const dashWasmParser = features.dashParsers.wasm;
-                    if (dashWasmParser !== null &&
-                        msg.value.dashWasmUrl !== undefined &&
-                        dashWasmParser.isCompatible()) {
-                        dashWasmParser.initialize({ wasmUrl: msg.value.dashWasmUrl }).catch((err) => {
-                            const error = err instanceof Error ? err.toString() : "Unknown Error";
-                            log.error("Core", "Could not initialize DASH_WASM parser", error);
-                        });
-                    }
-                    if (!msg.value.hasVideo) {
-                        contentPreparer.disposeCurrentContent();
-                        contentPreparer = new ContentPreparer({ hasVideo: msg.value.hasVideo });
-                    }
-                    sendMessage({ type: "init-success" /* CoreMessageType.InitSuccess */, value: null });
+                assert(!isInitialized);
+                isInitialized = true;
+                scaleTimestamp(msg.value);
+                updateLoggerLevel(msg.value.logLevel, msg.value.logFormat, msg.value.sendBackLogs);
+                if (msg.value.dashWasmUrl !== undefined && dashWasmParser.isCompatible()) {
+                    dashWasmParser.initialize({ wasmUrl: msg.value.dashWasmUrl }).catch((err) => {
+                        const error = err instanceof Error ? err.toString() : "Unknown Error";
+                        log.error("Core", "Could not initialize DASH_WASM parser", error);
+                    });
+                }
+                if (!msg.value.hasVideo) {
+                    contentPreparer.disposeCurrentContent();
+                    contentPreparer = new ContentPreparer({ hasVideo: msg.value.hasVideo });
                 }
+                sendMessage({ type: "init-success" /* WorkerMessageType.InitSuccess */, value: null });
                 break;
             case "log-level-update" /* MainThreadMessageType.LogLevelUpdate */:
                 updateLoggerLevel(msg.value.logLevel, msg.value.logFormat, msg.value.sendBackLogs);
                 break;
             case "prepare" /* MainThreadMessageType.PrepareContent */:
-                prepareNewContent(sendMessage, contentPreparer, msg.value, refs);
+                prepareNewContent(contentPreparer, msg.value);
                 break;
             case "start" /* MainThreadMessageType.StartPreparedContent */: {
                 const preparedContent = contentPreparer.getCurrentContent();
@@ -109,7 +93,7 @@ export default function initializeCoreEntry(setMessageReceiver, sendMessage) {
                     position: new ObservationPosition(...msg.value.initialObservation.position),
                 }));
                 playbackObservationRef = currentContentObservationRef;
-                currentContentHandle = loadPreparedContent(sendMessage, msg.value, contentPreparer, currentContentObservationRef, refs);
+                currentContentHandle = loadPreparedContent(msg.value, contentPreparer, currentContentObservationRef);
                 break;
             }
             case "observation" /* MainThreadMessageType.PlaybackObservation */: {
@@ -132,7 +116,7 @@ export default function initializeCoreEntry(setMessageReceiver, sendMessage) {
                 break;
             }
             case "ref-update" /* MainThreadMessageType.ReferenceUpdate */:
-                updateCoreReference(msg, refs);
+                updateGlobalReference(msg);
                 break;
             case "stop" /* MainThreadMessageType.StopContent */:
                 if (msg.contentId !== ((_a = contentPreparer.getCurrentContent()) === null || _a === void 0 ? void 0 : _a.contentId)) {
@@ -236,7 +220,7 @@ export default function initializeCoreEntry(setMessageReceiver, sendMessage) {
                     const warning = preparedContent.manifest.updateCodecSupport(newEvaluatedCodecs);
                     if (warning !== null) {
                         sendMessage({
-                            type: "warning" /* CoreMessageType.Warning */,
+                            type: "warning" /* WorkerMessageType.Warning */,
                             contentId: preparedContent.contentId,
                             value: formatErrorForSender(warning),
                         });
@@ -244,7 +228,7 @@ export default function initializeCoreEntry(setMessageReceiver, sendMessage) {
                 }
                 catch (err) {
                     sendMessage({
-                        type: "error" /* CoreMessageType.Error */,
+                        type: "error" /* WorkerMessageType.Error */,
                         contentId: preparedContent.contentId,
                         value: formatErrorForSender(err),
                     });
@@ -280,11 +264,11 @@ export default function initializeCoreEntry(setMessageReceiver, sendMessage) {
                 if (preparedContent === null || preparedContent.contentId !== msg.contentId) {
                     return;
                 }
-                if (preparedContent.coreTextSender === null) {
+                if (preparedContent.workerTextSender === null) {
                     log.error("Core", "Added text track but text track aren't enabled");
                     return;
                 }
-                preparedContent.coreTextSender.onPushedTrackSuccess(msg.value.ranges);
+                preparedContent.workerTextSender.onPushedTrackSuccess(msg.value.ranges);
                 break;
             }
             case "push-text-error" /* MainThreadMessageType.PushTextDataError */: {
@@ -292,11 +276,11 @@ export default function initializeCoreEntry(setMessageReceiver, sendMessage) {
                 if (preparedContent === null || preparedContent.contentId !== msg.contentId) {
                     return;
                 }
-                if (preparedContent.coreTextSender === null) {
+                if (preparedContent.workerTextSender === null) {
                     log.error("Core", "Added text track but text track aren't enabled");
                     return;
                 }
-                preparedContent.coreTextSender.onPushedTrackError(new Error(msg.value.message));
+                preparedContent.workerTextSender.onPushedTrackError(new Error(msg.value.message));
                 break;
             }
             case "remove-text-success" /* MainThreadMessageType.RemoveTextDataSuccess */: {
@@ -304,11 +288,11 @@ export default function initializeCoreEntry(setMessageReceiver, sendMessage) {
                 if (preparedContent === null || preparedContent.contentId !== msg.contentId) {
                     return;
                 }
-                if (preparedContent.coreTextSender === null) {
+                if (preparedContent.workerTextSender === null) {
                     log.error("Core", "Removed text track but text track aren't enabled");
                     return;
                 }
-                preparedContent.coreTextSender.onRemoveSuccess(msg.value.ranges);
+                preparedContent.workerTextSender.onRemoveSuccess(msg.value.ranges);
                 break;
             }
             case "remove-text-error" /* MainThreadMessageType.RemoveTextDataError */: {
@@ -316,19 +300,19 @@ export default function initializeCoreEntry(setMessageReceiver, sendMessage) {
                 if (preparedContent === null || preparedContent.contentId !== msg.contentId) {
                     return;
                 }
-                if (preparedContent.coreTextSender === null) {
+                if (preparedContent.workerTextSender === null) {
                     log.error("Core", "Removed text track but text track aren't enabled");
                     return;
                 }
-                preparedContent.coreTextSender.onRemoveError(new Error(msg.value.message));
+                preparedContent.workerTextSender.onRemoveError(new Error(msg.value.message));
                 break;
             }
             case "pull-segment-sink-store-infos" /* MainThreadMessageType.PullSegmentSinkStoreInfos */: {
-                sendSegmentSinksStoreInfos(sendMessage, contentPreparer, msg.value.requestId);
+                sendSegmentSinksStoreInfos(contentPreparer, msg.value.requestId);
                 break;
             }
             case "thumbnail-request" /* MainThreadMessageType.ThumbnailDataRequest */: {
-                sendThumbnailData(sendMessage, contentPreparer, msg);
+                sendThumbnailData(contentPreparer, msg);
                 break;
             }
             case "config-update" /* MainThreadMessageType.ConfigUpdate */: {
@@ -338,68 +322,48 @@ export default function initializeCoreEntry(setMessageReceiver, sendMessage) {
             default:
                 assertUnreachable(msg);
         }
-    });
+    };
 }
-/**
- * Performs steps needed to prepare a future content to be played:
- *   - Load its Manifest file
- *   - Create MSE `MediaSource` for that content.
- *   - Initialize all modules that will follow that content
- *   - etc.
- * @param {Function} sendMessage - Function allowing to send messages to the
- * "main thread" part of the RxPlayer logic.
- * @param {ContentPreparer} contentPreparer
- * @param {Object} contentInitData - Configuration wanted for the content to
- * load.
- * @param {Object} refs - Collection of so-called "references": values
- * configuring playback that may be updated at any time and that the
- * CoreEntry should react on.
- */
-function prepareNewContent(sendMessage, contentPreparer, contentInitData, refs) {
-    contentPreparer
-        .initializeNewContent(sendMessage, contentInitData, {
-        limitResolution: { video: refs.limitVideoResolution },
-        throttleBitrate: { video: refs.throttleVideoBitrate },
-    })
-        .then((manifest) => {
+function prepareNewContent(contentPreparer, contentInitData) {
+    contentPreparer.initializeNewContent(contentInitData).then((manifest) => {
         sendMessage({
-            type: "manifest-ready" /* CoreMessageType.ManifestReady */,
+            type: "manifest-ready" /* WorkerMessageType.ManifestReady */,
             contentId: contentInitData.contentId,
             value: { manifest },
         });
     }, (err) => {
         sendMessage({
-            type: "error" /* CoreMessageType.Error */,
+            type: "error" /* WorkerMessageType.Error */,
             contentId: contentInitData.contentId,
             value: formatErrorForSender(err),
         });
     });
 }
-function updateCoreReference(msg, refs) {
+function updateGlobalReference(msg) {
     switch (msg.value.name) {
         case "wantedBufferAhead":
-            refs.wantedBufferAhead.setValueIfChanged(msg.value.newVal);
+            wantedBufferAhead.setValueIfChanged(msg.value.newVal);
             break;
         case "maxVideoBufferSize":
-            refs.maxVideoBufferSize.setValueIfChanged(msg.value.newVal);
+            maxVideoBufferSize.setValueIfChanged(msg.value.newVal);
             break;
         case "maxBufferBehind":
-            refs.maxBufferBehind.setValueIfChanged(msg.value.newVal);
+            maxBufferBehind.setValueIfChanged(msg.value.newVal);
             break;
         case "maxBufferAhead":
-            refs.maxBufferAhead.setValueIfChanged(msg.value.newVal);
+            maxBufferAhead.setValueIfChanged(msg.value.newVal);
             break;
         case "limitVideoResolution":
-            refs.limitVideoResolution.setValueIfChanged(msg.value.newVal);
+            limitVideoResolution.setValueIfChanged(msg.value.newVal);
             break;
         case "throttleVideoBitrate":
-            refs.throttleVideoBitrate.setValueIfChanged(msg.value.newVal);
+            throttleVideoBitrate.setValueIfChanged(msg.value.newVal);
             break;
         default:
             assertUnreachable(msg.value);
     }
 }
-function loadPreparedContent(sendMessage, val, contentPreparer, playbackObservationRef, refs) {
+function loadPreparedContent(val, contentPreparer, playbackObservationRef) {
     log.debug("Core", "Loading pepared content.");
     const contentCanceller = new TaskCanceller();
     let currentLoadCanceller = null;
@@ -418,7 +382,7 @@ function loadPreparedContent(sendMessage, val, contentPreparer, playbackObservat
         currentLoadCanceller = new TaskCanceller();
         currentLoadCanceller.linkToSignal(contentCanceller.signal);
         /**
-         * Stores last discontinuity update sent to the Core for each Period and type
+         * Stores last discontinuity update sent to the worker for each Period and type
          * combinations, at least until the corresponding `PeriodStreamCleared`
          * message.
          *
@@ -430,7 +394,7 @@ function loadPreparedContent(sendMessage, val, contentPreparer, playbackObservat
         if (preparedContent === null || preparedContent.manifest === null) {
             const error = new OtherError("NONE", "Loading content when none is prepared");
             sendMessage({
-                type: "error" /* CoreMessageType.Error */,
+                type: "error" /* WorkerMessageType.Error */,
                 contentId: undefined,
                 value: formatErrorForSender(error),
             });
@@ -442,7 +406,7 @@ function loadPreparedContent(sendMessage, val, contentPreparer, playbackObservat
             synchronizeSegmentSinksOnObservation(observation, segmentSinksStore);
             const freezeResolution = preparedContent.freezeResolver.onNewObservation(observation);
             if (freezeResolution !== null) {
-                handleFreezeResolution(sendMessage, freezeResolution, {
+                handleFreezeResolution(freezeResolution, {
                     contentId,
                     manifest,
                     handleMediaSourceReload: performMediaSourceReload,
@@ -454,36 +418,36 @@ function loadPreparedContent(sendMessage, val, contentPreparer, playbackObservat
         if (initialPeriod === undefined) {
             const error = new MediaError("MEDIA_STARTING_TIME_NOT_FOUND", "Wanted starting time not found in the Manifest.");
             sendMessage({
-                type: "error" /* CoreMessageType.Error */,
+                type: "error" /* WorkerMessageType.Error */,
                 contentId,
                 value: formatErrorForSender(error),
             });
             throw error;
         }
-        const playbackObserver = new CorePlaybackObserver(playbackObservationRef, contentId, sendMessage, currentLoadCanceller.signal);
+        const playbackObserver = new WorkerPlaybackObserver(playbackObservationRef, contentId, sendMessage, currentLoadCanceller.signal);
         cmcdDataBuilder === null || cmcdDataBuilder === void 0 ? void 0 : cmcdDataBuilder.startMonitoringPlayback(playbackObserver);
         currentLoadCanceller.signal.register(() => {
             cmcdDataBuilder === null || cmcdDataBuilder === void 0 ? void 0 : cmcdDataBuilder.stopMonitoringPlayback();
         });
         const contentTimeBoundariesObserver = createContentTimeBoundariesObserver(manifest, mediaSource, playbackObserver, segmentSinksStore, {
             onWarning: (err) => sendMessage({
-                type: "warning" /* CoreMessageType.Warning */,
+                type: "warning" /* WorkerMessageType.Warning */,
                 contentId,
                 value: formatErrorForSender(err),
             }),
             onPeriodChanged: (period) => {
                 sendMessage({
-                    type: "active-period-changed" /* CoreMessageType.ActivePeriodChanged */,
+                    type: "active-period-changed" /* WorkerMessageType.ActivePeriodChanged */,
                     contentId,
                     value: { periodId: period.id },
                 });
             },
         }, currentLoadCanceller.signal);
         StreamOrchestrator({ initialPeriod, manifest }, playbackObserver, representationEstimator, segmentSinksStore, segmentQueueCreator, {
-            wantedBufferAhead: refs.wantedBufferAhead,
-            maxVideoBufferSize: refs.maxVideoBufferSize,
-            maxBufferAhead: refs.maxBufferAhead,
-            maxBufferBehind: refs.maxBufferBehind,
+            wantedBufferAhead,
+            maxVideoBufferSize,
+            maxBufferAhead,
+            maxBufferBehind,
             drmSystemId,
             enableFastSwitching,
             onCodecSwitch,
@@ -497,7 +461,7 @@ function loadPreparedContent(sendMessage, val, contentPreparer, playbackObservat
             return {
                 needsBufferFlush(payload) {
                     sendMessage({
-                        type: "needs-buffer-flush" /* CoreMessageType.NeedsBufferFlush */,
+                        type: "needs-buffer-flush" /* WorkerMessageType.NeedsBufferFlush */,
                         contentId,
                         value: payload,
                     });
@@ -534,7 +498,7 @@ function loadPreparedContent(sendMessage, val, contentPreparer, playbackObservat
                 },
                 lockedStream(payload) {
                     sendMessage({
-                        type: "locked-stream" /* CoreMessageType.LockedStream */,
+                        type: "locked-stream" /* WorkerMessageType.LockedStream */,
                         contentId,
                         value: {
                             periodId: payload.period.id,
@@ -550,7 +514,7 @@ function loadPreparedContent(sendMessage, val, contentPreparer, playbackObservat
                         return;
                     }
                     sendMessage({
-                        type: "adaptation-changed" /* CoreMessageType.AdaptationChanged */,
+                        type: "adaptation-changed" /* WorkerMessageType.AdaptationChanged */,
                         contentId,
                         value: {
                             adaptationId: (_b = (_a = value.adaptation) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : null,
@@ -567,7 +531,7 @@ function loadPreparedContent(sendMessage, val, contentPreparer, playbackObservat
                         return;
                     }
                     sendMessage({
-                        type: "representation-changed" /* CoreMessageType.RepresentationChanged */,
+                        type: "representation-changed" /* WorkerMessageType.RepresentationChanged */,
                         contentId,
                         value: {
                             adaptationId: value.adaptation.id,
@@ -579,14 +543,14 @@ function loadPreparedContent(sendMessage, val, contentPreparer, playbackObservat
                 },
                 inbandEvent(value) {
                     sendMessage({
-                        type: "inband-event" /* CoreMessageType.InbandEvent */,
+                        type: "inband-event" /* WorkerMessageType.InbandEvent */,
                         contentId,
                         value,
                     });
                 },
                 warning(value) {
                     sendMessage({
-                        type: "warning" /* CoreMessageType.Warning */,
+                        type: "warning" /* WorkerMessageType.Warning */,
                         contentId,
                         value: formatErrorForSender(value),
                     });
@@ -597,7 +561,7 @@ function loadPreparedContent(sendMessage, val, contentPreparer, playbackObservat
                     }
                     preparedContent.trackChoiceSetter.addTrackSetter(value.period.id, value.type, value.adaptationRef);
                     sendMessage({
-                        type: "period-stream-ready" /* CoreMessageType.PeriodStreamReady */,
+                        type: "period-stream-ready" /* WorkerMessageType.PeriodStreamReady */,
                         contentId,
                         value: { periodId: value.period.id, bufferType: value.type },
                     });
@@ -616,7 +580,7 @@ function loadPreparedContent(sendMessage, val, contentPreparer, playbackObservat
                     contentTimeBoundariesObserver.onPeriodCleared(value.type, value.period);
                     preparedContent.trackChoiceSetter.removeTrackSetter(value.period.id, value.type);
                     sendMessage({
-                        type: "period-stream-cleared" /* CoreMessageType.PeriodStreamCleared */,
+                        type: "period-stream-cleared" /* WorkerMessageType.PeriodStreamCleared */,
                         contentId,
                         value: { periodId: value.period.id, bufferType: value.type },
                     });
@@ -630,7 +594,7 @@ function loadPreparedContent(sendMessage, val, contentPreparer, playbackObservat
                     // Considering this is only for an unimportant undocumented API, we may
                     // throttle such messages. (e.g. max one per 2 seconds for each type?).
                     sendMessage({
-                        type: "bitrate-estimate-change" /* CoreMessageType.BitrateEstimateChange */,
+                        type: "bitrate-estimate-change" /* WorkerMessageType.BitrateEstimateChange */,
                         contentId,
                         value: {
                             bitrate: payload.bitrate,
@@ -643,7 +607,7 @@ function loadPreparedContent(sendMessage, val, contentPreparer, playbackObservat
                 },
                 needsDecipherabilityFlush() {
                     sendMessage({
-                        type: "needs-decipherability-flush" /* CoreMessageType.NeedsDecipherabilityFlush */,
+                        type: "needs-decipherability-flush" /* WorkerMessageType.NeedsDecipherabilityFlush */,
                         contentId,
                         value: null,
                     });
@@ -665,7 +629,7 @@ function loadPreparedContent(sendMessage, val, contentPreparer, playbackObservat
                             content.representation = content.representation.getMetadataSnapshot();
                         }
                         sendMessage({
-                            type: "encryption-data-encountered" /* CoreMessageType.EncryptionDataEncountered */,
+                            type: "encryption-data-encountered" /* WorkerMessageType.EncryptionDataEncountered */,
                             contentId,
                             value: {
                                 keyIds: value.keyIds,
@@ -678,7 +642,7 @@ function loadPreparedContent(sendMessage, val, contentPreparer, playbackObservat
                 },
                 error(error) {
                     sendMessage({
-                        type: "error" /* CoreMessageType.Error */,
+                        type: "error" /* WorkerMessageType.Error */,
                         contentId,
                         value: formatErrorForSender(error),
                     });
@@ -713,7 +677,7 @@ function loadPreparedContent(sendMessage, val, contentPreparer, playbackObservat
             };
             periodMap.set(value.bufferType, msgObj);
             sendMessage({
-                type: "discontinuity-update" /* CoreMessageType.DiscontinuityUpdate */,
+                type: "discontinuity-update" /* WorkerMessageType.DiscontinuityUpdate */,
                 contentId,
                 value: msgObj,
             });
@@ -736,7 +700,7 @@ function loadPreparedContent(sendMessage, val, contentPreparer, playbackObservat
             maximumPosition: payload.maximumPosition,
         });
         sendMessage({
-            type: "reloading-media-source" /* CoreMessageType.ReloadingMediaSource */,
+            type: "reloading-media-source" /* WorkerMessageType.ReloadingMediaSource */,
             mediaSourceId,
             value: payload,
         }, []);
@@ -752,7 +716,7 @@ function loadPreparedContent(sendMessage, val, contentPreparer, playbackObservat
             currentLoadCanceller = null;
         }
         const contentId = (_a = contentPreparer.getCurrentContent()) === null || _a === void 0 ? void 0 : _a.contentId;
-        contentPreparer.reloadMediaSource(sendMessage).then(() => {
+        contentPreparer.reloadMediaSource().then(() => {
             log.info("Core", "MediaSource Reloaded, loading content again", {
                 newInitialTime,
             });
@@ -763,7 +727,7 @@ function loadPreparedContent(sendMessage, val, contentPreparer, playbackObservat
                 return;
             }
             sendMessage({
-                type: "error" /* CoreMessageType.Error */,
+                type: "error" /* WorkerMessageType.Error */,
                 contentId,
                 value: formatErrorForSender(err),
             });
@@ -786,7 +750,7 @@ function updateLoggerLevel(logLevel, logFormat, sendBackLogs) {
             });
             // Not relying on `sendMessage` as it also logs
             postMessage({
-                type: "log" /* CoreMessageType.LogMessage */,
+                type: "log" /* WorkerMessageType.LogMessage */,
                 value: {
                     namespace,
                     logLevel: levelStr,
@@ -799,26 +763,23 @@ function updateLoggerLevel(logLevel, logFormat, sendBackLogs) {
 /**
  * Send a message `SegmentSinkStoreUpdate` to the main thread with
  * a serialized object that represents the segmentSinksStore state.
- * @param {Function} sendMessage - Function allowing to send messages to the
- * "main thread" part of the RxPlayer logic.
  * @param {ContentPreparer} contentPreparer
+ * @returns {void}
  */
-function sendSegmentSinksStoreInfos(sendMessage, contentPreparer, requestId) {
+function sendSegmentSinksStoreInfos(contentPreparer, requestId) {
     const currentContent = contentPreparer.getCurrentContent();
     if (currentContent === null) {
         return;
     }
     const segmentSinksMetrics = currentContent.segmentSinksStore.getSegmentSinksMetrics();
     sendMessage({
-        type: "segment-sink-store-update" /* CoreMessageType.SegmentSinkStoreUpdate */,
+        type: "segment-sink-store-update" /* WorkerMessageType.SegmentSinkStoreUpdate */,
         contentId: currentContent.contentId,
         value: { segmentSinkMetrics: segmentSinksMetrics, requestId },
     });
 }
 /**
  * Handle accordingly an `IFreezeResolution` object.
- * @param {Function} sendMessage - Function allowing to send messages to the
- * "main thread" part of the RxPlayer logic.
  * @param {Object|null} freezeResolution - The `IFreezeResolution` suggested.
  * @param {Object} param - Parameters that might be needed to implement the
  * resolution.
@@ -831,7 +792,7 @@ function sendSegmentSinksStoreInfos(sendMessage, contentPreparer, requestId) {
  * function is authorized to mark `Representation` as "to avoid" if the
  * `IFreezeResolution` object suggest it.
  */
-function handleFreezeResolution(sendMessage, freezeResolution, { contentId, manifest, handleMediaSourceReload, enableRepresentationAvoidance, }) {
+function handleFreezeResolution(freezeResolution, { contentId, manifest, handleMediaSourceReload, enableRepresentationAvoidance, }) {
     switch (freezeResolution.type) {
         case "reload": {
             log.info("Core", "Planning reload due to freeze");
@@ -845,7 +806,7 @@ function handleFreezeResolution(sendMessage, freezeResolution, { contentId, mani
         case "flush": {
             log.info("Core", "Flushing buffer due to freeze");
             sendMessage({
-                type: "needs-buffer-flush" /* CoreMessageType.NeedsBufferFlush */,
+                type: "needs-buffer-flush" /* WorkerMessageType.NeedsBufferFlush */,
                 contentId,
                 value: {
                     relativeResumingPosition: freezeResolution.value.relativeSeek,
@@ -876,11 +837,11 @@ function handleFreezeResolution(sendMessage, freezeResolution, { contentId, mani
  * @param {ContentPreparer} contentPreparer
  * @returns {void}
  */
-function sendThumbnailData(sendMessage, contentPreparer, msg) {
+function sendThumbnailData(contentPreparer, msg) {
     const preparedContent = contentPreparer.getCurrentContent();
     const respondWithError = (err) => {
         sendMessage({
-            type: "thumbnail-response" /* CoreMessageType.ThumbnailDataResponse */,
+            type: "thumbnail-response" /* WorkerMessageType.ThumbnailDataResponse */,
             contentId: msg.contentId,
             value: {
                 status: "error",
@@ -896,7 +857,7 @@ function sendThumbnailData(sendMessage, contentPreparer, msg) {
     }
     getThumbnailData(preparedContent.fetchThumbnailData, preparedContent.manifest, msg.value.periodId, msg.value.thumbnailTrackId, msg.value.time).then((result) => {
         sendMessage({
-            type: "thumbnail-response" /* CoreMessageType.ThumbnailDataResponse */,
+            type: "thumbnail-response" /* WorkerMessageType.ThumbnailDataResponse */,
             contentId: msg.contentId,
             value: {
                 status: "success",