@dcl/sdk-commands 7.1.3-4451863481.commit-c67e152 → 7.1.3-4479271193.commit-2d89420

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

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

package/dist/commands/build/index.js

@@ -55,10 +55,11 @@ async function main(options) {
     }
     const sceneJson = await (0, scene_validations_1.getValidSceneJson)(options.components, projectRoot);
     const coords = (0, scene_validations_1.getBaseCoords)(sceneJson);
-    await options.components.analytics.track('Build scene', {
+    options.components.analytics.trackSync('Build scene', {
         projectHash: await (0, project_files_1.b64HashingFunction)(projectRoot),
         coords,
-        isWorkspace: false
+        isWorkspace: false,
+        args: (0, args_1.getArgsUsed)(options.args)
     });
     await watchingFuture;
 }

package/dist/commands/deploy/index.js

@@ -66,11 +66,16 @@ async function main(options) {
     }
     const sceneJson = await (0, scene_validations_1.getValidSceneJson)(options.components, projectRoot);
     const coords = (0, scene_validations_1.getBaseCoords)(sceneJson);
-    const analyticsOpts = {
+    const isWorld = !!Object.keys(sceneJson.worldConfiguration || {}).length;
+    const trackProps = {
         projectHash: await (0, project_files_1.b64HashingFunction)(projectRoot),
-        coords
+        coords,
+        isWorld,
+        args: (0, args_1.getArgsUsed)(options.args)
     };
-    await options.components.analytics.track('Scene deploy started', analyticsOpts);
+    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);
     if (!skipBuild) {
         await (0, project_validations_1.npmRun)(projectRoot, 'build');
     }
@@ -111,9 +116,10 @@ async function main(options) {
     }
     catch (e) {
         error('Could not upload content:');
-        console.log(e);
+        console.log(e.message);
+        options.components.analytics.trackSync('Scene deploy failure', { ...trackProps, error: e.message ?? '' });
     }
-    await options.components.analytics.track('Scene deploy success', analyticsOpts);
+    options.components.analytics.trackSync('Scene deploy success', { ...trackProps, dependencies });
 }
 exports.main = main;
 async function getCatalyst(target, targetContent) {

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

@@ -117,9 +117,10 @@ 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);
-    await options.components.analytics.track('Export static', {
+    options.components.analytics.trackSync('Export static', {
         projectHash: await (0, project_files_1.b64HashingFunction)(projectRoot),
-        coords
+        coords,
+        args: (0, args_1.getArgsUsed)(options.args)
     });
     return { urn, entityId, destination: destDirectory };
 }

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);
     }
