@eluvio/elv-client-js 4.2.23 → 4.2.25

package/dist/src/HttpClient.js

@@ -7,17 +7,21 @@ var _Fetch = typeof fetch !== "undefined" ? fetch : require("node-fetch")["defau
 var _require = require("./LogMessage"),
   LogMessage = _require.LogMessage;
 var Utils = require("./Utils");
+var UrlJoin = require("url-join");
+var NetworkUrls = require("./NetworkUrls");
 var HttpClient = /*#__PURE__*/function () {
   "use strict";
 
   function HttpClient(_ref) {
     var uris = _ref.uris,
+      networkName = _ref.networkName,
       debug = _ref.debug;
     _classCallCheck(this, HttpClient);
     this.uris = uris;
     this.uriIndex = 0;
     this.debug = debug;
     this.draftURIs = {};
+    this.networkName = networkName;
     this.retries = Math.max(3, uris.length);
   }
   _createClass(HttpClient, [{
@@ -67,7 +71,7 @@ var HttpClient = /*#__PURE__*/function () {
     key: "Request",
     value: function () {
       var _Request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref3) {
-        var method, path, _ref3$queryParams, queryParams, body, _ref3$bodyType, bodyType, _ref3$headers, headers, _ref3$attempts, attempts, _ref3$allowFailover, allowFailover, _ref3$forceFailover, forceFailover, _ref3$allowRetry, allowRetry, uriIndex, baseURI, writeTokenMatch, writeToken, uri, fetchParameters, response, responseType, errorBody, error;
+        var method, path, _ref3$queryParams, queryParams, body, _ref3$bodyType, bodyType, _ref3$headers, headers, _ref3$attempts, attempts, _ref3$allowFailover, allowFailover, _ref3$forceFailover, forceFailover, _ref3$allowRetry, allowRetry, uriIndex, baseURI, writeTokenMatch, writeToken, configUrl, uri, fetchParameters, response, responseType, errorBody, error;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -75,16 +79,55 @@ var HttpClient = /*#__PURE__*/function () {
               baseURI = this.BaseURI(uriIndex); // If URL contains a write token, it must go to the correct server and can not fail over
               writeTokenMatch = path.replace(/^\//, "").match(/(qlibs\/ilib[a-zA-Z0-9]+|q|qid)\/(tqw__[a-zA-Z0-9]+)/);
               writeToken = writeTokenMatch ? writeTokenMatch[2] : undefined;
-              if (writeToken) {
-                allowFailover = false;
-                if (this.draftURIs[writeToken]) {
-                  // Use saved write token URI
-                  baseURI = this.draftURIs[writeToken];
-                } else {
-                  // Save current URI for all future requests involving this write token
-                  this.draftURIs[writeToken] = baseURI;
-                }
+              if (!writeToken) {
+                _context.next = 30;
+                break;
+              }
+              allowFailover = false;
+              if (!this.draftURIs[writeToken]) {
+                _context.next = 10;
+                break;
               }
+              // Use saved write token URI
+              baseURI = this.draftURIs[writeToken];
+              _context.next = 29;
+              break;
+            case 10:
+              if (!this.networkName) {
+                _context.next = 28;
+                break;
+              }
+              _context.prev = 11;
+              configUrl = new URL(NetworkUrls[this.networkName]);
+              configUrl.pathname = UrlJoin("/s", this.networkName, "nodes");
+              configUrl.searchParams.set("token", writeToken);
+              _context.t0 = URI;
+              _context.next = 18;
+              return fetch(configUrl);
+            case 18:
+              _context.next = 20;
+              return _context.sent.json();
+            case 20:
+              _context.t1 = _context.sent.nodes[0].services.fabric_api.urls[0];
+              baseURI = new _context.t0(_context.t1);
+              _context.next = 28;
+              break;
+            case 24:
+              _context.prev = 24;
+              _context.t2 = _context["catch"](11);
+              this.Log("Failed to retrieve write token node for " + writeToken);
+              this.Log(_context.t2);
+            case 28:
+              // Save current URI for all future requests involving this write token
+              this.draftURIs[writeToken] = baseURI;
+            case 29:
+              // If write token is present in headers, we may get redirected even if we try and use the right node.
+              // When a network request is redirected, the authorization header is dropped, which will cause issues.
+              // Ensure it is present in query params as well
+              if ((headers.Authorization || headers.authorization) && !queryParams.authorization) {
+                queryParams.authorization = headers.Authorization || headers.authorization;
+              }
+            case 30:
               uri = baseURI.path(path).query(queryParams).hash("");
               fetchParameters = {
                 method: method,
@@ -101,50 +144,50 @@ var HttpClient = /*#__PURE__*/function () {
                 this.Log("".concat(method, " - ").concat(uri.toString()));
                 this.Log("fetchParameters: ".concat(JSON.stringify(fetchParameters, null, 2)));
               }
-              _context.prev = 9;
-              _context.next = 12;
+              _context.prev = 34;
+              _context.next = 37;
               return HttpClient.Fetch(uri.toString(), fetchParameters);
-            case 12:
+            case 37:
               response = _context.sent;
-              _context.next = 18;
+              _context.next = 43;
               break;
-            case 15:
-              _context.prev = 15;
-              _context.t0 = _context["catch"](9);
+            case 40:
+              _context.prev = 40;
+              _context.t3 = _context["catch"](34);
               response = {
                 ok: false,
-                status: _context.t0 && _context.t0.status || 500,
-                statusText: "ElvClient Error: " + _context.t0.message,
+                status: _context.t3 && _context.t3.status || 500,
+                statusText: "ElvClient Error: " + _context.t3.message,
                 url: uri.toString(),
-                error: _context.t0
+                error: _context.t3
               };
-            case 18:
+            case 43:
               if (response.ok) {
-                _context.next = 47;
+                _context.next = 72;
                 break;
               }
               if (!((parseInt(response.status) >= 500 || forceFailover) && allowRetry && attempts < this.retries)) {
-                _context.next = 31;
+                _context.next = 56;
                 break;
               }
               if (!allowFailover) {
-                _context.next = 25;
+                _context.next = 50;
                 break;
               }
               // Fail over to alternate node
               this.uriIndex = (this.uriIndex + 1) % this.uris.length;
               this.Log("HttpClient failing over from ".concat(baseURI.toString(), ": ").concat(attempts + 1, " attempts"), true);
-              _context.next = 28;
+              _context.next = 53;
               break;
-            case 25:
+            case 50:
               // Wait and retry
               this.Log("HttpClient retrying request from ".concat(baseURI.toString(), ": ").concat(attempts + 1, " attempts"), true);
-              _context.next = 28;
+              _context.next = 53;
               return new Promise(function (resolve) {
                 return setTimeout(resolve, 1000);
               });
-            case 28:
-              _context.next = 30;
+            case 53:
+              _context.next = 55;
               return this.Request({
                 method: method,
                 path: path,
@@ -156,34 +199,34 @@ var HttpClient = /*#__PURE__*/function () {
                 uriIndex: uriIndex,
                 forceFailover: forceFailover
               });
-            case 30:
+            case 55:
               return _context.abrupt("return", _context.sent);
-            case 31:
+            case 56:
               // Parse JSON error if headers indicate JSON
               responseType = response.headers ? response.headers.get("content-type") || "" : "";
               errorBody = "";
               if (!(response.text && response.json)) {
-                _context.next = 44;
+                _context.next = 69;
                 break;
               }
               if (!responseType.includes("application/json")) {
-                _context.next = 40;
+                _context.next = 65;
                 break;
               }
-              _context.next = 37;
+              _context.next = 62;
               return response.json();
-            case 37:
-              _context.t1 = _context.sent;
-              _context.next = 43;
+            case 62:
+              _context.t4 = _context.sent;
+              _context.next = 68;
               break;
-            case 40:
-              _context.next = 42;
+            case 65:
+              _context.next = 67;
               return response.text();
-            case 42:
-              _context.t1 = _context.sent;
-            case 43:
-              errorBody = _context.t1;
-            case 44:
+            case 67:
+              _context.t4 = _context.sent;
+            case 68:
+              errorBody = _context.t4;
+            case 69:
               error = {
                 name: "ElvHttpClientError",
                 status: response.status,
@@ -196,14 +239,14 @@ var HttpClient = /*#__PURE__*/function () {
               };
               if (this.debug) this.Log(JSON.stringify(error, null, 2), true);
               throw error;
-            case 47:
+            case 72:
               this.Log("".concat(response.status, " - ").concat(method, " ").concat(uri.toString()));
               return _context.abrupt("return", response);
-            case 49:
+            case 74:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[9, 15]]);
+        }, _callee, this, [[11, 24], [34, 40]]);
       }));
       function Request(_x) {
         return _Request.apply(this, arguments);

package/dist/src/NetworkUrls.js

@@ -0,0 +1,8 @@
+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/RemoteSigner.js

@@ -49,12 +49,12 @@ var RemoteSigner = /*#__PURE__*/function (_Ethers$Signer) {
     key: "Initialize",
     value: function () {
       var _Initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var body, _yield$Utils$Response, addr, eth, token, keys, address;
+        var body, _yield$Utils$Response, addr, eth, token, pubkey, keys, address;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               if (this.authToken) {
-                _context.next = 13;
+                _context.next = 15;
                 break;
               }
               body = {
@@ -80,15 +80,17 @@ var RemoteSigner = /*#__PURE__*/function (_Ethers$Signer) {
               addr = _yield$Utils$Response.addr;
               eth = _yield$Utils$Response.eth;
               token = _yield$Utils$Response.token;
+              pubkey = _yield$Utils$Response.pubkey;
               this.authToken = token;
               this.address = Utils.FormatAddress(addr);
               this.id = eth;
-            case 13:
-              if (this.address) {
-                _context.next = 19;
+              this.publicKey = pubkey;
+            case 15:
+              if (!(!this.address || !this.publicKey)) {
+                _context.next = 21;
                 break;
               }
-              _context.next = 16;
+              _context.next = 18;
               return Utils.ResponseToJson(this.HttpClient.Request({
                 method: "GET",
                 path: UrlJoin("as", "wlt", "keys"),
@@ -96,18 +98,23 @@ var RemoteSigner = /*#__PURE__*/function (_Ethers$Signer) {
                   Authorization: "Bearer ".concat(this.authToken)
                 }
               }));
-            case 16:
+            case 18:
               keys = _context.sent;
-              address = keys.eth[0];
-              if (address && address.startsWith("0x")) {
-                this.address = address;
-              } else {
-                this.address = Utils.HashToAddress(keys.eth[0]);
+              if (!this.address) {
+                address = keys.eth[0];
+                if (address && address.startsWith("0x")) {
+                  this.address = address;
+                } else {
+                  this.address = Utils.HashToAddress(keys.eth[0]);
+                }
+              }
+              if (!this.publicKey) {
+                this.publicKey = keys.pubkey && keys.pubkey[0];
               }
-            case 19:
+            case 21:
               this.id = this.address ? "ikms".concat(Utils.AddressToHash(this.address)) : undefined;
               this.signer = this.provider.getSigner(this.address);
-            case 21:
+            case 23:
             case "end":
               return _context.stop();
           }
@@ -278,22 +285,115 @@ var RemoteSigner = /*#__PURE__*/function (_Ethers$Signer) {
       return this.address;
     }
   }, {
-    key: "signDigest",
+    key: "_normalizePublicKey",
+    value: function _normalizePublicKey(key) {
+      var with0x = key.startsWith("0x") ? key : "0x".concat(key);
+      return with0x.length === 2 + 128 ? "0x04".concat(with0x.slice(2)) : with0x;
+    }
+
+    /**
+     * This signer's public key, as provided by the authd service
+     *
+     * @return {Promise<string>} - The public key, in uncompressed hex like SigningKey.publicKey
+     */
+  }, {
+    key: "PublicKey",
     value: function () {
-      var _signDigest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(digest) {
-        var _this2 = this;
+      var _PublicKey = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
+        return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              if (this.publicKey) {
+                _context6.next = 2;
+                break;
+              }
+              throw Error("RemoteSigner: public key not available - call Initialize() first");
+            case 2:
+              return _context6.abrupt("return", this._normalizePublicKey(this.publicKey));
+            case 3:
+            case "end":
+              return _context6.stop();
+          }
+        }, _callee6, this);
+      }));
+      function PublicKey() {
+        return _PublicKey.apply(this, arguments);
+      }
+      return PublicKey;
+    }() /** so remote signers can be used interchangeably with local signers */
+  }, {
+    key: "_signingKey",
+    value: function _signingKey() {
+      if (!this.publicKey) {
+        throw Error("RemoteSigner: public key not available - call Initialize() first");
+      }
+      var publicKey = this._normalizePublicKey(this.publicKey);
+      return {
+        publicKey: publicKey,
+        get privateKey() {
+          throw Error("RemoteSigner: remote signer does not have direct access to a private key");
+        }
+      };
+    }
+
+    /**
+     * Decrypt a secp256k1 ECIES-encrypted blob (e.g. a fabric encryption conk) that was wrapped
+     * for this signer's public key, via the authd service's generic decrypt endpoint.
+     *
+     * @param {string} encryptedData - Base64-encoded ECIES-encrypted blob
+     * @return {Promise<Object>} - The decrypted, JSON-parsed contents
+     */
+  }, {
+    key: "DecryptCap",
+    value: function () {
+      var _DecryptCap = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(encryptedData) {
+        var _yield$Utils$Response2, data;
         return _regeneratorRuntime.wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
+            case 0:
+              _context7.next = 2;
+              return Utils.ResponseToJson(this.HttpClient.Request({
+                method: "POST",
+                path: UrlJoin("as", "wlt", "decrypt", "eth", this.id),
+                headers: {
+                  Authorization: "Bearer ".concat(this.authToken)
+                },
+                body: {
+                  data: encryptedData
+                }
+              }));
+            case 2:
+              _yield$Utils$Response2 = _context7.sent;
+              data = _yield$Utils$Response2.data;
+              return _context7.abrupt("return", JSON.parse(Buffer.from(data, "base64").toString()));
+            case 5:
+            case "end":
+              return _context7.stop();
+          }
+        }, _callee7, this);
+      }));
+      function DecryptCap(_x5) {
+        return _DecryptCap.apply(this, arguments);
+      }
+      return DecryptCap;
+    }()
+  }, {
+    key: "signDigest",
+    value: function () {
+      var _signDigest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(digest) {
+        var _this2 = this;
+        return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               if (!this.signatureCache[digest]) {
                 this.signatureCache[digest] = new Promise( /*#__PURE__*/function () {
-                  var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(resolve, reject) {
+                  var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(resolve, reject) {
                     var signature;
-                    return _regeneratorRuntime.wrap(function _callee6$(_context6) {
-                      while (1) switch (_context6.prev = _context6.next) {
+                    return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+                      while (1) switch (_context8.prev = _context8.next) {
                         case 0:
-                          _context6.prev = 0;
-                          _context6.next = 3;
+                          _context8.prev = 0;
+                          _context8.next = 3;
                           return Utils.ResponseToJson(_this2.HttpClient.Request({
                             method: "POST",
                             path: UrlJoin("as", "wlt", "sign", "eth", _this2.id),
@@ -305,38 +405,38 @@ var RemoteSigner = /*#__PURE__*/function (_Ethers$Signer) {
                             }
                           }));
                         case 3:
-                          signature = _context6.sent;
+                          signature = _context8.sent;
                           signature.v = parseInt(signature.v, 16);
                           signature.recoveryParam = signature.v - 27;
                           resolve(signature);
-                          _context6.next = 12;
+                          _context8.next = 12;
                           break;
                         case 9:
-                          _context6.prev = 9;
-                          _context6.t0 = _context6["catch"](0);
-                          reject(_context6.t0);
+                          _context8.prev = 9;
+                          _context8.t0 = _context8["catch"](0);
+                          reject(_context8.t0);
                         case 12:
                         case "end":
-                          return _context6.stop();
+                          return _context8.stop();
                       }
-                    }, _callee6, null, [[0, 9]]);
+                    }, _callee8, null, [[0, 9]]);
                   }));
-                  return function (_x6, _x7) {
+                  return function (_x7, _x8) {
                     return _ref6.apply(this, arguments);
                   };
                 }());
               }
-              _context7.next = 3;
+              _context9.next = 3;
               return this.signatureCache[digest];
             case 3:
-              return _context7.abrupt("return", _context7.sent);
+              return _context9.abrupt("return", _context9.sent);
             case 4:
             case "end":
-              return _context7.stop();
+              return _context9.stop();
           }
-        }, _callee7, this);
+        }, _callee9, this);
       }));
