@dcl/opscli 1.0.0-10507092676.commit-a604d88 → 1.0.0-10559981082.commit-e4ac0c1
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/README.md +21 -6
- package/dist/bin.d.ts.map +1 -1
- package/dist/bin.js +31 -39
- package/dist/bin.js.map +1 -1
- package/dist/commands/queue-ab-conversion-about.d.ts.map +1 -1
- package/dist/commands/queue-ab-conversion-about.js +7 -3
- package/dist/commands/queue-ab-conversion-about.js.map +1 -1
- package/dist/commands/queue-ab-conversion-snapshot.d.ts.map +1 -1
- package/dist/commands/queue-ab-conversion-snapshot.js +15 -11
- package/dist/commands/queue-ab-conversion-snapshot.js.map +1 -1
- package/dist/commands/queue-ab-conversion.d.ts.map +1 -1
- package/dist/commands/queue-ab-conversion.js +9 -5
- package/dist/commands/queue-ab-conversion.js.map +1 -1
- package/dist/helpers/asset-bundles.d.ts +7 -5
- package/dist/helpers/asset-bundles.d.ts.map +1 -1
- package/dist/helpers/asset-bundles.js +15 -20
- package/dist/helpers/asset-bundles.js.map +1 -1
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -20,24 +20,36 @@ npx @dcl/opscli queue-ab-conversion \
|
|
|
20
20
|
--pointer "110,10" \
|
|
21
21
|
--cid "110,10" \
|
|
22
22
|
--token <ACCESS_TOKEN> \
|
|
23
|
-
[--
|
|
23
|
+
[--platform webgl] \
|
|
24
|
+
[--platform mac] \
|
|
25
|
+
[--platform windows] \
|
|
26
|
+
[--ab-server https://ab-admin.decentraland.org] \
|
|
24
27
|
[--content-server https://peer.decentraland.org/content]
|
|
25
28
|
```
|
|
29
|
+
> If no platform is specified, it runs for all platforms. Also, more than one can be specified at a time.
|
|
30
|
+
|
|
31
|
+
> For dev, use `--ab-server https://ab-admin.decentraland.zone`.
|
|
26
32
|
|
|
27
33
|
### Schedule asset bundle conversion of all worlds
|
|
28
34
|
```
|
|
29
35
|
npx @dcl/opscli queue-ab-conversion-snapshot \
|
|
30
36
|
--snapshot worlds \
|
|
37
|
+
[--platform webgl] \
|
|
38
|
+
[--platform mac] \
|
|
39
|
+
[--platform windows] \
|
|
31
40
|
--token <ACCESS_TOKEN> \
|
|
32
|
-
[--ab-server https://
|
|
41
|
+
[--ab-server https://ab-admin.decentraland.org]
|
|
33
42
|
```
|
|
34
43
|
|
|
35
|
-
### Schedule asset bundle conversion of specific world by name
|
|
44
|
+
### Schedule asset bundle conversion of a specific world by name
|
|
36
45
|
```
|
|
37
46
|
npx @dcl/opscli queue-ab-conversion-snapshot \
|
|
38
47
|
--snapshot worlds \
|
|
48
|
+
[--platform webgl] \
|
|
49
|
+
[--platform mac] \
|
|
50
|
+
[--platform windows] \
|
|
39
51
|
--token <ACCESS_TOKEN> \
|
|
40
|
-
[--ab-server https://
|
|
52
|
+
[--ab-server https://ab-admin.decentraland.org]
|
|
41
53
|
[--world-name <world-name.dcl.eth>]
|
|
42
54
|
```
|
|
43
55
|
|
|
@@ -46,11 +58,14 @@ npx @dcl/opscli queue-ab-conversion-snapshot \
|
|
|
46
58
|
```
|
|
47
59
|
npx @dcl/opscli queue-ab-conversion-about \
|
|
48
60
|
--token <ACCESS_TOKEN> \
|
|
61
|
+
[--platform webgl] \
|
|
62
|
+
[--platform mac] \
|
|
63
|
+
[--platform windows] \
|
|
49
64
|
--about-url https://sdk-team-cdn.decentraland.org/ipfs/goerli-plaza-main/about \
|
|
50
|
-
[--ab-server https://
|
|
65
|
+
[--ab-server https://ab-admin.decentraland.org]
|
|
51
66
|
```
|
|
52
67
|
|
|
53
|
-
### Check status of conversion
|
|
68
|
+
### Check the status of conversion
|
|
54
69
|
|
|
55
70
|
```
|
|
56
71
|
npx @dcl/opscli check-ab-conversion \
|
package/dist/bin.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bin.d.ts","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"bin.d.ts","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":";AAiBA,qBAAa,QAAS,SAAQ,KAAK;CAAG"}
|
package/dist/bin.js
CHANGED
|
@@ -1,51 +1,44 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
"use strict";
|
|
3
|
-
var
|
|
4
|
-
|
|
5
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
6
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
7
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
8
|
-
}
|
|
9
|
-
Object.defineProperty(o, k2, desc);
|
|
10
|
-
}) : (function(o, m, k, k2) {
|
|
11
|
-
if (k2 === undefined) k2 = k;
|
|
12
|
-
o[k2] = m[k];
|
|
13
|
-
}));
|
|
14
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
15
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
16
|
-
}) : function(o, v) {
|
|
17
|
-
o["default"] = v;
|
|
18
|
-
});
|
|
19
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
20
|
-
if (mod && mod.__esModule) return mod;
|
|
21
|
-
var result = {};
|
|
22
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
23
|
-
__setModuleDefault(result, mod);
|
|
24
|
-
return result;
|
|
3
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
4
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
25
5
|
};
|
|
26
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
7
|
exports.CliError = void 0;
|
|
8
|
+
const query_rollout_1 = __importDefault(require("./commands/query-rollout"));
|
|
9
|
+
const wearables_consistency_1 = __importDefault(require("./commands/wearables-consistency"));
|
|
10
|
+
const pointer_consistency_1 = __importDefault(require("./commands/pointer-consistency"));
|
|
11
|
+
const update_renderer_upm_1 = __importDefault(require("./commands/update-renderer-upm"));
|
|
12
|
+
const secret_manager_1 = __importDefault(require("./commands/secret-manager"));
|
|
13
|
+
const parameters_manager_1 = __importDefault(require("./commands/parameters-manager"));
|
|
14
|
+
const download_entity_1 = __importDefault(require("./commands/download-entity"));
|
|
15
|
+
const deploy_entity_1 = __importDefault(require("./commands/deploy-entity"));
|
|
16
|
+
const queue_ab_conversion_1 = __importDefault(require("./commands/queue-ab-conversion"));
|
|
17
|
+
const queue_ab_conversion_snapshot_1 = __importDefault(require("./commands/queue-ab-conversion-snapshot"));
|
|
18
|
+
const queue_ab_conversion_about_1 = __importDefault(require("./commands/queue-ab-conversion-about"));
|
|
19
|
+
const check_ab_conversion_1 = __importDefault(require("./commands/check-ab-conversion"));
|
|
20
|
+
const circleci_1 = __importDefault(require("./commands/circleci"));
|
|
21
|
+
const concat_snapshots_1 = __importDefault(require("./commands/concat-snapshots"));
|
|
28
22
|
class CliError extends Error {
|
|
29
23
|
}
|
|
30
24
|
exports.CliError = CliError;
|
|
31
25
|
const commands = {
|
|
32
|
-
'query-rollout':
|
|
33
|
-
'wearables-consistency':
|
|
34
|
-
'pointer-consistency':
|
|
35
|
-
'update-renderer-upm':
|
|
36
|
-
'secret-manager':
|
|
37
|
-
'parameters-manager':
|
|
38
|
-
'download-entity':
|
|
39
|
-
'deploy-entity':
|
|
40
|
-
'queue-ab-conversion':
|
|
41
|
-
'
|
|
42
|
-
'queue-ab-conversion-
|
|
43
|
-
'
|
|
44
|
-
circleci:
|
|
45
|
-
'concat-snapshots':
|
|
26
|
+
'query-rollout': query_rollout_1.default,
|
|
27
|
+
'wearables-consistency': wearables_consistency_1.default,
|
|
28
|
+
'pointer-consistency': pointer_consistency_1.default,
|
|
29
|
+
'update-renderer-upm': update_renderer_upm_1.default,
|
|
30
|
+
'secret-manager': secret_manager_1.default,
|
|
31
|
+
'parameters-manager': parameters_manager_1.default,
|
|
32
|
+
'download-entity': download_entity_1.default,
|
|
33
|
+
'deploy-entity': deploy_entity_1.default,
|
|
34
|
+
'queue-ab-conversion': queue_ab_conversion_1.default,
|
|
35
|
+
'queue-ab-conversion-snapshot': queue_ab_conversion_snapshot_1.default,
|
|
36
|
+
'queue-ab-conversion-about': queue_ab_conversion_about_1.default,
|
|
37
|
+
'check-ab-conversion': check_ab_conversion_1.default,
|
|
38
|
+
circleci: circleci_1.default,
|
|
39
|
+
'concat-snapshots': concat_snapshots_1.default
|
|
46
40
|
};
|
|
47
41
|
async function main() {
|
|
48
|
-
var _a;
|
|
49
42
|
const commandName = process.argv[2];
|
|
50
43
|
if (!commandName || !commands[commandName]) {
|
|
51
44
|
throw new CliError('Invalid command. Possible are:\n' +
|
|
@@ -53,8 +46,7 @@ async function main() {
|
|
|
53
46
|
.map(($) => ' npx @dcl/opscli ' + $ + '\n')
|
|
54
47
|
.join(''));
|
|
55
48
|
}
|
|
56
|
-
|
|
57
|
-
await fn();
|
|
49
|
+
await commands[commandName]();
|
|
58
50
|
}
|
|
59
51
|
main().catch((err) => {
|
|
60
52
|
if (err instanceof CliError) {
|
package/dist/bin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bin.js","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bin.js","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":";;;;;;;AAEA,6EAAmD;AACnD,6FAAmE;AACnE,yFAA+D;AAC/D,yFAA8D;AAC9D,+EAAqD;AACrD,uFAA6D;AAC7D,iFAAuD;AACvD,6EAAmD;AACnD,yFAA8D;AAC9D,2GAA+E;AAC/E,qGAAyE;AACzE,yFAA8D;AAC9D,mEAA0C;AAC1C,mFAAyD;AAEzD,MAAa,QAAS,SAAQ,KAAK;CAAG;AAAtC,4BAAsC;AAEtC,MAAM,QAAQ,GAAG;IACf,eAAe,EAAE,uBAAY;IAC7B,uBAAuB,EAAE,+BAAoB;IAC7C,qBAAqB,EAAE,6BAAkB;IACzC,qBAAqB,EAAE,6BAAiB;IACxC,gBAAgB,EAAE,wBAAa;IAC/B,oBAAoB,EAAE,4BAAiB;IACvC,iBAAiB,EAAE,yBAAc;IACjC,eAAe,EAAE,uBAAY;IAC7B,qBAAqB,EAAE,6BAAiB;IACxC,8BAA8B,EAAE,sCAAyB;IACzD,2BAA2B,EAAE,mCAAsB;IACnD,qBAAqB,EAAE,6BAAiB;IACxC,QAAQ,EAAE,kBAAQ;IAClB,kBAAkB,EAAE,0BAAe;CACpC,CAAA;AAED,KAAK,UAAU,IAAI;IACjB,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAA0B,CAAA;IAE5D,IAAI,CAAC,WAAW,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QAC1C,MAAM,IAAI,QAAQ,CAChB,kCAAkC;YAChC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;iBAClB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAoB,GAAG,CAAC,GAAG,IAAI,CAAC;iBAC3C,IAAI,CAAC,EAAE,CAAC,CACd,CAAA;KACF;IAED,MAAM,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAA;AAC/B,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;IACnB,IAAI,GAAG,YAAY,QAAQ,EAAE;QAC3B,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;KACzB;SAAM;QACL,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;KACnB;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACjB,CAAC,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-ab-conversion-about.d.ts","sourceRoot":"","sources":["../../src/commands/queue-ab-conversion-about.ts"],"names":[],"mappings":";AAQA,
|
|
1
|
+
{"version":3,"file":"queue-ab-conversion-about.d.ts","sourceRoot":"","sources":["../../src/commands/queue-ab-conversion-about.ts"],"names":[],"mappings":";AAQA,wBA0DC"}
|
|
@@ -14,17 +14,21 @@ exports.default = async () => {
|
|
|
14
14
|
const args = (0, arg_1.default)({
|
|
15
15
|
'--about-url': String,
|
|
16
16
|
'--ab-server': String,
|
|
17
|
+
'--platform': [String],
|
|
17
18
|
'--token': String,
|
|
18
19
|
'--force': Boolean,
|
|
19
20
|
'--prioritize': Boolean
|
|
20
21
|
});
|
|
21
22
|
const aboutUrl = args['--about-url'];
|
|
22
23
|
const token = args['--token'];
|
|
23
|
-
const abServer = args['--ab-server'] || asset_bundles_1.
|
|
24
|
+
const abServer = args['--ab-server'] || asset_bundles_1.productionAbAdmin;
|
|
25
|
+
const platforms = args['--platform'] || Object.values(asset_bundles_1.Platform);
|
|
24
26
|
const force = args['--force'] || false;
|
|
25
27
|
const shouldPrioritize = !!args['--prioritize'];
|
|
26
28
|
(0, assert_1.assert)(!!token, '--token is missing');
|
|
29
|
+
platforms.forEach((platform) => (0, assert_1.assert)(Object.values(asset_bundles_1.Platform).includes(platform), `Invalid platform: ${platform}`));
|
|
27
30
|
console.log(`> Parameters:`);
|
|
31
|
+
console.log(` Platform(s): ${platforms.join(',')}`);
|
|
28
32
|
console.log(` Asset bundle server: ${abServer}`);
|
|
29
33
|
console.log(` Force rebuild: ${force}`);
|
|
30
34
|
const aboutReq = await (0, undici_1.fetch)(aboutUrl);
|
|
@@ -49,8 +53,8 @@ exports.default = async () => {
|
|
|
49
53
|
},
|
|
50
54
|
contentServerUrls: [parsed.baseUrl || 'https://peer.decentraland.org/content'],
|
|
51
55
|
force
|
|
52
|
-
}, token, shouldPrioritize);
|
|
53
|
-
console.log(` Result
|
|
56
|
+
}, token, shouldPrioritize, platforms);
|
|
57
|
+
console.log(` Result:`, JSON.stringify(result));
|
|
54
58
|
}
|
|
55
59
|
console.log(`Finished!`);
|
|
56
60
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-ab-conversion-about.js","sourceRoot":"","sources":["../../src/commands/queue-ab-conversion-about.ts"],"names":[],"mappings":";;;;;AAAA,0CAA2C;AAC3C,8CAAqB;AACrB,8CAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"queue-ab-conversion-about.js","sourceRoot":"","sources":["../../src/commands/queue-ab-conversion-about.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-ab-conversion-snapshot.d.ts","sourceRoot":"","sources":["../../src/commands/queue-ab-conversion-snapshot.ts"],"names":[],"mappings":";AAWA,
|
|
1
|
+
{"version":3,"file":"queue-ab-conversion-snapshot.d.ts","sourceRoot":"","sources":["../../src/commands/queue-ab-conversion-snapshot.ts"],"names":[],"mappings":";AAWA,wBAuGC"}
|
|
@@ -21,27 +21,31 @@ exports.default = async () => {
|
|
|
21
21
|
'--start-date': String,
|
|
22
22
|
'--grep': String,
|
|
23
23
|
'--ab-server': String,
|
|
24
|
+
'--platform': [String],
|
|
24
25
|
'--token': String,
|
|
25
26
|
'--prioritize': Boolean
|
|
26
27
|
});
|
|
27
28
|
const snapshot = args['--snapshot'] || 'wearable';
|
|
28
29
|
const token = args['--token'];
|
|
29
|
-
const abServer = args['--ab-server'] || asset_bundles_1.
|
|
30
|
+
const abServer = args['--ab-server'] || asset_bundles_1.productionAbAdmin;
|
|
31
|
+
const platforms = args['--platform'] || Object.values(asset_bundles_1.Platform);
|
|
30
32
|
const shouldPrioritize = !!args['--prioritize'];
|
|
31
33
|
(0, assert_1.assert)(!!snapshot, '--snapshot is missing');
|
|
32
34
|
(0, assert_1.assert)(!!token, '--token is missing');
|
|
35
|
+
platforms.forEach((platform) => (0, assert_1.assert)(Object.values(asset_bundles_1.Platform).includes(platform), `Invalid platform: ${platform}`));
|
|
33
36
|
console.log(`> Parameters:`);
|
|
34
37
|
const contentUrl = (args['--content-server'] || 'https://peer.decentraland.org/content').replace(/\/$/, '');
|
|
38
|
+
console.log(` Platform(s): ${platforms.join(',')}`);
|
|
35
39
|
console.log(` Entity type: ${snapshot}`);
|
|
36
40
|
console.log(` Content server: ${contentUrl}`);
|
|
37
41
|
console.log(` Asset bundle server: ${abServer}`);
|
|
38
42
|
if (snapshot === 'worlds') {
|
|
39
43
|
const specificWorld = args['--world-name'];
|
|
40
44
|
if (specificWorld) {
|
|
41
|
-
await processWorld(abServer, token, specificWorld, shouldPrioritize);
|
|
45
|
+
await processWorld(abServer, token, specificWorld, shouldPrioritize, platforms);
|
|
42
46
|
}
|
|
43
47
|
else {
|
|
44
|
-
await processWorlds(abServer, token, shouldPrioritize);
|
|
48
|
+
await processWorlds(abServer, token, shouldPrioritize, platforms);
|
|
45
49
|
}
|
|
46
50
|
console.log(`Finished!`);
|
|
47
51
|
return;
|
|
@@ -88,7 +92,7 @@ exports.default = async () => {
|
|
|
88
92
|
}
|
|
89
93
|
}
|
|
90
94
|
if (startDate <= entity.entityTimestamp && entity.entityType === snapshot) {
|
|
91
|
-
await tryRetryQueueConversion(abServer, entity.entityId, contentUrl, token, shouldPrioritize);
|
|
95
|
+
await tryRetryQueueConversion(abServer, entity.entityId, contentUrl, token, shouldPrioritize, platforms);
|
|
92
96
|
console.log(` (${i + 1}/${snapshotsCount}) [${percent}%]`, entity.entityId, entity.pointers[0]);
|
|
93
97
|
}
|
|
94
98
|
}
|
|
@@ -99,7 +103,7 @@ exports.default = async () => {
|
|
|
99
103
|
}
|
|
100
104
|
console.log(`Finished!`);
|
|
101
105
|
};
|
|
102
|
-
const processWorlds = async (abServer, token, prioritize) => {
|
|
106
|
+
const processWorlds = async (abServer, token, prioritize, platforms) => {
|
|
103
107
|
console.log('Processing worlds.');
|
|
104
108
|
const worldsIndexUrl = 'https://worlds-content-server.decentraland.org/index';
|
|
105
109
|
const worldsContentUrl = 'https://worlds-content-server.decentraland.org/';
|
|
@@ -119,11 +123,11 @@ const processWorlds = async (abServer, token, prioritize) => {
|
|
|
119
123
|
for (let j = 0; j < scenes.length; j++) {
|
|
120
124
|
const scene = scenes[j];
|
|
121
125
|
console.log(`> [${percent}%]`, name, scene.id);
|
|
122
|
-
await tryRetryQueueConversion(abServer, scene.id, worldsContentUrl, token, prioritize);
|
|
126
|
+
await tryRetryQueueConversion(abServer, scene.id, worldsContentUrl, token, prioritize, platforms);
|
|
123
127
|
}
|
|
124
128
|
}
|
|
125
129
|
};
|
|
126
|
-
const processWorld = async (abServer, token, worldName, prioritize) => {
|
|
130
|
+
const processWorld = async (abServer, token, worldName, prioritize, platforms) => {
|
|
127
131
|
console.log(`Processing world: ${worldName}.`);
|
|
128
132
|
const worldsIndexUrl = 'https://worlds-content-server.decentraland.org/index';
|
|
129
133
|
const worldsContentUrl = 'https://worlds-content-server.decentraland.org/';
|
|
@@ -146,12 +150,12 @@ const processWorld = async (abServer, token, worldName, prioritize) => {
|
|
|
146
150
|
const scene = scenes[j];
|
|
147
151
|
const percent = (100 * ((j + 1) / scenes.length)).toFixed(2);
|
|
148
152
|
console.log(`> [${percent}%]`, world.name, scene.id);
|
|
149
|
-
await tryRetryQueueConversion(abServer, scene.id, worldsContentUrl, token, prioritize);
|
|
153
|
+
await tryRetryQueueConversion(abServer, scene.id, worldsContentUrl, token, prioritize, platforms);
|
|
150
154
|
}
|
|
151
155
|
}
|
|
152
156
|
}
|
|
153
157
|
};
|
|
154
|
-
const tryRetryQueueConversion = async (abServer, entityId, contentUrl, token, prioritize, retryCount = 0) => {
|
|
158
|
+
const tryRetryQueueConversion = async (abServer, entityId, contentUrl, token, prioritize, platforms, retryCount = 0) => {
|
|
155
159
|
if (retryCount > 3) {
|
|
156
160
|
console.log(`> ${abServer} ${entityId} retry count exceeded, please check your connection.`);
|
|
157
161
|
(0, process_1.exit)(1);
|
|
@@ -169,12 +173,12 @@ const tryRetryQueueConversion = async (abServer, entityId, contentUrl, token, pr
|
|
|
169
173
|
]
|
|
170
174
|
},
|
|
171
175
|
contentServerUrls: [contentUrl]
|
|
172
|
-
}, token, prioritize);
|
|
176
|
+
}, token, prioritize, platforms);
|
|
173
177
|
}
|
|
174
178
|
catch (error) {
|
|
175
179
|
console.log(`> Unexpected error, retrying in 5 seconds...`);
|
|
176
180
|
await new Promise((f) => setTimeout(f, 5000));
|
|
177
|
-
await tryRetryQueueConversion(abServer, entityId, contentUrl, token, prioritize, retryCount + 1);
|
|
181
|
+
await tryRetryQueueConversion(abServer, entityId, contentUrl, token, prioritize, platforms, retryCount + 1);
|
|
178
182
|
}
|
|
179
183
|
};
|
|
180
184
|
const processSnapshot = async (url, processLine, retryCount = 0, skipToIndex = -1) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-ab-conversion-snapshot.js","sourceRoot":"","sources":["../../src/commands/queue-ab-conversion-snapshot.ts"],"names":[],"mappings":";;;;;AAAA,0CAA2C;AAC3C,8CAAqB;AACrB,mCAA8B;AAC9B,gCAAiC;AACjC,8CAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"queue-ab-conversion-snapshot.js","sourceRoot":"","sources":["../../src/commands/queue-ab-conversion-snapshot.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-ab-conversion.d.ts","sourceRoot":"","sources":["../../src/commands/queue-ab-conversion.ts"],"names":[],"mappings":";AAMA,
|
|
1
|
+
{"version":3,"file":"queue-ab-conversion.d.ts","sourceRoot":"","sources":["../../src/commands/queue-ab-conversion.ts"],"names":[],"mappings":";AAMA,wBAwEC"}
|
|
@@ -14,20 +14,24 @@ exports.default = async () => {
|
|
|
14
14
|
'--pointer': [String],
|
|
15
15
|
'--content-server': String,
|
|
16
16
|
'--ab-server': String,
|
|
17
|
+
'--platform': [String],
|
|
17
18
|
'--token': String,
|
|
18
19
|
'--prioritize': Boolean
|
|
19
20
|
});
|
|
20
21
|
const pointers = args['--pointer'] || [];
|
|
21
22
|
const cids = args['--cid'] || [];
|
|
22
23
|
const token = args['--token'];
|
|
23
|
-
const abServer = args['--ab-server'] || asset_bundles_1.
|
|
24
|
+
const abServer = args['--ab-server'] || asset_bundles_1.productionAbAdmin;
|
|
25
|
+
const platforms = args['--platform'] || Object.values(asset_bundles_1.Platform);
|
|
26
|
+
const contentUrl = (args['--content-server'] || 'https://peer.decentraland.org/content').replace(/\/$/, '');
|
|
24
27
|
const shouldPrioritize = !!args['--prioritize'];
|
|
25
28
|
(0, assert_1.assert)(!!token, '--token is missing');
|
|
26
29
|
(0, assert_1.assert)(pointers.length > 0 || cids.length > 0, '--pointer or --cid are required');
|
|
30
|
+
platforms.forEach((platform) => (0, assert_1.assert)(Object.values(asset_bundles_1.Platform).includes(platform), `Invalid platform: ${platform}`));
|
|
27
31
|
console.log(`> Parameters:`);
|
|
28
32
|
pointers.length && console.log(` Pointers: ${pointers.join(',')}`);
|
|
29
|
-
cids.length && console.log(` CIDs: ${cids.join(',')}`);
|
|
30
|
-
|
|
33
|
+
cids.length && console.log(` CIDs: ${cids.join(', ')}`);
|
|
34
|
+
console.log(` Platform(s): ${platforms.join(',')}`);
|
|
31
35
|
console.log(` Content server: ${contentUrl}`);
|
|
32
36
|
console.log(` Asset bundle server: ${abServer}`);
|
|
33
37
|
const entityIdsToConvert = [];
|
|
@@ -59,8 +63,8 @@ exports.default = async () => {
|
|
|
59
63
|
]
|
|
60
64
|
},
|
|
61
65
|
contentServerUrls: [contentUrl]
|
|
62
|
-
}, token, shouldPrioritize);
|
|
63
|
-
console.log(` Result
|
|
66
|
+
}, token, shouldPrioritize, platforms);
|
|
67
|
+
console.log(` Result:`, JSON.stringify(result));
|
|
64
68
|
}
|
|
65
69
|
console.log(`Finished!`);
|
|
66
70
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-ab-conversion.js","sourceRoot":"","sources":["../../src/commands/queue-ab-conversion.ts"],"names":[],"mappings":";;;;;AAAA,0CAA2D;AAC3D,8CAAqB;AACrB,8CAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"queue-ab-conversion.js","sourceRoot":"","sources":["../../src/commands/queue-ab-conversion.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { DeploymentToSqs } from '@dcl/schemas/dist/misc/deployments-to-sqs';
|
|
2
|
-
export declare const
|
|
3
|
-
export declare
|
|
2
|
+
export declare const productionAbAdmin = "https://ab-admin.decentraland.org";
|
|
3
|
+
export declare enum Platform {
|
|
4
|
+
WEBGL = "webgl",
|
|
5
|
+
WINDOWS = "windows",
|
|
6
|
+
MAC = "mac"
|
|
7
|
+
}
|
|
8
|
+
export declare function queueConversions(customABConverterServer: string, entity: DeploymentToSqs, token: string, prioritize: boolean, platforms: Platform[]): Promise<Array<{
|
|
4
9
|
id: string;
|
|
5
10
|
}>>;
|
|
6
|
-
export declare function queueConversion(assetConverterServer: string, body: DeploymentToSqs, token: string, prioritize: boolean): Promise<{
|
|
7
|
-
id: string;
|
|
8
|
-
}>;
|
|
9
11
|
//# sourceMappingURL=asset-bundles.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asset-bundles.d.ts","sourceRoot":"","sources":["../../src/helpers/asset-bundles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAA;AAI3E,eAAO,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"asset-bundles.d.ts","sourceRoot":"","sources":["../../src/helpers/asset-bundles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAA;AAI3E,eAAO,MAAM,iBAAiB,sCAAsC,CAAA;AAEpE,oBAAY,QAAQ;IAClB,KAAK,UAAU;IACf,OAAO,YAAY;IACnB,GAAG,QAAQ;CACZ;AAED,wBAAsB,gBAAgB,CACpC,uBAAuB,EAAE,MAAM,EAC/B,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,OAAO,EACnB,SAAS,EAAE,QAAQ,EAAE,GACpB,OAAO,CAAC,KAAK,CAAC;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAMhC"}
|
|
@@ -1,36 +1,32 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.queueConversions = exports.Platform = exports.productionAbAdmin = void 0;
|
|
4
4
|
const undici_1 = require("undici");
|
|
5
5
|
const bin_1 = require("../bin");
|
|
6
|
-
exports.
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
];
|
|
12
|
-
|
|
6
|
+
exports.productionAbAdmin = 'https://ab-admin.decentraland.org';
|
|
7
|
+
var Platform;
|
|
8
|
+
(function (Platform) {
|
|
9
|
+
Platform["WEBGL"] = "webgl";
|
|
10
|
+
Platform["WINDOWS"] = "windows";
|
|
11
|
+
Platform["MAC"] = "mac";
|
|
12
|
+
})(Platform = exports.Platform || (exports.Platform = {}));
|
|
13
|
+
async function queueConversions(customABConverterServer, entity, token, prioritize, platforms) {
|
|
13
14
|
const ids = [];
|
|
14
|
-
|
|
15
|
-
for (const assetConverterServer of abServers) {
|
|
16
|
-
ids.push(await queueConversion(assetConverterServer, entity, token, prioritize));
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
else {
|
|
20
|
-
ids.push(await queueConversion(customABConverterServer, entity, token, prioritize));
|
|
21
|
-
}
|
|
15
|
+
ids.push(await queueConversion(customABConverterServer, entity, token, prioritize, platforms));
|
|
22
16
|
return ids;
|
|
23
17
|
}
|
|
24
18
|
exports.queueConversions = queueConversions;
|
|
25
|
-
async function queueConversion(assetConverterServer, body, token, prioritize) {
|
|
26
|
-
const url = `${assetConverterServer}/
|
|
19
|
+
async function queueConversion(assetConverterServer, body, token, prioritize, platforms) {
|
|
20
|
+
const url = new URL(`${assetConverterServer}/enqueue-task`);
|
|
21
|
+
platforms.forEach((platform) => url.searchParams.append('platform', platform));
|
|
27
22
|
if (prioritize) {
|
|
28
23
|
;
|
|
29
24
|
body.prioritize = true;
|
|
30
25
|
}
|
|
26
|
+
console.log(`> Enqueueing task to ${url}`, JSON.stringify([body]));
|
|
31
27
|
const res = await (0, undici_1.fetch)(url, {
|
|
32
28
|
method: 'post',
|
|
33
|
-
body: JSON.stringify(body),
|
|
29
|
+
body: JSON.stringify([body]),
|
|
34
30
|
headers: {
|
|
35
31
|
'content-type': 'application/json',
|
|
36
32
|
Authorization: token
|
|
@@ -41,5 +37,4 @@ async function queueConversion(assetConverterServer, body, token, prioritize) {
|
|
|
41
37
|
}
|
|
42
38
|
return (await res.json());
|
|
43
39
|
}
|
|
44
|
-
exports.queueConversion = queueConversion;
|
|
45
40
|
//# sourceMappingURL=asset-bundles.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asset-bundles.js","sourceRoot":"","sources":["../../src/helpers/asset-bundles.ts"],"names":[],"mappings":";;;AACA,mCAA8B;AAC9B,gCAAiC;AAEpB,QAAA,iBAAiB,GAAG,
|
|
1
|
+
{"version":3,"file":"asset-bundles.js","sourceRoot":"","sources":["../../src/helpers/asset-bundles.ts"],"names":[],"mappings":";;;AACA,mCAA8B;AAC9B,gCAAiC;AAEpB,QAAA,iBAAiB,GAAG,mCAAmC,CAAA;AAEpE,IAAY,QAIX;AAJD,WAAY,QAAQ;IAClB,2BAAe,CAAA;IACf,+BAAmB,CAAA;IACnB,uBAAW,CAAA;AACb,CAAC,EAJW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAInB;AAEM,KAAK,UAAU,gBAAgB,CACpC,uBAA+B,EAC/B,MAAuB,EACvB,KAAa,EACb,UAAmB,EACnB,SAAqB;IAErB,MAAM,GAAG,GAA0B,EAAE,CAAA;IAErC,GAAG,CAAC,IAAI,CAAC,MAAM,eAAe,CAAC,uBAAuB,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,CAAA;IAE9F,OAAO,GAAG,CAAA;AACZ,CAAC;AAZD,4CAYC;AAED,KAAK,UAAU,eAAe,CAC5B,oBAA4B,EAC5B,IAAqB,EACrB,KAAa,EACb,UAAmB,EACnB,SAAqB;IAErB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,oBAAoB,eAAe,CAAC,CAAA;IAC3D,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAA;IAE9E,IAAI,UAAU,EAAE;QACd,CAAC;QAAC,IAAY,CAAC,UAAU,GAAG,IAAI,CAAA;KACjC;IACD,OAAO,CAAC,GAAG,CAAC,wBAAwB,GAAG,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAElE,MAAM,GAAG,GAAG,MAAM,IAAA,cAAK,EAAC,GAAG,EAAE;QAC3B,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC;QAC5B,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,aAAa,EAAE,KAAK;SACrB;KACF,CAAC,CAAA;IAEF,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;QACX,MAAM,IAAI,cAAQ,CAAC,mDAAmD,GAAG,CAAC,MAAM,SAAS,MAAM,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;KAC7G;IAED,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAmB,CAAA;AAC7C,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dcl/opscli",
|
|
3
|
-
"version": "1.0.0-
|
|
3
|
+
"version": "1.0.0-10559981082.commit-e4ac0c1",
|
|
4
4
|
"description": "base component",
|
|
5
5
|
"bin": "dist/bin.js",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -49,5 +49,5 @@
|
|
|
49
49
|
"files": [
|
|
50
50
|
"dist"
|
|
51
51
|
],
|
|
52
|
-
"commit": "
|
|
52
|
+
"commit": "e4ac0c1e76b2ce1d1d0ac38f7940d757bdd642d4"
|
|
53
53
|
}
|