-    await options.components.analytics.track('Scene created', { projectType: scene, url });
+    options.components.analytics.trackSync('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/index.js

@@ -114,7 +114,7 @@ async function main(options) {
     }
     // then start the embedded compiler, this can be disabled with --no-watch
     if (watch) {
-        await (0, build_1.main)({ ...options, args: { '--dir': projectRoot, '--watch': watch } });
+        await (0, build_1.main)({ ...options, args: { '--dir': projectRoot, '--watch': watch, _: [] } });
     }
     const sceneJson = await (0, scene_validations_1.getValidSceneJson)(options.components, projectRoot);
     const baseCoords = (0, scene_validations_1.getBaseCoords)(sceneJson);
@@ -170,10 +170,11 @@ async function main(options) {
             await startComponents();
             const networkInterfaces = os.networkInterfaces();
             const availableURLs = [];
-            await components.analytics.track('Preview started', {
+            components.analytics.trackSync('Preview started', {
                 projectHash: await (0, project_files_1.b64HashingFunction)(projectRoot),
                 coords: baseCoords,
-                isWorkspace: false
+                isWorkspace: false,
+                args: (0, args_1.getArgsUsed)(options.args)
             });
             components.logger.log(`Preview server is now running!`);
             components.logger.log('Available on:\n');

package/dist/components/analytics.d.ts

@@ -4,11 +4,14 @@ 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;
+    stop(): Promise<void>;
 };
-type Events = {
+export type Events = {
     'Scene created': {
         projectType: string;
         url: string;
+        args: Record<string, unknown>;
     };
     'Preview started': {
         projectHash: string;
@@ -17,6 +20,7 @@ type Events = {
             y: number;
         };
         isWorkspace: boolean;
+        args: Record<string, unknown>;
     };
     'Build scene': {
         projectHash: string;
@@ -25,6 +29,7 @@ type Events = {
             y: number;
         };
         isWorkspace: boolean;
+        args: Record<string, unknown>;
     };
     'Export static': {
         projectHash: string;
@@ -32,6 +37,7 @@ type Events = {
             x: number;
             y: number;
         };
+        args: Record<string, unknown>;
     };
     'Scene deploy started': {
         projectHash: string;
@@ -39,6 +45,8 @@ type Events = {
             x: number;
             y: number;
         };
+        isWorld: boolean;
+        args: Record<string, unknown>;
     };
     'Scene deploy success': {
         projectHash: string;
@@ -46,7 +54,19 @@ type Events = {
             x: number;
             y: number;
         };
+        isWorld: boolean;
+        args: Record<string, unknown>;
+        dependencies: string[];
+    };
+    'Scene deploy failure': {
+        projectHash: string;
+        coords: {
+            x: number;
+            y: number;
+        };
+        isWorld: boolean;
+        args: Record<string, unknown>;
+        error: string;
     };
 };
 export declare function createAnalyticsComponent({ dclInfoConfig }: Pick<CliComponents, 'dclInfoConfig'>): Promise<IAnalyticsComponent>;
-export {};

package/dist/components/analytics.js

@@ -12,15 +12,55 @@ async function createAnalyticsComponent({ dclInfoConfig }) {
     const USER_ID = 'sdk-commands-user';
     const config = await dclInfoConfig.get();
     const analytics = new analytics_node_1.Analytics({ writeKey: config.segmentKey ?? '' });
+    const promises = [];
+    async function track(eventName, eventProps) {
+        const trackFuture = (0, fp_future_1.default)();
+        const { userId, trackStats } = await dclInfoConfig.get();
+        const version = await dclInfoConfig.getVersion();
+        if (!trackStats) {
+            return trackFuture.resolve();
+        }
+        const trackInfo = {
+            userId: USER_ID,
+            event: eventName,
+            properties: {
+                ...eventProps,
+                os: process.platform,
+                nodeVersion: process.version,
+                cliVersion: version,
+                isCI: dclInfoConfig.isCI(),
+                isEditor: dclInfoConfig.isEditor(),
+                devId: userId,
+                ecs: {
+                    ecsVersion: 'ecs7',
+                    packageVersion: version
+                }
+            }
+        };
+        analytics.track(trackInfo, () => {
+            trackFuture.resolve();
+        });
+        if (!dclInfoConfig.isProduction()) {
+            console.log(trackInfo);
+        }
+        return trackFuture;
+    }
     return {
         get() {
             return analytics;
         },
         async identify() {
+            if (config.userId && !config.trackStats) {
+                return;
+            }
+            const userId = config.userId ?? (0, uuid_1.v4)();
+            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`);
-                const userId = (0, uuid_1.v4)();
-                await dclInfoConfig.updateDCLInfo({ userId, trackStats: true });
+            }
+            if (!config.userIdentified) {
+                dclInfo.userIdentified = true;
                 analytics.identify({
                     userId: USER_ID,
                     traits: {
@@ -29,37 +69,20 @@ async function createAnalyticsComponent({ dclInfoConfig }) {
                     }
                 });
             }
-        },
-        async track(eventName, eventProps) {
-            const trackFuture = (0, fp_future_1.default)();
-            const { userId, trackStats } = await dclInfoConfig.get();
-            if (!trackStats) {
-                return trackFuture.resolve();
+            if (Object.keys(dclInfo).length) {
+                await dclInfoConfig.updateDCLInfo(dclInfo);
             }
-            const trackInfo = {
-                userId: USER_ID,
-                event: eventName,
-                properties: {
-                    ...eventProps,
-                    os: process.platform,
-                    nodeVersion: process.version,
-                    cliVersion: await dclInfoConfig.getVersion(),
-                    isCI: dclInfoConfig.isCI(),
-                    isEditor: dclInfoConfig.isEditor(),
-                    devId: userId,
-                    ecs: {
-                        ecsVersion: 'ecs7',
-                        packageVersion: await dclInfoConfig.getVersion()
-                    }
-                }
-            };
-            analytics.track(trackInfo, () => {
-                trackFuture.resolve();
+        },
+        trackSync(eventName, eventProps) {
+            const futurePromise = (0, fp_future_1.default)();
+            promises.push(futurePromise);
+            void track(eventName, eventProps).then(() => {
+                futurePromise.resolve();
             });
-            if (!dclInfoConfig.isProduction()) {
-                console.log(trackInfo);
-            }
-            return trackFuture;
+        },
+        track,
+        async stop() {
+            await Promise.all(promises);
         }
     };
 }

package/dist/components/dcl-info-config.d.ts

@@ -1,5 +1,5 @@
 import { CliComponents } from '.';
-import { DCLInfo } from '../logic/config';
+import { DCLInfo } from '../logic/dcl-info';
 export type IDCLInfoConfigComponent = {
     get(): Promise<DCLInfo>;
     updateDCLInfo(value: Partial<DCLInfo>): Promise<Partial<DCLInfo>>;

package/dist/components/dcl-info-config.js

@@ -36,14 +36,18 @@ async function createDCLInfoConfigComponent({ fs }) {
         trackStats: false,
         segmentKey: isProduction() ? 'sFdziRVDJo0taOnGzTZwafEL9nLIANZ3' : 'mjCV5Dc4VAKXLJAH5g7LyHyW1jrIR3to'
     };
+    let dclInfoConfig;
     return {
         async get() {
-            const dclInfoConfig = await (0, config_1.getDCLInfoConfig)({ fs });
+            if (!dclInfoConfig) {
+                dclInfoConfig = await (0, config_1.getDCLInfoConfig)({ fs });
+            }
             const envConfig = (0, config_1.getEnvConfig)();
             const config = { ...defaultConfig, ...dclInfoConfig, ...envConfig };
             return config;
         },
         updateDCLInfo(value) {
+            dclInfoConfig = { ...dclInfoConfig, ...value };
             return (0, fs_1.writeJSON)({ fs }, (0, config_1.getDclInfoPath)(), value);
         },
         async getVersion() {

package/dist/index.js

@@ -50,6 +50,7 @@ async function main() {
             }
         }
     }
+    await components.analytics.stop();
     // rollup watcher leaves many open FSWatcher even in build mode. we must call
     // process.exit at this point to prevent the program halting forever
     process.exit(process.exitCode || 0);

package/dist/logic/args.d.ts

@@ -9,3 +9,4 @@ export declare const DEFAULT_ARGS: {
 };
 export declare function getArgs(): Result<typeof DEFAULT_ARGS>;
 export declare function getArgs<T extends Args>(args: T): Result<typeof DEFAULT_ARGS & T>;
+export declare function getArgsUsed(value: Result<typeof DEFAULT_ARGS>): Record<string, unknown>;

package/dist/logic/args.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getArgs = exports.DEFAULT_ARGS = void 0;
+exports.getArgsUsed = exports.getArgs = exports.DEFAULT_ARGS = void 0;
 const arg_1 = __importDefault(require("arg"));
 // updating to TS 4.9 will prevent losing types when
 // enforcing type to be "Args" by using "satisfies Args"
@@ -16,3 +16,8 @@ function getArgs(args) {
     return (0, arg_1.default)({ ...exports.DEFAULT_ARGS, ...args }, { permissive: true });
 }
 exports.getArgs = getArgs;
+function getArgsUsed(value) {
+    const { _, ...args } = value;
+    return args;
+}
+exports.getArgsUsed = getArgsUsed;

package/dist/logic/config.d.ts

@@ -1,9 +1,5 @@
 import { CliComponents } from '../components';
-export interface DCLInfo {
-    segmentKey?: string;
-    userId?: string;
-    trackStats?: boolean;
-}
+import { DCLInfo } from './dcl-info';
 export declare const getDclInfoPath: () => string;
 /**
  * Reads the contents of the `.dclinfo` file

package/dist/logic/dcl-info.d.ts

@@ -4,9 +4,10 @@ import { CliComponents } from '../components';
  */
 export declare function removeEmptyKeys(obj: Record<string, unknown>): Record<string, unknown>;
 export type DCLInfo = {
+    userIdentified?: boolean;
     fileExists?: boolean;
-    userId: string;
-    trackStats: boolean;
+    userId?: string;
+    trackStats?: boolean;
     provider?: string;
     MANAToken?: string;
     LANDRegistry?: string;

package/dist/logic/project-files.d.ts

@@ -17,3 +17,9 @@ export declare function normalizeDecentralandFilename(filename: string): string;
  */
 export declare function getProjectContentMappings(components: Pick<CliComponents, 'fs'>, projectRoot: string, hashingFunction: (filePath: string) => Promise<string>): Promise<ContentMapping[]>;
 export declare const b64HashingFunction: (str: string) => Promise<string>;
+interface PackageJson {
+    dependencies: Record<string, string>;
+    devDependencies: Record<string, string>;
+}
+export declare function getPackageJson(components: Pick<CliComponents, 'fs'>, projectRoot: string): Promise<PackageJson>;
+export {};

package/dist/logic/project-files.js

@@ -1,13 +1,36 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.b64HashingFunction = exports.getProjectContentMappings = exports.normalizeDecentralandFilename = exports.getPublishableFiles = void 0;
+exports.getPackageJson = exports.b64HashingFunction = exports.getProjectContentMappings = exports.normalizeDecentralandFilename = exports.getPublishableFiles = void 0;
 const dcl_ignore_1 = require("./dcl-ignore");
 const glob_1 = require("glob");
 const ignore_1 = __importDefault(require("ignore"));
-const path_1 = __importDefault(require("path"));
+const path_1 = __importStar(require("path"));
 const error_1 = require("./error");
 /**
  * Returns an array of the publishable files for a given folder.
@@ -70,3 +93,15 @@ hashingFunction) {
 exports.getProjectContentMappings = getProjectContentMappings;
 const b64HashingFunction = async (str) => 'b64-' + Buffer.from(str).toString('base64');
 exports.b64HashingFunction = b64HashingFunction;
+/* istanbul ignore next */
+async function getPackageJson(components, projectRoot) {
+    try {
+        const packageJsonRaw = await components.fs.readFile((0, path_1.resolve)(projectRoot, 'package.json'), 'utf8');
+        const packageJson = JSON.parse(packageJsonRaw);
+        return packageJson;
+    }
+    catch (err) {
+        throw new error_1.CliError(`Error reading the package.json file: ${err.message}`);
+    }
+}
+exports.getPackageJson = getPackageJson;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/sdk-commands",
-  "version": "7.1.3-4451863481.commit-c67e152",
+  "version": "7.1.3-4479271193.commit-2d89420",
   "description": "",
   "scripts": {
     "start": "tsc -p tsconfig.json --watch",
@@ -16,9 +16,9 @@
   "author": "Decentraland",
   "license": "Apache-2.0",
   "dependencies": {
-    "@dcl/dcl-rollup": "7.1.3-4451863481.commit-c67e152",
+    "@dcl/dcl-rollup": "7.1.3-4479271193.commit-2d89420",
     "@dcl/hashing": "1.1.3",
-    "@dcl/inspector": "7.1.3-4451863481.commit-c67e152",
+    "@dcl/inspector": "7.1.3-4479271193.commit-2d89420",
     "@dcl/linker-dapp": "0.7.0",
     "@dcl/mini-comms": "1.0.1-20230216163137.commit-a4c75be",
     "@dcl/protocol": "1.0.0-4408137944.commit-a67c796",
@@ -56,5 +56,5 @@
   "files": [
     "dist"
   ],
-  "commit": "c67e1523bd2d41ca4cc5a6d1c4b0a46d4d09008c"
+  "commit": "2d89420f1e0575d8fe23205ffbbef353012ccef1"
 }