@flashphoner/websdk 2.0.225 → 2.0.227

package/docTemplate/README.md

@@ -1,4 +1,4 @@
-Web SDK - 2.0.225
+Web SDK - 2.0.227
 
 [Download builds](https://docs.flashphoner.com/display/WEBSDK2EN/Web+SDK+release+notes)
 

package/examples/demo/streaming/embed_player/sample.js

@@ -27,8 +27,8 @@ function init_page() {
     $("#testBtn").click(function () {
         $("#fp_embed_player").attr('src', "player.html?" +
             "urlServer=" + $("#url").val() + "&" +
-            "streamName=" + $("#streamName").val().replace(/&/g,encodeURIComponent("&")) + "&" +
-            "mediaProviders=" + getMediaProviders() + "&" +
+            "streamName=" + encodeURIComponent($("#streamName").val()) + "&" +
+             "mediaProviders=" + getMediaProviders() + "&" +
             "autoplay=false");
     });
     $("#clipboardBtn").click(function () {
@@ -38,7 +38,7 @@ function init_page() {
     var constructCode = function () {
         var url = getAdminUrl() + "/embed_player?" +
         "urlServer=" + $("#url").val() + "&" +
-        "streamName=" + $("#streamName").val().replace(/&/g,encodeURIComponent("&")) + "&" +
+            "streamName=" + encodeURIComponent($("#streamName").val()) + "&" +
         "mediaProviders=" + getMediaProviders();
         $("#codeTextArea").text("<iframe id='fp_embed_player' src='" + url + "' " +
             "marginwidth='0' marginheight='0' frameborder='0' width='100%' height='100%' scrolling='no' allowfullscreen='allowfullscreen'></iframe>")
@@ -51,7 +51,7 @@ function init_page() {
     });
     constructCode();
 
-    // Подгружаем dark.css по умолчанию
+    // Add dark style to player frame
     $('#fp_embed_player').contents().find('html').addClass('dark-style');
     $('.fp-remoteVideo').addClass('dark-style-bg');
 

package/examples/demo/streaming/embed_player/utils.js

@@ -1,4 +1,7 @@
-//Set WCS URL
+/**
+ * Set WCS URL
+ * @return WCS URL to connect
+ */
 function setURL() {
     let proto;
     let url;
@@ -15,20 +18,55 @@ function setURL() {
     return url;
 }
 
+
+/**
+ * Check if value is URI encoded
+ * @param value a string to check for encoding
+ * @return true if value is encoded
+ */
+function isEncoded(value) {
+  value = value || '';
+  let result;
+
+  try {
+     result = (value !== decodeURIComponent(value));
+  } catch (e) {
+     result = false;
+  }
+
+  return result;
+}
+
+/**
+ * Get a parameter passed in URL by name
+ * @param name parameter name
+ * @return parameter value decoded if needed
+ */
 function getUrlParam(name) {
     let url = window.location.href;
     name = name.replace(/[\[\]]/g, "\\$&");
-    let regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
+    // Fixed streams playback with '#' char in name (test#m1) #WCS-3655
+    let regex = new RegExp("[?&]" + name + "(=([^&]*)|&|$)"),
         results = regex.exec(url);
     if (!results) return null;
     if (!results[2]) return '';
-    return decodeURIComponent(results[2].replace(/\+/g, " "));
+    let value = results[2];
+    if (isEncoded(value)) {
+        value = decodeURIComponent(value);
+    }
+    // Add workaround to play RTSP streams with '@' char in password #WCS-3655
+    if (value.startsWith("rtsp://") || value.startsWith("rtmp://")) {
+        return value.replace(/\@(?=.*\@)/g, '%40');
+    }
+    return value;
 }
 
 /**
  * Resize video object to fit parent div.
  * Div structure: div WxH -> div wrapper (display) -> video
  * @param video HTML element from resize event target
+ * @param width optional width to scale
+ * @param height optional height to scale
  */
 function resizeVideo(video, width, height) {
     if (!video.parentNode) {
@@ -62,6 +100,14 @@ function resizeVideo(video, width, height) {
 }
 
 
+/**
+ * Helper function to resize video
+ * @param videoWidth source video width
+ * @param videoHeight source video height
+ * @param dstWidth destination video width
+ * @param dstHeight destination video height
+ * @return new width and height
+ */
 function downScaleToFitSize(videoWidth, videoHeight, dstWidth, dstHeight) {
     let newWidth, newHeight;
     let videoRatio = videoWidth / videoHeight;

package/examples/demo/streaming/screen-sharing/screen-sharing.js

@@ -6,6 +6,8 @@ var remoteVideo;
 var extensionId = "nlbaajplpmleofphigmgaifhoikjmbkg";
 var extensionNotInstalled;
 
+var askExtension = getUrlParam("askExtension") || false;
+
 function init_page() {
     //init api
     try {
@@ -29,20 +31,22 @@ function init_page() {
 
     } else if (Browser.isChrome() && !Browser.isAndroid() && !Browser.isiOS()) {
         interval = setInterval(function() {
-            chrome.runtime.sendMessage(extensionId, {type: "isInstalled"}, function (response) {
-                if (chrome.runtime.lastError) {         //WCS-2369 - cacth runtime.lastError
-                    (inIframe()) ? $("#installFromMarket").show() : $("#installExtensionButton").show();
-                    clearInterval(interval);
-                    onExtensionAvailable();
-                    $('#woChromeExtension').prop('checked', true);
-                    $('#woChromeExtension').prop('disabled', true);
-                    extensionNotInstalled = true;
-                } else {
-                    $("#extension").hide();
+            try {
+                chrome.runtime.sendMessage(extensionId, {type: "isInstalled"}, function (response) {
+                    if (chrome.runtime.lastError) {         //WCS-2369 - catch runtime.lastError
+                        onExtensionNotFound();
+                    } else {
+                        $("#extension").hide();
+                        onExtensionAvailable();
+                    }
                     clearInterval(interval);
-                    onExtensionAvailable();
-                }
-            });
+                });
+            } catch (e) {
+                // Catch chrome.runtime.sendMessage undefined exception #WCS-3638
+                console.log("Can't detect screen sharing extension: "+e);
+                onExtensionNotFound();
+                clearInterval(interval);
+            }
         }, 500);
     } else if(isSafariMacOS()) {
         $("#extension").hide();
@@ -84,6 +88,22 @@ function isSafariMacOS() {
     return Browser.isSafari() && !Browser.isAndroid() && !Browser.isiOS();
 }
 
+function onExtensionNotFound() {
+    if (askExtension === true) {
+        if (inIframe()) {
+            $("#installFromMarket").show();
+        } else {
+            $("#installExtensionButton").show();
+        }
+    } else {
+        $("#extension").hide();
+    }
+    onExtensionAvailable();
+    $('#woChromeExtension').prop('checked', true);
+    $('#woChromeExtension').prop('disabled', true);
+    extensionNotInstalled = true;
+}
+
 function onExtensionAvailable() {
     localVideo = document.getElementById("localVideo");
     remoteVideo = document.getElementById("remoteVideo");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flashphoner/websdk",
-  "version": "2.0.225",
+  "version": "2.0.227",
   "description": "Official Flashphoner WebCallServer WebSDK package",
   "main": "./src/flashphoner-core.js",
   "types": "./src/flashphoner-core.d.ts",