fix(FEC-10806): playlist has limitation which configure cause setMedia (

#390) Issue: setMedia called before plugins initialize. Solution: split the configure for one without sources and another one after with sources, as we do for sources as well.
kaltura · Dec 27, 2020 · c5caeda · c5caeda
1 parent bfa458b
commit c5caeda
Show file tree

Hide file tree

Showing 3 changed files with 87 additions and 5 deletions.
diff --git a/src/common/playlist/playlist.js b/src/common/playlist/playlist.js
@@ -18,9 +18,9 @@ class Playlist {
   }
 
   configure(config: KPPlaylistObject, sourcesOptions: ?PKMediaSourceOptionsObject) {
-    this._id = config.id;
-    this._poster = config.poster;
-    this._metadata = config.metadata;
+    this._id = config.id ? config.id : this._id;
+    this._poster = config.poster ? config.poster : this._poster;
+    this._metadata = config.metadata ? config.metadata : this._metadata;
     if (config.items) {
       this._items = [];
       config.items.forEach(item => {

diff --git a/src/kaltura-player.js b/src/kaltura-player.js
@@ -75,8 +75,10 @@ class KalturaPlayer extends FakeEventTarget {
     this._playlistManager = new PlaylistManager(this, options);
     Object.values(CoreEventType).forEach(coreEvent => this._eventManager.listen(this._localPlayer, coreEvent, e => this.dispatchEvent(e)));
     this._addBindings();
-    this._playlistManager.configure(options.playlist);
+    this._playlistManager.configure(Utils.Object.mergeDeep({}, options.playlist, {items: null}));
     this.configure({plugins});
+    //configure sources after configure finished for all components - making sure all we'll set up correctly
+    this._playlistManager.configure({items: (options.playlist && options.playlist.items) || []});
     this._localPlayer.configure({sources: sources || {}});
   }
 

diff --git a/test/src/kaltura-player.spec.js b/test/src/kaltura-player.spec.js
@@ -7,7 +7,7 @@ import ColorsPlugin from './common/plugin/test-plugins/colors-plugin';
 import NumbersPlugin from './common/plugin/test-plugins/numbers-plugin';
 import {KalturaPlayer as Player} from '../../src/kaltura-player';
 import SourcesConfig from './configs/sources';
-import {FakeEvent, Utils} from '@playkit-js/playkit-js';
+import {EventType as CoreEventType, FakeEvent, Utils, EventManager} from '@playkit-js/playkit-js';
 import AsyncResolvePlugin from './common/plugin/test-plugins/async-resolve-plugin';
 import AsyncRejectPlugin from './common/plugin/test-plugins/async-reject-plugin';
 import {Provider} from 'playkit-js-providers';
@@ -626,6 +626,86 @@ describe('kaltura player api', function () {
         }
       });
     });
+
+    it('should create the plugin before playlist source selected', function () {
+      const eventManager = new EventManager();
+      player = new Player({
+        ui: {},
+        provider: {},
+        playlist: {
+          id: '1234',
+          metdata: {},
+          items: [
+            {
+              sources: SourcesConfig.Mp4
+            }
+          ]
+        },
+        plugins: {
+          numbers: {
+            size: 2,
+            firstCellValue: 3
+          }
+        }
+      });
+      eventManager.listen(player, CoreEventType.SOURCE_SELECTED, () => {
+        player._pluginManager.get('numbers').should.exist;
+        Object.keys(player._pluginManager._plugins).length.should.equals(1);
+        player.config.plugins.should.deep.equals({
+          numbers: {
+            size: 2,
+            firstCellValue: 3,
+            lastCellValue: 6
+          }
+        });
+      });
+    });
+
+    it('should create player with plugin and fail to configure other plugin after playlist source selected', function () {
+      player = new Player({
+        ui: {},
+        provider: {},
+        playlist: {
+          id: '1234',
+          metdata: {},
+          items: [
+            {
+              sources: SourcesConfig.Mp4
+            }
+          ]
+        },
+        plugins: {
+          numbers: {
+            size: 2,
+            firstCellValue: 3
+          }
+        }
+      });
+      player._pluginManager.get('numbers').should.exist;
+      Object.keys(player._pluginManager._plugins).length.should.equals(1);
+      player.config.plugins.should.deep.equals({
+        numbers: {
+          size: 2,
+          firstCellValue: 3,
+          lastCellValue: 6
+        }
+      });
+      player.configure({
+        plugins: {
+          colors: {
+            size: 200
+          }
+        }
+      });
+      Object.keys(player._pluginManager._plugins).length.should.equals(1);
+      player.config.plugins.should.deep.equals({
+        numbers: {
+          size: 2,
+          firstCellValue: 3,
+          lastCellValue: 6
+        }
+      });
+    });
   });
 
   describe('async plugins loading', () => {