@dcl/sdk-commands 7.28.1-34624845556.commit-7d0808b → 7.28.1-34869822800.commit-268e971
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/dcl-env.d.ts +16 -0
- package/dist/commands/start/dcl-env.js +51 -0
- package/dist/commands/start/dcl-env.js.map +1 -0
- package/dist/commands/start/index.js +11 -6
- 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 +11 -8
- 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 +4 -2
- package/dist/commands/start/server/routes.js.map +1 -1
- package/dist/logic/lsd-realm.d.ts +5 -0
- package/dist/logic/lsd-realm.js +28 -0
- package/dist/logic/lsd-realm.js.map +1 -0
- package/dist/logic/project-files.js +2 -0
- package/dist/logic/project-files.js.map +1 -1
- package/package.json +3 -3
|
@@ -0,0 +1,16 @@
|
|
|
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;
|
|
@@ -0,0 +1,51 @@
|
|
|
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
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -67,6 +67,7 @@ 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");
|
|
70
71
|
exports.args = (0, args_1.declareArgs)({
|
|
71
72
|
'--dir': String,
|
|
72
73
|
'--help': Boolean,
|
|
@@ -120,7 +121,7 @@ async function help(options) {
|
|
|
120
121
|
--web3 (deprecated) No effect. Kept for backwards compatibility
|
|
121
122
|
--skip-build Skip build and only serve the files in preview mode
|
|
122
123
|
--debug Enables Debug panel mode inside DCL Explorer (default=true)
|
|
123
|
-
--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)
|
|
124
|
+
--dclenv Decentraland Environment. Which environment to use for the content. This determines the catalyst server used, asset-bundles, etc., plus the bevy-web domain and the Pulse comms server for the preview. Possible values: org, zone, today. (default=org)
|
|
124
125
|
--realm Realm used to serve the content. (default=Localhost)
|
|
125
126
|
--local-scene Enable local scene development.
|
|
126
127
|
--position Initial Position to start the explorer. (default=position defined at scene.json)
|
|
@@ -166,6 +167,7 @@ async function main(options) {
|
|
|
166
167
|
const skipClient = !!options.args['--no-client'];
|
|
167
168
|
const bevyWeb = !!options.args['--bevy-web'];
|
|
168
169
|
const isMobile = !!options.args['--mobile'];
|
|
170
|
+
const dclenv = options.args['--dclenv'] || 'org';
|
|
169
171
|
const explorerAlpha = !bevyWeb;
|
|
170
172
|
const workspace = await (0, workspace_validations_1.getValidWorkspace)(options.components, workingDirectory);
|
|
171
173
|
/* istanbul ignore if */
|
|
@@ -236,7 +238,7 @@ async function main(options) {
|
|
|
236
238
|
components.logger.error(e);
|
|
237
239
|
}
|
|
238
240
|
}
|
|
239
|
-
await (0, routes_1.wireRouter)(components, workspace, dataLayer);
|
|
241
|
+
await (0, routes_1.wireRouter)(components, workspace, dataLayer, dclenv);
|
|
240
242
|
if (watch) {
|
|
241
243
|
for (const project of workspace.projects) {
|
|
242
244
|
await (0, file_watch_notifier_1.wireFileWatcherToWebSockets)(components, project.workingDirectory, project.kind);
|
|
@@ -247,7 +249,7 @@ async function main(options) {
|
|
|
247
249
|
const project = workspace.projects[0];
|
|
248
250
|
if (project) {
|
|
249
251
|
const realm = `http://localhost:${port}`;
|
|
250
|
-
const multiplayerServer = (0, multiplayer_server_1.spawnAuthServer)(components, project, realm);
|
|
252
|
+
const multiplayerServer = (0, multiplayer_server_1.spawnAuthServer)(components, project, realm, dclenv);
|
|
251
253
|
if (multiplayerServer) {
|
|
252
254
|
const cleanup = () => {
|
|
253
255
|
if (!multiplayerServer.killed) {
|
|
@@ -274,14 +276,17 @@ async function main(options) {
|
|
|
274
276
|
const sortedURLs = availableURLs.sort((a, _b) => {
|
|
275
277
|
return a.toLowerCase().includes('localhost') || a.includes('127.0.0.1') || a.includes('0.0.0.0') ? -1 : 1;
|
|
276
278
|
});
|
|
277
|
-
|
|
279
|
+
// no pulse override needed: the zone-hosted page derives its base domain — and with
|
|
280
|
+
// it its pulse-server fallback — from its own host (see dcl-env.ts)
|
|
281
|
+
const bevyUrl = `${(0, dcl_env_1.webExplorerBaseUrl)(dclenv)}?preview=true&realm=${new URL(sortedURLs[0]).origin}` +
|
|
282
|
+
`&position=${baseCoords.x},${baseCoords.y}${(0, dcl_env_1.webExplorerEnvParams)(dclenv)}`;
|
|
278
283
|
if (bevyWeb) {
|
|
279
284
|
components.logger.log('Available on:\n');
|
|
280
285
|
components.logger.log(` ${bevyUrl}`);
|
|
281
286
|
(0, beautiful_logs_1.printWarning)(components.logger, 'Chromium-based browsers require permission for websites to reach localhost (Local Network Access).\n' +
|
|
282
287
|
'When the browser asks to access apps on your device, click "Allow".\n' +
|
|
283
288
|
'If the scene never loads and no prompt appears, enable it manually and reload:\n' +
|
|
284
|
-
|
|
289
|
+
` chrome://settings/content/siteDetails?site=${encodeURIComponent(new URL(bevyUrl).origin)}\n` +
|
|
285
290
|
' → "Apps on device" (Chrome 145+) or "Local network access" (Chrome 142-144) → Allow');
|
|
286
291
|
}
|
|
287
292
|
components.logger.log('\nPress CTRL+C to exit\n');
|
|
@@ -290,7 +295,7 @@ async function main(options) {
|
|
|
290
295
|
await (0, explorer_alpha_1.runExplorerAlpha)(components, { cwd: workingDirectory, realm, baseCoords, isHub, args: options.args });
|
|
291
296
|
}
|
|
292
297
|
if (isMobile && !skipClient && lanUrl) {
|
|
293
|
-
const deepLink = `decentraland://open?preview=${lanUrl}&position=${baseCoords.x},${baseCoords.y}`;
|
|
298
|
+
const deepLink = `decentraland://open?preview=${lanUrl}&position=${baseCoords.x},${baseCoords.y}${(0, dcl_env_1.lsdDeepLinkPulseParams)(workspace.projects[0].workingDirectory, dclenv)}`;
|
|
294
299
|
qrcode_1.default.toString(deepLink, { type: 'terminal', small: true }, (err, qr) => {
|
|
295
300
|
if (!err) {
|
|
296
301
|
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":"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"}
|
|
@@ -6,7 +6,7 @@ type ServerEngine = 'bevy' | 'hammurabi';
|
|
|
6
6
|
/**
|
|
7
7
|
* Starts the Multiplayer Server process using npx to install and run in one step
|
|
8
8
|
*/
|
|
9
|
-
export declare function startMultiplayerServer(components: Pick<CliComponents, 'logger' | 'analytics'>, workingDir: string, realm: string, engine?: ServerEngine): ChildProcess;
|
|
9
|
+
export declare function startMultiplayerServer(components: Pick<CliComponents, 'logger' | 'analytics'>, workingDir: string, realm: string, engine?: ServerEngine, engineArgs?: string[]): ChildProcess;
|
|
10
10
|
/**
|
|
11
11
|
* Spawns the multiplayer server for the project.
|
|
12
12
|
* In the auth-server SDK, all scenes are authoritative multiplayer.
|
|
@@ -21,5 +21,5 @@ export declare function startMultiplayerServer(components: Pick<CliComponents, '
|
|
|
21
21
|
* @param realm - The realm URL to pass to the server
|
|
22
22
|
* @returns The ChildProcess if started, undefined otherwise
|
|
23
23
|
*/
|
|
24
|
-
export declare function spawnAuthServer(components: PreviewComponents, project: ProjectUnion, realm: string): ChildProcess | undefined;
|
|
24
|
+
export declare function spawnAuthServer(components: PreviewComponents, project: ProjectUnion, realm: string, dclenv?: string): ChildProcess | undefined;
|
|
25
25
|
export {};
|
|
@@ -6,13 +6,15 @@ const child_process_1 = require("child_process");
|
|
|
6
6
|
const beautiful_logs_1 = require("../../logic/beautiful-logs");
|
|
7
7
|
const log_1 = require("../../components/log");
|
|
8
8
|
const utils_1 = require("./utils");
|
|
9
|
+
const dcl_env_1 = require("./dcl-env");
|
|
9
10
|
const HAMMURABI_PACKAGE = '@dcl/hammurabi-server';
|
|
10
11
|
const HAMMURABI_VERSION = 'next';
|
|
11
12
|
const BEVY_PACKAGE = '@dcl-regenesislabs/bevy-headless-server';
|
|
12
|
-
//
|
|
13
|
-
//
|
|
14
|
-
//
|
|
15
|
-
|
|
13
|
+
// Exact pin: previews move engines only when someone edits this line — a floating tag
|
|
14
|
+
// re-resolves without warning. The pinned build must accept --base-domain and forward
|
|
15
|
+
// --preview-gatekeeper through its launcher (bevy-explorer#1260). DCL_SERVER_PACKAGE
|
|
16
|
+
// overrides for local builds.
|
|
17
|
+
const BEVY_VERSION = '0.1.0-34847389047.commit-7546497';
|
|
16
18
|
// The bevy server exits with this when it can never run here (unsupported platform,
|
|
17
19
|
// missing binary, bad arguments). We fail the preview loudly instead of retrying:
|
|
18
20
|
// a silent fallback would hide broken bevy installs from the people shipping them.
|
|
@@ -129,10 +131,10 @@ function forwardEngineLogs(source, sink) {
|
|
|
129
131
|
/**
|
|
130
132
|
* Starts the Multiplayer Server process using npx to install and run in one step
|
|
131
133
|
*/
|
|
132
|
-
function startMultiplayerServer(components, workingDir, realm, engine = DEFAULT_ENGINE) {
|
|
134
|
+
function startMultiplayerServer(components, workingDir, realm, engine = DEFAULT_ENGINE, engineArgs = []) {
|
|
133
135
|
const pkg = packageSpec(engine);
|
|
134
136
|
(0, beautiful_logs_1.printProgressInfo)(components.logger, `Starting ${log_1.colors.bold('Multiplayer Server')} (${engine}) with realm: ${log_1.colors.bold(realm)}`);
|
|
135
|
-
const npxArgs = ['--yes', pkg, `--realm=${realm}
|
|
137
|
+
const npxArgs = ['--yes', pkg, `--realm=${realm}`, ...engineArgs];
|
|
136
138
|
const npxCliJs = (0, utils_1.findNpxCliJs)();
|
|
137
139
|
// In Electron, override npm_config_prefix because npm derives its prefix from process.execPath,
|
|
138
140
|
// which points to the Electron Helper binary. This causes npm to look for a `lib/` directory
|
|
@@ -200,10 +202,11 @@ function startMultiplayerServer(components, workingDir, realm, engine = DEFAULT_
|
|
|
200
202
|
* @param realm - The realm URL to pass to the server
|
|
201
203
|
* @returns The ChildProcess if started, undefined otherwise
|
|
202
204
|
*/
|
|
203
|
-
function spawnAuthServer(components, project, realm) {
|
|
205
|
+
function spawnAuthServer(components, project, realm, dclenv = 'org') {
|
|
204
206
|
const engine = selectedEngine();
|
|
205
207
|
try {
|
|
206
|
-
|
|
208
|
+
// hammurabi knows nothing of base domains; env args are a bevy-engine concept
|
|
209
|
+
const child = startMultiplayerServer(components, project.workingDirectory, realm, engine, engine === 'bevy' ? (0, dcl_env_1.engineEnvArgs)(dclenv) : []);
|
|
207
210
|
if (engine === 'bevy') {
|
|
208
211
|
child.on('close', (code) => {
|
|
209
212
|
if (code !== EXIT_UNAVAILABLE)
|
|
@@ -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":";;AA6IA,wDA4EC;AAgBD,0CAmCC;AA5QD,iDAAiE;AAGjE,+DAA4E;AAC5E,8CAA6C;AAG7C,mCAAqF;AACrF,uCAAyC;AAEzC,MAAM,iBAAiB,GAAG,uBAAuB,CAAA;AACjD,MAAM,iBAAiB,GAAG,MAAM,CAAA;AAEhC,MAAM,YAAY,GAAG,yCAAyC,CAAA;AAC9D,sFAAsF;AACtF,sFAAsF;AACtF,qFAAqF;AACrF,8BAA8B;AAC9B,MAAM,YAAY,GAAG,kCAAkC,CAAA;AAEvD,oFAAoF;AACpF,kFAAkF;AAClF,mFAAmF;AACnF,MAAM,gBAAgB,GAAG,EAAE,CAAA;AAI3B,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,6EAA6E;AAC7E,6EAA6E;AAC7E,MAAM,cAAc,GAAG,2FAA2F,CAAA;AAClH,MAAM,cAAc,GAAG,sBAAsB,CAAA;AAC7C,gFAAgF;AAChF,kEAAkE;AAClE,4CAA4C;AAC5C,MAAM,UAAU,GAAG,mBAAmB,CAAA;AAEtC,gFAAgF;AAChF,6EAA6E;AAC7E,6EAA6E;AAC7E,6DAA6D;AAC7D,MAAM,YAAY,GAAG;IACnB,yBAAyB;IACzB,yBAAyB;IACzB,gEAAgE;IAChE,yEAAyE;CAC1E,CAAA;AAED,8EAA8E;AAC9E,sDAAsD;AACtD,MAAM,aAAa,GAAG,iCAAiC,CAAA;AAEvD,sEAAsE;AACtE,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,iFAAiF;AACjF,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;;;;GAIG;AACH,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,6EAA6E;YAC7E,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;AAED;;GAEG;AACH,SAAgB,sBAAsB,CACpC,UAAuD,EACvD,UAAkB,EAClB,KAAa,EACb,SAAuB,cAAc,EACrC,aAAuB,EAAE;IAEzB,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,EAAE,GAAG,UAAU,CAAC,CAAA;IACjE,MAAM,QAAQ,GAAG,IAAA,oBAAY,GAAE,CAAA;IAE/B,gGAAgG;IAChG,6FAA6F;IAC7F,0DAA0D;IAC1D,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,4EAA4E;IAC5E,iFAAiF;IACjF,IAAI,MAAM,KAAK,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;QACvC,GAAG,CAAC,QAAQ,GAAG,0CAA0C,CAAA;IAC3D,CAAC;IAED,yFAAyF;IACzF,MAAM,KAAK,GAAiB,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAEvF,sFAAsF;IACtF,+FAA+F;IAC/F,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,IAAA,iBAAS,GAAE,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAA;IAE9E,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACtB,iBAAiB,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;QACvD,iBAAiB,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;IACzD,CAAC;IAED,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QAClC,IAAA,6BAAY,EAAC,UAAU,CAAC,MAAM,EAAE,qCAAqC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IACvF,CAAC,CAAC,CAAA;IAEF,4BAA4B;IAC5B,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,IAAI,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAChC,8EAA8E;YAC9E,oEAAoE;YACpE,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,EAAC,UAAU,CAAC,MAAM,EAAE,uCAAuC,IAAI,EAAE,CAAC,CAAA;QAChF,CAAC;aAAM,IAAI,MAAM,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;YACjE,4EAA4E;YAC5E,mDAAmD;YACnD,IAAA,6BAAY,EAAC,UAAU,CAAC,MAAM,EAAE,2CAA2C,MAAM,EAAE,CAAC,CAAA;QACtF,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,aAAa,CAAA;AACtB,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,SAAgB,eAAe,CAC7B,UAA6B,EAC7B,OAAqB,EACrB,KAAa,EACb,SAAiB,KAAK;IAEtB,MAAM,MAAM,GAAG,cAAc,EAAE,CAAA;IAC/B,IAAI,CAAC;QACH,8EAA8E;QAC9E,MAAM,KAAK,GAAG,sBAAsB,CAClC,UAAU,EACV,OAAO,CAAC,gBAAgB,EACxB,KAAK,EACL,MAAM,EACN,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,IAAA,uBAAa,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAC/C,CAAA;QACD,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;YACtB,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;gBACzB,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,yEAAyE;gBACzE,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,KAAK,CAAA;IACd,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): Promise<void>;
|
|
6
|
+
export declare function wireRouter(components: PreviewComponents, workspace: Workspace, dataLayer?: DataLayer, dclenv?: string): Promise<void>;
|
|
@@ -13,8 +13,9 @@ 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");
|
|
16
17
|
exports.sceneUpdateClients = new Set();
|
|
17
|
-
async function wireRouter(components, workspace, dataLayer) {
|
|
18
|
+
async function wireRouter(components, workspace, dataLayer, dclenv = 'org') {
|
|
18
19
|
const router = new http_server_1.Router();
|
|
19
20
|
if (dataLayer) {
|
|
20
21
|
router.get('/data-layer', async (ctx, next) => {
|
|
@@ -47,7 +48,8 @@ async function wireRouter(components, workspace, dataLayer) {
|
|
|
47
48
|
};
|
|
48
49
|
}
|
|
49
50
|
const [x, y] = baseParcel.split(',');
|
|
50
|
-
|
|
51
|
+
// same Pulse params as the terminal QR in start/index.ts
|
|
52
|
+
const deepLink = `decentraland://open?preview=${lanUrl}&position=${x},${y}${(0, dcl_env_1.lsdDeepLinkPulseParams)(workspace.projects[0].workingDirectory, dclenv)}`;
|
|
51
53
|
const qrDataUrl = await qrcode_1.default.toDataURL(deepLink);
|
|
52
54
|
return {
|
|
53
55
|
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":";;;;;;AAeA,gCAuEC;AAtFD,oDAA2B;AAC3B,oEAA2D;AAC3D,mEAAqF;AAIrF,yCAAoD;AAEpD,2CAAgD;AAChD,uDAAyD;AACzD,mCAA4C;AAC5C,oCAAoC;AACpC,wCAAmD;AAEtC,QAAA,kBAAkB,GAAG,IAAI,GAAG,EAAa,CAAA;AAC/C,KAAK,UAAU,UAAU,CAC9B,UAA6B,EAC7B,SAAoB,EACpB,SAAqB,EACrB,SAAiB,KAAK;IAEtB,MAAM,MAAM,GAAG,IAAI,oBAAM,EAAqB,CAAA;IAE9C,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAC5C,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,WAAW,EAAE,CAAC;gBACvD,OAAO,IAAA,6BAAwB,EAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAA,sBAAiB,EAAC,UAAU,EAAE,EAAS,EAAE,SAAS,CAAC,CAAC,CAAA;YAC9F,CAAC;YAED,OAAO,IAAI,EAAE,CAAA;QACf,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAClC,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,WAAW,EAAE,CAAC;YACvD,OAAO,IAAA,6BAAwB,EAAC,CAAC,EAAE,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAsB,EAAE,0BAAkB,CAAC,CAAC,CAAA;QACvG,CAAC;QAED,OAAO,IAAI,EAAE,CAAA;IACf,CAAC,CAAC,CAAA;IAEF,MAAM,iBAAiB,GAAa,EAAE,CAAA;IACtC,MAAM,UAAU,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAA;IACzD,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;QACzC,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACjD,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAChC,CAAC;IACH,CAAC;IAED,kCAAkC;IAClC,MAAM,CAAC,GAAG,CAAC,iBAAiB,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QAC1C,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACtC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO;gBACL,MAAM,EAAE,GAAG;gBACX,IAAI,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,yBAAyB,EAAE;aACtD,CAAA;QACH,CAAC;QAED,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACpC,yDAAyD;QACzD,MAAM,QAAQ,GAAG,+BAA+B,MAAM,aAAa,CAAC,IAAI,CAAC,GAAG,IAAA,gCAAsB,EAChG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,gBAAgB,EACtC,MAAM,CACP,EAAE,CAAA;QACH,MAAM,SAAS,GAAG,MAAM,gBAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QAElD,OAAO;YACL,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE;gBACJ,EAAE,EAAE,IAAI;gBACR,IAAI,EAAE;oBACJ,GAAG,EAAE,QAAQ;oBACb,EAAE,EAAE,SAAS;iBACd;aACF;SACF,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,IAAA,0BAAkB,EAAC,UAAU,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAA;IACzD,IAAA,uCAAqB,EAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;IACpD,MAAM,IAAA,8BAAkB,EAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;IAEvD,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;IACxC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,CAAA;IAC9C,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAA;AAC5C,CAAC;AAED,MAAM,gBAAgB,GAAG,CAAC,EAAa,EAAE,OAAuB,EAAE,EAAE;IAClE,IAAI,EAAE,CAAC,UAAU,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC;QAC9B,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACjB,CAAC;SAAM,CAAC;QACN,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;IACtC,CAAC;IACD,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;AAC1C,CAAC,CAAA"}
|
|
@@ -0,0 +1,5 @@
|
|
|
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;
|
|
@@ -0,0 +1,28 @@
|
|
|
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
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -122,6 +122,8 @@ 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.
|
|
125
127
|
const b64HashingFunction = (str) => {
|
|
126
128
|
const unique = `${str}-${exports.machineId}`;
|
|
127
129
|
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.28.1-
|
|
4
|
+
"version": "7.28.1-34869822800.commit-268e971",
|
|
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.28.1-
|
|
11
|
+
"@dcl/ecs": "7.28.1-34869822800.commit-268e971",
|
|
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": "268e971be26d72020cd909e4f44abdce9d10c1a6"
|
|
78
78
|
}
|