@eluvio/elv-client-js 4.0.89 → 4.0.91

package/dist/src/client/ContentManagement.js

@@ -328,9 +328,10 @@ exports.CreateContentType = /*#__PURE__*/function () {
         case 21:
           rawCreateResponse = _context4.sent;
           // extract the url for the node that handled the request
+          // TODO: remove/simplify after we start using /nodes API call to get node URLs for write tokens
           nodeUrl = new URL(rawCreateResponse.url).origin;
           _context4.next = 25;
-          return this.utils.ResponseToJson(rawCreateResponse);
+          return this.utils.ResponseToJson(rawCreateResponse, this.HttpClient.debug, this.HttpClient.Log.bind(this.HttpClient));
         case 25:
           createResponse = _context4.sent;
           // Record the node used in creating this write token
@@ -971,9 +972,11 @@ exports.CreateContentObject = /*#__PURE__*/function () {
           return _context11.t4.Request.call(_context11.t4, _context11.t8);
         case 65:
           rawCreateResponse = _context11.sent;
+          // extract the url for the node that handled the request
+          // TODO: remove/simplify after we start using /nodes API call to get node URLs for write tokens
           nodeUrl = new URL(rawCreateResponse.url).origin;
           _context11.next = 69;
-          return this.utils.ResponseToJson(rawCreateResponse);
+          return this.utils.ResponseToJson(rawCreateResponse, this.HttpClient.debug, this.HttpClient.Log.bind(this.HttpClient));
         case 69:
           createResponse = _context11.sent;
           // Record the node used in creating this write token
@@ -1315,9 +1318,10 @@ exports.EditContentObject = /*#__PURE__*/function () {
         case 33:
           rawEditResponse = _context15.sent;
           // extract the url for the node that handled the request
+          // TODO: remove/simplify after we start using /nodes API call to get node URLs for write tokens
           nodeUrl = new URL(rawEditResponse.url).origin;
           _context15.next = 37;
-          return this.utils.ResponseToJson(rawEditResponse);
+          return this.utils.ResponseToJson(rawEditResponse, this.HttpClient.debug, this.HttpClient.Log.bind(this.HttpClient));
         case 37:
           editResponse = _context15.sent;
           // Record the node used in creating this write token
@@ -1651,44 +1655,42 @@ exports.FinalizeContentObject = /*#__PURE__*/function () {
           return this.AwaitPending(objectId);
         case 23:
           path = UrlJoin("q", writeToken);
-          _context20.t11 = this.utils;
-          _context20.t12 = this.HttpClient;
-          _context20.next = 28;
+          _context20.t11 = this.HttpClient;
+          _context20.next = 27;
           return this.authClient.AuthorizationHeader({
             libraryId: libraryId,
             objectId: objectId,
             update: true
           });
-        case 28:
-          _context20.t13 = _context20.sent;
-          _context20.t14 = path;
-          _context20.t15 = {
-            headers: _context20.t13,
+        case 27:
+          _context20.t12 = _context20.sent;
+          _context20.t13 = path;
+          _context20.t14 = {
+            headers: _context20.t12,
             method: "POST",
-            path: _context20.t14,
+            path: _context20.t13,
             allowFailover: false
           };
-          _context20.t16 = _context20.t12.Request.call(_context20.t12, _context20.t15);
-          _context20.next = 34;
-          return _context20.t11.ResponseToJson.call(_context20.t11, _context20.t16);
-        case 34:
+          _context20.next = 32;
+          return _context20.t11.RequestJsonBody.call(_context20.t11, _context20.t14);
+        case 32:
           finalizeResponse = _context20.sent;
           this.Log("Finalized: ".concat(finalizeResponse.hash));
           if (!publish) {
-            _context20.next = 39;
+            _context20.next = 37;
             break;
           }
-          _context20.next = 39;
+          _context20.next = 37;
           return this.PublishContentVersion({
             objectId: objectId,
             versionHash: finalizeResponse.hash,
             awaitCommitConfirmation: awaitCommitConfirmation
           });
-        case 39:
+        case 37:
           // Invalidate cached content type, if this is one.
           delete this.contentTypes[objectId];
           return _context20.abrupt("return", finalizeResponse);
-        case 41:
+        case 39:
         case "end":
           return _context20.stop();
       }
@@ -1735,7 +1737,7 @@ exports.PublishContentVersion = /*#__PURE__*/function () {
           });
         case 9:
           abi = _context21.sent;
-          fromBlock = commit.blockNumber + 1;
+          fromBlock = commit.blockNumber - 30; // due to block re-org
           _context21.next = 13;
           return this.ExtractValueFromEvent({
             abi: abi,
@@ -1779,6 +1781,7 @@ exports.PublishContentVersion = /*#__PURE__*/function () {
             contractAddress: this.utils.HashToAddress(objectId),
             abi: abi,
             fromBlock: fromBlock,
+            topics: [Ethers.utils.id("VersionConfirm(address,address,string)")],
             count: 1000
           });
         case 27:

package/dist/src/client/Files.js

@@ -56,25 +56,23 @@ exports.ListFiles = /*#__PURE__*/function () {
             objectId = this.utils.DecodeVersionHash(versionHash).objectId;
           }
           urlPath = UrlJoin("q", writeToken || versionHash || objectId, "files_list", path);
-          _context.t0 = this.utils;
-          _context.t1 = this.HttpClient;
-          _context.next = 8;
+          _context.t0 = this.HttpClient;
+          _context.next = 7;
           return this.authClient.AuthorizationHeader({
             libraryId: libraryId,
             objectId: objectId,
             versionHash: versionHash
           });
-        case 8:
-          _context.t2 = _context.sent;
-          _context.t3 = urlPath;
-          _context.t4 = {
-            headers: _context.t2,
+        case 7:
+          _context.t1 = _context.sent;
+          _context.t2 = urlPath;
+          _context.t3 = {
+            headers: _context.t1,
             method: "GET",
-            path: _context.t3
+            path: _context.t2
           };
-          _context.t5 = _context.t1.Request.call(_context.t1, _context.t4);
-          return _context.abrupt("return", _context.t0.ResponseToJson.call(_context.t0, _context.t5));
-        case 13:
+          return _context.abrupt("return", _context.t0.RequestJsonBody.call(_context.t0, _context.t3));
+        case 11:
         case "end":
           return _context.stop();
       }
@@ -159,7 +157,11 @@ exports.UploadFilesFromS3 = /*#__PURE__*/function () {
           _context2.next = 5;
           break;
         case 18:
-          this.Log("Uploading files from S3: ".concat(libraryId, " ").concat(objectId, " ").concat(writeToken));
+          if (copy) {
+            this.Log("Copying files from S3: ".concat(libraryId, " ").concat(objectId, " ").concat(writeToken));
+          } else {
+            this.Log("Adding links to files in S3: ".concat(libraryId, " ").concat(objectId, " ").concat(writeToken));
+          }
           if (!(encryption === "cgck")) {
             _context2.next = 25;
             break;
@@ -700,29 +702,27 @@ exports.CreateFileUploadJob = /*#__PURE__*/function () {
             ops: ops
           };
           path = UrlJoin("q", writeToken, "file_jobs");
-          _context8.t0 = this.utils;
-          _context8.t1 = this.HttpClient;
-          _context8.next = 12;
+          _context8.t0 = this.HttpClient;
+          _context8.next = 11;
           return this.authClient.AuthorizationHeader({
             libraryId: libraryId,
             objectId: objectId,
             update: true,
             encryption: encryption
           });
-        case 12:
-          _context8.t2 = _context8.sent;
-          _context8.t3 = path;
-          _context8.t4 = body;
-          _context8.t5 = {
-            headers: _context8.t2,
+        case 11:
+          _context8.t1 = _context8.sent;
+          _context8.t2 = path;
+          _context8.t3 = body;
+          _context8.t4 = {
+            headers: _context8.t1,
             method: "POST",
-            path: _context8.t3,
-            body: _context8.t4,
+            path: _context8.t2,
+            body: _context8.t3,
             allowFailover: false
           };
-          _context8.t6 = _context8.t1.Request.call(_context8.t1, _context8.t5);
-          return _context8.abrupt("return", _context8.t0.ResponseToJson.call(_context8.t0, _context8.t6));
-        case 18:
+          return _context8.abrupt("return", _context8.t0.RequestJsonBody.call(_context8.t0, _context8.t4));
+        case 16:
         case "end":
           return _context8.stop();
       }
@@ -1375,29 +1375,27 @@ exports.ContentParts = /*#__PURE__*/function () {
             objectId = this.utils.DecodeVersionHash(versionHash).objectId;
           }
           path = UrlJoin("q", versionHash || objectId, "parts");
-          _context17.t0 = this.utils;
-          _context17.t1 = this.HttpClient;
-          _context17.next = 9;
+          _context17.t0 = this.HttpClient;
+          _context17.next = 8;
           return this.authClient.AuthorizationHeader({
             libraryId: libraryId,
             objectId: objectId,
             versionHash: versionHash
           });
-        case 9:
-          _context17.t2 = _context17.sent;
-          _context17.t3 = path;
-          _context17.t4 = {
-            headers: _context17.t2,
+        case 8:
+          _context17.t1 = _context17.sent;
+          _context17.t2 = path;
+          _context17.t3 = {
+            headers: _context17.t1,
             method: "GET",
-            path: _context17.t3
+            path: _context17.t2
           };
-          _context17.t5 = _context17.t1.Request.call(_context17.t1, _context17.t4);
-          _context17.next = 15;
-          return _context17.t0.ResponseToJson.call(_context17.t0, _context17.t5);
-        case 15:
+          _context17.next = 13;
+          return _context17.t0.RequestJsonBody.call(_context17.t0, _context17.t3);
+        case 13:
           response = _context17.sent;
           return _context17.abrupt("return", response.parts);
-        case 17:
+        case 15:
         case "end":
           return _context17.stop();
       }
@@ -1439,28 +1437,26 @@ exports.ContentPart = /*#__PURE__*/function () {
             objectId = this.utils.DecodeVersionHash(versionHash).objectId;
           }
           path = UrlJoin("q", versionHash || objectId, "parts", partHash);
-          _context18.t0 = this.utils;
-          _context18.t1 = this.HttpClient;
-          _context18.next = 10;
+          _context18.t0 = this.HttpClient;
+          _context18.next = 9;
           return this.authClient.AuthorizationHeader({
             libraryId: libraryId,
             objectId: objectId,
             versionHash: versionHash
           });
-        case 10:
-          _context18.t2 = _context18.sent;
-          _context18.t3 = path;
-          _context18.t4 = {
-            headers: _context18.t2,
+        case 9:
+          _context18.t1 = _context18.sent;
+          _context18.t2 = path;
+          _context18.t3 = {
+            headers: _context18.t1,
             method: "GET",
-            path: _context18.t3
+            path: _context18.t2
           };
-          _context18.t5 = _context18.t1.Request.call(_context18.t1, _context18.t4);
-          _context18.next = 16;
-          return _context18.t0.ResponseToJson.call(_context18.t0, _context18.t5);
-        case 16:
+          _context18.next = 14;
+          return _context18.t0.RequestJsonBody.call(_context18.t0, _context18.t3);
+        case 14:
           return _context18.abrupt("return", _context18.sent);
-        case 17:
+        case 15:
         case "end":
           return _context18.stop();
       }
@@ -1856,33 +1852,31 @@ exports.CreatePart = /*#__PURE__*/function () {
           });
           ValidateWriteToken(writeToken);
           path = UrlJoin("q", writeToken, "parts");
-          _context23.t0 = this.utils;
-          _context23.t1 = this.HttpClient;
-          _context23.next = 8;
+          _context23.t0 = this.HttpClient;
+          _context23.next = 7;
           return this.authClient.AuthorizationHeader({
             libraryId: libraryId,
             objectId: objectId,
             update: true,
             encryption: encryption
           });
-        case 8:
-          _context23.t2 = _context23.sent;
-          _context23.t3 = path;
-          _context23.t4 = {
-            headers: _context23.t2,
+        case 7:
+          _context23.t1 = _context23.sent;
+          _context23.t2 = path;
+          _context23.t3 = {
+            headers: _context23.t1,
             method: "POST",
-            path: _context23.t3,
+            path: _context23.t2,
             bodyType: "BINARY",
             body: "",
             allowFailover: false
           };
-          _context23.t5 = _context23.t1.Request.call(_context23.t1, _context23.t4);
-          _context23.next = 14;
-          return _context23.t0.ResponseToJson.call(_context23.t0, _context23.t5);
-        case 14:
+          _context23.next = 12;
+          return _context23.t0.RequestJsonBody.call(_context23.t0, _context23.t3);
+        case 12:
           openResponse = _context23.sent;
           return _context23.abrupt("return", openResponse.part.write_token);
-        case 16:
+        case 14:
         case "end":
           return _context23.stop();
       }
@@ -2000,35 +1994,30 @@ exports.FinalizePart = /*#__PURE__*/function () {
           });
           ValidateWriteToken(writeToken);
           path = UrlJoin("q", writeToken, "parts");
-          _context25.t0 = this.utils;
-          _context25.t1 = this.HttpClient;
-          _context25.next = 8;
+          _context25.t0 = this.HttpClient;
+          _context25.next = 7;
           return this.authClient.AuthorizationHeader({
             libraryId: libraryId,
             objectId: objectId,
             update: true,
             encryption: encryption
           });
-        case 8:
-          _context25.t2 = _context25.sent;
-          _context25.t3 = UrlJoin(path, partWriteToken);
-          _context25.t4 = {
-            headers: _context25.t2,
+        case 7:
+          _context25.t1 = _context25.sent;
+          _context25.t2 = UrlJoin(path, partWriteToken);
+          _context25.t3 = {
+            headers: _context25.t1,
             method: "POST",
-            path: _context25.t3,
+            path: _context25.t2,
             bodyType: "BINARY",
             body: "",
             allowFailover: false
           };
-          _context25.next = 13;
-          return _context25.t1.Request.call(_context25.t1, _context25.t4);
-        case 13:
-          _context25.t5 = _context25.sent;
-          _context25.next = 16;
-          return _context25.t0.ResponseToJson.call(_context25.t0, _context25.t5);
-        case 16:
+          _context25.next = 12;
+          return _context25.t0.RequestJsonBody.call(_context25.t0, _context25.t3);
+        case 12:
           return _context25.abrupt("return", _context25.sent);
-        case 17:
+        case 13:
         case "end":
           return _context25.stop();
       }

package/dist/src/client/LiveConf.js

@@ -317,7 +317,6 @@ var LiveConf = /*#__PURE__*/function () {
           break;
         default:
           throw "unsupported frame rate for MPEGTS - " + frameRate;
-          break;
       }
       return seg;
     }
@@ -379,7 +378,6 @@ var LiveConf = /*#__PURE__*/function () {
           break;
         default:
           throw "unsupported frame rate for RTMP - " + frameRate;
-          break;
       }
       return seg;
     }

package/dist/src/client/LiveStream.js

@@ -1664,7 +1664,7 @@ exports.StreamInsertion = /*#__PURE__*/function () {
  */
 exports.StreamConfig = /*#__PURE__*/function () {
   var _ref22 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(_ref21) {
-    var name, _ref21$customSettings, customSettings, probeMetadata, objectId, status, libraryId, probe, mainMeta, userConfig, hostName, streamUrl, nodes, node, endpoint, controller, timeoutId, probeUrl, lc, liveRecordingConfig, e, writeToken;
+    var name, _ref21$customSettings, customSettings, probeMetadata, objectId, status, libraryId, probe, mainMeta, userConfig, parsedName, hostName, streamUrl, nodes, node, endpoint, controller, timeoutId, probeUrl, lc, liveRecordingConfig, e, writeToken;
     return _regeneratorRuntime.wrap(function _callee11$(_context11) {
       while (1) switch (_context11.prev = _context11.next) {
         case 0:
@@ -1693,22 +1693,23 @@ exports.StreamConfig = /*#__PURE__*/function () {
           status.user_config = userConfig;
 
           // Get node URI from user config
-          hostName = userConfig.url.replace("udp://", "").replace("rtmp://", "").replace("srt://", "").split(":")[0];
+          parsedName = userConfig.url.replace("udp://", "https://").replace("rtmp://", "https://").replace("srt://", "https://");
+          hostName = new URL(parsedName).hostname;
           streamUrl = new URL(userConfig.url);
           console.log("Retrieving nodes - matching", hostName);
-          _context11.next = 19;
+          _context11.next = 20;
           return this.SpaceNodes({
             matchEndpoint: hostName
           });
-        case 19:
+        case 20:
           nodes = _context11.sent;
           if (!(nodes.length < 1)) {
-            _context11.next = 23;
+            _context11.next = 24;
             break;
           }
           status.error = "No node matching stream URL " + streamUrl.href;
           return _context11.abrupt("return", status);
-        case 23:
+        case 24:
           node = {
             endpoints: nodes[0].services.fabric_api.urls,
             id: nodes[0].id
@@ -1716,7 +1717,7 @@ exports.StreamConfig = /*#__PURE__*/function () {
           status.node = node;
           endpoint = node.endpoints[0];
           if (probe) {
-            _context11.next = 55;
+            _context11.next = 56;
             break;
           }
           this.SetNodes({
@@ -1729,17 +1730,17 @@ exports.StreamConfig = /*#__PURE__*/function () {
           timeoutId = setTimeout(function () {
             controller.abort();
           }, 60 * 1000); // milliseconds
-          _context11.prev = 31;
-          _context11.next = 34;
+          _context11.prev = 32;
+          _context11.next = 35;
           return this.Rep({
             libraryId: libraryId,
             objectId: objectId,
             rep: "probe"
           });
-        case 34:
+        case 35:
           probeUrl = _context11.sent;
           _context11.t0 = this.utils;
-          _context11.next = 38;
+          _context11.next = 39;
           return HttpClient.Fetch(probeUrl, {
             body: JSON.stringify({
               "filename": streamUrl.href,
@@ -1748,50 +1749,50 @@ exports.StreamConfig = /*#__PURE__*/function () {
             method: "POST",
             signal: controller.signal
           });
-        case 38:
+        case 39:
           _context11.t1 = _context11.sent;
-          _context11.next = 41;
+          _context11.next = 42;
           return _context11.t0.ResponseToJson.call(_context11.t0, _context11.t1);
-        case 41:
+        case 42:
           probe = _context11.sent;
           if (probe) {
             clearTimeout(timeoutId);
           }
           if (!probe.errors) {
-            _context11.next = 45;
+            _context11.next = 46;
             break;
           }
           throw probe.errors[0];
-        case 45:
-          _context11.next = 54;
+        case 46:
+          _context11.next = 55;
           break;
-        case 47:
-          _context11.prev = 47;
-          _context11.t2 = _context11["catch"](31);
+        case 48:
+          _context11.prev = 48;
+          _context11.t2 = _context11["catch"](32);
           if (!(_context11.t2.code === "ETIMEDOUT")) {
-            _context11.next = 53;
+            _context11.next = 54;
             break;
           }
           throw "Stream probe time out - make sure the stream source is available";
-        case 53:
-          throw _context11.t2;
         case 54:
-          probe.format.filename = streamUrl.href;
+          throw _context11.t2;
         case 55:
+          probe.format.filename = streamUrl.href;
+        case 56:
           // Create live recording config
           lc = new LiveConf(probe, node.id, endpoint, false, false, true);
           liveRecordingConfig = lc.generateLiveConf({
             customSettings: customSettings
           }); // Store live recording config into the stream object
-          _context11.next = 59;
+          _context11.next = 60;
           return this.EditContentObject({
             libraryId: libraryId,
             objectId: objectId
           });
-        case 59:
+        case 60:
           e = _context11.sent;
           writeToken = e.write_token;
-          _context11.next = 63;
+          _context11.next = 64;
           return this.ReplaceMetadata({
             libraryId: libraryId,
             objectId: objectId,
@@ -1799,8 +1800,8 @@ exports.StreamConfig = /*#__PURE__*/function () {
             metadataSubtree: "live_recording",
             metadata: liveRecordingConfig.live_recording
           });
-        case 63:
-          _context11.next = 65;
+        case 64:
+          _context11.next = 66;
           return this.ReplaceMetadata({
             libraryId: libraryId,
             objectId: objectId,
@@ -1808,22 +1809,22 @@ exports.StreamConfig = /*#__PURE__*/function () {
             metadataSubtree: "live_recording_config/probe_info",
             metadata: probe
           });
-        case 65:
-          _context11.next = 67;
+        case 66:
+          _context11.next = 68;
           return this.FinalizeContentObject({
             libraryId: libraryId,
             objectId: objectId,
             writeToken: writeToken,
             commitMessage: "Apply live stream configuration"
           });
-        case 67:
+        case 68:
           status.fin = _context11.sent;
           return _context11.abrupt("return", status);
-        case 69:
+        case 70:
         case "end":
           return _context11.stop();
       }
-    }, _callee11, this, [[31, 47]]);
+    }, _callee11, this, [[32, 48]]);
   }));
   return function (_x11) {
     return _ref22.apply(this, arguments);

package/package.json

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

package/src/HttpClient.js

@@ -1,6 +1,7 @@
 const URI = require("urijs");
 const Fetch = typeof fetch !== "undefined" ? fetch : require("node-fetch").default;
 const {LogMessage} = require("./LogMessage");
+const Utils = require("./Utils");
 
 class HttpClient {
   Log(message, error=false) {
@@ -100,7 +101,10 @@ class HttpClient {
     }
 
     let response;
-    this.Log(`${method} - ${uri.toString()}`);
+    if(this.debug) {
+      this.Log(`${method} - ${uri.toString()}`);
+      this.Log(`fetchParameters: ${JSON.stringify(fetchParameters, null, 2)}`);
+    }
     try {
       response =
         await HttpClient.Fetch(
@@ -166,7 +170,7 @@ class HttpClient {
         requestParams: fetchParameters
       };
 
-      this.Log(
+      if(this.debug) this.Log(
         JSON.stringify(error, null, 2),
         true
       );
@@ -208,6 +212,16 @@ class HttpClient {
     );
   }
 
+  // Perform http request and then return response body parsed as JSON
+  // ResponseToJson() will log response if this.debug === true
+  async RequestJsonBody(params) {
+    return Utils.ResponseToJson(
+      this.Request(params),
+      this.debug,
+      this.Log.bind(this)
+    );
+  }
+
   URL({path, queryParams={}}) {
     let baseURI = this.BaseURI();