eitri-cli 1.10.1 → 1.11.0-beta.2

package/eitri-cli-v2/src/services/blind_guardian.rs

@@ -1,87 +0,0 @@
-use std::{env, process::exit};
-
-use reqwest::header::HeaderMap;
-use serde_derive::{Deserialize, Serialize};
-
-use crate::{
-    config::user_credentials,
-    infra::http_client::{self, HttpError},
-    model::{auth_response::AuthResponse, credentials::Credentials},
-};
-
-#[derive(Serialize, Deserialize)]
-struct AuthenticationDTO {
-    client_id: String,
-    client_secret: String,
-    grant_type: String,
-}
-
-#[allow(dead_code)]
-pub async fn get_access_token(host: &str, uri: &str) -> Result<String, HttpError> {
-    let mut headers = HeaderMap::new();
-    headers.append("user-agent", "eitri".parse().unwrap());
-
-    let client_id = env::var("EITRI_CLI_CLIENT_ID").unwrap_or_else(|_| String::from(""));
-    let client_secret = env::var("EITRI_CLI_CLIENT_SECRET").unwrap_or_else(|_| String::from(""));
-
-    let credentials = if !client_id.is_empty() && !client_secret.is_empty() {
-        let credentials = Credentials {
-            dev_key: client_secret,
-            dev_user: client_id,
-        };
-        credentials
-    } else {
-        let credentials = match user_credentials::get_credentials() {
-            Ok(credential) => credential,
-            Err(_) => {
-                eprintln!("Erro ao ler credenciais");
-                exit(1)
-            }
-        };
-        credentials
-    };
-
-    let data = AuthenticationDTO {
-        client_id: credentials.dev_user,
-        client_secret: credentials.dev_key,
-        grant_type: String::from("client_credentials"),
-    };
-
-    let url = &format!("{}/{}", host, uri);
-
-    let response = http_client::post::<AuthResponse, AuthenticationDTO>(url, data, headers).await?;
-
-    Ok(response.access_token)
-}
-
-#[cfg(test)]
-mod tests {
-
-    use super::*;
-    use httpmock::prelude::*;
-    use serde_json::json;
-
-    #[tokio::test]
-    async fn should_get_access_token() {
-        let server = MockServer::start();
-
-        server.mock(|when, then| {
-            when.method(POST).path("/blind-guardian-api/v2/o/auth");
-            then.status(200)
-                .header("content-type", "application/json; charset=UTF-8")
-                .body(
-                    json!({
-                        "accessToken": "123.123.123"
-                    })
-                    .to_string()
-                    .as_bytes(),
-                );
-        });
-
-        let token = get_access_token(&server.url(""), "blind-guardian-api/v2/o/auth")
-            .await
-            .unwrap();
-        
-        assert_eq!(token, "123.123.123")
-    }
-}

package/eitri-cli-v2/src/services/eitri_foundry.rs

