@dcl/sdk-commands 7.1.4-4542949081.commit-c326cfb → 7.1.4-4544451404.commit-3e8cb7c

package/.dclrc

@@ -0,0 +1,19 @@
+# This file provides the default configurations for sdk-commands
+
+# Several .dcl.rc configuration files are loaded for each session, each key of the file
+# overrides the previously loaded, and finally it uses env vars if present. Meaning:
+# - multiple keys can be present in the same file
+# - the last file overrides the first file
+# - env vars override the config files entirely
+
+# DCL_ANON_ID=0000000-0000000000-0000000
+DCL_DISABLE_ANALYTICS=false
+
+# Address of the LAND_REGISTRY smart contract
+#DCL_LAND_REGISTRY_ADDRESS=
+
+# Address of the ESTATE_REGISTRY smart contract
+#DCL_ESTATE_REGISTRY_ADDRESS=
+
+# Default catalyst node
+DCL_CATALYST=https://peer.decentraland.org

package/dist/commands/build/index.d.ts

@@ -1,7 +1,7 @@
 import { CliComponents } from '../../components';
 interface Options {
     args: typeof args;
-    components: Pick<CliComponents, 'fs' | 'logger' | 'dclInfoConfig' | 'analytics'>;
+    components: Pick<CliComponents, 'fs' | 'logger' | 'analytics' | 'spawner'>;
 }
 export declare const args: import("arg").Result<{
     '--help': BooleanConstructor;
@@ -11,6 +11,8 @@ export declare const args: import("arg").Result<{
     '--watch': BooleanConstructor;
     '-w': string;
     '--production': BooleanConstructor;
+    '--single': StringConstructor;
+    '--emitDeclaration': BooleanConstructor;
     '-p': string;
     '--skip-install': BooleanConstructor;
     '--dir': StringConstructor;

package/dist/commands/build/index.js

@@ -1,20 +1,18 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.main = exports.help = exports.args = void 0;
 const path_1 = require("path");
 const args_1 = require("../../logic/args");
-const compile_1 = require("@dcl/dcl-rollup/compile");
-const fp_future_1 = __importDefault(require("fp-future"));
 const project_validations_1 = require("../../logic/project-validations");
 const scene_validations_1 = require("../../logic/scene-validations");
 const project_files_1 = require("../../logic/project-files");
+const bundle_1 = require("../../logic/bundle");
 exports.args = (0, args_1.getArgs)({
     '--watch': Boolean,
     '-w': '--watch',
     '--production': Boolean,
+    '--single': String,
+    '--emitDeclaration': Boolean,
     '-p': '--production',
     '--skip-install': Boolean,
     '--dir': String
@@ -36,31 +34,26 @@ function help() {
 }
 exports.help = help;
 async function main(options) {
-    const projectRoot = (0, path_1.resolve)(process.cwd(), options.args['--dir'] || '.');
-    await (0, project_validations_1.assertValidProjectFolder)(options.components, projectRoot);
-    const shouldInstallDeps = await (0, project_validations_1.needsDependencies)(options.components, projectRoot);
+    const workingDirectory = (0, path_1.resolve)(process.cwd(), options.args['--dir'] || '.');
+    await (0, project_validations_1.assertValidProjectFolder)(options.components, workingDirectory);
+    const shouldInstallDeps = await (0, project_validations_1.needsDependencies)(options.components, workingDirectory);
     if (shouldInstallDeps && !options.args['--skip-install']) {
-        await (0, project_validations_1.installDependencies)(options.components, projectRoot);
+        await (0, project_validations_1.installDependencies)(options.components, workingDirectory);
     }
     const watch = !!options.args['--watch'];
-    const watchingFuture = (0, fp_future_1.default)();
-    await (0, compile_1.compile)({
-        project: projectRoot,
+    const { sceneJson } = await (0, bundle_1.bundleProject)(options.components, {
+        workingDirectory,
         watch,
+        single: options.args['--single'],
         production: !!options.args['--production'],
-        watchingFuture
+        emitDeclaration: !!options.args['--emitDeclaration']
     });
-    if (!watch) {
-        watchingFuture.resolve(null);
-    }
-    const sceneJson = await (0, scene_validations_1.getValidSceneJson)(options.components, projectRoot);
     const coords = (0, scene_validations_1.getBaseCoords)(sceneJson);
-    options.components.analytics.trackSync('Build scene', {
-        projectHash: await (0, project_files_1.b64HashingFunction)(projectRoot),
+    options.components.analytics.track('Build scene', {
+        projectHash: await (0, project_files_1.b64HashingFunction)(workingDirectory),
         coords,
         isWorkspace: false,
         args: (0, args_1.getArgsUsed)(options.args)
     });
-    await watchingFuture;
 }
 exports.main = main;

package/dist/commands/deploy/index.js

@@ -74,9 +74,9 @@ async function main(options) {
     };
     const packageJson = await (0, project_files_1.getPackageJson)(options.components, projectRoot);
     const dependencies = Array.from(new Set([...Object.keys(packageJson.dependencies || {}), ...Object.keys(packageJson.devDependencies || {})]));
-    options.components.analytics.trackSync('Scene deploy started', trackProps);
+    options.components.analytics.track('Scene deploy started', trackProps);
     if (!skipBuild) {
-        await (0, project_validations_1.npmRun)(projectRoot, 'build');
+        await (0, project_validations_1.npmRun)(options.components, projectRoot, 'build');
     }
     // Obtain list of files to deploy
     const files = await (0, scene_validations_1.getFiles)(options.components, projectRoot);
@@ -116,9 +116,9 @@ async function main(options) {
     catch (e) {
         options.components.logger.error('Could not upload content:');
         options.components.logger.error(e);
-        options.components.analytics.trackSync('Scene deploy failure', { ...trackProps, error: e.message ?? '' });
+        options.components.analytics.track('Scene deploy failure', { ...trackProps, error: e.message ?? '' });
     }
-    options.components.analytics.trackSync('Scene deploy success', { ...trackProps, dependencies });
+    options.components.analytics.track('Scene deploy success', { ...trackProps, dependencies });
 }
 exports.main = main;
 async function getCatalyst(target, targetContent) {

package/dist/commands/deploy/linker-dapp/api.d.ts

@@ -17,7 +17,7 @@ export interface SceneInfo {
     description?: string;
     skipValidations: boolean;
 }
-export declare function runLinkerApp(cliComponents: Pick<CliComponents, 'fs' | 'logger' | 'fetch'>, scene: Scene, files: IFile[], port: number, rootCID: string, { isHttps, skipValidations, openBrowser }: {
+export declare function runLinkerApp(cliComponents: Pick<CliComponents, 'fs' | 'logger' | 'fetch' | 'config'>, scene: Scene, files: IFile[], port: number, rootCID: string, { isHttps, skipValidations, openBrowser }: {
     isHttps: boolean;
     skipValidations: boolean;
     openBrowser: boolean;

package/dist/commands/deploy/linker-dapp/api.js

@@ -13,14 +13,13 @@ const schemas_1 = require("@dcl/schemas");
 const querystring_1 = __importDefault(require("querystring"));
 const open_1 = __importDefault(require("open"));
 const get_free_port_1 = require("../../../logic/get-free-port");
-const dcl_info_1 = require("../../../logic/dcl-info");
 const beautiful_logs_1 = require("../../../logic/beautiful-logs");
 const routes_1 = require("./routes");
+const config_1 = require("../../../logic/config");
 function runLinkerApp(cliComponents, scene, files, port, rootCID, { isHttps, skipValidations, openBrowser }) {
     return new Promise(async (resolve) => {
-        const { logger } = cliComponents;
         const resolvedPort = await (0, get_free_port_1.getPort)(port, 4044);
-        const sceneInfo = await getSceneInfo(scene, rootCID, skipValidations);
+        const sceneInfo = await getSceneInfo(cliComponents, scene, rootCID, skipValidations);
         const protocol = isHttps ? 'https' : 'http';
         const queryParams = querystring_1.default.stringify(sceneInfo);
         const url = `${protocol}://localhost:${resolvedPort}`;
@@ -32,24 +31,23 @@ function runLinkerApp(cliComponents, scene, files, port, rootCID, { isHttps, ski
                     ...process.env
                 });
                 const logs = await (0, logger_1.createConsoleLogComponent)({});
-                const components = { config, logs };
                 const https = isHttps ? await getCredentials(cliComponents) : undefined;
-                const server = await (0, http_server_1.createServerComponent)(components, { https });
-                return { config, logs, server };
+                const server = await (0, http_server_1.createServerComponent)({ ...cliComponents, logs }, { https });
+                return { ...cliComponents, config, logs, server };
             },
             async main({ components, startComponents }) {
-                const { router, futureSignature } = (0, routes_1.setRoutes)(cliComponents, files, sceneInfo);
+                const { router, futureSignature } = (0, routes_1.setRoutes)(components, files, sceneInfo);
                 components.server.setContext(components);
                 components.server.use(router.allowedMethods());
                 components.server.use(router.middleware());
                 await startComponents();
                 if (openBrowser)
-                    await browse(cliComponents, url, queryParams);
+                    await browse(components, url, queryParams);
                 const value = await futureSignature;
-                (0, beautiful_logs_1.printSuccess)(cliComponents.logger, `\nContent successfully signed.`, '');
-                logger.info(`Address: ${value.address}`);
-                logger.info(`Signature: ${value.signature}`);
-                logger.info(`Network: ${(0, schemas_1.getChainName)(value.chainId)}`);
+                (0, beautiful_logs_1.printSuccess)(components.logger, `\nContent successfully signed.`, '');
+                components.logger.info(`Address: ${value.address}`);
+                components.logger.info(`Signature: ${value.signature}`);
+                components.logger.info(`Network: ${(0, schemas_1.getChainName)(value.chainId)}`);
                 resolve(value);
             }
         });
@@ -64,7 +62,7 @@ async function browse({ logger }, url, params) {
             await (0, open_1.default)(`${url}?${params}`);
         }
         catch (e) {
-            logger.error(`Unable to open browser automatically`);
+            logger.error(`Unable to open browser automatically. Please manually navigate to:\n  ${url}?${params}`);
         }
     }, 5000);
     logger.info(`Signing app ready at ${url}`);
@@ -74,15 +72,14 @@ async function getCredentials({ fs }) {
     const certificate = await fs.readFile((0, path_1.resolve)(__dirname, '../../../certs/localhost.crt'), 'utf-8');
     return { key: privateKey, cert: certificate };
 }
-async function getSceneInfo(scene, rootCID, skipValidations) {
-    const { LANDRegistry, EstateRegistry } = (0, dcl_info_1.getCustomConfig)();
+async function getSceneInfo(components, scene, rootCID, skipValidations) {
     const { scene: { parcels, base }, display } = scene;
     return {
         baseParcel: base,
         parcels,
         rootCID,
-        landRegistry: LANDRegistry,
-        estateRegistry: EstateRegistry,
+        landRegistry: await (0, config_1.getLandRegistry)(components),
+        estateRegistry: await (0, config_1.getEstateRegistry)(components),
         debug: !!process.env.DEBUG,
         title: display?.title,
         description: display?.description,

package/dist/commands/deploy/linker-dapp/routes.d.ts

@@ -2,7 +2,7 @@ import { Router } from '@well-known-components/http-server';
 import { CliComponents } from '../../../components';
 import { IFile } from '../../../logic/scene-validations';
 import { LinkerResponse, SceneInfo } from './api';
-export declare function setRoutes(components: Pick<CliComponents, 'fs' | 'logger' | 'fetch'>, files: IFile[], sceneInfo: SceneInfo): {
+export declare function setRoutes(components: Pick<CliComponents, 'fs' | 'logger' | 'fetch' | 'config'>, files: IFile[], sceneInfo: SceneInfo): {
     router: Router<{}>;
     futureSignature: import("fp-future").IFuture<LinkerResponse>;
 };

package/dist/commands/deploy/linker-dapp/routes.js

@@ -9,7 +9,7 @@ const url_1 = __importDefault(require("url"));
 const http_server_1 = require("@well-known-components/http-server");
 const schemas_1 = require("@dcl/schemas");
 const fp_future_1 = __importDefault(require("fp-future"));
-const catalyst_pointers_1 = require("./catalyst-pointers");
+const catalyst_requests_1 = require("../../../logic/catalyst-requests");
 const coordinates_1 = require("../../../logic/coordinates");
 function getContentType(type) {
     switch (type) {
@@ -57,7 +57,7 @@ function setRoutes(components, files, sceneInfo) {
         const pointer = `${x},${y}`;
         const chainId = deployInfo.linkerResponse?.chainId || 1;
         const network = chainId === schemas_1.ChainId.ETHEREUM_MAINNET ? 'mainnet' : 'goerli';
-        const value = await (0, catalyst_pointers_1.getPointers)(components, pointer, network);
+        const value = await (0, catalyst_requests_1.getPointers)(components, pointer, network);
         return {
             body: {
                 catalysts: value,

package/dist/commands/export-static/index.d.ts

@@ -1,7 +1,7 @@
 import { CliComponents } from '../../components';
 interface Options {
     args: typeof args;
-    components: Pick<CliComponents, 'fetch' | 'fs' | 'logger' | 'dclInfoConfig' | 'analytics'>;
+    components: Pick<CliComponents, 'fetch' | 'fs' | 'logger' | 'analytics' | 'config'>;
 }
 export declare const args: import("arg").Result<{
     '--help': BooleanConstructor;

package/dist/commands/export-static/index.js

@@ -100,7 +100,7 @@ async function main(options) {
     if (willCreateRealm) {
         // prepare the realm object
         (0, beautiful_logs_1.printProgressStep)(logger, 'Creating realm file...', currentStep++, maxSteps);
-        const realm = (0, realm_1.createStaticRealm)();
+        const realm = await (0, realm_1.createStaticRealm)(options.components);
         const realmName = exports.args['--realmName'];
         realm.configurations.scenesUrn = [urn];
         realm.configurations.realmName = realmName;
@@ -117,7 +117,7 @@ async function main(options) {
     (0, beautiful_logs_1.printSuccess)(logger, `Export finished!`, `=> The entity URN is ${log_1.colors.bold(urn)}`);
     const sceneJson = await (0, scene_validations_1.getValidSceneJson)(options.components, projectRoot);
     const coords = (0, scene_validations_1.getBaseCoords)(sceneJson);
-    options.components.analytics.trackSync('Export static', {
+    options.components.analytics.track('Export static', {
         projectHash: await (0, project_files_1.b64HashingFunction)(projectRoot),
         coords,
         args: (0, args_1.getArgsUsed)(options.args)

package/dist/commands/init/index.d.ts

@@ -1,7 +1,7 @@
 import { CliComponents } from '../../components';
 interface Options {
     args: typeof args;
-    components: Pick<CliComponents, 'fetch' | 'fs' | 'logger' | 'dclInfoConfig' | 'analytics'>;
+    components: Pick<CliComponents, 'fetch' | 'fs' | 'logger' | 'analytics' | 'spawner'>;
 }
 export declare const args: import("arg").Result<{
     '--help': BooleanConstructor;

package/dist/commands/init/index.js

@@ -34,7 +34,7 @@ async function main(options) {
     if (shouldInstallDeps && !options.args['--skip-install']) {
         await (0, project_validations_1.installDependencies)(options.components, dir);
     }
-    options.components.analytics.trackSync('Scene created', { projectType: scene, url, args: (0, args_1.getArgsUsed)(options.args) });
+    options.components.analytics.track('Scene created', { projectType: scene, url, args: (0, args_1.getArgsUsed)(options.args) });
 }
 exports.main = main;
 const moveFilesFromDir = async (components, dir, folder) => {

package/dist/commands/start/data-layer/fs.d.ts

@@ -1,2 +1,3 @@
 import { FileSystemInterface } from '@dcl/inspector';
-export declare function createFsFromNode(): FileSystemInterface;
+import { IFileSystemComponent } from '../../../components/fs';
+export declare function createFsFromFsComponent(fs: IFileSystemComponent): FileSystemInterface;

package/dist/commands/start/data-layer/fs.js

@@ -1,28 +1,30 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFsFromNode = void 0;
-const fs_extra_1 = __importDefault(require("fs-extra"));
-function createFsFromNode() {
+exports.createFsFromFsComponent = void 0;
+function createFsFromFsComponent(fs) {
     return {
         async existFile(filePath) {
-            return fs_extra_1.default.existsSync(filePath);
+            try {
+                await fs.access(filePath, fs.constants.F_OK | fs.constants.R_OK);
+                return true;
+            }
+            catch (error) {
+                return false;
+            }
         },
         async readFile(filePath) {
-            return fs_extra_1.default.readFile(filePath);
+            return fs.readFile(filePath);
         },
         async writeFile(filePath, content) {
-            await fs_extra_1.default.writeFile(filePath, content);
+            await fs.writeFile(filePath, content);
         },
         async readdir(dirPath) {
-            const result = await fs_extra_1.default.readdir(dirPath, { withFileTypes: true });
-            return result.map((item) => ({
-                name: item.name,
-                isDirectory: item.isDirectory()
-            }));
+            const result = await fs.readdir(dirPath);
+            return Promise.all(result.map(async (name) => ({
+                name: name,
+                isDirectory: await fs.directoryExists(name)
+            })));
         }
     };
 }
-exports.createFsFromNode = createFsFromNode;
+exports.createFsFromFsComponent = createFsFromFsComponent;

package/dist/commands/start/data-layer/rpc.d.ts

@@ -8,4 +8,4 @@ export type DataLayer = {
     rpcServer: RpcServer<DataLayerContext>;
     context: DataLayerContext;
 };
-export declare function createDataLayer({ fs }: Pick<CliComponents, 'fs'>): Promise<DataLayer>;
+export declare function createDataLayer({ fs, logger }: Pick<CliComponents, 'fs' | 'logger'>): Promise<DataLayer>;

package/dist/commands/start/data-layer/rpc.js

@@ -28,13 +28,12 @@ const inspector_1 = require("@dcl/inspector");
 const rpc_1 = require("@dcl/rpc");
 const codegen = __importStar(require("@dcl/rpc/dist/codegen"));
 const fs_1 = require("./fs");
-async function createDataLayer({ fs: _fs }) {
-    // TODO: implement createFsFromIFileSystemComponent(fs)
-    const dataLayerHost = await (0, inspector_1.createDataLayerHost)((0, fs_1.createFsFromNode)());
+async function createDataLayer({ fs, logger }) {
+    const dataLayerHost = await (0, inspector_1.createDataLayerHost)((0, fs_1.createFsFromFsComponent)(fs));
     const context = {
         dataLayerHost
     };
-    const rpcServer = (0, rpc_1.createRpcServer)({});
+    const rpcServer = (0, rpc_1.createRpcServer)({ logger });
     async function rpcHandler(serverPort) {
         // TODO: dataLayer as any
         codegen.registerService(serverPort, inspector_1.DataServiceDefinition, async (_port, _ctx) => dataLayerHost.rpcMethods);

package/dist/commands/start/data-layer/ws.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleDataLayerWs = void 0;
 const WebSocket_1 = require("@dcl/rpc/dist/transports/WebSocket");
-// TODO: dataLayer should be an optional component
+// TODO: dataLayer should be an optional component after WKC supports it
 async function handleDataLayerWs(components, ws, dataLayer) {
     const wsTransport = (0, WebSocket_1.WebSocketTransport)(ws);
     dataLayer.rpcServer.attachTransport(wsTransport, dataLayer.context);

package/dist/commands/start/index.d.ts

@@ -1,7 +1,7 @@
 import { CliComponents } from '../../components';
 interface Options {
     args: typeof args;
-    components: Pick<CliComponents, 'fetch' | 'fs' | 'logger' | 'dclInfoConfig' | 'analytics'>;
+    components: Pick<CliComponents, 'fetch' | 'fs' | 'logger' | 'analytics' | 'spawner'>;
 }
 export declare const args: import("arg").Result<{
     '--help': BooleanConstructor;

package/dist/commands/start/index.js

@@ -30,7 +30,6 @@ exports.main = exports.help = exports.args = void 0;
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const open_1 = __importDefault(require("open"));
-const fp_future_1 = __importDefault(require("fp-future"));
 const build_1 = require("../build");
 const args_1 = require("../../logic/args");
 const project_validations_1 = require("../../logic/project-validations");
@@ -50,6 +49,7 @@ const routes_1 = require("./server/routes");
 const ws_1 = require("./server/ws");
 const project_files_1 = require("../../logic/project-files");
 const rpc_1 = require("./data-layer/rpc");
+const exit_signal_1 = require("../../components/exit-signal");
 exports.args = (0, args_1.getArgs)({
     '--dir': String,
     '--help': Boolean,
@@ -110,7 +110,7 @@ async function main(options) {
     const hasPortableExperience = false;
     // first run `npm run build`, this can be disabled with --skip-build
     if (!skipBuild) {
-        await (0, project_validations_1.npmRun)(projectRoot, 'build');
+        await (0, project_validations_1.npmRun)(options.components, projectRoot, 'build');
     }
     // then start the embedded compiler, this can be disabled with --no-watch
     if (watch) {
@@ -139,15 +139,7 @@ async function main(options) {
                 logs,
                 config
             });
-            const programClosed = (0, fp_future_1.default)();
-            const signaler = {
-                programClosed,
-                async stop() {
-                    // this promise is resolved upon SIGTERM or SIGHUP
-                    // or when program.stop is called
-                    programClosed.resolve();
-                }
-            };
+            const signaler = (0, exit_signal_1.createExitSignalComponent)();
             return {
                 ...options.components,
                 logger: (0, log_1.createStderrCliLogger)(),
@@ -163,15 +155,15 @@ async function main(options) {
         },
         async main({ components, startComponents }) {
             // TODO: dataLayerRpc should be an optional component
-            const dataLayerRpc = withDataLayer ? await (0, rpc_1.createDataLayer)({ fs: components.fs }) : undefined;
-            await (0, routes_1.wireRouter)(components, projectRoot, dataLayerRpc);
+            const dataLayer = withDataLayer ? await (0, rpc_1.createDataLayer)(components) : undefined;
+            await (0, routes_1.wireRouter)(components, projectRoot, dataLayer);
             if (watch) {
                 await (0, file_watch_notifier_1.wireFileWatcherToWebSockets)(components, projectRoot);
             }
             await startComponents();
             const networkInterfaces = os.networkInterfaces();
             const availableURLs = [];
-            components.analytics.trackSync('Preview started', {
+            components.analytics.track('Preview started', {
                 projectHash: await (0, project_files_1.b64HashingFunction)(projectRoot),
                 coords: baseCoords,
                 isWorkspace: false,

package/dist/commands/start/server/endpoints.d.ts

@@ -1,4 +1,4 @@
 import { Router } from '@well-known-components/http-server';
 import { PreviewComponents } from '../types';
 import { CliComponents } from '../../../components';
-export declare function setupEcs6Endpoints(components: CliComponents, dir: string, router: Router<PreviewComponents>): void;
+export declare function setupEcs6Endpoints(components: CliComponents, dir: string, router: Router<PreviewComponents>): Promise<void>;

package/dist/commands/start/server/endpoints.js

@@ -30,13 +30,12 @@ const schemas_1 = require("@dcl/schemas");
 const node_fetch_1 = __importStar(require("node-fetch"));
 const catalyst_requests_1 = require("../../../logic/catalyst-requests");
 const project_files_1 = require("../../../logic/project-files");
-function getCatalystUrl() {
-    return new URL('https://peer.decentraland.org');
-}
+const config_1 = require("../../../logic/config");
 function smartWearableNameToId(name) {
     return name.toLocaleLowerCase().replace(/ /g, '-');
 }
-function setupEcs6Endpoints(components, dir, router) {
+async function setupEcs6Endpoints(components, dir, router) {
+    const catalystUrl = new URL(await (0, config_1.getCatalystBaseUrl)(components));
     const baseFolders = [dir];
     // handle old preview scene.json
     router.get('/scene.json', async () => {
@@ -78,7 +77,6 @@ function setupEcs6Endpoints(components, dir, router) {
                 baseUrl
             });
             if (previewWearables.length === 1) {
-                const catalystUrl = getCatalystUrl();
                 const u = new URL(ctx.url.toString());
                 u.host = catalystUrl.host;
                 u.protocol = catalystUrl.protocol;
@@ -109,7 +107,6 @@ function setupEcs6Endpoints(components, dir, router) {
         return next();
     });
     router.all('/lambdas/:path+', async (ctx) => {
-        const catalystUrl = getCatalystUrl();
         const u = new URL(ctx.url.toString());
         u.host = catalystUrl.host;
         u.protocol = catalystUrl.protocol;
@@ -129,7 +126,6 @@ function setupEcs6Endpoints(components, dir, router) {
         };
     });
     router.post('/content/entities', async (ctx) => {
-        const catalystUrl = getCatalystUrl();
         const headers = new node_fetch_1.Headers();
         const res = await (0, node_fetch_1.default)(`${catalystUrl.toString()}/content/entities`, {
             method: 'post',
@@ -140,10 +136,11 @@ function setupEcs6Endpoints(components, dir, router) {
     });
     serveStatic(components, dir, router);
     // TODO: get workspace scenes & wearables...
-    serveFolders(components, router, baseFolders);
+    await serveFolders(components, router, baseFolders);
 }
 exports.setupEcs6Endpoints = setupEcs6Endpoints;
-function serveFolders(components, router, baseFolders) {
+async function serveFolders(components, router, baseFolders) {
+    const catalystUrl = await (0, config_1.getCatalystBaseUrl)(components);
     router.get('/content/contents/:hash', async (ctx, next) => {
         if (ctx.params.hash && ctx.params.hash.startsWith('b64-')) {
             const fullPath = path.resolve(Buffer.from(ctx.params.hash.replace(/^b64-/, ''), 'base64').toString('utf8'));
@@ -168,8 +165,7 @@ function serveFolders(components, router, baseFolders) {
         }
         const requestedPointers = new Set(pointers && typeof pointers === 'string' ? [pointers] : pointers);
         const resultEntities = await getSceneJson(components, baseFolders, Array.from(requestedPointers));
-        const catalystUrl = getCatalystUrl();
-        const remote = (0, catalyst_requests_1.fetchEntityByPointer)(catalystUrl.toString(), pointers.filter(($) => !$.match(/-?\d+,-?\d+/)));
+        const remote = (0, catalyst_requests_1.fetchEntityByPointer)(components, catalystUrl.toString(), pointers.filter(($) => !$.match(/-?\d+,-?\d+/)));
         const serverEntities = Array.isArray(remote) ? remote : [];
         return [...resultEntities, ...serverEntities];
     }

package/dist/commands/start/server/routes.js

@@ -24,7 +24,7 @@ async function wireRouter(components, dir, dataLayer) {
         return next();
     });
     (0, realm_1.setupRealmAndComms)(components, router);
-    (0, endpoints_1.setupEcs6Endpoints)(components, dir, router);
+    await (0, endpoints_1.setupEcs6Endpoints)(components, dir, router);
     components.server.setContext(components);
     components.server.use(router.allowedMethods());
     components.server.use(router.middleware());

package/dist/commands/start/types.d.ts

@@ -3,6 +3,7 @@ import { HTTPProvider } from 'eth-connect';
 import { RoomComponent } from '@dcl/mini-comms/dist/adapters/rooms';
 import { WebSocketComponent } from './server/ws';
 import { CliComponents } from '../../components';
+import { ISignalerComponent } from '../../components/exit-signal';
 export type PreviewComponents = CliComponents & {
     logs: ILoggerComponent;
     server: IHttpServerComponent<PreviewComponents>;
@@ -13,6 +14,3 @@ export type PreviewComponents = CliComponents & {
     ws: WebSocketComponent;
     signaler: ISignalerComponent;
 };
-export type ISignalerComponent = {
-    programClosed: Promise<void>;
-};

package/dist/components/analytics.d.ts

@@ -1,10 +1,7 @@
 import { Analytics } from '@segment/analytics-node';
 import { CliComponents } from '.';
 export type IAnalyticsComponent = {
-    get(): Analytics;
-    identify(): Promise<void>;
-    track<T extends keyof Events>(eventName: T, eventProps: Events[T]): Promise<void>;
-    trackSync<T extends keyof Events>(eventName: T, eventProps: Events[T]): void;
+    track<T extends keyof Events>(eventName: T, eventProps: Events[T]): void;
     stop(): Promise<void>;
 };
 export type Events = {
@@ -69,4 +66,8 @@ export type Events = {
         error: string;
     };
 };
-export declare function createAnalyticsComponent({ dclInfoConfig, logger }: Pick<CliComponents, 'dclInfoConfig' | 'logger'>): Promise<IAnalyticsComponent>;
+export declare function createAnalyticsComponent(components: Pick<CliComponents, 'config' | 'logger' | 'fs'>): Promise<IAnalyticsComponent | {
+    get(): Analytics;
+    track: <T extends keyof Events>(eventName: T, eventProps: Events[T]) => void;
+    stop(): Promise<void>;
+}>;