-      function signDigest(_x5) {
+      function signDigest(_x6) {
         return _signDigest.apply(this, arguments);
       }
       return signDigest;
@@ -344,27 +444,27 @@ var RemoteSigner = /*#__PURE__*/function (_Ethers$Signer) {
   }, {
     key: "signMessage",
     value: function () {
-      var _signMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(message) {
-        return _regeneratorRuntime.wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+      var _signMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(message) {
+        return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              _context8.t0 = Promise;
-              _context8.t1 = Ethers.utils;
-              _context8.t2 = "0x";
-              _context8.next = 5;
+              _context10.t0 = Promise;
+              _context10.t1 = Ethers.utils;
+              _context10.t2 = "0x";
+              _context10.next = 5;
               return this.signDigest(Ethers.utils.hashMessage(message));
             case 5:
-              _context8.t3 = _context8.sent;
-              _context8.t4 = _context8.t2.concat.call(_context8.t2, _context8.t3);
-              _context8.t5 = _context8.t1.joinSignature.call(_context8.t1, _context8.t4);
-              return _context8.abrupt("return", _context8.t0.resolve.call(_context8.t0, _context8.t5));
+              _context10.t3 = _context10.sent;
+              _context10.t4 = _context10.t2.concat.call(_context10.t2, _context10.t3);
+              _context10.t5 = _context10.t1.joinSignature.call(_context10.t1, _context10.t4);
+              return _context10.abrupt("return", _context10.t0.resolve.call(_context10.t0, _context10.t5));
             case 9:
             case "end":
-              return _context8.stop();
+              return _context10.stop();
           }
-        }, _callee8, this);
+        }, _callee10, this);
       }));