@@ -1,84 +0,0 @@
-use crate::{
-  infra::http_client::{self, HttpError},
-  model::{
-    process_output::ProcessOutput, test_config::TestConfig, url::Url, workspace_auth::WorkspaceAuth,
-  },
-};
-
-pub async fn run_test(
-  workspace_auth: WorkspaceAuth,
-  test_path: String,
-  url: Url,
-) -> Result<ProcessOutput, HttpError> {
-  let access_token: String = workspace_auth.access_token;
-  let user_workspace_id: String = workspace_auth.user_workspace_id;
-  let mut headers = http_client::get_default_headers(access_token).await;
-  let url = url.get_full_url();
-  let data = TestConfig {
-    test_path: test_path,
-  };
-
-
-  headers.append("workspace-id", user_workspace_id.parse().unwrap());
-  let result = http_client::post::<ProcessOutput, TestConfig>(&url, data, headers).await?;
-
-  Ok(result)
-}
-
-#[cfg(test)]
-mod tests {
-  use httpmock::prelude::*;
-  use serde_json::json;
-
-  use crate::{
-    model::{url::Url, workspace_auth::WorkspaceAuth},
-    services::eitri_foundry::run_test,
-  };
-
-  #[tokio::test]
-  async fn should_return_test_status() {
-    let server = MockServer::start();
-
-    let result = String::from("'PASS ../storage/ad24ec72-90b0-4511-b836-e217183e31c7/react-proj/src/test/Service.test.js\n' +
-    '  ✓ teste soma agora (2 ms)\n' +
-    '  ✓ teste multiplicao agora\n' +
-    '\n' +
-    'Test Suites: 1 passed, 1 total\n' +
-    'Tests:       2 passed, 2 total\n' +
-    'Snapshots:   0 total\n' +
-    'Time:        0.162 s, estimated 1 s\n' +
-    'Ran all test suites'");
-
-    let mock = server.mock(|when, then| {
-      when.method(POST).path("/runes-foundry/run-test");
-      then
-        .status(200)
-        .header("content-type", "application/json; charset=UTF-8")
-        .body(
-          json!({
-              "stderr": result,
-              "stdout":"aaaaaa"
-          })
-          .to_string()
-          .as_bytes(),
-        );
-    });
-
-    let workspace_auth = WorkspaceAuth {
-      access_token: String::from("123.123.123"),
-      user_workspace_id: String::from("xxxx"),
-    };
-
-    let path = String::from("");
-    let url = Url {
-      host: server.url(""),
-      path: String::from("/runes-foundry/run-test"),
-    };
-
-    let response = run_test(workspace_auth, path, url).await.unwrap();
-
-    assert_eq!(mock.hits(), 1);
-    assert_eq!(response.stderr, result);
-
-  }
-}

package/eitri-cli-v2/src/services/eitri_manager.rs

@@ -1,78 +0,0 @@
-use std::process::exit;
-
-use serde_json::json;
-
-use crate::{
-    infra::http_client::{self, HttpError},
-    model::revision::{GetRevisionsResult, Revision},
-};
-
-use super::blind_guardian;
-
-pub async fn get_revision(eitri_app_id: &str, version: &str) -> Result<Revision, HttpError> {
-    let access_token = match blind_guardian::get_access_token(
-        "https://api.eitri.tech",
-        "blind-guardian-api/v2/o/auth",
-    )
-    .await
-    {
-        Ok(token) => token,
-        Err(_err) => {
-            eprintln!("Houve um erro ao autenticar-se no Eitri");
-            exit(1)
-        }
-    };
-
-    let headers = http_client::get_default_headers(access_token).await;
-
-    let url = format!(
-        "https://api.eitri.tech/eitri-manager-api/v2/revisions?eitriAppId={}&version={}",
-        eitri_app_id, version
-    );
-
-    let result = http_client::get::<GetRevisionsResult>(&url, headers).await?;
-
-    let revision = match result.revisions.first() {
-        Some(revision) => revision.clone(),
-        None => {
-            eprintln!("Versão não encontrada, certifique-se de que foi feito push-version antes de publicar a versão.");
-            exit(1)
-        }
-    };
-    Ok(revision)
-}
-
-pub async fn publish_revision(
-    eitri_app_id: &str,
-    environment_id: &str,
-    message: &str,
-) -> Result<String, HttpError> {
-    let access_token = match blind_guardian::get_access_token(
-        "https://api.eitri.tech",
-        "blind-guardian-api/v2/o/auth",
-    )
-    .await
-    {
-        Ok(token) => token,
-        Err(_err) => {
-            eprintln!("Houve um erro ao autenticar-se no Eitri");
-            exit(1)
-        }
-    };
-
-    let headers = http_client::get_default_headers(access_token).await;
-
-    let url = format!(
-        "https://api.eitri.tech/eitri-manager-api/revisions/{}/publish",
-        eitri_app_id
-    );
-
-    let data = json!({
-        "envId": environment_id,
-        "message": message
-    });
-
-    let result = http_client::put(&url, data, headers).await?;
-
-    Ok(result)
-}

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

@@ -1,4 +0,0 @@
-pub mod blind_guardian;
-pub mod eitri_manager;
-pub mod workspace;
-pub mod eitri_foundry;

package/eitri-cli-v2/src/services/workspace.rs

@@ -1,49 +0,0 @@
-use std::{env, fs, path::Path, process::exit};
-
-use crate::model::eitri_conf::EitriConf;
-use crate::utils::convert_eitri_conf;
-
-pub async fn read_eitri_conf() -> EitriConf {
-    let current_dir = match env::current_dir().ok() {
-        Some(it) => it,
-        None => {
-            eprintln!("Houve um erro o tentar ler o diretório atual");
-            exit(1)
-        }
-    };
-
-    let current_dir_str = current_dir.display().to_string();
-    let file_path = Path::new(&current_dir_str);
-    let file_path = file_path.join("eitri-app.conf.json");
-
-    convert_eitri_conf::convert();
-
-    let content = match fs::read_to_string(file_path.display().to_string()).ok() {
-        Some(it) => it,
-        None => {
-            eprintln!("Houve um erro ao tentar ler o eitri-app.conf do projeto. Certifique-se de estar no diretório de um Eitri-App");
-            exit(1)
-        }
-    };
-
-    let eitri_conf: EitriConf = match serde_json::from_str(&content).ok() {
-        Some(it) => {
-            match fs::remove_file(file_path.display().to_string()) {
-                Ok(()) => (),
-                Err(_err) => {
-                    eprintln!(
-                        "Houve um erro ao tentar ler o eitri-app.conf do projeto. Tente novamente."
-                    );
-                    exit(1)
-                }
-            };
-            it
-        }
-        None => {
-            eprintln!("Houve um erro ao fazer parse do json");
-            exit(1)
-        }
-    };
-
-    eitri_conf
-}

package/eitri-cli-v2/src/utils/convert_eitri_conf.rs

@@ -1,98 +0,0 @@
-use std::env::current_dir;
-use std::fs;
-use std::io::Write;
-use std::process::exit;
-use std::{fs::File, process::Command};
-
-static BASH_SCRIPT: &str = r#"
-#!/bin/bash
-
-# Atribua os argumentos a variáveis
-js_file="eitri-app.conf.js"
-json_file="eitri-app.conf.json"
-
-# Verifique se o arquivo JavaScript existe
-if [ ! -f "$js_file" ]; then
-    echo "Erro: Arquivo JavaScript não encontrado: $js_file"
-    exit 1
-fi
-
-# Execute o script JavaScript para converter o objeto para JSON e redirecione a saída para o arquivo JSON
-node -e "console.log(JSON.stringify(require('./$js_file'), null, 2))" > "$json_file"
-
-echo "Conversão concluída. O JSON foi salvo em: $json_file"
-"#;
-
-static BAT_SCRIPT: &str = r#"
-@echo off
-
-rem Atribua os argumentos a variáveis
-set "js_file=eitri-app.conf.js"
-set "json_file=eitri-app.conf.json"
-
-rem Verifique se o arquivo JavaScript existe
-if not exist "%js_file%" (
-    echo Erro: Arquivo JavaScript não encontrado: %js_file%
-    exit /b 1
-)
-
-rem Execute o script JavaScript para converter o objeto para JSON e redirecione a saída para o arquivo JSON
-node -e "console.log(JSON.stringify(require('./%js_file%'), null, 2))" > "%json_file%"
-
-echo Conversão concluída. O JSON foi salvo em: %json_file%
-"#;
-
-#[allow(dead_code)]
-pub fn convert() {
-    if cfg!(target_os = "windows") {
-        let temp_script = temp_bat_script();
-        println!("{temp_script}");
-        let out = Command::new("cmd")
-            .args(&["/C", &temp_script])
-            .output()
-            .expect("Falha ao converter arquivo .js e .json");
-        println!("\x1b[33mArquivo eitri-app.conf.json gerado com sucesso\x1b[0m");
-        match fs::remove_file(temp_script) {
-            Ok(it) => it,
-            Err(_err) => {
-                eprintln!("Houve um remover script temporário");
-                exit(1)
-            }
-        };
-        out
-    } else {
-        Command::new("sh")
-            .arg("-c")
-            .arg(BASH_SCRIPT)
-            .output()
-            .expect("Falha ao converter arquivo .js e .json")
-    };
-}
-
-fn temp_bat_script() -> String {
-    let dir = match current_dir() {
-        Ok(dir_path) => dir_path,
-        Err(_) => {
-            eprintln!("Houve um erro o tentar ler o diretório atual");
-            exit(1)
-        }
-    };
-
-    let file_path = dir.join("convert.bat");
-    let file = match File::create(file_path.to_owned()) {
-        Ok(it) => it,
-        Err(_err) => {
-            eprintln!("Houve um criar script temporário");
-            exit(1)
-        }
-    };
-    match writeln!(&file, "{BAT_SCRIPT}") {
-        Ok(it) => it,
-        Err(_err) => {
-            eprintln!("Houve um salvar script temporário");
-            exit(1)
-        }
-    };
-
-    file_path.to_owned().display().to_string()
-}

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

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

package/test/Executor.js

@@ -1,60 +0,0 @@
-const exec = require("child_process").exec
-
-class Executor {
-
-    constructor(execOptions) {
-        this.listeners = {}
-        this.execOptions = execOptions
-        this.children = []
-        this.stdout = ''
-        this.child = {
-            kill: (killArg) => {
-                this.children.forEach(c => c.kill(killArg))
-            }
-        }
-    }
-
-    exec(cmdStr, options) {
-        console.log(`Executando: ${cmdStr}`)
-        const child = exec(cmdStr, options || this.execOptions)
-        child.stdout.on('data', lines => {
-            this.stdout += lines
-            for (const listener in this.listeners) {
-                this.listeners[listener](lines)
-            }
-        });
-        child.stderr.on('data', (lines) => {
-            if (lines && lines.includes('Error:')) {
-                throw new Error(lines)
-            }
-        });
-        child.on('exit', (code) => {
-            console.log(`child process exited with code ${code}\n\tCommand: ${cmdStr}`);
-            const missing = Object.keys(this.listeners)
-            if (missing.length) {
-                this.reject(new Error(`Ainda aguardando:\n\t ${missing.join('\n\t')}`))
-            }
-        });
-        this.children.push(child)
-        return this
-    }
-
-    async waitFor(regex) {
-        console.log('Esperando uma linha que case com', regex)
-        return new Promise((resolve, reject) => {
-            this.reject = reject
-            this.listeners[regex.toString()] = (lines) => {
-                let lineFound = lines.split('\n').find(line => regex.test(line))
-                if (lineFound) {
-                    console.log(`Devolvendo resultado que casou com ${regex}:\n${lineFound}`);
-                    delete this.listeners[regex.toString()]
-                    resolve(lineFound)
-                } else {
-                    console.log(`Ignorando child stdout:\n${lines}`);
-                }
-            }
-        })
-    }
-}
-
-module.exports = Executor

package/test/Factory.js

@@ -1,13 +0,0 @@
-module.exports = class Factory {
-    static generateWorkspace() {
-        return [
-            {
-                name: "MY_WORKSPACE",
-                userId: "2",
-                status: "ACTIVE",
-                id: "2a563ae3-722a-4640-8e7a-4f46aa93ec67",
-                createdAt: "2023-08-08T18:17:16.921Z",
-            },
-        ];
-    }
-};

package/test/Helper.js

@@ -1,15 +0,0 @@
-const BlindGuardian = require("../src/service/BlindGuardian");
-const Http = require("../src/service/Http");
-
-class Helper {
-
-    static async delete(eitriAppId) {
-        console.log(`Apagando eitri app id ${eitriAppId}...`)
-        const blindGuardian = new BlindGuardian();
-        const http = new Http(blindGuardian);
-        await http.delete(`https://api.eitri.tech/eitri-manager-api/eitri-apps/${eitriAppId}`)
-        console.log(`Eitri app id ${eitriAppId} apagado.`)
-    }
-}
-
-module.exports = Helper

package/test/_fixtures/factory.js

@@ -1,30 +0,0 @@
-
-const getTarget = () => {
-    return  {
-        id: 7,
-        name: 'CALINDRA_MOBILE',
-        minimumCliVersion: '1.16.5',
-        boilerplateUrl: 'https://github.com/Calindra/eitri-mobile-mini-app-template',
-        superAppClientLibName: 'eitri-app-client',
-        componentsLibName: 'eitri-app-components',
-        description: 'CALINDRA_MOBILE',
-        status: 'ACTIVE',
-        platform: 'mobile',
-        targetConfig: [],
-        bodyClass: 'eitri-mobile',
-        sdkSupport: 'eitri-mini-app-sdk-support',
-        default: true,
-        miniAppBoilerplateList: [
-            {
-                name: 'serverless',
-                boilerplateUrl: 'https://github.com/Calindra/eitri-mobile-mini-app-template',
-                description: 'Para uso de Eitri-App com serverless'
-            }
-        ]
-    }
-}
-
-
-module.exports = {
-    getTarget
-}

package/test/_fixtures/miniWebApp/miniapp.conf.js

@@ -1,4 +0,0 @@
-module.exports = {
-    "version": "0.1.0",
-    "eitri-mini-app-sdk-support": "2.0.0"
-}

package/test/_fixtures/miniapp.conf.js

@@ -1,5 +0,0 @@
-module.exports = {
-    'slug': 'mini-app-colossus',
-    'public-key': '877480a8-a8cb-496c-96ab-12292bd7811e',
-    'version': '0.1.0'
-}

package/test/_fixtures/server/HelloWorldBackend.js

@@ -1,7 +0,0 @@
-module.exports = class HelloWorldBackend {
-
-    async handler(req) {
-        return req
-    }
- 
-}

package/test/_fixtures/src/Home.js

@@ -1,5 +0,0 @@
-
-class Home {
-
-}
-module.exports = Home;

package/test/_fixtures/src/Home2.js

@@ -1,5 +0,0 @@
-
-class Home {
-
-}
-module.exports = Home;

package/test/_fixtures/src/commons/util.js

@@ -1,3 +0,0 @@
-module.exports = () => {
-    return 'util'
-}

package/test/_fixtures/src/components/TagA.jsx

@@ -1,4 +0,0 @@
-<div>
-    <TagB>Conteudo da tag B</TagB>
-    <TagC>Conteudo da tag C</TagC>
-</div>

package/test/_fixtures/src/components/TagB.jsx

@@ -1,4 +0,0 @@
-<div>
-    Conteudo
-    <TagC></TagC>
-</div>

package/test/_fixtures/src/components/TagC.jsx

@@ -1,3 +0,0 @@
-<div>
-    Tag C
-</div>

package/test/_fixtures/src/components/TagD.jsx

@@ -1,3 +0,0 @@
-<div>
-    Tag C
-</div>

package/test/_fixtures/src/server/foo.js

@@ -1,7 +0,0 @@
-export default class Foo {
-
- fullfill() {
- return 'foo'
- }
-
-}

package/test/_fixtures/src/views/AboutTemplate.jsx

@@ -1,14 +0,0 @@
-<Window>
-    <Group>
-        <Circle icon={require('../assets/images/icon_ame.svg')} />
-        <Spacing size="sm" />
-        <Subtitle fontSize="xs" textAlign="center" color="neutralcolor-darkest">Detalhes desta versão</Subtitle>
-        <View>
-            <Subtitle textAlign="center" fontSize="xxxs" color="neutralcolor-darkest">Este Eitri-App foi desenvolvido utilizando as seguintes versões:</Subtitle>
-            <Spacing size="sm" />
-            <Paragraph textAlign="center">Versão da biblioteca de componentes: ###COMPONENTS_LIBRARY_VERSION_HIGHLIGHTER###</Paragraph>
-            <Spacing size="sm" />
-            <Paragraph textAlign="center">Versão da API de Super Client: ###SUPER_APP_CLIENT_VERSION_HIGHLIGHTER###</Paragraph>
-        </View>
-    </Group>
-</Window>

package/test/_fixtures/woodcoffee/miniapp.conf.js

@@ -1,5 +0,0 @@
-module.exports = {
-    "version": "0.1.0",
-    "eitri-app-client":"1.0.0",
-    "eitri-app-components":"1.0.0"
-}

package/test/ame.conf.js

@@ -1,3 +0,0 @@
-module.exports = {
-    'version': '0.1.0'
-}