@eluvio/elv-client-js 4.0.108 → 4.0.110

package/dist/src/client/LiveStream.js

@@ -427,7 +427,7 @@ var StreamGenerateOffering = /*#__PURE__*/function () {
  */
 exports.StreamStatus = /*#__PURE__*/function () {
   var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(_ref7) {
-    var name, _ref7$stopLro, stopLro, _ref7$showParams, showParams, objectId, status, libraryId, mainMeta, fabURI, edgeWriteToken, edgeMeta, recordings, sequence, period, tlro, videoLastFinalizationTimeEpochSec, videoFinalizedParts, sinceLastFinalize, recording_period, insertions, i, insertionTimeSinceEpoch, state, lroStatus, playout_urls, playout_options, hls_clear_enabled, hls_aes128_enabled, hls_sample_aes_enabled, networkInfo, token, embed_net, embed_url;
+    var name, _ref7$stopLro, stopLro, _ref7$showParams, showParams, objectId, status, libraryId, mainMeta, fabURI, edgeWriteToken, edgeMeta, recordings, sequence, period, tlro, videoLastFinalizationTimeEpochSec, videoFinalizedParts, sinceLastFinalize, recording_period, insertions, i, insertionTimeSinceEpoch, state, lroStatus, segDurationMeta, playout_urls, playout_options, hls_clear_enabled, hls_aes128_enabled, hls_sample_aes_enabled, networkInfo, token, embed_net, embed_url;
     return _regeneratorRuntime.wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
@@ -605,107 +605,107 @@ exports.StreamStatus = /*#__PURE__*/function () {
           status.error = _context4.t3.response;
           return _context4.abrupt("return", status);
         case 89:
-          // Convert LRO 'state' to desired 'state'
+          segDurationMeta = edgeMeta.live_recording.recording_config.recording_params.xc_params.seg_duration; // Convert LRO 'state' to desired 'state'
           if (state === "running" && videoLastFinalizationTimeEpochSec <= 0) {
             state = "starting";
-          } else if (state === "running" && sinceLastFinalize > 32.9) {
+          } else if (state === "running" && segDurationMeta !== undefined && sinceLastFinalize > parseInt(segDurationMeta) + 5) {
             state = "stalled";
           } else if (state == "terminated") {
             state = "stopped";
           }
           status.state = state;
           if (!((state === "running" || state === "stalled" || state === "starting") && stopLro)) {
-            _context4.next = 110;
+            _context4.next = 111;
             break;
           }
-          _context4.next = 94;
+          _context4.next = 95;
           return this.FabricUrl({
             libraryId: libraryId,
             objectId: objectId,
             writeToken: edgeWriteToken,
             call: "live/stop/" + tlro
           });
-        case 94:
+        case 95:
           lroStopUrl = _context4.sent;
-          _context4.prev = 95;
+          _context4.prev = 96;
           _context4.t4 = this.utils;
-          _context4.next = 99;
+          _context4.next = 100;
           return HttpClient.Fetch(lroStopUrl);
-        case 99:
+        case 100:
           _context4.t5 = _context4.sent;
-          _context4.next = 102;
+          _context4.next = 103;
           return _context4.t4.ResponseToJson.call(_context4.t4, _context4.t5);
-        case 102:
+        case 103:
           console.log("LRO Stop: ", lroStatus.body);
-          _context4.next = 108;
+          _context4.next = 109;
           break;
-        case 105:
-          _context4.prev = 105;
-          _context4.t6 = _context4["catch"](95);
+        case 106:
+          _context4.prev = 106;
+          _context4.t6 = _context4["catch"](96);
           console.log("LRO Stop (failed): ", _context4.t6.response.statusCode);
-        case 108:
+        case 109:
           state = "stopped";
           status.state = state;
-        case 110:
+        case 111:
           if (!(state === "running")) {
-            _context4.next = 141;
+            _context4.next = 142;
             break;
           }
           playout_urls = {};
-          _context4.next = 114;
+          _context4.next = 115;
           return this.PlayoutOptions({
             objectId: objectId,
             linkPath: "public/asset_metadata/sources/default"
           });
-        case 114:
+        case 115:
           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 = 120;
+            _context4.next = 121;
             break;
           }
-          _context4.next = 119;
+          _context4.next = 120;
           return this.FabricUrl({
             libraryId: libraryId,
             objectId: objectId,
             rep: "playout/default/hls-clear/playlist.m3u8"
           });
-        case 119:
-          playout_urls.hls_clear = _context4.sent;
         case 120:
+          playout_urls.hls_clear = _context4.sent;
+        case 121:
           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 = 125;
+            _context4.next = 126;
             break;
           }
-          _context4.next = 124;
+          _context4.next = 125;
           return this.FabricUrl({
             libraryId: libraryId,
             objectId: objectId,
             rep: "playout/default/hls-aes128/playlist.m3u8"
           });
-        case 124:
-          playout_urls.hls_aes128 = _context4.sent;
         case 125:
+          playout_urls.hls_aes128 = _context4.sent;
+        case 126:
           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 = 130;
+            _context4.next = 131;
             break;
           }
-          _context4.next = 129;
+          _context4.next = 130;
           return this.FabricUrl({
             libraryId: libraryId,
             objectId: objectId,
             rep: "playout/default/hls-sample-aes/playlist.m3u8"
           });
-        case 129:
-          playout_urls.hls_sample_aes = _context4.sent;
         case 130:
-          _context4.next = 132;
+          playout_urls.hls_sample_aes = _context4.sent;
+        case 131:
+          _context4.next = 133;
           return this.NetworkInfo();
-        case 132:
+        case 133:
           networkInfo = _context4.sent;
-          _context4.next = 135;
+          _context4.next = 136;
           return this.authClient.AuthorizationToken({
             libraryId: libraryId,
             objectId: objectId,
@@ -713,7 +713,7 @@ exports.StreamStatus = /*#__PURE__*/function () {
             noCache: true,
             noAuth: true
           });
-        case 135:
+        case 136:
           token = _context4.sent;
           embed_net = "main";
           if (networkInfo.name.includes("demo")) {
@@ -722,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 141:
-          _context4.next = 146;
+        case 142:
+          _context4.next = 147;
           break;
-        case 143:
-          _context4.prev = 143;
+        case 144:
+          _context4.prev = 144;
           _context4.t7 = _context4["catch"](3);
           console.error(_context4.t7);
-        case 146:
-          return _context4.abrupt("return", status);
         case 147:
+          return _context4.abrupt("return", status);
+        case 148:
         case "end":
           return _context4.stop();
       }
-    }, _callee4, this, [[3, 143], [34, 40], [69, 83], [95, 105]]);
+    }, _callee4, this, [[3, 144], [34, 40], [69, 83], [96, 106]]);
   }));
   return function (_x4) {
     return _ref8.apply(this, arguments);

package/package.json

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

package/src/ElvClient.js

@@ -435,7 +435,7 @@ class ElvClient {
       const signer = wallet.AddAccountFromMnemonic({mnemonic: wallet.GenerateMnemonic()});
 
       this.SetSigner({signer, reset: false});
-      this.SetStaticToken({token: staticToken});
+      await this.SetStaticToken({token: staticToken});
     }
 
     this.authClient = new AuthorizationClient({
@@ -623,7 +623,7 @@ class ElvClient {
    */
   async SpaceNodes({matchEndpoint, matchNodeId}={}) {
     let nodes;
-    this.SetStaticToken();
+    await this.SetStaticToken();
 
     if(matchEndpoint) {
       ({nodes} = await this.utils.ResponseToJson(
@@ -664,7 +664,7 @@ class ElvClient {
         return match;
       });
     } else if(matchNodeId) {
-      this.SetStaticToken();
+      await this.SetStaticToken();
       let node = await this.utils.ResponseToJson(
         this.HttpClient.Request({
           path: UrlJoin("nodes", matchNodeId),
@@ -877,7 +877,13 @@ class ElvClient {
     Sign
   }) {
     if(!Sign) {
-      Sign = async message => this.authClient.Sign(message);
+      // Same as authClient.Sign, but authClient may not yet be initialized
+      Sign = async message =>
+        Ethers.utils.joinSignature(
+          this.signer.signDigest ?
+            await this.signer.signDigest(message) :
+            await this.signer._signingKey().signDigest(message)
+        );
     }
 
     if(addEthereumPrefix) {
@@ -1171,12 +1177,13 @@ class ElvClient {
    * @namedParams
    * @param {string=} token - The static token to use. If not provided, the default static token will be set.
    */
-  SetStaticToken({token}={}) {
-    if(!token) {
-      token = this.utils.B64(JSON.stringify({qspace_id: this.contentSpaceId}));
+  async SetStaticToken({token}={}) {
+    if(token) {
+      this.staticToken = token;
+    } else {
+      this.CreateFabricToken({duration: 7 * 24 * 60 * 60 * 1000})
+        .then(token => this.staticToken = token);
     }
-
-    this.staticToken = token;
   }
 
   /**
@@ -1196,7 +1203,7 @@ class ElvClient {
    * @param {string} objectId - The ID of the policy object
    */
   async SetPolicyAuthorization({objectId}) {
-    this.SetStaticToken({
+    await this.SetStaticToken({
       token: await this.GenerateStateChannelToken({objectId})
     });
   }

package/src/client/LiveStream.js

@@ -515,10 +515,12 @@ exports.StreamStatus = async function({name, stopLro=false, showParams=false}) {
       return status;
     }
 
+    const segDurationMeta = edgeMeta.live_recording.recording_config.recording_params.xc_params.seg_duration
+
     // Convert LRO 'state' to desired 'state'
     if(state === "running" && videoLastFinalizationTimeEpochSec <= 0) {
       state = "starting";
-    } else if(state === "running" && sinceLastFinalize > 32.9) {
+    } else if(state === "running" && segDurationMeta !== undefined && sinceLastFinalize > (parseInt(segDurationMeta) + 5)) {
       state = "stalled";
     } else if(state == "terminated") {
       state = "stopped";