@dcl/sdk-commands 7.1.4-4495128859.commit-9f954df → 7.1.4-4502579506.commit-4147243

package/dist/commands/deploy/index.js

@@ -60,7 +60,6 @@ async function main(options) {
     const openBrowser = !options.args['--no-browser'];
     const skipBuild = options.args['--skip-build'];
     const linkerPort = options.args['--port'];
-    const { error } = options.components.logger;
     if (options.args['--target'] && options.args['--target-content']) {
         throw new error_1.CliError(`You can't set both the 'target' and 'target-content' arguments.`);
     }
@@ -115,8 +114,8 @@ async function main(options) {
         (0, beautiful_logs_1.printSuccess)(options.components.logger, 'Content uploaded', sceneUrl);
     }
     catch (e) {
-        error('Could not upload content:');
-        console.log(e.message);
+        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.trackSync('Scene deploy success', { ...trackProps, dependencies });

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

@@ -42,7 +42,6 @@ function runLinkerApp(cliComponents, scene, files, port, rootCID, { isHttps, ski
                 components.server.setContext(components);
                 components.server.use(router.allowedMethods());
                 components.server.use(router.middleware());
-                console.log('\x1Bc');
                 await startComponents();
                 if (openBrowser)
                     await browse(cliComponents, url, queryParams);

package/dist/commands/deploy/linker-dapp/catalyst-pointers.d.ts

@@ -16,5 +16,5 @@ export declare function fetchEntityByPointer({ fetch }: Pick<CliComponents, 'fet
     baseUrl: string;
     deployments: Entity[];
 }>;
-export declare function getPointers(components: Pick<CliComponents, 'fetch'>, pointer: string, network?: Network): Promise<CatalystInfo[]>;
+export declare function getPointers(components: Pick<CliComponents, 'fetch' | 'logger'>, pointer: string, network?: Network): Promise<CatalystInfo[]>;
 export {};

package/dist/commands/deploy/linker-dapp/catalyst-pointers.js

@@ -37,7 +37,7 @@ async function getPointers(components, pointer, network = 'mainnet') {
             catalystInfo.push({ timestamp, entityId, url: baseUrl });
         }
         catch (err) {
-            console.log('Error fetching catalyst pointers', err);
+            components.logger.log('Error fetching catalyst pointers', err);
         }
     }
     return catalystInfo;

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

@@ -1,3 +1,4 @@
 import { WebSocket } from 'ws';
+import { PreviewComponents } from '../types';
 import { DataLayer } from './rpc';
-export declare function handleDataLayerWs(ws: WebSocket, dataLayer: DataLayer): Promise<void>;
+export declare function handleDataLayerWs(components: PreviewComponents, ws: WebSocket, dataLayer: DataLayer): Promise<void>;

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

@@ -2,15 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleDataLayerWs = void 0;
 const WebSocket_1 = require("@dcl/rpc/dist/transports/WebSocket");
-async function handleDataLayerWs(ws, dataLayer) {
+// TODO: dataLayer should be an optional component
+async function handleDataLayerWs(components, ws, dataLayer) {
     const wsTransport = (0, WebSocket_1.WebSocketTransport)(ws);
     dataLayer.rpcServer.attachTransport(wsTransport, dataLayer.context);
     ws.on('error', (error) => {
-        console.error(error);
+        components.logger.error(error);
         ws.close();
     });
     ws.on('close', () => {
-        console.debug('Websocket closed');
+        components.logger.debug('Websocket closed');
     });
 }
 exports.handleDataLayerWs = handleDataLayerWs;

package/dist/commands/start/index.js

@@ -150,7 +150,7 @@ async function main(options) {
             };
             return {
                 ...options.components,
-                logger: (0, log_1.createStdoutCliLogger)(),
+                logger: (0, log_1.createStderrCliLogger)(),
                 logs,
                 ethereumProvider: eth_1.providerInstance,
                 rooms,
@@ -162,6 +162,7 @@ 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);
             if (watch) {

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

@@ -103,7 +103,8 @@ function setupEcs6Endpoints(components, dir, router) {
             }
         }
         catch (err) {
-            console.warn(`Failed to catch profile and fill with preview wearables.`, err);
+            components.logger.warn(`Failed to catch profile and fill with preview wearables.`);
+            components.logger.error(err);
         }
         return next();
     });
@@ -130,7 +131,6 @@ function setupEcs6Endpoints(components, dir, router) {
     router.post('/content/entities', async (ctx) => {
         const catalystUrl = getCatalystUrl();
         const headers = new node_fetch_1.Headers();
-        console.log(ctx.request.headers);
         const res = await (0, node_fetch_1.default)(`${catalystUrl.toString()}/content/entities`, {
             method: 'post',
             headers,
@@ -224,7 +224,7 @@ async function getAllPreviewWearables(components, { baseFolders, baseUrl }) {
             ret.push(await serveWearable(components, wearableJsonPath, baseUrl));
         }
         catch (err) {
-            console.error(`Couldn't mock the wearable ${wearableJsonPath}. Please verify the correct format and scheme.`, err);
+            components.logger.error(`Couldn't mock the wearable ${wearableJsonPath}. Please verify the correct format and scheme.` + err);
         }
     }
     return ret;
@@ -234,7 +234,7 @@ async function serveWearable(components, wearableJsonPath, baseUrl) {
     const wearableJson = JSON.parse((await components.fs.readFile(wearableJsonPath)).toString());
     if (!sdk_1.WearableJson.validate(wearableJson)) {
         const errors = (sdk_1.WearableJson.validate.errors || []).map((a) => `${a.data} ${a.message}`).join('');
-        console.error(`Unable to validate wearable.json properly, please check it.`, errors);
+        components.logger.error(`Unable to validate wearable.json properly, please check it.` + errors);
         throw new Error(`Invalid wearable.json (${wearableJsonPath})`);
     }
     const hashedFiles = await (0, project_files_1.getProjectContentMappings)(components, wearableDir, project_files_1.b64HashingFunction);
@@ -366,15 +366,16 @@ async function fakeEntityV3FromFolder(components, projectRoot, hashingFunction)
             const wearableJson = JSON.parse(await components.fs.readFile(wearableJsonPath, 'utf-8'));
             if (!sdk_1.WearableJson.validate(wearableJson)) {
                 const errors = (sdk_1.WearableJson.validate.errors || []).map((a) => `${a.data} ${a.message}`).join('');
-                console.error(`Unable to validate wearable.json properly, please check it.`, errors);
-                console.error(`Invalid wearable.json (${wearableJsonPath})`);
+                components.logger.error(`Unable to validate wearable.json properly, please check its schema.` + errors);
+                components.logger.error(`Invalid wearable.json (${wearableJsonPath})`);
             }
             else {
                 isParcelScene = false;
             }
         }
         catch (err) {
-            console.error(`Unable to load wearable.json properly`, err);
+            components.logger.error(`Unable to load wearable.json`);
+            components.logger.error(err);
         }
     }
     if ((await components.fs.fileExists(sceneJsonPath)) && isParcelScene) {

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

@@ -40,14 +40,14 @@ function setupRealmAndComms(components, router) {
         return (0, ws_1.upgradeWebSocketResponse)((ws) => {
             if (ws.protocol === 'rfc5' || ws.protocol === 'rfc4') {
                 ws.on('error', (error) => {
-                    console.error(error);
+                    components.logger.error(error);
                     ws.close();
                 });
                 ws.on('close', () => {
-                    console.debug('Websocket closed');
+                    components.logger.debug('Websocket closed');
                 });
                 (0, handle_linear_protocol_1.handleSocketLinearProtocol)(components, ws, ctx.params.roomId).catch((err) => {
-                    console.info(err);
+                    components.logger.info(err);
                     ws.close();
                 });
             }

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

@@ -12,7 +12,7 @@ async function wireRouter(components, dir, dataLayer) {
     if (dataLayer) {
         router.get('/data-layer', async (ctx, next) => {
             if (ctx.request.headers.get('upgrade') === 'websocket') {
-                return (0, ws_1.upgradeWebSocketResponse)((ws) => (0, ws_2.handleDataLayerWs)(ws, dataLayer));
+                return (0, ws_1.upgradeWebSocketResponse)((ws) => (0, ws_2.handleDataLayerWs)(components, ws, dataLayer));
             }
             return next();
         });

package/dist/components/analytics.d.ts

@@ -69,4 +69,4 @@ export type Events = {
         error: string;
     };
 };
-export declare function createAnalyticsComponent({ dclInfoConfig }: Pick<CliComponents, 'dclInfoConfig'>): Promise<IAnalyticsComponent>;
+export declare function createAnalyticsComponent({ dclInfoConfig, logger }: Pick<CliComponents, 'dclInfoConfig' | 'logger'>): Promise<IAnalyticsComponent>;

package/dist/components/analytics.js

@@ -8,7 +8,7 @@ const uuid_1 = require("uuid");
 const analytics_node_1 = require("@segment/analytics-node");
 const fp_future_1 = __importDefault(require("fp-future"));
 const log_1 = require("./log");
-async function createAnalyticsComponent({ dclInfoConfig }) {
+async function createAnalyticsComponent({ dclInfoConfig, logger }) {
     const USER_ID = 'sdk-commands-user';
     const config = await dclInfoConfig.get();
     const analytics = new analytics_node_1.Analytics({ writeKey: config.segmentKey ?? '' });
@@ -41,7 +41,8 @@ async function createAnalyticsComponent({ dclInfoConfig }) {
             trackFuture.resolve();
         });
         if (!dclInfoConfig.isProduction()) {
-            console.log(trackInfo);
+            // TODO: what is this supposed to do?
+            logger.info('TrackingInfo: ' + JSON.stringify(trackInfo));
         }
         return trackFuture;
     }
@@ -57,7 +58,7 @@ async function createAnalyticsComponent({ dclInfoConfig }) {
             let dclInfo = {};
             if (!config.userId) {
                 dclInfo = { userId, trackStats: true };
-                console.log(`Decentraland CLI sends anonymous usage stats to improve their products, if you want to disable it change the configuration at ${log_1.colors.bold('~/.dclinfo')}\n`);
+                logger.info(`Decentraland CLI sends anonymous usage stats to improve their products, if you want to disable it change the configuration at ${log_1.colors.bold('~/.dclinfo')}\n`);
             }
             if (!config.userIdentified) {
                 dclInfo.userIdentified = true;

package/dist/components/index.js

@@ -9,12 +9,13 @@ const log_1 = require("./log");
 async function initComponents() {
     const fsComponent = (0, fs_1.createFsComponent)();
     const dclInfoConfig = await (0, dcl_info_config_1.createDCLInfoConfigComponent)({ fs: fsComponent });
+    const logger = (0, log_1.createStderrCliLogger)();
     return {
         fs: fsComponent,
         fetch: (0, fetch_1.createFetchComponent)(),
-        logger: (0, log_1.createStdoutCliLogger)(),
+        logger,
         dclInfoConfig,
-        analytics: await (0, analytics_1.createAnalyticsComponent)({ dclInfoConfig })
+        analytics: await (0, analytics_1.createAnalyticsComponent)({ dclInfoConfig, logger })
     };
 }
 exports.initComponents = initComponents;

package/dist/components/log.d.ts

@@ -1,4 +1,14 @@
 /// <reference types="colorette" />
 import { ILoggerComponent } from '@well-known-components/interfaces';
+/**
+ * This file imitates "cargo" logs. The words are aligned with the colon like this:
+ *        V
+ *   Error: some text provided as argumen
+ *    Info: some text provided as argumen
+ * Success: some text provided as argumen
+ * Warning: some text provided as argumen
+ *        ^
+ */
+export declare const writeToStderr: (...parameters: readonly unknown[]) => void;
 export declare const colors: import("colorette").Colorette;
-export declare function createStdoutCliLogger(): ILoggerComponent.ILogger;
+export declare function createStderrCliLogger(): ILoggerComponent.ILogger;

package/dist/components/log.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createStdoutCliLogger = exports.colors = void 0;
+exports.createStderrCliLogger = exports.colors = exports.writeToStderr = void 0;
 const colorette_1 = require("colorette");
 const error_1 = require("../logic/error");
 /**
@@ -12,36 +12,43 @@ const error_1 = require("../logic/error");
  * Warning: some text provided as argumen
  *        ^
  */
-const stderr = (...parameters) => {
+const writeToStderr = (...parameters) => {
     process.stderr.write(`${parameters.filter(($) => $ !== undefined).join('')}\n`);
 };
+exports.writeToStderr = writeToStderr;
 // @see https://no-color.org
 // @see https://www.npmjs.com/package/chalk
 exports.colors = (0, colorette_1.createColors)({
     useColor: process.env.FORCE_COLOR !== '0' && !process.env.NO_COLOR
 });
-function createStdoutCliLogger() {
+function createStderrCliLogger() {
     return {
         log(message, extra) {
-            stderr(message, extra && JSON.stringify(extra));
+            (0, exports.writeToStderr)(message, extra && JSON.stringify(extra));
         },
         debug(message, extra) {
-            stderr(exports.colors.blueBright('debug: '), message, extra && JSON.stringify(extra));
+            (0, exports.writeToStderr)(exports.colors.blueBright('debug: '), message, extra && JSON.stringify(extra));
         },
         error(error, extra) {
-            stderr(exports.colors.redBright('error: '), error, extra && JSON.stringify(extra));
+            (0, exports.writeToStderr)(exports.colors.redBright('error: '), error, extra && JSON.stringify(extra));
             /* istanbul ignore next */
-            if (!(error instanceof error_1.CliError) || process.env.DEBUG) {
-                // print the stacktrace if it is not a CliError
-                console.error(error);
+            if (!(error instanceof error_1.CliError)) {
+                if (error instanceof Error && error.stack) {
+                    // print the stacktrace if it is not a CliError
+                    (0, exports.writeToStderr)(error.stack);
+                }
+                else if (process.env.DEBUG) {
+                    // print the stacktrace if it is not a CliError
+                    (0, exports.writeToStderr)(error.toString());
+                }
             }
         },
         info(message, extra) {
-            stderr(exports.colors.blueBright('info: '), message, extra && JSON.stringify(extra));
+            (0, exports.writeToStderr)(exports.colors.blueBright('info: '), message, extra && JSON.stringify(extra));
         },
         warn(message, extra) {
-            stderr(exports.colors.yellow('warning: '), message, extra && JSON.stringify(extra));
+            (0, exports.writeToStderr)(exports.colors.yellow('warning: '), message, extra && JSON.stringify(extra));
         }
     };
 }
-exports.createStdoutCliLogger = createStdoutCliLogger;
+exports.createStderrCliLogger = createStderrCliLogger;

package/dist/index.js

@@ -57,12 +57,13 @@ async function main() {
 }
 main().catch(function handleError(err) {
     if (err instanceof error_1.CliError) {
-        console.error(log_1.colors.redBright('Error: ') + err.message);
+        (0, log_1.writeToStderr)(log_1.colors.redBright('Error: ') + err.message);
     }
     else {
         // log with console to show stacktrace and debug information
+        // eslint-disable-next-line no-console
         console.error(err);
-        console.warn(`Developer: All errors thrown must be an instance of "CliError"`);
+        (0, log_1.writeToStderr)(`Developer: All errors thrown must be an instance of "CliError"`);
     }
     // set an exit code but not finish the program immediately to close any pending work
     process.exitCode = 1;

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@dcl/sdk-commands",
   "description": "",
-  "version": "7.1.4-4495128859.commit-9f954df",
+  "version": "7.1.4-4502579506.commit-4147243",
   "author": "Decentraland",
   "bin": {
     "sdk-commands": "./dist/index.js"
   },
   "dependencies": {
-    "@dcl/dcl-rollup": "7.1.4-4495128859.commit-9f954df",
+    "@dcl/dcl-rollup": "7.1.4-4502579506.commit-4147243",
     "@dcl/hashing": "1.1.3",
-    "@dcl/inspector": "7.1.4-4495128859.commit-9f954df",
+    "@dcl/inspector": "7.1.4-4502579506.commit-4147243",
     "@dcl/linker-dapp": "0.7.0",
     "@dcl/mini-comms": "1.0.1-20230216163137.commit-a4c75be",
     "@dcl/protocol": "1.0.0-4493564897.commit-c858f8a",
@@ -56,5 +56,5 @@
     "displayName": "SDK",
     "tsconfig": "./tsconfig.json"
   },
-  "commit": "9f954df0bf811ad6c2f4af1e1ae86426ab05e950"
+  "commit": "41472432721ca80b377a54744da814b43fbf3631"
 }