eitri-cli 1.6.1 → 1.7.0-beta.1

package/package.json

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

package/src/service/Emulator/AndroidEmulatorService.js

@@ -0,0 +1,103 @@
+const util = require('util');
+const inquirer = require("inquirer");
+const GenericUtils = require('../../util/GenericUtils');
+const exec = util.promisify(require("child_process").exec)
+
+module.exports = class AndroidEmulatorService {
+
+    static async open(deepLink, shareId) {
+        await this.checkHasInstalledAdb()
+        const serialNumber = await this.selectDevice()
+        const cmd = `adb -s ${serialNumber} shell am start -a android.intent.action.VIEW -d ${deepLink}/${shareId}`
+        const opened = await this.openDeepLink(cmd)
+        if (opened) return;
+    }
+
+    static async checkHasInstalledAdb() {
+        try {
+            console.log("Verificando instalação do ABD",)
+            const command = "adb --version"
+            await exec(command)
+            console.log("ADB Instalado. Continuando...")
+        } catch (error) {
+            throw new Error('"adb" não instalado. Saiba mais em https://developer.android.com/tools/adb')
+        }
+    }
+
+    static async selectDevice() {
+        const devices = await this.checkAttachedDevices()
+
+        if (devices.length === 0) {
+            throw new Error('Dipositivo não selecionado')
+        }
+
+        if (devices.length === 1) {
+            return GenericUtils.getSerialNumberFromAdb(devices[0])
+        }
+
+        const res = await inquirer.prompt([
+            {
+                name: "accepted",
+                type: "list",
+                message:
+                    "Selecione o Android que deseja se conectar",
+                choices: devices,
+                pageSize: devices.length + 2,
+            },
+        ]);
+
+        if (res.accepted && typeof res.accepted === "string") {
+            console.log("Dispositivo selecionado: ", res.accepted, "\n")
+            return GenericUtils.getSerialNumberFromAdb(res.accepted)
+        }
+
+    }
+
+    static async checkAttachedDevices() {
+        console.log("Verificando dispositivos ADB conectados")
+        const devices = await this.getListAdbDevices()
+        if (!devices.length) {
+            throw new Error('Nenhum dispositivo/emulador encontrado')
+        }
+
+        return devices
+    }
+
+    static async openDeepLink(cmd) {
+        try {
+            const {stderr} = await exec(cmd)
+            return !(stderr);
+        } catch (error) {
+            console.log(`Houve um erro ao tentar abrir o Eitri-App via deep link`)
+            console.log(error)
+            return process.exit(1)
+        }
+    }
+
+    static async getListAdbDevices() {
+
+        return new Promise((resolve, _reject) => {
+            exec('adb devices -l', (error, stdout, _stderr) => {
+                const adbDevices = []
+                if (error) {
+                    console.error(`Erro ao executar o comando: ${error}`);
+                    return;
+                }
+
+                const devicesList = stdout.split('\n');
+                const devices = devicesList.slice(1, -2);
+
+                devices.forEach(device => {
+                    adbDevices.push(device)
+                });
+                resolve(adbDevices)
+            });
+
+        })
+    }
+
+
+
+}
+
+

package/src/service/Emulator/IOSEmulatorService.js

@@ -0,0 +1,70 @@
+const util = require('util');
+const exec = util.promisify(require("child_process").exec)
+
+module.exports = class IOSEmulatorService {
+    
+    static async open(deepLink, shareId) {
+        await this.checkHasInstalledXcode()
+
+        const cmd = `xcrun simctl openurl booted ${deepLink}/${shareId}`
+        const opened = await this.openDeepLink(cmd)
+        if (opened) return;
+
+    }
+
+    static async openDeepLink(cmd) {
+        try {
+            const {stderr} = await exec(cmd)
+            return !(stderr);
+        } catch (error) {
+            console.log(`Houve um erro ao tentar abrir o Eitri-App via deep link`)
+            console.log(error)
+            return process.exit(1)
+        }
+    }
+
+    static async checkHasInstalledXcode(){
+        try {
+            console.log("Verificando instalação do Xcode.")
+            const command = "xcode-select -p"
+            await exec(command)
+            console.log("Xcode instalado")
+        } catch (error) {
+            throw new Error('"Xcode" não encontrado. Saiba mais em https://developer.apple.com/xcode/')
+        }
+    }
+
+    /**
+     * TODO implementar seleção de iPhone
+     */
+    static async selectDevice(){
+        const devices = this.getListIphones() 
+        const res = await inquirer.prompt([
+            {
+                name: "accepted",
+                type: "list",
+                message:
+                    "Selecione o iPhone que deseja se conectar",
+                choices: devices,
+                pageSize: devices.length + 2,
+            },
+        ]);
+
+        if (res.accepted && typeof res.accepted === "string") {
+            console.log("iPhone selecionado: ", res.accepted, "\n")
+            return GenericUtils.getSerialNumberFromAdb(res.accepted)
+        }
+   
+    }
+    /**
+     * TODO implementar lista de iPhones
+     */
+    static async getListIphones(){
+        console.log("Verificando dispositivos Apple conectados")
+        const command = 'xcrun simctl list devices | grep -i "iphone"'
+        await exec(command)
+    }
+
+}
+
+

