eitri-cli 1.10.1 → 1.11.0-beta.1

package/eitri-cli-v2/Cargo.toml

@@ -22,6 +22,7 @@ serde_derive = "1.0.197"
 serde_json = "1.0.114"
 tokio = { version = "1.36.0", features = ["full"] }
 colored = "2.0"
+config = "0.14.0"
 
 [target.x86_64-unknown-linux-gnu]
 openssl = { version = "0.9", features = ["vendored"] }

package/eitri-cli-v2/config/config.dev.toml

@@ -0,0 +1,67 @@
+user_agent = "eitri-cli"
+
+[signup]
+config_file_path = ".eitri/prod-eitri.conf.js"
+old_config_file_path = ".miniapp/prod-eitri.conf.js"
+
+[doc]
+create_url = "https://console.eitri.tech/docs"
+
+[blind_guardian]
+url = "https://api.eitri.tech/blind-guardian-api"
+auth_path = "/v2/o/auth"
+
+[share_api]
+url = "https://api.eitri.tech/share-api/share"
+
+[foundry]
+url = "https://api.eitri.tech"
+base_path = "runes-foundry"
+target_path = "/runes-foundry/targets"
+run_test_path = "/runes-foundry/run-test"
+share_path = "/foundry/share"
+
+[foundry.libs]
+update_libs_endpoint_version = "application/vnd.workspace.api.v2+json"
+
+[hugin]
+url = "https://api.eitri.tech/eitri-hugin-api"
+upload_zip = "/uploadAll"
+upload_file = "/uploadSingle"
+watch_user_dir = "/server"
+
+[qr_code]
+url = "https://prod.eitri.calindra.com.br/workspace/share"
+
+[mini_log]
+url = "https://prod.eitri.calindra.com.br/mini-log/rooms"
+path = "/mini-log/socket.io"
+
+[manager_api]
+url = "https://api.eitri.tech/miniapp-manager-api"
+
+[eitri_manager]
+url = "https://api.eitri.tech/eitri-manager-api"
+revision_path = "/v2/revisions"
+publish_path = "/revisions/:eitriAppId/publish"
+
+[eitri_analytics]
+url = "https://api.eitri.tech/analytics/event"
+
+[manager_front]
+url = "https://console.eitri.tech"
+manager_credential = "/settings/manager-credential"
+cli_generate_login_credential = "/settings/cli-generate-credential"
+
+[vegvisir]
+url = "https://api.eitri.tech"
+base_path = "/eitri-vegvisir-api"
+workspace = "/workspace"
+my = "/workspace/my"
+check = "/workspace/check"
+
+
+[cdn_library]
+url = "https://cdn.83io.com.br/library"
+bifrost_versions = "/eitri-bifrost/versions/index.json"
+luminus_ui_versions = "/luminus-ui/versions/index.json"

package/eitri-cli-v2/config/config.loc.toml

