@eluvio/elv-client-js 4.0.101 → 4.0.102
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ElvClient-min.js +14 -15
- package/dist/ElvClient-node-min.js +13 -14
- package/dist/ElvFrameClient-min.js +10 -10
- package/dist/ElvPermissionsClient-min.js +9 -9
- package/dist/ElvWalletClient-min.js +14 -15
- package/dist/ElvWalletClient-node-min.js +13 -14
- package/dist/src/AuthorizationClient.js +12 -9
- package/dist/src/ContentObjectAudit.js +3 -3
- package/dist/src/ContentObjectVerification.js +3 -3
- package/dist/src/Crypto.js +2 -2
- package/dist/src/ElvClient.js +74 -67
- package/dist/src/ElvWallet.js +5 -7
- package/dist/src/EthClient.js +9 -8
- package/dist/src/FrameClient.js +10 -9
- package/dist/src/HttpClient.js +2 -1
- package/dist/src/Id.js +2 -1
- package/dist/src/PermissionsClient.js +19 -31
- package/dist/src/RemoteSigner.js +8 -6
- package/dist/src/UserProfileClient.js +19 -35
- package/dist/src/Utils.js +3 -2
- package/dist/src/client/ABRPublishing.js +2 -2
- package/dist/src/client/AccessGroups.js +2 -2
- package/dist/src/client/ContentAccess.js +620 -548
- package/dist/src/client/ContentManagement.js +3 -3
- package/dist/src/client/Contracts.js +2 -2
- package/dist/src/client/Files.js +2 -2
- package/dist/src/client/LiveConf.js +5 -3
- package/dist/src/client/LiveStream.js +2 -0
- package/dist/src/client/NFT.js +2 -2
- package/dist/src/walletClient/ClientMethods.js +2 -2
- package/dist/src/walletClient/Profile.js +2 -2
- package/dist/src/walletClient/Utils.js +2 -2
- package/dist/src/walletClient/index.js +14 -17
- package/package.json +1 -1
- package/src/ElvClient.js +43 -14
- package/src/FrameClient.js +1 -0
- package/src/client/ContentAccess.js +55 -1
- package/testScripts/Test.js +1 -9
|
@@ -2,8 +2,8 @@ var _typeof = require("@babel/runtime/helpers/typeof");
|
|
|
2
2
|
var _defineProperty = require("@babel/runtime/helpers/defineProperty");
|
|
3
3
|
var _regeneratorRuntime = require("@babel/runtime/regenerator");
|
|
4
4
|
var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
|
|
5
|
-
function ownKeys(
|
|
6
|
-
function _objectSpread(
|
|
5
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
6
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
7
7
|
/**
|
|
8
8
|
* Methods for managing content types, libraries and objects
|
|
9
9
|
*
|
|
@@ -2303,7 +2303,7 @@ exports.UpdateContentObjectGraph = /*#__PURE__*/function () {
|
|
|
2303
2303
|
return _context30.delegateYield(_loop(), "t0", 8);
|
|
2304
2304
|
case 8:
|
|
2305
2305
|
_ret = _context30.t0;
|
|
2306
|
-
if (!_ret) {
|
|
2306
|
+
if (!(_typeof(_ret) === "object")) {
|
|
2307
2307
|
_context30.next = 11;
|
|
2308
2308
|
break;
|
|
2309
2309
|
}
|
|
@@ -2,8 +2,8 @@ var _defineProperty = require("@babel/runtime/helpers/defineProperty");
|
|
|
2
2
|
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
3
3
|
var _regeneratorRuntime = require("@babel/runtime/regenerator");
|
|
4
4
|
var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
|
|
5
|
-
function ownKeys(
|
|
6
|
-
function _objectSpread(
|
|
5
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
6
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
7
7
|
/**
|
|
8
8
|
* Methods for deploying and interacting with contracts
|
|
9
9
|
*
|
package/dist/src/client/Files.js
CHANGED
|
@@ -2,8 +2,8 @@ var _toConsumableArray = require("@babel/runtime/helpers/toConsumableArray");
|
|
|
2
2
|
var _defineProperty = require("@babel/runtime/helpers/defineProperty");
|
|
3
3
|
var _regeneratorRuntime = require("@babel/runtime/regenerator");
|
|
4
4
|
var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
|
|
5
|
-
function ownKeys(
|
|
6
|
-
function _objectSpread(
|
|
5
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
6
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
7
7
|
/**
|
|
8
8
|
* Methods for accessing and managing access groups
|
|
9
9
|
*
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
var _defineProperty = require("@babel/runtime/helpers/defineProperty");
|
|
2
2
|
var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
|
|
3
3
|
var _createClass = require("@babel/runtime/helpers/createClass");
|
|
4
|
-
function ownKeys(
|
|
5
|
-
function _objectSpread(
|
|
4
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
5
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
6
6
|
var LadderTemplate = {
|
|
7
7
|
"2160": {
|
|
8
8
|
bit_rate: 14000000,
|
|
@@ -130,7 +130,7 @@ var LiveConf = /*#__PURE__*/function () {
|
|
|
130
130
|
this.overwriteOriginUrl = overwriteOriginUrl;
|
|
131
131
|
this.syncAudioToVideo = syncAudioToVideo;
|
|
132
132
|
}
|
|
133
|
-
|
|
133
|
+
_createClass(LiveConf, [{
|
|
134
134
|
key: "probeKind",
|
|
135
135
|
value: function probeKind() {
|
|
136
136
|
var fileNameSplit = this.probeData.format.filename.split(":");
|
|
@@ -245,6 +245,7 @@ var LiveConf = /*#__PURE__*/function () {
|
|
|
245
245
|
} else {
|
|
246
246
|
seg.audio = 29.76 * 48000; // Other codecs are resampled @48000
|
|
247
247
|
}
|
|
248
|
+
|
|
248
249
|
return seg;
|
|
249
250
|
}
|
|
250
251
|
|
|
@@ -577,5 +578,6 @@ var LiveConf = /*#__PURE__*/function () {
|
|
|
577
578
|
return conf;
|
|
578
579
|
}
|
|
579
580
|
}]);
|
|
581
|
+
return LiveConf;
|
|
580
582
|
}();
|
|
581
583
|
exports.LiveConf = LiveConf;
|
|
@@ -823,6 +823,7 @@ exports.StreamCreate = /*#__PURE__*/function () {
|
|
|
823
823
|
edge_write_token: edgeToken,
|
|
824
824
|
state: "active" // indicates there is an active session (set to 'closed' when done)
|
|
825
825
|
},
|
|
826
|
+
|
|
826
827
|
fabric_config: {
|
|
827
828
|
edge_write_token: edgeToken
|
|
828
829
|
}
|
|
@@ -1444,6 +1445,7 @@ exports.StreamInsertion = /*#__PURE__*/function () {
|
|
|
1444
1445
|
insertionInfo = {
|
|
1445
1446
|
duration_sec: 0 // Minimum of video and audio duration
|
|
1446
1447
|
};
|
|
1448
|
+
|
|
1447
1449
|
["video", "audio"].forEach(function (mt) {
|
|
1448
1450
|
var stream = offeringMeta.media_struct.streams[mt];
|
|
1449
1451
|
insertionInfo[mt] = {
|
package/dist/src/client/NFT.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
var _regeneratorRuntime = require("@babel/runtime/regenerator");
|
|
2
2
|
var _defineProperty = require("@babel/runtime/helpers/defineProperty");
|
|
3
3
|
var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
|
|
4
|
-
function ownKeys(
|
|
5
|
-
function _objectSpread(
|
|
4
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
5
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
6
6
|
/**
|
|
7
7
|
* Methods for creating and managing NFTs
|
|
8
8
|
*
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
var _defineProperty = require("@babel/runtime/helpers/defineProperty");
|
|
2
2
|
var _regeneratorRuntime = require("@babel/runtime/regenerator");
|
|
3
3
|
var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
|
|
4
|
-
function ownKeys(
|
|
5
|
-
function _objectSpread(
|
|
4
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
5
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
6
6
|
var Utils = require("../Utils");
|
|
7
7
|
var UrlJoin = require("url-join");
|
|
8
8
|
var _require = require("./Utils"),
|
|
@@ -2,8 +2,8 @@ var _defineProperty = require("@babel/runtime/helpers/defineProperty");
|
|
|
2
2
|
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
3
3
|
var _regeneratorRuntime = require("@babel/runtime/regenerator");
|
|
4
4
|
var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
|
|
5
|
-
function ownKeys(
|
|
6
|
-
function _objectSpread(
|
|
5
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
6
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
7
7
|
var Utils = require("../Utils");
|
|
8
8
|
var UrlJoin = require("url-join");
|
|
9
9
|
var StateStorePath = function StateStorePath(_ref) {
|
|
@@ -2,8 +2,8 @@ var _regeneratorRuntime = require("@babel/runtime/regenerator");
|
|
|
2
2
|
var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
|
|
3
3
|
var _defineProperty = require("@babel/runtime/helpers/defineProperty");
|
|
4
4
|
var _slicedToArray = require("@babel/runtime/helpers/slicedToArray");
|
|
5
|
-
function ownKeys(
|
|
6
|
-
function _objectSpread(
|
|
5
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
6
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
7
7
|
var Utils = require("../Utils");
|
|
8
8
|
var RarityToPercentage = function RarityToPercentage(rarity) {
|
|
9
9
|
if (!rarity) {
|
|
@@ -7,8 +7,8 @@ var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
|
|
|
7
7
|
var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
|
|
8
8
|
var _createClass = require("@babel/runtime/helpers/createClass");
|
|
9
9
|
var _excluded = ["code", "address", "type", "authToken", "expiresAt"];
|
|
10
|
-
function ownKeys(
|
|
11
|
-
function _objectSpread(
|
|
10
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
11
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
12
12
|
var _require = require("../ElvClient"),
|
|
13
13
|
ElvClient = _require.ElvClient;
|
|
14
14
|
var Configuration = require("./Configuration");
|
|
@@ -79,7 +79,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
|
|
|
79
79
|
this.utils = client.utils;
|
|
80
80
|
this.ForbiddenMethods = ElvWalletClient.ForbiddenMethods;
|
|
81
81
|
}
|
|
82
|
-
|
|
82
|
+
_createClass(ElvWalletClient, [{
|
|
83
83
|
key: "Log",
|
|
84
84
|
value: function Log(message) {
|
|
85
85
|
var error = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
|
|
@@ -136,7 +136,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
|
|
|
136
136
|
*/
|
|
137
137
|
}, {
|
|
138
138
|
key: "PersonalSign",
|
|
139
|
-
value:
|
|
139
|
+
value: function () {
|
|
140
140
|
var _PersonalSign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref2) {
|
|
141
141
|
var message, parameters, url;
|
|
142
142
|
return _regeneratorRuntime.wrap(function _callee3$(_context3) {
|
|
@@ -265,7 +265,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
|
|
|
265
265
|
return _PersonalSign.apply(this, arguments);
|
|
266
266
|
}
|
|
267
267
|
return PersonalSign;
|
|
268
|
-
}()
|
|
268
|
+
}()
|
|
269
269
|
}, {
|
|
270
270
|
key: "LogInURL",
|
|
271
271
|
value: function () {
|
|
@@ -344,7 +344,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
|
|
|
344
344
|
*/
|
|
345
345
|
}, {
|
|
346
346
|
key: "LogIn",
|
|
347
|
-
value:
|
|
347
|
+
value: function () {
|
|
348
348
|
var _LogIn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(_ref5) {
|
|
349
349
|
var _this = this;
|
|
350
350
|
var _ref5$method, method, provider, _ref5$mode, mode, callbackUrl, marketplaceParams, _ref5$clearLogin, clearLogin, callback, loginUrl;
|
|
@@ -463,10 +463,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
|
|
|
463
463
|
*
|
|
464
464
|
* @methodGroup Login
|
|
465
465
|
*/
|
|
466
|
-
)
|
|
467
466
|
}, {
|
|
468
467
|
key: "LogOut",
|
|
469
|
-
value:
|
|
468
|
+
value: function () {
|
|
470
469
|
var _LogOut = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
|
|
471
470
|
return _regeneratorRuntime.wrap(function _callee8$(_context8) {
|
|
472
471
|
while (1) switch (_context8.prev = _context8.next) {
|
|
@@ -509,7 +508,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
|
|
|
509
508
|
return _LogOut.apply(this, arguments);
|
|
510
509
|
}
|
|
511
510
|
return LogOut;
|
|
512
|
-
}()
|
|
511
|
+
}()
|
|
513
512
|
}, {
|
|
514
513
|
key: "TokenStatus",
|
|
515
514
|
value: function () {
|
|
@@ -549,7 +548,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
|
|
|
549
548
|
*/
|
|
550
549
|
}, {
|
|
551
550
|
key: "Authenticate",
|
|
552
|
-
value:
|
|
551
|
+
value: function () {
|
|
553
552
|
var _Authenticate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(_ref7) {
|
|
554
553
|
var token, decodedToken;
|
|
555
554
|
return _regeneratorRuntime.wrap(function _callee10$(_context10) {
|
|
@@ -615,10 +614,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
|
|
|
615
614
|
* - signingToken - Identical to `authToken`, but also includes the ability to perform arbitrary signatures with the custodial wallet. This token should be protected and should not be
|
|
616
615
|
* shared with third parties.
|
|
617
616
|
*/
|
|
618
|
-
)
|
|
619
617
|
}, {
|
|
620
618
|
key: "AuthenticateOAuth",
|
|
621
|
-
value:
|
|
619
|
+
value: function () {
|
|
622
620
|
var _AuthenticateOAuth = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(_ref8) {
|
|
623
621
|
var idToken, tenantId, email, signerURIs, _ref8$shareEmail, shareEmail, _ref8$extraData, extraData, nonce, _ref8$createRemoteTok, createRemoteToken, _ref8$force, force, tokenDuration, fabricToken, expiresAt, tokenResponse, address, decodedToken;
|
|
624
622
|
return _regeneratorRuntime.wrap(function _callee11$(_context11) {
|
|
@@ -745,10 +743,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
|
|
|
745
743
|
* @returns {Promise<string>} - Returns an authorization token that can be used to initialize the client using <a href="#Authenticate">Authenticate</a>.
|
|
746
744
|
* Save this token to avoid having to reauthenticate. This token expires after 24 hours.
|
|
747
745
|
*/
|
|
748
|
-
)
|
|
749
746
|
}, {
|
|
750
747
|
key: "AuthenticateExternalWallet",
|
|
751
|
-
value:
|
|
748
|
+
value: function () {
|
|
752
749
|
var _AuthenticateExternalWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(_ref9) {
|
|
753
750
|
var _this2 = this;
|
|
754
751
|
var address, _ref9$tokenDuration, tokenDuration, _ref9$walletName, walletName, Sign, expiresAt, fabricToken;
|
|
@@ -817,7 +814,6 @@ var ElvWalletClient = /*#__PURE__*/function () {
|
|
|
817
814
|
*
|
|
818
815
|
* @returns {string} - The client auth token
|
|
819
816
|
*/
|
|
820
|
-
)
|
|
821
817
|
}, {
|
|
822
818
|
key: "ClientAuthToken",
|
|
823
819
|
value: function ClientAuthToken() {
|
|
@@ -1982,7 +1978,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
|
|
|
1982
1978
|
*/
|
|
1983
1979
|
}, {
|
|
1984
1980
|
key: "Initialize",
|
|
1985
|
-
value:
|
|
1981
|
+
value: function () {
|
|
1986
1982
|
var _Initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee25(_ref24) {
|
|
1987
1983
|
var client, _ref24$appId, appId, _ref24$network, network, _ref24$mode, mode, localization, marketplaceParams, previewMarketplaceId, _ref24$storeAuthToken, storeAuthToken, _ref24$skipMarketplac, skipMarketplaceLoad, _ref25, tenantSlug, marketplaceSlug, marketplaceId, marketplaceHash, previewMarketplaceHash, walletClient, url, savedToken;
|
|
1988
1984
|
return _regeneratorRuntime.wrap(function _callee25$(_context25) {
|
|
@@ -2100,8 +2096,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
|
|
|
2100
2096
|
return _Initialize.apply(this, arguments);
|
|
2101
2097
|
}
|
|
2102
2098
|
return Initialize;
|
|
2103
|
-
}()
|
|
2099
|
+
}()
|
|
2104
2100
|
}]);
|
|
2101
|
+
return ElvWalletClient;
|
|
2105
2102
|
}();
|
|
2106
2103
|
Object.assign(ElvWalletClient.prototype, require("./ClientMethods"));
|
|
2107
2104
|
Object.assign(ElvWalletClient.prototype, require("./Profile"));
|
package/package.json
CHANGED
package/src/ElvClient.js
CHANGED
|
@@ -70,7 +70,11 @@ class ElvClient {
|
|
|
70
70
|
this.authClient,
|
|
71
71
|
this.ethClient,
|
|
72
72
|
this.HttpClient,
|
|
73
|
-
this.
|
|
73
|
+
this.AuthHttpClient,
|
|
74
|
+
this.FileServiceHttpClient,
|
|
75
|
+
this.SearchHttpClient,
|
|
76
|
+
this.userProfileClient
|
|
77
|
+
].forEach(setDebug);
|
|
74
78
|
|
|
75
79
|
if(enable) {
|
|
76
80
|
this.Log(
|
|
@@ -78,7 +82,8 @@ class ElvClient {
|
|
|
78
82
|
Content Space: ${this.contentSpaceId}
|
|
79
83
|
Fabric URLs: [\n\t\t${this.fabricURIs.join(", \n\t\t")}\n\t]
|
|
80
84
|
Ethereum URLs: [\n\t\t${this.ethereumURIs.join(", \n\t\t")}\n\t]
|
|
81
|
-
Auth Service URLs: [
|
|
85
|
+
Auth Service URLs: [\\n\\t\\t${this.authServiceURIs.join(", \n\t\t")}\\n\\t]
|
|
86
|
+
File Service URLs: [\\n\\t\\t${this.fileServiceURIs.join(", \n\t\t")}\\n\\t]
|
|
82
87
|
`
|
|
83
88
|
);
|
|
84
89
|
}
|
|
@@ -130,6 +135,7 @@ class ElvClient {
|
|
|
130
135
|
* @param {Array<string>} fabricURIs - A list of full URIs to content fabric nodes
|
|
131
136
|
* @param {Array<string>} ethereumURIs - A list of full URIs to ethereum nodes
|
|
132
137
|
* @param {Array<string>} authServiceURIs - A list of full URIs to auth service endpoints
|
|
138
|
+
* @param {Array<string>} fileServiceURIs - A list of full URIs to file service endpoints
|
|
133
139
|
* @param {Array<string>=} searchURIs - A list of full URIs to search service endpoints
|
|
134
140
|
* @param {number=} ethereumContractTimeout=10 - Number of seconds to wait for contract calls
|
|
135
141
|
* @param {string=} trustAuthorityId - (OAuth) The ID of the trust authority to use for OAuth authentication
|
|
@@ -150,6 +156,7 @@ class ElvClient {
|
|
|
150
156
|
fabricURIs,
|
|
151
157
|
ethereumURIs,
|
|
152
158
|
authServiceURIs,
|
|
159
|
+
fileServiceURIs,
|
|
153
160
|
searchURIs,
|
|
154
161
|
ethereumContractTimeout = 10,
|
|
155
162
|
trustAuthorityId,
|
|
@@ -175,6 +182,7 @@ class ElvClient {
|
|
|
175
182
|
|
|
176
183
|
this.fabricURIs = fabricURIs;
|
|
177
184
|
this.authServiceURIs = authServiceURIs;
|
|
185
|
+
this.fileServiceURIs = fileServiceURIs || fabricURIs;
|
|
178
186
|
this.ethereumURIs = ethereumURIs;
|
|
179
187
|
this.searchURIs = searchURIs;
|
|
180
188
|
this.ethereumContractTimeout = ethereumContractTimeout;
|
|
@@ -249,6 +257,11 @@ class ElvClient {
|
|
|
249
257
|
authServiceURIs = authServiceURIs.filter(filterHTTPS);
|
|
250
258
|
}
|
|
251
259
|
|
|
260
|
+
let fileServiceURIs = fabricInfo.network.services.file_service || fabricURIs;
|
|
261
|
+
if(fileServiceURIs.find(filterHTTPS)) {
|
|
262
|
+
fileServiceURIs = fileServiceURIs.filter(filterHTTPS);
|
|
263
|
+
}
|
|
264
|
+
|
|
252
265
|
const searchURIs = fabricInfo.network.services.search || [];
|
|
253
266
|
|
|
254
267
|
const fabricVersion = Math.max(...(fabricInfo.network.api_versions || [2]));
|
|
@@ -261,6 +274,7 @@ class ElvClient {
|
|
|
261
274
|
fabricURIs,
|
|
262
275
|
ethereumURIs,
|
|
263
276
|
authServiceURIs,
|
|
277
|
+
fileServiceURIs,
|
|
264
278
|
kmsURIs: kmsUrls,
|
|
265
279
|
searchURIs,
|
|
266
280
|
fabricVersion
|
|
@@ -364,6 +378,7 @@ class ElvClient {
|
|
|
364
378
|
fabricURIs,
|
|
365
379
|
ethereumURIs,
|
|
366
380
|
authServiceURIs,
|
|
381
|
+
fileServiceURIs,
|
|
367
382
|
searchURIs,
|
|
368
383
|
fabricVersion
|
|
369
384
|
} = await ElvClient.Configuration({
|
|
@@ -380,6 +395,7 @@ class ElvClient {
|
|
|
380
395
|
fabricURIs,
|
|
381
396
|
ethereumURIs,
|
|
382
397
|
authServiceURIs,
|
|
398
|
+
fileServiceURIs,
|
|
383
399
|
searchURIs,
|
|
384
400
|
ethereumContractTimeout,
|
|
385
401
|
trustAuthorityId,
|
|
@@ -410,6 +426,7 @@ class ElvClient {
|
|
|
410
426
|
const uris = this.service === "search" ? this.searchURIs : this.fabricURIs;
|
|
411
427
|
this.HttpClient = new HttpClient({uris, debug: this.debug});
|
|
412
428
|
this.AuthHttpClient = new HttpClient({uris: this.authServiceURIs, debug: this.debug});
|
|
429
|
+
this.FileServiceHttpClient = new HttpClient({uris: this.fileServiceURIs, debug: this.debug});
|
|
413
430
|
this.SearchHttpClient = new HttpClient({uris: this.searchURIs || [], debug: this.debug});
|
|
414
431
|
this.ethClient = new EthClient({client: this, uris: this.ethereumURIs, networkId: this.networkId, debug: this.debug, timeout: this.ethereumContractTimeout});
|
|
415
432
|
|
|
@@ -466,27 +483,26 @@ class ElvClient {
|
|
|
466
483
|
throw Error("Unable to change region: Configuration URL not set");
|
|
467
484
|
}
|
|
468
485
|
|
|
469
|
-
const {fabricURIs, ethereumURIs, authServiceURIs, searchURIs} = await ElvClient.Configuration({
|
|
486
|
+
const {fabricURIs, ethereumURIs, authServiceURIs, fileServiceURIs, searchURIs} = await ElvClient.Configuration({
|
|
470
487
|
configUrl: this.configUrl,
|
|
471
488
|
region
|
|
472
489
|
});
|
|
473
490
|
|
|
474
491
|
this.region = region;
|
|
475
492
|
|
|
476
|
-
this.
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
this.ethClient.ethereumURIs = ethereumURIs;
|
|
485
|
-
this.ethClient.ethereumURIIndex = 0;
|
|
493
|
+
this.SetNodes({
|
|
494
|
+
fabricURIs,
|
|
495
|
+
ethereumURIs,
|
|
496
|
+
authServiceURIs,
|
|
497
|
+
fileServiceURIs,
|
|
498
|
+
searchURIs
|
|
499
|
+
});
|
|
486
500
|
|
|
487
501
|
return {
|
|
488
502
|
fabricURIs,
|
|
489
503
|
ethereumURIs,
|
|
504
|
+
fileServiceURIs,
|
|
505
|
+
authServiceURIs,
|
|
490
506
|
searchURIs
|
|
491
507
|
};
|
|
492
508
|
}
|
|
@@ -541,6 +557,7 @@ class ElvClient {
|
|
|
541
557
|
fabricURIs: this.fabricURIs,
|
|
542
558
|
ethereumURIs: this.ethereumURIs,
|
|
543
559
|
authServiceURIs: this.authServiceURIs,
|
|
560
|
+
fileServiceURIs: this.fileServiceURIs,
|
|
544
561
|
searchURIs: this.searchURIs
|
|
545
562
|
};
|
|
546
563
|
}
|
|
@@ -552,11 +569,12 @@ class ElvClient {
|
|
|
552
569
|
* @param {Array<string>=} fabricURIs - A list of URLs for the fabric, in preference order
|
|
553
570
|
* @param {Array<string>=} ethereumURIs - A list of URLs for the blockchain, in preference order
|
|
554
571
|
* @param {Array<string>=} authServiceURIs - A list of URLs for the auth service, in preference order
|
|
572
|
+
* @param {Array<string>=} fileServiceURIs - A list of URLs for file service jobs, in preference order
|
|
555
573
|
* @param {Array<string>=} searchURIs - A list of URLs for the search nodes, in preference order
|
|
556
574
|
*
|
|
557
575
|
* @methodGroup Nodes
|
|
558
576
|
*/
|
|
559
|
-
SetNodes({fabricURIs, ethereumURIs, authServiceURIs, searchURIs}) {
|
|
577
|
+
SetNodes({fabricURIs, ethereumURIs, authServiceURIs, fileServiceURIs, searchURIs}) {
|
|
560
578
|
if(fabricURIs) {
|
|
561
579
|
this.fabricURIs = fabricURIs;
|
|
562
580
|
|
|
@@ -573,12 +591,23 @@ class ElvClient {
|
|
|
573
591
|
|
|
574
592
|
if(authServiceURIs) {
|
|
575
593
|
this.authServiceURIs = authServiceURIs;
|
|
594
|
+
|
|
576
595
|
this.AuthHttpClient.uris = authServiceURIs;
|
|
577
596
|
this.AuthHttpClient.uriIndex = 0;
|
|
578
597
|
}
|
|
579
598
|
|
|
599
|
+
if(fileServiceURIs) {
|
|
600
|
+
this.fileServiceURIs = fileServiceURIs;
|
|
601
|
+
|
|
602
|
+
this.FileServiceHttpClient.uris = fileServiceURIs;
|
|
603
|
+
this.FileServiceHttpClient.uriIndex = 0;
|
|
604
|
+
}
|
|
605
|
+
|
|
580
606
|
if(searchURIs) {
|
|
581
607
|
this.searchURIs = searchURIs;
|
|
608
|
+
|
|
609
|
+
this.SearchHttpClient.uris = searchURIs;
|
|
610
|
+
this.SearchHttpClient.uriIndex = 0;
|
|
582
611
|
}
|
|
583
612
|
}
|
|
584
613
|
|
package/src/FrameClient.js
CHANGED
|
@@ -1900,6 +1900,58 @@ exports.GlobalUrl = async function({
|
|
|
1900
1900
|
return url.toString();
|
|
1901
1901
|
};
|
|
1902
1902
|
|
|
1903
|
+
exports.MakeFileServiceRequest = async function({
|
|
1904
|
+
libraryId,
|
|
1905
|
+
objectId,
|
|
1906
|
+
versionHash,
|
|
1907
|
+
writeToken,
|
|
1908
|
+
path,
|
|
1909
|
+
method="GET",
|
|
1910
|
+
queryParams={},
|
|
1911
|
+
body,
|
|
1912
|
+
bodyType="JSON",
|
|
1913
|
+
format="json",
|
|
1914
|
+
headers={},
|
|
1915
|
+
authorizationToken
|
|
1916
|
+
}) {
|
|
1917
|
+
if(versionHash) { objectId = this.utils.DecodeVersionHash(versionHash).objectId; }
|
|
1918
|
+
|
|
1919
|
+
if(objectId && !libraryId) {
|
|
1920
|
+
libraryId = await this.ContentObjectLibraryId({objectId});
|
|
1921
|
+
}
|
|
1922
|
+
|
|
1923
|
+
ValidateParameters({libraryId, objectId, versionHash});
|
|
1924
|
+
|
|
1925
|
+
let queryPath = UrlJoin("q", writeToken || versionHash || objectId, path);
|
|
1926
|
+
|
|
1927
|
+
if(libraryId && !versionHash) {
|
|
1928
|
+
queryPath = UrlJoin("qlibs", libraryId, queryPath);
|
|
1929
|
+
}
|
|
1930
|
+
|
|
1931
|
+
let authorization = [
|
|
1932
|
+
authorizationToken,
|
|
1933
|
+
await this.authClient.AuthorizationToken({objectId})
|
|
1934
|
+
]
|
|
1935
|
+
.flat()
|
|
1936
|
+
.filter(token => token);
|
|
1937
|
+
|
|
1938
|
+
headers.Authorization = headers.Authorization || authorization.map(token => `Bearer ${token}`);
|
|
1939
|
+
|
|
1940
|
+
return this.utils.ResponseToFormat(
|
|
1941
|
+
format,
|
|
1942
|
+
await this.FileServiceHttpClient.Request({
|
|
1943
|
+
body,
|
|
1944
|
+
bodyType,
|
|
1945
|
+
headers,
|
|
1946
|
+
method,
|
|
1947
|
+
path: queryPath,
|
|
1948
|
+
queryParams
|
|
1949
|
+
}),
|
|
1950
|
+
this.FileServiceHttpClient.debug,
|
|
1951
|
+
this.FileServiceHttpClient.Log.bind(this.FileServiceHttpClient)
|
|
1952
|
+
);
|
|
1953
|
+
};
|
|
1954
|
+
|
|
1903
1955
|
|
|
1904
1956
|
/**
|
|
1905
1957
|
* Call the specified bitcode method on the specified object
|
|
@@ -1939,7 +1991,7 @@ exports.CallBitcodeMethod = async function({
|
|
|
1939
1991
|
|
|
1940
1992
|
let path = UrlJoin("q", writeToken || versionHash || objectId, "call", method);
|
|
1941
1993
|
|
|
1942
|
-
if(libraryId) {
|
|
1994
|
+
if(libraryId && !versionHash) {
|
|
1943
1995
|
path = UrlJoin("qlibs", libraryId, path);
|
|
1944
1996
|
}
|
|
1945
1997
|
|
|
@@ -2153,6 +2205,8 @@ exports.FabricUrl = async function({
|
|
|
2153
2205
|
httpClient = this.SearchHttpClient;
|
|
2154
2206
|
} else if(service === "auth") {
|
|
2155
2207
|
httpClient = this.AuthHttpClient;
|
|
2208
|
+
} else if(service === "files") {
|
|
2209
|
+
httpClient = this.FileServiceHttpClient;
|
|
2156
2210
|
}
|
|
2157
2211
|
|
|
2158
2212
|
return httpClient.URL({
|
package/testScripts/Test.js
CHANGED
|
@@ -9,9 +9,6 @@ const Test = async () => {
|
|
|
9
9
|
const client = await ElvClient.FromNetworkName({
|
|
10
10
|
networkName: "demo"
|
|
11
11
|
});
|
|
12
|
-
// const client = await ElvClient.FromConfigurationUrl({
|
|
13
|
-
// configUrl: "http://localhost:8008/config?qspace=demov3&self"
|
|
14
|
-
// });
|
|
15
12
|
|
|
16
13
|
const wallet = client.GenerateWallet();
|
|
17
14
|
const signer = wallet.AddAccount({
|
|
@@ -20,12 +17,7 @@ const Test = async () => {
|
|
|
20
17
|
|
|
21
18
|
client.SetSigner({signer});
|
|
22
19
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
const url = await client.FabricUrl({
|
|
26
|
-
versionHash
|
|
27
|
-
});
|
|
28
|
-
console.log("url", url)
|
|
20
|
+
console.log(await client.ContentLibraries());
|
|
29
21
|
} catch(error) {
|
|
30
22
|
console.error(error);
|
|
31
23
|
console.error(JSON.stringify(error, null, 2));
|