eitri-cli 1.16.0-beta.3 → 1.16.1

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

@@ -27,7 +27,6 @@ setup = "/v2/workspace/setup"
 version = "/version"
 upload_all = "/uploadAll"
 file_upload = "/fileupload"
-setup_app = "/v2/workspace/setup-app"
 
 [foundry.libs]
 update_libs_endpoint_version = "application/vnd.workspace.api.v2+json"

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

@@ -27,7 +27,6 @@ setup = "/v2/workspace/setup"
 version = "/version"
 upload_all = "/uploadAll"
 file_upload = "/fileupload"
-setup_app = "/v2/workspace/setup-app"
 
 
 [foundry.libs]

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

@@ -27,7 +27,6 @@ setup = "/v2/workspace/setup"
 version = "/version"
 upload_all = "/uploadAll"
 file_upload = "/fileupload"
-setup_app = "/v2/workspace/setup-app"
 
 
 [foundry.libs]

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

@@ -11,4 +11,3 @@ setup = "/v2/workspace/setup"
 version = "/version"
 upload_all = "/uploadAll"
 file_upload = "/fileupload"
-setup_app = "/v2/workspace/setup-app"

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

@@ -27,7 +27,6 @@ setup = "/v2/workspace/setup"
 version = "/version"
 upload_all = "/uploadAll"
 file_upload = "/fileupload"
-setup_app = "/v2/workspace/setup-app"
 
 
 [foundry.libs]

package/eitri-cli-v2/index.d.ts

