@dcl/sdk-commands 7.29.1-34986384248.commit-bb45080 → 7.29.1-35039347300.commit-dffaede
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/start/index.js +6 -11
- package/dist/commands/start/index.js.map +1 -1
- package/dist/commands/start/multiplayer-server.d.ts +2 -2
- package/dist/commands/start/multiplayer-server.js +8 -6
- package/dist/commands/start/multiplayer-server.js.map +1 -1
- package/dist/commands/start/server/routes.d.ts +1 -1
- package/dist/commands/start/server/routes.js +2 -4
- package/dist/commands/start/server/routes.js.map +1 -1
- package/dist/logic/project-files.js +0 -2
- package/dist/logic/project-files.js.map +1 -1
- package/package.json +3 -3
- package/dist/commands/start/dcl-env.d.ts +0 -16
- package/dist/commands/start/dcl-env.js +0 -51
- package/dist/commands/start/dcl-env.js.map +0 -1
- package/dist/logic/lsd-realm.d.ts +0 -5
- package/dist/logic/lsd-realm.js +0 -28
- package/dist/logic/lsd-realm.js.map +0 -1
|
@@ -67,7 +67,6 @@ const project_validations_1 = require("../../logic/project-validations");
|
|
|
67
67
|
const explorer_alpha_1 = require("./explorer-alpha");
|
|
68
68
|
const utils_1 = require("./utils");
|
|
69
69
|
const multiplayer_server_1 = require("./multiplayer-server");
|
|
70
|
-
const dcl_env_1 = require("./dcl-env");
|
|
71
70
|
exports.args = (0, args_1.declareArgs)({
|
|
72
71
|
'--dir': String,
|
|
73
72
|
'--help': Boolean,
|
|
@@ -122,7 +121,7 @@ async function help(options) {
|
|
|
122
121
|
--web3 (deprecated) No effect. Kept for backwards compatibility
|
|
123
122
|
--skip-build Skip build and only serve the files in preview mode
|
|
124
123
|
--debug Enables Debug panel mode inside DCL Explorer (default=true)
|
|
125
|
-
--dclenv Decentraland Environment. Which environment to use for the content. This determines the catalyst server used, asset-bundles, etc
|
|
124
|
+
--dclenv Decentraland Environment. Which environment to use for the content. This determines the catalyst server used, asset-bundles, etc. Possible values: org, zone, today. (default=org)
|
|
126
125
|
--realm Realm used to serve the content. (default=Localhost)
|
|
127
126
|
--local-scene Enable local scene development.
|
|
128
127
|
--position Initial Position to start the explorer. (default=position defined at scene.json)
|
|
@@ -170,7 +169,6 @@ async function main(options) {
|
|
|
170
169
|
const skipServer = !!options.args['--no-server'];
|
|
171
170
|
const bevyWeb = !!options.args['--bevy-web'];
|
|
172
171
|
const isMobile = !!options.args['--mobile'];
|
|
173
|
-
const dclenv = options.args['--dclenv'] || 'org';
|
|
174
172
|
const explorerAlpha = !bevyWeb;
|
|
175
173
|
const workspace = await (0, workspace_validations_1.getValidWorkspace)(options.components, workingDirectory);
|
|
176
174
|
/* istanbul ignore if */
|
|
@@ -241,7 +239,7 @@ async function main(options) {
|
|
|
241
239
|
components.logger.error(e);
|
|
242
240
|
}
|
|
243
241
|
}
|
|
244
|
-
await (0, routes_1.wireRouter)(components, workspace, dataLayer
|
|
242
|
+
await (0, routes_1.wireRouter)(components, workspace, dataLayer);
|
|
245
243
|
if (watch) {
|
|
246
244
|
for (const project of workspace.projects) {
|
|
247
245
|
await (0, file_watch_notifier_1.wireFileWatcherToWebSockets)(components, project.workingDirectory, project.kind);
|
|
@@ -249,7 +247,7 @@ async function main(options) {
|
|
|
249
247
|
}
|
|
250
248
|
await startComponents();
|
|
251
249
|
const project = workspace.projects[0];
|
|
252
|
-
const multiplayerServerReady = project && !skipServer ? (0, multiplayer_server_1.spawnAuthServer)(components, project, `http://localhost:${port}
|
|
250
|
+
const multiplayerServerReady = project && !skipServer ? (0, multiplayer_server_1.spawnAuthServer)(components, project, `http://localhost:${port}`) : undefined;
|
|
253
251
|
const networkInterfaces = os.networkInterfaces();
|
|
254
252
|
const availableURLs = [];
|
|
255
253
|
(0, beautiful_logs_1.printProgressInfo)(options.components.logger, 'Preview server is now running!');
|
|
@@ -267,17 +265,14 @@ async function main(options) {
|
|
|
267
265
|
const sortedURLs = availableURLs.sort((a, _b) => {
|
|
268
266
|
return a.toLowerCase().includes('localhost') || a.includes('127.0.0.1') || a.includes('0.0.0.0') ? -1 : 1;
|
|
269
267
|
});
|
|
270
|
-
|
|
271
|
-
// it its pulse-server fallback — from its own host (see dcl-env.ts)
|
|
272
|
-
const bevyUrl = `${(0, dcl_env_1.webExplorerBaseUrl)(dclenv)}?preview=true&realm=${new URL(sortedURLs[0]).origin}` +
|
|
273
|
-
`&position=${baseCoords.x},${baseCoords.y}${(0, dcl_env_1.webExplorerEnvParams)(dclenv)}`;
|
|
268
|
+
const bevyUrl = `https://decentraland.org/bevy-web/?preview=true&realm=${new URL(sortedURLs[0]).origin}&position=${baseCoords.x},${baseCoords.y}`;
|
|
274
269
|
if (bevyWeb) {
|
|
275
270
|
components.logger.log('Available on:\n');
|
|
276
271
|
components.logger.log(` ${bevyUrl}`);
|
|
277
272
|
(0, beautiful_logs_1.printWarning)(components.logger, 'Chromium-based browsers require permission for websites to reach localhost (Local Network Access).\n' +
|
|
278
273
|
'When the browser asks to access apps on your device, click "Allow".\n' +
|
|
279
274
|
'If the scene never loads and no prompt appears, enable it manually and reload:\n' +
|
|
280
|
-
|
|
275
|
+
' chrome://settings/content/siteDetails?site=https%3A%2F%2Fdecentraland.org\n' +
|
|
281
276
|
' → "Apps on device" (Chrome 145+) or "Local network access" (Chrome 142-144) → Allow');
|
|
282
277
|
}
|
|
283
278
|
components.logger.log('\nPress CTRL+C to exit\n');
|
|
@@ -290,7 +285,7 @@ async function main(options) {
|
|
|
290
285
|
await (0, explorer_alpha_1.runExplorerAlpha)(components, { cwd: workingDirectory, realm, baseCoords, isHub, args: options.args });
|
|
291
286
|
}
|
|
292
287
|
if (isMobile && !skipClient && lanUrl) {
|
|
293
|
-
const deepLink = `decentraland://open?preview=${lanUrl}&position=${baseCoords.x},${baseCoords.y}
|
|
288
|
+
const deepLink = `decentraland://open?preview=${lanUrl}&position=${baseCoords.x},${baseCoords.y}`;
|
|
294
289
|
qrcode_1.default.toString(deepLink, { type: 'terminal', small: true }, (err, qr) => {
|
|
295
290
|
if (!err) {
|
|
296
291
|
components.logger.log(log_1.colors.bold('\nScan to preview on mobile: \n'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/start/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/start/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8EA,oBAiDC;AAED,oBAiLC;AAlTD,uCAAwB;AACxB,2CAA4B;AAC5B,4DAAmC;AACnC,oDAA2B;AAG3B,oCAAqC;AACrC,2CAA8C;AAC9C,qEAA6D;AAC7D,6DAAmD;AAEnD,4DAA2E;AAC3E,kEAA6D;AAC7D,oFAAwF;AACxF,+DAAwF;AACxF,oEAA0E;AAC1E,0DAAyE;AACzE,8CAAuD;AACvD,8CAAoE;AACpE,sEAA0E;AAC1E,4CAA4C;AAC5C,oCAA+C;AAC/C,6DAA8D;AAC9D,0CAA6D;AAC7D,8DAAwE;AACxE,6EAAqE;AACrE,+DAAyG;AAEzG,yEAAkE;AAClE,qDAAmD;AACnD,mCAAmC;AACnC,6DAA0E;AAO7D,QAAA,IAAI,GAAG,IAAA,kBAAW,EAAC;IAC9B,OAAO,EAAE,MAAM;IACf,QAAQ,EAAE,OAAO;IACjB,QAAQ,EAAE,MAAM;IAChB,YAAY,EAAE,OAAO;IACrB,cAAc,EAAE,OAAO;IACvB,YAAY,EAAE,OAAO;IACrB,MAAM,EAAE,OAAO;IACf,gBAAgB,EAAE,OAAO;IACzB,QAAQ,EAAE,OAAO;IACjB,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,YAAY;IAClB,IAAI,EAAE,cAAc;IACpB,IAAI,EAAE,YAAY;IAClB,cAAc,EAAE,OAAO;IACvB,cAAc,EAAE,OAAO;IACvB,kBAAkB,EAAE,OAAO;IAC3B,OAAO,EAAE,OAAO;IAChB,UAAU,EAAE,OAAO;IACnB,IAAI,EAAE,UAAU;IAChB,uCAAuC;IACvC,SAAS,EAAE,OAAO;IAClB,UAAU,EAAE,MAAM;IAClB,SAAS,EAAE,MAAM;IACjB,eAAe,EAAE,OAAO;IACxB,YAAY,EAAE,MAAM;IACpB,oBAAoB,EAAE,OAAO;IAC7B,6BAA6B,EAAE,OAAO;IACtC,IAAI,EAAE,OAAO;IACb,YAAY,EAAE,OAAO;IACrB,OAAO,EAAE,YAAY;IACrB,kBAAkB,EAAE,OAAO;IAC3B,iBAAiB,EAAE,OAAO;IAC1B,aAAa,EAAE,OAAO;IACtB,aAAa,EAAE,OAAO;IACtB,OAAO,EAAE,OAAO;IAChB,YAAY,EAAE,MAAM;CACrB,CAAC,CAAA;AAEK,KAAK,UAAU,IAAI,CAAC,OAAgB;IACzC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+C/B,CAAC,CAAA;AACF,CAAC;AAEM,KAAK,UAAU,IAAI,CAAC,OAAgB;IACzC,IAAI,UAAU,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAA;IAC/B,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,CAAA;IAClF,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,KAAK,CAAA;IAC5D,MAAM,WAAW,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAA;IAC1D,MAAM,KAAK,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;IAC3C,MAAM,KAAK,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IACzC,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;IAClD,MAAM,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACrC,MAAM,UAAU,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAChD,MAAM,UAAU,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAChD,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IAC5C,MAAM,QAAQ,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IAC3C,MAAM,aAAa,GAAG,CAAC,OAAO,CAAA;IAE9B,MAAM,SAAS,GAAG,MAAM,IAAA,yCAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAA;IAE/E,wBAAwB;IACxB,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC;QAC/B,IAAA,6BAAY,EAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,sDAAsD,CAAC,CAAA;IAEjG,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;QACzC,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,IAAI,OAAO,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;YAClE,IAAA,4CAA2B,EAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,CAAA;YAE1E,oEAAoE;YACpE,yEAAyE;YACzE,IAAI,KAAK,IAAI,KAAK,EAAE,CAAC;gBACnB,MAAM,IAAA,kBAAU,EAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,gBAAgB,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,CAAA;gBAC/G,MAAM,IAAA,sCAAgB,EAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;YACtE,CAAC;YAED,kBAAkB;YAClB,UAAU,GAAG,IAAA,iCAAa,EAAC,OAAO,CAAC,KAAK,CAAC,CAAA;YACzC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,iBAAiB,EAAE;gBACpD,WAAW,EAAE,MAAM,IAAA,kCAAkB,EAAC,OAAO,CAAC,gBAAgB,CAAC;gBAC/D,MAAM,EAAE,UAAU;gBAClB,WAAW,EAAE,KAAK;gBAClB,oBAAoB,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB;aAC3D,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,IAAA,kCAAiB,EAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAA;IAEvE,MAAM,IAAI,GAAG,MAAM,IAAA,uBAAO,EAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;IACvD,MAAM,OAAO,GAAG,MAAM,sBAAS,CAAC,GAAG,CAAoB;QACrD,KAAK,CAAC,cAAc;YAClB,MAAM,OAAO,GAAG,IAAA,oCAA0B,EAAC,oBAAY,CAAC,CAAA;YACxD,MAAM,MAAM,GAAG,IAAA,iDAA2B,EAAC;gBACzC,gBAAgB,EAAE,IAAI,CAAC,QAAQ,EAAE;gBACjC,gBAAgB,EAAE,SAAS;gBAC3B,uEAAuE;gBACvE,wEAAwE;gBACxE,SAAS,EAAE,MAAM;gBACjB,GAAG,OAAO,CAAC,GAAG;aACf,CAAC,CAAA;YACF,MAAM,IAAI,GAAG,MAAM,IAAA,kCAAyB,EAAC,EAAE,MAAM,EAAE,CAAC,CAAA;YACxD,MAAM,EAAE,GAAG,MAAM,IAAA,sBAAiB,EAAC,EAAE,IAAI,EAAE,CAAC,CAAA;YAC5C,MAAM,MAAM,GAAG,MAAM,IAAA,mCAAqB,EAAoB,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;YACxG,MAAM,KAAK,GAAG,MAAM,IAAA,4BAAoB,EAAC;gBACvC,OAAO;gBACP,IAAI;gBACJ,MAAM;aACP,CAAC,CAAA;YAEF,MAAM,QAAQ,GAAG,IAAA,uCAAyB,GAAE,CAAA;YAE5C,OAAO;gBACL,GAAG,OAAO,CAAC,UAAU;gBACrB,MAAM,EAAE,IAAA,2BAAqB,GAAE;gBAC/B,IAAI;gBACJ,gBAAgB,EAAE,sBAAgB;gBAClC,KAAK;gBACL,MAAM;gBACN,OAAO;gBACP,MAAM;gBACN,EAAE;gBACF,QAAQ;aACT,CAAA;QACH,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,eAAe,EAAE;YACxC,IAAI,SAAgC,CAAA;YACpC,IAAI,aAAa,EAAE,CAAC;gBAClB,IAAI,CAAC;oBACH,MAAM,iBAAiB,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,gBAAgB,IAAI,gBAAgB,CAAA;oBACrF,SAAS,GAAG,MAAM,IAAA,qBAAe,EAAC,UAAU,EAAE,iBAAiB,CAAC,CAAA;gBAClE,CAAC;gBAAC,OAAO,CAAU,EAAE,CAAC;oBACpB,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAU,CAAC,CAAA;gBACrC,CAAC;YACH,CAAC;YAED,MAAM,IAAA,mBAAU,EAAC,UAAU,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;YAClD,IAAI,KAAK,EAAE,CAAC;gBACV,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;oBACzC,MAAM,IAAA,iDAA2B,EAAC,UAAU,EAAE,OAAO,CAAC,gBAAgB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;gBACvF,CAAC;YACH,CAAC;YACD,MAAM,eAAe,EAAE,CAAA;YAEvB,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;YACrC,MAAM,sBAAsB,GAC1B,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,oCAAe,EAAC,UAAU,EAAE,OAAO,EAAE,oBAAoB,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YAEvG,MAAM,iBAAiB,GAAG,EAAE,CAAC,iBAAiB,EAAE,CAAA;YAChD,MAAM,aAAa,GAAa,EAAE,CAAA;YAElC,IAAA,kCAAiB,EAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,gCAAgC,CAAC,CAAA;YAE9E,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC7C,CAAC;gBAAA,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;oBAClD,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;wBAC9B,aAAa,CAAC,IAAI,CAAC,UAAU,OAAO,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC,CAAA;oBACzD,CAAC;gBACH,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;YAEF,6CAA6C;YAC7C,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,IAAI,CAAC,CAAA;YAE9B,sCAAsC;YACtC,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE;gBAC9C,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAC3G,CAAC,CAAC,CAAA;YACF,MAAM,OAAO,GAAG,yDACd,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,MACzB,aAAa,UAAU,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,EAAE,CAAA;YAC3C,IAAI,OAAO,EAAE,CAAC;gBACZ,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;gBACxC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,OAAO,EAAE,CAAC,CAAA;gBACvC,IAAA,6BAAY,EACV,UAAU,CAAC,MAAM,EACjB,sGAAsG;oBACpG,uEAAuE;oBACvE,kFAAkF;oBAClF,+EAA+E;oBAC/E,uFAAuF,CAC1F,CAAA;YACH,CAAC;YACD,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;YAEjD,MAAM,cAAc,GAAG,CAAC,UAAU,IAAI,CAAC,QAAQ,IAAI,CAAC,aAAa,IAAI,WAAW,CAAC,CAAA;YACjF,IAAI,sBAAsB,IAAI,cAAc,EAAE,CAAC;gBAC7C,MAAM,IAAA,uCAAkB,EAAC,UAAU,EAAE,sBAAsB,CAAC,CAAA;YAC9D,CAAC;YAED,IAAI,aAAa,IAAI,CAAC,QAAQ,IAAI,CAAC,UAAU,EAAE,CAAC;gBAC9C,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;gBAC3C,MAAM,IAAA,iCAAgB,EAAC,UAAU,EAAE,EAAE,GAAG,EAAE,gBAAgB,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;YAC7G,CAAC;YAED,IAAI,QAAQ,IAAI,CAAC,UAAU,IAAI,MAAM,EAAE,CAAC;gBACtC,MAAM,QAAQ,GAAG,+BAA+B,MAAM,aAAa,UAAU,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,EAAE,CAAA;gBACjG,gBAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE;oBACvE,IAAI,CAAC,GAAG,EAAE,CAAC;wBACT,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,YAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC,CAAA;wBACrE,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;wBACzB,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,QAAQ,iBAAiB,CAAC,CAAA;oBAC1E,CAAC;gBACH,CAAC,CAAC,CAAA;YACJ,CAAC;YAED,IAAI,OAAO,IAAI,WAAW,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;gBAC/D,IAAI,CAAC;oBACH,MAAM,IAAA,cAAI,EAAC,OAAO,CAAC,CAAA;gBACrB,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAA;gBACjE,CAAC;YACH,CAAC;YACD,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;QACnD,CAAC;KACF,CAAC,CAAA;IAEF,mEAAmE;IACnE,8EAA8E;IAC9E,UAAU;IACV,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAA;AACjD,CAAC"}
|
|
@@ -11,7 +11,7 @@ export type MultiplayerServer = {
|
|
|
11
11
|
/**
|
|
12
12
|
* Starts the Multiplayer Server process using npx to install and run in one step
|
|
13
13
|
*/
|
|
14
|
-
export declare function startMultiplayerServer(components: Pick<CliComponents, 'logger' | 'analytics'>, workingDir: string, realm: string, engine?: ServerEngine,
|
|
14
|
+
export declare function startMultiplayerServer(components: Pick<CliComponents, 'logger' | 'analytics'>, workingDir: string, realm: string, engine?: ServerEngine, position?: {
|
|
15
15
|
x: number;
|
|
16
16
|
y: number;
|
|
17
17
|
}): MultiplayerServer;
|
|
@@ -31,5 +31,5 @@ export declare function waitForServerReady(components: Pick<CliComponents, 'logg
|
|
|
31
31
|
* @param realm - The realm URL to pass to the server
|
|
32
32
|
* @returns The readiness promise, or undefined when the server could not be spawned
|
|
33
33
|
*/
|
|
34
|
-
export declare function spawnAuthServer(components: PreviewComponents, project: ProjectUnion, realm: string
|
|
34
|
+
export declare function spawnAuthServer(components: PreviewComponents, project: ProjectUnion, realm: string): Promise<boolean> | undefined;
|
|
35
35
|
export {};
|
|
@@ -9,11 +9,13 @@ const log_1 = require("../../components/log");
|
|
|
9
9
|
const utils_1 = require("./utils");
|
|
10
10
|
const scene_validations_1 = require("../../logic/scene-validations");
|
|
11
11
|
const future_1 = require("../../logic/future");
|
|
12
|
-
const dcl_env_1 = require("./dcl-env");
|
|
13
12
|
const HAMMURABI_PACKAGE = '@dcl/hammurabi-server';
|
|
14
13
|
const HAMMURABI_VERSION = 'next';
|
|
15
14
|
const BEVY_PACKAGE = '@dcl-regenesislabs/bevy-headless-server';
|
|
16
|
-
|
|
15
|
+
// `latest` moves only when someone dispatches bevy-explorer's publish-headless
|
|
16
|
+
// workflow with dist_tag=latest — engine pushes to main land on `next` and cannot
|
|
17
|
+
// change what previews run. DCL_SERVER_PACKAGE overrides for local builds.
|
|
18
|
+
const BEVY_VERSION = 'latest';
|
|
17
19
|
const EXIT_UNAVAILABLE = 78;
|
|
18
20
|
const CMD_METACHARACTERS = /[&|<>^%"!\r\n]/;
|
|
19
21
|
const DEFAULT_ENGINE = 'bevy';
|
|
@@ -112,10 +114,10 @@ function forwardEngineLogs(source, sink) {
|
|
|
112
114
|
/**
|
|
113
115
|
* Starts the Multiplayer Server process using npx to install and run in one step
|
|
114
116
|
*/
|
|
115
|
-
function startMultiplayerServer(components, workingDir, realm, engine = DEFAULT_ENGINE,
|
|
117
|
+
function startMultiplayerServer(components, workingDir, realm, engine = DEFAULT_ENGINE, position) {
|
|
116
118
|
const pkg = packageSpec(engine);
|
|
117
119
|
(0, beautiful_logs_1.printProgressInfo)(components.logger, `Starting ${log_1.colors.bold('Multiplayer Server')} (${engine}) with realm: ${log_1.colors.bold(realm)}`);
|
|
118
|
-
const npxArgs = ['--yes', pkg, `--realm=${realm}
|
|
120
|
+
const npxArgs = ['--yes', pkg, `--realm=${realm}`];
|
|
119
121
|
if (position)
|
|
120
122
|
npxArgs.push(`--position=${position.x},${position.y}`);
|
|
121
123
|
const npxCliJs = (0, utils_1.findNpxCliJs)();
|
|
@@ -212,10 +214,10 @@ async function waitForServerReady(components, ready, timeoutMs = SERVER_READY_TI
|
|
|
212
214
|
* @param realm - The realm URL to pass to the server
|
|
213
215
|
* @returns The readiness promise, or undefined when the server could not be spawned
|
|
214
216
|
*/
|
|
215
|
-
function spawnAuthServer(components, project, realm
|
|
217
|
+
function spawnAuthServer(components, project, realm) {
|
|
216
218
|
const engine = selectedEngine();
|
|
217
219
|
try {
|
|
218
|
-
const server = startMultiplayerServer(components, project.workingDirectory, realm, engine,
|
|
220
|
+
const server = startMultiplayerServer(components, project.workingDirectory, realm, engine, (0, scene_validations_1.getBaseCoords)(project.scene));
|
|
219
221
|
void components.signaler.programClosed
|
|
220
222
|
.then(() => {
|
|
221
223
|
if (!server.child.killed)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multiplayer-server.js","sourceRoot":"","sources":["../../../src/commands/start/multiplayer-server.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"multiplayer-server.js","sourceRoot":"","sources":["../../../src/commands/start/multiplayer-server.ts"],"names":[],"mappings":";;AAkIA,wDA+FC;AAGD,gDAqBC;AAgBD,0CAqCC;AA9SD,iDAAiE;AAGjE,+DAA4E;AAC5E,8CAA6C;AAG7C,mCAAsF;AACtF,qEAA6D;AAC7D,+CAA2C;AAE3C,MAAM,iBAAiB,GAAG,uBAAuB,CAAA;AACjD,MAAM,iBAAiB,GAAG,MAAM,CAAA;AAEhC,MAAM,YAAY,GAAG,yCAAyC,CAAA;AAC9D,+EAA+E;AAC/E,kFAAkF;AAClF,2EAA2E;AAC3E,MAAM,YAAY,GAAG,QAAQ,CAAA;AAE7B,MAAM,gBAAgB,GAAG,EAAE,CAAA;AAI3B,MAAM,kBAAkB,GAAG,gBAAgB,CAAA;AAE3C,MAAM,cAAc,GAAiB,MAAM,CAAA;AAE3C,SAAS,cAAc;IACrB,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAA;IAC/C,OAAO,SAAS,KAAK,MAAM,IAAI,SAAS,KAAK,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAA;AACvF,CAAC;AAED;;;GAGG;AACH,SAAS,WAAW,CAAC,MAAoB;IACvC,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAA;IAC/C,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAA;IAC7B,OAAO,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,GAAG,YAAY,IAAI,YAAY,EAAE,CAAC,CAAC,CAAC,GAAG,iBAAiB,IAAI,iBAAiB,EAAE,CAAA;AAC5G,CAAC;AAED;;;GAGG;AACH,SAAS,sBAAsB,CAAC,OAAmB;IACjD,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IAC9B,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IAC7B,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAE3B,OAAO,GAAG,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QAC/B,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAC9B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B,CAAC,CAAA;AACH,CAAC;AAED,MAAM,cAAc,GAAG,2FAA2F,CAAA;AAClH,MAAM,cAAc,GAAG,sBAAsB,CAAA;AAC7C,MAAM,qBAAqB,GAAG,IAAK,CAAA;AACnC,MAAM,uBAAuB,GAAG,KAAM,CAAA;AACtC,MAAM,UAAU,GAAG,mBAAmB,CAAA;AAEtC,MAAM,YAAY,GAAG;IACnB,yBAAyB;IACzB,yBAAyB;IACzB,gEAAgE;IAChE,yEAAyE;CAC1E,CAAA;AAED,MAAM,aAAa,GAAG,iCAAiC,CAAA;AAEvD,SAAS,YAAY,CAAC,KAAyB,EAAE,OAAe;IAC9D,IAAI,KAAK,KAAK,MAAM;QAAE,OAAO,YAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACnD,IAAI,KAAK,KAAK,OAAO;QAAE,OAAO,YAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;IACvD,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,SAAS,SAAS,CAAC,YAAoB;IACrC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC,CAAA;IACzC,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAM,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CAAA;AACvF,CAAC;AAED,kGAAkG;AAClG,SAAS,iBAAiB,CAAC,MAAuB,EAAE,IAAwB;IAC1E,IAAI,CAAC,MAAM;QAAE,OAAM;IACnB,MAAM,SAAS,GAAG,YAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,GAAG,CAAA;IACtD,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE;QACjC,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAA;QACxC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YAAE,OAAM;QACxB,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,OAAM;QACrC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;QACxC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,CAAA;YACjE,OAAM;QACR,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;QAC3C,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAAE,OAAM;QACjE,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAA;YACvD,MAAM,QAAQ,GAAG,YAAY,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAA;YAC/D,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,CAAA;YAC7E,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;QACxF,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAAA;QACtF,CAAC;IACH,CAAC,CAAA;IACD,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;IAC1B,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;QAClC,MAAM,KAAK,GAAG,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAC3C,OAAO,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAA;QAC3B,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IAC3B,CAAC,CAAC,CAAA;IACF,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;QACpB,IAAI,OAAO;YAAE,UAAU,CAAC,OAAO,CAAC,CAAA;IAClC,CAAC,CAAC,CAAA;AACJ,CAAC;AAQD;;GAEG;AACH,SAAgB,sBAAsB,CACpC,UAAuD,EACvD,UAAkB,EAClB,KAAa,EACb,SAAuB,cAAc,EACrC,QAAmC;IAEnC,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,CAAA;IAE/B,IAAA,kCAAiB,EACf,UAAU,CAAC,MAAM,EACjB,YAAY,YAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,MAAM,iBAAiB,YAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAC9F,CAAA;IAED,MAAM,OAAO,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,WAAW,KAAK,EAAE,CAAC,CAAA;IAClD,IAAI,QAAQ;QAAE,OAAO,CAAC,IAAI,CAAC,cAAc,QAAQ,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAA;IACpE,MAAM,QAAQ,GAAG,IAAA,oBAAY,GAAE,CAAA;IAC/B,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,kBAAU,GAAE,CAAA;IAC9C,IAAI,CAAC,QAAQ,IAAI,CAAC,OAAO,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAA;IAC5E,CAAC;IACD,MAAM,QAAQ,GAAG,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAA;IAC1D,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;QAClE,IAAI,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,uDAAuD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC5G,IAAA,6BAAY,EACV,UAAU,CAAC,MAAM,EACjB,gCAAgC,OAAO,CAAC,QAAQ,gCAAgC,OAAO,oBAAoB,CAC5G,CAAA;IACH,CAAC;IAED,MAAM,GAAG,GAA8B,IAAA,6BAAqB,GAAE;QAC5D,CAAC,CAAC,EAAE,GAAG,IAAA,mBAAW,GAAE,EAAE,iBAAiB,EAAE,UAAU,EAAE;QACrD,CAAC,CAAC,EAAE,GAAG,IAAA,mBAAW,GAAE,EAAE,CAAA;IAExB,IAAI,MAAM,KAAK,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;QACvC,GAAG,CAAC,QAAQ,GAAG,0CAA0C,CAAA;IAC3D,CAAC;IAED,MAAM,KAAK,GAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;IAEvD,MAAM,aAAa,GAAG,QAAQ;QAC5B,CAAC,CAAC,IAAA,qBAAK,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;QAChG,CAAC,CAAC,IAAA,qBAAK,EAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,OAAQ,GAAG,CAAC,CAAC,CAAC,OAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE;YAClG,GAAG,EAAE,UAAU;YACf,KAAK,EAAE,QAAQ;YACf,KAAK;YACL,GAAG;SACJ,CAAC,CAAA;IAEN,iBAAiB,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;IACvD,iBAAiB,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;IAEvD,MAAM,KAAK,GAAG,IAAA,eAAM,GAAW,CAAA;IAC/B,IAAI,UAAsC,CAAA;IAE1C,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;QAC7B,UAAU,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,qBAAqB,CAAC,CAAA;IAC3E,CAAC,CAAC,CAAA;IAEF,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QAClC,YAAY,CAAC,UAAU,CAAC,CAAA;QACxB,IAAA,6BAAY,EAAC,UAAU,CAAC,MAAM,EAAE,qCAAqC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;QACrF,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACtB,CAAC,CAAC,CAAA;IAEF,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;YAC1B,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAC/B,CAAC;IACH,CAAC,CAAA;IAED,MAAM,aAAa,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAA;IAErD,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;QACzC,aAAa,EAAE,CAAA;QACf,YAAY,CAAC,UAAU,CAAC,CAAA;QACxB,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACpB,IAAI,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAChC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,2BAA2B,EAAE;gBACtD,MAAM;gBACN,QAAQ,EAAE,IAAI;gBACd,WAAW,EAAE,IAAI,KAAK,gBAAgB;aACvC,CAAC,CAAA;YACF,IAAA,6BAAY,EACV,UAAU,CAAC,MAAM,EACjB,uCAAuC,IAAI,0CAA0C;gBACnF,6GAA6G,CAChH,CAAA;QACH,CAAC;aAAM,IAAI,MAAM,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;YACjE,IAAA,6BAAY,EAAC,UAAU,CAAC,MAAM,EAAE,2CAA2C,MAAM,EAAE,CAAC,CAAA;QACtF,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,CAAA;AACxC,CAAC;AAED,kEAAkE;AAC3D,KAAK,UAAU,kBAAkB,CACtC,UAAyC,EACzC,KAAuB,EACvB,YAAoB,uBAAuB;IAE3C,IAAA,kCAAiB,EAAC,UAAU,CAAC,MAAM,EAAE,gDAAgD,CAAC,CAAA;IACtF,IAAI,KAAiC,CAAA;IACrC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAY,CAAC,OAAO,EAAE,EAAE;QACjD,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,CAAA;IACzD,CAAC,CAAC,CAAA;IACF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAA;IACnD,YAAY,CAAC,KAAK,CAAC,CAAA;IACnB,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QACpB,IAAA,kCAAiB,EAAC,UAAU,CAAC,MAAM,EAAE,GAAG,YAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAA;QACrF,OAAM;IACR,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,sBAAsB,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,gBAAgB,CAAA;IAClG,IAAA,6BAAY,EACV,UAAU,CAAC,MAAM,EACjB,sBAAsB,MAAM,uFAAuF,CACpH,CAAA;AACH,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,SAAgB,eAAe,CAC7B,UAA6B,EAC7B,OAAqB,EACrB,KAAa;IAEb,MAAM,MAAM,GAAG,cAAc,EAAE,CAAA;IAC/B,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,sBAAsB,CACnC,UAAU,EACV,OAAO,CAAC,gBAAgB,EACxB,KAAK,EACL,MAAM,EACN,IAAA,iCAAa,EAAC,OAAO,CAAC,KAAK,CAAC,CAC7B,CAAA;QACD,KAAK,UAAU,CAAC,QAAQ,CAAC,aAAa;aACnC,IAAI,CAAC,GAAG,EAAE;YACT,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM;gBAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QACxD,CAAC,CAAC;aACD,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;QAClB,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;YACtB,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;gBAChC,IAAI,IAAI,KAAK,gBAAgB;oBAAE,OAAM;gBACrC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAA;gBAC7B,MAAM,CAAC,KAAK,CACV,gCAAgC,WAAW,CAAC,MAAM,CAAC,+BAA+B;oBAChF,SAAS,gBAAgB,8CAA8C,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,IAAI,CAC9G,CAAA;gBACD,MAAM,CAAC,KAAK,CAAC,uDAAuD,CAAC,CAAA;gBACrE,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAA;gBACvD,KAAK,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAA;YAChF,CAAC,CAAC,CAAA;QACJ,CAAC;QACD,OAAO,MAAM,CAAC,KAAK,CAAA;IACrB,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,IAAA,6BAAY,EAAC,UAAU,CAAC,MAAM,EAAE,uCAAuC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;QACvF,OAAO,SAAS,CAAA;IAClB,CAAC;AACH,CAAC"}
|
|
@@ -3,4 +3,4 @@ import { Workspace } from '../../../logic/workspace-validations';
|
|
|
3
3
|
import { DataLayer } from '../data-layer/rpc';
|
|
4
4
|
import { PreviewComponents } from '../types';
|
|
5
5
|
export declare const sceneUpdateClients: Set<WebSocket>;
|
|
6
|
-
export declare function wireRouter(components: PreviewComponents, workspace: Workspace, dataLayer?: DataLayer
|
|
6
|
+
export declare function wireRouter(components: PreviewComponents, workspace: Workspace, dataLayer?: DataLayer): Promise<void>;
|
|
@@ -13,9 +13,8 @@ const endpoints_1 = require("./endpoints");
|
|
|
13
13
|
const storage_service_1 = require("./storage-service");
|
|
14
14
|
const realm_1 = require("./realm");
|
|
15
15
|
const utils_1 = require("../utils");
|
|
16
|
-
const dcl_env_1 = require("../dcl-env");
|
|
17
16
|
exports.sceneUpdateClients = new Set();
|
|
18
|
-
async function wireRouter(components, workspace, dataLayer
|
|
17
|
+
async function wireRouter(components, workspace, dataLayer) {
|
|
19
18
|
const router = new http_server_1.Router();
|
|
20
19
|
if (dataLayer) {
|
|
21
20
|
router.get('/data-layer', async (ctx, next) => {
|
|
@@ -48,8 +47,7 @@ async function wireRouter(components, workspace, dataLayer, dclenv = 'org') {
|
|
|
48
47
|
};
|
|
49
48
|
}
|
|
50
49
|
const [x, y] = baseParcel.split(',');
|
|
51
|
-
|
|
52
|
-
const deepLink = `decentraland://open?preview=${lanUrl}&position=${x},${y}${(0, dcl_env_1.lsdDeepLinkPulseParams)(workspace.projects[0].workingDirectory, dclenv)}`;
|
|
50
|
+
const deepLink = `decentraland://open?preview=${lanUrl}&position=${x},${y}`;
|
|
53
51
|
const qrDataUrl = await qrcode_1.default.toDataURL(deepLink);
|
|
54
52
|
return {
|
|
55
53
|
headers: { 'content-type': 'application/json' },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../../src/commands/start/server/routes.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../../src/commands/start/server/routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -122,8 +122,6 @@ async function getProjectPublishableFilesWithHashes(components, projectRoot, has
|
|
|
122
122
|
});
|
|
123
123
|
}
|
|
124
124
|
exports.machineId = os_1.default.hostname() || os_1.default.userInfo().username;
|
|
125
|
-
// Preview entity ids, and the base of the LSD Pulse realm key that explorers
|
|
126
|
-
// derive independently. See docs/lsd-identity-and-pulse-realm.md before changing.
|
|
127
125
|
const b64HashingFunction = (str) => {
|
|
128
126
|
const unique = `${str}-${exports.machineId}`;
|
|
129
127
|
return 'b64-' + Buffer.from(unique).toString('base64');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-files.js","sourceRoot":"","sources":["../../src/logic/project-files.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqBA,kDAkBC;AAOD,sEAMC;AAMD,sEAOC;AASD,oFA+BC;
|
|
1
|
+
{"version":3,"file":"project-files.js","sourceRoot":"","sources":["../../src/logic/project-files.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dcl/sdk-commands",
|
|
3
3
|
"description": "",
|
|
4
|
-
"version": "7.29.1-
|
|
4
|
+
"version": "7.29.1-35039347300.commit-dffaede",
|
|
5
5
|
"author": "Decentraland",
|
|
6
6
|
"bin": {
|
|
7
7
|
"sdk-commands": "./dist/index.js"
|
|
8
8
|
},
|
|
9
9
|
"dependencies": {
|
|
10
10
|
"@dcl/crypto": "^3.4.4",
|
|
11
|
-
"@dcl/ecs": "7.29.1-
|
|
11
|
+
"@dcl/ecs": "7.29.1-35039347300.commit-dffaede",
|
|
12
12
|
"@dcl/gltf-validator-ts": "1.0.14",
|
|
13
13
|
"@dcl/hashing": "1.1.3",
|
|
14
14
|
"@dcl/inspector": "7.36.3",
|
|
@@ -74,5 +74,5 @@
|
|
|
74
74
|
"displayName": "SDK",
|
|
75
75
|
"tsconfig": "./tsconfig.json"
|
|
76
76
|
},
|
|
77
|
-
"commit": "
|
|
77
|
+
"commit": "dffaede67b4ff56bdfc4af6e6d5d729ee1308767"
|
|
78
78
|
}
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
export declare function webExplorerBaseUrl(dclenv: string): string;
|
|
2
|
-
/** Extra query params for the web client under a non-default environment. */
|
|
3
|
-
export declare function webExplorerEnvParams(dclenv: string): string;
|
|
4
|
-
/**
|
|
5
|
-
* Environment args for the locally-spawned engine. `--base-domain` re-points every backend
|
|
6
|
-
* host the engine composes, Pulse included; the gatekeeper pin is the temporary exception.
|
|
7
|
-
*/
|
|
8
|
-
export declare function engineEnvArgs(dclenv: string): string[];
|
|
9
|
-
/** Pulse endpoint for deep-linked native clients (ENet); undefined = the client's default. */
|
|
10
|
-
export declare function pulseServerNative(dclenv: string): string | undefined;
|
|
11
|
-
/**
|
|
12
|
-
* Pulse params for the mobile preview deep link: the LSD realm key — stated explicitly so a
|
|
13
|
-
* phone-side explorer can join the partition without re-deriving it — plus the environment's
|
|
14
|
-
* Pulse endpoint when it is not the production default.
|
|
15
|
-
*/
|
|
16
|
-
export declare function lsdDeepLinkPulseParams(projectRoot: string, dclenv: string): string;
|
|
@@ -1,51 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.webExplorerBaseUrl = webExplorerBaseUrl;
|
|
4
|
-
exports.webExplorerEnvParams = webExplorerEnvParams;
|
|
5
|
-
exports.engineEnvArgs = engineEnvArgs;
|
|
6
|
-
exports.pulseServerNative = pulseServerNative;
|
|
7
|
-
exports.lsdDeepLinkPulseParams = lsdDeepLinkPulseParams;
|
|
8
|
-
// Everything `--dclenv` selects for the preview lives here. The default (org) needs no
|
|
9
|
-
// overrides. Zone runs its OWN Pulse server with identical realm names, so a zone preview
|
|
10
|
-
// must land every party on it: the zone-hosted web client and a --base-domain zone engine
|
|
11
|
-
// derive `pulse-server.decentraland.zone` themselves (bevy-explorer#1224); only parties
|
|
12
|
-
// with no zone base domain — native clients launched by deep link — need it stated.
|
|
13
|
-
const lsd_realm_1 = require("../../logic/lsd-realm");
|
|
14
|
-
function webExplorerBaseUrl(dclenv) {
|
|
15
|
-
// bevy-web is deployed on decentraland.org and decentraland.zone only; the zone page
|
|
16
|
-
// resolves its base domain from its own host, which re-points its Pulse fallback too
|
|
17
|
-
return `https://decentraland.${dclenv === 'zone' ? 'zone' : 'org'}/bevy-web/`;
|
|
18
|
-
}
|
|
19
|
-
// TEMPORARY: the preview gatekeeper has no zone deployment yet, so zone launches pin that
|
|
20
|
-
// one service back to org — server and web client alike — or scene-room minting fails.
|
|
21
|
-
// Drop both pins once comms-gatekeeper-local is deployed on zone.
|
|
22
|
-
const ORG_PREVIEW_GATEKEEPER = 'https://comms-gatekeeper-local.decentraland.org';
|
|
23
|
-
/** Extra query params for the web client under a non-default environment. */
|
|
24
|
-
function webExplorerEnvParams(dclenv) {
|
|
25
|
-
if (dclenv !== 'zone')
|
|
26
|
-
return '';
|
|
27
|
-
return `&previewGatekeeper=${encodeURIComponent(ORG_PREVIEW_GATEKEEPER)}`;
|
|
28
|
-
}
|
|
29
|
-
/**
|
|
30
|
-
* Environment args for the locally-spawned engine. `--base-domain` re-points every backend
|
|
31
|
-
* host the engine composes, Pulse included; the gatekeeper pin is the temporary exception.
|
|
32
|
-
*/
|
|
33
|
-
function engineEnvArgs(dclenv) {
|
|
34
|
-
if (dclenv !== 'zone')
|
|
35
|
-
return [];
|
|
36
|
-
return ['--base-domain=decentraland.zone', `--preview-gatekeeper=${ORG_PREVIEW_GATEKEEPER}`];
|
|
37
|
-
}
|
|
38
|
-
/** Pulse endpoint for deep-linked native clients (ENet); undefined = the client's default. */
|
|
39
|
-
function pulseServerNative(dclenv) {
|
|
40
|
-
return dclenv === 'zone' ? 'pulse-server.decentraland.zone:7777' : undefined;
|
|
41
|
-
}
|
|
42
|
-
/**
|
|
43
|
-
* Pulse params for the mobile preview deep link: the LSD realm key — stated explicitly so a
|
|
44
|
-
* phone-side explorer can join the partition without re-deriving it — plus the environment's
|
|
45
|
-
* Pulse endpoint when it is not the production default.
|
|
46
|
-
*/
|
|
47
|
-
function lsdDeepLinkPulseParams(projectRoot, dclenv) {
|
|
48
|
-
const server = pulseServerNative(dclenv);
|
|
49
|
-
return `&pulse-realm=${encodeURIComponent((0, lsd_realm_1.lsdRealmKey)(projectRoot))}` + (server ? `&pulse-server=${server}` : '');
|
|
50
|
-
}
|
|
51
|
-
//# sourceMappingURL=dcl-env.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"dcl-env.js","sourceRoot":"","sources":["../../../src/commands/start/dcl-env.ts"],"names":[],"mappings":";;AAOA,gDAIC;AAQD,oDAGC;AAMD,sCAGC;AAGD,8CAEC;AAOD,wDAGC;AA9CD,uFAAuF;AACvF,0FAA0F;AAC1F,0FAA0F;AAC1F,wFAAwF;AACxF,oFAAoF;AACpF,qDAAmD;AAEnD,SAAgB,kBAAkB,CAAC,MAAc;IAC/C,qFAAqF;IACrF,qFAAqF;IACrF,OAAO,wBAAwB,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,YAAY,CAAA;AAC/E,CAAC;AAED,0FAA0F;AAC1F,uFAAuF;AACvF,kEAAkE;AAClE,MAAM,sBAAsB,GAAG,iDAAiD,CAAA;AAEhF,6EAA6E;AAC7E,SAAgB,oBAAoB,CAAC,MAAc;IACjD,IAAI,MAAM,KAAK,MAAM;QAAE,OAAO,EAAE,CAAA;IAChC,OAAO,sBAAsB,kBAAkB,CAAC,sBAAsB,CAAC,EAAE,CAAA;AAC3E,CAAC;AAED;;;GAGG;AACH,SAAgB,aAAa,CAAC,MAAc;IAC1C,IAAI,MAAM,KAAK,MAAM;QAAE,OAAO,EAAE,CAAA;IAChC,OAAO,CAAC,iCAAiC,EAAE,wBAAwB,sBAAsB,EAAE,CAAC,CAAA;AAC9F,CAAC;AAED,8FAA8F;AAC9F,SAAgB,iBAAiB,CAAC,MAAc;IAC9C,OAAO,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,qCAAqC,CAAC,CAAC,CAAC,SAAS,CAAA;AAC9E,CAAC;AAED;;;;GAIG;AACH,SAAgB,sBAAsB,CAAC,WAAmB,EAAE,MAAc;IACxE,MAAM,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAA;IACxC,OAAO,gBAAgB,kBAAkB,CAAC,IAAA,uBAAW,EAAC,WAAW,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,iBAAiB,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;AACnH,CAAC"}
|
|
@@ -1,5 +0,0 @@
|
|
|
1
|
-
/** Pulse's `MaxRealmLength`. */
|
|
2
|
-
export declare const PULSE_MAX_REALM_LENGTH = 255;
|
|
3
|
-
/** The scene entity id the preview server already serves, reused verbatim. */
|
|
4
|
-
export declare function lsdPreviewSceneId(projectRoot: string): string;
|
|
5
|
-
export declare function lsdRealmKey(projectRoot: string): string;
|
package/dist/logic/lsd-realm.js
DELETED
|
@@ -1,28 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.PULSE_MAX_REALM_LENGTH = void 0;
|
|
4
|
-
exports.lsdPreviewSceneId = lsdPreviewSceneId;
|
|
5
|
-
exports.lsdRealmKey = lsdRealmKey;
|
|
6
|
-
// Local Scene Development identity and the Pulse realm key.
|
|
7
|
-
// Pulse matches realms by exact string and nothing is exchanged, so a derivation
|
|
8
|
-
// that drifts is invisible: peers just never see each other.
|
|
9
|
-
// Contract and caveats: docs/lsd-identity-and-pulse-realm.md
|
|
10
|
-
const crypto_1 = require("crypto");
|
|
11
|
-
const project_files_1 = require("./project-files");
|
|
12
|
-
/** Pulse's `MaxRealmLength`. */
|
|
13
|
-
exports.PULSE_MAX_REALM_LENGTH = 255;
|
|
14
|
-
const LSD_REALM_PREFIX = 'lsd:';
|
|
15
|
-
const LSD_REALM_HASHED_PREFIX = 'lsd:sha256:';
|
|
16
|
-
/** The scene entity id the preview server already serves, reused verbatim. */
|
|
17
|
-
function lsdPreviewSceneId(projectRoot) {
|
|
18
|
-
return (0, project_files_1.b64HashingFunction)(projectRoot);
|
|
19
|
-
}
|
|
20
|
-
function lsdRealmKey(projectRoot) {
|
|
21
|
-
const previewSceneId = lsdPreviewSceneId(projectRoot);
|
|
22
|
-
const realmKey = LSD_REALM_PREFIX + previewSceneId;
|
|
23
|
-
// hashed, not truncated: every party must land on the same string unprompted
|
|
24
|
-
if (realmKey.length <= exports.PULSE_MAX_REALM_LENGTH)
|
|
25
|
-
return realmKey;
|
|
26
|
-
return LSD_REALM_HASHED_PREFIX + (0, crypto_1.createHash)('sha256').update(previewSceneId).digest('hex');
|
|
27
|
-
}
|
|
28
|
-
//# sourceMappingURL=lsd-realm.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"lsd-realm.js","sourceRoot":"","sources":["../../src/logic/lsd-realm.ts"],"names":[],"mappings":";;;AAcA,8CAEC;AAED,kCAQC;AA1BD,4DAA4D;AAC5D,iFAAiF;AACjF,6DAA6D;AAC7D,6DAA6D;AAC7D,mCAAmC;AACnC,mDAAoD;AAEpD,gCAAgC;AACnB,QAAA,sBAAsB,GAAG,GAAG,CAAA;AAEzC,MAAM,gBAAgB,GAAG,MAAM,CAAA;AAC/B,MAAM,uBAAuB,GAAG,aAAa,CAAA;AAE7C,8EAA8E;AAC9E,SAAgB,iBAAiB,CAAC,WAAmB;IACnD,OAAO,IAAA,kCAAkB,EAAC,WAAW,CAAC,CAAA;AACxC,CAAC;AAED,SAAgB,WAAW,CAAC,WAAmB;IAC7C,MAAM,cAAc,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAA;IACrD,MAAM,QAAQ,GAAG,gBAAgB,GAAG,cAAc,CAAA;IAElD,6EAA6E;IAC7E,IAAI,QAAQ,CAAC,MAAM,IAAI,8BAAsB;QAAE,OAAO,QAAQ,CAAA;IAE9D,OAAO,uBAAuB,GAAG,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;AAC5F,CAAC"}
|