@@ -0,0 +1,67 @@
+user_agent = "eitri-cli"
+
+[signup]
+config_file_path = ".eitri/prod-eitri.conf.js"
+old_config_file_path = ".miniapp/prod-eitri.conf.js"
+
+[doc]
+create_url = "https://console.eitri.tech/docs"
+
+[blind_guardian]
+url = "https://api.eitri.tech/blind-guardian-api"
+auth_path = "/v2/o/auth"
+
+[share_api]
+url = "https://api.eitri.tech/share-api/share"
+
+[foundry]
+url = "http://localhost:3000"
+base_path = "runes-foundry"
+target_path = "/runes-foundry/targets"
+run_test_path = "/runes-foundry/run-test"
+share_path = "/runes-foundry/share"
+
+[foundry.libs]
+update_libs_endpoint_version = "application/vnd.workspace.api.v2+json"
+
+[hugin]
+url = "https://api.eitri.tech/eitri-hugin-api"
+upload_zip = "/uploadAll"
+upload_file = "/uploadSingle"
+watch_user_dir = "/server"
+
+[qr_code]
+url = "https://prod.eitri.calindra.com.br/workspace/share"
+
+[mini_log]
+url = "https://prod.eitri.calindra.com.br/mini-log/rooms"
+path = "/mini-log/socket.io"
+
+[manager_api]
+url = "https://api.eitri.tech/miniapp-manager-api"
+
+[eitri_manager]
+url = "https://api.eitri.tech/eitri-manager-api"
+revision_path = "/v2/revisions"
+publish_path = "/revisions/:eitriAppId/publish"
+
+[eitri_analytics]
+url = "https://api.eitri.tech/analytics/event"
+
+[manager_front]
+url = "https://console.eitri.tech"
+manager_credential = "/settings/manager-credential"
+cli_generate_login_credential = "/settings/cli-generate-credential"
+
+[vegvisir]
+url = "https://api.eitri.tech"
+base_path = "/eitri-vegvisir-api"
+workspace = "/workspace"
+my = "/workspace/my"
+check = "/workspace/check"
+
+
+[cdn_library]
+url = "https://cdn.83io.com.br/library"
+bifrost_versions = "/eitri-bifrost/versions/index.json"
+luminus_ui_versions = "/luminus-ui/versions/index.json"

package/eitri-cli-v2/config/config.prod.toml

@@ -0,0 +1,62 @@
+user_agent = "eitri-cli"
+
+[signup]
+config_file_path = ".eitri/prod-eitri.conf.js"
+old_config_file_path = ".miniapp/prod-eitri.conf.js"
+
+[doc]
+create_url = "https://console.eitri.tech/docs"
+
+[blind_guardian]
+url = "https://api.eitri.tech/blind-guardian-api"
+auth_path = "/v2/o/auth"
+
+[share_api]
+url = "https://api.eitri.tech/share-api/share"
+
+[foundry]
+url = "https://api.eitri.tech"
+base_path = "foundry"
+target_path = "/foundry/targets"
+run_test_path = "/foundry/run-test"
+share_path = "/foundry/share"
+
+[foundry.libs]
+update_libs_endpoint_version = "application/vnd.workspace.api.v2+json"
+
+[hugin]
+url = "https://api.eitri.tech/eitri-hugin-api"
+upload_zip = "/uploadAll"
+upload_file = "/uploadSingle"
+watch_user_dir = "/server"
+
+[mini_log]
+url = "https://prod.eitri.calindra.com.br/mini-log/rooms"
+path = "/mini-log/socket.io"
+
+
+[eitri_manager]
+url = "https://api.eitri.tech/eitri-manager-api"
+revision_path = "/v2/revisions"
+publish_path = "/revisions/:eitriAppId/publish"
+
+[eitri_analytics]
+url = "https://api.eitri.tech/analytics/event"
+
+[manager_front]
+url = "https://console.eitri.tech"
+manager_credential = "/settings/manager-credential"
+cli_generate_login_credential = "/settings/cli-generate-credential"
+
+[vegvisir]
+url = "https://api.eitri.tech"
+base_path = "/eitri-vegvisir-api"
+workspace = "/workspace"
+my = "/workspace/my"
+check = "/workspace/check"
+
+
+[cdn_library]
+url = "https://cdn.83io.com.br/library"
+bifrost_versions = "/eitri-bifrost/versions/index.json"
+luminus_ui_versions = "/luminus-ui/versions/index.json"

package/eitri-cli-v2/config/config.runes-foundry.toml

@@ -0,0 +1,7 @@
+
+[foundry]
+url = "https://api.eitri.tech"
+base_path = "runes-foundry"
+target_path = "/runes-foundry/targets"
+run_test_path = "/runes-foundry/run-test"
+share_path = "/runes-foundry/share"

package/eitri-cli-v2/config/config.test.toml