@@ -6,7 +6,6 @@
 export interface StartArguments {
   shared?: boolean
   verbose?: boolean
-  playground?: boolean
 }
 export interface EitriLibsArguments {
   bifrost?: boolean
@@ -18,9 +17,8 @@ export function eitriLibs(eitriLibsArgs: EitriLibsArguments): Promise<void>
 export function doctor(): Promise<void>
 export function start(args: StartArguments): Promise<void>
 export namespace app {
-  export function start(args: StartArguments): Promise<void>
+  export function start(): Promise<void>
   export function appLogs(): Promise<void>
-  export function clean(): Promise<void>
 }
 export namespace workspace {
   export function clean(): Promise<void>

package/index.js

@@ -72,10 +72,6 @@ const run = async () => {
     .option("-f, --force", "Força o start")
     .option("-S, --show-deeplink", "Exibe o deep link do workspace")
     .option("-sm, --skip-mini-log", "Skipa conexão com o mini-log")
-    .option(
-      "-p, --playground",
-      "Gera um QR code com a URL de abertura do Eitri Playground"
-    )
     .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"

package/package.json

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

package/src/cmd/runTests.js

@@ -70,7 +70,7 @@ module.exports = async function runTests(args) {
         debug("Fim da busca e validação do EitriAppConf", { miniConf })
 
         const url = config.get('workspace').url
-        const setupResult = await workspace.setup(args)
+        const setupResult = await workspace.setup()
         debug("Informações do setupResult do workspace", { setupResult })
 
         blindGuardian.readConf()

package/src/cmd/start.js

@@ -54,10 +54,7 @@ module.exports = async function start(args) {
         const applicationName = setupResult?.application?.name
 
         blindGuardian.readConf()
-        let qrCodeUrl = setupResult?.eitriAppBootstrapURL
-        if(args.playground){
-            qrCodeUrl = config.get('qrCode').url
-        }
+        const qrCodeUrl = config.get('qrCode').url
         if (args.verbose) {
             blindGuardian.verbose = true
             miniLog.verbose = true

package/src/modules/app/AppCommand.js

@@ -3,17 +3,11 @@ module.exports = function AppCommand() {
     const app = commander.command("app")
         .description("Gerencia a execução de Eitri-Apps do Aplicativo declarado no app-config.yaml 'eitri app --help'")
 
-    const eitriCLIV2 = require("../../../eitri-cli-v2/index.js");
-
     app
         .command("start")
         .description("Inicializa todos os Eitri-Apps do arquivo de configuração app-config.yaml")
-        .option("-v, --verbose", "Exibe mais logs")
-        .option(
-            "-p, --playground",
-            "Gera um QR code com a URL de abertura do Eitri Playground"
-        )
         .action(async (cmdObj) => {
+            const eitriCLIV2 = require("../../../eitri-cli-v2/index.js");
             await eitriCLIV2.app.start(cmdObj)
         });
 
@@ -21,15 +15,9 @@ module.exports = function AppCommand() {
         .command("logs")
         .description("Exibe os logs dos Eitri-Apps em execução do comando 'eitri app start'")
         .action(async () => {
+            const eitriCLIV2 = require("../../../eitri-cli-v2/index.js");
             await eitriCLIV2.app.appLogs();
         });
 
-    app
-        .command("clean")
-        .description("Realiza a limpeza do workspace remoto")
-        .action(async () => {
-            await eitriCLIV2.app.clean();
-        });
-
     return app;
 };

package/src/service/Emulator/AndroidEmulatorService.js

@@ -6,10 +6,10 @@ const debug = require('debug')('eitri:AndroidEmulatorService')
 
 module.exports = class AndroidEmulatorService {
 
-    static async open(deepLink) {
+    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}`
+        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;
     }

package/src/service/Emulator/IOSEmulatorService.js

@@ -4,10 +4,10 @@ const inquirer = require("inquirer");
 
 module.exports = class IOSEmulatorService {
     
-    static async open(deepLink) {
+    static async open(deepLink, shareId) {
         await this.checkHasInstalledXcode()
 
-        const cmd = `xcrun simctl openurl booted ${deepLink}`
+        const cmd = `xcrun simctl openurl booted ${deepLink}/${shareId}`
         const opened = await this.openDeepLink(cmd)
         if (opened) return;
 

package/src/service/EmulatorService.js

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

package/src/service/QRCodeFactory.js

@@ -18,11 +18,15 @@ class QRCodeFactory {
         })
     }
 
-    async create(data, eitriAppSlug = "", args = {}) {
-        this.displayQrCodeInstruction(args?.playground)
+    async create(data, eitriAppSlug = "", displayOutsideTerminal = false) {
+        console.log('\n==================================================')
+        console.log('Utilize o QR-Code para iniciar o seu Eitri-App')
+        console.log('É importante utilizar o leitor de QR-Code do')
+        console.log('aplicativo à qual destina-se o seu Eitri-App')
+        console.log('==================================================')
 
         let qrCodeTempPath = `${eitriAppSlug}::${new Date().getTime()}`
-        if(args?.qrPrinter){
+        if(displayOutsideTerminal){
             qrCodeTempPath = await this.tempFile(eitriAppSlug)
             await this.createQRCodeImage(qrCodeTempPath, data)
         }
@@ -59,23 +63,6 @@ class QRCodeFactory {
             )
         })
     }
-
-    displayQrCodeInstruction(playGroundMode = false) {
-        const separator = "=================================================="
-        console.log("\n" + separator)
-
-        if (playGroundMode) {
-            console.log('Para iniciar seu Eitri-App, escaneie o QR Code')
-            console.log('exibido usando o Eitri Playground')
-            console.log(separator)
-            return
-        }
-            
-        console.log("Para iniciar seu Eitri-App, escaneie o QR Code exibido.")
-        console.log('Certifique-se de usar o leitor de QR Code')
-        console.log('do aplicativo destinado ao seu Eitri-App.')
-        console.log(separator)
-    }
 }
 
 module.exports = QRCodeFactory

package/src/service/Workspace.js

@@ -35,7 +35,6 @@ const YAML = require('yaml');
 const { readFile } = require("fs/promises");
 const convertKeysToCamelCase = require("../util/convertKeysToCamelCase");
 const { exit } = require("process");
-const debug = require('debug')('eitri:Workspace')
 
 class Workspace {
 
@@ -195,20 +194,13 @@ class Workspace {
         const headers = {
             accept: this.config.libs.updateLibsEndpointVersion,
         };
-
-        let runAppMode = "CLIENT_APP"
-        if(args?.playground) runAppMode = "PLAYGROUND"
-
-        debug("RUN_APP_MODE", runAppMode)
-
         try {
             const appConfig = await this.getAppConfig()
             const setupResponse = await this.http.post(
                 `${this.serverUrl}/${this.basePath}/v2/workspace/setup`,
                 {
                     eitriConf,
-                    appConfig,
-                    runAppMode 
+                    appConfig
                 },
                 headers
             ); // somente para garantir que a pasta do usuario existe
@@ -438,7 +430,6 @@ class Workspace {
             title: miniAppConf["title"],
             permissions: miniAppConf["permissions"],
             miniAppBootstrapUrl: this.getBootstrapURL(setupConfig.eitriAppBootstrapURL),
-            developmentDeeplink: setupConfig.developmentDeeplink,
             initializationParams,
             orderId,
             view,

package/src/service/WorkspaceManager.js

@@ -40,7 +40,7 @@ class WorkspaceManager {
                     console.log(qrCode)
                 })
             } else {
-                const qrCodePath = await new QRCodeFactory().create(fullUrl, "", args)
+                const qrCodePath = await new QRCodeFactory().create(fullUrl)
                 const sanitizedQrCodePath = qrCodePath.replace('/~', '')
                 if(args) {
                     Server.startServer({ qrCodePath: sanitizedQrCodePath, qrPrinter: args.qrPrinter })

package/src/service/factories/QRCodeStarterFactory.js

@@ -21,14 +21,13 @@ function QRCodeStarter(
     this.startServer = async function () {
         const eitriAppConf = this.workspace._miniConf;
         const workspaceURLConfig = await this.workspace.getNewWorkspaceURL(
-            this.args,
-            this.setupConfig,
-            eitriAppConf
-        );
-
-        const fullQrCodeUrl = workspaceURLConfig.miniAppConf.developmentDeeplink;
+                this.args,
+                this.setupConfig,
+                eitriAppConf
+            );
+        const fullUrl = workspaceURLConfig.miniAppUrl
         if (this.args.verbose) {
-            console.log(`QrCodeUrl: ${fullQrCodeUrl}`);
+            console.log(`QrCodeUrl: ${fullUrl}`);
         }
 
         this.watcher.start();
@@ -36,35 +35,47 @@ function QRCodeStarter(
             console.log("######################################");
             console.log("########### Deep Link URL ############");
             console.log("######################################");
-            console.log(`${fullQrCodeUrl}`);
+            console.log(`${fullUrl}`);
             console.log("######################################");
         }
 
         const _QRCodeFactory = new QRCodeFactory();
 
         const eitriAppSlug = this.workspace?._miniConf?.slug ?? "";
-        const qrCodePath = await _QRCodeFactory.create(fullQrCodeUrl, eitriAppSlug, this.args);
+        const qrCodePath = await _QRCodeFactory.create(fullUrl, eitriAppSlug, this.args.qrPrinter);
 
         if (this.args.verbose) {
             console.log(`QrCode Path: ${qrCodePath}`);
         }
 
-        _QRCodeFactory.generate({ ...this.args, qrCodePath, fullUrl: fullQrCodeUrl });
+        _QRCodeFactory.generate({ ...this.args, qrCodePath, fullUrl });
 
         if (this.args.emulator) {
-            await tryOpenEmulator(fullQrCodeUrl, args);
+            await tryOpenEmulator(fullUrl, args);
         }
 
-        await listenerKeyPressToShowQrCode(fullQrCodeUrl);
-        await listenerKeyPressToOpenEmulator(fullQrCodeUrl);
+        await listenerKeyPressToShowQrCode(fullUrl);
+        await listenerKeyPressToOpenEmulator(fullUrl, args.deepLinks);
     };
 }
 
 async function tryOpenEmulator(fullUrl, args) {
-    await EmulatorService.openSimulator(args.emulator, fullUrl)
+    const shareId = extractShareId(fullUrl);
+    const { emulator, deepLinks } = args;
+    if(!deepLinks || deepLinks?.length < 1) {
+        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
+    };
+    await EmulatorService.openSimulator(emulator, shareId, deepLinks)
 }
 
-async function listenerKeyPressToOpenEmulator(url) {
+async function listenerKeyPressToOpenEmulator(url, deepLinks) {
+    if(!deepLinks || deepLinks?.length < 1) return;
     const enterText = chalk.blue.bold("Enter");
     console.log("================================================");
     console.log(`\t${chalk.blue.bold("Abertura de Eitri-App automática")}`);
@@ -88,12 +99,12 @@ async function listenerKeyPressToOpenEmulator(url) {
             if (key && key.name == "a") {
                 const emulator = "android";
                 console.log(`Abrindo Eitri-App no ${chalk.blue.bold("Android")}`);
-                await tryOpenEmulator(url, {emulator});
+                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});
+                await tryOpenEmulator(url, {emulator, deepLinks});
             }
         } catch (error) {
             console.log(error);
@@ -133,6 +144,11 @@ async function listenerKeyPressToShowQrCode(url) {
     });
 }
 
+function extractShareId(url) {
+    const [, shareId] = url.split("/share/");
+    return shareId;
+}
+
 function QRCodeContentFactory() {
     this.create = function (
         args,

package/src/service/factories/WebStarterFactory.js

@@ -50,7 +50,7 @@ function WebAppStarter(args, trackingService, watcher, workspace, targetConfig )
         const { slug } = miniConf
 
         if(this.args.emulator){
-            Server.startServerEmulator({...this.args, bootstrapUrl: miniAppConf.developmentDeeplink, slug, http: this.workspace.getHttp() })
+            Server.startServerEmulator({...this.args, bootstrapUrl: miniAppConf.miniAppBootstrapUrl, slug, http: this.workspace.getHttp() })
             return
         }