eyevinn-channel-engine 3.0.4 → 3.0.5

package/engine/session_live.js

@@ -1018,16 +1018,17 @@ class SessionLive {
         cueData["assetData"] = attributes["assetData"];
       }
       if ("daterange" in attributes) {
-        if(!daterangeData) {
-          daterangeData = {}
+        if (!daterangeData) {
+          daterangeData = {};
         }
-        daterangeData = {
-          id: attributes["daterange"]["ID"],
-          "start-date": attributes["daterange"]["START-DATE"],
-          "planned-duration": parseFloat(
-            attributes["daterange"]["PLANNED-DURATION"]
-          ),
-        };
+        let allDaterangeAttributes = Object.keys(attributes["daterange"]);
+        allDaterangeAttributes.forEach((attr) => {
+          if (attr.match(/DURATION$/)) {
+            daterangeData[attr.toLowerCase()] = parseFloat(attributes["daterange"][attr]);
+          } else {
+            daterangeData[attr.toLowerCase()] = attributes["daterange"][attr];
+          }
+        });
       }
       if (playlistItem.properties.uri) {
         if (playlistItem.properties.uri.match("^http")) {
@@ -1171,9 +1172,12 @@ class SessionLive {
           }
         }
       }
+      if (seg.datetime) {
+        m3u8 += `#EXT-X-PROGRAM-DATE-TIME:${seg.datetime}\n`;
+      }
       if (seg.daterange) {
         const dateRangeAttributes = Object.keys(seg.daterange).map(key => daterangeAttribute(key, seg.daterange[key])).join(',');
-        if (seg.daterange['start-date']) {
+        if (!seg.datetime && seg.daterange['start-date']) {
           m3u8 += "#EXT-X-PROGRAM-DATE-TIME:" + seg.daterange['start-date'] + "\n";
         }
         m3u8 += "#EXT-X-DATERANGE:" + dateRangeAttributes + "\n";

package/engine/stream_switcher.js

@@ -278,6 +278,9 @@ class StreamSwitcher {
           debug(`[${this.sessionId}]: [ Switched from V2L->LIVE ]`);
           return true;
         } catch (err) {
+          this.streamTypeLive = false;
+          this.working = false;
+          this.eventId = null;
           debug(`[${this.sessionId}]: [ ERROR Switching from V2L->LIVE ]`);
           throw new Error(err);
         }
@@ -309,6 +312,9 @@ class StreamSwitcher {
           debug(`[${this.sessionId}]: [ Switched from V2L->VOD ]`);
           return false;
         } catch (err) {
+          this.streamTypeLive = false;
+          this.working = false;
+          this.eventId = null;
           debug(`[${this.sessionId}]: [ ERROR Switching from V2L->VOD ]`);
           throw new Error(err);
         }
@@ -349,6 +355,9 @@ class StreamSwitcher {
           debug(`[${this.sessionId}]: [ Switched from LIVE->V2L ]`);
           return false;
         } catch (err) {
+          this.streamTypeLive = false;
+          this.working = false;
+          this.eventId = null;
           debug(`[${this.sessionId}]: [ ERROR Switching from LIVE->V2L ]`);
           throw new Error(err);
         }
@@ -389,6 +398,9 @@ class StreamSwitcher {
           debug(`[${this.sessionId}]: Switched from LIVE->VOD`);
           return false;
         } catch (err) {
+          this.streamTypeLive = false;
+          this.working = false;
+          this.eventId = null;
           debug(`[${this.sessionId}]: [ ERROR Switching from LIVE->VOD ]`);
           throw new Error(err);
         }
@@ -425,6 +437,9 @@ class StreamSwitcher {
           debug(`[${this.sessionId}]: Switched from LIVE->LIVE`);
           return true;
         } catch (err) {
+          this.streamTypeLive = false;
+          this.working = false;
+          this.eventId = null;
           debug(`[${this.sessionId}]: [ ERROR Switching from LIVE->LIVE ]`);
           throw new Error(err);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyevinn-channel-engine",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "description": "OTT TV Channel Engine",
   "main": "index.js",
   "scripts": {