Skip to content

refactor: replace global dashjs.FactoryMaker with ES6 imports #4890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 17, 2025
Merged

refactor: replace global dashjs.FactoryMaker with ES6 imports #4890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/mss/MssHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import MssParser from './parser/MssParser.js';
import MssErrors from './errors/MssErrors.js';
import DashJSError from '../streaming/vo/DashJSError.js';
import {HTTPRequest} from '../streaming/vo/metrics/HTTPRequest.js';
import FactoryMaker from '../core/FactoryMaker.js';

function MssHandler(config) {

Expand Down Expand Up @@ -206,10 +207,10 @@ function MssHandler(config) {
}

function registerEvents() {
eventBus.on(events.INIT_FRAGMENT_NEEDED, onInitFragmentNeeded, instance, { priority: dashjs.FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH });
eventBus.on(events.PLAYBACK_PAUSED, onPlaybackPaused, instance, { priority: dashjs.FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH });
eventBus.on(events.PLAYBACK_SEEKING, onPlaybackSeeking, instance, { priority: dashjs.FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH });
eventBus.on(events.FRAGMENT_LOADING_COMPLETED, onSegmentMediaLoaded, instance, { priority: dashjs.FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH });
eventBus.on(events.INIT_FRAGMENT_NEEDED, onInitFragmentNeeded, instance, { priority: FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH });
eventBus.on(events.PLAYBACK_PAUSED, onPlaybackPaused, instance, { priority: FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH });
eventBus.on(events.PLAYBACK_SEEKING, onPlaybackSeeking, instance, { priority: FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH });
eventBus.on(events.FRAGMENT_LOADING_COMPLETED, onSegmentMediaLoaded, instance, { priority: FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH });
eventBus.on(events.TTML_TO_PARSE, onTTMLPreProcess, instance);
}

Expand Down Expand Up @@ -247,7 +248,7 @@ function MssHandler(config) {
}

MssHandler.__dashjs_factory_name = 'MssHandler';
const factory = dashjs.FactoryMaker.getClassFactory(MssHandler);
const factory = FactoryMaker.getClassFactory(MssHandler);
factory.errors = MssErrors;
dashjs.FactoryMaker.updateClassFactory(MssHandler.__dashjs_factory_name, factory);
FactoryMaker.updateClassFactory(MssHandler.__dashjs_factory_name, factory);
export default factory;
3 changes: 2 additions & 1 deletion src/offline/OfflineStreamProcessor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import FragmentModel from '../streaming/models/FragmentModel.js';
import FragmentLoader from '../streaming/FragmentLoader.js';
import URLUtils from '../streaming/utils/URLUtils.js';
import SegmentsController from '../dash/controllers/SegmentsController.js';
import FactoryMaker from '../core/FactoryMaker.js';

function OfflineStreamProcessor(config) {

Expand Down Expand Up @@ -379,5 +380,5 @@ function OfflineStreamProcessor(config) {
}

OfflineStreamProcessor.__dashjs_factory_name = 'OfflineStreamProcessor';
const factory = dashjs.FactoryMaker.getClassFactory(OfflineStreamProcessor);
const factory = FactoryMaker.getClassFactory(OfflineStreamProcessor);
export default factory;
5 changes: 3 additions & 2 deletions src/offline/controllers/OfflineController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import OfflineUrlUtils from '../utils/OfflineUrlUtils.js';
import OfflineEvents from '../events/OfflineEvents.js';
import OfflineErrors from '../errors/OfflineErrors.js';
import OfflineRecord from '../vo/OfflineDownloadVo.js';
import FactoryMaker from '../../core/FactoryMaker.js';

/**
* @module OfflineController
Expand Down Expand Up @@ -383,8 +384,8 @@ function OfflineController(config) {
}

OfflineController.__dashjs_factory_name = 'OfflineController';
const factory = dashjs.FactoryMaker.getClassFactory(OfflineController);
const factory = FactoryMaker.getClassFactory(OfflineController);
factory.events = OfflineEvents;
factory.errors = OfflineErrors;
dashjs.FactoryMaker.updateClassFactory(OfflineController.__dashjs_factory_name, factory);
FactoryMaker.updateClassFactory(OfflineController.__dashjs_factory_name, factory);
export default factory;
3 changes: 2 additions & 1 deletion src/offline/net/IndexDBOfflineLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
import IndexDBStore from '../storage/IndexDBStore.js';
import FactoryMaker from '../../core/FactoryMaker.js';

function IndexDBOfflineLoader(config) {
config = config || {};
Expand Down Expand Up @@ -100,5 +101,5 @@ function IndexDBOfflineLoader(config) {
}

IndexDBOfflineLoader.__dashjs_factory_name = 'IndexDBOfflineLoader';
const factory = dashjs.FactoryMaker.getClassFactory(IndexDBOfflineLoader);
const factory = FactoryMaker.getClassFactory(IndexDBOfflineLoader);
export default factory;
5 changes: 3 additions & 2 deletions src/streaming/metrics/MetricsReporting.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import MetricsReportingEvents from './MetricsReportingEvents.js';
import MetricsCollectionController from './controllers/MetricsCollectionController.js';
import MetricsHandlerFactory from './metrics/MetricsHandlerFactory.js';
import ReportingFactory from './reporting/ReportingFactory.js';
import FactoryMaker from '../../core/FactoryMaker.js';

function MetricsReporting() {

Expand Down Expand Up @@ -83,7 +84,7 @@ function MetricsReporting() {
}

MetricsReporting.__dashjs_factory_name = 'MetricsReporting';
const factory = dashjs.FactoryMaker.getClassFactory(MetricsReporting);
const factory = FactoryMaker.getClassFactory(MetricsReporting);
factory.events = MetricsReportingEvents;
dashjs.FactoryMaker.updateClassFactory(MetricsReporting.__dashjs_factory_name, factory);
FactoryMaker.updateClassFactory(MetricsReporting.__dashjs_factory_name, factory);
export default factory;
5 changes: 3 additions & 2 deletions src/streaming/protection/Protection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import ProtectionErrors from './errors/ProtectionErrors.js';
import DefaultProtectionModel from './models/DefaultProtectionModel.js';
import ProtectionModel_3Feb2014 from './models/ProtectionModel_3Feb2014.js';
import ProtectionModel_01b from './models/ProtectionModel_01b.js';
import FactoryMaker from '../../core/FactoryMaker.js';

const APIS_ProtectionModel_01b = [
// Un-prefixed as per spec
Expand Down Expand Up @@ -200,8 +201,8 @@ function Protection() {
}

Protection.__dashjs_factory_name = 'Protection';
const factory = dashjs.FactoryMaker.getClassFactory(Protection);
const factory = FactoryMaker.getClassFactory(Protection);
factory.events = ProtectionEvents;
factory.errors = ProtectionErrors;
dashjs.FactoryMaker.updateClassFactory(Protection.__dashjs_factory_name, factory);
FactoryMaker.updateClassFactory(Protection.__dashjs_factory_name, factory);
export default factory;