@flashphoner/websdk 2.0.212 → 2.0.217

package/src/util.js

@@ -1,147 +1,156 @@
 'use strict';
 
-module.exports = {
+const isEmptyObject = function( obj ) {
+    for ( var name in obj ) {
+        return false;
+    }
+    return true;
+};
 
-    isEmptyObject: function( obj ) {
-        for ( var name in obj ) {
-            return false;
+/**
+ * Copy values of object own properties to array.
+ *
+ * @param obj
+ * @returns {Array}
+ */
+const copyObjectToArray = function(obj) {
+    var ret = [];
+    for (var prop in obj) {
+        if(obj.hasOwnProperty(prop)) {
+            ret.push(obj[prop]);
         }
-        return true;
-    },
+    }
+    return ret;
+};
 
-    /**
-     * Copy values of object own properties to array.
-     *
-     * @param obj
-     * @returns {Array}
-     */
-    copyObjectToArray: function(obj) {
-        var ret = [];
-        for (var prop in obj) {
-            if(obj.hasOwnProperty(prop)) {
-                ret.push(obj[prop]);
-            }
+/**
+ * Copy src properties to dst object.
+ * Will overwrite dst prop with src prop in case of dst prop exist.
+ */
+const copyObjectPropsToAnotherObject = function(src, dst) {
+    for (var prop in src) {
+        if(src.hasOwnProperty(prop)) {
+            dst[prop] = src[prop];
         }
-        return ret;
-    },
-    /**
-     * Copy src properties to dst object.
-     * Will overwrite dst prop with src prop in case of dst prop exist.
-     */
-    copyObjectPropsToAnotherObject: function(src, dst) {
-        for (var prop in src) {
-            if(src.hasOwnProperty(prop)) {
-                dst[prop] = src[prop];
-            }
-        }
-    },
-    processRtcStatsReport: function(browser, report) {
-        var result = {};
-        if (browser == "chrome") {
-            /**
-             * Report types: googComponent, googCandidatePair, googCertificate, googLibjingleSession, googTrack, ssrc
-             */
-            var gotResult = false;
-            if (report.type && report.type == "googCandidatePair") {
-                //check if this is active pair
-                if (report.googActiveConnection == "true") {
-                    gotResult = true;
-                }
-            }
+    }
+};
 
-            if (report.type && report.type == "ssrc") {
+const processRtcStatsReport = function(browser, report) {
+    var result = {};
+    if (browser == "chrome") {
+        /**
+         * Report types: googComponent, googCandidatePair, googCertificate, googLibjingleSession, googTrack, ssrc
+         */
+        var gotResult = false;
+        if (report.type && report.type == "googCandidatePair") {
+            //check if this is active pair
+            if (report.googActiveConnection == "true") {
                 gotResult = true;
             }
+        }
 
-            if (gotResult) {
-                for (var k in report) {
-                    if (report.hasOwnProperty(k)) {
-                        result[k] = report[k];
-                    }
+        if (report.type && report.type == "ssrc") {
+            gotResult = true;
+        }
+
+        if (gotResult) {
+            for (var k in report) {
+                if (report.hasOwnProperty(k)) {
+                    result[k] = report[k];
                 }
             }
-            return result;
-        } else if (browser == "firefox") {
-            /**
-             * RTCStatsReport http://mxr.mozilla.org/mozilla-central/source/dom/webidl/RTCStatsReport.webidl
-             */
+        }
+        return result;
+    } else if (browser == "firefox") {
+        /**
+         * RTCStatsReport http://mxr.mozilla.org/mozilla-central/source/dom/webidl/RTCStatsReport.webidl
+         */
 
-            if (report.type && (report.type == "outboundrtp" || report.type == "inboundrtp") && report.id.indexOf("rtcp") == -1) {
-                result = {};
-                for (var k in report) {
-                    if (report.hasOwnProperty(k)) {
-                        result[k] = report[k];
-                    }
+        if (report.type && (report.type == "outboundrtp" || report.type == "inboundrtp") && report.id.indexOf("rtcp") == -1) {
+            result = {};
+            for (var k in report) {
+                if (report.hasOwnProperty(k)) {
+                    result[k] = report[k];
                 }
             }
+        }
+
+        return result;
+    } else {
+        return result
+    }
+};
 
-            return result;
-        } else { return result };
+const Browser = {
+    isIE: function () {
+        return /*@cc_on!@*/false || !!document.documentMode;
     },
-    Browser: {
-        isIE: function () {
-            return /*@cc_on!@*/false || !!document.documentMode;
-        },
-        isFirefox: function () {
-            return typeof InstallTrigger !== 'undefined';
-        },
-        isChrome: function () {
-            return !!window.chrome && /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor) && !/OPR/.test(navigator.userAgent);
-        },
-        isEdge: function () {
-            return !isIE && !!window.StyleMedia;
-        },
-        isOpera: function () {
-            return (!!window.opr && !!opr.addons) || !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0;
-        },
-        isiOS: function () {
-            return /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
-        },
-        isSafari: function () {
-            var userAgent = navigator.userAgent.toLowerCase();
-            return /(safari|applewebkit)/i.test(userAgent) && !userAgent.includes("chrome") && !userAgent.includes("android");
-        },
-        isAndroid: function () {
-            return navigator.userAgent.toLowerCase().indexOf("android") > -1;
-        },
-        isSafariWebRTC: function () {
-            return navigator.mediaDevices && this.isSafari();
-        },
-        isSamsungBrowser: function() {
-            return /SamsungBrowser/i.test(navigator.userAgent);
-        },
-        isAndroidFirefox: function () {
-            return this.isAndroid() && /Firefox/i.test(navigator.userAgent);
-        }
+    isFirefox: function () {
+        return typeof InstallTrigger !== 'undefined';
     },
-    SDP: {
-        matchPrefix: function(sdp,prefix) {
-            var parts = sdp.trim().split('\n').map(function(line) {
-                return line.trim();
-            });
-            return parts.filter(function(line) {
-                return line.indexOf(prefix) === 0;
-            });
-        },
-        writeFmtp: function (sdp, param, codec) {
-            var sdpArray = sdp.split("\n");
-            var i;
-            for (i = 0; i < sdpArray.length; i++) {
-                if (sdpArray[i].search(codec) != -1 && sdpArray[i].indexOf("a=rtpmap") == 0) {
-                    sdpArray[i] += "\na=fmtp:" + sdpArray[i].match(/[0-9]+/)[0] + " " + param + "\r";
-                }
+    isChrome: function () {
+        return !!window.chrome && /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor) && !/OPR/.test(navigator.userAgent);
+    },
+    isEdge: function () {
+        return !isIE && !!window.StyleMedia;
+    },
+    isOpera: function () {
+        return (!!window.opr && !!opr.addons) || !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0;
+    },
+    isiOS: function () {
+        return /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
+    },
+    isSafari: function () {
+        var userAgent = navigator.userAgent.toLowerCase();
+        return /(safari|applewebkit)/i.test(userAgent) && !userAgent.includes("chrome") && !userAgent.includes("android");
+    },
+    isAndroid: function () {
+        return navigator.userAgent.toLowerCase().indexOf("android") > -1;
+    },
+    isSafariWebRTC: function () {
+        return navigator.mediaDevices && this.isSafari();
+    },
+    isSamsungBrowser: function() {
+        return /SamsungBrowser/i.test(navigator.userAgent);
+    },
+    isAndroidFirefox: function () {
+        return this.isAndroid() && /Firefox/i.test(navigator.userAgent);
+    },
+    isChromiumEdge: function () {
+        return /Chrome/i.test(navigator.userAgent) && /Edg/i.test(navigator.userAgent);
+    }
+};
+
+const SDP = {
+    matchPrefix: function(sdp,prefix) {
+        var parts = sdp.trim().split('\n').map(function(line) {
+            return line.trim();
+        });
+        return parts.filter(function(line) {
+            return line.indexOf(prefix) === 0;
+        });
+    },
+    writeFmtp: function (sdp, param, codec) {
+        var sdpArray = sdp.split("\n");
+        var i;
+        for (i = 0; i < sdpArray.length; i++) {
+            if (sdpArray[i].search(codec) != -1 && sdpArray[i].indexOf("a=rtpmap") == 0) {
+                sdpArray[i] += "\na=fmtp:" + sdpArray[i].match(/[0-9]+/)[0] + " " + param + "\r";
             }
-            //normalize sdp after modifications
-            var result = "";
-            for (i = 0; i < sdpArray.length; i++) {
-                if (sdpArray[i] != "") {
-                    result += sdpArray[i] + "\n";
-                }
+        }
+        //normalize sdp after modifications
+        var result = "";
+        for (i = 0; i < sdpArray.length; i++) {
+            if (sdpArray[i] != "") {
+                result += sdpArray[i] + "\n";
             }
-            return result;
         }
-    },
-    logger: {
+        return result;
+    }
+};
+
+const logger = function() {
+    return {
         init: function (verbosity, enablePushLogs, customLogger, enableLogs) {
             switch (verbosity.toUpperCase()) {
                 case "DEBUG":
@@ -178,7 +187,6 @@ module.exports = {
                                 data: [{logs: delayedLogs[i]}]
                             }));
                         }
-
                     }
                     delayedLogs = [];
                     this.wsConnection.send(JSON.stringify({
@@ -202,7 +210,7 @@ module.exports = {
                     this.customLogger.info(text);
                 } else {
                     console.log(prefix,text);
-            	}
+                }
             }
         },
         debug: function (src, text) {
@@ -223,7 +231,7 @@ module.exports = {
             if (!this.enableLogs){
                 return;
             }
-			var prefix = this.date() + " TRACE " + src + " - ";
+            var prefix = this.date() + " TRACE " + src + " - ";
             this.pushLogs(prefix + JSON.stringify(text) + '\n');
             if (this.verbosity >= 4) {
                 if (this.customLogger != null) {
@@ -237,7 +245,7 @@ module.exports = {
             if (!this.enableLogs){
                 return;
             }
-			var prefix = this.date() + " WARN " + src + " - ";
+            var prefix = this.date() + " WARN " + src + " - ";
             this.pushLogs(prefix + JSON.stringify(text) + '\n');
             if (this.verbosity >= 1) {
                 if (this.customLogger != null) {
@@ -251,7 +259,7 @@ module.exports = {
             if (!this.enableLogs){
                 return;
             }
-			var prefix = this.date() + " ERROR " + src + " - ";
+            var prefix = this.date() + " ERROR " + src + " - ";
             this.pushLogs(prefix + JSON.stringify(text) + '\n');
             if (this.verbosity >= 0) {
                 if (this.customLogger != null) {
@@ -293,80 +301,94 @@ module.exports = {
                     break;
                 default :
                     this.verbosity = 2;
-            };
+            }
         }
-    },
-    stripCodecs: function(sdp, codecs) {
-        if (!codecs.length) return sdp;
+    }
+};
 
-        var sdpArray = sdp.split("\n");
-        var codecsArray = codecs.split(",");
+const stripCodecs = function(sdp, codecs) {
+    if (!codecs.length) return sdp;
 
-        //search and delete codecs line
-        var pt = [];
-        var i;
-        for (var p = 0; p < codecsArray.length; p++) {
-            console.log("Searching for codec " + codecsArray[p]);
+    var sdpArray = sdp.split("\n");
+    var codecsArray = codecs.split(",");
+
+    //search and delete codecs line
+    var pt = [];
+    var i;
+    for (var p = 0; p < codecsArray.length; p++) {
+        console.log("Searching for codec " + codecsArray[p]);
+        for (i = 0; i < sdpArray.length; i++) {
+            if (sdpArray[i].search(new RegExp(codecsArray[p],'i')) != -1 && sdpArray[i].indexOf("a=rtpmap") == 0) {
+                console.log(codecsArray[p] + " detected");
+                pt.push(sdpArray[i].match(/[0-9]+/)[0]);
+                sdpArray[i] = "";
+            }
+        }
+    }
+    if (pt.length) {
+        //searching for fmtp
+        for (p = 0; p < pt.length; p++) {
             for (i = 0; i < sdpArray.length; i++) {
-                if (sdpArray[i].search(new RegExp(codecsArray[p],'i')) != -1 && sdpArray[i].indexOf("a=rtpmap") == 0) {
-                    console.log(codecsArray[p] + " detected");
-                    pt.push(sdpArray[i].match(/[0-9]+/)[0]);
+                if (sdpArray[i].search("a=fmtp:" + pt[p]) != -1 || sdpArray[i].search("a=rtcp-fb:" + pt[p]) != -1) {
                     sdpArray[i] = "";
                 }
             }
         }
-        if (pt.length) {
-            //searching for fmtp
-            for (p = 0; p < pt.length; p++) {
-                for (i = 0; i < sdpArray.length; i++) {
-                    if (sdpArray[i].search("a=fmtp:" + pt[p]) != -1 || sdpArray[i].search("a=rtcp-fb:" + pt[p]) != -1) {
-                        sdpArray[i] = "";
-                    }
-                }
-            }
 
-            //delete entries from m= line
-            for (i = 0; i < sdpArray.length; i++) {
-                if (sdpArray[i].search("m=audio") != -1 || sdpArray[i].search("m=video") != -1) {
-                    var mLineSplitted = sdpArray[i].split(" ");
-                    var newMLine = "";
-                    for (var m = 0; m < mLineSplitted.length; m++) {
-                        if (pt.indexOf(mLineSplitted[m].trim()) == -1 || m <= 2) {
-                            newMLine += mLineSplitted[m];
-                            if (m < mLineSplitted.length - 1) {
-                                newMLine = newMLine + " ";
-                            }
+        //delete entries from m= line
+        for (i = 0; i < sdpArray.length; i++) {
+            if (sdpArray[i].search("m=audio") != -1 || sdpArray[i].search("m=video") != -1) {
+                var mLineSplitted = sdpArray[i].split(" ");
+                var newMLine = "";
+                for (var m = 0; m < mLineSplitted.length; m++) {
+                    if (pt.indexOf(mLineSplitted[m].trim()) == -1 || m <= 2) {
+                        newMLine += mLineSplitted[m];
+                        if (m < mLineSplitted.length - 1) {
+                            newMLine = newMLine + " ";
                         }
                     }
-                    sdpArray[i] = newMLine;
                 }
+                sdpArray[i] = newMLine;
             }
         }
+    }
 
-        //normalize sdp after modifications
-        var result = "";
-        for (i = 0; i < sdpArray.length; i++) {
-            if (sdpArray[i] != "") {
-                result += sdpArray[i] + "\n";
-            }
+    //normalize sdp after modifications
+    var result = "";
+    for (i = 0; i < sdpArray.length; i++) {
+        if (sdpArray[i] != "") {
+            result += sdpArray[i] + "\n";
         }
-        return result;
-    },
-    getCurrentCodecAndSampleRate: function(sdp, mediaType) {
-        var rows = sdp.split("\n");
-        var codecPt;
-        for (var i = 0; i < rows.length ; i++) {
-            if (codecPt && rows[i].indexOf("a=rtpmap:" + codecPt) != -1) {
-                var ret = {};
-                ret.name = rows[i].split(" ")[1].split("/")[0];
-                ret.sampleRate = rows[i].split(" ")[1].split("/")[1];
-                return ret;
-            }
-            //WCS-2136. WebRTC statistics doesn't work for VP8
-            if (rows[i].indexOf("m=" + mediaType) != -1) {
-                codecPt = rows[i].split(" ")[3].trim();
-            }
+    }
+    return result;
+};
+
+const getCurrentCodecAndSampleRate = function(sdp, mediaType) {
+    var rows = sdp.split("\n");
+    var codecPt;
+    for (var i = 0; i < rows.length ; i++) {
+        if (codecPt && rows[i].indexOf("a=rtpmap:" + codecPt) != -1) {
+            var ret = {};
+            ret.name = rows[i].split(" ")[1].split("/")[0];
+            ret.sampleRate = rows[i].split(" ")[1].split("/")[1];
+            return ret;
+        }
+        //WCS-2136. WebRTC statistics doesn't work for VP8
+        if (rows[i].indexOf("m=" + mediaType) != -1) {
+            codecPt = rows[i].split(" ")[3].trim();
         }
     }
+};
+
 
+module.exports = {
+    isEmptyObject,
+    copyObjectToArray,
+    copyObjectPropsToAnotherObject,
+    processRtcStatsReport,
+    Browser,
+    SDP,
+    logger,
+    stripCodecs,
+    getCurrentCodecAndSampleRate
 };

package/src/webrtc-media-provider.js

@@ -23,6 +23,11 @@ var mics = [];
 var createConnection = function (options) {
     return new Promise(function (resolve, reject) {
 
+        // Set connection logger #WCS-2434
+        if (options.logger) {
+            logger = options.logger;
+        }
+
         var id = options.id;
         var connectionConfig = options.connectionConfig || {"iceServers": []};
         var connectionConstraints = options.connectionConstraints || {};
@@ -131,9 +136,9 @@ var createConnection = function (options) {
         function setContentHint(stream, hint) {
             stream.getVideoTracks().forEach(function(track) {
                 if(track.contentHint === undefined) {
-                    logger.warn("contentHint unsupported");
+                    logger.warn(LOG_PREFIX, "Track contentHint unsupported");
                 } else {
-                    logger.info("Set video track contentHint to " + hint);
+                    logger.info(LOG_PREFIX, "Set video track contentHint to " + hint);
                     track.contentHint = hint;
                 }
             });
@@ -168,7 +173,7 @@ var createConnection = function (options) {
                 //WCS-2771 add playback delay
                 connection.getReceivers().forEach((track) => {
                     if (track.playoutDelayHint === undefined) {
-                        logger.warn("playout delay unsupported");
+                        logger.warn(LOG_PREFIX, "Playout delay unsupported");
                     }
                     track.playoutDelayHint = playoutDelay;
                 });
@@ -518,7 +523,7 @@ var createConnection = function (options) {
                             if (localVideo.srcObject.getAudioTracks().length == 0 && audioTrack) {
                                 localVideo.srcObject.addTrack(audioTrack);
                             }
-                            logger.info("Switch camera to " + cam);
+                            logger.info(LOG_PREFIX, "Switch camera to " + cam);
                             resolve(cam);
                         }).catch(function (reason) {
                             logger.error(LOG_PREFIX, reason);
@@ -569,7 +574,7 @@ var createConnection = function (options) {
                             if (videoTrack) {
                                 localVideo.srcObject.addTrack(videoTrack);
                             }
-                            logger.info("Switch mic to " + mic);
+                            logger.info(LOG_PREFIX, "Switch mic to " + mic);
                             resolve(mic);
                         }).catch(function (reason) {
                             logger.error(LOG_PREFIX, reason);
@@ -657,7 +662,7 @@ var createConnection = function (options) {
                     localVideo.srcObject.addTrack(currentAudioTrack);
                 }
             });
-            logger.info("Switch to screen");
+            logger.info(LOG_PREFIX, "Switch to screen");
             screenShare = true;
             resolve();
         };
@@ -685,7 +690,7 @@ var createConnection = function (options) {
                     }
                 });
             }
-            logger.info("Switch to cam");
+            logger.info(LOG_PREFIX, "Switch to cam");
             screenShare = false;
         };
 

package/src/websocket-media-provider.js

@@ -27,6 +27,11 @@ var createConnection = function(options, handlers) {
         var id = options.id;
         var display = options.display;
 
+        // Set connection logger #WCS-2434
+        if (options.logger) {
+            logger = options.logger;
+        }
+
         var canvas = document.createElement("canvas");
         display.appendChild(canvas);
         canvas.id = id;