@@ -0,0 +1,67 @@
+user_agent = "eitri-cli"
+
+[signup]
+config_file_path = ".eitri/prod-eitri.conf.js"
+old_config_file_path = ".miniapp/prod-eitri.conf.js"
+
+[doc]
+create_url = "https://console.eitri.tech/docs"
+
+[blind_guardian]
+url = "https://api.eitri.tech/blind-guardian-api"
+auth_path = "/v2/o/auth"
+
+[share_api]
+url = "https://api.eitri.tech/share-api/share"
+
+[foundry]
+url = "https://api.eitri.tech"
+base_path = "runes-foundry"
+target_path = "/runes-foundry/targets"
+run_test_path = "/runes-foundry/run-test"
+share_path = "/foundry/share"
+
+[foundry.libs]
+update_libs_endpoint_version = "application/vnd.workspace.api.v2+json"
+
+[hugin]
+url = "https://api.eitri.tech/eitri-hugin-api"
+upload_zip = "/uploadAll"
+upload_file = "/uploadSingle"
+watch_user_dir = "/server"
+
+[qr_code]
+url = "https://prod.eitri.calindra.com.br/workspace/share"
+
+[mini_log]
+url = "https://prod.eitri.calindra.com.br/mini-log/rooms"
+path = "/mini-log/socket.io"
+
+[manager_api]
+url = "https://api.eitri.tech/miniapp-manager-api"
+
+[eitri_manager]
+url = "https://api.eitri.tech/eitri-manager-api"
+revision_path = "/v2/revisions"
+publish_path = "/revisions/:eitriAppId/publish"
+
+[eitri_analytics]
+url = "https://api.eitri.tech/analytics/event"
+
+[manager_front]
+url = "https://console.eitri.tech"
+manager_credential = "/settings/manager-credential"
+cli_generate_login_credential = "/settings/cli-generate-credential"
+
+[vegvisir]
+url = "https://api.eitri.tech"
+base_path = "/eitri-vegvisir-api"
+workspace = "/workspace"
+my = "/workspace/my"
+check = "/workspace/check"
+
+
+[cdn_library]
+url = "https://cdn.83io.com.br/library"
+bifrost_versions = "/eitri-bifrost/versions/index.json"
+luminus_ui_versions = "/luminus-ui/versions/index.json"

package/index.js

