@eluvio/elv-client-js 4.2.17 → 4.2.19

package/package.json

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

package/src/AuthorizationClient.js

@@ -570,18 +570,13 @@ class AuthorizationClient {
       const stateChannelApi = "elv_channelContentRequestContext";
       const additionalParams = [JSON.stringify(audienceData)];
 
-      const payload = await this.MakeKMSCall({
+      token = await this.MakeKMSCall({
         objectId,
         methodName: stateChannelApi,
         paramTypes: ["address", "address", "uint", "uint"],
         params: [this.client.signer.address, Utils.HashToAddress(objectId), value, Date.now()],
         additionalParams
       });
-
-      const signature = await this.Sign(Ethers.utils.keccak256(Ethers.utils.toUtf8Bytes(payload)));
-      const multiSig = Utils.FormatSignature(signature);
-
-      token = `${payload}.${Utils.B64(multiSig)}`;
     }
 
     if(!this.noCache) {

package/src/client/LiveConf.js

@@ -540,6 +540,7 @@ class LiveConf {
         conf.live_recording.recording_config.recording_params.source_timescale = sourceTimescale;
         break;
       case "rtmp":
+      case "flv":
         sourceTimescale = 16000;
         conf.live_recording.recording_config.recording_params.source_timescale = sourceTimescale;
         break;

package/src/client/LiveStream.js

@@ -2265,14 +2265,6 @@ exports.StreamApplyProfile = async function({
     }));
   }
 
-  // Load the base config profile and merge with overrides
-  const overrides = await this.ContentObjectMetadata({
-    libraryId,
-    objectId,
-    writeToken: streamWriteToken,
-    metadataSubtree: "live_recording_overrides"
-  }) || {};
-
   const currentConfig = await this.ContentObjectMetadata({
     libraryId,
     objectId,
@@ -2280,8 +2272,9 @@ exports.StreamApplyProfile = async function({
     metadataSubtree: "live_recording_config"
   }) || {};
 
-  // Preserve stream-specific fields (e.g. url) from the current config, then apply profile, then overrides
-  const config = R.mergeDeepRight(R.mergeDeepRight(currentConfig, profile), overrides);
+  // Only preserve stream-identity fields from the current config; all technical settings come from the new profile
+  const preservedConfig = R.pick(["url", "name"], currentConfig);
+  const config = R.mergeDeepRight(preservedConfig, profile);
 
   const currentProfileName = await this.ContentObjectMetadata({
     libraryId,
@@ -2299,6 +2292,34 @@ exports.StreamApplyProfile = async function({
     liveRecordingConfig: config
   });
 
+  // Clear live_recording and live_recording_overrides so stale settings from the previous profile don't persist
+  await this.ReplaceMetadata({
+    libraryId,
+    objectId,
+    writeToken: streamWriteToken,
+    metadataSubtree: "live_recording",
+    metadata: {}
+  });
+
+  await this.ReplaceMetadata({
+    libraryId,
+    objectId,
+    writeToken: streamWriteToken,
+    metadataSubtree: "live_recording_overrides",
+    metadata: {}
+  });
+
+  // If input_stream_info is available, regenerate live_recording from the new profile now
+  if(config.input_stream_info) {
+    await this.StreamConfig({
+      name: objectId,
+      liveRecordingConfig: config,
+      inputStreamInfo: config.input_stream_info,
+      writeToken: streamWriteToken,
+      finalize: false
+    });
+  }
+
   if(!profileSlug) {
     profileSlug = slugify(profile.name);
   }
@@ -2578,13 +2599,6 @@ exports.StreamConfig = async function({
     objectId: objectId,
   }
 
-  const liveRecordingMeta = await this.ContentObjectMetadata({
-    libraryId: libraryId,
-    objectId,
-    writeToken,
-    metadataSubtree: "/live_recording"
-  });
-
   let liveRecordingConfigProfile;
   if(liveRecordingConfig && Object.keys(liveRecordingConfig || {}).length > 0) {
     // Extract values that may have been saved during Create but aren't being repeated in the Config step
@@ -2612,6 +2626,15 @@ exports.StreamConfig = async function({
 
   status.userConfig = liveRecordingConfigProfile;
 
+  // If the stored probe is from a different protocol than the current URL, discard it and re-probe
+  if(probe && !inputStreamInfo) {
+    const urlProtocol = liveRecordingConfigProfile.url?.split(":")?.[0];
+    const probeProtocol = (probe.format?.filename || "").split(":")?.[0];
+    if(urlProtocol && probeProtocol && urlProtocol !== probeProtocol) {
+      probe = null;
+    }
+  }
+
   const streamData = {
     client: this
   };
@@ -2648,7 +2671,6 @@ exports.StreamConfig = async function({
   const liveConf = new LiveConf({
     url: liveRecordingConfigProfile.url,
     probeData: probe,
-    liveRecordingMeta,
     nodeId,
     nodeUrl: endpoint,
     includeAVSegDurations: false,
@@ -3392,9 +3414,8 @@ exports.OutputsList = async function({libraryId, objectId, includeState=true}) {
       value.input.status = streamStatus?.state;
     }
 
-    value = await this.OutputsResolveSrtPullUrls({value});
-
     if(includeState) {
+      await this.OutputsResolveSrtPullUrls({value});
       try {
         const nodeId = value.srt_pull?.node_ids?.[0];
         const result = await this.OutputsState({outputId: key, objectId, libraryId, nodeId, includeState: true});
@@ -3464,7 +3485,7 @@ exports.OutputsListItem = async function({libraryId, objectId, outputId, include
     value.input.status = streamStatus?.state;
   }
 
-  value = await this.OutputsResolveSrtPullUrls({value});
+  await this.OutputsResolveSrtPullUrls({value});
 
   if(includeState) {
     try {
@@ -3567,7 +3588,7 @@ const RouteToOutputNode = async ({client, libraryId, objectId, outputId, nodeId}
     const fabricUrl = nodes?.[0]?.services?.fabric_api?.urls?.[0];
     if(fabricUrl) {
       client.SetNodes({fabricURIs: [fabricUrl]});
-      if(config) { config = await client.OutputsResolveSrtPullUrls({value: config}); }
+      if(config) { await client.OutputsResolveSrtPullUrls({value: config}); }
     }
   }
 

package/src/client/NTP.js

@@ -253,6 +253,51 @@ exports.DeleteNTPInstance = async function({tenantId, ntpId}) {
   });
 };
 
+/**
+ * Generate a report for the specified NTP instance.
+ *
+ * @methodGroup NTP Instances
+ * @namedParams
+ * @param {string} tenantId - The ID of the tenant in which this NTP instance was created
+ * @param {string} ntpId - The ID of the NTP instance
+ * @param {string} password - The code associated with the NTP instance
+ * @param {string=} email - Email address associated with the code
+ */
+exports.ReportNTPInstance = async function({tenantId, ntpId, password, email}) {
+  ValidatePresence("tenantId", tenantId);
+  ValidatePresence("ntpId", ntpId);
+
+  let paramsJSON = [];
+
+  if (password) {
+    paramsJSON.push(`pwd:${password}`);
+  }
+
+  if (email) {
+    paramsJSON.push(`eml:${email}`);
+  }
+
+  const res = await this.authClient.MakeKMSCall({
+    tenantId,
+    methodName: "elv_updateOTPInstance",
+    params: [
+      tenantId,
+      ntpId,
+      "report",
+      JSON.stringify(paramsJSON),
+      Date.now()
+    ],
+    paramTypes: [
+      "string",
+      "string",
+      "string",
+      "string",
+      "int"
+    ]
+  });
+  return res || {};
+};
+
 /**
  * Retrieve info for NTP instances in the specified tenant
  *
@@ -389,6 +434,32 @@ exports.IssueSignedNTPCode = async function({tenantId, ntpId, email, maxRedempti
   return result;
 };
 
+/**
+ * Check the status of the specified ticket/code without redeeming it.
+ *
+ * @methodGroup Tickets
+ * @namedParams
+ * @param {string} tenantId - The ID of the tenant from which the ticket was issued
+ * @param {string} ntpId - The ID of the NTP instance from which the ticket was issued
+ * @param {string} code - Access code
+ * @param {string=} email - Email address associated with the code
+ *
+ * @return {Promise<Object>} - Status information for the ticket
+ */
+exports.NTPStatus = async function({tenantId, ntpId, code, email}) {
+  ValidatePresence("tenantId", tenantId);
+  ValidatePresence("ntpId", ntpId);
+  ValidatePresence("code", code);
+
+  const response = await this.HttpClient.Request({
+    method: "POST",
+    path: UrlJoin("ks", "otp", "ntp", tenantId, ntpId, "status"),
+    body: {"_PASSWORD": code, "_EMAIL": email}
+  });
+
+  return await response.json();
+};
+
 /**
  * Redeem the specified ticket/code to authorize the client. Must provide either issuer or tenantId and ntpId
  *

package/dist/src/ContentObjectVerification.js

@@ -1,281 +0,0 @@
-var _regeneratorRuntime = require("@babel/runtime/regenerator");
-var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
-function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-var CBOR = require("cbor");
-var SJCL = require("sjcl");
-var MultiHash = require("multihashes");
-var DeepEqual = require("deep-equal");
-var Utils = require("./Utils");
-var ContentObjectVerification = {
-  VerifyContentObject: function VerifyContentObject(_ref) {
-    return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var client, libraryId, objectId, versionHash, response, partHash, qpartsResponse, partVerification, qmdHash, metadataPartHash, metadataPartResponse, metadataVerification, metadata, qstructHash, structPartHash, structPartResponse, structVerification;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            client = _ref.client, libraryId = _ref.libraryId, objectId = _ref.objectId, versionHash = _ref.versionHash;
-            response = {
-              hash: versionHash
-            };
-            partHash = Utils.DecodeVersionHash(versionHash).partHash;
-            _context.next = 5;
-            return client.QParts({
-              libraryId: libraryId,
-              objectId: objectId,
-              partHash: partHash,
-              format: "arrayBuffer"
-            }).then(function (response) {
-              return Buffer.from(response);
-            });
-          case 5:
-            qpartsResponse = _context.sent;
-            partVerification = ContentObjectVerification._VerifyPart({
-              partHash: partHash,
-              qpartsResponse: qpartsResponse
-            });
-            if (partVerification.valid) {
-              response.qref = {
-                valid: true
-              };
-            } else {
-              response.qref = {
-                valid: false,
-                error: partVerification.error.message
-              };
-            }
-            response.qref.hash = partHash;
-            if (!response.qref.valid) {
-              _context.next = 32;
-              break;
-            }
-            // Validate Metadata
-            qmdHash = partVerification.cbor.QmdHash.value;
-            metadataPartHash = "hqp_" + MultiHash.toB58String(qmdHash.slice(1, qmdHash.length));
-            _context.next = 14;
-            return client.QParts({
-              libraryId: libraryId,
-              objectId: objectId,
-              partHash: metadataPartHash,
-              format: "arrayBuffer"
-            }).then(function (response) {
-              return Buffer.from(response);
-            });
-          case 14:
-            metadataPartResponse = _context.sent;
-            metadataVerification = ContentObjectVerification._VerifyPart({
-              partHash: metadataPartHash,
-              qpartsResponse: metadataPartResponse
-            });
-            if (metadataVerification.valid) {
-              response.qmd = {
-                valid: true
-              };
-            } else {
-              response.qmd = {
-                valid: false,
-                error: metadataVerification.error.message
-              };
-            }
-            response.qmd.hash = metadataPartHash;
-            if (!(response.qmd.valid && libraryId)) {
-              _context.next = 23;
-              break;
-            }
-            _context.next = 21;
-            return client.ContentObjectMetadata({
-              libraryId: libraryId,
-              objectId: objectId,
-              versionHash: partHash.replace("hqp_", "hq__")
-            });
-          case 21:
-            metadata = _context.sent;
-            response.qmd.check = ContentObjectVerification._VerifyMetadata({
-              metadataCbor: metadataVerification.cbor,
-              metadata: metadata
-            });
-          case 23:
-            // Validate Qstruct
-            qstructHash = partVerification.cbor.QstructHash.value;
-            structPartHash = "hqp_" + MultiHash.toB58String(qstructHash.slice(1, qstructHash.length));
-            _context.next = 27;
-            return client.QParts({
-              libraryId: libraryId,
-              objectId: objectId,
-              partHash: structPartHash,
-              format: "arrayBuffer"
-            }).then(function (response) {
-              return Buffer.from(response);
-            });
-          case 27:
-            structPartResponse = _context.sent;
-            structVerification = ContentObjectVerification._VerifyPart({
-              partHash: structPartHash,
-              qpartsResponse: structPartResponse
-            });
-            if (structVerification.valid) {
-              response.qstruct = {
-                valid: true
-              };
-            } else {
-              response.qstruct = {
-                valid: false,
-                error: structVerification.error.message
-              };
-            }
-            response.qstruct.hash = structPartHash;
-            if (response.qstruct.valid) {
-              response.qstruct.parts = ContentObjectVerification._FormatQStruct(structVerification.cbor.Parts);
-            }
-          case 32:
-            response.valid = response.qref.valid && response.qmd.valid && response.qstruct.valid && (!response.qmd.check || response.qmd.check.valid);
-            return _context.abrupt("return", response);
-          case 34:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }))();
-  },
-  // Content verification methods //
-  _FormatQStruct: function _FormatQStruct(structParts) {
-    if (!structParts) {
-      return [];
-    }
-    return structParts.map(function (structPart) {
-      return {
-        hash: "hqp_" + MultiHash.toB58String(structPart.Hash.value.slice(1, structPart.Hash.length)),
-        size: structPart.Size
-      };
-    });
-  },
-  _Hash: function _Hash(thing) {
-    function fromBits(arr) {
-      var out = [],
-        bl = SJCL.bitArray.bitLength(arr),
-        i,
-        tmp;
-      for (i = 0; i < bl / 8; i++) {
-        if ((i & 3) === 0) {
-          tmp = arr[i / 4];
-        }
-        out.push(tmp >>> 24);
-        tmp <<= 8;
-      }
-      return out;
-    }
-    function toBits(bytes) {
-      var out = [],
-        i,
-        tmp = 0;
-      for (i = 0; i < bytes.length; i++) {
-        tmp = tmp << 8 | bytes[i];
-        if ((i & 3) === 3) {
-          out.push(tmp);
-          tmp = 0;
-        }
-      }
-      if (i & 3) {
-        out.push(SJCL.bitArray.partial(8 * (i & 3), tmp));
-      }
-      return out;
-    }
-    var digest = SJCL.hash.sha256.hash(toBits(thing));
-    var bytes = fromBits(digest);
-    var out = Buffer.from(bytes, "binary");
-    return MultiHash.toB58String(MultiHash.encode(out, "sha2-256"));
-  },
-  _ParseCBOR: function _ParseCBOR(cborResponse) {
-    var buffer = cborResponse.slice(7, cborResponse.length);
-    var hex = buffer.toString("hex");
-    return CBOR.decodeFirstSync(hex);
-  },
-  _VerifyPart: function _VerifyPart(_ref2) {
-    var partHash = _ref2.partHash,
-      qpartsResponse = _ref2.qpartsResponse;
-    try {
-      if (ContentObjectVerification._Hash(qpartsResponse) !== partHash.replace("hqp_", "")) {
-        throw Error("Hashes do not match");
-      }
-      var cbor = ContentObjectVerification._ParseCBOR(qpartsResponse);
-      return {
-        valid: true,
-        cbor: cbor
-      };
-    } catch (error) {
-      return {
-        valid: false,
-        error: error
-      };
-    }
-  },
-  _VerifyMetadata: function _VerifyMetadata(_ref3) {
-    var metadataCbor = _ref3.metadataCbor,
-      metadata = _ref3.metadata;
-    if (!metadataCbor) {
-      metadataCbor = {};
-    }
-    if (!metadata) {
-      metadata = {};
-    }
-    var response = {
-      valid: true,
-      invalidValues: []
-    };
-    var cborKeys = Object.keys(metadataCbor);
-    var metadataKeys = Object.keys(metadata);
-
-    // Find any difference between top level keys
-    var differentKeys = cborKeys.filter(function (x) {
-      return !metadataKeys.includes(x);
-    }).concat(metadataKeys.filter(function (x) {
-      return !cborKeys.includes(x);
-    }));
-    var _iterator = _createForOfIteratorHelper(differentKeys),
-      _step;
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var key = _step.value;
-        var cborValue = metadataCbor[key];
-        var metadataValue = metadata[key];
-        response.invalidValues.push({
-          key: key,
-          cborValue: cborValue,
-          metadataValue: metadataValue
-        });
-      }
-
-      // Deep comparison of up to 5 keys
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
-    }
-    var _iterator2 = _createForOfIteratorHelper(Object.keys(metadataCbor).slice(0, 5)),
-      _step2;
-    try {
-      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        var fieldToValidate = _step2.value;
-        var _cborValue = metadataCbor[fieldToValidate];
-        var _metadataValue = metadata[fieldToValidate];
-        if (!DeepEqual(_cborValue, _metadataValue)) {
-          response.invalidValues.push({
-            key: fieldToValidate,
-            cborValue: _cborValue,
-            metadataValue: _metadataValue
-          });
-        }
-      }
-    } catch (err) {
-      _iterator2.e(err);
-    } finally {
-      _iterator2.f();
-    }
-    if (response.invalidValues.length !== 0) {
-      response.valid = false;
-    }
-    return response;
-  }
-};
-module.exports = ContentObjectVerification;

package/dist/src/NetworkUrls.js

@@ -1,8 +0,0 @@
-var networks = {
-  "main": "https://main.net955305.contentfabric.io",
-  "demo": "https://demov3.net955210.contentfabric.io",
-  "demov3": "https://demov3.net955210.contentfabric.io",
-  "local": "http://127.0.0.1:8008/config?qspace=dev&self",
-  "test": "https://test.net955203.contentfabric.io"
-};
-module.exports = networks;

package/dist/src/live_recording_config_profiles/live_recording_config_default.js

@@ -1,45 +0,0 @@
-var LiveRecordingConfigDefault = {
-  drm_type: "clear",
-  recording_config: {
-    part_ttl: 86400,
-    reconnect_timeout: 3600,
-    connection_timeout: 3600,
-    copy_mpegts: false
-  },
-  profile: {
-    ladder_specs: {
-      audio: [{
-        bit_rate: 192000,
-        channels: 2,
-        codecs: "mp4a.40.2"
-      }, {
-        bit_rate: 384000,
-        channels: 6,
-        codecs: "mp4a.40.2"
-      }],
-      video: [{
-        bit_rate: 9500000,
-        codecs: "avc1.640028,mp4a.40.2",
-        height: 1080,
-        width: 1920
-      }, {
-        bit_rate: 4500000,
-        codecs: "avc1.640028,mp4a.40.2",
-        height: 720,
-        width: 1280
-      }, {
-        bit_rate: 2000000,
-        codecs: "avc1.640028,mp4a.40.2",
-        height: 540,
-        width: 960
-      }, {
-        bit_rate: 900000,
-        codecs: "avc1.640028,mp4a.40.2",
-        height: 540,
-        width: 960
-      }]
-    },
-    name: "Default"
-  }
-};
-module.exports = LiveRecordingConfigDefault;