@eluvio/elv-client-js 4.0.105 → 4.0.107

package/dist/src/client/LiveStream.js

@@ -498,25 +498,35 @@ exports.StreamStatus = /*#__PURE__*/function () {
           });
           status.edge_write_token = edgeWriteToken;
           status.stream_id = edgeWriteToken; // By convention the stream ID is its write token
-          _context4.next = 36;
+          _context4.prev = 34;
+          _context4.next = 37;
           return this.ContentObjectMetadata({
             libraryId: libraryId,
             objectId: objectId,
             writeToken: edgeWriteToken,
             select: ["live_recording"]
           });
-        case 36:
+        case 37:
           edgeMeta = _context4.sent;
-          status.edge_meta_size = JSON.stringify(edgeMeta).length;
+          _context4.next = 45;
+          break;
+        case 40:
+          _context4.prev = 40;
+          _context4.t0 = _context4["catch"](34);
+          console.error("Unable to read edge write token metadata. Has token been deleted?", _context4.t0);
+          status.state = "inactive";
+          return _context4.abrupt("return", status);
+        case 45:
+          status.edge_meta_size = JSON.stringify(edgeMeta || "").length;
 
           // If a stream has never been started return state 'inactive'
           if (!(edgeMeta.live_recording === undefined || edgeMeta.live_recording.recordings === undefined || edgeMeta.live_recording.recordings.recording_sequence === undefined)) {
-            _context4.next = 41;
+            _context4.next = 49;
             break;
           }
           status.state = "stopped";
           return _context4.abrupt("return", status);
-        case 41:
+        case 49:
           recordings = edgeMeta.live_recording.recordings;
           status.recording_period_sequence = recordings.recording_sequence;
           sequence = recordings.recording_sequence;
@@ -542,14 +552,14 @@ exports.StreamStatus = /*#__PURE__*/function () {
             video_since_last_finalize_sec: sinceLastFinalize
           };
           status.recording_period = recording_period;
-          _context4.next = 55;
+          _context4.next = 63;
           return this.FabricUrl({
             libraryId: libraryId,
             objectId: objectId,
             writeToken: edgeWriteToken,
             call: "live/status/" + tlro
           });