-      function signMessage(_x8) {
+      function signMessage(_x9) {
         return _signMessage.apply(this, arguments);
       }
       return signMessage;
@@ -372,27 +472,27 @@ var RemoteSigner = /*#__PURE__*/function (_Ethers$Signer) {
   }, {
     key: "sign",
     value: function () {
-      var _sign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(transaction) {
+      var _sign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(transaction) {
         var signature;
-        return _regeneratorRuntime.wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+        return _regeneratorRuntime.wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              _context9.next = 2;
+              _context11.next = 2;
               return Ethers.utils.resolveProperties(transaction);
             case 2:
-              transaction = _context9.sent;
-              _context9.next = 5;
+              transaction = _context11.sent;
+              _context11.next = 5;
               return this.signDigest(Ethers.utils.keccak256(Ethers.utils.serializeTransaction(transaction)));
             case 5:
-              signature = _context9.sent;
-              return _context9.abrupt("return", Ethers.utils.serializeTransaction(transaction, signature));
+              signature = _context11.sent;
+              return _context11.abrupt("return", Ethers.utils.serializeTransaction(transaction, signature));
             case 7:
             case "end":
-              return _context9.stop();
+              return _context11.stop();
           }
-        }, _callee9, this);
+        }, _callee11, this);
       }));
