ovenplayer 0.10.2 → 0.10.3-3.alpha-2

package/src/js/api/provider/html5/providers/WebRTCLoader.js

@@ -9,19 +9,30 @@ import {
     PLAYER_WEBRTC_SET_LOCAL_DESC_ERROR,
     PLAYER_WEBRTC_NETWORK_SLOW,
     PLAYER_WEBRTC_UNEXPECTED_DISCONNECT,
-    OME_P2P_MODE
+    PLAYER_WEBRTC_INTERNAL_ERROR,
+    OME_P2P_MODE,
+    CONTENT_LEVEL_CHANGED,
+    PEER_CONNECTION_PREPARED
 } from "api/constants";
+import sizeHumanizer from "../../../../utils/sizeHumanizer";
+import {PEER_CONNECTION_DESTROYED} from "../../../constants";
 
 
-const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigger, playerConfig) {
+const WebRTCLoader = function (provider,
+                               webSocketUrl,
+                               loadCallback,
+                               connectedCallback,
+                               internalErrorCallback,
+                               errorTrigger,
+                               playerConfig,
+                               spec) {
 
     let defaultConnectionConfig = {};
 
     let that = {};
 
     let ws = null;
-
-    let wsPing = null;
+    let wsConnected = false;
 
     let mainStream = null;
 
@@ -34,12 +45,15 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
     //closed websocket by ome or client.
     let wsClosedByPlayer = false;
 
-    let recorverPacketLoss = false;
+    let recoverPacketLoss = false;
+
+    let playlistFromOme = null;
+    let autoQuality = false;
 
     if (playerConfig.getConfig().webrtcConfig &&
-        playerConfig.getConfig().webrtcConfig.recorverPacketLoss === true) {
+        playerConfig.getConfig().webrtcConfig.recoverPacketLoss === true) {
 
-        recorverPacketLoss = true;
+        recoverPacketLoss = true;
     }
 
     let generatePublicCandidate = true;
@@ -54,8 +68,10 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
 
     let currentBrowser = analUserAgent();
 
+    let existingHandler = null;
+
     (function () {
-        let existingHandler = window.onbeforeunload;
+        existingHandler = window.onbeforeunload;
         window.onbeforeunload = function (event) {
             if (existingHandler) {
                 existingHandler(event);
@@ -65,6 +81,7 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
         }
     })();
 
+
     function getPeerConnectionById(id) {
 
         let peerConnection = null;
@@ -163,7 +180,7 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
     // return opus format number
     function getOpusFormatNumber(sdp) {
 
-        const lines = sdp.split('\n');
+        const lines = sdp.split('\r\n');
         let opusFormatNumber = -1;
 
         for (let i = 0; i < lines.length - 1; i++) {
@@ -182,7 +199,7 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
 
     function checkOpusIsStereo(sdp, opusFormatNumber) {
 
-        const lines = sdp.split('\n');
+        const lines = sdp.split('\r\n');
 
         let stereo = false;
 
@@ -205,7 +222,7 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
 
     function mungeSdpForceStereoOpus(sdp, opusFormatNumber) {
 
-        const lines = sdp.split('\n');
+        const lines = sdp.split('\r\n');
 
         // find this line and modify. "a=fmtp:102 minptime=10;useinbandfec=1"
         for (let i = 0; i < lines.length - 1; i++) {
@@ -221,10 +238,10 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
             }
         }
 
-        return lines.join('\n');
+        return lines.join('\r\n');
     }
 
-    function createMainPeerConnection(id, peerId, sdp, candidates, iceServers, resolve) {
+    function createMainPeerConnection(id, peerId, sdp, candidates, iceServers) {
 
         let peerConnectionConfig = {};
 
@@ -276,7 +293,7 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
                     }
                 }
 
-                regIceServer.username = iceServer.user_name;
+                regIceServer.username = iceServer.username || iceServer.user_name;
                 regIceServer.credential = iceServer.credential;
 
                 peerConnectionConfig.iceServers.push(regIceServer);
@@ -292,7 +309,19 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
 
         OvenPlayerConsole.log("Main Peer Connection Config : ", peerConnectionConfig);
 
-        let peerConnection = new RTCPeerConnection(peerConnectionConfig);
+        let peerConnection = null;
+
+        try {
+
+            peerConnection = new RTCPeerConnection(peerConnectionConfig);
+            provider.trigger(PEER_CONNECTION_PREPARED, peerConnection);
+
+        } catch (error) {
+            let tempError = ERRORS.codes[PLAYER_WEBRTC_INTERNAL_ERROR];
+            tempError.error = error;
+            closePeer(tempError);
+            return;
+        }
 
         mainPeerConnectionInfo = {
             id: id,
@@ -301,56 +330,54 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
         };
 
         //Set remote description when I received sdp from server.
-        peerConnection.setRemoteDescription(new RTCSessionDescription(sdp))
-            .then(function () {
+        peerConnection.setRemoteDescription(new RTCSessionDescription(sdp)).then(function () {
 
-                peerConnection.createAnswer()
-                    .then(function (desc) {
+            peerConnection.createAnswer().then(function (desc) {
 
-                        const opusFormatNumber = getOpusFormatNumber(sdp.sdp);
+                const opusFormatNumber = getOpusFormatNumber(sdp.sdp);
 
-                        if (opusFormatNumber > -1) {
+                if (opusFormatNumber > -1) {
 
-                            if (checkOpusIsStereo(sdp.sdp, opusFormatNumber)) {
+                    if (checkOpusIsStereo(sdp.sdp, opusFormatNumber)) {
 
-                                //If offer has opus and if it is stereo, munge local sdp to force stereo=1
-                                //Thanks to community https://github.com/AirenSoft/OvenMediaEngine/issues/203
-                                desc.sdp = mungeSdpForceStereoOpus(desc.sdp, opusFormatNumber);
-                            }
-                        }
+                        //If offer has opus and if it is stereo, munge local sdp to force stereo=1
+                        //Thanks to community https://github.com/AirenSoft/OvenMediaEngine/issues/203
+                        desc.sdp = mungeSdpForceStereoOpus(desc.sdp, opusFormatNumber);
+                    }
+                }
 
-                        OvenPlayerConsole.log("create Host Answer : success");
+                OvenPlayerConsole.log('Local SDP', desc);
 
-                        peerConnection.setLocalDescription(desc).then(function () {
-                            // my SDP created.
-                            let localSDP = peerConnection.localDescription;
-                            OvenPlayerConsole.log('Local SDP', localSDP);
+                sendMessage(ws, {
+                    id: id,
+                    peer_id: peerId,
+                    command: 'answer',
+                    sdp: desc
+                });
 
-                            sendMessage(ws, {
-                                id: id,
-                                peer_id: peerId,
-                                command: 'answer',
-                                sdp: localSDP
-                            });
+                OvenPlayerConsole.log("create Host Answer : success");
 
-                        }).catch(function (error) {
+                peerConnection.setLocalDescription(desc).then(function () {
 
-                            let tempError = ERRORS.codes[PLAYER_WEBRTC_SET_LOCAL_DESC_ERROR];
-                            tempError.error = error;
-                            closePeer(tempError);
-                        });
-                    })
-                    .catch(function (error) {
-                        let tempError = ERRORS.codes[PLAYER_WEBRTC_CREATE_ANSWER_ERROR];
-                        tempError.error = error;
-                        closePeer(tempError);
-                    });
-            })
-            .catch(function (error) {
-                let tempError = ERRORS.codes[PLAYER_WEBRTC_SET_REMOTE_DESC_ERROR];
+
+                }).catch(function (error) {
+
+                    let tempError = ERRORS.codes[PLAYER_WEBRTC_SET_LOCAL_DESC_ERROR];
+                    tempError.error = error;
+                    closePeer(tempError);
+                });
+            }).catch(function (error) {
+
+                let tempError = ERRORS.codes[PLAYER_WEBRTC_CREATE_ANSWER_ERROR];
                 tempError.error = error;
                 closePeer(tempError);
             });
+        }).catch(function (error) {
+
+            let tempError = ERRORS.codes[PLAYER_WEBRTC_SET_REMOTE_DESC_ERROR];
+            tempError.error = error;
+            closePeer(tempError);
+        });
 
         if (candidates) {
 
@@ -358,12 +385,12 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
         }
 
         peerConnection.onicecandidate = function (e) {
+
             if (e.candidate) {
 
-                OvenPlayerConsole.log("WebRTCLoader send candidate to server : " , e.candidate);
+                OvenPlayerConsole.log("WebRTCLoader send candidate to server : ", e.candidate);
 
                 // console.log('Main Peer Connection candidate', e.candidate);
-
                 sendMessage(ws, {
                     id: id,
                     peer_id: peerId,
@@ -372,14 +399,38 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
                 });
             }
         };
+
         peerConnection.onconnectionstatechange = function (e) {
-            //iceConnectionState
+            //ConnectionState
             OvenPlayerConsole.log("[on connection state change]", peerConnection.connectionState, e);
 
+            // firefox and opera do not support onconnectionstatechange (Jan 07, 2021)
+            // double check with oniceconnectionstatechange
+            if (peerConnection.connectionState === 'connected') {
+
+                if (connectedCallback) {
+                    connectedCallback();
+                }
+            }
+        };
+
+        peerConnection.onicecandidateerror = function (e) {
+
         };
+
+        peerConnection.onicegatheringstatechange = function (e) {
+
+        };
+
         peerConnection.oniceconnectionstatechange = function (e) {
             OvenPlayerConsole.log("[on ice connection state change]", peerConnection.iceConnectionState, e);
 
+            if (peerConnection.iceConnectionState === 'connected') {
+
+                if (connectedCallback) {
+                    connectedCallback();
+                }
+            }
             /*
             * https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/iceConnectionState
             * Checks to ensure that components are still connected failed for at least one component of the RTCPeerConnection. This is a less stringent test than "failed" and may trigger intermittently and resolve just as spontaneously on less reliable networks, or during temporary disconnections. When the problem resolves, the connection may return to the "connected" state.
@@ -395,13 +446,14 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
                 }
             }
         };
+
         peerConnection.ontrack = function (e) {
 
             OvenPlayerConsole.log("stream received.");
 
-            OvenPlayerConsole.log('Recovery On Packet Loss :', recorverPacketLoss);
+            OvenPlayerConsole.log('Recovery On Packet Loss :', recoverPacketLoss);
 
-            if (recorverPacketLoss) {
+            if (recoverPacketLoss) {
                 extractLossPacketsOnNetworkStatus(mainPeerConnectionInfo);
             }
 
@@ -418,7 +470,15 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
 
                     let receiver = receivers[i];
 
-                    receiver.playoutDelayHint = hint;
+                    if (receiver.track.kind === 'audio') {
+
+                        receiver.playoutDelayHint = hint;
+                        receiver.jitterBufferDelayHint = hint;
+                    } else {
+
+                        receiver.playoutDelayHint = hint;
+                    }
+
                     OvenPlayerConsole.log("WebRTC playoutDelayHint", receiver, hint);
                 }
 
@@ -517,37 +577,17 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
         let newDomain = generateDomainFromUrl(webSocketUrl);
         let ip = findIp(cloneCandidate.candidate);
 
-        if (ip === '' || ip === newDomain) {
+        return new Promise(function (resolve, reject) {
 
-            return null;
-        }
+            if (ip === '' || ip === newDomain) {
 
-        return new Promise(function (resolve, reject) {
+                resolve(null);
+            }
 
             // firefox browser throws a candidate parsing exception when a domain name is set at the address property. So we resolve the dns using google dns resolve api.
             if (currentBrowser.browser === 'Firefox' && !findIp(newDomain)) {
 
-                fetch('https://dns.google.com/resolve?name=' + newDomain)
-                    .then(resp => resp.json())
-                    .then(data => {
-
-                        if (data && data.Answer && data.Answer.length > 0) {
-
-                            if (data.Answer[0].data) {
-
-                                let relsolvedIp = data.Answer[0].data;
-
-                                cloneCandidate.candidate = cloneCandidate.candidate.replace(ip, relsolvedIp);
-                                resolve(cloneCandidate);
-                            } else {
-
-                                resolve(null);
-                            }
-                        } else {
-
-                            resolve(null);
-                        }
-                    });
+                resolve(null);
 
             } else {
 
@@ -599,7 +639,7 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
         }
     }
 
-    function initWebSocket(resolve, reject) {
+    function initWebSocket() {
 
         try {
 
@@ -607,15 +647,11 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
 
             ws.onopen = function () {
 
+                wsConnected = true;
+
                 sendMessage(ws, {
                     command: "request_offer"
                 });
-
-                // wsPing = setInterval(function () {
-                //
-                //     sendMessage(ws, {command: "ping"});
-                //
-                // }, 20 * 1000);
             };
 
             ws.onmessage = function (e) {
@@ -641,15 +677,11 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
                     return;
                 }
 
-                if (!message.id) {
-
-                    OvenPlayerConsole.log('ID must be not null');
-                    return;
-                }
-
                 if (message.command === 'offer') {
 
-                    createMainPeerConnection(message.id, message.peer_id, message.sdp, message.candidates, message.ice_servers, resolve);
+                    let iceServers = message.iceServers || message.ice_servers;
+
+                    createMainPeerConnection(message.id, message.peer_id, message.sdp, message.candidates, iceServers);
                     if (message.peer_id === 0) {
                         provider.trigger(OME_P2P_MODE, false);
                     } else {
@@ -693,6 +725,57 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
                     addIceCandidate(peerConnection3, message.candidates);
                 }
 
+                if (message.command === 'notification') {
+
+                    if (message.type === 'playlist') {
+
+                        const renditions = message.message.renditions;
+                        playlistFromOme = message.message;
+
+                        for (let i = 0; i < renditions.length; i++) {
+
+                            let rendition = renditions[i];
+
+                            spec.qualityLevels.push({
+                                bitrate: rendition.video_track.video.bitrate,
+                                height: rendition.video_track.video.height,
+                                width: rendition.video_track.video.width,
+                                index: i,
+                                label: rendition.name
+                            });
+                        }
+
+                        spec.currentQuality = 0;
+                        autoQuality = message.message.auto;
+                    }
+
+                    if (message.type === 'rendition_changed') {
+
+                        const rendition = message.message;
+
+                        if (message.auto) {
+                            autoQuality = message.auto;
+                        }
+
+                        let qualityIndex = -1;
+
+                        for (let i = 0; i < playlistFromOme.renditions.length; i ++) {
+
+                            if (rendition.rendition_name ===  playlistFromOme.renditions[i].name) {
+                                qualityIndex = i;
+                                spec.currentQuality = i;
+                                break;
+                            }
+                        }
+
+                        provider.trigger(CONTENT_LEVEL_CHANGED, {
+                            isAuto: autoQuality,
+                            currentQuality: qualityIndex,
+                            type: "render"
+                        });
+                    }
+                }
+
                 if (message.command === 'stop') {
 
                     if (mainPeerConnectionInfo.peerId === message.peer_id) {
@@ -724,10 +807,20 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
                     }
                 }
             };
-            ws.onclose = function () {
+            ws.onclose = function (e) {
 
                 if (!wsClosedByPlayer) {
 
+                    if (connectedCallback) {
+                        if (!wsConnected) {
+
+                            // If the websocket is closed while there is no connection,
+                            // it is judged as a timeout.
+                            closePeer();
+                            return;
+                        }
+                    }
+
                     let tempError = ERRORS.codes[PLAYER_WEBRTC_WS_ERROR];
 
                     if (mainPeerConnectionInfo) {
@@ -740,13 +833,6 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
 
             ws.onerror = function (error) {
 
-                //Why Edge Browser calls onerror() when ws.close()?
-                if (!wsClosedByPlayer) {
-                    let tempError = ERRORS.codes[PLAYER_WEBRTC_WS_ERROR];
-                    tempError.error = error;
-                    closePeer(tempError);
-                    // reject(error);
-                }
             };
 
         } catch (error) {
@@ -758,13 +844,9 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
     function initialize() {
 
         OvenPlayerConsole.log("WebRTCLoader connecting...");
+        OvenPlayerConsole.log("WebRTCLoader url : " + webSocketUrl);
 
-        return new Promise(function (resolve, reject) {
-
-            OvenPlayerConsole.log("WebRTCLoader url : " + webSocketUrl);
-
-            initWebSocket(resolve, reject);
-        });
+        initWebSocket();
     }
 
     function closePeer(error) {
@@ -794,6 +876,7 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
             }
 
             mainPeerConnectionInfo.peerConnection = null;
+            provider.trigger(PEER_CONNECTION_DESTROYED);
             mainPeerConnectionInfo = null;
         }
 
@@ -813,9 +896,6 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
             clientPeerConnections = {};
         }
 
-        clearInterval(wsPing);
-        wsPing = null;
-
         if (ws) {
             OvenPlayerConsole.log('Closing websocket connection...');
             OvenPlayerConsole.log("Send Signaling : Stop.");
@@ -825,7 +905,7 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
             2 (CLOSING)
             3 (CLOSED)
             */
-            if (ws.readyState === 0 || ws.readyState === 1) {
+            if (ws.readyState === 1) {
 
                 wsClosedByPlayer = true;
 
@@ -846,6 +926,11 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
         ws = null;
 
         if (error) {
+
+            if (internalErrorCallback) {
+                internalErrorCallback(error);
+            }
+
             errorTrigger(error, provider);
         }
     }
@@ -858,12 +943,58 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
 
     }
 
+    provider.setCurrentQuality = (qualityIndex) => {
+
+        if (!playlistFromOme) {
+            return -1;
+        }
+
+        let rendition = playlistFromOme.renditions[qualityIndex];
+
+        if (!rendition) {
+            return spec.currentQuality;
+        }
+
+        sendMessage(ws, {
+            command: 'change_rendition',
+            id: mainPeerConnectionInfo.id,
+            rendition_name: rendition.name,
+            auto: false
+        });
+
+        autoQuality = false;
+
+        spec.currentQuality = qualityIndex;
+        return spec.currentQuality;
+    };
+
+    provider.isAutoQuality = () => {
+
+        return autoQuality;
+    };
+
+    provider.setAutoQuality = (auto) => {
+
+        sendMessage(ws, {
+            command: 'change_rendition',
+            id: mainPeerConnectionInfo.id,
+            auto: auto
+        });
+        autoQuality = auto;
+    };
+
     that.connect = () => {
-        return initialize();
+
+        initialize();
     };
 
     that.destroy = () => {
+
+        wsClosedByPlayer = true;
         closePeer();
+
+        window.onbeforeunload = existingHandler;
+        existingHandler = null;
     };
 
     return that;

package/src/js/ovenplayer.js

@@ -1,5 +1,6 @@
+import {version} from 'version'
 import OvenPlayerSDK from './ovenplayer.sdk'
-import {checkAndGetContainerElement} from 'utils/validator';
+import {checkAndGetContainerElement} from 'utils/validator'
 import View from './view/view';
 
 function ovenPlayerFactory() {
@@ -16,19 +17,14 @@ function ovenPlayerFactory() {
 
         const playerInstance = OvenPlayerSDK.create(player.getMediaElementContainer(), options);
 
-
-        Object.assign(playerInstance, {
-            getContainerId: function () {
-                return containerElement.id;
-            }
-        });
-
         player.setApi(playerInstance);
 
+        OvenPlayerConsole.log("[OvenPlayer] v."+ version);
+
         return playerInstance;
     };
 
     return OvenPlayer;
 }
 
-export default ovenPlayerFactory()
+export default ovenPlayerFactory()

package/src/js/ovenplayer.sdk.js

@@ -84,20 +84,19 @@ function ovenPlayerFactory() {
     };
 
     /**
-     * Remove the player instance by playerId.
+     * Remove the player instance by playerInstance.
      *
-     * @param      {playerId}  id
+     * @param      {playerInstance}  playerInstance
      * @return     {null}
      */
-    OvenPlayerSDK.removePlayer = function (playerId) {
-        for (let i = 0; i < playerList.length; i++) {
+    OvenPlayerSDK.removePlayer = function (playerInstance) {
 
-            if (playerList[i].getContainerId() === playerId) {
+        for (let i = 0; i < playerList.length; i++) {
 
+            if (playerList[i] === playerInstance) {
                 playerList.splice(i, 1);
             }
         }
-
     };
 
     /**

package/src/js/utils/browser.js

@@ -209,7 +209,12 @@ export const analUserAgent = function(){
 
         case 'iOS':
             osVersion = /OS (\d+)_(\d+)_?(\d+)?/.exec(nVer);
-            osVersion = osVersion[1] + '.' + osVersion[2] + '.' + (osVersion[3] | 0);
+            if (osVersion) {
+                osVersion = osVersion[1] + '.' + osVersion[2] + '.' + (osVersion[3] | 0);
+            } else {
+                osVersion = '';
+            }
+
             break;
     }