eitri-cli 1.1.5-beta.2 → 1.2.0-beta.1

package/config/dev.js

@@ -83,7 +83,7 @@ const config = {
         contextPath: "/workspace-manager",
     },
     eitriAnalytics: {
-        url: "https://analytics.dev.eitri.calindra.com.br/analytics/event/cli",
+        url: "https://analytics.dev.eitri.calindra.com.br/analytics/event",
     },
     managerFront: {
         url: `https://admin.${HOST}`,

package/config/k8s-eitri.js

@@ -80,7 +80,7 @@ const config = {
         contextPath: '/workspace-manager'
     },
     eitriAnalytics: {
-        url: "https://analytics.dev.eitri.calindra.com.br/analytics/event/cli"
+        url: "https://analytics.dev.eitri.calindra.com.br/analytics/event"
     },
     managerFront: {
         url: `https://admin.k8s.eitri.calindra.com.br`

package/config/loc-eitri.js

@@ -88,7 +88,7 @@ const config = {
         contextPath: "/workspace-manager",
     },
     eitriAnalytics: {
-        url: "https://analytics.dev.eitri.calindra.com.br/analytics/event/cli",
+        url: "https://analytics.dev.eitri.calindra.com.br/analytics/event",
     },
     managerFront: {
         url: `https://admin.${HOST}`,

package/config/prod-eitri.js

@@ -85,7 +85,7 @@ const config = {
         contextPath: "/workspace-manager",
     },
     eitriAnalytics: {
-        url: "https://analytics.dev.eitri.calindra.com.br/analytics/event/cli",
+        url: "https://analytics.dev.eitri.calindra.com.br/analytics/event",
     },
     managerFront: {
         url: `https://admin.eitri.calindra.com.br`,

package/index-eitri.js

@@ -1,6 +1,9 @@
 #!/usr/bin/env node
 process.env['NODE_APP_INSTANCE'] = 'eitri'
 
+const { v4: uuidv4 } = require('uuid')
+process.env['NODE_APP_SESSION_ID'] = uuidv4()
+
 const run = require('./index')
 
 run()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eitri-cli",
-  "version": "1.1.5-beta.2",
+  "version": "1.2.0-beta.1",
   "description": "Command Line Interface to make \"Eitri-App\" with code and fire.",
   "main": "index.js",
   "bin": {

package/src/cmd/clean.js

@@ -34,15 +34,17 @@ module.exports = async function clean(cmdObj) {
         console.log('[1] Limpo.')
 
         TrackingEitriAnalytics.sendEvent({
-            command: "clean",
-            success: true,
+            eventName: "clean",
+            userId: workspace?.userEmail
         })
         process.exit(0)
     } catch (e) {
         TrackingEitriAnalytics.sendEvent({
-            command: "clean",
-            success: false,
-            errorMessage: e?.message || ""
+            eventName: "clean.error",
+            userId: workspace?.userEmail,
+            data: {
+                errorMessage: e?.message || ""
+            }
         })
 
         if(!e) {

package/src/cmd/create.js

@@ -79,12 +79,19 @@ module.exports = async function create(projectName, cmdObj) {
             );
             return;
         }
-        return await askProjMetadata(clientApplication, cmdObj, projectName);
+        const responseAskProjMetadata = await askProjMetadata(clientApplication, cmdObj, projectName);
+        TrackingEitriAnalytics.sendEvent({
+            eventName: "create",
+            userId: workspace?.userEmail,
+        });
+        return responseAskProjMetadata
     } catch (e) {
-        await TrackingEitriAnalytics.sendEvent({
-            command: "create",
-            success: false,
-            errorMessage: e?.message,
+        TrackingEitriAnalytics.sendEvent({
+            eventName: "create.error",
+            userId: workspace?.userEmail,
+            data: {
+                errorMessage: e?.message,
+            }
         });
         console.error(e?.message);
     }

package/src/cmd/login.js

@@ -38,10 +38,11 @@ module.exports = async function login(args) {
         console.log("\n", portalOpenMessage)
         console.log("\n\n Aguardando autenticação...")
     } catch (error) {
-        await TrackingEitriAnalytics.sendEvent({
-            command: "login",
-            success: false,
-            errorMessage: error?.message
+        TrackingEitriAnalytics.sendEvent({
+            eventName: "login.error",
+            data: {
+                errorMessage: error?.message ?? ""
+            }
         })
 
         console.log('Erro inesperado, tente novamente mais tarde.', error?.message)

package/src/cmd/push-version.js

@@ -117,9 +117,9 @@ ${await targetService.getAppConfExampleSnippet()}
             id: miniConf?.organizationId
         }
 
-        await TrackingEitriAnalytics.sendEvent({
-            command: "push-version",
-            success: true,
+        TrackingEitriAnalytics.sendEvent({
+            eventName: "push-version",
+            userId: workspace?.userEmail,
             data: {
                 eitriApp: {
                     ...miniConf,
@@ -141,10 +141,12 @@ ${await targetService.getAppConfExampleSnippet()}
             console.log(`\x1b[1m\x1b[31mNão será possível continuar por enquanto. Ocorreu um erro.\x1b[0m`);
         }
 
-        await TrackingEitriAnalytics.sendEvent({
-            command: "push-version",
-            success: false,
-            errorMessage: e?.message
+        TrackingEitriAnalytics.sendEvent({
+            eventName: "push-version.error",
+            userId: workspace?.userEmail,
+            data: {
+                errorMessage: e?.message ?? ""
+            }
         })
         process.exit(1)
     }

package/src/cmd/signup.js

@@ -35,17 +35,19 @@ module.exports = async function signup(args) {
         new UserLocalCredential().saveContent(conf)
 
         TrackingEitriAnalytics.sendEvent({
-            command: "signup",
-            success: true,
+            eventName: "signup",
+            userId: email,
             data: {
                 args
             }
         })
     } catch (e) {
-        await TrackingEitriAnalytics.sendEvent({
-            command: "signup",
-            success: false,
-            errorMessage: e?.message
+        TrackingEitriAnalytics.sendEvent({
+            eventName: "signup.error",
+            userId: email,
+            data: {
+                errorMessage: e?.message ?? ""
+            }
         })
 
         if (args.verbose) console.error(e)

package/src/cmd/start.js

@@ -94,43 +94,22 @@ module.exports = async function start(args) {
         await handleStartServer(args, trackingService, watcher, workspace, target, targetConfig, platform)
 
         TrackingEitriAnalytics.sendEvent({
-            command: "start",
-            success: true,
+            eventName:"start",
+            userId: workspace?.userEmail,
             data: {
-                args,
-                platform,
-                workspace: {
-                    id: workspace?.target?.id,
-                    name: workspace?.target?.name,
-                    superAppClientLibName: workspace?.target?.superAppClientLibName,
-                    componentsLibName: workspace?.target?.componentsLibName,
-                    description: workspace?.target?.description,
-                    status: workspace?.target?.status,
-                    platform: workspace?.target?.platform,
-                    organization: {...workspace?.target?.organization},
-                    userEmail: workspace?.userEmail,
-                },
-                eitriApp: {
-                    name: workspace?._miniConf?.name,
-                    title: workspace?._miniConf?.title,
-                    slug: workspace?._miniConf?.slug,
-                    version: workspace?._miniConf?.version,
-                    organization: workspace?._miniConf?.organization,
-                    "eitri-app-components": workspace?._miniConf?.["eitri-app-components"],
-                    "eitri-app-client": workspace?._miniConf?.["eitri-app-client"],
-                    "eitri-commons": workspace?._miniConf?.["eitri-commons"],
-                    publickey: workspace?._miniConf?.["public-key"]
-                }
+                workspace,
+                userWorkspace,
+                miniConf,
+                args
             }
         })
     } catch (e) {
         TrackingEitriAnalytics.sendEvent({
-            command: "start",
-            success: false,
+            eventName: "start.error",
+            userId: workspace?.userEmail,
             data: {
-                args,
-            },
-            errorMessage: e?.message || ""
+                errorMessage: e?.message || "start.error"
+            }
         })
 
         if (args.verbose) console.error(e)

package/src/service/CliLogin.js

@@ -20,17 +20,19 @@ class CliLogin {
         } catch (error) {
             console.error("\n", "Não foi possível realizar o seu login. Por favor, verique as credenciais.")
             TrackingEitriAnalytics.sendEvent({
-                command: "login",
-                success: false,
-                errorMessage: error?.message
+                eventName: "login.error",
+                userId: email,
+                data: {
+                    errorMessage: error?.message ?? ""
+                }
             })
             process.exit(1)
         }
 
         await new UserLocalCredential().asyncSaveContent({devUser, devKey})
         TrackingEitriAnalytics.sendEvent({
-            command: "login",
-            success: true,
+            eventName: "login",
+            userId: email,
             data: {
                 email,
                 devUser

package/src/service/TrackingEitriAnalytics.js

@@ -1,30 +1,20 @@
 const axios = require('axios')
-const debug = require('debug')('ame-app-tools:TrackingService')
 const config = require('config')
 const EITRI_ANALYTICS_URL = config.get('eitriAnalytics')?.url
 
 class TrackingEitriAnalytics {
 
-    static async sendEvent(input = {command: "", success: true, data: {}, errorMessage: ""}) {
+    static async sendEvent(input = {eventName: "", userId: "", data: {}}) {
+        const {eventName, data, userId} = input
 
-        try {
-            const event = {
-                command: `${input?.command}`,
-                success: `${input?.success}`,
-                data: {
-                    ...(input?.data && typeof input?.data === "object" && !Object.keys(input?.data).length == 0) ? input?.data : undefined
-                }
-            }
-
-            if (input?.errorMessage && typeof input?.errorMessage === "string") {
-                event["errorMessage"] = input?.errorMessage?.replace("'", "")
-            }
-
-            await axios.post(EITRI_ANALYTICS_URL, event)
-        } catch (e) {
-            debug('Erro ao enviar evento ao Eitri Analytics', e?.message)
+        const event = {
+            origin: "CLI",
+            eventName,
+            sessionId: process?.env?.["NODE_APP_SESSION_ID"] ?? "",
+            userId,
+            data
         }
-
+        await axios.post(EITRI_ANALYTICS_URL, event).catch(_err => null)
     }
 
 }