-      function sign(_x9) {
+      function sign(_x10) {
         return _sign.apply(this, arguments);
       }
       return sign;
@@ -400,33 +500,33 @@ var RemoteSigner = /*#__PURE__*/function (_Ethers$Signer) {
   }, {
     key: "sendTransaction",
     value: function () {
-      var _sendTransaction = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(transaction) {
+      var _sendTransaction = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12(transaction) {
         var _this3 = this;
-        return _regeneratorRuntime.wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+        return _regeneratorRuntime.wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
               if (!(transaction.nonce == null)) {
-                _context10.next = 5;
+                _context12.next = 5;
                 break;
               }
               transaction = Ethers.utils.shallowCopy(transaction);
-              _context10.next = 4;
+              _context12.next = 4;
               return this.provider.getTransactionCount(this.address, "pending");
             case 4:
-              transaction.nonce = _context10.sent;
+              transaction.nonce = _context12.sent;
             case 5:
-              return _context10.abrupt("return", this.populateTransaction(transaction, this.provider, this.address).then(function (tx) {
+              return _context12.abrupt("return", this.populateTransaction(transaction, this.provider, this.address).then(function (tx) {
                 return _this3.sign(tx).then(function (signedTransaction) {
                   return _this3.provider.sendTransaction(signedTransaction);
                 });
               }));
             case 6:
             case "end":
-              return _context10.stop();
+              return _context12.stop();
           }
-        }, _callee10, this);
+        }, _callee12, this);
       }));
-      function sendTransaction(_x10) {
+      function sendTransaction(_x11) {
         return _sendTransaction.apply(this, arguments);
       }
       return sendTransaction;

package/dist/src/abr_profiles/abr_profile_live_drm.js

@@ -1578,16 +1578,6 @@ var AbrProfileLiveDrm = {
     }
   },
   "playout_formats": {
-    "dash-playready-cenc": {
-      "drm": {
-        "enc_scheme_name": "cenc",
-        "type": "DrmPlayReady"
-      },
-      "protocol": {
-        "min_buffer_length": 2,
-        "type": "ProtoDash"
-      }
-    },
     "dash-widevine": {
       "drm": {
         "content_id": "",