@dcl/sdk 7.0.6-4087611163.commit-4735f5b → 7.0.6-4087883663.commit-054d424

package/cli/commands/preview/index.d.ts

@@ -1,4 +1,6 @@
+import { Lifecycle } from '@well-known-components/interfaces';
 import { CliComponents } from '../../components';
+import { PreviewComponents } from './types';
 export declare function help(): string;
 interface Options {
     args: Omit<typeof args, '_'>;
@@ -14,5 +16,5 @@ export declare const args: import("arg").Result<{
     '--port': NumberConstructor;
     '-p': string;
 }>;
-export declare function main(options: Options): Promise<void>;
+export declare function main(options: Options): Promise<Lifecycle.ComponentBasedProgram<PreviewComponents>>;
 export {};

package/cli/commands/preview/index.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.main = exports.args = exports.help = void 0;
 const path_1 = require("path");
+const fp_future_1 = __importDefault(require("fp-future"));
 const interfaces_1 = require("@well-known-components/interfaces");
 const rooms_1 = require("@dcl/mini-comms/dist/adapters/rooms");
 const env_config_provider_1 = require("@well-known-components/env-config-provider");
@@ -12,7 +13,6 @@ const http_server_1 = require("@well-known-components/http-server");
 const logger_1 = require("@well-known-components/logger");
 const metrics_1 = require("@well-known-components/metrics");
 const ws_1 = require("./ws");
-const fp_future_1 = __importDefault(require("fp-future"));
 const args_1 = require("../../utils/args");
 const project_1 = require("./project");
 const port_1 = require("./port");
@@ -34,9 +34,7 @@ async function main(options) {
     await (0, project_1.validateExistingProject)(options.components, dir);
     await (0, project_1.validateSceneOptions)(options.components, dir);
     const port = options.args['--port'] || (await (0, port_1.previewPort)());
-    const startedFuture = (0, fp_future_1.default)();
-    setTimeout(() => startedFuture.reject(new Error('Timed out starting the server')), 3000);
-    await interfaces_1.Lifecycle.run({
+    const program = await interfaces_1.Lifecycle.run({
         async initComponents() {
             const metrics = (0, metrics_1.createTestMetricsComponent)(rooms_1.roomsMetrics);
             const config = (0, env_config_provider_1.createRecordConfigComponent)(Object.assign({ HTTP_SERVER_PORT: port.toString(), HTTP_SERVER_HOST: '0.0.0.0' }, process.env));
@@ -48,6 +46,13 @@ async function main(options) {
                 logs,
                 config
             });
+            const programClosed = (0, fp_future_1.default)();
+            const signaler = {
+                programClosed,
+                async stop() {
+                    programClosed.resolve();
+                }
+            };
             return {
                 logs,
                 ethereumProvider: eth_1.providerInstance,
@@ -55,22 +60,16 @@ async function main(options) {
                 config,
                 metrics,
                 server,
-                ws
+                ws,
+                signaler
             };
         },
         async main({ components, startComponents }) {
-            try {
-                await (0, wire_1.wire)(dir, components, !!options.args['--watch']);
-                await startComponents();
-                startedFuture.resolve();
-            }
-            catch (err) {
-                startedFuture.reject(err);
-            }
+            await (0, wire_1.wire)(dir, components);
+            await startComponents();
         }
     });
-    await startedFuture;
-    return;
+    return program;
 }
 exports.main = main;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSwrQkFBOEI7QUFDOUIsa0VBQTZEO0FBQzdELCtEQUF3RjtBQUN4RixvRkFBd0Y7QUFDeEYsb0VBQTBFO0FBQzFFLDBEQUF5RTtBQUN6RSw0REFBMkU7QUFDM0UsNkJBQXdDO0FBQ3hDLDBEQUE4QjtBQUc5QiwyQ0FBMEM7QUFFMUMsdUNBQXlFO0FBQ3pFLGlDQUFvQztBQUNwQywrQkFBd0M7QUFDeEMsaUNBQTZCO0FBRTdCLFNBQWdCLElBQUk7SUFDbEIsT0FBTyxFQUFFLENBQUE7QUFDWCxDQUFDO0FBRkQsb0JBRUM7QUFPWSxRQUFBLElBQUksR0FBRyxJQUFBLGNBQU8sRUFBQztJQUMxQixTQUFTLEVBQUUsT0FBTztJQUNsQixJQUFJLEVBQUUsU0FBUztJQUNmLE9BQU8sRUFBRSxNQUFNO0lBQ2YsUUFBUSxFQUFFLE1BQU07SUFDaEIsSUFBSSxFQUFFLFFBQVE7Q0FDZixDQUFDLENBQUE7QUFJSyxLQUFLLFVBQVUsSUFBSSxDQUFDLE9BQWdCO0lBQ3pDLE1BQU0sR0FBRyxHQUFHLElBQUEsY0FBTyxFQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEdBQUcsQ0FBQyxDQUFBO0lBQ2hFLE1BQU0sSUFBQSxpQ0FBdUIsRUFBQyxPQUFPLENBQUMsVUFBVSxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBQ3RELE1BQU0sSUFBQSw4QkFBb0IsRUFBQyxPQUFPLENBQUMsVUFBVSxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBRW5ELE1BQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxNQUFNLElBQUEsa0JBQVcsR0FBRSxDQUFDLENBQUE7SUFDNUQsTUFBTSxhQUFhLEdBQUcsSUFBQSxtQkFBTSxHQUFRLENBQUE7SUFFcEMsVUFBVSxDQUFDLEdBQUcsRUFBRSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxLQUFLLENBQUMsK0JBQStCLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFBO0lBRXhGLE1BQU0sc0JBQVMsQ0FBQyxHQUFHLENBQW9CO1FBQ3JDLEtBQUssQ0FBQyxjQUFjO1lBQ2xCLE1BQU0sT0FBTyxHQUFHLElBQUEsb0NBQTBCLEVBQUMsb0JBQVksQ0FBQyxDQUFBO1lBQ3hELE1BQU0sTUFBTSxHQUFHLElBQUEsaURBQTJCLGtCQUN4QyxnQkFBZ0IsRUFBRSxJQUFJLENBQUMsUUFBUSxFQUFFLEVBQ2pDLGdCQUFnQixFQUFFLFNBQVMsSUFDeEIsT0FBTyxDQUFDLEdBQUcsRUFDZCxDQUFBO1lBQ0YsTUFBTSxJQUFJLEdBQUcsTUFBTSxJQUFBLGtDQUF5QixFQUFDLEVBQUUsQ0FBQyxDQUFBO1lBQ2hELE1BQU0sRUFBRSxHQUFHLE1BQU0sSUFBQSxzQkFBaUIsRUFBQyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUE7WUFDNUMsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFBLG1DQUFxQixFQUFvQixFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLEVBQUUsQ0FBQyxFQUFFLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFBO1lBQ3hHLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBQSw0QkFBb0IsRUFBQztnQkFDdkMsT0FBTztnQkFDUCxJQUFJO2dCQUNKLE1BQU07YUFDUCxDQUFDLENBQUE7WUFFRixPQUFPO2dCQUNMLElBQUk7Z0JBQ0osZ0JBQWdCLEVBQUUsc0JBQWdCO2dCQUNsQyxLQUFLO2dCQUNMLE1BQU07Z0JBQ04sT0FBTztnQkFDUCxNQUFNO2dCQUNOLEVBQUU7YUFDSCxDQUFBO1FBQ0gsQ0FBQztRQUNELEtBQUssQ0FBQyxJQUFJLENBQUMsRUFBRSxVQUFVLEVBQUUsZUFBZSxFQUFFO1lBQ3hDLElBQUk7Z0JBQ0YsTUFBTSxJQUFBLFdBQUksRUFBQyxHQUFHLEVBQUUsVUFBVSxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUE7Z0JBQ3RELE1BQU0sZUFBZSxFQUFFLENBQUE7Z0JBQ3ZCLGFBQWEsQ0FBQyxPQUFPLEVBQUUsQ0FBQTthQUN4QjtZQUFDLE9BQU8sR0FBUSxFQUFFO2dCQUNqQixhQUFhLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFBO2FBQzFCO1FBQ0gsQ0FBQztLQUNGLENBQUMsQ0FBQTtJQUdGLE1BQU0sYUFBYSxDQUFBO0lBRW5CLE9BQU07QUFDUixDQUFDO0FBcERELG9CQW9EQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJ1xuaW1wb3J0IHsgTGlmZWN5Y2xlIH0gZnJvbSAnQHdlbGwta25vd24tY29tcG9uZW50cy9pbnRlcmZhY2VzJ1xuaW1wb3J0IHsgcm9vbXNNZXRyaWNzLCBjcmVhdGVSb29tc0NvbXBvbmVudCB9IGZyb20gJ0BkY2wvbWluaS1jb21tcy9kaXN0L2FkYXB0ZXJzL3Jvb21zJ1xuaW1wb3J0IHsgY3JlYXRlUmVjb3JkQ29uZmlnQ29tcG9uZW50IH0gZnJvbSAnQHdlbGwta25vd24tY29tcG9uZW50cy9lbnYtY29uZmlnLXByb3ZpZGVyJ1xuaW1wb3J0IHsgY3JlYXRlU2VydmVyQ29tcG9uZW50IH0gZnJvbSAnQHdlbGwta25vd24tY29tcG9uZW50cy9odHRwLXNlcnZlcidcbmltcG9ydCB7IGNyZWF0ZUNvbnNvbGVMb2dDb21wb25lbnQgfSBmcm9tICdAd2VsbC1rbm93bi1jb21wb25lbnRzL2xvZ2dlcidcbmltcG9ydCB7IGNyZWF0ZVRlc3RNZXRyaWNzQ29tcG9uZW50IH0gZnJvbSAnQHdlbGwta25vd24tY29tcG9uZW50cy9tZXRyaWNzJ1xuaW1wb3J0IHsgY3JlYXRlV3NDb21wb25lbnQgfSBmcm9tICcuL3dzJ1xuaW1wb3J0IGZ1dHVyZSBmcm9tICdmcC1mdXR1cmUnXG5cbmltcG9ydCB7IENsaUNvbXBvbmVudHMgfSBmcm9tICcuLi8uLi9jb21wb25lbnRzJ1xuaW1wb3J0IHsgZ2V0QXJncyB9IGZyb20gJy4uLy4uL3V0aWxzL2FyZ3MnXG5pbXBvcnQgeyBQcmV2aWV3Q29tcG9uZW50cyB9IGZyb20gJy4vdHlwZXMnXG5pbXBvcnQgeyB2YWxpZGF0ZUV4aXN0aW5nUHJvamVjdCwgdmFsaWRhdGVTY2VuZU9wdGlvbnMgfSBmcm9tICcuL3Byb2plY3QnXG5pbXBvcnQgeyBwcmV2aWV3UG9ydCB9IGZyb20gJy4vcG9ydCdcbmltcG9ydCB7IHByb3ZpZGVySW5zdGFuY2UgfSBmcm9tICcuL2V0aCdcbmltcG9ydCB7IHdpcmUgfSBmcm9tICcuL3dpcmUnXG5cbmV4cG9ydCBmdW5jdGlvbiBoZWxwKCkge1xuICByZXR1cm4gYGBcbn1cblxuaW50ZXJmYWNlIE9wdGlvbnMge1xuICBhcmdzOiBPbWl0PHR5cGVvZiBhcmdzLCAnXyc+XG4gIGNvbXBvbmVudHM6IFBpY2s8Q2xpQ29tcG9uZW50cywgJ2ZldGNoJyB8ICdmcyc+XG59XG5cbmV4cG9ydCBjb25zdCBhcmdzID0gZ2V0QXJncyh7XG4gICctLXdhdGNoJzogQm9vbGVhbixcbiAgJy13JzogJy0td2F0Y2gnLFxuICAnLS1kaXInOiBTdHJpbmcsXG4gICctLXBvcnQnOiBOdW1iZXIsXG4gICctcCc6ICctLXBvcnQnXG59KVxuXG4vLyBjb3B5L3Bhc3RlIGZyb20gaHR0cHM6Ly9naXRodWIuY29tL2RlY2VudHJhbGFuZC9jbGkvYmxvYi8zMmRlOTZiY2ZjNGVmMWMyNmM1NTgwYzc3NjdhZDZjOGNhYzNiMzY3L3NyYy9saWIvRGVjZW50cmFsYW5kLnRzXG4vLyBUT0RPOiByZWZhY3RvciB0aGlzIHN0dWZmIGNvbXBsZXRlbHlcbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBtYWluKG9wdGlvbnM6IE9wdGlvbnMpIHtcbiAgY29uc3QgZGlyID0gcmVzb2x2ZShwcm9jZXNzLmN3ZCgpLCBvcHRpb25zLmFyZ3NbJy0tZGlyJ10gfHwgJy4nKVxuICBhd2FpdCB2YWxpZGF0ZUV4aXN0aW5nUHJvamVjdChvcHRpb25zLmNvbXBvbmVudHMsIGRpcilcbiAgYXdhaXQgdmFsaWRhdGVTY2VuZU9wdGlvbnMob3B0aW9ucy5jb21wb25lbnRzLCBkaXIpXG5cbiAgY29uc3QgcG9ydCA9IG9wdGlvbnMuYXJnc1snLS1wb3J0J10gfHwgKGF3YWl0IHByZXZpZXdQb3J0KCkpXG4gIGNvbnN0IHN0YXJ0ZWRGdXR1cmUgPSBmdXR1cmU8dm9pZD4oKVxuXG4gIHNldFRpbWVvdXQoKCkgPT4gc3RhcnRlZEZ1dHVyZS5yZWplY3QobmV3IEVycm9yKCdUaW1lZCBvdXQgc3RhcnRpbmcgdGhlIHNlcnZlcicpKSwgMzAwMClcblxuICBhd2FpdCBMaWZlY3ljbGUucnVuPFByZXZpZXdDb21wb25lbnRzPih7XG4gICAgYXN5bmMgaW5pdENvbXBvbmVudHMoKSB7XG4gICAgICBjb25zdCBtZXRyaWNzID0gY3JlYXRlVGVzdE1ldHJpY3NDb21wb25lbnQocm9vbXNNZXRyaWNzKVxuICAgICAgY29uc3QgY29uZmlnID0gY3JlYXRlUmVjb3JkQ29uZmlnQ29tcG9uZW50KHtcbiAgICAgICAgSFRUUF9TRVJWRVJfUE9SVDogcG9ydC50b1N0cmluZygpLFxuICAgICAgICBIVFRQX1NFUlZFUl9IT1NUOiAnMC4wLjAuMCcsXG4gICAgICAgIC4uLnByb2Nlc3MuZW52XG4gICAgICB9KVxuICAgICAgY29uc3QgbG9ncyA9IGF3YWl0IGNyZWF0ZUNvbnNvbGVMb2dDb21wb25lbnQoe30pXG4gICAgICBjb25zdCB3cyA9IGF3YWl0IGNyZWF0ZVdzQ29tcG9uZW50KHsgbG9ncyB9KVxuICAgICAgY29uc3Qgc2VydmVyID0gYXdhaXQgY3JlYXRlU2VydmVyQ29tcG9uZW50PFByZXZpZXdDb21wb25lbnRzPih7IGNvbmZpZywgbG9ncywgd3M6IHdzLndzIH0sIHsgY29yczoge30gfSlcbiAgICAgIGNvbnN0IHJvb21zID0gYXdhaXQgY3JlYXRlUm9vbXNDb21wb25lbnQoe1xuICAgICAgICBtZXRyaWNzLFxuICAgICAgICBsb2dzLFxuICAgICAgICBjb25maWdcbiAgICAgIH0pXG5cbiAgICAgIHJldHVybiB7XG4gICAgICAgIGxvZ3MsXG4gICAgICAgIGV0aGVyZXVtUHJvdmlkZXI6IHByb3ZpZGVySW5zdGFuY2UsXG4gICAgICAgIHJvb21zLFxuICAgICAgICBjb25maWcsXG4gICAgICAgIG1ldHJpY3MsXG4gICAgICAgIHNlcnZlcixcbiAgICAgICAgd3NcbiAgICAgIH1cbiAgICB9LFxuICAgIGFzeW5jIG1haW4oeyBjb21wb25lbnRzLCBzdGFydENvbXBvbmVudHMgfSkge1xuICAgICAgdHJ5IHtcbiAgICAgICAgYXdhaXQgd2lyZShkaXIsIGNvbXBvbmVudHMsICEhb3B0aW9ucy5hcmdzWyctLXdhdGNoJ10pXG4gICAgICAgIGF3YWl0IHN0YXJ0Q29tcG9uZW50cygpXG4gICAgICAgIHN0YXJ0ZWRGdXR1cmUucmVzb2x2ZSgpXG4gICAgICB9IGNhdGNoIChlcnI6IGFueSkge1xuICAgICAgICBzdGFydGVkRnV0dXJlLnJlamVjdChlcnIpXG4gICAgICB9XG4gICAgfVxuICB9KVxuXG4gIC8vIGJ1YmJsZSB1cCB0aGUgZXhjZXB0aW9uIGlmIHN0YXJ0ZWRGdXR1cmUgd2FzIHJlamVjdGVkXG4gIGF3YWl0IHN0YXJ0ZWRGdXR1cmVcblxuICByZXR1cm5cbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSwrQkFBOEI7QUFDOUIsMERBQThCO0FBQzlCLGtFQUE2RTtBQUM3RSwrREFBd0Y7QUFDeEYsb0ZBQXdGO0FBQ3hGLG9FQUEwRTtBQUMxRSwwREFBeUU7QUFDekUsNERBQTJFO0FBQzNFLDZCQUF3QztBQUd4QywyQ0FBMEM7QUFFMUMsdUNBQXlFO0FBQ3pFLGlDQUFvQztBQUNwQywrQkFBd0M7QUFDeEMsaUNBQTZCO0FBRTdCLFNBQWdCLElBQUk7SUFDbEIsT0FBTyxFQUFFLENBQUE7QUFDWCxDQUFDO0FBRkQsb0JBRUM7QUFPWSxRQUFBLElBQUksR0FBRyxJQUFBLGNBQU8sRUFBQztJQUMxQixTQUFTLEVBQUUsT0FBTztJQUNsQixJQUFJLEVBQUUsU0FBUztJQUNmLE9BQU8sRUFBRSxNQUFNO0lBQ2YsUUFBUSxFQUFFLE1BQU07SUFDaEIsSUFBSSxFQUFFLFFBQVE7Q0FDZixDQUFDLENBQUE7QUFJSyxLQUFLLFVBQVUsSUFBSSxDQUFDLE9BQWdCO0lBQ3pDLE1BQU0sR0FBRyxHQUFHLElBQUEsY0FBTyxFQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEdBQUcsQ0FBQyxDQUFBO0lBQ2hFLE1BQU0sSUFBQSxpQ0FBdUIsRUFBQyxPQUFPLENBQUMsVUFBVSxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBQ3RELE1BQU0sSUFBQSw4QkFBb0IsRUFBQyxPQUFPLENBQUMsVUFBVSxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBRW5ELE1BQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxNQUFNLElBQUEsa0JBQVcsR0FBRSxDQUFDLENBQUE7SUFFNUQsTUFBTSxPQUFPLEdBQUcsTUFBTSxzQkFBUyxDQUFDLEdBQUcsQ0FBb0I7UUFDckQsS0FBSyxDQUFDLGNBQWM7WUFDbEIsTUFBTSxPQUFPLEdBQUcsSUFBQSxvQ0FBMEIsRUFBQyxvQkFBWSxDQUFDLENBQUE7WUFDeEQsTUFBTSxNQUFNLEdBQUcsSUFBQSxpREFBMkIsa0JBQ3hDLGdCQUFnQixFQUFFLElBQUksQ0FBQyxRQUFRLEVBQUUsRUFDakMsZ0JBQWdCLEVBQUUsU0FBUyxJQUN4QixPQUFPLENBQUMsR0FBRyxFQUNkLENBQUE7WUFDRixNQUFNLElBQUksR0FBRyxNQUFNLElBQUEsa0NBQXlCLEVBQUMsRUFBRSxDQUFDLENBQUE7WUFDaEQsTUFBTSxFQUFFLEdBQUcsTUFBTSxJQUFBLHNCQUFpQixFQUFDLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQTtZQUM1QyxNQUFNLE1BQU0sR0FBRyxNQUFNLElBQUEsbUNBQXFCLEVBQW9CLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsRUFBRSxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUE7WUFDeEcsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFBLDRCQUFvQixFQUFDO2dCQUN2QyxPQUFPO2dCQUNQLElBQUk7Z0JBQ0osTUFBTTthQUNQLENBQUMsQ0FBQTtZQUVGLE1BQU0sYUFBYSxHQUFHLElBQUEsbUJBQU0sR0FBUSxDQUFBO1lBQ3BDLE1BQU0sUUFBUSxHQUF3QztnQkFDcEQsYUFBYTtnQkFDYixLQUFLLENBQUMsSUFBSTtvQkFHUixhQUFhLENBQUMsT0FBTyxFQUFFLENBQUE7Z0JBQ3pCLENBQUM7YUFDRixDQUFBO1lBRUQsT0FBTztnQkFDTCxJQUFJO2dCQUNKLGdCQUFnQixFQUFFLHNCQUFnQjtnQkFDbEMsS0FBSztnQkFDTCxNQUFNO2dCQUNOLE9BQU87Z0JBQ1AsTUFBTTtnQkFDTixFQUFFO2dCQUNGLFFBQVE7YUFDVCxDQUFBO1FBQ0gsQ0FBQztRQUNELEtBQUssQ0FBQyxJQUFJLENBQUMsRUFBRSxVQUFVLEVBQUUsZUFBZSxFQUFFO1lBQ3hDLE1BQU0sSUFBQSxXQUFJLEVBQUMsR0FBRyxFQUFFLFVBQVUsQ0FBQyxDQUFBO1lBQzNCLE1BQU0sZUFBZSxFQUFFLENBQUE7UUFDekIsQ0FBQztLQUNGLENBQUMsQ0FBQTtJQUVGLE9BQU8sT0FBTyxDQUFBO0FBQ2hCLENBQUM7QUFwREQsb0JBb0RDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgcmVzb2x2ZSB9IGZyb20gJ3BhdGgnXG5pbXBvcnQgZnV0dXJlIGZyb20gJ2ZwLWZ1dHVyZSdcbmltcG9ydCB7IExpZmVjeWNsZSwgSUJhc2VDb21wb25lbnQgfSBmcm9tICdAd2VsbC1rbm93bi1jb21wb25lbnRzL2ludGVyZmFjZXMnXG5pbXBvcnQgeyByb29tc01ldHJpY3MsIGNyZWF0ZVJvb21zQ29tcG9uZW50IH0gZnJvbSAnQGRjbC9taW5pLWNvbW1zL2Rpc3QvYWRhcHRlcnMvcm9vbXMnXG5pbXBvcnQgeyBjcmVhdGVSZWNvcmRDb25maWdDb21wb25lbnQgfSBmcm9tICdAd2VsbC1rbm93bi1jb21wb25lbnRzL2Vudi1jb25maWctcHJvdmlkZXInXG5pbXBvcnQgeyBjcmVhdGVTZXJ2ZXJDb21wb25lbnQgfSBmcm9tICdAd2VsbC1rbm93bi1jb21wb25lbnRzL2h0dHAtc2VydmVyJ1xuaW1wb3J0IHsgY3JlYXRlQ29uc29sZUxvZ0NvbXBvbmVudCB9IGZyb20gJ0B3ZWxsLWtub3duLWNvbXBvbmVudHMvbG9nZ2VyJ1xuaW1wb3J0IHsgY3JlYXRlVGVzdE1ldHJpY3NDb21wb25lbnQgfSBmcm9tICdAd2VsbC1rbm93bi1jb21wb25lbnRzL21ldHJpY3MnXG5pbXBvcnQgeyBjcmVhdGVXc0NvbXBvbmVudCB9IGZyb20gJy4vd3MnXG5cbmltcG9ydCB7IENsaUNvbXBvbmVudHMgfSBmcm9tICcuLi8uLi9jb21wb25lbnRzJ1xuaW1wb3J0IHsgZ2V0QXJncyB9IGZyb20gJy4uLy4uL3V0aWxzL2FyZ3MnXG5pbXBvcnQgeyBJU2lnbmFsZXJDb21wb25lbnQsIFByZXZpZXdDb21wb25lbnRzIH0gZnJvbSAnLi90eXBlcydcbmltcG9ydCB7IHZhbGlkYXRlRXhpc3RpbmdQcm9qZWN0LCB2YWxpZGF0ZVNjZW5lT3B0aW9ucyB9IGZyb20gJy4vcHJvamVjdCdcbmltcG9ydCB7IHByZXZpZXdQb3J0IH0gZnJvbSAnLi9wb3J0J1xuaW1wb3J0IHsgcHJvdmlkZXJJbnN0YW5jZSB9IGZyb20gJy4vZXRoJ1xuaW1wb3J0IHsgd2lyZSB9IGZyb20gJy4vd2lyZSdcblxuZXhwb3J0IGZ1bmN0aW9uIGhlbHAoKSB7XG4gIHJldHVybiBgYFxufVxuXG5pbnRlcmZhY2UgT3B0aW9ucyB7XG4gIGFyZ3M6IE9taXQ8dHlwZW9mIGFyZ3MsICdfJz5cbiAgY29tcG9uZW50czogUGljazxDbGlDb21wb25lbnRzLCAnZmV0Y2gnIHwgJ2ZzJz5cbn1cblxuZXhwb3J0IGNvbnN0IGFyZ3MgPSBnZXRBcmdzKHtcbiAgJy0td2F0Y2gnOiBCb29sZWFuLFxuICAnLXcnOiAnLS13YXRjaCcsXG4gICctLWRpcic6IFN0cmluZyxcbiAgJy0tcG9ydCc6IE51bWJlcixcbiAgJy1wJzogJy0tcG9ydCdcbn0pXG5cbi8vIGNvcHkvcGFzdGUgZnJvbSBodHRwczovL2dpdGh1Yi5jb20vZGVjZW50cmFsYW5kL2NsaS9ibG9iLzMyZGU5NmJjZmM0ZWYxYzI2YzU1ODBjNzc2N2FkNmM4Y2FjM2IzNjcvc3JjL2xpYi9EZWNlbnRyYWxhbmQudHNcbi8vIFRPRE86IHJlZmFjdG9yIHRoaXMgc3R1ZmYgY29tcGxldGVseVxuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIG1haW4ob3B0aW9uczogT3B0aW9ucykge1xuICBjb25zdCBkaXIgPSByZXNvbHZlKHByb2Nlc3MuY3dkKCksIG9wdGlvbnMuYXJnc1snLS1kaXInXSB8fCAnLicpXG4gIGF3YWl0IHZhbGlkYXRlRXhpc3RpbmdQcm9qZWN0KG9wdGlvbnMuY29tcG9uZW50cywgZGlyKVxuICBhd2FpdCB2YWxpZGF0ZVNjZW5lT3B0aW9ucyhvcHRpb25zLmNvbXBvbmVudHMsIGRpcilcblxuICBjb25zdCBwb3J0ID0gb3B0aW9ucy5hcmdzWyctLXBvcnQnXSB8fCAoYXdhaXQgcHJldmlld1BvcnQoKSlcblxuICBjb25zdCBwcm9ncmFtID0gYXdhaXQgTGlmZWN5Y2xlLnJ1bjxQcmV2aWV3Q29tcG9uZW50cz4oe1xuICAgIGFzeW5jIGluaXRDb21wb25lbnRzKCkge1xuICAgICAgY29uc3QgbWV0cmljcyA9IGNyZWF0ZVRlc3RNZXRyaWNzQ29tcG9uZW50KHJvb21zTWV0cmljcylcbiAgICAgIGNvbnN0IGNvbmZpZyA9IGNyZWF0ZVJlY29yZENvbmZpZ0NvbXBvbmVudCh7XG4gICAgICAgIEhUVFBfU0VSVkVSX1BPUlQ6IHBvcnQudG9TdHJpbmcoKSxcbiAgICAgICAgSFRUUF9TRVJWRVJfSE9TVDogJzAuMC4wLjAnLFxuICAgICAgICAuLi5wcm9jZXNzLmVudlxuICAgICAgfSlcbiAgICAgIGNvbnN0IGxvZ3MgPSBhd2FpdCBjcmVhdGVDb25zb2xlTG9nQ29tcG9uZW50KHt9KVxuICAgICAgY29uc3Qgd3MgPSBhd2FpdCBjcmVhdGVXc0NvbXBvbmVudCh7IGxvZ3MgfSlcbiAgICAgIGNvbnN0IHNlcnZlciA9IGF3YWl0IGNyZWF0ZVNlcnZlckNvbXBvbmVudDxQcmV2aWV3Q29tcG9uZW50cz4oeyBjb25maWcsIGxvZ3MsIHdzOiB3cy53cyB9LCB7IGNvcnM6IHt9IH0pXG4gICAgICBjb25zdCByb29tcyA9IGF3YWl0IGNyZWF0ZVJvb21zQ29tcG9uZW50KHtcbiAgICAgICAgbWV0cmljcyxcbiAgICAgICAgbG9ncyxcbiAgICAgICAgY29uZmlnXG4gICAgICB9KVxuXG4gICAgICBjb25zdCBwcm9ncmFtQ2xvc2VkID0gZnV0dXJlPHZvaWQ+KClcbiAgICAgIGNvbnN0IHNpZ25hbGVyOiBJQmFzZUNvbXBvbmVudCAmIElTaWduYWxlckNvbXBvbmVudCA9IHtcbiAgICAgICAgcHJvZ3JhbUNsb3NlZCxcbiAgICAgICAgYXN5bmMgc3RvcCgpIHtcbiAgICAgICAgICAvLyB0aGlzIHByb21pc2UgaXMgcmVzb2x2ZWQgdXBvbiBTSUdURVJNIG9yIFNJR0hVUFxuICAgICAgICAgIC8vIG9yIHdoZW4gcHJvZ3JhbS5zdG9wIGlzIGNhbGxlZFxuICAgICAgICAgIHByb2dyYW1DbG9zZWQucmVzb2x2ZSgpXG4gICAgICAgIH1cbiAgICAgIH1cblxuICAgICAgcmV0dXJuIHtcbiAgICAgICAgbG9ncyxcbiAgICAgICAgZXRoZXJldW1Qcm92aWRlcjogcHJvdmlkZXJJbnN0YW5jZSxcbiAgICAgICAgcm9vbXMsXG4gICAgICAgIGNvbmZpZyxcbiAgICAgICAgbWV0cmljcyxcbiAgICAgICAgc2VydmVyLFxuICAgICAgICB3cyxcbiAgICAgICAgc2lnbmFsZXJcbiAgICAgIH1cbiAgICB9LFxuICAgIGFzeW5jIG1haW4oeyBjb21wb25lbnRzLCBzdGFydENvbXBvbmVudHMgfSkge1xuICAgICAgYXdhaXQgd2lyZShkaXIsIGNvbXBvbmVudHMpXG4gICAgICBhd2FpdCBzdGFydENvbXBvbmVudHMoKVxuICAgIH1cbiAgfSlcblxuICByZXR1cm4gcHJvZ3JhbVxufVxuIl19

package/cli/commands/preview/index.ts

@@ -1,16 +1,16 @@
 import { resolve } from 'path'
-import { Lifecycle } from '@well-known-components/interfaces'
+import future from 'fp-future'
+import { Lifecycle, IBaseComponent } from '@well-known-components/interfaces'
 import { roomsMetrics, createRoomsComponent } from '@dcl/mini-comms/dist/adapters/rooms'
 import { createRecordConfigComponent } from '@well-known-components/env-config-provider'
 import { createServerComponent } from '@well-known-components/http-server'
 import { createConsoleLogComponent } from '@well-known-components/logger'
 import { createTestMetricsComponent } from '@well-known-components/metrics'
 import { createWsComponent } from './ws'
-import future from 'fp-future'
 
 import { CliComponents } from '../../components'
 import { getArgs } from '../../utils/args'
-import { PreviewComponents } from './types'
+import { ISignalerComponent, PreviewComponents } from './types'
 import { validateExistingProject, validateSceneOptions } from './project'
 import { previewPort } from './port'
 import { providerInstance } from './eth'
@@ -41,11 +41,8 @@ export async function main(options: Options) {
   await validateSceneOptions(options.components, dir)
 
   const port = options.args['--port'] || (await previewPort())
-  const startedFuture = future<void>()
 
-  setTimeout(() => startedFuture.reject(new Error('Timed out starting the server')), 3000)
-
-  await Lifecycle.run<PreviewComponents>({
+  const program = await Lifecycle.run<PreviewComponents>({
     async initComponents() {
       const metrics = createTestMetricsComponent(roomsMetrics)
       const config = createRecordConfigComponent({
@@ -62,6 +59,16 @@ export async function main(options: Options) {
         config
       })
 
+      const programClosed = future<void>()
+      const signaler: IBaseComponent & ISignalerComponent = {
+        programClosed,
+        async stop() {
+          // this promise is resolved upon SIGTERM or SIGHUP
+          // or when program.stop is called
+          programClosed.resolve()
+        }
+      }
+
       return {
         logs,
         ethereumProvider: providerInstance,
@@ -69,22 +76,15 @@ export async function main(options: Options) {
         config,
         metrics,
         server,
-        ws
+        ws,
+        signaler
       }
     },
     async main({ components, startComponents }) {
-      try {
-        await wire(dir, components, !!options.args['--watch'])
-        await startComponents()
-        startedFuture.resolve()
-      } catch (err: any) {
-        startedFuture.reject(err)
-      }
+      await wire(dir, components)
+      await startComponents()
     }
   })
 
-  // bubble up the exception if startedFuture was rejected
-  await startedFuture
-
-  return
+  return program
 }

package/cli/commands/preview/types.d.ts

@@ -10,4 +10,8 @@ export type PreviewComponents = {
     ethereumProvider: HTTPProvider;
     rooms: RoomComponent;
     ws: WebSocketComponent;
+    signaler: ISignalerComponent;
+};
+export type ISignalerComponent = {
+    programClosed: Promise<void>;
 };

package/cli/commands/preview/types.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ0eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgSUxvZ2dlckNvbXBvbmVudCxcbiAgSU1ldHJpY3NDb21wb25lbnQsXG4gIElIdHRwU2VydmVyQ29tcG9uZW50LFxuICBJQ29uZmlnQ29tcG9uZW50XG59IGZyb20gJ0B3ZWxsLWtub3duLWNvbXBvbmVudHMvaW50ZXJmYWNlcydcbmltcG9ydCB7IEhUVFBQcm92aWRlciB9IGZyb20gJ2V0aC1jb25uZWN0J1xuaW1wb3J0IHsgUm9vbUNvbXBvbmVudCB9IGZyb20gJ0BkY2wvbWluaS1jb21tcy9kaXN0L2FkYXB0ZXJzL3Jvb21zJ1xuaW1wb3J0IHsgV2ViU29ja2V0Q29tcG9uZW50IH0gZnJvbSAnLi93cydcblxuZXhwb3J0IHR5cGUgUHJldmlld0NvbXBvbmVudHMgPSB7XG4gIGxvZ3M6IElMb2dnZXJDb21wb25lbnRcbiAgc2VydmVyOiBJSHR0cFNlcnZlckNvbXBvbmVudDxQcmV2aWV3Q29tcG9uZW50cz5cbiAgY29uZmlnOiBJQ29uZmlnQ29tcG9uZW50XG4gIG1ldHJpY3M6IElNZXRyaWNzQ29tcG9uZW50PGFueT5cbiAgZXRoZXJldW1Qcm92aWRlcjogSFRUUFByb3ZpZGVyXG4gIHJvb21zOiBSb29tQ29tcG9uZW50XG4gIHdzOiBXZWJTb2NrZXRDb21wb25lbnRcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ0eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgSUxvZ2dlckNvbXBvbmVudCxcbiAgSU1ldHJpY3NDb21wb25lbnQsXG4gIElIdHRwU2VydmVyQ29tcG9uZW50LFxuICBJQ29uZmlnQ29tcG9uZW50XG59IGZyb20gJ0B3ZWxsLWtub3duLWNvbXBvbmVudHMvaW50ZXJmYWNlcydcbmltcG9ydCB7IEhUVFBQcm92aWRlciB9IGZyb20gJ2V0aC1jb25uZWN0J1xuaW1wb3J0IHsgUm9vbUNvbXBvbmVudCB9IGZyb20gJ0BkY2wvbWluaS1jb21tcy9kaXN0L2FkYXB0ZXJzL3Jvb21zJ1xuaW1wb3J0IHsgV2ViU29ja2V0Q29tcG9uZW50IH0gZnJvbSAnLi93cydcblxuZXhwb3J0IHR5cGUgUHJldmlld0NvbXBvbmVudHMgPSB7XG4gIGxvZ3M6IElMb2dnZXJDb21wb25lbnRcbiAgc2VydmVyOiBJSHR0cFNlcnZlckNvbXBvbmVudDxQcmV2aWV3Q29tcG9uZW50cz5cbiAgY29uZmlnOiBJQ29uZmlnQ29tcG9uZW50XG4gIG1ldHJpY3M6IElNZXRyaWNzQ29tcG9uZW50PGFueT5cbiAgZXRoZXJldW1Qcm92aWRlcjogSFRUUFByb3ZpZGVyXG4gIHJvb21zOiBSb29tQ29tcG9uZW50XG4gIHdzOiBXZWJTb2NrZXRDb21wb25lbnRcbiAgc2lnbmFsZXI6IElTaWduYWxlckNvbXBvbmVudFxufVxuXG5leHBvcnQgdHlwZSBJU2lnbmFsZXJDb21wb25lbnQgPSB7XG4gIC8vIHByb2dyYW1DbG9zZWQgcmVzb2x2ZXMgd2hlbiB0aGUgY29tcG9uZW50IGlzIHN0b3BwZWRcbiAgcHJvZ3JhbUNsb3NlZDogUHJvbWlzZTx2b2lkPlxufVxuIl19

package/cli/commands/preview/types.ts

@@ -16,4 +16,10 @@ export type PreviewComponents = {
   ethereumProvider: HTTPProvider
   rooms: RoomComponent
   ws: WebSocketComponent
+  signaler: ISignalerComponent
+}
+
+export type ISignalerComponent = {
+  // programClosed resolves when the component is stopped
+  programClosed: Promise<void>
 }

package/cli/commands/preview/wire.d.ts

@@ -1,14 +1,2 @@
-import { ILoggerComponent, IMetricsComponent, IHttpServerComponent, IConfigComponent } from '@well-known-components/interfaces';
-import { HTTPProvider } from 'eth-connect';
-import { RoomComponent } from '@dcl/mini-comms/dist/adapters/rooms';
-import { WebSocketComponent } from './ws';
-export type PreviewComponents = {
-    logs: ILoggerComponent;
-    server: IHttpServerComponent<PreviewComponents>;
-    config: IConfigComponent;
-    metrics: IMetricsComponent<any>;
-    ethereumProvider: HTTPProvider;
-    rooms: RoomComponent;
-    ws: WebSocketComponent;
-};
-export declare function wire(dir: string, components: PreviewComponents, watch?: boolean): Promise<void>;
+import { PreviewComponents } from './types';
+export declare function wire(dir: string, components: PreviewComponents): Promise<void>;

package/cli/commands/preview/wire.js

@@ -10,7 +10,7 @@ const bff_1 = require("./bff");
 const http_server_1 = require("@well-known-components/http-server");
 const endpoints_1 = require("./endpoints");
 const error_1 = require("../../utils/error");
-async function wire(dir, components, watch = false) {
+async function wire(dir, components) {
     const npmModulesPath = path_1.default.resolve(dir, 'node_modules');
     if (!fs_extra_1.default.pathExistsSync(npmModulesPath)) {
         throw new error_1.CliError(`Couldn\'t find ${npmModulesPath}, please run: npm install`);
@@ -18,11 +18,9 @@ async function wire(dir, components, watch = false) {
     const router = new http_server_1.Router();
     await (0, bff_1.setupBffAndComms)(components, router);
     (0, endpoints_1.setupEcs6Endpoints)(dir, router);
-    if (watch) {
-    }
     components.server.setContext(components);
     components.server.use(router.allowedMethods());
     components.server.use(router.middleware());
 }
 exports.wire = wire;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2lyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIndpcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsZ0RBQXVCO0FBQ3ZCLHdEQUF5QjtBQUV6QiwrQkFBd0M7QUFTeEMsb0VBQTJEO0FBRTNELDJDQUFnRDtBQUNoRCw2Q0FBNEM7QUFZckMsS0FBSyxVQUFVLElBQUksQ0FBQyxHQUFXLEVBQUUsVUFBNkIsRUFBRSxRQUFpQixLQUFLO0lBQzNGLE1BQU0sY0FBYyxHQUFHLGNBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLGNBQWMsQ0FBQyxDQUFBO0lBR3hELElBQUksQ0FBQyxrQkFBRSxDQUFDLGNBQWMsQ0FBQyxjQUFjLENBQUMsRUFBRTtRQUN0QyxNQUFNLElBQUksZ0JBQVEsQ0FBQyxrQkFBa0IsY0FBYywyQkFBMkIsQ0FBQyxDQUFBO0tBQ2hGO0lBRUQsTUFBTSxNQUFNLEdBQUcsSUFBSSxvQkFBTSxFQUFxQixDQUFBO0lBRTlDLE1BQU0sSUFBQSxzQkFBZ0IsRUFBQyxVQUFVLEVBQUUsTUFBTSxDQUFDLENBQUE7SUFDMUMsSUFBQSw4QkFBa0IsRUFBQyxHQUFHLEVBQUUsTUFBTSxDQUFDLENBQUE7SUFDL0IsSUFBSSxLQUFLLEVBQUU7S0FHVjtJQUVELFVBQVUsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxDQUFBO0lBQ3hDLFVBQVUsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxjQUFjLEVBQUUsQ0FBQyxDQUFBO0lBQzlDLFVBQVUsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUFBO0FBQzVDLENBQUM7QUFwQkQsb0JBb0JDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHBhdGggZnJvbSAncGF0aCdcbmltcG9ydCBmcyBmcm9tICdmcy1leHRyYSdcblxuaW1wb3J0IHsgc2V0dXBCZmZBbmRDb21tcyB9IGZyb20gJy4vYmZmJ1xuaW1wb3J0IHtcbiAgSUxvZ2dlckNvbXBvbmVudCxcbiAgSU1ldHJpY3NDb21wb25lbnQsXG4gIElIdHRwU2VydmVyQ29tcG9uZW50LFxuICBJQ29uZmlnQ29tcG9uZW50XG59IGZyb20gJ0B3ZWxsLWtub3duLWNvbXBvbmVudHMvaW50ZXJmYWNlcydcbmltcG9ydCB7IEhUVFBQcm92aWRlciB9IGZyb20gJ2V0aC1jb25uZWN0J1xuaW1wb3J0IHsgUm9vbUNvbXBvbmVudCB9IGZyb20gJ0BkY2wvbWluaS1jb21tcy9kaXN0L2FkYXB0ZXJzL3Jvb21zJ1xuaW1wb3J0IHsgUm91dGVyIH0gZnJvbSAnQHdlbGwta25vd24tY29tcG9uZW50cy9odHRwLXNlcnZlcidcbmltcG9ydCB7IFdlYlNvY2tldENvbXBvbmVudCB9IGZyb20gJy4vd3MnXG5pbXBvcnQgeyBzZXR1cEVjczZFbmRwb2ludHMgfSBmcm9tICcuL2VuZHBvaW50cydcbmltcG9ydCB7IENsaUVycm9yIH0gZnJvbSAnLi4vLi4vdXRpbHMvZXJyb3InXG5cbmV4cG9ydCB0eXBlIFByZXZpZXdDb21wb25lbnRzID0ge1xuICBsb2dzOiBJTG9nZ2VyQ29tcG9uZW50XG4gIHNlcnZlcjogSUh0dHBTZXJ2ZXJDb21wb25lbnQ8UHJldmlld0NvbXBvbmVudHM+XG4gIGNvbmZpZzogSUNvbmZpZ0NvbXBvbmVudFxuICBtZXRyaWNzOiBJTWV0cmljc0NvbXBvbmVudDxhbnk+XG4gIGV0aGVyZXVtUHJvdmlkZXI6IEhUVFBQcm92aWRlclxuICByb29tczogUm9vbUNvbXBvbmVudFxuICB3czogV2ViU29ja2V0Q29tcG9uZW50XG59XG5cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiB3aXJlKGRpcjogc3RyaW5nLCBjb21wb25lbnRzOiBQcmV2aWV3Q29tcG9uZW50cywgd2F0Y2g6IGJvb2xlYW4gPSBmYWxzZSkge1xuICBjb25zdCBucG1Nb2R1bGVzUGF0aCA9IHBhdGgucmVzb2x2ZShkaXIsICdub2RlX21vZHVsZXMnKVxuXG4gIC8vIFRPRE86IGRjbC5wcm9qZWN0Lm5lZWRzRGVwZW5kZW5jaWVzKCkgc2hvdWxkIGRvIHRoaXNcbiAgaWYgKCFmcy5wYXRoRXhpc3RzU3luYyhucG1Nb2R1bGVzUGF0aCkpIHtcbiAgICB0aHJvdyBuZXcgQ2xpRXJyb3IoYENvdWxkblxcJ3QgZmluZCAke25wbU1vZHVsZXNQYXRofSwgcGxlYXNlIHJ1bjogbnBtIGluc3RhbGxgKVxuICB9XG5cbiAgY29uc3Qgcm91dGVyID0gbmV3IFJvdXRlcjxQcmV2aWV3Q29tcG9uZW50cz4oKVxuXG4gIGF3YWl0IHNldHVwQmZmQW5kQ29tbXMoY29tcG9uZW50cywgcm91dGVyKVxuICBzZXR1cEVjczZFbmRwb2ludHMoZGlyLCByb3V0ZXIpXG4gIGlmICh3YXRjaCkge1xuICAgIC8vIGFkZCBcIndhdGNoXCJcbiAgICAvLyBhd2FpMnQgYmluZFdhdGNoKGNvbXBvbmVudHMsIHNjZW5lVXBkYXRlQ2xpZW50cylcbiAgfVxuXG4gIGNvbXBvbmVudHMuc2VydmVyLnNldENvbnRleHQoY29tcG9uZW50cylcbiAgY29tcG9uZW50cy5zZXJ2ZXIudXNlKHJvdXRlci5hbGxvd2VkTWV0aG9kcygpKVxuICBjb21wb25lbnRzLnNlcnZlci51c2Uocm91dGVyLm1pZGRsZXdhcmUoKSlcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2lyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIndpcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsZ0RBQXVCO0FBQ3ZCLHdEQUF5QjtBQUV6QiwrQkFBd0M7QUFDeEMsb0VBQTJEO0FBQzNELDJDQUFnRDtBQUNoRCw2Q0FBNEM7QUFHckMsS0FBSyxVQUFVLElBQUksQ0FBQyxHQUFXLEVBQUUsVUFBNkI7SUFDbkUsTUFBTSxjQUFjLEdBQUcsY0FBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsY0FBYyxDQUFDLENBQUE7SUFHeEQsSUFBSSxDQUFDLGtCQUFFLENBQUMsY0FBYyxDQUFDLGNBQWMsQ0FBQyxFQUFFO1FBQ3RDLE1BQU0sSUFBSSxnQkFBUSxDQUFDLGtCQUFrQixjQUFjLDJCQUEyQixDQUFDLENBQUE7S0FDaEY7SUFFRCxNQUFNLE1BQU0sR0FBRyxJQUFJLG9CQUFNLEVBQXFCLENBQUE7SUFFOUMsTUFBTSxJQUFBLHNCQUFnQixFQUFDLFVBQVUsRUFBRSxNQUFNLENBQUMsQ0FBQTtJQUMxQyxJQUFBLDhCQUFrQixFQUFDLEdBQUcsRUFBRSxNQUFNLENBQUMsQ0FBQTtJQUUvQixVQUFVLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQTtJQUN4QyxVQUFVLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsY0FBYyxFQUFFLENBQUMsQ0FBQTtJQUM5QyxVQUFVLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FBQTtBQUM1QyxDQUFDO0FBaEJELG9CQWdCQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBwYXRoIGZyb20gJ3BhdGgnXG5pbXBvcnQgZnMgZnJvbSAnZnMtZXh0cmEnXG5cbmltcG9ydCB7IHNldHVwQmZmQW5kQ29tbXMgfSBmcm9tICcuL2JmZidcbmltcG9ydCB7IFJvdXRlciB9IGZyb20gJ0B3ZWxsLWtub3duLWNvbXBvbmVudHMvaHR0cC1zZXJ2ZXInXG5pbXBvcnQgeyBzZXR1cEVjczZFbmRwb2ludHMgfSBmcm9tICcuL2VuZHBvaW50cydcbmltcG9ydCB7IENsaUVycm9yIH0gZnJvbSAnLi4vLi4vdXRpbHMvZXJyb3InXG5pbXBvcnQgeyBQcmV2aWV3Q29tcG9uZW50cyB9IGZyb20gJy4vdHlwZXMnXG5cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiB3aXJlKGRpcjogc3RyaW5nLCBjb21wb25lbnRzOiBQcmV2aWV3Q29tcG9uZW50cykge1xuICBjb25zdCBucG1Nb2R1bGVzUGF0aCA9IHBhdGgucmVzb2x2ZShkaXIsICdub2RlX21vZHVsZXMnKVxuXG4gIC8vIFRPRE86IGRjbC5wcm9qZWN0Lm5lZWRzRGVwZW5kZW5jaWVzKCkgc2hvdWxkIGRvIHRoaXNcbiAgaWYgKCFmcy5wYXRoRXhpc3RzU3luYyhucG1Nb2R1bGVzUGF0aCkpIHtcbiAgICB0aHJvdyBuZXcgQ2xpRXJyb3IoYENvdWxkblxcJ3QgZmluZCAke25wbU1vZHVsZXNQYXRofSwgcGxlYXNlIHJ1bjogbnBtIGluc3RhbGxgKVxuICB9XG5cbiAgY29uc3Qgcm91dGVyID0gbmV3IFJvdXRlcjxQcmV2aWV3Q29tcG9uZW50cz4oKVxuXG4gIGF3YWl0IHNldHVwQmZmQW5kQ29tbXMoY29tcG9uZW50cywgcm91dGVyKVxuICBzZXR1cEVjczZFbmRwb2ludHMoZGlyLCByb3V0ZXIpXG5cbiAgY29tcG9uZW50cy5zZXJ2ZXIuc2V0Q29udGV4dChjb21wb25lbnRzKVxuICBjb21wb25lbnRzLnNlcnZlci51c2Uocm91dGVyLmFsbG93ZWRNZXRob2RzKCkpXG4gIGNvbXBvbmVudHMuc2VydmVyLnVzZShyb3V0ZXIubWlkZGxld2FyZSgpKVxufVxuIl19

package/cli/commands/preview/wire.ts

@@ -2,30 +2,12 @@ import path from 'path'
 import fs from 'fs-extra'
 
 import { setupBffAndComms } from './bff'
-import {
-  ILoggerComponent,
-  IMetricsComponent,
-  IHttpServerComponent,
-  IConfigComponent
-} from '@well-known-components/interfaces'
-import { HTTPProvider } from 'eth-connect'
-import { RoomComponent } from '@dcl/mini-comms/dist/adapters/rooms'
 import { Router } from '@well-known-components/http-server'
-import { WebSocketComponent } from './ws'
 import { setupEcs6Endpoints } from './endpoints'
 import { CliError } from '../../utils/error'
+import { PreviewComponents } from './types'
 
-export type PreviewComponents = {
-  logs: ILoggerComponent
-  server: IHttpServerComponent<PreviewComponents>
-  config: IConfigComponent
-  metrics: IMetricsComponent<any>
-  ethereumProvider: HTTPProvider
-  rooms: RoomComponent
-  ws: WebSocketComponent
-}
-
-export async function wire(dir: string, components: PreviewComponents, watch: boolean = false) {
+export async function wire(dir: string, components: PreviewComponents) {
   const npmModulesPath = path.resolve(dir, 'node_modules')
 
   // TODO: dcl.project.needsDependencies() should do this
@@ -37,10 +19,6 @@ export async function wire(dir: string, components: PreviewComponents, watch: bo
 
   await setupBffAndComms(components, router)
   setupEcs6Endpoints(dir, router)
-  if (watch) {
-    // add "watch"
-    // awai2t bindWatch(components, sceneUpdateClients)
-  }
 
   components.server.setContext(components)
   components.server.use(router.allowedMethods())

package/cli/commands/start/index.js

@@ -76,7 +76,7 @@ async function main(options) {
     if (watch) {
         await (0, build_1.main)(Object.assign({ args: { '--dir': dir, '--watch': watch } }, comps));
     }
-    await (0, preview_1.main)(Object.assign({ args: { '--dir': dir, '--port': port } }, comps));
+    const server = await (0, preview_1.main)(Object.assign({ args: { '--dir': dir, '--port': port } }, comps));
     const networkInterfaces = os_1.default.networkInterfaces();
     const availableURLs = [];
     console.log(`\nPreview server is now running!`);
@@ -120,6 +120,7 @@ async function main(options) {
             console.log('Unable to open browser automatically.');
         }
     }
+    await server.components.signaler.programClosed;
 }
 exports.main = main;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["import os from 'os'\nimport { resolve } from 'path'\nimport open from 'open'\n\nimport { CliComponents } from '../../components'\nimport { main as build } from '../build'\nimport { main as preview } from '../preview'\nimport { previewPort } from '../preview/port'\nimport { getArgs } from '../../utils/args'\nimport { npmRun } from '../build/helpers'\n\ninterface Options {\n  args: typeof args\n  components: Pick<CliComponents, 'fetch' | 'fs'>\n}\n\nexport const args = getArgs({\n  '--dir': String,\n  '--help': Boolean,\n  '--port': String,\n  '--no-debug': Boolean,\n  '--no-browser': Boolean,\n  '--no-watch': Boolean,\n  '--ci': Boolean,\n  '--skip-install': Boolean,\n  '--web3': Boolean,\n  '-h': '--help',\n  '-p': '--port',\n  '-d': '--no-debug',\n  '-b': '--no-browser',\n  '-w': '--no-watch',\n  '--skip-build': Boolean,\n  '--desktop-client': Boolean\n})\n\nexport function help() {\n  return `\n  Usage: dcl start [options]\n\n    Options:\n\n      -h, --help                Displays complete help\n      -p, --port        [port]  Select a custom port for the development server\n      -d, --no-debug            Disable debugging panel\n      -b, --no-browser          Do not open a new browser window\n      -w, --no-watch            Do not open watch for filesystem changes\n      -c, --ci                  Run the parcel previewer on a remote unix server\n      --web3                    Connects preview to browser wallet to use the associated avatar and account\n      --skip-build              Skip build and only serve the files in preview mode\n      --desktop-client          Show URL to launch preview in the desktop client (BETA)\n\n    Examples:\n\n    - Start a local development server for a Decentraland Scene at port 3500\n\n      $ dcl start -p 3500\n\n    - Start a local development server for a Decentraland Scene at a docker container\n\n      $ dcl start --ci\n`\n}\n\nexport async function main(options: Options) {\n  const dir = resolve(process.cwd(), options.args['--dir'] || '.')\n  const isCi = args['--ci'] || process.env.CI || false\n  const debug = !args['--no-debug'] && !isCi\n  const openBrowser = !args['--no-browser'] && !isCi\n  const skipBuild = args['--skip-build']\n  const watch = !args['--no-watch']\n  const enableWeb3 = args['--web3']\n  const port = parseInt(args['--port']!, 10) || (await previewPort())\n  const baseCoords = { x: 0, y: 0 }\n  const hasPortableExperience = false\n\n  const comps = { components: options.components }\n\n  // first run `npm run build`, this can be disabled with --skip-build\n  if (!skipBuild) {\n    await npmRun(dir, 'build')\n  }\n\n  // then start the embedded compiler, this can be disabled with --no-watch\n  if (watch) {\n    await build({ args: { '--dir': dir, '--watch': watch }, ...comps })\n  }\n\n  // after the watcher is running, start the server\n  await preview({ args: { '--dir': dir, '--port': port }, ...comps })\n\n  const networkInterfaces = os.networkInterfaces()\n  const availableURLs: string[] = []\n\n  console.log(`\\nPreview server is now running!`)\n  console.log('Available on:\\n')\n\n  Object.keys(networkInterfaces).forEach((dev) => {\n    ;(networkInterfaces[dev] || []).forEach((details) => {\n      if (details.family === 'IPv4') {\n        let addr = `http://${details.address}:${port}?position=${baseCoords.x}%2C${baseCoords.y}&ENABLE_ECS7`\n        if (debug) {\n          addr = `${addr}&SCENE_DEBUG_PANEL`\n        }\n        if (enableWeb3 || hasPortableExperience) {\n          addr = `${addr}&ENABLE_WEB3`\n        }\n\n        availableURLs.push(addr)\n      }\n    })\n  })\n\n  // Push localhost and 127.0.0.1 at top\n  const sortedURLs = availableURLs.sort((a, _b) => {\n    return a.toLowerCase().includes('localhost') || a.includes('127.0.0.1') || a.includes('0.0.0.0') ? -1 : 1\n  })\n\n  for (const addr of sortedURLs) {\n    console.log(`    ${addr}`)\n  }\n\n  if (args['--desktop-client']) {\n    console.log('\\n  Desktop client:\\n')\n    for (const addr of sortedURLs) {\n      const searchParams = new URLSearchParams()\n      searchParams.append('PREVIEW-MODE', addr)\n      console.log(`    dcl://${searchParams.toString()}&`)\n    }\n  }\n\n  console.log('\\n  Details:\\n')\n  console.log('\\nPress CTRL+C to exit\\n')\n\n  // Open preferably localhost/127.0.0.1\n  if (openBrowser && sortedURLs.length && !args['--desktop-client']) {\n    try {\n      await open(sortedURLs[0])\n    } catch (_) {\n      console.log('Unable to open browser automatically.')\n    }\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["import os from 'os'\nimport { resolve } from 'path'\nimport open from 'open'\n\nimport { CliComponents } from '../../components'\nimport { main as build } from '../build'\nimport { main as preview } from '../preview'\nimport { previewPort } from '../preview/port'\nimport { getArgs } from '../../utils/args'\nimport { npmRun } from '../build/helpers'\n\ninterface Options {\n  args: typeof args\n  components: Pick<CliComponents, 'fetch' | 'fs'>\n}\n\nexport const args = getArgs({\n  '--dir': String,\n  '--help': Boolean,\n  '--port': String,\n  '--no-debug': Boolean,\n  '--no-browser': Boolean,\n  '--no-watch': Boolean,\n  '--ci': Boolean,\n  '--skip-install': Boolean,\n  '--web3': Boolean,\n  '-h': '--help',\n  '-p': '--port',\n  '-d': '--no-debug',\n  '-b': '--no-browser',\n  '-w': '--no-watch',\n  '--skip-build': Boolean,\n  '--desktop-client': Boolean\n})\n\nexport function help() {\n  return `\n  Usage: dcl start [options]\n\n    Options:\n\n      -h, --help                Displays complete help\n      -p, --port        [port]  Select a custom port for the development server\n      -d, --no-debug            Disable debugging panel\n      -b, --no-browser          Do not open a new browser window\n      -w, --no-watch            Do not open watch for filesystem changes\n      -c, --ci                  Run the parcel previewer on a remote unix server\n      --web3                    Connects preview to browser wallet to use the associated avatar and account\n      --skip-build              Skip build and only serve the files in preview mode\n      --desktop-client          Show URL to launch preview in the desktop client (BETA)\n\n    Examples:\n\n    - Start a local development server for a Decentraland Scene at port 3500\n\n      $ dcl start -p 3500\n\n    - Start a local development server for a Decentraland Scene at a docker container\n\n      $ dcl start --ci\n`\n}\n\nexport async function main(options: Options) {\n  const dir = resolve(process.cwd(), options.args['--dir'] || '.')\n  const isCi = args['--ci'] || process.env.CI || false\n  const debug = !args['--no-debug'] && !isCi\n  const openBrowser = !args['--no-browser'] && !isCi\n  const skipBuild = args['--skip-build']\n  const watch = !args['--no-watch']\n  const enableWeb3 = args['--web3']\n  const port = parseInt(args['--port']!, 10) || (await previewPort())\n  const baseCoords = { x: 0, y: 0 }\n  const hasPortableExperience = false\n\n  const comps = { components: options.components }\n\n  // first run `npm run build`, this can be disabled with --skip-build\n  if (!skipBuild) {\n    await npmRun(dir, 'build')\n  }\n\n  // then start the embedded compiler, this can be disabled with --no-watch\n  if (watch) {\n    await build({ args: { '--dir': dir, '--watch': watch }, ...comps })\n  }\n\n  // after the watcher is running, start the server\n  const server = await preview({ args: { '--dir': dir, '--port': port }, ...comps })\n\n  const networkInterfaces = os.networkInterfaces()\n  const availableURLs: string[] = []\n\n  console.log(`\\nPreview server is now running!`)\n  console.log('Available on:\\n')\n\n  Object.keys(networkInterfaces).forEach((dev) => {\n    ;(networkInterfaces[dev] || []).forEach((details) => {\n      if (details.family === 'IPv4') {\n        let addr = `http://${details.address}:${port}?position=${baseCoords.x}%2C${baseCoords.y}&ENABLE_ECS7`\n        if (debug) {\n          addr = `${addr}&SCENE_DEBUG_PANEL`\n        }\n        if (enableWeb3 || hasPortableExperience) {\n          addr = `${addr}&ENABLE_WEB3`\n        }\n\n        availableURLs.push(addr)\n      }\n    })\n  })\n\n  // Push localhost and 127.0.0.1 at top\n  const sortedURLs = availableURLs.sort((a, _b) => {\n    return a.toLowerCase().includes('localhost') || a.includes('127.0.0.1') || a.includes('0.0.0.0') ? -1 : 1\n  })\n\n  for (const addr of sortedURLs) {\n    console.log(`    ${addr}`)\n  }\n\n  if (args['--desktop-client']) {\n    console.log('\\n  Desktop client:\\n')\n    for (const addr of sortedURLs) {\n      const searchParams = new URLSearchParams()\n      searchParams.append('PREVIEW-MODE', addr)\n      console.log(`    dcl://${searchParams.toString()}&`)\n    }\n  }\n\n  console.log('\\n  Details:\\n')\n  console.log('\\nPress CTRL+C to exit\\n')\n\n  // Open preferably localhost/127.0.0.1\n  if (openBrowser && sortedURLs.length && !args['--desktop-client']) {\n    try {\n      await open(sortedURLs[0])\n    } catch (_) {\n      console.log('Unable to open browser automatically.')\n    }\n  }\n\n  // this signal is resolved by: (wkc)program.stop(), SIGTERM, SIGHUP\n  await server.components.signaler.programClosed\n}\n"]}

package/cli/commands/start/index.ts

@@ -86,7 +86,7 @@ export async function main(options: Options) {
   }
 
   // after the watcher is running, start the server
-  await preview({ args: { '--dir': dir, '--port': port }, ...comps })
+  const server = await preview({ args: { '--dir': dir, '--port': port }, ...comps })
 
   const networkInterfaces = os.networkInterfaces()
   const availableURLs: string[] = []
@@ -139,4 +139,7 @@ export async function main(options: Options) {
       console.log('Unable to open browser automatically.')
     }
   }
+
+  // this signal is resolved by: (wkc)program.stop(), SIGTERM, SIGHUP
+  await server.components.signaler.programClosed
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/sdk",
-  "version": "7.0.6-4087611163.commit-4735f5b",
+  "version": "7.0.6-4087883663.commit-054d424",
   "description": "",
   "main": "./index.js",
   "typings": "./index.d.ts",
@@ -20,13 +20,13 @@
   "author": "Decentraland",
   "license": "Apache-2.0",
   "dependencies": {
-    "@dcl/dcl-rollup": "7.0.6-4087611163.commit-4735f5b",
-    "@dcl/ecs": "7.0.6-4087611163.commit-4735f5b",
+    "@dcl/dcl-rollup": "7.0.6-4087883663.commit-054d424",
+    "@dcl/ecs": "7.0.6-4087883663.commit-054d424",
     "@dcl/ecs-math": "2.0.1-20221129185242.commit-40495c1",
     "@dcl/explorer": "1.0.76945-20230203192753.commit-55553af",
-    "@dcl/js-runtime": "7.0.6-4087611163.commit-4735f5b",
+    "@dcl/js-runtime": "7.0.6-4087883663.commit-054d424",
     "@dcl/mini-comms": "1.0.0",
-    "@dcl/react-ecs": "7.0.6-4087611163.commit-4735f5b",
+    "@dcl/react-ecs": "7.0.6-4087883663.commit-054d424",
     "@dcl/schemas": "6.6.0",
     "@types/inquirer": "^8.2.5",
     "@well-known-components/env-config-provider": "^1.1.2-20220801195549.commit-101c273",
@@ -55,5 +55,5 @@
     "displayName": "SDK",
     "tsconfig": "./tsconfig.json"
   },
-  "commit": "4735f5b60e904595e174bab3edec3a5fd117f838"
+  "commit": "054d424646fc6082e7a29ebf4cc5903454205935"
 }