@@ -12,6 +12,9 @@ const debug = require('debug')('eitri:run')
 
 const run = async () => {
     debug("Iniciando run()")
+    // Temporariamente necessário por conta de no contexto do Rust não saber o diretório atual, dessa forma exportando o fullPath do config é possível.
+    // Quando se tornar uma CLI somente em rust no processo de instalação podemos declarar o caminho, como é via NPM pode ter caminhos variados de acordo com sistema de versionamento, NVM, Volta, ASDF é necessário a variável abaixo.
+    process.env.CONFIG_DIR_PATH = path.join(__dirname, 'eitri-cli-v2', 'config')
     try {
         const srcFolder2watch = path.join(process.cwd(), "src");
         workspace.setFolder2Watch(srcFolder2watch);
@@ -156,7 +159,7 @@ const run = async () => {
             "-p --path <test_path>",
             "Define o path do arquivo de teste que será executado."
         )
-        .action(async (cmdObj) => {return require("./src/cmd/runTests")(cmdObj)});
+        .action(async (cmdObj) => { return require("./src/cmd/runTests")(cmdObj) });
 
     program.addCommand(VegvisirCommand());
 

package/package.json

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

package/src/modules/vegvisir/VegvisirService.js

@@ -125,7 +125,7 @@ module.exports = class VegvisirService {
             );
             const fileContent = await readFile(workspaceGlobalPath, "utf8");
             const workspace = JSON.parse(fileContent);
-            debug(`Construindo para o Workspace [${workspace.id}]`)
+            debug(`Construindo para o Workspace [${workspace.id} / Email: ${workspace.userEmail}]`)
             workspace.id = validateUUID(this.workspaceId) ? this.workspaceId : workspace.id;
             return workspace;
         } catch (error) {

package/src/service/Emulator/AndroidEmulatorService.js

@@ -2,6 +2,7 @@ const util = require('util');
 const inquirer = require("inquirer");
 const GenericUtils = require('../../util/GenericUtils');
 const exec = util.promisify(require("child_process").exec)
+const debug = require('debug')('eitri:AndroidEmulatorService')
 
 module.exports = class AndroidEmulatorService {
 
@@ -17,9 +18,30 @@ module.exports = class AndroidEmulatorService {
         try {
             console.log("Verificando instalação do ABD",)
             const command = "adb --version"
-            await exec(command)
-            console.log("ADB Instalado. Continuando...")
+            const {stdout} = await exec(command)
+            console.log("ADB Instalado. Continuando...\n");
+            
+            debug('checkHasInstalledAdb (adb --version):', stdout)
         } catch (error) {
+            console.error("checkHasInstalledAdb: Comando 'adb --version' não executado. Iniciando fallback. \n")
+            await this.checkHasInstalledAdbFallback(error)
+        }
+    }
+
+    static async checkHasInstalledAdbFallback(firstError = {}) {
+        try {
+            console.log("Verificação novamente instalação do ADB...");
+            
+            const command = "adb devices"
+            const {stdout} = await exec(command)
+            console.log("ADB Instalado. Continuando...\n");
+
+            debug('checkHasInstalledAdb (adb devices):', stdout)
+        } catch (fallbackError) {
+            console.error("checkHasInstalledAdb: Comando 'adb devices' não executado. \n")
+            console.error("\n\ncheckHasInstalledAdb error: 'adb --version': \n", {message: firstError?.message || "", error: firstError})
+            console.error("\n\ncheckHasInstalledAdb error: 'adb devices': \n", {message: fallbackError?.message || "", error: fallbackError})
+
             throw new Error('"adb" não instalado. Saiba mais em https://developer.android.com/tools/adb')
         }
     }
@@ -65,7 +87,7 @@ module.exports = class AndroidEmulatorService {
 
     static async openDeepLink(cmd) {
         try {
-            const {stderr} = await exec(cmd)
+            const { stderr } = await exec(cmd)
             return !(stderr);
         } catch (error) {
             console.log(`Houve um erro ao tentar abrir o Eitri-App via deep link`)

package/src/service/MiniLog.js

@@ -14,12 +14,12 @@ class MiniLog {
         return new Promise((resolve, reject) => {
             const socket = this.createSocket()
             socket.on('connect', () => {
-                if(!silentOnConnect) console.log('✓ Construindo para Workspace Temporário: ', roomName)
+                if (!silentOnConnect) console.log('✓ Construindo para Workspace Temporário: ', roomName)
                 socket.emit('joinRoom', roomName)
                 resolve()
             })
             socket.on('connect_error', (e) => {
-                if(silentOnConnect) console.error('Não foi possível contectar ao compilador', roomName)
+                if (silentOnConnect) console.error('Não foi possível contectar ao compilador', roomName)
                 else console.error('Não foi possível contectar ao compilador', roomName, `${this._config.url} ${this._config.path}`)
                 reject(e)
             })
@@ -29,36 +29,6 @@ class MiniLog {
             this.socket = socket
         })
     }
-    //TODO: ESSE MÉTODO DEVE SER APAGADO, QUANDO NÃO EXISTIR MAIS O COMANDO PUBLISH
-    awaitForPublish() {
-        return new Promise((resolve, reject) => {
-            this.socket.on('onLog', (event) => {
-                if (!event.publish) {
-                    return
-                }
-                if (event.publish.ok) {
-                    resolve(event)
-                } else {
-                    reject(new Error(event.publish.error))
-                }
-            })
-        })
-    }
-
-    awaitForBuild() {
-        return new Promise((resolve, reject) => {
-            this.socket.on('onLog', (event) => {
-                if (!event.publish) {
-                    return
-                }
-                if (event.publish.ok) {
-                    resolve(event)
-                } else {
-                    reject(new Error(event.publish.error))
-                }
-            })
-        })
-    }
 
     awaitForPushVersion() {
         return new Promise((resolve, reject) => {
@@ -69,7 +39,8 @@ class MiniLog {
                 if (event.publish.ok) {
                     resolve(event)
                 } else {
-                    reject(new Error(event.publish.error))
+                    console.error(event.publish.friendlyMessage || event.publish.error)
+                    return process.exit(1)
                 }
             })
         })
@@ -83,18 +54,6 @@ class MiniLog {
         }
     }
 
-    format2JSON(str) {
-        let parsedToJSON
-
-        try {
-            parsedToJSON = JSON.parse(str)
-        } catch (e) {
-            return undefined
-        }
-
-        return parsedToJSON
-    }
-
     printLog(data) {
         if (typeof data.msg === 'undefined') {
             return
@@ -121,7 +80,7 @@ class MiniLog {
             console.log(chalk.cyan(msg))
         } else {
             // A propriedade userFriendlyMessage deve ser tratada pelo Eitri-App. Logaremos da forma como o Eitri-App nos fornecer o objeto.
-            if(!data.method) {
+            if (!data.method) {
                 console.log(`\x1b[34meitri:\x1b[0m\x1b[97m${data.msg}\x1b[0m`);
             } else {
                 const message = this._colorizeMessage(data.msg, data.method)

package/src/service/factories/WoodCoffeeFactory.js

@@ -6,6 +6,7 @@ const util = require("util");
 const exec = util.promisify(require("child_process").exec);
 const { writeFile, rm } = require("fs/promises");
 const axios = require("axios");
+const LibUtil = require("../../util/LibUtil");
 
 class WoodCoffee {
     static COMPONENTS_LIBRARY_VERSION_HIGHLIGHTER =
@@ -250,7 +251,7 @@ class WoodCoffee {
     async writeEitriAppConf(project, conf) {
         const versions = await this._getLatestLibVersions();
         conf["version"] = "0.1.0";
-        conf["eitri-luminus"] = versions.componentsVersion;
+        conf["eitri-luminus"] = LibUtil.getLuminusVersion(project.structure.miniAppConf["eitri-luminus"], versions.componentsVersion)
         conf["eitri-bifrost"] = versions.appClientVersion;
 
         let confString = `module.exports = ${JSON.stringify(conf, null, 4)}`;
@@ -260,8 +261,8 @@ class WoodCoffee {
             "utf8"
         );
         const oldConfPath = path.join(project.projectPath, "miniapp.conf.js");
-        if(fs.existsSync(oldConfPath)) {
-            await rm(oldConfPath, {force: true})
+        if (fs.existsSync(oldConfPath)) {
+            await rm(oldConfPath, { force: true })
         }
     }
 

package/src/util/LibUtil.js

@@ -0,0 +1,32 @@
+module.exports = class LibUtil {
+    static extractVersion = (text) => {
+        const m = text?.match(semverRegEx);
+        if (m) {
+            return m[1];
+        }
+        return "";
+    };
+
+    /**
+     * Função utilizada apenas em casos onde a biblioteca de componentes não
+     * recebe uma versão, mas uma string que começa com @ e aponta para um eitri-app
+     * @param {string} text
+     * @returns
+     */
+    static extractSlug = (text) => {
+        const match = text?.match(/^@([^:]+):/);
+        if (match) {
+            return match[1];
+        }
+        return "";
+    };
+
+    static getLuminusVersion(version, latestVersion) {
+        const slug = LibUtil.extractSlug(version)
+        if (slug) {
+            return version
+        }
+
+        return latestVersion
+    }
+}

package/eitri-cli-v2/src/commands/mod.rs

@@ -1,2 +0,0 @@
-pub mod publish;
-pub mod run_test;

package/eitri-cli-v2/src/commands/publish.rs

@@ -1,35 +0,0 @@
-use std::process::exit;
-
-use crate::services::{eitri_manager, workspace};
-
-const DIVISOR: &str = "========================================================";
-
-pub async fn execute(environment: String, message: String) {
-  let init_message = format!("Iniciando publicação de Eitri-App",);
-  println!("{DIVISOR}");
-  println!("\t{init_message}");
-  println!("{DIVISOR}");
-
-  let eitri_conf = workspace::read_eitri_conf().await;
-  let version = eitri_conf.version;
-  println!("Versão a ser publicada: {}", version);
-  println!("Environment: {}", environment);
-  println!("Mensagem: {}", message);
-
-  let revision = match eitri_manager::get_revision(&eitri_conf.id, &version).await {
-    Ok(revision) => revision,
-    Err(_err) => {
-      eprintln!("Houve um erro ao buscar revisão.");
-      exit(1)
-    }
-  };
-  match eitri_manager::publish_revision(&revision.id, &environment, &message).await {
-    Ok(_) => {
-      println!("Eitri-App publicado com sucesso!")
-    }
-    Err(err) => {
-      eprintln!("Houve um erro. Error: {:?}", err);
-      exit(1)
-    }
-  }
-}

package/eitri-cli-v2/src/commands/run_test.rs

@@ -1,41 +0,0 @@
-use std::{env, process::exit};
-use colored::*;
-
-use crate::{
-  model::{url::Url, workspace_auth::WorkspaceAuth},
-  services::eitri_foundry,
-};
-
-pub async fn execute(_workspace_auth: WorkspaceAuth, _path: String) {
-  let path = env::var("FOUNDRY_CONTEXT_PATH")
-    .ok()
-    .and_then(|context_path| {
-      if context_path.is_empty() {
-        Some(String::from("foundry/run-test"))
-      } else {
-        Some(format!("{}/run-test", context_path))
-      }
-    })
-    .unwrap_or_else(|| String::from("foundry/run-test"));
-
-  let url = Url {
-    host: String::from("https://api.eitri.tech/"),
-    path: path,
-  };
-  let result = eitri_foundry::run_test(_workspace_auth, _path, url).await;
-
-  match result {
-    Ok(output) => {
-      let output_str = output.stderr;
-      eprint!("{output_str}");
-    }
-    Err(http_error) => {
-      if let Some(message) = http_error.get_message() {
-        eprintln!("{}", message.red().bold());
-      } else {
-        eprintln!("Houve um erro ao executar os testes.");
-      }
-      exit(1)
-    }
-  }
-}

package/eitri-cli-v2/src/config/mod.rs

@@ -1 +0,0 @@
-pub mod user_credentials;

package/eitri-cli-v2/src/config/user_credentials.rs

@@ -1,38 +0,0 @@
-use std::{fs, process::exit};
-
-use homedir::get_my_home;
-
-use crate::model::credentials::Credentials;
-
-pub fn get_credentials() -> Result<Credentials, serde_json::Error> {
-    let home_dir = match get_my_home() {
-        Ok(dir) => dir,
-        Err(_) => {
-            eprintln!("Houve um erro ao ler a home do usuário");
-            exit(1)
-        }
-    };
-
-    let home_dir = match home_dir {
-        Some(dir) => dir,
-        _ => exit(1),
-    };
-
-    let credentials_file_path = home_dir.join(".eitri").join("prod-eitri.conf.js");
-
-    let content = match fs::read_to_string(credentials_file_path.to_owned()) {
-        Ok(c) => c,
-        Err(_) => {
-            eprintln!(
-                "Houve um erro ao ler credenciais do usuário, certifique-se de ter feito login"
-            );
-            exit(1)
-        }
-    };
-
-    let content = content.replace("module.exports = ", "");
-
-    let credentials: Credentials = serde_json::from_str(&content)?;
-
-    Ok(credentials)
-}