package/src/service/EmulatorService.js

@@ -0,0 +1,20 @@
+const AndroidEmulatorService = require('./Emulator/AndroidEmulatorService');
+const IOSEmulatorService = require('./Emulator/IOSEmulatorService');
+
+module.exports = class EmulatorService {
+
+    static async openSimulator(emulator, shareId, deepLinks) {
+        try {
+            const emulatorService = emulator === "ios" ? IOSEmulatorService : AndroidEmulatorService;
+
+            for (const deepLink of deepLinks) {
+                await emulatorService.open(deepLink, shareId)
+            }
+        } catch (error) {
+            throw {message: error.message}
+        }
+    }
+
+}
+
+

package/src/service/HuginService.js

@@ -24,6 +24,7 @@ module.exports = class HuginService {
     formData.append("filepath", relativePath);
     formData.append("isDevMode", String(isDevMode));
     formData.append("eitriAppId", eitriConf.id);
+    formData.append("applicationId", eitriConf.applicationId);
     formData.append("workspaceId", workspace.id);
     let url = this.getServerlessUploadUrl(filePath);
     await this.http.postForm(url, formData);

package/src/service/TargetService.js

@@ -1,20 +1,20 @@
 const configService = require('./ConfigService')
 const targetEnum = require('../enum/target')
 // eslint-disable-next-line no-unused-vars
-
-const LIBS_FOR_TARGET = {
-    MOBILE: {
-        superApp: 'eitri-app-client',
-        components: 'eitri-app-components',
-        sdkSupport: 'eitri-app-sdk-support',
-    },
-    WEB: {
-        superApp: 'eitri-app-client-web',
-        components: 'eitri-miniapp-components-web',
-        sdkSupport: 'eitri-app-sdk-support',
-    },
-}
 class TargetService{
+    
+    static LIBS_FOR_TARGET = {
+        MOBILE: {
+            bifrost: 'eitri-app-client',
+            luminus: 'eitri-app-components',
+            sdkSupport: 'eitri-app-sdk-support',
+        },
+        MOBILE_NEW: {
+            bifrost: 'eitri-bifrost',
+            luminus: 'eitri-luminus',
+            sdkSupport: 'eitri-app-sdk-support',
+        },
+    }
     constructor(workspace) {
         this.workspace = workspace
         this.conf = configService.get('managerApi')
@@ -37,16 +37,16 @@ class TargetService{
         }        
     }
 
-    static getLibsFromMiniConf(miniConf, availableTargets) {
-        const target = availableTargets.find(t => t.name === miniConf.target)
-        if (target) {
+    static getLibsFromMiniConf(eitriConf, availableTargets) {
+        const application = availableTargets.find(t => t.name === eitriConf.target || t.id === eitriConf.applicationId)
+        if (application) {
             return {
-                superApp: target.superAppClientLibName,
-                components: target.componentsLibName,
-                sdkSupport: target.sdkSupportLibName || LIBS_FOR_TARGET.MOBILE.sdkSupport
+                bifrost: application.superAppClientLibName,
+                luminus: application.componentsLibName,
+                sdkSupport: application.sdkSupportLibName || this.LIBS_FOR_TARGET.MOBILE.sdkSupport
             }
         }
-        return LIBS_FOR_TARGET.MOBILE
+        return this.LIBS_FOR_TARGET.MOBILE
     }
 
     async getLibs() {

package/src/service/Workspace.js

@@ -28,6 +28,7 @@ const EitriAppService = require("./EitriAppService");
 const VegvisirService = require("../modules/vegvisir/VegvisirService");
 const HuginService = require("./HuginService");
 const EitriAppType = require("../model/EitriAppType");
+const chalk = require("chalk");
 const vegvisirService = new VegvisirService()
 const huginService = new HuginService()
 
@@ -286,7 +287,7 @@ class Workspace {
 
     async checkVersions() {
         try {
-            const miniConf = this.getMiniConf();
+            const eitriConf = this.getMiniConf();
             const headers = {
                 accept: this.config.libs.updateLibsEndpointVersion,
             };
@@ -294,25 +295,33 @@ class Workspace {
             // somente para garantir que a pasta do usuario existe
             await this.http.post(
                 `${this.serverUrl}/${this.basePath}/setup`,
-                miniConf,
+                eitriConf,
                 headers
             );
             console.log("Preparando ambiente de desenvolvimento");
             const response = await this.http.put(
                 `${this.serverUrl}/${this.basePath}/version?command=push-version`,
-                miniConf,
+                eitriConf,
                 headers
             );
-            miniConf.target = response.target;
+            eitriConf.target = response.application;
             const availableTargets = await this.availableTargets();
             let libs = TargetService.getLibsFromMiniConf(
-                miniConf,
+                eitriConf,
                 availableTargets
             );
             console.log("Ambiente pronto para compilação");
+            const eitriConfProperties = Object.getOwnPropertyNames(eitriConf)
+            const clientName = eitriConfProperties.find(p => p === libs.bifrost) || TargetService.LIBS_FOR_TARGET.MOBILE_NEW.bifrost
+            const componentsName = eitriConfProperties.find(p => p === libs.luminus) || TargetService.LIBS_FOR_TARGET.MOBILE_NEW.luminus
+
+            const bifrostVersion = eitriConf[clientName]
+            const luminusVersion = eitriConf[componentsName]
+
+            console.log("\nVersão sendo criada a partir das seguintes bibliotecas e suas respectivas versões:")
+            console.log(chalk.bold.green(`${clientName} [${bifrostVersion}]`))
             console.log(
-                `${libs.components} [${miniConf[libs.components]}]\n${libs.superApp
-                } [${miniConf[libs.superApp]}]`
+               chalk.bold.green(`${componentsName} [${luminusVersion}]`)
             );
             return { target: response.target };
         } catch (error) {

package/src/service/factories/QRCodeStarterFactory.js

@@ -2,8 +2,7 @@ const QRCodeFactory = require("../QRCodeFactory");
 const readline = require("readline");
 const chalk = require("chalk");
 const os = require("os");
-const util = require('util')
-const exec = util.promisify(require("child_process").exec)
+const EmulatorService = require("../EmulatorService");
 
 function QRCodeStarter(
     args,
@@ -69,33 +68,15 @@ async function tryOpenEmulator(fullUrl, args) {
     const shareId = extractShareId(fullUrl);
     const { emulator, deepLinks } = args;
     if(!deepLinks || deepLinks?.length < 1) {
-        console.log("Seu application não contém deep links configurados.")
+        const warningMessages = [
+            'Observamos que o seu Aplicativo não possui "deep links" configurados no momento.',
+            'Para obter assistência na configuração, por favor, entre em contato com o nosso suporte técnico Eitri.',
+            'Estamos aqui para ajudar a configurá-los para você.'
+        ] 
+        console.log(warningMessages.join("\n"))
         return
     };
-    for (const deepLink of deepLinks) {
-        if (emulator === "ios") {
-            const cmd = `xcrun simctl openurl booted ${deepLink}/${shareId}`
-            const opened = await openDeepLink(cmd)
-            if(opened) return;
-        } else {
-            const cmd = `adb shell am start -a android.intent.action.VIEW -d ${deepLink}/${shareId}`
-            const opened = await openDeepLink(cmd)
-            if(opened) return;
-        }
-    }
-}
-
-async function openDeepLink(cmd) {
-    try {
-        const {stderr} = await exec(cmd)
-        if(stderr) {
-            return false
-        }
-        return true
-    } catch (error) {
-        console.log(`Houve um erro ao tentar abrir o Eitri-App via deep link`)
-        return process.exit(1)
-    }
+    await EmulatorService.openSimulator(emulator, shareId, deepLinks)
 }
 
 async function listenerKeyPressToOpenEmulator(url, deepLinks) {
@@ -120,15 +101,20 @@ async function listenerKeyPressToOpenEmulator(url, deepLinks) {
     readline.emitKeypressEvents(process.stdin);
 
     process.stdin.on("keypress", async (chunk, key) => {
-        if (key && key.name == "a") {
-            const emulator = "android";
-            console.log(`Abrindo Eitri-App no ${chalk.blue.bold("Android")}`);
-            await tryOpenEmulator(url, { emulator, deepLinks });
-        }
-        if (os.platform() === "darwin" && key && key.name == "i") {
-            const emulator = "ios";
-            console.log(`Abrindo Eitri-App no ${chalk.blue.bold("iOS")}`);
-            await tryOpenEmulator(url, { emulator, deepLinks });
+        try {
+            if (key && key.name == "a") {
+                const emulator = "android";
+                console.log(`Abrindo Eitri-App no ${chalk.blue.bold("Android")}`);
+                await tryOpenEmulator(url, {emulator, deepLinks});
+            }
+            if (os.platform() === "darwin" && key && key.name == "i") {
+                const emulator = "ios";
+                console.log(`Abrindo Eitri-App no ${chalk.blue.bold("iOS")}`);
+                await tryOpenEmulator(url, {emulator, deepLinks});
+            }
+        } catch (error) {
+            console.log(error);
+            process.exit(1);
         }
     });
 }

package/src/util/GenericUtils.js

@@ -30,6 +30,12 @@ class GenericUtils {
         }
     }
 
+    static getSerialNumberFromAdb(deviceString = ""){
+        const regex = /^(\S+)\s+device/;
+        const serialNumber = RegExp(regex).exec(deviceString)
+        return serialNumber[1]
+    }
+
 }
 
 module.exports = GenericUtils