dcl-catalyst-client 8.1.1 → 8.1.2-20211004191412.commit-e8658b6
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/.github/dependabot.yml +7 -0
- package/.prettierignore +3 -0
- package/.vscode/settings.json +9 -4
- package/coverage/clover.xml +291 -286
- package/coverage/coverage-final.json +10 -10
- package/coverage/lcov-report/index.html +29 -29
- package/coverage/lcov.info +607 -751
- package/dist/CatalystClient.d.ts +4 -3
- package/dist/CatalystClient.js +9 -6
- package/dist/CatalystClient.js.map +1 -1
- package/dist/CatalystsList.js +5 -0
- package/dist/CatalystsList.js.map +1 -1
- package/dist/ContentAPI.d.ts +11 -4
- package/dist/ContentClient.d.ts +13 -3
- package/dist/ContentClient.js +100 -111
- package/dist/ContentClient.js.map +1 -1
- package/dist/LambdasAPI.js.map +1 -1
- package/dist/LambdasClient.js +12 -12
- package/dist/LambdasClient.js.map +1 -1
- package/dist/ports/Jwt.js +11 -13
- package/dist/ports/Jwt.js.map +1 -1
- package/dist/utils/CatalystClientBuilder.js +4 -4
- package/dist/utils/CatalystClientBuilder.js.map +1 -1
- package/dist/utils/DeploymentBuilder.js +6 -7
- package/dist/utils/DeploymentBuilder.js.map +1 -1
- package/dist/utils/Environment.js +1 -2
- package/dist/utils/Environment.js.map +1 -1
- package/dist/utils/Helper.d.ts +1 -0
- package/dist/utils/Helper.js +6 -16
- package/dist/utils/Helper.js.map +1 -1
- package/dist/utils/ProofOfWork.js +2 -2
- package/dist/utils/ProofOfWork.js.map +1 -1
- package/dist/utils/catalystList.js +7 -8
- package/dist/utils/catalystList.js.map +1 -1
- package/package.json +10 -12
package/dist/LambdasClient.js
CHANGED
|
@@ -6,25 +6,25 @@ const Jwt_1 = require("./ports/Jwt");
|
|
|
6
6
|
const Helper_1 = require("./utils/Helper");
|
|
7
7
|
class LambdasClient {
|
|
8
8
|
constructor(options) {
|
|
9
|
-
|
|
10
|
-
this.lambdasUrl = Helper_1.sanitizeUrl(options.lambdasUrl);
|
|
9
|
+
this.lambdasUrl = (0, Helper_1.sanitizeUrl)(options.lambdasUrl);
|
|
11
10
|
this.fetcher =
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
11
|
+
options.fetcher ??
|
|
12
|
+
new dcl_catalyst_commons_1.Fetcher({
|
|
13
|
+
headers: (0, Helper_1.getHeadersWithUserAgent)('lambdas-client')
|
|
14
|
+
});
|
|
15
15
|
if (options.proofOfWorkEnabled) {
|
|
16
16
|
const powAuthBaseUrl = new URL(this.lambdasUrl).origin;
|
|
17
|
-
Jwt_1.configureJWTMiddlewares(this.fetcher, powAuthBaseUrl);
|
|
17
|
+
(0, Jwt_1.configureJWTMiddlewares)(this.fetcher, powAuthBaseUrl);
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
20
|
fetchProfiles(ethAddresses, profileOptions, options) {
|
|
21
21
|
const queryParams = new Map();
|
|
22
22
|
queryParams.set('id', ethAddresses);
|
|
23
|
-
if (profileOptions
|
|
24
|
-
const fieldsValue = profileOptions
|
|
23
|
+
if (profileOptions?.fields) {
|
|
24
|
+
const fieldsValue = profileOptions?.fields.getFields();
|
|
25
25
|
queryParams.set('fields', [fieldsValue]);
|
|
26
26
|
}
|
|
27
|
-
return Helper_1.splitAndFetch({
|
|
27
|
+
return (0, Helper_1.splitAndFetch)({
|
|
28
28
|
fetcher: this.fetcher,
|
|
29
29
|
baseUrl: this.lambdasUrl,
|
|
30
30
|
path: '/profiles',
|
|
@@ -33,11 +33,11 @@ class LambdasClient {
|
|
|
33
33
|
});
|
|
34
34
|
}
|
|
35
35
|
fetchWearables(filters, options) {
|
|
36
|
-
const queryParams = Helper_1.convertFiltersToQueryParams(filters);
|
|
36
|
+
const queryParams = (0, Helper_1.convertFiltersToQueryParams)(filters);
|
|
37
37
|
if (queryParams.size === 0) {
|
|
38
38
|
throw new Error('You must set at least one filter');
|
|
39
39
|
}
|
|
40
|
-
return Helper_1.splitAndFetchPaginated({
|
|
40
|
+
return (0, Helper_1.splitAndFetchPaginated)({
|
|
41
41
|
fetcher: this.fetcher,
|
|
42
42
|
baseUrl: this.lambdasUrl,
|
|
43
43
|
path: '/collections/wearables',
|
|
@@ -48,7 +48,7 @@ class LambdasClient {
|
|
|
48
48
|
});
|
|
49
49
|
}
|
|
50
50
|
fetchOwnedWearables(ethAddress, includeDefinitions, options) {
|
|
51
|
-
return Helper_1.splitAndFetch({
|
|
51
|
+
return (0, Helper_1.splitAndFetch)({
|
|
52
52
|
fetcher: this.fetcher,
|
|
53
53
|
baseUrl: this.lambdasUrl,
|
|
54
54
|
path: `/collections/wearables-by-owner/${ethAddress}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LambdasClient.js","sourceRoot":"","sources":["../src/LambdasClient.ts"],"names":[],"mappings":";;;AAAA,+DAAqH;AAUrH,qCAAqD;AACrD,2CAMuB;AAOvB,MAAa,aAAa;IAIxB,YAAY,OAA6B
|
|
1
|
+
{"version":3,"file":"LambdasClient.js","sourceRoot":"","sources":["../src/LambdasClient.ts"],"names":[],"mappings":";;;AAAA,+DAAqH;AAUrH,qCAAqD;AACrD,2CAMuB;AAOvB,MAAa,aAAa;IAIxB,YAAY,OAA6B;QACvC,IAAI,CAAC,UAAU,GAAG,IAAA,oBAAW,EAAC,OAAO,CAAC,UAAU,CAAC,CAAA;QACjD,IAAI,CAAC,OAAO;YACV,OAAO,CAAC,OAAO;gBACf,IAAI,8BAAO,CAAC;oBACV,OAAO,EAAE,IAAA,gCAAuB,EAAC,gBAAgB,CAAC;iBACnD,CAAC,CAAA;QAEJ,IAAI,OAAO,CAAC,kBAAkB,EAAE;YAC9B,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAA;YACtD,IAAA,6BAAuB,EAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAA;SACtD;IACH,CAAC;IAED,aAAa,CACX,YAA0B,EAC1B,cAA+B,EAC/B,OAAwB;QAExB,MAAM,WAAW,GAA0B,IAAI,GAAG,EAAE,CAAA;QACpD,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,YAAY,CAAC,CAAA;QACnC,IAAI,cAAc,EAAE,MAAM,EAAE;YAC1B,MAAM,WAAW,GAAG,cAAc,EAAE,MAAM,CAAC,SAAS,EAAE,CAAA;YACtD,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,CAAC,CAAA;SACzC;QACD,OAAO,IAAA,sBAAa,EAAU;YAC5B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,OAAO,EAAE,IAAI,CAAC,UAAU;YACxB,IAAI,EAAE,WAAW;YACjB,WAAW;YACX,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;IAED,cAAc,CAAC,OAAyB,EAAE,OAAwB;QAChE,MAAM,WAAW,GAAG,IAAA,oCAA2B,EAAC,OAAO,CAAC,CAAA;QACxD,IAAI,WAAW,CAAC,IAAI,KAAK,CAAC,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;SACpD;QAED,OAAO,IAAA,+BAAsB,EAAC;YAC5B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,OAAO,EAAE,IAAI,CAAC,UAAU;YACxB,IAAI,EAAE,wBAAwB;YAC9B,WAAW;YACX,QAAQ,EAAE,IAAI;YACd,gBAAgB,EAAE,WAAW;YAC7B,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;IAED,mBAAmB,CACjB,UAAsB,EACtB,kBAAqB,EACrB,OAAwB;QAExB,OAAO,IAAA,sBAAa,EAAmF;YACrG,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,OAAO,EAAE,IAAI,CAAC,UAAU;YACxB,IAAI,EAAE,mCAAmC,UAAU,EAAE;YACrD,WAAW,EAAE,EAAE,IAAI,EAAE,oBAAoB,EAAE,MAAM,EAAE,CAAC,GAAG,kBAAkB,EAAE,CAAC,EAAE;YAC9E,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;IAED,2BAA2B,CAAC,OAAwB;QAClD,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,UAAU,oBAAoB,EAAE,OAAO,CAAQ,CAAA;IACvF,CAAC;IAED,kBAAkB,CAAC,OAAwB;QACzC,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,UAAU,SAAS,EAAE,OAAO,CAAQ,CAAA;IAC5E,CAAC;IAED,eAAe,CAAC,OAAwB;QACtC,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,UAAU,SAAS,EAAE,OAAO,CAAQ,CAAA;IAC5E,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,UAAU,CAAA;IACxB,CAAC;CACF;AApFD,sCAoFC"}
|
package/dist/ports/Jwt.js
CHANGED
|
@@ -11,13 +11,13 @@ const ProofOfWork_1 = require("../utils/ProofOfWork");
|
|
|
11
11
|
const LOGGER = log4js_1.default.getLogger('JWTPort');
|
|
12
12
|
async function obtainJWT(fetcher, catalystUrl) {
|
|
13
13
|
try {
|
|
14
|
-
const response = await fetcher.fetchJson(catalystUrl + '/pow-auth/challenge');
|
|
14
|
+
const response = (await fetcher.fetchJson(catalystUrl + '/pow-auth/challenge'));
|
|
15
15
|
const challenge = response.challenge;
|
|
16
16
|
const complexity = response.complexity;
|
|
17
|
-
const nonce = await ProofOfWork_1.generateNonceForChallenge(challenge, complexity);
|
|
17
|
+
const nonce = await (0, ProofOfWork_1.generateNonceForChallenge)(challenge, complexity);
|
|
18
18
|
const powAuthUrl = new URL('/pow-auth/challenge', catalystUrl).href;
|
|
19
19
|
const challengeBody = JSON.stringify({ challenge: challenge, complexity: complexity, nonce: nonce });
|
|
20
|
-
const jwtResponse = await fetcher.postForm(powAuthUrl, { body: challengeBody });
|
|
20
|
+
const jwtResponse = (await fetcher.postForm(powAuthUrl, { body: challengeBody }));
|
|
21
21
|
if (!jwtResponse.jwt) {
|
|
22
22
|
LOGGER.warn('[POW] Could not get a JWT from Pow Auth Server.');
|
|
23
23
|
}
|
|
@@ -41,17 +41,16 @@ function isJWTCookieRemoved(response) {
|
|
|
41
41
|
}
|
|
42
42
|
return false;
|
|
43
43
|
}
|
|
44
|
-
catch
|
|
44
|
+
catch {
|
|
45
45
|
return false;
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
48
|
exports.isJWTCookieRemoved = isJWTCookieRemoved;
|
|
49
49
|
function missingJWTInRequest(request) {
|
|
50
|
-
|
|
51
|
-
const headers = (_a = request.requestInit) === null || _a === void 0 ? void 0 : _a.headers;
|
|
50
|
+
const headers = request.requestInit?.headers;
|
|
52
51
|
if (!!headers) {
|
|
53
52
|
if (headers instanceof Headers) {
|
|
54
|
-
return !hasJWTCookie(
|
|
53
|
+
return !hasJWTCookie(headers.get('Cookie') ?? '');
|
|
55
54
|
}
|
|
56
55
|
else if (Array.isArray(headers)) {
|
|
57
56
|
return !headers.find((a) => {
|
|
@@ -59,7 +58,7 @@ function missingJWTInRequest(request) {
|
|
|
59
58
|
});
|
|
60
59
|
}
|
|
61
60
|
else {
|
|
62
|
-
return !hasJWTCookie(
|
|
61
|
+
return !hasJWTCookie(headers.Cookie ?? '');
|
|
63
62
|
}
|
|
64
63
|
}
|
|
65
64
|
else {
|
|
@@ -68,13 +67,12 @@ function missingJWTInRequest(request) {
|
|
|
68
67
|
}
|
|
69
68
|
exports.missingJWTInRequest = missingJWTInRequest;
|
|
70
69
|
function hasJWTCookie(cookieValue) {
|
|
71
|
-
var _a;
|
|
72
70
|
const cookies = cookie_1.default.parse(cookieValue);
|
|
73
|
-
return
|
|
71
|
+
return cookies.JWT ?? '' !== '';
|
|
74
72
|
}
|
|
75
73
|
function configureJWTMiddlewares(fetcher, baseUrl) {
|
|
76
74
|
let lastFailedPowEndpointTimestamp = 0;
|
|
77
|
-
let minutesToAdd = ms_1.default('5m');
|
|
75
|
+
let minutesToAdd = (0, ms_1.default)('5m');
|
|
78
76
|
let isRequestingJWT = false;
|
|
79
77
|
fetcher.overrideDefaults({
|
|
80
78
|
requestMiddleware: async (request) => {
|
|
@@ -86,14 +84,14 @@ function configureJWTMiddlewares(fetcher, baseUrl) {
|
|
|
86
84
|
if (!!jwt) {
|
|
87
85
|
fetcher.overrideDefaults({ cookies: { JWT: jwt } });
|
|
88
86
|
lastFailedPowEndpointTimestamp = 0;
|
|
89
|
-
minutesToAdd = ms_1.default('5m');
|
|
87
|
+
minutesToAdd = (0, ms_1.default)('5m');
|
|
90
88
|
}
|
|
91
89
|
else {
|
|
92
90
|
lastFailedPowEndpointTimestamp = Date.now();
|
|
93
91
|
minutesToAdd = 2 * minutesToAdd;
|
|
94
92
|
}
|
|
95
93
|
}
|
|
96
|
-
catch
|
|
94
|
+
catch {
|
|
97
95
|
LOGGER.warn('[POW] Could not configure Middleware to set JWT.');
|
|
98
96
|
}
|
|
99
97
|
finally {
|
package/dist/ports/Jwt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Jwt.js","sourceRoot":"","sources":["../../src/ports/Jwt.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA2B;AAE3B,oDAA2B;AAC3B,4CAAmB;AACnB,sDAAgE;AAEhE,MAAM,MAAM,GAAG,gBAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;AAEnC,KAAK,UAAU,SAAS,CAAC,OAAgB,EAAE,WAAmB;IACnE,IAAI;QACF,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,WAAW,GAAG,qBAAqB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"Jwt.js","sourceRoot":"","sources":["../../src/ports/Jwt.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ const FETCH_HEALTH_TIMEOUT = '10s';
|
|
|
10
10
|
* Returns a CatalystClient connected to one of the catalysts in the given network
|
|
11
11
|
*/
|
|
12
12
|
async function clientConnectedToCatalystIn(options) {
|
|
13
|
-
const noContractList = await catalystList_1.getUpdatedApprovedListWithoutQueryingContract({
|
|
13
|
+
const noContractList = await (0, catalystList_1.getUpdatedApprovedListWithoutQueryingContract)({
|
|
14
14
|
preKnownServers: { network: options.network },
|
|
15
15
|
proofOfWorkEnabled: options.proofOfWorkEnabled
|
|
16
16
|
});
|
|
@@ -20,9 +20,9 @@ async function clientConnectedToCatalystIn(options) {
|
|
|
20
20
|
}
|
|
21
21
|
else {
|
|
22
22
|
console.warn('Falling back to the smart contract to get an updated list of active servers');
|
|
23
|
-
list = await catalystList_1.getApprovedListFromContract(options.network);
|
|
23
|
+
list = await (0, catalystList_1.getApprovedListFromContract)(options.network);
|
|
24
24
|
}
|
|
25
|
-
const shuffled = common_1.shuffleArray(list);
|
|
25
|
+
const shuffled = (0, common_1.shuffleArray)(list);
|
|
26
26
|
for (const catalystUrl of shuffled) {
|
|
27
27
|
const client = new CatalystClient_1.CatalystClient({
|
|
28
28
|
catalystUrl: catalystUrl,
|
|
@@ -42,7 +42,7 @@ async function isServerUp(client) {
|
|
|
42
42
|
const isSomeServerDown = Object.keys(result).some((service) => result[service] !== dcl_catalyst_commons_1.HealthStatus.HEALTHY);
|
|
43
43
|
return !isSomeServerDown;
|
|
44
44
|
}
|
|
45
|
-
catch
|
|
45
|
+
catch {
|
|
46
46
|
return false;
|
|
47
47
|
}
|
|
48
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CatalystClientBuilder.js","sourceRoot":"","sources":["../../src/utils/CatalystClientBuilder.ts"],"names":[],"mappings":";;;AAAA,+DAAmD;AACnD,sDAA0E;AAC1E,iDAA2G;AAC3G,qCAAuC;AAEvC,MAAM,oBAAoB,GAAG,KAAK,CAAA;AAElC;;GAEG;AACI,KAAK,UAAU,2BAA2B,CAAC,OAA+B;IAC/E,MAAM,cAAc,GAAG,MAAM,4DAA6C,
|
|
1
|
+
{"version":3,"file":"CatalystClientBuilder.js","sourceRoot":"","sources":["../../src/utils/CatalystClientBuilder.ts"],"names":[],"mappings":";;;AAAA,+DAAmD;AACnD,sDAA0E;AAC1E,iDAA2G;AAC3G,qCAAuC;AAEvC,MAAM,oBAAoB,GAAG,KAAK,CAAA;AAElC;;GAEG;AACI,KAAK,UAAU,2BAA2B,CAAC,OAA+B;IAC/E,MAAM,cAAc,GAAG,MAAM,IAAA,4DAA6C,EAAC;QACzE,eAAe,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE;QAC7C,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;KAC/C,CAAC,CAAA;IAEF,IAAI,IAAc,CAAA;IAClB,IAAI,cAAc,EAAE;QAClB,IAAI,GAAG,cAAc,CAAA;KACtB;SAAM;QACL,OAAO,CAAC,IAAI,CAAC,6EAA6E,CAAC,CAAA;QAC3F,IAAI,GAAG,MAAM,IAAA,0CAA2B,EAAC,OAAO,CAAC,OAAO,CAAC,CAAA;KAC1D;IAED,MAAM,QAAQ,GAAG,IAAA,qBAAY,EAAC,IAAI,CAAC,CAAA;IAEnC,KAAK,MAAM,WAAW,IAAI,QAAQ,EAAE;QAClC,MAAM,MAAM,GAAG,IAAI,+BAAc,CAAC;YAChC,WAAW,EAAE,WAAW;YACxB,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;SAC/C,CAAC,CAAA;QAEF,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,CAAA;QACrC,IAAI,IAAI,EAAE;YACR,OAAO,MAAM,CAAA;SACd;KACF;IAED,MAAM,IAAI,KAAK,CAAC,iCAAiC,OAAO,CAAC,OAAO,sBAAsB,CAAC,CAAA;AACzF,CAAC;AA7BD,kEA6BC;AAED,KAAK,UAAU,UAAU,CAAC,MAAsB;IAC9C,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAA;QAC9E,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,mCAAY,CAAC,OAAO,CAAC,CAAA;QAExG,OAAO,CAAC,gBAAgB,CAAA;KACzB;IAAC,MAAM;QACN,OAAO,KAAK,CAAA;KACb;AACH,CAAC"}
|
|
@@ -9,7 +9,7 @@ class DeploymentBuilder {
|
|
|
9
9
|
*/
|
|
10
10
|
static async buildEntity({ version, type, pointers, files, metadata, timestamp }) {
|
|
11
11
|
// Reorder input
|
|
12
|
-
const contentFiles = Array.from(files
|
|
12
|
+
const contentFiles = Array.from(files ?? new Map().entries()).map(([key, content]) => ({
|
|
13
13
|
key,
|
|
14
14
|
content
|
|
15
15
|
}));
|
|
@@ -32,30 +32,29 @@ class DeploymentBuilder {
|
|
|
32
32
|
return DeploymentBuilder.buildEntityInternal(version, type, pointers, { hashesByKey, metadata, timestamp });
|
|
33
33
|
}
|
|
34
34
|
static async buildEntityInternal(version, type, pointers, options) {
|
|
35
|
-
var _a, _b, _c;
|
|
36
35
|
// Make sure that there is at least one pointer
|
|
37
36
|
if (pointers.length === 0) {
|
|
38
37
|
throw new Error(`All entities must have at least one pointer.`);
|
|
39
38
|
}
|
|
40
39
|
// Re-organize the hashes
|
|
41
|
-
const hashesByKey =
|
|
40
|
+
const hashesByKey = options?.hashesByKey ?? new Map();
|
|
42
41
|
const entityContent = Array.from(hashesByKey.entries()).map(([key, hash]) => ({
|
|
43
42
|
file: key,
|
|
44
43
|
hash
|
|
45
44
|
}));
|
|
46
45
|
// Calculate timestamp if necessary
|
|
47
|
-
const timestamp =
|
|
46
|
+
const timestamp = options?.timestamp ?? Date.now();
|
|
48
47
|
// Build entity file
|
|
49
|
-
const { entity, entityFile } = await dcl_catalyst_commons_1.buildEntityAndFile({
|
|
48
|
+
const { entity, entityFile } = await (0, dcl_catalyst_commons_1.buildEntityAndFile)({
|
|
50
49
|
version,
|
|
51
50
|
type,
|
|
52
51
|
pointers,
|
|
53
52
|
timestamp,
|
|
54
53
|
content: entityContent,
|
|
55
|
-
metadata: options
|
|
54
|
+
metadata: options?.metadata
|
|
56
55
|
});
|
|
57
56
|
// Add entity file to content files
|
|
58
|
-
const filesByHash =
|
|
57
|
+
const filesByHash = options?.filesByHash ?? new Map();
|
|
59
58
|
filesByHash.set(entity.id, entityFile);
|
|
60
59
|
return { files: filesByHash, entityId: entity.id };
|
|
61
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeploymentBuilder.js","sourceRoot":"","sources":["../../src/utils/DeploymentBuilder.ts"],"names":[],"mappings":";;;AAAA,+DAW6B;AAG7B,MAAa,iBAAiB;IAC5B;;;OAGG;IACH,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,EACvB,OAAO,EACP,IAAI,EACJ,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,SAAS,EAQV;QACC,gBAAgB;QAChB,MAAM,YAAY,GAAuC,KAAK,CAAC,IAAI,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"DeploymentBuilder.js","sourceRoot":"","sources":["../../src/utils/DeploymentBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var _a;
|
|
3
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
3
|
exports.RUNNING_VERSION = void 0;
|
|
5
|
-
exports.RUNNING_VERSION =
|
|
4
|
+
exports.RUNNING_VERSION = process.env.CURRENT_VERSION ?? 'v3';
|
|
6
5
|
//# sourceMappingURL=Environment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Environment.js","sourceRoot":"","sources":["../../src/utils/Environment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Environment.js","sourceRoot":"","sources":["../../src/utils/Environment.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,IAAI,CAAA"}
|
package/dist/utils/Helper.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Fetcher, RequestOptions } from 'dcl-catalyst-commons';
|
|
2
|
+
import FormData from 'form-data';
|
|
2
3
|
export declare function addModelToFormData(model: any, form: FormData, namespace?: string): FormData;
|
|
3
4
|
/**
|
|
4
5
|
* This method performs one or more fetches to the given server, splitting query params into different queries to avoid exceeding the max length of urls
|
package/dist/utils/Helper.js
CHANGED
|
@@ -36,13 +36,13 @@ function removeDuplicates(array) {
|
|
|
36
36
|
exports.MAX_URL_LENGTH = 2048;
|
|
37
37
|
async function splitAndFetch({ baseUrl, path, queryParams, fetcher, uniqueBy, options }) {
|
|
38
38
|
// Adding default
|
|
39
|
-
fetcher = fetcher
|
|
39
|
+
fetcher = fetcher ?? new dcl_catalyst_commons_1.Fetcher();
|
|
40
40
|
// Split values into different queries
|
|
41
41
|
const queries = splitValuesIntoManyQueries({ baseUrl, path, queryParams });
|
|
42
42
|
const results = new Map();
|
|
43
43
|
for (const query of queries) {
|
|
44
44
|
// Perform the different queries
|
|
45
|
-
const elements = await fetcher.fetchJson(query, options);
|
|
45
|
+
const elements = (await fetcher.fetchJson(query, options));
|
|
46
46
|
// Group by unique property (if set), or add all of them to the map
|
|
47
47
|
elements.forEach((element) => results.set(uniqueBy ? element[uniqueBy] : results.size, element));
|
|
48
48
|
}
|
|
@@ -57,7 +57,7 @@ const CHARS_LEFT_FOR_OFFSET = 7;
|
|
|
57
57
|
*/
|
|
58
58
|
async function splitAndFetchPaginated({ fetcher, baseUrl, path, queryParams, elementsProperty, uniqueBy, options }) {
|
|
59
59
|
// Set default
|
|
60
|
-
fetcher = fetcher
|
|
60
|
+
fetcher = fetcher ?? new dcl_catalyst_commons_1.Fetcher();
|
|
61
61
|
// Reserve a few chars to send the offset
|
|
62
62
|
const reservedParams = new Map([['offset', CHARS_LEFT_FOR_OFFSET]]);
|
|
63
63
|
// Split values into different queries
|
|
@@ -69,7 +69,7 @@ async function splitAndFetchPaginated({ fetcher, baseUrl, path, queryParams, ele
|
|
|
69
69
|
let url = queries[i];
|
|
70
70
|
while (url && !exit) {
|
|
71
71
|
try {
|
|
72
|
-
const response = await fetcher.fetchJson(url, options);
|
|
72
|
+
const response = (await fetcher.fetchJson(url, options));
|
|
73
73
|
const elements = response[elementsProperty];
|
|
74
74
|
elements.forEach((element) => foundElements.set(element[uniqueBy], element));
|
|
75
75
|
const nextRelative = response.pagination.next;
|
|
@@ -153,7 +153,7 @@ function convertFiltersToQueryParams(filters) {
|
|
|
153
153
|
}
|
|
154
154
|
exports.convertFiltersToQueryParams = convertFiltersToQueryParams;
|
|
155
155
|
function isNode() {
|
|
156
|
-
return typeof
|
|
156
|
+
return Object.prototype.toString.call(typeof process !== 'undefined' ? process : 0) === '[object process]';
|
|
157
157
|
}
|
|
158
158
|
exports.isNode = isNode;
|
|
159
159
|
function getHeadersWithUserAgent(client) {
|
|
@@ -162,15 +162,6 @@ function getHeadersWithUserAgent(client) {
|
|
|
162
162
|
: undefined;
|
|
163
163
|
}
|
|
164
164
|
exports.getHeadersWithUserAgent = getHeadersWithUserAgent;
|
|
165
|
-
function isBlobAvailable() {
|
|
166
|
-
try {
|
|
167
|
-
new Blob();
|
|
168
|
-
return true;
|
|
169
|
-
}
|
|
170
|
-
catch (_a) {
|
|
171
|
-
return false;
|
|
172
|
-
}
|
|
173
|
-
}
|
|
174
165
|
function isValidQueryParamValue(value) {
|
|
175
166
|
return typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean';
|
|
176
167
|
}
|
|
@@ -200,11 +191,10 @@ class QueryBuilder {
|
|
|
200
191
|
return this.length + paramName.length + paramValue.length + 2 < exports.MAX_URL_LENGTH;
|
|
201
192
|
}
|
|
202
193
|
addParam(paramName, paramValue) {
|
|
203
|
-
var _a;
|
|
204
194
|
if (!this.canAddParam(paramName, paramValue)) {
|
|
205
195
|
throw new Error(`You can't add this parameter '${paramName}', since it would exceed the max url length`);
|
|
206
196
|
}
|
|
207
|
-
const values =
|
|
197
|
+
const values = this.queryParams.get(paramName) ?? [];
|
|
208
198
|
values.push(paramValue);
|
|
209
199
|
this.queryParams.set(paramName, values);
|
|
210
200
|
this.length += this.calculateAddedLength(paramName, [paramValue]);
|
package/dist/utils/Helper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Helper.js","sourceRoot":"","sources":["../../src/utils/Helper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Helper.js","sourceRoot":"","sources":["../../src/utils/Helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,8 @@ exports.generateNonceForChallenge = void 0;
|
|
|
5
5
|
const crypto_1 = require("crypto");
|
|
6
6
|
async function generateNonceForChallenge(challenge, complexity) {
|
|
7
7
|
while (true) {
|
|
8
|
-
const nonce = crypto_1.randomBytes(256).toString('hex');
|
|
9
|
-
const hash = await crypto_1.createHash('sha256')
|
|
8
|
+
const nonce = (0, crypto_1.randomBytes)(256).toString('hex');
|
|
9
|
+
const hash = await (0, crypto_1.createHash)('sha256')
|
|
10
10
|
.update(challenge + nonce, 'utf8')
|
|
11
11
|
.digest('hex');
|
|
12
12
|
const isValid = hash.startsWith('0'.repeat(complexity));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProofOfWork.js","sourceRoot":"","sources":["../../src/utils/ProofOfWork.ts"],"names":[],"mappings":";;;AAAA,4EAA4E;AAC5E,mCAAgD;AAEzC,KAAK,UAAU,yBAAyB,CAAC,SAAS,EAAE,UAAU;IACnE,OAAO,IAAI,EAAE;QACX,MAAM,KAAK,GAAG,oBAAW,
|
|
1
|
+
{"version":3,"file":"ProofOfWork.js","sourceRoot":"","sources":["../../src/utils/ProofOfWork.ts"],"names":[],"mappings":";;;AAAA,4EAA4E;AAC5E,mCAAgD;AAEzC,KAAK,UAAU,yBAAyB,CAAC,SAAS,EAAE,UAAU;IACnE,OAAO,IAAI,EAAE;QACX,MAAM,KAAK,GAAG,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QAC9C,MAAM,IAAI,GAAG,MAAM,IAAA,mBAAU,EAAC,QAAQ,CAAC;aACpC,MAAM,CAAC,SAAS,GAAG,KAAK,EAAE,MAAM,CAAC;aACjC,MAAM,CAAC,KAAK,CAAC,CAAA;QAEhB,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAA;QAEvD,IAAI,OAAO,EAAE;YACX,OAAO,KAAK,CAAA;SACb;KACF;AACH,CAAC;AAbD,8DAaC"}
|
|
@@ -9,7 +9,7 @@ const CatalystClient_1 = require("../CatalystClient");
|
|
|
9
9
|
const CatalystsList_1 = __importDefault(require("../CatalystsList"));
|
|
10
10
|
const common_1 = require("./common");
|
|
11
11
|
async function getApprovedListFromContract(network) {
|
|
12
|
-
const servers = network === 'mainnet' ? await dcl_catalyst_commons_1.getMainnetCatalysts() : await dcl_catalyst_commons_1.getRopstenCatalysts();
|
|
12
|
+
const servers = network === 'mainnet' ? await (0, dcl_catalyst_commons_1.getMainnetCatalysts)() : await (0, dcl_catalyst_commons_1.getRopstenCatalysts)();
|
|
13
13
|
return servers.map(({ address }) => address);
|
|
14
14
|
}
|
|
15
15
|
exports.getApprovedListFromContract = getApprovedListFromContract;
|
|
@@ -22,10 +22,10 @@ exports.getApprovedListFromContract = getApprovedListFromContract;
|
|
|
22
22
|
*/
|
|
23
23
|
const REQUIRED_LISTS = 3;
|
|
24
24
|
async function getUpdatedApprovedListWithoutQueryingContract(options) {
|
|
25
|
-
var _a, _b;
|
|
26
25
|
// Set defaults if needed
|
|
27
|
-
const catalystListFetch =
|
|
28
|
-
|
|
26
|
+
const catalystListFetch = options.fetchApprovedCatalysts ??
|
|
27
|
+
((catalystUrl) => fetchCatalystsApprovedByDAO(catalystUrl, options.proofOfWorkEnabled));
|
|
28
|
+
const requiredAmountOfLists = options.requiredLists ?? REQUIRED_LISTS;
|
|
29
29
|
// Get the list of known servers
|
|
30
30
|
const knownServers = 'list' in options.preKnownServers ? options.preKnownServers.list : CatalystsList_1.default[options.preKnownServers.network];
|
|
31
31
|
// If I don't know enough servers, then it doesn't make sense to continue
|
|
@@ -33,7 +33,7 @@ async function getUpdatedApprovedListWithoutQueryingContract(options) {
|
|
|
33
33
|
return undefined;
|
|
34
34
|
}
|
|
35
35
|
// Shuffle the list
|
|
36
|
-
const shuffledPreKnownServers = common_1.shuffleArray(knownServers);
|
|
36
|
+
const shuffledPreKnownServers = (0, common_1.shuffleArray)(knownServers);
|
|
37
37
|
// Ask N of them for their list
|
|
38
38
|
const approvedServersList = await Promise.all(shuffledPreKnownServers
|
|
39
39
|
.slice(0, requiredAmountOfLists + 3)
|
|
@@ -60,11 +60,10 @@ async function getUpdatedApprovedListWithoutQueryingContract(options) {
|
|
|
60
60
|
}
|
|
61
61
|
exports.getUpdatedApprovedListWithoutQueryingContract = getUpdatedApprovedListWithoutQueryingContract;
|
|
62
62
|
function calculateIntersection(lists) {
|
|
63
|
-
var _a;
|
|
64
63
|
const count = new Map();
|
|
65
64
|
for (const list of lists) {
|
|
66
65
|
for (const element of list) {
|
|
67
|
-
count.set(element, (
|
|
66
|
+
count.set(element, (count.get(element) ?? 0) + 1);
|
|
68
67
|
}
|
|
69
68
|
}
|
|
70
69
|
return Array.from(count.entries())
|
|
@@ -80,7 +79,7 @@ async function fetchCatalystsApprovedByDAO(catalystUrl, proofOfWorkEnabled) {
|
|
|
80
79
|
const servers = await client.fetchCatalystsApprovedByDAO({ timeout: '10s' });
|
|
81
80
|
return servers.map(({ address }) => address);
|
|
82
81
|
}
|
|
83
|
-
catch
|
|
82
|
+
catch {
|
|
84
83
|
return undefined;
|
|
85
84
|
}
|
|
86
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalystList.js","sourceRoot":"","sources":["../../src/utils/catalystList.ts"],"names":[],"mappings":";;;;;;AAAA,+DAA+E;AAC/E,sDAAkD;AAClD,qEAA4C;AAC5C,qCAAuC;AAEhC,KAAK,UAAU,2BAA2B,CAAC,OAA8B;IAC9E,MAAM,OAAO,GAAG,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,0CAAmB,
|
|
1
|
+
{"version":3,"file":"catalystList.js","sourceRoot":"","sources":["../../src/utils/catalystList.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dcl-catalyst-client",
|
|
3
|
-
"version": "8.1.
|
|
3
|
+
"version": "8.1.2-20211004191412.commit-e8658b6",
|
|
4
4
|
"description": "A client to query and perform changes on Decentraland's catalyst servers",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "./dist/index.d.ts",
|
|
@@ -12,8 +12,8 @@
|
|
|
12
12
|
"watch": "tsc --watch --project tsconfig-build.json",
|
|
13
13
|
"test": "jest --forceExit --detectOpenHandles --coverage --verbose",
|
|
14
14
|
"commit-msg": "validate-commit-msg",
|
|
15
|
-
"lint:fix": "
|
|
16
|
-
"lint:check": "
|
|
15
|
+
"lint:fix": "eslint '**/*.{js,ts,tsx}' --quiet --fix",
|
|
16
|
+
"lint:check": "eslint '**/*.{js,ts,tsx}' --quiet"
|
|
17
17
|
},
|
|
18
18
|
"nyc": {
|
|
19
19
|
"all": true,
|
|
@@ -44,28 +44,26 @@
|
|
|
44
44
|
"homepage": "https://github.com/decentraland/catalyst-client#readme",
|
|
45
45
|
"dependencies": {
|
|
46
46
|
"@types/form-data": "^2.5.0",
|
|
47
|
-
"@types/log4js": "^2.3.5",
|
|
48
|
-
"async-iterator-to-array": "0.0.1",
|
|
49
47
|
"cookie": "^0.4.1",
|
|
50
|
-
"dcl-catalyst-commons": "7.
|
|
48
|
+
"dcl-catalyst-commons": "^7.1.1",
|
|
51
49
|
"dcl-crypto": "^2.2.0",
|
|
52
50
|
"form-data": "^4.0.0",
|
|
53
51
|
"log4js": "^6.3.0"
|
|
54
52
|
},
|
|
55
53
|
"devDependencies": {
|
|
56
|
-
"@types/jest": "^
|
|
54
|
+
"@types/jest": "^27.0.1",
|
|
55
|
+
"@types/log4js": "^2.3.5",
|
|
57
56
|
"@typescript-eslint/eslint-plugin": "^4.9.0",
|
|
58
57
|
"@typescript-eslint/parser": "^4.9.0",
|
|
59
58
|
"eslint": "^7.14.0",
|
|
60
59
|
"eslint-config-prettier": "^7.2.0",
|
|
61
60
|
"eslint-plugin-prettier": "^3.2.0",
|
|
62
|
-
"jest": "^
|
|
61
|
+
"jest": "^27.2.1",
|
|
63
62
|
"prettier": "^2.2.1",
|
|
64
|
-
"ts-jest": "^
|
|
63
|
+
"ts-jest": "^27.0.5",
|
|
65
64
|
"ts-mockito": "^2.6.1",
|
|
66
65
|
"ts-node": "^9.1.1",
|
|
67
|
-
"
|
|
68
|
-
"typescript": "^4.1.3",
|
|
66
|
+
"typescript": "^4.4.3",
|
|
69
67
|
"validate-commit-msg": "^2.14.0"
|
|
70
68
|
},
|
|
71
69
|
"prettier": {
|
|
@@ -74,5 +72,5 @@
|
|
|
74
72
|
"printWidth": 120,
|
|
75
73
|
"trailingComma": "none"
|
|
76
74
|
},
|
|
77
|
-
"commit": "
|
|
75
|
+
"commit": "e8658b6a9dce78001b686a2d6d71d317030e5b3e"
|
|
78
76
|
}
|