@antmedia/web_player 2.11.2 → 2.11.11

package/test/embedded-player.test.js

@@ -22,7 +22,7 @@ describe("WebPlayer", function() {
 	  sandbox.restore();
 	});
 	
-	 it("Check default parameters", async function() {
+	 it("check-default-parameters", async function() {
 		
 		
 		  var videoContainer = document.createElement("video_container");
@@ -79,10 +79,10 @@ describe("WebPlayer", function() {
 
 		var player = new WebPlayer(windowComponent, videoContainer, placeHolder);
 
-		expect(player.websocketURL).to.be.equal('wss://example.com/stream123.webrtc');
+		expect(player.websocketBaseURL).to.be.equal('wss://example.com/');
 	});
     
-    it("Check url parameters", async function() {
+    it("check-url-parameters", async function() {
 		
 		  var videoContainer = document.createElement("video_container");
 		  
@@ -119,7 +119,9 @@ describe("WebPlayer", function() {
 	      expect(player.iceConnected).to.false;
 	      expect(player.errorCalled).to.false;
 
-		  expect(player.websocketURL).to.be.equal('ws://example.com/stream123.webrtc');
+		  expect(player.websocketBaseURL).to.be.equal('ws://example.com/');
+		  var fullWebSocketBaseUrl = player.getWebsocketURLForStream(player.streamId);
+		  expect(fullWebSocketBaseUrl).to.be.equal('ws://example.com/stream123.webrtc');
 		  expect(player.httpBaseURL).to.be.equal('http://example.com/');
 	      expect(player.getSecurityQueryParams()).to.be.equal("&token="+token+"&subscriberId="+subscriberId+"&subscriberCode="+subscriberCode);      
     
@@ -135,14 +137,14 @@ describe("WebPlayer", function() {
 
 			player = new WebPlayer(windowComponent, videoContainer, placeHolder);
 
-			expect(player.websocketURL).to.be.equal('ws://example.com/stream123.webrtc');
+			expect(player.websocketBaseURL).to.be.equal('ws://example.com/');
 			expect(player.httpBaseURL).to.be.equal('http://example.com/');
 
 
 		  }
     });
     
-    it("CheckConfigParameters", async function(){
+    it("check-config-parameters", async function(){
 	        
         var videoContainer = document.createElement("video_container");
 		  
@@ -209,7 +211,9 @@ describe("WebPlayer", function() {
 		
 		expect(player.httpBaseURL).to.be.equal('http://example.antmedia.io:5080/WebRTCAppEE/');
 		
-		expect(player.websocketURL).to.be.equal('ws://example.antmedia.io:5080/WebRTCAppEE/streamConfig123.webrtc');
+		expect(player.websocketBaseURL).to.be.equal('ws://example.antmedia.io:5080/WebRTCAppEE/');
+		var fullWebSocketUrl = player.getWebsocketURLForStream(player.streamId);
+		expect(fullWebSocketUrl).to.be.equal('ws://example.antmedia.io:5080/WebRTCAppEE/streamConfig123.webrtc');
 		
 	});
 	
@@ -421,7 +425,7 @@ describe("WebPlayer", function() {
 		  
 		var placeHolder = document.createElement("place_holder");
 		  			
-		var locationComponent =  { href : 'http://example.com?id=stream123', search: "?id=stream123", pathname:"/" , protocol:"http:"};
+		var locationComponent =  { href : 'http://example.com?id=stream123&backupStreamId=backup123', search: "?id=stream123&backupStreamId=backup123", pathname:"/" , protocol:"http:"};
 		var windowComponent = { location : locationComponent,
 		  						  document:  document};
 		 	      
@@ -435,30 +439,63 @@ describe("WebPlayer", function() {
 	    player.playOrder = ["webrtc","hls"];
 	    player.currentPlayType = "webrtc";
 	    
+		expect(player.streamId).to.be.equal("stream123");
+		expect(player.backupStreamId).to.be.equal("backup123");
+
 	    player.tryNextTech();
 	    
-	    
-	    
 	    expect(destroyDashPlayer.calledOnce).to.be.true;
 	    expect(destroyVideoJSPlayer.calledOnce).to.be.true;
 	    expect(setPlayerVisible.calledOnce).to.be.true;
-	     expect(setPlayerVisible.calledWithMatch(false)).to.be.true;
+	    expect(setPlayerVisible.calledWithMatch(false)).to.be.true;
 	    
 	    clock.tick(2500);
 	    
 	    expect(playIfExists.calledOnce).to.be.false;
 	    
-	    clock.tick(3500);
-	    
+	    clock.tick(1500);
+	    //4 seconds passed
+
+		
 	    expect(playIfExists.calledOnce).to.be.true;
-	    expect(playIfExists.calledWithMatch("hls")).to.be.true;
+		//it should call with webrtc, backup stream
+	    expect(playIfExists.calledWithMatch("webrtc", "backup123")).to.be.true;
+
+		player.currentPlayType = "webrtc";
+
+		player.tryNextTech();
+		
+		clock.tick(3500);
+
+		expect(playIfExists.callCount).to.be.equal(2);
+		//it should call with other tech hls and original stream
+		expect(playIfExists.calledWithMatch("hls", "stream123")).to.be.true;
 	    
+
+		player.currentPlayType = "hls";
+
+		player.tryNextTech();
+		
+		clock.tick(3500);
+		expect(playIfExists.callCount).to.be.equal(3);
+		//it should call with hls and backup stream
+		expect(playIfExists.calledWithMatch("hls", "backup123")).to.be.true;
+
+
 	    player.currentPlayType = "hls";
 	    
 	    player.tryNextTech();
 	    clock.tick(3500);
-	    expect(playIfExists.callCount).to.be.equal(2);
-	    expect(playIfExists.calledWithMatch("webrtc")).to.be.true;
+	    expect(playIfExists.callCount).to.be.equal(4);
+		//it should call with webrtc and original stream again
+	    expect(playIfExists.calledWithMatch("webrtc", "stream123")).to.be.true;
+
+		player.currentPlayType = "hls";
+		player.tryNextTech();
+	    clock.tick(3500);
+		expect(playIfExists.callCount).to.be.equal(5);
+		//it should call with webrtc and  backup stream
+	    expect(playIfExists.calledWithMatch("webrtc", "backup123")).to.be.true;
 
 	});
 	
@@ -596,8 +633,9 @@ describe("WebPlayer", function() {
 		var videoContainer = document.createElement("video_container");
 		  
 		var placeHolder = document.createElement("place_holder");
-		  			
-		var locationComponent =  { href : 'http://example.com?id=stream123', search: "?id=stream123",  pathname: "/", 
+		  	
+		var streamId = "stream123";
+		var locationComponent =  { href : 'http://example.com?id=stream123', search: "?id="+streamId,  pathname: "/", 
 									hostname:"example.com", port:5080,
 									protocol:"http:" };
 		var windowComponent = {  location : locationComponent,
@@ -608,7 +646,7 @@ describe("WebPlayer", function() {
 		var player = new WebPlayer(windowComponent, videoContainer, placeHolder);
 		var playWithVideoJS = sinon.replace(player, "playWithVideoJS", sinon.fake());
 		
-		await player.playIfExists("webrtc");	
+		await player.playIfExists("webrtc", streamId);	
 		expect(playWithVideoJS.callCount).to.be.equal(1);
 		expect(playWithVideoJS.calledWithExactly("ws://example.com:5080/stream123.webrtc", "webrtc")).to.be.true;
 		
@@ -640,7 +678,7 @@ describe("WebPlayer", function() {
 		expect(setPlayerVisible.called).to.be.true;
 		expect(setPlayerVisible.calledWithMatch(false)).to.be.true;
 		
-		await player.playIfExists("webrtc");	
+		await player.playIfExists("webrtc", player.streamId);	
 		expect(playWithVideoJS.callCount).to.be.equal(2);
 		expect(playWithVideoJS.calledWithMatch("ws://example.com:5080/stream123.webrtc", "webrtc")).to.be.true;
 		
@@ -648,7 +686,7 @@ describe("WebPlayer", function() {
 		
 		var playWithVideoJS = sinon.replace(player, "playWithVideoJS", sinon.fake());
 		sinon.replace(player, "checkStreamExistsViaHttp", sinon.fake.returns(Promise.resolve("streams/stream123.mp4")));
-		await player.playIfExists("vod");
+		await player.playIfExists("vod", player.streamId);
 		
 		expect(playWithVideoJS.callCount).to.be.equal(1);
 		expect(playWithVideoJS.calledWithMatch("streams/stream123.mp4", "mp4")).to.be.true;
@@ -658,7 +696,7 @@ describe("WebPlayer", function() {
 		var playViaDash = sinon.replace(player, "playViaDash", sinon.fake());
 		sinon.replace(player, "checkStreamExistsViaHttp", sinon.fake.returns(Promise.resolve("streams/stream123/stream123.mpd")));
 		
-		await player.playIfExists("dash");
+		await player.playIfExists("dash", player.streamId);
 		expect(playViaDash.callCount).to.be.equal(1);
 		expect(playViaDash.calledWithMatch("streams/stream123/stream123.mpd")).to.be.true;
 		
@@ -669,14 +707,14 @@ describe("WebPlayer", function() {
 		sinon.replace(player, "checkStreamExistsViaHttp", sinon.fake.returns(Promise.reject("")));
 		var playWithVideoJS = sinon.replace(player, "playWithVideoJS", sinon.fake());
 		
-		await player.playIfExists("hls");
+		await player.playIfExists("hls", player.streamId);
 		expect(tryNextTech.callCount).to.be.equal(1);
 		
 		
-		await player.playIfExists("dash");
+		await player.playIfExists("dash", player.streamId);
 		expect(tryNextTech.callCount).to.be.equal(2);
 		
-		await player.playIfExists("vod");
+		await player.playIfExists("vod", player.streamId);
 		//because it will not tryNextTech if promises fails
 		expect(tryNextTech.callCount).to.be.equal(2);
 		
@@ -701,7 +739,7 @@ describe("WebPlayer", function() {
 	    var checkStreamExistsViaHttp = sinon.replace(player, "checkStreamExistsViaHttp", sinon.fake.returns(Promise.resolve("streams/stream123.mp4")));
 	    var playWithVideoJS = sinon.replace(player, "playWithVideoJS", sinon.fake());
 	    
-	    await player.playIfExists("vod");
+	    await player.playIfExists("vod", player.streamId);
 	    
 	    expect(checkStreamExistsViaHttp.calledWithMatch(WebPlayer.STREAMS_FOLDER, "stream123.mp4", "")).to.be.true;
 	    expect(playWithVideoJS.calledWithMatch("streams/stream123.mp4", "mp4")).to.be.true;
@@ -718,7 +756,7 @@ describe("WebPlayer", function() {
 	    checkStreamExistsViaHttp = sinon.replace(player2, "checkStreamExistsViaHttp", sinon.fake.returns(Promise.resolve("")));
 	    expect(player2.playType[0]).to.be.equal("mp4");
 	    
-	    player2.playIfExists("vod");
+	    player2.playIfExists("vod", player2.streamId);
 	    
 	    expect(checkStreamExistsViaHttp.calledWithMatch(WebPlayer.STREAMS_FOLDER, "stream123", "mp4")).to.be.true;
 	    		
@@ -1026,13 +1064,83 @@ describe("WebPlayer", function() {
 		var checkStreamExistsViaHttp = sinon.replace(player, "checkStreamExistsViaHttp", sinon.fake.resolves(streamPath));
 		var playWithVideoJS = sinon.replace(player, "playWithVideoJS", sinon.fake());
 
-		await player.playIfExists("ll-hls");
+		await player.playIfExists("ll-hls", streamId);
 
 		expect(checkStreamExistsViaHttp.calledWithMatch(WebPlayer.STREAMS_FOLDER + "/" + WebPlayer.LL_HLS_FOLDER, streamId, WebPlayer.HLS_EXTENSION)).to.be.true;
 		expect(playWithVideoJS.calledWithMatch(streamPath, WebPlayer.HLS_EXTENSION)).to.be.true;
 	});
 	
+	it("Player events", async function() {
+		this.timeout(10000)
+		var videoContainer = document.createElement("video_container");
+		  
+		var placeHolder = document.createElement("place_holder");
+		  			
+		var locationComponent =  { href : 'http://example.com?id=stream123', search: "?id=stream123",  protocol:"http:", pathname: "/", hostname:"example.com", port:5080 };
+		var windowComponent = {  location : locationComponent,
+		  						  document:  document,
+		  						  };
+		  						  			  
+		var player = new WebPlayer(windowComponent, videoContainer, placeHolder);
+	 
+	    var setPlayerVisible = sinon.replace(player, "setPlayerVisible", sinon.fake());
+		
+		// Mock videojsPlayer
+		player.videojsPlayer = {
+			on: sinon.stub(),
+			currentTime: sinon.stub().returns(10),
+			bufferedPercent: sinon.stub().returns(0.5),
+			volume: sinon.stub().returns(0.8),
+			muted: sinon.stub().returns(false),
+			playbackRate: sinon.stub().returns(1.0),
+		};
+		
+		player.playerListener = sinon.stub();
+		
+		player.tryNextTech = sinon.stub();
+		
+		player.listenPlayerEvents();
+		
+		player.playerEvents.forEach(event => {
+		  expect(player.videojsPlayer.on.calledWith(event)).to.be.true;
+		});
+		
+		const playCallback = player.videojsPlayer.on.args.find(arg => arg[0] === 'play')[1];
+		playCallback();
+		expect(setPlayerVisible.calledWith(true)).to.be.true;
+		expect(player.playerListener.calledWith("play")).to.be.true;
+		
+		const endedCallback = player.videojsPlayer.on.args.find(arg => arg[0] === 'ended')[1];
+		endedCallback();
+		expect(setPlayerVisible.calledWith(false)).to.be.true;
+		expect(player.playerListener.calledWith("ended")).to.be.true;
+
+		const pauseCallback = player.videojsPlayer.on.args.find(arg => arg[0] === 'pause')[1];
+		pauseCallback();
+		expect(player.playerListener.calledWith("pause")).to.be.true;
+
+		const errorCallback = player.videojsPlayer.on.args.find(arg => arg[0] === 'error')[1];
+		const errorEventData = { code: 4 };
+		errorCallback(errorEventData);
+		expect(player.playerListener.calledWith("error", errorEventData)).to.be.true;
+
+		const timeUpdateCallback = player.videojsPlayer.on.args.find(arg => arg[0] === 'timeupdate')[1];
+		timeUpdateCallback();
+		expect(player.playerListener.calledWith('timeupdate', sinon.match.any, { currentTime: 10 })).to.be.true;
+	
+		const progressCallback = player.videojsPlayer.on.args.find(arg => arg[0] === 'progress')[1];
+		progressCallback();
+		expect(player.playerListener.calledWith('progress', sinon.match.any, { bufferedPercent: 0.5 })).to.be.true;
 	
+		const volumeChangeCallback = player.videojsPlayer.on.args.find(arg => arg[0] === 'volumechange')[1];
+		volumeChangeCallback();
+		expect(player.playerListener.calledWith('volumechange', sinon.match.any, { volume: 0.8, muted: false })).to.be.true;
+	
+		const rateChangeCallback = player.videojsPlayer.on.args.find(arg => arg[0] === 'ratechange')[1];
+		rateChangeCallback();
+		expect(player.playerListener.calledWith('ratechange', sinon.match.any, { playbackRate: 1.0 })).to.be.true;
+		
+	})
     
     
 });

package/dist/es/videojs-webrtc-plugin-f56e1f9e.js

@@ -1,3 +0,0 @@
-var videojsWebrtcPlugin = "/*! @name @antmedia/videojs-webrtc-plugin @version 1.3.1 @license MIT */\n.vjs-custom-spinner{position:absolute;top:50%;transform:translateY(-50%) translateX(-50%);left:50%;width:80px;height:80px}.vjs-custom-spinner:after{content:\" \";display:block;width:64px;height:64px;margin:8px;border-radius:50%;border:6px solid #fff;border-color:#fff transparent;animation:vjs-spinner-spin 1.1s cubic-bezier(.6,.2,0,.8) infinite,vjs-spinner-fade 1.1s linear infinite}";
-
-export { videojsWebrtcPlugin as default };