@xibosignage/xibo-layout-renderer 1.0.14 → 1.0.16

package/dist/xibo-layout-renderer.js

@@ -798,6 +798,34 @@ var XiboLayoutRenderer = (function (exports) {
     }));
     return _fetchJSON.apply(this, arguments);
   }
+  function fetchText(_x5) {
+    return _fetchText.apply(this, arguments);
+  }
+  function _fetchText() {
+    _fetchText = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(url) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            return _context4.abrupt("return", fetch(url).then(function (res) {
+              return res.text();
+            }).then(function (responseText) {
+              if (String(responseText).length > 0) {
+                return responseText;
+              } else {
+                return '';
+              }
+            })["catch"](function (err) {
+              console.debug(err);
+              return err === null || err === void 0 ? void 0 : err.message;
+            }));
+          case 1:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4);
+    }));
+    return _fetchText.apply(this, arguments);
+  }
   function getFileExt(filename) {
     var filenameArr = String(filename).split('.');
     return filenameArr[filenameArr.length - 1];
@@ -873,6 +901,9 @@ var XiboLayoutRenderer = (function (exports) {
       index: 0
     };
   }
+  function isEmpty$1(input) {
+    return !Boolean(input) || String(input).length === 0;
+  }
   function getAllAttributes(elem) {
     if (!elem || elem === null) {
       return {};
@@ -72638,7 +72669,7 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
     return $media;
   }
   function VideoMedia(media, xlr) {
-    return {
+    var videoMediaInstance = {
       init: function init() {
         var vjsPlayer = media.player;
         if (vjsPlayer !== undefined) {
@@ -72666,10 +72697,10 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
                         // Temporary setting
                         expires: format(new Date(setExpiry(1)), 'yyyy-MM-dd HH:mm:ss')
                       })["finally"](function () {
-                        // Expire the media and dispose the video
-                        vjsPlayer.dispose();
-                        media.emitter.emit('end', media);
+                        videoMediaInstance.stop();
                       });
+                    } else {
+                      videoMediaInstance.stop();
                     }
                   case 5:
                   case "end":
@@ -72689,88 +72720,130 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
           });
           vjsPlayer.on('ready', function () {
             vjsPlayer.muted(true);
-            var promise = vjsPlayer.play();
-            if (promise !== undefined) {
-              promise.then(function () {
-                // Autoplay restarted
-                console.debug('autoplay started . . .');
-              })["catch"]( /*#__PURE__*/function () {
-                var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(error) {
-                  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-                    while (1) switch (_context2.prev = _context2.next) {
-                      case 0:
-                        console.debug("".concat(capitalizeStr(media.mediaType), " for media > ").concat(media.id, " autoplay error"));
-                        if (!(xlr.config.platform === 'chromeOS')) {
-                          _context2.next = 4;
-                          break;
-                        }
-                        _context2.next = 4;
-                        return playerReportFault('Media autoplay error');
-                      case 4:
-                      case "end":
-                        return _context2.stop();
-                    }
-                  }, _callee2);
-                }));
-                return function (_x2) {
-                  return _ref2.apply(this, arguments);
-                };
-              }());
-            }
+            // Race promise between a 0.5s play and a 5s skip
+            Promise.race([new Promise(function (resolve, reject) {
+              return setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+                return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                  while (1) switch (_context2.prev = _context2.next) {
+                    case 0:
+                      console.debug("".concat(capitalizeStr(media.mediaType), " for media > ").concat(media.id, " : Trying to force play after 0.1 seconds"));
+                      // Try to force play here
+                      _context2.prev = 1;
+                      _context2.next = 4;
+                      return vjsPlayer.play();
+                    case 4:
+                      // Resolve if play works
+                      resolve(true);
+                      _context2.next = 10;
+                      break;
+                    case 7:
+                      _context2.prev = 7;
+                      _context2.t0 = _context2["catch"](1);
+                      // Reject race if play fails
+                      reject('Play failed');
+                    case 10:
+                    case "end":
+                      return _context2.stop();
+                  }
+                }, _callee2, null, [[1, 7]]);
+              })), 100);
+            }), new Promise(function (_, reject) {
+              return setTimeout(function () {
+                return reject('Timeout');
+              }, 5000);
+            })]).then(function () {
+              console.debug("".concat(capitalizeStr(media.mediaType), " for media > ").concat(media.id, " : Autoplay started"));
+            })["catch"]( /*#__PURE__*/function () {
+              var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(error) {
+                return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                  while (1) switch (_context3.prev = _context3.next) {
+                    case 0:
+                      if (!(error === 'Timeout')) {
+                        _context3.next = 5;
+                        break;
+                      }
+                      console.debug("".concat(capitalizeStr(media.mediaType), " for media > ").concat(media.id, " : Promise not resolved within 5 seconds. Move to next media"));
+                      videoMediaInstance.stop();
+                      _context3.next = 9;
+                      break;
+                    case 5:
+                      console.debug("".concat(capitalizeStr(media.mediaType), " for media > ").concat(media.id, " : Autoplay error: ").concat(error));
+                      if (!(xlr.config.platform === 'chromeOS')) {
+                        _context3.next = 9;
+                        break;
+                      }
+                      _context3.next = 9;
+                      return playerReportFault('Media autoplay error');
+                    case 9:
+                    case "end":
+                      return _context3.stop();
+                  }
+                }, _callee3);
+              }));
+              return function (_x2) {
+                return _ref3.apply(this, arguments);
+              };
+            }());
           });
           vjsPlayer.on('playing', function () {
             console.debug("".concat(capitalizeStr(media.mediaType), " for media > ").concat(media.id, " is now playing . . ."));
             vjsPlayer.muted(media.muted);
           });
           vjsPlayer.on('error', /*#__PURE__*/function () {
-            var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(err) {
-              return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-                while (1) switch (_context3.prev = _context3.next) {
+            var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(err) {
+              return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+                while (1) switch (_context4.prev = _context4.next) {
                   case 0:
                     console.debug("Media Error: ".concat(capitalizeStr(media.mediaType), " for media > ").concat(media.id));
                     if (!(xlr.config.platform === 'chromeOS')) {
-                      _context3.next = 6;
+                      _context4.next = 6;
                       break;
                     }
-                    _context3.next = 4;
+                    _context4.next = 4;
                     return playerReportFault('Video file source not supported');
                   case 4:
-                    _context3.next = 7;
+                    _context4.next = 7;
                     break;
                   case 6:
                     // End media after 5 seconds
                     setTimeout(function () {
                       console.debug("".concat(capitalizeStr(media.mediaType), " for media > ").concat(media.id, " has ended . . ."));
-                      media.emitter.emit('end', media);
-                      vjsPlayer.dispose();
+                      videoMediaInstance.stop();
                     }, 5000);
                   case 7:
                   case "end":
-                    return _context3.stop();
+                    return _context4.stop();
                 }
-              }, _callee3);
+              }, _callee4);
             }));
             return function (_x3) {
-              return _ref3.apply(this, arguments);
+              return _ref4.apply(this, arguments);
             };
           }());