-        case 55:
+        case 63:
           status.lro_status_url = _context4.sent;
           status.insertions = [];
           if (edgeMeta.live_recording.playout_config.interleaves != undefined && edgeMeta.live_recording.playout_config.interleaves[sequence] != undefined) {
@@ -569,15 +579,15 @@ exports.StreamStatus = /*#__PURE__*/function () {
           }
           state = "stopped";
           lroStatus = "";
-          _context4.prev = 61;
-          _context4.t0 = this.utils;
-          _context4.next = 65;
+          _context4.prev = 69;
+          _context4.t1 = this.utils;
+          _context4.next = 73;
           return HttpClient.Fetch(status.lro_status_url);
-        case 65:
-          _context4.t1 = _context4.sent;
-          _context4.next = 68;
-          return _context4.t0.ResponseToJson.call(_context4.t0, _context4.t1);
-        case 68:
+        case 73:
+          _context4.t2 = _context4.sent;
+          _context4.next = 76;
+          return _context4.t1.ResponseToJson.call(_context4.t1, _context4.t2);
+        case 76:
           lroStatus = _context4.sent;
           state = lroStatus.state;
           status.warnings = lroStatus.custom && lroStatus.custom.warnings;
@@ -585,16 +595,16 @@ exports.StreamStatus = /*#__PURE__*/function () {
           if (lroStatus.custom && lroStatus.custom.status) {
             status.recording_status = lroStatus.custom.status;
           }
-          _context4.next = 81;
+          _context4.next = 89;
           break;
-        case 75:
-          _context4.prev = 75;
-          _context4.t2 = _context4["catch"](61);
-          console.log("LRO Status (failed): ", _context4.t2.response.statusCode);
+        case 83:
+          _context4.prev = 83;
+          _context4.t3 = _context4["catch"](69);
+          console.log("LRO Status (failed): ", _context4.t3.response.statusCode);
           status.state = "stopped";
-          status.error = _context4.t2.response;
+          status.error = _context4.t3.response;
           return _context4.abrupt("return", status);
-        case 81:
+        case 89:
           // Convert LRO 'state' to desired 'state'
           if (state === "running" && videoLastFinalizationTimeEpochSec <= 0) {
             state = "starting";
@@ -605,97 +615,97 @@ exports.StreamStatus = /*#__PURE__*/function () {
           }
           status.state = state;
           if (!((state === "running" || state === "stalled" || state === "starting") && stopLro)) {
-            _context4.next = 102;
+            _context4.next = 110;
             break;
           }
-          _context4.next = 86;
+          _context4.next = 94;
           return this.FabricUrl({
             libraryId: libraryId,
             objectId: objectId,
             writeToken: edgeWriteToken,
             call: "live/stop/" + tlro
           });
-        case 86:
+        case 94:
           lroStopUrl = _context4.sent;
-          _context4.prev = 87;
-          _context4.t3 = this.utils;
-          _context4.next = 91;
+          _context4.prev = 95;
+          _context4.t4 = this.utils;
+          _context4.next = 99;
           return HttpClient.Fetch(lroStopUrl);
-        case 91:
-          _context4.t4 = _context4.sent;
-          _context4.next = 94;
-          return _context4.t3.ResponseToJson.call(_context4.t3, _context4.t4);
-        case 94:
+        case 99:
+          _context4.t5 = _context4.sent;
+          _context4.next = 102;
+          return _context4.t4.ResponseToJson.call(_context4.t4, _context4.t5);
+        case 102:
           console.log("LRO Stop: ", lroStatus.body);
-          _context4.next = 100;
+          _context4.next = 108;
           break;
-        case 97:
-          _context4.prev = 97;
-          _context4.t5 = _context4["catch"](87);
-          console.log("LRO Stop (failed): ", _context4.t5.response.statusCode);
-        case 100:
+        case 105:
+          _context4.prev = 105;
+          _context4.t6 = _context4["catch"](95);
+          console.log("LRO Stop (failed): ", _context4.t6.response.statusCode);
+        case 108:
           state = "stopped";
           status.state = state;
-        case 102:
+        case 110:
           if (!(state === "running")) {
-            _context4.next = 133;
+            _context4.next = 141;
             break;
           }
           playout_urls = {};
-          _context4.next = 106;
+          _context4.next = 114;
           return this.PlayoutOptions({
             objectId: objectId,
             linkPath: "public/asset_metadata/sources/default"
           });
-        case 106:
+        case 114:
           playout_options = _context4.sent;
           hls_clear_enabled = playout_options && playout_options.hls && playout_options.hls.playoutMethods && playout_options.hls.playoutMethods.clear !== undefined;
           if (!hls_clear_enabled) {
-            _context4.next = 112;
+            _context4.next = 120;
             break;
           }
-          _context4.next = 111;
+          _context4.next = 119;
           return this.FabricUrl({
             libraryId: libraryId,
             objectId: objectId,
             rep: "playout/default/hls-clear/playlist.m3u8"
           });
-        case 111:
+        case 119:
           playout_urls.hls_clear = _context4.sent;
-        case 112:
+        case 120:
           hls_aes128_enabled = playout_options && playout_options.hls && playout_options.hls.playoutMethods && playout_options.hls.playoutMethods["aes-128"] !== undefined;
           if (!hls_aes128_enabled) {
-            _context4.next = 117;
+            _context4.next = 125;
             break;
           }
-          _context4.next = 116;
+          _context4.next = 124;
           return this.FabricUrl({
             libraryId: libraryId,
             objectId: objectId,
             rep: "playout/default/hls-aes128/playlist.m3u8"
           });
-        case 116:
+        case 124:
           playout_urls.hls_aes128 = _context4.sent;
-        case 117:
+        case 125:
           hls_sample_aes_enabled = playout_options && playout_options.hls && playout_options.hls.playoutMethods && playout_options.hls.playoutMethods["sample-aes"] !== undefined;
           if (!hls_sample_aes_enabled) {
-            _context4.next = 122;
+            _context4.next = 130;
             break;
           }
-          _context4.next = 121;
+          _context4.next = 129;
           return this.FabricUrl({
             libraryId: libraryId,
             objectId: objectId,
             rep: "playout/default/hls-sample-aes/playlist.m3u8"
           });
-        case 121:
+        case 129:
           playout_urls.hls_sample_aes = _context4.sent;
-        case 122:
-          _context4.next = 124;
+        case 130:
+          _context4.next = 132;
           return this.NetworkInfo();
-        case 124:
+        case 132:
           networkInfo = _context4.sent;
-          _context4.next = 127;
+          _context4.next = 135;
           return this.authClient.AuthorizationToken({
             libraryId: libraryId,
             objectId: objectId,
@@ -703,7 +713,7 @@ exports.StreamStatus = /*#__PURE__*/function () {
             noCache: true,
             noAuth: true
           });
-        case 127:
+        case 135:
           token = _context4.sent;
           embed_net = "main";
           if (networkInfo.name.includes("demo")) {
@@ -712,20 +722,20 @@ exports.StreamStatus = /*#__PURE__*/function () {
           embed_url = "https://embed.v3.contentfabric.io/?net=".concat(embed_net, "&p&ct=h&oid=").concat(objectId, "&mt=lv&ath=").concat(token);
           playout_urls.embed_url = embed_url;
           status.playout_urls = playout_urls;
-        case 133:
-          _context4.next = 138;
+        case 141:
+          _context4.next = 146;
           break;
-        case 135:
-          _context4.prev = 135;
-          _context4.t6 = _context4["catch"](3);
-          console.error(_context4.t6);
-        case 138:
+        case 143:
+          _context4.prev = 143;
+          _context4.t7 = _context4["catch"](3);
+          console.error(_context4.t7);
+        case 146:
           return _context4.abrupt("return", status);
-        case 139:
+        case 147:
         case "end":
           return _context4.stop();
       }
-    }, _callee4, this, [[3, 135], [61, 75], [87, 97]]);
+    }, _callee4, this, [[3, 143], [34, 40], [69, 83], [95, 105]]);
   }));
   return function (_x4) {
     return _ref8.apply(this, arguments);
@@ -2271,106 +2281,121 @@ exports.StreamCopyToVod = /*#__PURE__*/function () {
  *
  * @methodGroup Live Stream
  * @namedParams
+ * @param {string=} libraryId - Library ID of the live stream
  * @param {string} objectId - Object ID of the live stream
+ * @param {string=} writeToken - Write token of the draft
  * @param {Array<string>} types - Specify which type of watermark to remove. Possible values:
  * - "image"
  * - "text"
+ * - "forensic"
  * @param {boolean=} finalize - If enabled, target object will be finalized after removing watermark
  *
  * @return {Promise<Object>} - The finalize response
  */
 exports.StreamRemoveWatermark = /*#__PURE__*/function () {
   var _ref29 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(_ref28) {
-    var objectId, types, _ref28$finalize, finalize, libraryId, _yield$this$EditConte3, writeToken, edgeWriteToken, recordingParamsPath, recordingMetadata, finalizeResponse;
+    var libraryId, objectId, writeToken, types, _ref28$finalize, finalize, _yield$this$EditConte3, edgeWriteToken, metadataPath, objectMetadata, finalizeResponse;
     return _regeneratorRuntime.wrap(function _callee15$(_context15) {
       while (1) switch (_context15.prev = _context15.next) {
         case 0:
-          objectId = _ref28.objectId, types = _ref28.types, _ref28$finalize = _ref28.finalize, finalize = _ref28$finalize === void 0 ? true : _ref28$finalize;
+          libraryId = _ref28.libraryId, objectId = _ref28.objectId, writeToken = _ref28.writeToken, types = _ref28.types, _ref28$finalize = _ref28.finalize, finalize = _ref28$finalize === void 0 ? true : _ref28$finalize;
           ValidateObject(objectId);
-          _context15.next = 4;
+          if (libraryId) {
+            _context15.next = 6;
+            break;
+          }
+          _context15.next = 5;
           return this.ContentObjectLibraryId({
             objectId: objectId
           });
-        case 4:
+        case 5:
           libraryId = _context15.sent;
-          _context15.next = 7;
+        case 6:
+          if (writeToken) {
+            _context15.next = 11;
+            break;
+          }
+          _context15.next = 9;
           return this.EditContentObject({
             objectId: objectId,
             libraryId: libraryId
           });
-        case 7:
+        case 9:
           _yield$this$EditConte3 = _context15.sent;
           writeToken = _yield$this$EditConte3.writeToken;
+        case 11:
           this.Log("Removing watermark types: ".concat(types.join(", "), " ").concat(libraryId, " ").concat(objectId));
-          _context15.next = 12;
+          _context15.next = 14;
           return this.ContentObjectMetadata({
             objectId: objectId,
             libraryId: libraryId,
             metadataSubtree: "/live_recording/fabric_config/edge_write_token"
           });
-        case 12:
+        case 14:
           edgeWriteToken = _context15.sent;
-          recordingParamsPath = "live_recording/recording_config/recording_params";
-          _context15.next = 16;
+          metadataPath = "live_recording/playout_config";
+          _context15.next = 18;
           return this.ContentObjectMetadata({
             libraryId: libraryId,
             objectId: objectId,
             writeToken: writeToken,
-            metadataSubtree: recordingParamsPath,
+            metadataSubtree: metadataPath,
             resolveLinks: false
           });
-        case 16:
-          recordingMetadata = _context15.sent;
-          if (recordingMetadata) {
-            _context15.next = 19;
+        case 18:
+          objectMetadata = _context15.sent;
+          if (objectMetadata) {
+            _context15.next = 21;
             break;
           }
-          throw Error("Stream object must be configured");
-        case 19:
+          throw Error("Stream object must be configured before removing a watermark");
+        case 21:
           types.forEach(function (type) {
             if (type === "text") {
-              delete recordingMetadata.simple_watermark;
+              delete objectMetadata.simple_watermark;
             } else if (type === "image") {
-              delete recordingMetadata.image_watermark;
+              delete objectMetadata.image_watermark;
+            } else if (type === "forensic") {
+              delete objectMetadata.forensic_watermark;
             }
           });
-          _context15.next = 22;
+          _context15.next = 24;
           return this.ReplaceMetadata({
             libraryId: libraryId,
             objectId: objectId,
             writeToken: writeToken,
-            metadataSubtree: recordingParamsPath,
-            metadata: recordingMetadata
+            metadataSubtree: metadataPath,
+            metadata: objectMetadata
           });
-        case 22:
+        case 24:
           if (!edgeWriteToken) {
-            _context15.next = 25;
+            _context15.next = 27;
             break;
           }
-          _context15.next = 25;
+          _context15.next = 27;
           return this.ReplaceMetadata({
             libraryId: libraryId,
             objectId: objectId,
             writeToken: edgeWriteToken,
-            metadataSubtree: recordingParamsPath,
-            metadata: recordingMetadata
+            metadataSubtree: metadataPath,
+            metadata: objectMetadata
           });
-        case 25:
+        case 27:
           if (!finalize) {
-            _context15.next = 30;
+            _context15.next = 32;
             break;
           }
-          _context15.next = 28;
+          _context15.next = 30;
           return this.FinalizeContentObject({
             libraryId: libraryId,
             objectId: objectId,
             writeToken: writeToken,
             commitMessage: "Watermark removed"
           });
-        case 28:
+        case 30:
           finalizeResponse = _context15.sent;
           return _context15.abrupt("return", finalizeResponse);
-        case 30:
+        case 32:
         case "end":
           return _context15.stop();
       }
@@ -2386,109 +2411,177 @@ exports.StreamRemoveWatermark = /*#__PURE__*/function () {
  *
  * @methodGroup Live Stream
  * @namedParams
+ * @param {string=} libraryId - Library ID of the live stream
  * @param {string} objectId - Object ID of the live stream
+ * @param {string=} writeToken - Write token of the draft
  * @param {Object} simpleWatermark - Text watermark
  * @param {Object} imageWatermark - Image watermark
+ * @param {Object} forensicWatermark - Forensic watermark
  * @param {boolean=} finalize - If enabled, target object will be finalized after adding watermark
+ * Watermark examples:
+ *
+ * Simple Watermark:
+   {
+     "font_color": "",
+     "font_relative_height": 0,
+     "shadow": false,
+     "template": "",
+     "timecode": "",
+     "timecode_rate": 0,
+     "x": "",
+     "y": ""
+   }
+ *
+ * Image watermark:
+   {
+     "image": "",
+     "align_h": "",
+     "align_v": "",
+     "target_video_height": 0,
+     "wm_enabled": false
+   }
+ *
+ * Forensic watermark:
+   {
+     "algo": 6,
+     "forensic_duration": 0,
+     "forensic_start": "",
+     "image_a": <path_to_image>,
+     "image_b": <path_to_image>,
+     "is_stub": true,
+     "payload_bit_nb": 23,
+     "wm_enabled": true
+   }
+ *
  *
  * @return {Promise<Object>} - The finalize response
  */
 exports.StreamAddWatermark = /*#__PURE__*/function () {
   var _ref31 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16(_ref30) {
-    var objectId, simpleWatermark, imageWatermark, _ref30$finalize, finalize, libraryId, _yield$this$EditConte4, writeToken, edgeWriteToken, recordingParamsPath, recordingMetadata, response, finalizeResponse;
+    var libraryId, objectId, writeToken, simpleWatermark, imageWatermark, forensicWatermark, _ref30$finalize, finalize, _yield$this$EditConte4, edgeWriteToken, watermarkType, metadataPath, objectMetadata, watermarkArgCount, response, finalizeResponse;
     return _regeneratorRuntime.wrap(function _callee16$(_context16) {
       while (1) switch (_context16.prev = _context16.next) {
         case 0:
-          objectId = _ref30.objectId, simpleWatermark = _ref30.simpleWatermark, imageWatermark = _ref30.imageWatermark, _ref30$finalize = _ref30.finalize, finalize = _ref30$finalize === void 0 ? true : _ref30$finalize;
+          libraryId = _ref30.libraryId, objectId = _ref30.objectId, writeToken = _ref30.writeToken, simpleWatermark = _ref30.simpleWatermark, imageWatermark = _ref30.imageWatermark, forensicWatermark = _ref30.forensicWatermark, _ref30$finalize = _ref30.finalize, finalize = _ref30$finalize === void 0 ? true : _ref30$finalize;
           ValidateObject(objectId);
-          _context16.next = 4;
+          if (libraryId) {
+            _context16.next = 6;
+            break;
+          }
+          _context16.next = 5;
           return this.ContentObjectLibraryId({
             objectId: objectId
           });
-        case 4:
+        case 5:
           libraryId = _context16.sent;
-          _context16.next = 7;
+        case 6:
+          if (writeToken) {
+            _context16.next = 11;
+            break;
+          }
+          _context16.next = 9;
           return this.EditContentObject({
             objectId: objectId,
             libraryId: libraryId
           });
-        case 7:
+        case 9:
           _yield$this$EditConte4 = _context16.sent;
           writeToken = _yield$this$EditConte4.writeToken;
-          _context16.next = 11;
+        case 11:
+          _context16.next = 13;
           return this.ContentObjectMetadata({
             objectId: objectId,
             libraryId: libraryId,
             metadataSubtree: "/live_recording/fabric_config/edge_write_token"
           });
-        case 11:
+        case 13:
           edgeWriteToken = _context16.sent;
-          this.Log("Adding watermarking type: ".concat(imageWatermark ? "image" : "text", " ").concat(libraryId, " ").concat(objectId));
-          recordingParamsPath = "live_recording/recording_config/recording_params";
-          _context16.next = 16;
+          watermarkType = imageWatermark ? "image" : forensicWatermark ? "forensic" : "text";
+          metadataPath = "live_recording/playout_config";
+          this.Log("Adding watermarking type: ".concat(watermarkType, " ").concat(libraryId, " ").concat(objectId));
+          _context16.next = 19;
           return this.ContentObjectMetadata({
             libraryId: libraryId,
             objectId: objectId,
             writeToken: writeToken,
-            metadataSubtree: recordingParamsPath,
+            metadataSubtree: metadataPath,
             resolveLinks: false
           });
-        case 16:
-          recordingMetadata = _context16.sent;
-          if (recordingMetadata) {
-            _context16.next = 19;
+        case 19:
+          objectMetadata = _context16.sent;
+          if (objectMetadata) {
+            _context16.next = 22;
             break;
           }
-          throw Error("Stream object must be configured");
-        case 19:
+          throw Error("Stream object must be configured before adding a watermark");
+        case 22:
+          watermarkArgCount = [simpleWatermark, imageWatermark, forensicWatermark].filter(function (i) {
+            return !!i;
+          }).length;
+          console.log("watermark arg count", watermarkArgCount);
+          if (!(watermarkArgCount === 0)) {
+            _context16.next = 28;
+            break;
+          }
+          throw Error("No watermark was provided");
+        case 28:
+          if (!(watermarkArgCount > 1)) {
+            _context16.next = 30;
+            break;
+          }
+          throw Error("Only one watermark is allowed");
+        case 30:
           if (simpleWatermark) {
-            recordingMetadata.simple_watermark = simpleWatermark;
+            objectMetadata.simple_watermark = simpleWatermark;
           } else if (imageWatermark) {
-            recordingMetadata.image_watermark = imageWatermark;
+            objectMetadata.image_watermark = imageWatermark;
+          } else if (forensicWatermark) {
+            objectMetadata.forensic_watermark = forensicWatermark;
           }
-          _context16.next = 22;
+          _context16.next = 33;
           return this.ReplaceMetadata({
             libraryId: libraryId,
             objectId: objectId,
             writeToken: writeToken,
-            metadataSubtree: recordingParamsPath,
-            metadata: recordingMetadata
+            metadataSubtree: metadataPath,
+            metadata: objectMetadata
           });
-        case 22:
+        case 33:
           if (!edgeWriteToken) {
-            _context16.next = 25;
+            _context16.next = 36;
             break;
           }
-          _context16.next = 25;
+          _context16.next = 36;
           return this.ReplaceMetadata({
             libraryId: libraryId,
             objectId: objectId,
             writeToken: edgeWriteToken,
-            metadataSubtree: recordingParamsPath,
-            metadata: recordingMetadata
+            metadataSubtree: metadataPath,
+            metadata: objectMetadata
           });
-        case 25:
+        case 36:
           response = {
-            "imageWatermark": recordingMetadata.image_watermark,
-            "textWatermark": recordingMetadata.simple_watermark
+            "imageWatermark": objectMetadata.image_watermark,
+            "textWatermark": objectMetadata.simple_watermark,
+            "forensicWatermark": objectMetadata.forensic_watermark
           };
           if (!finalize) {
-            _context16.next = 31;
+            _context16.next = 42;
             break;
           }
-          _context16.next = 29;
+          _context16.next = 40;
           return this.FinalizeContentObject({
             libraryId: libraryId,
             objectId: objectId,
             writeToken: writeToken,
             commitMessage: "Watermark set"
           });
-        case 29:
+        case 40:
           finalizeResponse = _context16.sent;
           response.hash = finalizeResponse.hash;
-        case 31:
+        case 42:
           return _context16.abrupt("return", response);
-        case 32:
+        case 43:
         case "end":
           return _context16.stop();
       }

package/package.json

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