eitri-cli 1.6.0-beta.2 → 1.6.0-beta.4

package/index.js

@@ -7,13 +7,16 @@ const path = require("path");
 const { workspace } = require("./src/service/Workspace");
 const configService = require("./src/service/ConfigService");
 const VegvisirCommand = require("./src/modules/vegvisir/VegvisirCommand");
+const debug = require('debug')('eitri:run')
 
 const run = async () => {
+    debug("Iniciando run()")
     try {
         const srcFolder2watch = path.join(process.cwd(), "src");
         workspace.setFolder2Watch(srcFolder2watch);
         workspace.setServerUrl(`${configService.get("workspace").url}`);
     } catch (e) {
+        debug("Erro no set da pasta", {message: e?.message, error: e})
         if (process.env.LOG_LEVEL === "full") {
             console.log("Current directory listening has failed", e);
         }

package/package.json

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

package/src/cmd/start.js

@@ -17,14 +17,19 @@ const hashFolder = workspace.hashFolder
 const trackingService = new TrackingService(blindGuardian, { ignoreCredentialError: true })
 const watcher = new Watcher(workspace, hashFolder, trackingService)
 const vegvisirService = new VegvisirService()
+const debug = require('debug')('eitri:start')
 
 module.exports = async function start(args) {
+    debug("Iniciando start()")
+    
     const separator = '======================================================================='
     let displayFriendlyErrorAtEnd = ""
 
     try {
         UserLocalCredential.checkForCredentials()
+        debug("Successo na checagem de credenciais")
     } catch (error) {
+        debug("ERRO na checagem de credenciais", {message: error?.message, error})
         const errorMessage = args?.verbose ? error : error?.message
         console.error("\n", errorMessage, "\n")
         return
@@ -36,6 +41,7 @@ module.exports = async function start(args) {
         }
 
         const miniLog = new MiniLog(config.get('miniLog'))
+        debug("Obtendo informações do MiniLog", miniLog)
 
         const resourceFolders2watch = [path.join(process.cwd(), 'public')]
         if (fs.existsSync(resourceFolders2watch)) {
@@ -44,9 +50,12 @@ module.exports = async function start(args) {
 
         const miniConf = workspace.getMiniConf()
         await vegvisirService.check(miniConf.slug)
+        debug("Fim da busca e validação do EitriAppConf", {miniConf})
         
         const url = config.get('workspace').url
         const setupResult = await workspace.setup()
+        debug("Informações do setupResult do workspace", {setupResult})
+
         const target = setupResult.target.name
         
         let targetConfig = {}
@@ -56,6 +65,7 @@ module.exports = async function start(args) {
             process.exit(1)
         }
 
+        debug("Verificando se há targetConfig nos argumentos", {targetConfig: args?.targetConfig})
         if(args.targetConfig) {
             targetConfig = await askTargetConfig(args, target)
         } else {
@@ -71,7 +81,11 @@ module.exports = async function start(args) {
         }
         workspace.setServerUrl(url)
         workspace.setQrCodeUrl(qrCodeUrl)
+
+        debug("Iniciando workspace", {workspace})
         await workspace.init()
+        debug("Workspace iniciado", {workspace})
+
         const silentOnConnect = args.verbose ? false : true
         const userWorkspace = await vegvisirService.getWorkspace()
         await miniLog.connect(userWorkspace.id, silentOnConnect)
@@ -79,8 +93,10 @@ module.exports = async function start(args) {
         console.log("Construindo...");
         const isDevMode = true
         try {
+            debug("Iniciando workspace.uploadZip", {isDevMode, workspace})
             await workspace.uploadZip(isDevMode);
         } catch (error) {
+            debug("Erro no workspace.uploadZip", {isDevMode, workspace, error})
             if(args.verbose){
                 console.error("::uploadZip::", error?.message)
                 console.error(":::uploadZip::: ", error)
@@ -88,21 +104,23 @@ module.exports = async function start(args) {
 
             const friendlyMessage1 = "Desculpe, não foi possível realizar a sincronização dos arquivos."
             const friendlyMessage2 = "Recomendamos que verifique eventuais erros no código. Para mais informações, consulte nossa documentação em: https://docs.eitri.tech/."
-            console.log(`\x1b[1m\x1b[31m\n${friendlyMessage1}\n${friendlyMessage2} \x1b[0m`);
-            
             const friendlyMessage3 = "Se o problema persistir, por favor, entre em contato com o suporte técnico do Eitri."
             const friendlyMessage4 = "Você pode continuar o desenvolvimento localmente, mesmo que a sincronização não esteja disponível no momento."
-            displayFriendlyErrorAtEnd = `\n${friendlyMessage3}\n${friendlyMessage4}\n \x1b[0m`
+            displayFriendlyErrorAtEnd = `\x1b[1m\x1b[31m\n${friendlyMessage1}\n${friendlyMessage2} \x1b[0m` + "\n" + `\n${friendlyMessage3}\n${friendlyMessage4}\n \x1b[0m`
         }
         console.log("Pronto!");
 
         const loadedTarget = await workspace.getTarget()
+        debug("Target carregado do workspace", {loadedTarget})
+
         const platform = loadedTarget.platform
         const argsWithDeeplinks = {
             ...args,
             deepLinks: loadedTarget?.deepLinks || []
         }
+        debug("Iniciando servidor", {argsWithDeeplinks, trackingService, watcher, workspace, target, targetConfig, platform})
         await handleStartServer(argsWithDeeplinks, trackingService, watcher, workspace, target, targetConfig, platform)
+        debug("Servidor iniciado", {loadedTarget})
 
         TrackingEitriAnalytics.sendEvent({
             eventName:"start",
@@ -115,6 +133,7 @@ module.exports = async function start(args) {
             }
         })
     } catch (e) {
+        debug("Erro no processo de start", {message: e?.message, error: e})
         TrackingEitriAnalytics.sendEvent({
             eventName: "start.error",
             userId: workspace?.userEmail,

package/src/modules/vegvisir/VegvisirService.js

@@ -8,6 +8,8 @@ const os = require("os");
 const {validateUUID} = require("../../util/GenericUtils");
 const path = require("path");
 const fs = require('fs')
+const debug = require('debug')('eitri:VegvisirService')
+
 module.exports = class VegvisirService {
     constructor() {
         const blindGuardian = new BlindGuardian();
@@ -55,10 +57,14 @@ module.exports = class VegvisirService {
     }
 
     async check(slug) {
+        debug("Iniciando check")
         try {
             let workspace = await this.getWorkspace()
+            debug("Workspace carregado", {workspace})
             if(!workspace) {
+                debug("Nenhum workspace obtido. Inciando busca de Workspaces")
                 const workspaces = await this.listMyWorkspaces();
+                debug("Lista de Workspaces", {workspaces})
                 const defaultWorkspace = await workspaces.find(w => w.name === 'DEFAULT')
                 await writeGlobalWorkspaceConfig(defaultWorkspace)
                 workspace = defaultWorkspace;
@@ -73,7 +79,9 @@ module.exports = class VegvisirService {
             const url =`${this.config.url}${this.config.basePath}${this.config.check}`;
 
             await this.http.put(url, data)
+            debug("Atualização realizada", {url, data})
         } catch (error) {
+            debug("Erro na realização do check", {message: error?.message, error})
             console.error(error.message)
             if (axios.isAxiosError(error)) {
                 if (error?.response?.status === 404) {