-          vjsPlayer.on('ended', function () {
-            var _media$emitter;
-            console.debug("VideoMedia: onended: ".concat(capitalizeStr(media.mediaType), " for media > ").concat(media.id, " has ended playing . . ."));
-            (_media$emitter = media.emitter) === null || _media$emitter === void 0 || _media$emitter.emit('end', media);
-            vjsPlayer.dispose();
-          });
-          vjsPlayer.on('durationchange', function () {
-            if (media.duration === 0 && vjsPlayer.duration() !== undefined) {
-              media.duration = vjsPlayer.duration();
-            } else if (media.duration > 0) {
-              vjsPlayer.duration(media.duration);
-            }
-            console.debug('VIDEOJS: ondurationchange: Showing Media ' + media.id + ' for ' + vjsPlayer.duration() + 's of Region ' + media.region.regionId);
-          });
+          if (media.duration === 0) {
+            vjsPlayer.on('ended', function () {
+              console.debug("VideoMedia: onended: ".concat(capitalizeStr(media.mediaType), " for media > ").concat(media.id, " has ended playing . . ."));
+              videoMediaInstance.stop();
+            });
+            vjsPlayer.on('durationchange', function () {
+              console.debug('VIDEOJS: ondurationchange: Showing Media ' + media.id + ' for ' + vjsPlayer.duration() + 's of Region ' + media.region.regionId);
+            });
+          }
+        }
+      },
+      stop: function stop() {
+        var disposeOnly = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+        var vjsPlayer = media.player;
+        // Expire the media and dispose the video
+        if (vjsPlayer !== undefined) {
+          if (!disposeOnly) {
+            media.emitter.emit('end', media);
+          }
+          vjsPlayer.dispose();
         }
       }
     };
+    return videoMediaInstance;
   }
 
   function AudioMedia(media) {
@@ -72850,6 +72923,11 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
         if (mediaTimeCount > media.duration) {
           console.debug('startMediaTimer: emit>end: on media ' + media.id + ' of Region ' + media.region.regionId);
           media.emitter.emit('end', media);
+          if (media.mediaType === 'video') {
+            // Dispose the video media
+            console.debug("VideoMedia::stop - ".concat(capitalizeStr(media.mediaType), " for media ").concat(media.id, " has been stopped."));
+            VideoMedia(media, xlr).stop(true);
+          }
         }
       }, 1000);
       console.debug('startMediaTimer: Showing Media ' + media.id + ' for ' + media.duration + 's of Region ' + media.region.regionId);
@@ -74654,15 +74732,22 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
   exports.VideoMedia = VideoMedia;
   exports.audioFileType = audioFileType;
   exports.capitalizeStr = capitalizeStr;
+  exports.composeBgUrlByPlatform = composeBgUrlByPlatform;
+  exports.composeMediaUrl = composeMediaUrl;
+  exports.composeResourceUrl = composeResourceUrl;
+  exports.composeResourceUrlByPlatform = composeResourceUrlByPlatform;
   exports.default = XiboLayoutRenderer;
   exports.defaultTrans = defaultTrans;
   exports.fadeInElem = fadeInElem;
   exports.fadeOutElem = fadeOutElem;
   exports.fetchJSON = fetchJSON;
+  exports.fetchText = fetchText;
   exports.flyInElem = flyInElem;
   exports.flyOutElem = flyOutElem;
   exports.flyTransitionKeyframes = flyTransitionKeyframes;
+  exports.getDataBlob = getDataBlob;
   exports.getFileExt = getFileExt;
+  exports.getIndexByLayoutId = getIndexByLayoutId;
   exports.getLayout = getLayout;
   exports.getMediaId = getMediaId;
   exports.getXlf = getXlf;
@@ -74671,6 +74756,7 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
   exports.initialMedia = initialMedia;
   exports.initialRegion = initialRegion;
   exports.initialXlr = initialXlr;
+  exports.isEmpty = isEmpty$1;
   exports.nextId = nextId;
   exports.platform = platform;
   exports.preloadMediaBlob = preloadMediaBlob;