@eluvio/elv-client-js 4.0.83 → 4.0.85

package/src/client/LiveStream.js

@@ -358,17 +358,17 @@ const StreamGenerateOffering = async({
  * @return {Promise<Object>} - The status response for the object, as well as logs, warnings and errors from the master initialization
  */
 exports.StreamStatus = async function({name, stopLro=false, showParams=false}) {
-  let conf = await this.LoadConf({name});
+  let objectId = name;
   let status = {name: name};
 
   try {
-    let libraryId = await this.ContentObjectLibraryId({objectId: conf.objectId});
+    let libraryId = await this.ContentObjectLibraryId({objectId});
     status.library_id = libraryId;
-    status.object_id = conf.objectId;
+    status.object_id = objectId;
 
     let mainMeta = await this.ContentObjectMetadata({
-      libraryId: libraryId,
-      objectId: conf.objectId,
+      libraryId,
+      objectId,
       select: [
         "live_recording_config",
         "live_recording"
@@ -416,7 +416,7 @@ exports.StreamStatus = async function({name, stopLro=false, showParams=false}) {
     status.stream_id = edgeWriteToken; // By convention the stream ID is its write token
     let edgeMeta = await this.ContentObjectMetadata({
       libraryId: libraryId,
-      objectId: conf.objectId,
+      objectId: objectId,
       writeToken: edgeWriteToken,
       select: [
         "live_recording"
@@ -442,8 +442,14 @@ exports.StreamStatus = async function({name, stopLro=false, showParams=false}) {
     let tlro = period.live_recording_handle;
     status.tlro = tlro;
 
-    let sinceLastFinalize = Math.floor(new Date().getTime() / 1000) -
-      period.video_finalized_parts_info.last_finalization_time /1000000;
+    let videoLastFinalizationTimeEpochSec = -1;
+    let videoFinalizedParts = 0;
+    let sinceLastFinalize = -1;
+    if (period.finalized_parts_info && period.finalized_parts_info.video && period.finalized_parts_info.video.last_finalization_time) {
+      videoLastFinalizationTimeEpochSec = period.finalized_parts_info.video.last_finalization_time / 1000000;
+      videoFinalizedParts = period.finalized_parts_info.video.n_parts;
+      sinceLastFinalize = Math.floor(new Date().getTime() / 1000) - videoLastFinalizationTimeEpochSec;
+    }
 
     let recording_period = {
       activation_time_epoch_sec: period.recording_start_time_epoch_sec,
@@ -451,15 +457,15 @@ exports.StreamStatus = async function({name, stopLro=false, showParams=false}) {
       start_time_text: new Date(period.start_time_epoch_sec * 1000).toLocaleString(),
       end_time_epoch_sec: period.end_time_epoch_sec,
       end_time_text:  period.end_time_epoch_sec === 0 ? null : new Date(period.end_time_epoch_sec * 1000).toLocaleString(),
-      video_parts: period.video_finalized_parts_info.n_parts,
-      video_last_part_finalized_epoch_sec: period.video_finalized_parts_info.last_finalization_time / 1000000,
+      video_parts: videoFinalizedParts,
+      video_last_part_finalized_epoch_sec: videoLastFinalizationTimeEpochSec,
       video_since_last_finalize_sec : sinceLastFinalize
     };
     status.recording_period = recording_period;
 
     status.lro_status_url = await this.FabricUrl({
       libraryId: libraryId,
-      objectId: conf.objectId,
+      objectId: objectId,
       writeToken: edgeWriteToken,
       call: "live/status/" + tlro
     });
@@ -499,7 +505,7 @@ exports.StreamStatus = async function({name, stopLro=false, showParams=false}) {
     }
 
     // Convert LRO 'state' to desired 'state'
-    if(state === "running" && period.video_finalized_parts_info.last_finalization_time === 0) {
+    if(state === "running" && videoLastFinalizationTimeEpochSec <= 0) {
       state = "starting";
     } else if(state === "running" && sinceLastFinalize > 32.9) {
       state = "stalled";
@@ -510,8 +516,8 @@ exports.StreamStatus = async function({name, stopLro=false, showParams=false}) {
 
     if((state === "running" || state === "stalled" || state === "starting") && stopLro) {
       lroStopUrl = await this.FabricUrl({
-        libraryId: libraryId,
-        objectId: conf.objectId,
+        libraryId,
+        objectId,
         writeToken: edgeWriteToken,
         call: "live/stop/" + tlro
       });
@@ -532,7 +538,6 @@ exports.StreamStatus = async function({name, stopLro=false, showParams=false}) {
 
     if(state === "running") {
       let playout_urls = {};
-      let objectId = conf.objectId;
       let playout_options = await this.PlayoutOptions({
         objectId,
         linkPath: "public/asset_metadata/sources/default"
@@ -593,7 +598,7 @@ exports.StreamStatus = async function({name, stopLro=false, showParams=false}) {
       if(networkInfo.name.includes("demo")) {
         embed_net = "demo";
       }
-      let embed_url = `https://embed.v3.contentfabric.io/?net=${embed_net}&p&ct=h&oid=${conf.objectId}&mt=lv&ath=${token}`;
+      let embed_url = `https://embed.v3.contentfabric.io/?net=${embed_net}&p&ct=h&oid=${objectId}&mt=lv&ath=${token}`;
       playout_urls.embed_url = embed_url;
 
       status.playout_urls = playout_urls;
@@ -618,7 +623,7 @@ exports.StreamStatus = async function({name, stopLro=false, showParams=false}) {
 */
 exports.StreamCreate = async function({name, start=false}) {
   let status = await this.StreamStatus({name});
-  if(status.state !== "inactive" && status.state !== "terminated" && status.state !== "stopped") {
+  if(status.state != "uninitialized" && status.state !== "inactive" && status.state !== "terminated" && status.state !== "stopped") {
     return {
       state: status.state,
       error: "stream still active - must terminate first"
@@ -728,7 +733,7 @@ exports.StreamCreate = async function({name, start=false}) {
 */
 exports.StreamStartOrStopOrReset = async function({name, op}) {
   try {
-    let status = await this.StreamStatus({name});
+    let status = await this.StreamStatus({name})
     if(status.state != "stopped") {
       if(op === "start") {
         status.error = "Unable to start stream - state: " + status.state;
@@ -816,9 +821,7 @@ exports.StreamStartOrStopOrReset = async function({name, op}) {
 exports.StreamStopSession = async function({name}) {
   try {
     this.Log(`Terminating stream session for: ${name}`);
-    let conf = await this.LoadConf({name});
-
-    let {objectId} = conf;
+    let objectId = name;
     let libraryId = await this.ContentObjectLibraryId({objectId});
 
     let mainMeta = await this.ContentObjectMetadata({
@@ -887,8 +890,7 @@ exports.StreamStopSession = async function({name}) {
         fabric_config: {
           edge_write_token: ""
         }
-      },
-      recording_stop_time: stopTime
+      }
     };
 
     await this.MergeMetadata({
@@ -933,9 +935,8 @@ exports.StreamInitialize = async function({name, drm=false, format}) {
   let typeLiveStream;
 
   // Fetch Title and Live Stream content types from tenant meta
-  const tenantContractId = await client.userProfileClient.TenantContractId();
-  let liveStreamContentType, titleContentType;
-  const {live_stream, title} = await client.ContentObjectMetadata({
+  const tenantContractId = await this.userProfileClient.TenantContractId();
+  const {live_stream, title} = await this.ContentObjectMetadata({
     libraryId: tenantContractId.replace("iten", "ilib"),
     objectId: tenantContractId.replace("iten", "iq__"),
     metadataSubtree: "public/content_types",
@@ -964,7 +965,7 @@ exports.StreamInitialize = async function({name, drm=false, format}) {
 };
 
 /**
- * Set the Live Stream offering
+ * Create a dummy VoD offering and initialize DRM keys.
  *
  * @methodGroup Live Stream
  * @namedParams
@@ -980,7 +981,7 @@ exports.StreamInitialize = async function({name, drm=false, format}) {
  */
 exports.StreamSetOfferingAndDRM = async function({name, typeAbrMaster, typeLiveStream, drm=false, format}) {
   let status = await this.StreamStatus({name});
-  if(status.state != "inactive" && status.state != "stopped") {
+  if(status.state != "uninitialized" && status.state != "inactive" && status.state != "stopped") {
     return {
       state: status.state,
       error: "stream still active - must terminate first"
@@ -1162,13 +1163,12 @@ exports.StreamInsertion = async function({name, insertionTime, sinceStart=false,
     }
   }
 
-  let conf = await this.LoadConf({name});
-  let libraryId = await this.ContentObjectLibraryId({objectId: conf.objectId});
-  let objectId = conf.objectId;
+  let objectId = name;
+  let libraryId = await this.ContentObjectLibraryId({objectId});
 
   let mainMeta = await this.ContentObjectMetadata({
-    libraryId: libraryId,
-    objectId: conf.objectId
+    libraryId,
+    objectId
   });
 
   let fabURI = mainMeta.live_recording.fabric_config.ingress_node_api;
@@ -1182,8 +1182,8 @@ exports.StreamInsertion = async function({name, insertionTime, sinceStart=false,
   let edgeWriteToken = mainMeta.live_recording.fabric_config.edge_write_token;
 
   let edgeMeta = await this.ContentObjectMetadata({
-    libraryId: libraryId,
-    objectId: conf.objectId,
+    libraryId,
+    objectId,
     writeToken: edgeWriteToken
   });
 
@@ -1298,73 +1298,52 @@ exports.StreamInsertion = async function({name, insertionTime, sinceStart=false,
 };
 
 /**
- * Load cached stream configuration
+ * Configure the stream based on built-in logic and optional custom settings.
  *
- * @methodGroup Live Stream
- * @namedParams
- * @param {string} name - Object ID or name of the live stream object
- *
- * @return {Promise<Object>} - The configuration of the stream
- */
-exports.LoadConf = async function({name}) {
-  if(name.startsWith("iq__")) {
-    return {
-      name: name,
-      objectId: name
-    };
-  }
-
-  // If name is not a QID, load liveconf.json
-  let streamsBuf;
-  try {
-    streamsBuf = fs.readFileSync(
-      path.resolve(__dirname, "../liveconf.json")
-    );
-  } catch(error) {
-    console.log("Stream name must be a QID or a label in liveconf.json");
-    return {};
-  }
-  const streams = JSON.parse(streamsBuf);
-  const conf = streams[name];
-  if(conf === null) {
-    console.log("Bad name: ", name);
-    return {};
-  }
-
-  return conf;
-};
-
-/**
- * Configure the stream
+ * Custom settings format:
+ *    {
+ *      "audio" {
+ *        "1" : {  // This is the stream index
+ *          "tags" : "language: english",
+ *          "codec" : "aac",
+ *          "bitrate": 204000,
+ *          "record":  true,
+ *          "recording_bitrate" : 192000,
+ *          "recording_channels" : 2,
+ *          "playout": bool
+ *          "playout_label": "English (Stereo)"
+ *        },
+ *        "3": {
+ *          ...
+ *        }
+ *      }
+ *    }
  *
  * @methodGroup Live Stream
  * @namedParams
  * @param {string} name - Object ID or name of the live stream object
  * @param {Object=} customSettings - Additional options to customize configuration settings
- * - audioBitrate
- * - audioIndex
- * - partTtl
- * - channelLayout
- *
+ * @param {Object=} probeMetadata - Metadata for the probe. If not specified, a new probe will be configured
  * @return {Promise<Object>} - The status response for the stream
  *
  */
-exports.StreamConfig = async function({name, customSettings={}}) {
-  let conf = await this.LoadConf({name});
+exports.StreamConfig = async function({name, customSettings={}, probeMetadata}) {
+  let objectId = name;
   let status = {name};
 
-  let libraryId = await this.ContentObjectLibraryId({objectId: conf.objectId});
+  let libraryId = await this.ContentObjectLibraryId({objectId});
   status.library_id = libraryId;
-  status.object_id = conf.objectId;
+  status.object_id = objectId;
+
+  let probe = probeMetadata;
 
   let mainMeta = await this.ContentObjectMetadata({
     libraryId: libraryId,
-    objectId: conf.objectId
+    objectId: objectId
   });
 
   let userConfig = mainMeta.live_recording_config;
   status.user_config = userConfig;
-  console.log("userConfig", userConfig);
 
   // Get node URI from user config
   const hostName = userConfig.url.replace("udp://", "").replace("rtmp://", "").replace("srt://", "").split(":")[0];
@@ -1378,80 +1357,85 @@ exports.StreamConfig = async function({name, customSettings={}}) {
   }
   const node = nodes[0];
   status.node = node;
-
   let endpoint = node.endpoints[0];
-  this.SetNodes({fabricURIs: [endpoint]});
-
-  // Probe the stream
-  let probe = {};
-  const controller = new AbortController();
-  const timeoutId = setTimeout(() => {
-    controller.abort();
-  }, 60 * 1000); // milliseconds
-  try {
 
-    let probeUrl = await this.Rep({
-      libraryId,
-      objectId: conf.objectId,
-      rep: "probe"
-    });
+  if(!probe) {
+    this.SetNodes({fabricURIs: [endpoint]});
 
-    probe = await this.utils.ResponseToJson(
-      await HttpClient.Fetch(probeUrl, {
-        body: JSON.stringify({
-          "filename": streamUrl.href,
-          "listen": true
-        }),
-        method: "POST",
-        signal: controller.signal
-      })
-    );
+    // Probe the stream
+    probe = {};
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => {
+      controller.abort();
+    }, 60 * 1000); // milliseconds
+    try {
 
-    if(probe) { clearTimeout(timeoutId); }
+      let probeUrl = await this.Rep({
+        libraryId,
+        objectId,
+        rep: "probe"
+      });
 
-    if(probe.errors) {
-      throw probe.errors[0];
-    }
-  } catch(error) {
-    if(error.code === "ETIMEDOUT") {
-      throw "Stream probe time out - make sure the stream source is available";
-    } else {
-      throw error;
+      probe = await this.utils.ResponseToJson(
+        await HttpClient.Fetch(probeUrl, {
+          body: JSON.stringify({
+            "filename": streamUrl.href,
+            "listen": true
+          }),
+          method: "POST",
+          signal: controller.signal
+        })
+      );
+
+      if(probe) { clearTimeout(timeoutId); }
+
+      if(probe.errors) {
+        throw probe.errors[0];
+      }
+    } catch(error) {
+      if(error.code === "ETIMEDOUT") {
+        throw "Stream probe time out - make sure the stream source is available";
+      } else {
+        throw error;
+      }
     }
-  }
 
-  probe.format.filename = streamUrl.href;
+    probe.format.filename = streamUrl.href;
+  }
 
   // Create live recording config
   let lc = new LiveConf(probe, node.id, endpoint, false, false, true);
 
-  const liveRecordingConfigStr = lc.generateLiveConf({
-    audioBitrate: customSettings.audioBitrate,
-    audioIndex: customSettings.audioIndex,
-    partTtl: customSettings.partTtl,
-    channelLayout: customSettings.channelLayout
+  const liveRecordingConfig = lc.generateLiveConf({
+    customSettings
   });
-  let liveRecordingConfig = JSON.parse(liveRecordingConfigStr);
-  console.log("CONFIG", JSON.stringify(liveRecordingConfig.live_recording));
 
   // Store live recording config into the stream object
   let e = await this.EditContentObject({
     libraryId,
-    objectId: conf.objectId
+    objectId: objectId
   });
   let writeToken = e.write_token;
 
   await this.ReplaceMetadata({
     libraryId,
-    objectId: conf.objectId,
+    objectId,
     writeToken,
     metadataSubtree: "live_recording",
     metadata: liveRecordingConfig.live_recording
   });
 
+  await this.ReplaceMetadata({
+    libraryId,
+    objectId,
+    writeToken,
+    metadataSubtree: "live_recording_config/probe_info",
+    metadata: probe
+  });
+
   status.fin = await this.FinalizeContentObject({
     libraryId,
-    objectId: conf.objectId,
+    objectId,
     writeToken,
     commitMessage: "Apply live stream configuration"
   });
@@ -1499,7 +1483,8 @@ exports.StreamListUrls = async function({siteId}={}) {
       objectId: siteId,
       metadataSubtree: "public/asset_metadata/live_streams",
       resolveLinks: true,
-      resolveIgnoreErrors: true
+      resolveIgnoreErrors: true,
+      resolveIncludeSource: true
     });
 
     const activeUrlMap = {};
@@ -1510,18 +1495,8 @@ exports.StreamListUrls = async function({siteId}={}) {
         const stream = streamMetadata[slug];
         let versionHash;
 
-        if(
-          stream &&
-          stream.sources &&
-          stream.sources.default &&
-          stream.sources.default["."] &&
-          stream.sources.default["."].container ||
-          ((stream["/"] || "").match(/^\/?qfab\/([\w]+)\/?.+/) || [])[1]
-        ) {
-          versionHash = (
-            stream.sources.default["."].container ||
-            ((stream["/"] || "").match(/^\/?qfab\/([\w]+)\/?.+/) || [])[1]
-          );
+        if(stream && stream["."] && stream["."].source) {
+          versionHash = stream["."].source;
         }
 
         if(versionHash) {
@@ -1646,7 +1621,7 @@ exports.StreamCopyToVod = async function({
   startTime="",
   endTime=""
 }) {
-  const conf = await this.LoadConf({name});
+  const objectId = name;
   const abrProfile = require("../abr_profiles/abr_profile_live_to_vod.js");
 
   const status = await this.StreamStatus({name});
@@ -1672,9 +1647,9 @@ exports.StreamCopyToVod = async function({
   }
 
   try {
-    status.live_object_id = conf.objectId;
+    status.live_object_id = objectId;
 
-    const liveHash = await this.LatestVersionHash({objectId: conf.objectId, libraryId});
+    const liveHash = await this.LatestVersionHash({objectId, libraryId});
     status.live_hash = liveHash;
 
     if(eventId) {