@desynova-digital/player 4.2.1 → 4.2.2

package/components/Video.js

@@ -303,7 +303,7 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
     key: "combineM3U8Manifests",
     value: function () {
       var _combineM3U8Manifests = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(originalUrl, dubbedUrl, additionalTrackUrl) {
-        var fetchManifest, fetchPromises, contents, originalContent, dubbedContent, additionalContent, extractAudioTracks, extractVideoStream, originalBase, dubbedBase, additionalBase, videoStreamUri, originalAudioTracks, dubbedAudioTracks, additionalAudioTracks, allTracksMap, allAudioTracks, combinedManifest, _i, _allAudioTracks, track;
+        var fetchManifest, fetchPromises, hasDubbed, hasAdditional, contents, originalContent, dubbedContent, additionalContent, extractAudioTracks, extractVideoStream, originalBase, dubbedBase, additionalBase, videoStreamUri, originalAudioTracks, dubbedAudioTracks, additionalAudioTracks, allTracksMap, allAudioTracks, combinedManifest, _i, _allAudioTracks, track;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -335,15 +335,23 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
                 };
               }(); // Fetch all manifests
               fetchPromises = [fetchManifest(originalUrl)];
-              if (dubbedUrl) fetchPromises.push(fetchManifest(dubbedUrl));
-              if (additionalTrackUrl) fetchPromises.push(fetchManifest(additionalTrackUrl));
-              _context2.next = 6;
+              hasDubbed = dubbedUrl && dubbedUrl.trim() !== '';
+              hasAdditional = additionalTrackUrl && additionalTrackUrl.trim() !== '';
+              if (hasDubbed) fetchPromises.push(fetchManifest(dubbedUrl));
+              if (hasAdditional) fetchPromises.push(fetchManifest(additionalTrackUrl));
+              _context2.next = 8;
               return Promise.all(fetchPromises);
-            case 6:
+            case 8:
               contents = _context2.sent;
               originalContent = contents[0];
-              dubbedContent = contents[1];
-              additionalContent = contents[2];
+              dubbedContent = undefined;
+              additionalContent = undefined;
+              if (hasDubbed) {
+                dubbedContent = contents[1];
+                if (hasAdditional) additionalContent = contents[2];
+              } else if (hasAdditional) {
+                additionalContent = contents[1];
+              }
               extractAudioTracks = function extractAudioTracks(content, baseUrl) {
                 var lines = content.split(/\r?\n/);
                 var audioTracks = [];
@@ -393,7 +401,7 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
               };
               originalBase = originalUrl;
               dubbedBase = dubbedUrl;
-              additionalBase = additionalTrackUrl || originalUrl;
+              additionalBase = additionalTrackUrl;
               videoStreamUri = extractVideoStream(originalContent, originalBase);
               originalAudioTracks = extractAudioTracks(originalContent, originalBase);
               dubbedAudioTracks = dubbedUrl ? extractAudioTracks(dubbedContent, dubbedBase) : [];
@@ -433,7 +441,7 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
                 dubbedTrackInfo: this.dubbedTrackInfo,
                 additionalTrackInfo: this.additionalTrackInfo
               });
-            case 30:
+            case 33:
             case "end":
               return _context2.stop();
           }
@@ -628,7 +636,7 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
         var audioTracksWithFlags = (data.audioTracks || []).map(function (track) {
           var flaggedTrack = _objectSpread({}, track);
           // Match by NAME and URI
-          if (self.dubbedTrackInfo && self.dubbedTrackInfo.length > 0) {
+          if (self.dubbedTrackInfo && self.dubbedTrackInfo.length > 0 && hasDubbed) {
             var matched = self.dubbedTrackInfo.some(function (dubbedTrack) {
               return dubbedTrack.name === track.name && dubbedTrack.uri === track.url;
             });
@@ -636,7 +644,7 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
               flaggedTrack.isDubbedTrack = true;
             }
           }
-          if (self.additionalTrackInfo && self.additionalTrackInfo.length > 0) {
+          if (self.additionalTrackInfo && self.additionalTrackInfo.length > 0 && hasAdditionalTracks) {
             var _matched = self.additionalTrackInfo.some(function (additionalTrack) {
               return additionalTrack.name === track.name && additionalTrack.uri === track.url;
             });
@@ -929,6 +937,8 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
           URL.revokeObjectURL(this.combinedManifestUrl);
           this.combinedManifestUrl = null;
         }
+        this.dubbedTrackInfo = [];
+        this.additionalTrackInfo = [];
         var m3u8 = newProps.src.split('.').pop() === 'm3u8';
         this.setState({
           isM3U8: m3u8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@desynova-digital/player",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "Video Player Package for Contido Application",
   "main": "index.js",
   "scripts": {