@eluvio/elv-client-js 4.0.78 → 4.0.79

package/dist/src/client/LiveStream.js

@@ -341,7 +341,7 @@ var StreamGenerateOffering = /*#__PURE__*/function () {
  */
 exports.StreamStatus = /*#__PURE__*/function () {
   var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref5) {
-    var name, _ref5$stopLro, stopLro, _ref5$showParams, showParams, conf, status, libraryId, mainMeta, fabURI, edgeWriteToken, edgeMeta, recordings, sequence, period, tlro, sinceLastFinalize, recording_period, insertions, i, insertionTimeSinceEpoch, state, lroStatus, playout_urls, objectId, playout_options, hls_clear_enabled, hls_aes128_enabled, hls_sample_aes_enabled, networkInfo, token, embed_net, embed_url;
+    var name, _ref5$stopLro, stopLro, _ref5$showParams, showParams, conf, status, libraryId, mainMeta, fabURI, _edgeWriteToken, edgeMeta, recordings, sequence, period, tlro, sinceLastFinalize, recording_period, insertions, i, insertionTimeSinceEpoch, state, lroStatus, playout_urls, objectId, playout_options, hls_clear_enabled, hls_aes128_enabled, hls_sample_aes_enabled, networkInfo, token, embed_net, embed_url;
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -403,8 +403,8 @@ exports.StreamStatus = /*#__PURE__*/function () {
           }
           status.fabric_api = fabURI;
           status.url = mainMeta.live_recording.recording_config.recording_params.origin_url;
-          edgeWriteToken = mainMeta.live_recording.fabric_config.edge_write_token;
-          if (edgeWriteToken) {
+          _edgeWriteToken = mainMeta.live_recording.fabric_config.edge_write_token;
+          if (_edgeWriteToken) {
             _context3.next = 33;
             break;
           }
@@ -412,16 +412,16 @@ exports.StreamStatus = /*#__PURE__*/function () {
           return _context3.abrupt("return", status);
         case 33:
           this.RecordWriteToken({
-            writeToken: edgeWriteToken,
+            writeToken: _edgeWriteToken,
             fabricNodeUrl: fabURI
           });
-          status.edge_write_token = edgeWriteToken;
-          status.stream_id = edgeWriteToken; // By convention the stream ID is its write token
+          status.edge_write_token = _edgeWriteToken;
+          status.stream_id = _edgeWriteToken; // By convention the stream ID is its write token
           _context3.next = 38;
           return this.ContentObjectMetadata({
             libraryId: libraryId,
             objectId: conf.objectId,
-            writeToken: edgeWriteToken,
+            writeToken: _edgeWriteToken,
             select: ["live_recording"]
           });
         case 38:
@@ -458,7 +458,7 @@ exports.StreamStatus = /*#__PURE__*/function () {
           return this.FabricUrl({
             libraryId: libraryId,
             objectId: conf.objectId,
-            writeToken: edgeWriteToken,
+            writeToken: _edgeWriteToken,
             call: "live/status/" + tlro
           });
         case 54:
@@ -519,7 +519,7 @@ exports.StreamStatus = /*#__PURE__*/function () {
           return this.FabricUrl({
             libraryId: libraryId,
             objectId: conf.objectId,
-            writeToken: edgeWriteToken,
+            writeToken: _edgeWriteToken,
             call: "live/stop/" + tlro
           });
         case 82:
@@ -933,8 +933,7 @@ exports.StreamStartOrStopOrReset = /*#__PURE__*/function () {
 }();
 
 /**
- * Stop the live stream session and close the edge write token.
- * Not implemented fully
+ * Close the edge write token and make the stream object inactive.
  *
  * @methodGroup Live Stream
  * @namedParams
@@ -944,13 +943,13 @@ exports.StreamStartOrStopOrReset = /*#__PURE__*/function () {
  */
 exports.StreamStopSession = /*#__PURE__*/function () {
   var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(_ref11) {
-    var name, conf, objectId, libraryId, mainMeta, fabURI, edgeWriteToken, edgeMeta, status, tries, fin;
+    var name, conf, objectId, libraryId, mainMeta, fabURI, metaEdgeWriteToken, streamMetadata, status, _yield$this$EditConte, writeToken, newState, stopTime, finalizeMetadata, fin;
     return _regeneratorRuntime.wrap(function _callee6$(_context6) {
       while (1) switch (_context6.prev = _context6.next) {
         case 0:
           name = _ref11.name;
           _context6.prev = 1;
-          console.log("TERMINATE: ", name);
+          this.Log("Terminating stream session for: ".concat(name));
           _context6.next = 5;
           return this.LoadConf({
             name: name
@@ -979,121 +978,108 @@ exports.StreamStopSession = /*#__PURE__*/function () {
           this.SetNodes({
             fabricURIs: [fabURI]
           });
-          edgeWriteToken = mainMeta.live_recording.fabric_config.edge_write_token;
-          if (!(edgeWriteToken === undefined || edgeWriteToken === "")) {
+          metaEdgeWriteToken = mainMeta.live_recording.fabric_config.edge_write_token;
+          if (metaEdgeWriteToken) {
             _context6.next = 19;
             break;
           }
           return _context6.abrupt("return", {
             state: "inactive",
-            error: "no active streams - must create a stream first"
+            error: "The stream is not active"
           });
         case 19:
-          _context6.next = 21;
+          _context6.prev = 19;
+          _context6.next = 22;
           return this.ContentObjectMetadata({
             libraryId: libraryId,
             objectId: objectId,
-            writeToken: edgeWriteToken
+            writeToken: metaEdgeWriteToken
           });
-        case 21:
-          edgeMeta = _context6.sent;
-          _context6.next = 24;
+        case 22:
+          streamMetadata = _context6.sent;
+          _context6.next = 25;
           return this.StreamStatus({
             name: name
           });
-        case 24:
+        case 25:
           status = _context6.sent;
-          if (!(status.state != "terminated")) {
-            _context6.next = 48;
+          if (!(status.state !== "stopped")) {
+            _context6.next = 28;
             break;
           }
-          console.log("STOPPING");
-          _context6.prev = 27;
+          return _context6.abrupt("return", {
+            state: status.state,
+            error: "The stream must be stopped before terminating"
+          });
+        case 28:
           _context6.next = 30;
-          return this.CallBitcodeMethod({
-            libraryId: status.library_id,
-            objectId: status.object_id,
-            writeToken: status.edge_write_token,
-            method: "/live/stop/" + status.tlro,
-            constant: false
+          return this.DeleteWriteToken({
+            libraryId: libraryId,
+            writeToken: metaEdgeWriteToken
           });
         case 30:
-          _context6.next = 34;
+          _context6.next = 35;
           break;
         case 32:
           _context6.prev = 32;
-          _context6.t0 = _context6["catch"](27);
-        case 34:
-          // Wait until LRO is terminated
-          tries = 10;
+          _context6.t0 = _context6["catch"](19);
+          this.Log("Unable to retrieve metadata for edge write token ".concat(edgeWriteToken));
         case 35:
-          if (!(status.state != "stopped" && tries-- > 0)) {
-            _context6.next = 44;
-            break;
-          }
-          console.log("Wait to terminate - ", status.state);
-          _context6.next = 39;
-          return Sleep(1000);
-        case 39:
-          _context6.next = 41;
-          return this.StreamStatus({
-            name: name
+          _context6.next = 37;
+          return this.EditContentObject({
+            libraryId: libraryId,
+            objectId: objectId
           });
-        case 41:
-          status = _context6.sent;
-          _context6.next = 35;
-          break;
-        case 44:
-          console.log("Status after stop - ", status.state);
-          if (!(tries <= 0)) {
-            _context6.next = 48;
-            break;
-          }
-          console.log("Failed to stop");
-          return _context6.abrupt("return", status);
-        case 48:
-          // Set stop time
-          edgeMeta.recording_stop_time = Math.floor(new Date().getTime() / 1000);
-          console.log("recording_start_time: ", edgeMeta.recording_start_time);
-          console.log("recording_stop_time:  ", edgeMeta.recording_stop_time);
-          edgeMeta.live_recording.status = {
-            state: "terminated",
-            recording_stop_time: edgeMeta.recording_stop_time
+        case 37:
+          _yield$this$EditConte = _context6.sent;
+          writeToken = _yield$this$EditConte.writeToken;
+          // Set stop time and inactive state
+          newState = "inactive";
+          stopTime = Math.floor(new Date().getTime() / 1000);
+          finalizeMetadata = {
+            live_recording: {
+              status: {
+                edge_write_token: "",
+                state: newState,
+                recording_stop_time: stopTime
+              },
+              fabric_config: {
+                edge_write_token: ""
+              }
+            },
+            recording_stop_time: stopTime
           };
-          edgeMeta.live_recording.fabric_config.edge_write_token = "";
-          _context6.next = 55;
-          return this.ReplaceMetadata({
+          _context6.next = 44;
+          return this.MergeMetadata({
             libraryId: libraryId,
             objectId: objectId,
-            writeToken: edgeWriteToken,
-            metadata: edgeMeta
+            writeToken: writeToken,
+            metadata: finalizeMetadata
           });
-        case 55:
-          _context6.next = 57;
+        case 44:
+          _context6.next = 46;
           return this.FinalizeContentObject({
             libraryId: libraryId,
             objectId: objectId,
-            writeToken: edgeWriteToken,
-            commitMessage: "Finalize live stream - stop time " + edgeMeta.recording_stop_time,
-            publish: false // Don't publish this version because it is not currently useful
+            writeToken: writeToken,
+            commitMessage: "Deactivate live stream - stop time ".concat(stopTime)
           });
-        case 57:
+        case 46:
           fin = _context6.sent;
           return _context6.abrupt("return", {
             fin: fin,
             name: name,
-            edge_write_token: edgeWriteToken,
-            state: "terminated"
+            state: newState
           });
-        case 61:
-          _context6.prev = 61;
+        case 50:
+          _context6.prev = 50;
           _context6.t1 = _context6["catch"](1);
           console.error(_context6.t1);
-        case 64:
+        case 53:
         case "end":
           return _context6.stop();
       }
-    }, _callee6, this, [[1, 61], [27, 32]]);
+    }, _callee6, this, [[1, 50], [19, 32]]);
   }));
   return function (_x6) {
     return _ref12.apply(this, arguments);
@@ -1793,135 +1779,178 @@ exports.StreamConfig = /*#__PURE__*/function () {
 }();
 
 /**
- * Deactivate the stream
+ * List the pre-allocated URLs for a site
  *
  * @methodGroup Live Stream
  * @namedParams
- * @param {string} name - Object ID or name of the live stream object
+ * @param {string=} - ID of the live stream site object
  *
- * @return {Promise<Object>} - The status response for the stream
+ * @return {Promise<Object>} - The list of stream URLs
  */
-exports.StreamDeactivate = /*#__PURE__*/function () {
-  var _ref24 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12(_ref23) {
-    var name, conf, objectId, libraryId, mainMeta, status, fabURI, edgeWriteToken, edgeMeta, newState, fin;
-    return _regeneratorRuntime.wrap(function _callee12$(_context12) {
-      while (1) switch (_context12.prev = _context12.next) {
-        case 0:
-          name = _ref23.name;
-          _context12.prev = 1;
-          _context12.next = 4;
-          return this.LoadConf({
-            name: name
-          });
-        case 4:
-          conf = _context12.sent;
-          objectId = conf.objectId;
-          _context12.next = 8;
-          return this.ContentObjectLibraryId({
-            objectId: objectId
-          });
-        case 8:
-          libraryId = _context12.sent;
-          _context12.next = 11;
-          return this.ContentObjectMetadata({
-            libraryId: libraryId,
-            objectId: objectId
-          });
-        case 11:
-          mainMeta = _context12.sent;
-          _context12.next = 14;
-          return this.StreamStatus({
-            name: name
-          });
-        case 14:
-          status = _context12.sent;
-          if (mainMeta.live_recording) {
-            _context12.next = 17;
-            break;
-          }
-          return _context12.abrupt("return", {
-            state: status.state,
-            error: "Stream must be configured before deactivating"
-          });
-        case 17:
-          if (!(status.state !== "stopped")) {
-            _context12.next = 19;
-            break;
-          }
-          return _context12.abrupt("return", {
-            state: status.state,
-            error: "Stream must be stopped before deactivating"
-          });
-        case 19:
-          fabURI = mainMeta.live_recording.fabric_config.ingress_node_api; // Support both hostname and URL ingress_node_api
-          if (!fabURI.startsWith("http")) {
-            // Assume https
-            fabURI = "https://" + fabURI;
-          }
-          this.SetNodes({
-            fabricURIs: [fabURI]
-          });
-          edgeWriteToken = mainMeta.live_recording.fabric_config.edge_write_token;
-          if (!(edgeWriteToken === undefined || edgeWriteToken === "")) {
-            _context12.next = 25;
-            break;
-          }
-          return _context12.abrupt("return", {
-            state: "inactive",
-            error: "stream is already inactive"
-          });
-        case 25:
-          _context12.next = 27;
-          return this.ContentObjectMetadata({
-            libraryId: libraryId,
-            objectId: objectId,
-            writeToken: edgeWriteToken
-          });
-        case 27:
-          edgeMeta = _context12.sent;
-          // Set stop time
-          edgeMeta.recording_stop_time = Math.floor(new Date().getTime() / 1000);
-          newState = "inactive";
-          edgeMeta.live_recording.status = {
-            state: newState,
-            recording_stop_time: edgeMeta.recording_stop_time
+exports.StreamListUrls = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
+  var _this = this;
+  var _ref24,
+    siteId,
+    STATUS_MAP,
+    tenantContractId,
+    streamMetadata,
+    activeUrlMap,
+    streamUrlStatus,
+    streamUrls,
+    _args13 = arguments;
+  return _regeneratorRuntime.wrap(function _callee13$(_context13) {
+    while (1) switch (_context13.prev = _context13.next) {
+      case 0:
+        _ref24 = _args13.length > 0 && _args13[0] !== undefined ? _args13[0] : {}, siteId = _ref24.siteId;
+        _context13.prev = 1;
+        STATUS_MAP = {
+          UNCONFIGURED: "unconfigured",
+          UNINITIALIZED: "uninitialized",
+          INACTIVE: "inactive",
+          STOPPED: "stopped",
+          STARTING: "starting",
+          RUNNING: "running",
+          STALLED: "stalled"
+        };
+        if (siteId) {
+          _context13.next = 12;
+          break;
+        }
+        _context13.next = 6;
+        return this.userProfileClient.TenantContractId();
+      case 6:
+        tenantContractId = _context13.sent;
+        if (tenantContractId) {
+          _context13.next = 9;
+          break;
+        }
+        throw Error("No tenant contract ID configured");
+      case 9:
+        _context13.next = 11;
+        return this.ContentObjectMetadata({
+          libraryId: tenantContractId.replace("iten", "ilib"),
+          objectId: tenantContractId.replace("iten", "iq__"),
+          metadataSubtree: "public/sites/live_streams"
+        });
+      case 11:
+        siteId = _context13.sent;
+      case 12:
+        _context13.t0 = this;
+        _context13.next = 15;
+        return this.ContentObjectLibraryId({
+          objectId: siteId
+        });
+      case 15:
+        _context13.t1 = _context13.sent;
+        _context13.t2 = siteId;
+        _context13.t3 = {
+          libraryId: _context13.t1,
+          objectId: _context13.t2,
+          metadataSubtree: "public/asset_metadata/live_streams",
+          resolveLinks: true,
+          resolveIgnoreErrors: true
+        };
+        _context13.next = 20;
+        return _context13.t0.ContentObjectMetadata.call(_context13.t0, _context13.t3);
+      case 20:
+        streamMetadata = _context13.sent;
+        activeUrlMap = {};
+        _context13.next = 24;
+        return this.utils.LimitedMap(10, Object.keys(streamMetadata || {}), /*#__PURE__*/function () {
+          var _ref25 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12(slug) {
+            var stream, versionHash, objectId, libraryId, status, streamMeta, url, isActive;
+            return _regeneratorRuntime.wrap(function _callee12$(_context12) {
+              while (1) switch (_context12.prev = _context12.next) {
+                case 0:
+                  stream = streamMetadata[slug];
+                  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 (!versionHash) {
+                    _context12.next = 16;
+                    break;
+                  }
+                  objectId = _this.utils.DecodeVersionHash(versionHash).objectId;
+                  _context12.next = 6;
+                  return _this.ContentObjectLibraryId({
+                    objectId: objectId
+                  });
+                case 6:
+                  libraryId = _context12.sent;
+                  _context12.next = 9;
+                  return _this.StreamStatus({
+                    name: objectId
+                  });
+                case 9:
+                  status = _context12.sent;
+                  _context12.next = 12;
+                  return _this.ContentObjectMetadata({
+                    objectId: objectId,
+                    libraryId: libraryId,
+                    select: ["live_recording_config/reference_url",
+                    // live_recording_config/url is the old path
+                    "live_recording_config/url"]
+                  });
+                case 12:
+                  streamMeta = _context12.sent;
+                  url = streamMeta.live_recording_config.reference_url || streamMeta.live_recording_config.url;
+                  isActive = [STATUS_MAP.STARTING, STATUS_MAP.RUNNING, STATUS_MAP.STALLED, STATUS_MAP.STOPPED].includes(status.state);
+                  if (url && isActive) {
+                    activeUrlMap[url] = true;
+                  }
+                case 16:
+                case "end":
+                  return _context12.stop();
+              }
+            }, _callee12);
+          }));
+          return function (_x12) {
+            return _ref25.apply(this, arguments);
           };
-          edgeMeta.live_recording.fabric_config.edge_write_token = "";
-          _context12.next = 34;
-          return this.ReplaceMetadata({
-            libraryId: libraryId,
-            objectId: objectId,
-            writeToken: edgeWriteToken,
-            metadata: edgeMeta
-          });
-        case 34:
-          _context12.next = 36;
-          return this.FinalizeContentObject({
-            libraryId: libraryId,
-            objectId: objectId,
-            writeToken: edgeWriteToken,
-            commitMessage: "Deactivate stream"
-          });
-        case 36:
-          fin = _context12.sent;
-          return _context12.abrupt("return", {
-            reference_url: status.reference_url,
-            fin: fin,
-            name: name,
-            edge_write_token: edgeWriteToken,
-            state: newState
+        }());
+      case 24:
+        streamUrlStatus = {};
+        _context13.t4 = this;
+        _context13.next = 28;
+        return this.ContentObjectLibraryId({
+          objectId: siteId
+        });
+      case 28:
+        _context13.t5 = _context13.sent;
+        _context13.t6 = siteId;
+        _context13.t7 = {
+          libraryId: _context13.t5,
+          objectId: _context13.t6,
+          metadataSubtree: "/live_stream_urls",
+          resolveLinks: true,
+          resolveIgnoreErrors: true
+        };
+        _context13.next = 33;
+        return _context13.t4.ContentObjectMetadata.call(_context13.t4, _context13.t7);
+      case 33:
+        streamUrls = _context13.sent;
+        if (streamUrls) {
+          _context13.next = 36;
+          break;
+        }
+        throw Error("No pre-allocated URLs configured");
+      case 36:
+        Object.keys(streamUrls || {}).forEach(function (protocol) {
+          streamUrlStatus[protocol] = streamUrls[protocol].map(function (url) {
+            return {
+              url: url,
+              active: activeUrlMap[url] || false
+            };
           });
-        case 40:
-          _context12.prev = 40;
-          _context12.t0 = _context12["catch"](1);
-          console.error(_context12.t0);
-        case 43:
-        case "end":
-          return _context12.stop();
-      }
-    }, _callee12, this, [[1, 40]]);
-  }));
-  return function (_x12) {
-    return _ref24.apply(this, arguments);
-  };
-}();
+        });
+        return _context13.abrupt("return", streamUrlStatus);
+      case 40:
+        _context13.prev = 40;
+        _context13.t8 = _context13["catch"](1);
+        console.error(_context13.t8);
+      case 43:
+      case "end":
+        return _context13.stop();
+    }
+  }, _callee13, this, [[1, 40]]);
+}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "4.0.78",
+  "version": "4.0.79",
   "description": "Javascript client for the Eluvio Content Fabric",
   "main": "src/index.js",
   "author": "Kevin Talmadge",

package/src/FrameClient.js

@@ -387,6 +387,7 @@ class FrameClient {
       "DeleteMetadata",
       "DeleteNTPInstance",
       "DeletePart",
+      "DeleteWriteToken",
       "DeployContract",
       "Download",
       "DownloadEncrypted",
@@ -476,9 +477,9 @@ class FrameClient {
       "StartABRMezzanineJobs",
       "StreamConfig",
       "StreamCreate",
-      "StreamDeactivate",
       "StreamInitialize",
       "StreamInsertion",
+      "StreamListUrls",
       "StreamStatus",
       "StreamStartOrStopOrReset",
       "StreamStopSession",

package/src/HttpClient.js

@@ -29,6 +29,12 @@ class HttpClient {
     this.draftURIs[writeToken] = new URI(nodeUrlStr);
   }
 
+  ClearWriteToken({writeToken}) {
+    if(Object.hasOwn(this.draftURIs, writeToken)) {
+      delete this.draftURIs[writeToken];
+    }
+  }
+
   RequestHeaders(bodyType, headers={}) {
     if(!headers.Accept) {
       headers["Accept"] = "application/json";