@dcl/opscli 1.0.0-8785603081.commit-34e5455 → 1.0.0-8987120430.commit-d785dd9
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/commands/queue-ab-conversion-about.d.ts.map +1 -1
- package/dist/commands/queue-ab-conversion-about.js +11 -13
- 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 +26 -23
- 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 +12 -5
- package/dist/commands/queue-ab-conversion.js.map +1 -1
- package/dist/helpers/asset-bundles.d.ts +3 -2
- package/dist/helpers/asset-bundles.d.ts.map +1 -1
- package/dist/helpers/asset-bundles.js +20 -6
- package/dist/helpers/asset-bundles.js.map +1 -1
- package/package.json +2 -2
|
@@ -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,wBAyDC"}
|
|
@@ -16,23 +16,21 @@ exports.default = async () => {
|
|
|
16
16
|
"--ab-server": String,
|
|
17
17
|
"--token": String,
|
|
18
18
|
"--force": Boolean,
|
|
19
|
-
"--
|
|
19
|
+
"--prioritize": Boolean
|
|
20
20
|
});
|
|
21
21
|
const aboutUrl = args["--about-url"];
|
|
22
22
|
const token = args["--token"];
|
|
23
|
-
const abServer = args["--ab-server"] ||
|
|
23
|
+
const abServer = args["--ab-server"] || asset_bundles_1.multiPlatformFlag;
|
|
24
24
|
const force = args["--force"] || false;
|
|
25
|
-
const
|
|
26
|
-
const abServers = crossplatform
|
|
27
|
-
? [
|
|
28
|
-
"https://asset-bundle-converter.decentraland.org",
|
|
29
|
-
"https://asset-bundle-converter-windows.decentraland.org",
|
|
30
|
-
"https://asset-bundle-converter-mac.decentraland.org",
|
|
31
|
-
]
|
|
32
|
-
: [abServer];
|
|
25
|
+
const shouldPrioritize = !!args["--prioritize"];
|
|
33
26
|
(0, assert_1.assert)(!!token, "--token is missing");
|
|
34
27
|
console.log(`> Parameters:`);
|
|
35
|
-
|
|
28
|
+
if (abServer !== asset_bundles_1.multiPlatformFlag) {
|
|
29
|
+
console.log(` Asset bundle server: Windows, Mac, WebGL`);
|
|
30
|
+
}
|
|
31
|
+
else {
|
|
32
|
+
console.log(` Asset bundle server: ${JSON.stringify(abServer)}`);
|
|
33
|
+
}
|
|
36
34
|
console.log(` Force rebuild: ${force}`);
|
|
37
35
|
const aboutReq = await (0, undici_1.fetch)(aboutUrl);
|
|
38
36
|
if (!aboutReq.ok)
|
|
@@ -43,7 +41,7 @@ exports.default = async () => {
|
|
|
43
41
|
for (const urn of aboutJson.configurations.scenesUrn) {
|
|
44
42
|
const parsed = (0, parseEntityUrn_1.parseEntityUrn)(urn);
|
|
45
43
|
console.log(`> Scheduling conversion of entity ${parsed.entityId}`);
|
|
46
|
-
const result = await (0, asset_bundles_1.queueConversions)(
|
|
44
|
+
const result = await (0, asset_bundles_1.queueConversions)(abServer, {
|
|
47
45
|
entity: {
|
|
48
46
|
entityId: parsed.entityId,
|
|
49
47
|
authChain: [
|
|
@@ -56,7 +54,7 @@ exports.default = async () => {
|
|
|
56
54
|
},
|
|
57
55
|
contentServerUrls: [parsed.baseUrl || "https://peer.decentraland.org/content"],
|
|
58
56
|
force,
|
|
59
|
-
}, token);
|
|
57
|
+
}, token, shouldPrioritize);
|
|
60
58
|
console.log(` Result: ${JSON.stringify(result)}`);
|
|
61
59
|
}
|
|
62
60
|
console.log(`Finished!`);
|
|
@@ -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":";;;;;AAAA,0CAA2C;AAC3C,8CAAqB;AACrB,8CAA0C;AAC1C,4DAA8E;AAC9E,mCAA8B;AAC9B,gCAAiC;AACjC,8DAA0D;AAE1D,kBAAe,KAAK,IAAI,EAAE;IACxB,MAAM,IAAI,GAAG,IAAA,aAAG,EAAC;QACf,aAAa,EAAE,MAAM;QACrB,aAAa,EAAE,MAAM;QACrB,SAAS,EAAE,MAAM;QACjB,SAAS,EAAE,OAAO;QAClB,cAAc,EAAE,OAAO;KACxB,CAAC,CAAA;IAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAE,CAAA;IACrC,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAE,CAAA;IAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,iCAAiB,CAAA;IACzD,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,KAAK,CAAA;IAEtC,MAAM,gBAAgB,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;IAE/C,IAAA,eAAM,EAAC,CAAC,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAA;IAErC,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAA;IAC5C,IAAI,QAAQ,KAAK,iCAAiB,EAAE;QAClC,OAAO,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAA;KACjE;SAAI;QACH,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;KACzE;IACD,OAAO,CAAC,GAAG,CAAC,iCAAiC,KAAK,EAAE,CAAC,CAAA;IAErD,MAAM,QAAQ,GAAG,MAAM,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAA;IACtC,IAAI,CAAC,QAAQ,CAAC,EAAE;QAAE,MAAM,IAAI,cAAQ,CAAC,yBAAyB,QAAQ,EAAE,CAAC,CAAA;IACzE,MAAM,SAAS,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAQ,CAAA;IAChD,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,SAAS;QAAE,MAAM,IAAI,cAAQ,CAAC,yBAAyB,CAAC,CAAA;IAEtF,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,cAAc,CAAC,SAAS,EAAE;QACpD,MAAM,MAAM,GAAG,IAAA,+BAAc,EAAC,GAAG,CAAC,CAAA;QAClC,OAAO,CAAC,GAAG,CAAC,qCAAqC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAA;QACnE,MAAM,MAAM,GAAG,MAAM,IAAA,gCAAgB,EACnC,QAAQ,EACR;YACE,MAAM,EAAE;gBACN,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,SAAS,EAAE;oBACT;wBACE,IAAI,EAAE,sBAAY,CAAC,MAAM;wBACzB,OAAO,EAAE,4CAA4C;wBACrD,SAAS,EAAE,EAAE;qBACd;iBACF;aACF;YACD,iBAAiB,EAAE,CAAC,MAAM,CAAC,OAAO,IAAI,uCAAuC,CAAC;YAC9E,KAAK;SACN,EACD,KAAK,EACL,gBAAgB,CACjB,CAAA;QACD,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;KACnD;IAED,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;AAC1B,CAAC,CAAA"}
|
|
@@ -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,wBAwHC"}
|
|
@@ -22,33 +22,31 @@ exports.default = async () => {
|
|
|
22
22
|
"--grep": String,
|
|
23
23
|
"--ab-server": String,
|
|
24
24
|
"--token": String,
|
|
25
|
-
"--
|
|
25
|
+
"--prioritize": Boolean
|
|
26
26
|
});
|
|
27
27
|
const snapshot = args["--snapshot"] || 'wearable';
|
|
28
28
|
const token = args["--token"];
|
|
29
|
-
const abServer = args["--ab-server"] ||
|
|
30
|
-
const
|
|
31
|
-
const abServers = crossplatform
|
|
32
|
-
? [
|
|
33
|
-
"https://asset-bundle-converter.decentraland.org",
|
|
34
|
-
"https://asset-bundle-converter-windows.decentraland.org",
|
|
35
|
-
"https://asset-bundle-converter-mac.decentraland.org",
|
|
36
|
-
]
|
|
37
|
-
: [abServer];
|
|
29
|
+
const abServer = args["--ab-server"] || asset_bundles_1.multiPlatformFlag;
|
|
30
|
+
const shouldPrioritize = !!args["--prioritize"];
|
|
38
31
|
(0, assert_1.assert)(!!snapshot, "--snapshot is missing");
|
|
39
32
|
(0, assert_1.assert)(!!token, "--token is missing");
|
|
40
33
|
console.log(`> Parameters:`);
|
|
41
34
|
const contentUrl = (args["--content-server"] || "https://peer.decentraland.org/content").replace(/\/$/, "");
|
|
42
35
|
console.log(` Entity type: ${snapshot}`);
|
|
43
36
|
console.log(` Content server: ${contentUrl}`);
|
|
44
|
-
|
|
37
|
+
if (abServer !== asset_bundles_1.multiPlatformFlag) {
|
|
38
|
+
console.log(` Asset bundle server: Windows, Mac, WebGL`);
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
console.log(` Asset bundle server: ${JSON.stringify(abServer)}`);
|
|
42
|
+
}
|
|
45
43
|
if (snapshot == "worlds") {
|
|
46
44
|
let specificWorld = args["--world-name"];
|
|
47
45
|
if (specificWorld) {
|
|
48
|
-
await processWorld(
|
|
46
|
+
await processWorld(abServer, token, specificWorld, shouldPrioritize);
|
|
49
47
|
}
|
|
50
48
|
else {
|
|
51
|
-
await processWorlds(
|
|
49
|
+
await processWorlds(abServer, token, shouldPrioritize);
|
|
52
50
|
}
|
|
53
51
|
console.log(`Finished!`);
|
|
54
52
|
return;
|
|
@@ -96,7 +94,7 @@ exports.default = async () => {
|
|
|
96
94
|
}
|
|
97
95
|
}
|
|
98
96
|
if (startDate <= entity.entityTimestamp && entity.entityType == snapshot) {
|
|
99
|
-
await tryRetryQueueConversion(
|
|
97
|
+
await tryRetryQueueConversion(abServer, entity.entityId, contentUrl, token, shouldPrioritize);
|
|
100
98
|
console.log(` (${i + 1}/${snapshotsCount}) [${percent}%]`, entity.entityId, entity.pointers[0]);
|
|
101
99
|
}
|
|
102
100
|
}
|
|
@@ -107,7 +105,7 @@ exports.default = async () => {
|
|
|
107
105
|
}
|
|
108
106
|
console.log(`Finished!`);
|
|
109
107
|
};
|
|
110
|
-
const processWorlds = async (
|
|
108
|
+
const processWorlds = async (customABServer, token, prioritize) => {
|
|
111
109
|
console.log("Processing worlds.");
|
|
112
110
|
const worldsIndexUrl = 'https://worlds-content-server.decentraland.org/index';
|
|
113
111
|
const worldsContentUrl = 'https://worlds-content-server.decentraland.org/';
|
|
@@ -127,11 +125,11 @@ const processWorlds = async (abServers, token) => {
|
|
|
127
125
|
for (let j = 0; j < scenes.length; j++) {
|
|
128
126
|
const scene = scenes[j];
|
|
129
127
|
console.log(`> [${percent}%]`, name, scene.id);
|
|
130
|
-
await tryRetryQueueConversion(
|
|
128
|
+
await tryRetryQueueConversion(customABServer, scene.id, worldsContentUrl, token, prioritize);
|
|
131
129
|
}
|
|
132
130
|
}
|
|
133
131
|
};
|
|
134
|
-
const processWorld = async (
|
|
132
|
+
const processWorld = async (customABServer, token, worldName, prioritize) => {
|
|
135
133
|
console.log(`Processing world: ${worldName}.`);
|
|
136
134
|
const worldsIndexUrl = 'https://worlds-content-server.decentraland.org/index';
|
|
137
135
|
const worldsContentUrl = 'https://worlds-content-server.decentraland.org/';
|
|
@@ -155,18 +153,23 @@ const processWorld = async (abServers, token, worldName) => {
|
|
|
155
153
|
const scene = scenes[j];
|
|
156
154
|
const percent = (100 * ((j + 1) / scenes.length)).toFixed(2);
|
|
157
155
|
console.log(`> [${percent}%]`, world.name, scene.id);
|
|
158
|
-
await tryRetryQueueConversion(
|
|
156
|
+
await tryRetryQueueConversion(customABServer, scene.id, worldsContentUrl, token, prioritize);
|
|
159
157
|
}
|
|
160
158
|
}
|
|
161
159
|
}
|
|
162
160
|
};
|
|
163
|
-
const tryRetryQueueConversion = async (
|
|
161
|
+
const tryRetryQueueConversion = async (customABServer, entityId, contentUrl, token, prioritize, retryCount = 0) => {
|
|
164
162
|
if (retryCount > 3) {
|
|
165
|
-
|
|
163
|
+
if (customABServer !== asset_bundles_1.multiPlatformFlag) {
|
|
164
|
+
console.log(`> ${customABServer} ${entityId} retry count exceeded, please check your connection.`);
|
|
165
|
+
}
|
|
166
|
+
else {
|
|
167
|
+
console.log(`> All platforms ${entityId} retry count exceeded, please check your connection.`);
|
|
168
|
+
}
|
|
166
169
|
(0, process_1.exit)(1);
|
|
167
170
|
}
|
|
168
171
|
try {
|
|
169
|
-
await (0, asset_bundles_1.queueConversions)(
|
|
172
|
+
await (0, asset_bundles_1.queueConversions)(customABServer, {
|
|
170
173
|
entity: {
|
|
171
174
|
entityId: entityId, authChain: [
|
|
172
175
|
{
|
|
@@ -176,12 +179,12 @@ const tryRetryQueueConversion = async (abServers, entityId, contentUrl, token, r
|
|
|
176
179
|
}
|
|
177
180
|
]
|
|
178
181
|
}, contentServerUrls: [contentUrl]
|
|
179
|
-
}, token);
|
|
182
|
+
}, token, prioritize);
|
|
180
183
|
}
|
|
181
184
|
catch (error) {
|
|
182
185
|
console.log(`> Unexpected error, retrying in 5 seconds...`);
|
|
183
186
|
await new Promise(f => setTimeout(f, 5000));
|
|
184
|
-
tryRetryQueueConversion(
|
|
187
|
+
tryRetryQueueConversion(customABServer, entityId, contentUrl, token, prioritize, retryCount + 1);
|
|
185
188
|
}
|
|
186
189
|
};
|
|
187
190
|
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,wBAgEC"}
|
|
@@ -14,12 +14,14 @@ exports.default = async () => {
|
|
|
14
14
|
"--pointer": [String],
|
|
15
15
|
"--content-server": String,
|
|
16
16
|
"--ab-server": String,
|
|
17
|
-
"--token": String
|
|
17
|
+
"--token": String,
|
|
18
|
+
"--prioritize": Boolean
|
|
18
19
|
});
|
|
19
20
|
const pointers = args["--pointer"] || [];
|
|
20
21
|
const cids = args["--cid"] || [];
|
|
21
22
|
const token = args["--token"];
|
|
22
|
-
const abServer = args["--ab-server"] ||
|
|
23
|
+
const abServer = args["--ab-server"] || asset_bundles_1.multiPlatformFlag;
|
|
24
|
+
const shouldPrioritize = !!args["--prioritize"];
|
|
23
25
|
(0, assert_1.assert)(!!token, "--token is missing");
|
|
24
26
|
(0, assert_1.assert)(pointers.length > 0 || cids.length > 0, "--pointer or --cid are required");
|
|
25
27
|
console.log(`> Parameters:`);
|
|
@@ -27,7 +29,12 @@ exports.default = async () => {
|
|
|
27
29
|
cids.length && console.log(` CIDs: ${cids.join(",")}`);
|
|
28
30
|
const contentUrl = (args["--content-server"] || "https://peer.decentraland.org/content").replace(/\/$/, "");
|
|
29
31
|
console.log(` Content server: ${contentUrl}`);
|
|
30
|
-
|
|
32
|
+
if (abServer !== asset_bundles_1.multiPlatformFlag) {
|
|
33
|
+
console.log(` Asset bundle server: Windows, Mac, WebGL`);
|
|
34
|
+
}
|
|
35
|
+
else {
|
|
36
|
+
console.log(` Asset bundle server: ${JSON.stringify(abServer)}`);
|
|
37
|
+
}
|
|
31
38
|
const entityIdsToConvert = [];
|
|
32
39
|
if (pointers.length) {
|
|
33
40
|
for (const entity of await (0, downloads_1.getActiveEntities)(pointers, contentUrl)) {
|
|
@@ -45,7 +52,7 @@ exports.default = async () => {
|
|
|
45
52
|
}
|
|
46
53
|
for (const entity of entityIdsToConvert) {
|
|
47
54
|
console.log(`> Scheduling conversion of entity ${entity}`);
|
|
48
|
-
const result = await (0, asset_bundles_1.
|
|
55
|
+
const result = await (0, asset_bundles_1.queueConversions)(abServer, {
|
|
49
56
|
entity: {
|
|
50
57
|
entityId: entity, authChain: [
|
|
51
58
|
{
|
|
@@ -55,7 +62,7 @@ exports.default = async () => {
|
|
|
55
62
|
}
|
|
56
63
|
]
|
|
57
64
|
}, contentServerUrls: [contentUrl]
|
|
58
|
-
}, token);
|
|
65
|
+
}, token, shouldPrioritize);
|
|
59
66
|
console.log(` Result: ${JSON.stringify(result)}`);
|
|
60
67
|
}
|
|
61
68
|
console.log(`Finished!`);
|
|
@@ -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,8 +1,9 @@
|
|
|
1
1
|
import { DeploymentToSqs } from "@dcl/schemas/dist/misc/deployments-to-sqs";
|
|
2
|
-
export declare
|
|
2
|
+
export declare const multiPlatformFlag = "multiPlatform";
|
|
3
|
+
export declare function queueConversions(customABConverterServer: string, entity: DeploymentToSqs, token: string, prioritize: boolean): Promise<Array<{
|
|
3
4
|
id: string;
|
|
4
5
|
}>>;
|
|
5
|
-
export declare function queueConversion(assetConverterServer: string,
|
|
6
|
+
export declare function queueConversion(assetConverterServer: string, body: DeploymentToSqs, token: string, prioritize: boolean): Promise<{
|
|
6
7
|
id: string;
|
|
7
8
|
}>;
|
|
8
9
|
//# 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,wBAAsB,gBAAgB,CAAC,
|
|
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,kBAAkB,CAAA;AAOhD,wBAAsB,gBAAgB,CAAC,uBAAuB,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAWnK;AAED,wBAAsB,eAAe,CAAC,oBAAoB,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC,CAsBtJ"}
|
|
@@ -1,21 +1,35 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.queueConversion = exports.queueConversions = void 0;
|
|
3
|
+
exports.queueConversion = exports.queueConversions = exports.multiPlatformFlag = void 0;
|
|
4
4
|
const undici_1 = require("undici");
|
|
5
5
|
const bin_1 = require("../bin");
|
|
6
|
-
|
|
6
|
+
exports.multiPlatformFlag = "multiPlatform";
|
|
7
|
+
const abServers = [
|
|
8
|
+
"https://asset-bundle-converter.decentraland.org",
|
|
9
|
+
"https://asset-bundle-converter-windows.decentraland.org",
|
|
10
|
+
"https://asset-bundle-converter-mac.decentraland.org",
|
|
11
|
+
];
|
|
12
|
+
async function queueConversions(customABConverterServer, entity, token, prioritize) {
|
|
7
13
|
let ids = [];
|
|
8
|
-
|
|
9
|
-
|
|
14
|
+
if (customABConverterServer !== exports.multiPlatformFlag) {
|
|
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));
|
|
10
21
|
}
|
|
11
22
|
return ids;
|
|
12
23
|
}
|
|
13
24
|
exports.queueConversions = queueConversions;
|
|
14
|
-
async function queueConversion(assetConverterServer,
|
|
25
|
+
async function queueConversion(assetConverterServer, body, token, prioritize) {
|
|
15
26
|
const url = `${assetConverterServer}/queue-task`;
|
|
27
|
+
if (prioritize) {
|
|
28
|
+
body.prioritize = true;
|
|
29
|
+
}
|
|
16
30
|
const res = await (0, undici_1.fetch)(url, {
|
|
17
31
|
method: "post",
|
|
18
|
-
body: JSON.stringify(
|
|
32
|
+
body: JSON.stringify(body),
|
|
19
33
|
headers: {
|
|
20
34
|
"content-type": "application/json",
|
|
21
35
|
Authorization: token
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asset-bundles.js","sourceRoot":"","sources":["../../src/helpers/asset-bundles.ts"],"names":[],"mappings":";;;AACA,mCAA8B;AAC9B,gCAAiC;
|
|
1
|
+
{"version":3,"file":"asset-bundles.js","sourceRoot":"","sources":["../../src/helpers/asset-bundles.ts"],"names":[],"mappings":";;;AACA,mCAA8B;AAC9B,gCAAiC;AAEpB,QAAA,iBAAiB,GAAG,eAAe,CAAA;AAEhD,MAAM,SAAS,GAAI;IACjB,iDAAiD;IACjD,yDAAyD;IACzD,qDAAqD;CACtD,CAAA;AACM,KAAK,UAAU,gBAAgB,CAAC,uBAA+B,EAAE,MAAuB,EAAE,KAAa,EAAE,UAAmB;IACjI,IAAI,GAAG,GAA0B,EAAE,CAAA;IAEnC,IAAI,uBAAuB,KAAK,yBAAiB,EAAE;QACjD,KAAK,MAAM,oBAAoB,IAAI,SAAS,EAAE;YAC5C,GAAG,CAAC,IAAI,CAAC,MAAM,eAAe,CAAC,oBAAoB,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAA;SACjF;KACF;SAAI;QACH,GAAG,CAAC,IAAI,CAAC,MAAM,eAAe,CAAC,uBAAuB,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAA;KACpF;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AAXD,4CAWC;AAEM,KAAK,UAAU,eAAe,CAAC,oBAA4B,EAAE,IAAqB,EAAE,KAAa,EAAE,UAAmB;IAC3H,MAAM,GAAG,GAAG,GAAG,oBAAoB,aAAa,CAAA;IAEhD,IAAI,UAAU,EAAE;QACb,IAAY,CAAC,UAAU,GAAG,IAAI,CAAA;KAChC;IAED,MAAM,GAAG,GAAG,MAAM,IAAA,cAAK,EAAC,GAAG,EAAE;QAC3B,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;QAC1B,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,aAAa,EAAE,KAAK;SACrB;KACF,CAAC,CAAA;IAGF,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,MAAM,GAAG,CAAC,IAAI,EAAoB,CAAA;AAC3C,CAAC;AAtBD,0CAsBC"}
|
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-8987120430.commit-d785dd9",
|
|
4
4
|
"description": "base component",
|
|
5
5
|
"bin": "dist/bin.js",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -44,5 +44,5 @@
|
|
|
44
44
|
"files": [
|
|
45
45
|
"dist"
|
|
46
46
|
],
|
|
47
|
-
"commit": "
|
|
47
|
+
"commit": "d785dd94d1a670b46f6f8b5b7c6f801376d2e62f"
|
|
48
48
|
}
|