eitri-cli 1.2.1 → 1.3.0-beta.1

package/bitbucket-pipelines.yml

@@ -1,11 +1,25 @@
-image: node:18
+image: node:18-alpine
 pipelines:
+  custom:
+    test-validation:
+      - step:
+          name: Run validation tests
+          caches:
+            - node
+          script:
+            - yarn
+            - npm i -g .
+            - export FOUNDRY_CONTEXT_PATH=runes-foundry
+            - yarn test cli.test.js --force-exit
   default:
     - step: &runTests
         name: Run tests
         caches:
           - node
         script:
+          - apk add git
+          - apk add chromium
+          - export PUPPETEER_EXECUTABLE_PATH='/usr/bin/chromium-browser'
           - yarn
           - npm i -g .
           - yarn test cli.test.js --force-exit
@@ -19,6 +33,7 @@ pipelines:
           caches:
             - node
           script:
+            - apk add git
             - echo 'Start release'
             - echo 'If there is a new version, it will be automatically published on NPM according to the channel/branch (beta or master (stable)).'
             - yarn

package/config/dev.js

@@ -86,11 +86,9 @@ const config = {
         url: "https://analytics.dev.eitri.calindra.com.br/analytics/event",
     },
     managerFront: {
-        url: `https://admin.${HOST}`,
+        url: `https://console.eitri.tech`,
         managerCredential: "/settings/manager-credential",
         cliGenerateLoginCredential: "/settings/cli-generate-credential",
-
-        url: `https://admin.${HOST}`,
     },
     vegvisir: {
         url: `https://${HOST}`,

package/config/loc-eitri.js

@@ -3,7 +3,7 @@ const HOST = ipv4()[0];
 const packageJson = require("../package.json");
 const PORT = process.env.EITRI_APP_TOOLS_PORT || 3333;
 const path = require("path");
-const HOST_EITRIAPPS = "dev.eitri.calindra.com.br";
+const HOST_EITRIAPPS = "api.eitri.tech";
 
 const config = {
     userAgent: packageJson.name,

package/index.js

@@ -30,6 +30,7 @@ const run = async () => {
         .description(
             "Configura suas credenciais de desenvolvedor no dispositivo local"
         )
+        .option("--yes", "Aceita o redirecionamento para o console")
         .action(async (cmdObj) => {
             require("./src/cmd/login")(cmdObj);
         });
@@ -41,7 +42,10 @@ const run = async () => {
             "--yes",
             "Aceita os valores default para nome título e organização"
         )
-        .option("--application <application>", "Define o application de execução do Eitri-App")
+        .option(
+            "--application <application>",
+            "Define o application de execução do Eitri-App"
+        )
         .option("-v, --verbose", "Exibe mais logs")
         .action((projectName, cmdObj) => {
             require("./src/cmd/create")(projectName, cmdObj);
@@ -53,9 +57,13 @@ const run = async () => {
         .option("-v, --verbose", "Exibe mais logs")
         .option("-f, --force", "Força o start")
         .option("-S, --show-deeplink", "Exibe o deep link do workspace")
-        .option(    
+        .option(
             "-P, --qr-printer <qrPrinter>",
             "Indica qual programa imprimirá o QR Code. Se omitido, exibe o QrCode no terminal. Valores válidos: terminal|chrome|msedge|firefox"
+        )
+        .option(
+            "-e, --emulator <platform>",
+            "Abre o Eitri-App no emulador, desde que seja definido qual plataforma será aberto, android ou ios."
         );
 
     startProgram.action((cmdObj) => {
@@ -83,14 +91,14 @@ const run = async () => {
         });
 
     program
-        .command('clean')
+        .command("clean")
         .description(
-            'Realiza a limpeza do workspace remoto do desenvolvedor. Útil quando há mal fucionamento na compilação em nuvem do Eitri-App.'
+            "Realiza a limpeza do workspace remoto do desenvolvedor. Útil quando há mal fucionamento na compilação em nuvem do Eitri-App."
         )
-        .option('-v, --verbose', 'Exibe mais logs')
-        .action(cmdObj => {
-            require('./src/cmd/clean')(cmdObj)
-        })
+        .option("-v, --verbose", "Exibe mais logs")
+        .action((cmdObj) => {
+            require("./src/cmd/clean")(cmdObj);
+        });
 
     program
         .command("self-update")
@@ -102,7 +110,7 @@ const run = async () => {
             );
         });
 
-    program.addCommand(VegvisirCommand())
+    program.addCommand(VegvisirCommand());
 
     if (
         process.argv.length > 2 &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eitri-cli",
-  "version": "1.2.1",
+  "version": "1.3.0-beta.1",
   "description": "Command Line Interface to make \"Eitri-App\" with code and fire.",
   "main": "index.js",
   "bin": {
@@ -61,6 +61,7 @@
     "tmp": "^0.1.0",
     "tough-cookie": "^3.0.1",
     "tough-cookie-file-store": "^2.0.2",
+    "uri-scheme": "^1.1.0",
     "uuid": "^7.0.2"
   },
   "devDependencies": {
@@ -73,9 +74,10 @@
     "eslint": "^6.7.2",
     "eslint-config-google": "^0.14.0",
     "husky": "^8.0.3",
-    "jest": "^24.9.0",
+    "jest": "^29.7.0",
     "lint-staged": "^9.5.0",
     "nock": "^13.3.0",
+    "puppeteer": "^21.4.1",
     "semantic-release": "^22.0.5"
   },
   "resolutions": {

package/src/cmd/login.js

@@ -1,53 +1,70 @@
-const inquirer = require('inquirer')
-const configService = require('../service/ConfigService')
-const open = require('open')
-const TrackingEitriAnalytics = require('../service/TrackingEitriAnalytics')
-const Server = require('../service/Server')
+const inquirer = require("inquirer");
+const configService = require("../service/ConfigService");
+const open = require("open");
+const TrackingEitriAnalytics = require("../service/TrackingEitriAnalytics");
+const Server = require("../service/Server");
 
 module.exports = async function login(args) {
     try {
-        console.log("\n\n")
+        console.log("\n\n");
+        const urlAdminManagerCredential = `${
+            configService.get("managerFront").url
+        }`;
+        const res = Server.startCliLogin();
+        const urlAdminManagerCredentialWithParams = `${urlAdminManagerCredential}?loginType=EITRI_CLI&port=${res?.port}`;
 
-        const {openPortalAnwser} = await inquirer.prompt([
+        let portalOpenMessage = "";
+
+        if (args.yes) {
+            try {
+                open(urlAdminManagerCredentialWithParams);
+            } catch (error) {
+                portalOpenMessage =
+                    "Não foi possível abrir automaticamente. Copie o link e cole em seu navegador para fazer o login na Eitri-CLI. " +
+                    urlAdminManagerCredentialWithParams;
+            }
+            return;
+        }
+
+        const { openPortalAnwser } = await inquirer.prompt([
             {
-                type: 'confirm',
-                name: 'openPortalAnwser',
-                message: ' Podemos redirecioná-lo para o login?',
+                type: "confirm",
+                name: "openPortalAnwser",
+                message: " Podemos redirecioná-lo para o login?",
             },
-        ])
-
-        const res = Server.startCliLogin()
-        
-        const urlAdminManagerCredential = `${configService.get("managerFront").url}`
-        const urlAdminManagerCredentialWithParams = `${urlAdminManagerCredential}?loginType=EITRI_CLI&port=${res?.port}`
-        
-        let portalOpenMessage = ""
+        ]);
 
         if (openPortalAnwser) {
-            console.log("\n", "Redirecionando...")
+            console.log("\n", "Redirecionando...");
             try {
-                open(urlAdminManagerCredentialWithParams)
-                portalOpenMessage = "Aberto em seu navegador padrão"
+                open(urlAdminManagerCredentialWithParams);
+                portalOpenMessage = "Aberto em seu navegador padrão";
             } catch (error) {
-                portalOpenMessage = "Não foi possível abrir automaticamente. Copie o link e cole em seu navegador para fazer o login na Eitri-CLI. " + urlAdminManagerCredentialWithParams
+                portalOpenMessage =
+                    "Não foi possível abrir automaticamente. Copie o link e cole em seu navegador para fazer o login na Eitri-CLI. " +
+                    urlAdminManagerCredentialWithParams;
             }
         } else {
-            portalOpenMessage = "Copie o link e cole em seu navegador para fazer o login na Eitri-CLI. " + urlAdminManagerCredentialWithParams
+            portalOpenMessage =
+                "Copie o link e cole em seu navegador para fazer o login na Eitri-CLI. " +
+                urlAdminManagerCredentialWithParams;
         }
 
-        console.log("\n", portalOpenMessage)
-        console.log("\n\n Aguardando autenticação...")
+        console.log("\n", portalOpenMessage);
+        console.log("\n\n Aguardando autenticação...");
     } catch (error) {
         TrackingEitriAnalytics.sendEvent({
             eventName: "login.error",
             data: {
-                errorMessage: error?.message ?? ""
-            }
-        })
+                errorMessage: error?.message ?? "",
+            },
+        });
 
-        console.log('Erro inesperado, tente novamente mais tarde.', error?.message)
+        console.log(
+            "Erro inesperado, tente novamente mais tarde.",
+            error?.message
+        );
 
-        process.exit(1)
+        process.exit(1);
     }
-
-}
+};

package/src/service/factories/QRCodeStarterFactory.js

@@ -1,70 +1,146 @@
-const QRCodeFactory = require('../QRCodeFactory')
-
-function QRCodeStarter(args, trackingService, watcher, workspace, targetConfig ) {
-    this.args = args
-    this.trackingService = trackingService
-    this.watcher = watcher
-    this.workspace = workspace
-    this.targetConfig = targetConfig
+const QRCodeFactory = require("../QRCodeFactory");
+const { Ios, Android } = require("uri-scheme");
+const readline = require("readline");
+const chalk = require("chalk");
+const os = require("os");
+function QRCodeStarter(
+    args,
+    trackingService,
+    watcher,
+    workspace,
+    targetConfig
+) {
+    this.args = args;
+    this.trackingService = trackingService;
+    this.watcher = watcher;
+    this.workspace = workspace;
+    this.targetConfig = targetConfig;
 
     this.startServer = async function () {
-        let fullUrl
+        let fullUrl;
         if (this.args.oldQrcode) {
-            fullUrl = await this.workspace.getWorkspaceURL(this.args, this.targetConfig)
+            fullUrl = await this.workspace.getWorkspaceURL(
+                this.args,
+                this.targetConfig
+            );
         } else {
-            const {miniAppUrl} = await this.workspace.getNewWorkspaceURL(this.args, this.targetConfig)
-            fullUrl =  miniAppUrl
+            const { miniAppUrl } = await this.workspace.getNewWorkspaceURL(
+                this.args,
+                this.targetConfig
+            );
+            fullUrl = miniAppUrl;
         }
 
         if (this.args.verbose) {
-            console.log(`QrCodeUrl: ${fullUrl}`)
+            console.log(`QrCodeUrl: ${fullUrl}`);
         }
 
-        this.watcher.start()
-        if(this.args.showDeeplink){
-            console.log('######################################')
-            console.log('########### Deep Link URL ############')
-            console.log('######################################')
-            console.log(`${fullUrl}`)
-            console.log('######################################')
+        this.watcher.start();
+        if (this.args.showDeeplink) {
+            console.log("######################################");
+            console.log("########### Deep Link URL ############");
+            console.log("######################################");
+            console.log(`${fullUrl}`);
+            console.log("######################################");
         }
 
-        const _QRCodeFactory = new QRCodeFactory()
+        const _QRCodeFactory = new QRCodeFactory();
 
-        const eitriAppSlug = this.workspace?._miniConf?.slug ?? ""
-        const qrCodePath = await _QRCodeFactory.create(fullUrl, eitriAppSlug)
+        const eitriAppSlug = this.workspace?._miniConf?.slug ?? "";
+        const qrCodePath = await _QRCodeFactory.create(fullUrl, eitriAppSlug);
 
         if (this.args.verbose) {
-            console.log(`QrCode Path: ${qrCodePath}`)
+            console.log(`QrCode Path: ${qrCodePath}`);
+        }
+
+        _QRCodeFactory.generate({ ...this.args, qrCodePath, fullUrl });
+
+        if (this.args.emulator) {
+            tryOpenEmulator(fullUrl, args);
         }
 
-        _QRCodeFactory.generate({...this.args, qrCodePath, fullUrl})
+        listenerKeyPressToOpenEmulator(fullUrl);
+    };
+}
+
+function tryOpenEmulator(fullUrl, args) {
+    const shareId = extractShareId(fullUrl);
+    const { emulator } = args;
+    if (emulator === "ios") {
+        return Ios.openAsync({ uri: `eitri://workspace/${shareId}` }).catch(
+            () => {
+                console.error(
+                    `Houve um erro ao tentar abrir o Eitri-App na plataforma iOS`
+                );
+            }
+        );
     }
+    return Android.openAsync({ uri: `eitri://workspace/${shareId}` }).catch(
+        () => {
+            console.error(
+                `Houve um erro ao tentar abrir o Eitri-App na plataforma Android`
+            );
+        }
+    );
 }
 
-function tryToOpenAndroidEmulator(fullUrl, args) {
-    try {
-        const cmd = `adb shell am start -a android.intent.action.VIEW -d "${encodeURIComponent(fullUrl)}"`
-        let options = {}
-        if (args.verbose) {
-            options.stdio = 'inherit'
-            require('child_process').execSync(cmd, options)
-        } else {
-            require('child_process').exec(cmd, options, () => {
-                // ignora erros
-            })
+function listenerKeyPressToOpenEmulator(url) {
+    console.log("================================================");
+    console.log(`\t${chalk.green.bold("Abertura de Eitri-App automática")}`);
+    console.log("================================================");
+    console.log(`Pressione ${chalk.blue.bold("a")} para abrir no Android`);
+    if (os.platform() === "darwin") {
+        console.log(`Pressione ${chalk.blue.bold("i")} para abrir no iOS`);
+    }
+    console.log(
+        `Pressione ${chalk.blue.bold(
+            "q"
+        )} para finalizar a execução do Eitri-App`
+    );
+    console.log("================================================");
+    readline.emitKeypressEvents(process.stdin);
+
+    if (process.stdin.isTTY) process.stdin.setRawMode(true);
+
+    process.stdin.on("keypress", (chunk, key) => {
+        if (key && key.name == "a") {
+            const emulator = "android";
+            console.log("Abrindo Eitri-App no Android");
+            tryOpenEmulator(url, { emulator });
         }
-    } catch(e) {
-        if (args.verbose) {
-            console.log(e)
+        if (os.platform() === "darwin" && key && key.name == "i") {
+            const emulator = "ios";
+            console.log("Abrindo Eitri-App no iOS");
+            tryOpenEmulator(url, { emulator });
         }
-    }
+        if (key && key.name == "q") {
+            console.log("Parando execução do Eitri-App");
+            process.exit(0);
+        }
+    });
 }
 
-function QRCodeContentFactory(){
-    this.create = function (args, trackingService, watcher, workspace, targetConfig) {
-        return new QRCodeStarter(args, trackingService, watcher, workspace, targetConfig )
-    }
+function extractShareId(url) {
+    const [, shareId] = url.split("/share/");
+    return shareId;
+}
+
+function QRCodeContentFactory() {
+    this.create = function (
+        args,
+        trackingService,
+        watcher,
+        workspace,
+        targetConfig
+    ) {
+        return new QRCodeStarter(
+            args,
+            trackingService,
+            watcher,
+            workspace,
+            targetConfig
+        );
+    };
 }
 
-module.exports = QRCodeContentFactory
+module.exports = QRCodeContentFactory;

package/test/e2e/cli.test.js

@@ -1,68 +1,143 @@
-const util = require("util")
-const path = require("path")
-const execAsync = util.promisify(require("child_process").exec)
-const axios = require("axios")
-const minutes = 60000
-const Executor = require("../Executor.js")
-const Helper = require("../Helper.js")
+const util = require("util");
+const puppeteer = require("puppeteer");
+const path = require("path");
+const execAsync = util.promisify(require("child_process").exec);
+const axios = require("axios");
+const minutes = 60000;
+const Executor = require("../Executor.js");
+const Helper = require("../Helper.js");
+const ConfigService = require("../../src/service/ConfigService.js");
 
 describe("eitri-cli", () => {
-
-    const EITRI_WORK_DIR = path.join(__dirname, '..', '..', 'developer-folder')
+    const EITRI_WORK_DIR = path.join(__dirname, "..", "..", "developer-folder");
     let devEnv = {
         ...process.env,
         EITRI_CLI_CLIENT_ID: process.env.EITRI_CLI_CLIENT_ID,
         EITRI_CLI_CLIENT_SECRET: process.env.EITRI_CLI_CLIENT_SECRET,
-    }
+    };
+
+    it(
+        "should works",
+        async () => {
+            const EITRI_APP_NAME = `eitri-test-${Date.now()}`;
+            try {
+                await execAsync(
+                    `cd ${EITRI_WORK_DIR} && rm -rf ./eitri-test-*`,
+                    { env: process.env }
+                );
+
+                const executor = new Executor({ env: devEnv });
+                await executor
+                    .exec(
+                        `cd ${EITRI_WORK_DIR} && eitri create ${EITRI_APP_NAME} --yes --application=APPLICATION_CALINDRA`,
+                        { env: devEnv }
+                    )
+                    .waitFor(/Download de template completo/);
+                await new Promise((resolve) => setTimeout(resolve, 200));
+                const EITRI_APP_FOLDER = path.resolve(
+                    EITRI_WORK_DIR,
+                    EITRI_APP_NAME
+                );
+
+                const startExecution = new Executor({ env: devEnv });
+                await startExecution
+                    .exec(`cd ${EITRI_APP_FOLDER} && eitri start`)
+                    .waitFor(/Utilize o QR-Code para iniciar o seu Eitri-App/);
+
+                const line = await executor
+                    .exec(`eitri workspace list`)
+                    .waitFor(/Id:/i);
+
+                const workspaceId = line.split(/id:/i)[1].trim();
+                await axios.get(
+                    `https://api.eitri.tech/foundry/user/${workspaceId}/index.html`
+                );
+                await axios.get(
+                    `https://api.eitri.tech/foundry/user/${workspaceId}/Home.html`
+                );
+
+                const textContent = `SomeText${Date.now()}Content`;
+                const promise = startExecution.waitFor(
+                    /Forjado em ([0-9])+ milissegundos/
+                );
+                await execAsync(
+                    `echo "<Text>${textContent}</Text>" > ${EITRI_APP_FOLDER}/src/views/Home.jsx`
+                );
+                await promise;
 
-    it("should works", async () => {
-        const EITRI_APP_NAME = `eitri-test-${Date.now()}`
+                let res = await axios.get(
+                    `https://api.eitri.tech/foundry/user/${workspaceId}/index.js`
+                );
+                expect(res.data).toContain(textContent);
+
+                startExecution.child.kill();
+                executor.child.kill();
+
+                const pushVersion = new Executor({ env: devEnv });
+                await pushVersion
+                    .exec(`cd ${EITRI_APP_FOLDER} && eitri push-version`)
+                    .waitFor(/disponível no Eitri Console/);
+                pushVersion.child.kill();
+
+                const conf = require(`../../developer-folder/${EITRI_APP_NAME}/eitri-app.conf.js`);
+                await Helper.delete(conf.id);
+            } catch (e) {
+                console.error(e);
+                throw e;
+            }
+        },
+        2 * minutes
+    );
+
+    it("should do eitri login", async () => {
+        const loginVars = {
+            EITRI_TEST_LOGIN_EMAIL: process.env.EITRI_TEST_LOGIN_EMAIL,
+            EITRI_TEST_LOGIN_PASSWORD: process.env.EITRI_TEST_LOGIN_PASSWORD,
+        };
         try {
+            const consoleUrl = ConfigService.get("managerFront").url;
+            const browser = await puppeteer.launch({
+                headless: "new",
+                args: ["--no-sandbox"],
+            });
+            const page = await browser.newPage();
+
+            console.log("Abrindo console");
+            await page.goto(consoleUrl);
+            const inputEmail = await page.waitForXPath('//*[@id="email"]');
+            console.log("Inserindo e-mail");
+            inputEmail.type(String(loginVars.EITRI_TEST_LOGIN_EMAIL));
+            await sleep(1000);
+            const inputPassword = await page.waitForXPath(
+                '//*[@id="password"]'
+            );
+            console.log("Inserindo password");
+            inputPassword.type(String(loginVars.EITRI_TEST_LOGIN_PASSWORD));
+
+            const buttonElement = await page.waitForXPath(
+                "/html/body/div/div/div[2]/div[2]/div/div/div/form/div/button"
+            );
+            console.log("Clicando no botão");
+            buttonElement.click();
+            await sleep(4000);
+
+            const executor = new Executor({ env: devEnv });
+            executor
+                .exec("eitri login --yes --verbose")
+                .waitFor(/Credencial gerada! Você está logado/);
 
-            await execAsync(`cd ${EITRI_WORK_DIR} && rm -rf ./eitri-test-*`, { env: process.env })
-
-            const executor = new Executor({ env: devEnv })
-            await executor
-                .exec(`cd ${EITRI_WORK_DIR} && eitri create ${EITRI_APP_NAME} --yes --application=APPLICATION_CALINDRA`, { env: devEnv })
-                .waitFor(/Download de template completo/)
-            await new Promise(resolve => setTimeout(resolve, 200))
-            const EITRI_APP_FOLDER = path.resolve(EITRI_WORK_DIR, EITRI_APP_NAME)
-
-            const startExecution = new Executor({ env: devEnv })
-            await startExecution
-                .exec(`cd ${EITRI_APP_FOLDER} && eitri start`)
-                .waitFor(/Utilize o QR-Code para iniciar o seu Eitri-App/)
-
-            const line = await executor
-                .exec(`eitri workspace list`)
-                .waitFor(/Id:/i)
-
-            const workspaceId = line.split(/id:/i)[1].trim()
-            await axios.get(`https://api.eitri.tech/foundry/user/${workspaceId}/index.html`)
-            await axios.get(`https://api.eitri.tech/foundry/user/${workspaceId}/Home.html`)
-
-            const textContent = `SomeText${Date.now()}Content`
-            const promise = startExecution.waitFor(/Forjado em ([0-9])+ milissegundos/)
-            await execAsync(`echo "<Text>${textContent}</Text>" > ${EITRI_APP_FOLDER}/src/views/Home.jsx`)
-            await promise
-
-            let res = await axios.get(`https://api.eitri.tech/foundry/user/${workspaceId}/index.js`)
-            expect(res.data).toContain(textContent)
-
-            startExecution.child.kill()
-            executor.child.kill()
-
-            const pushVersion = new Executor({ env: devEnv })
-            await pushVersion.exec(`cd ${EITRI_APP_FOLDER} && eitri push-version`)
-                .waitFor(/disponível no Eitri Console/)
-            pushVersion.child.kill()
-
-            const conf = require(`../../developer-folder/${EITRI_APP_NAME}/eitri-app.conf.js`)
-            await Helper.delete(conf.id)
-        } catch (e) {
-            console.error(e)
-            throw e
+            console.log(
+                "Executando login e abrindo no pupeeteer para enviar as credenciais geradas para a CLI"
+            );
+            await page.goto(`${consoleUrl}/?loginType=EITRI_CLI&port=3333`);
+            await browser.close();
+        } catch (error) {
+            console.error(error);
+            throw error;
         }
-    }, 2 * minutes)
+    });
 
-})
+    const sleep = (timeInMs) => {
+        return new Promise((resolve) => setTimeout(resolve, timeInMs));
+    };
+});