eitri-cli 1.15.0 → 1.16.0-beta.2

package/bitbucket-pipelines.yml

@@ -44,8 +44,10 @@ pipelines:
         caches:
           - node
         script:
+        - mkdir -p ~/.eitri/workspaces
+        - cp -r eitri-cli-v2/tests/fixtures/fake-workspace ~/.eitri/workspaces/workspace
         - cd eitri-cli-v2
-        - cargo test -- --test-threads=1
+        - cargo test -- --test-threads=1 --nocapture
     - step: &macOSCrossCompile
         image: 
           name: 343482176926.dkr.ecr.us-east-1.amazonaws.com/eitri-base-cli-pipeline:macos

package/eitri-cli-v2/Cargo.toml

@@ -35,6 +35,12 @@ log = "0.4.21"
 env_logger = "0.11.3"
 crossterm = "0.27.0"
 spinners = "4.1.1"
+regex = "1.10.4"
+walkdir = "2.5.0"
+zip = "2.1.0"
+sha1 = "0.10.6"
+file-hashing = "0.1.2"
+qr2term = "0.3.1"
 
 [dependencies.uuid]
 version = "1.8.0"

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

@@ -23,6 +23,11 @@ run_test_path = "/runes-foundry/run-test"
 share_path = "/foundry/share"
 clean_path = "/sources"
 shared_tags_json_path = "/user/:workspaceId/index.json"
+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

@@ -23,6 +23,12 @@ run_test_path = "/runes-foundry/run-test"
 share_path = "/runes-foundry/share"
 clean_path = "/sources"
 shared_tags_json_path = "/user/:workspaceId/index.json"
+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.prod.toml

@@ -23,6 +23,12 @@ run_test_path = "/foundry/run-test"
 share_path = "/foundry/share"
 clean_path = "/sources"
 shared_tags_json_path = "/user/:workspaceId/index.json"
+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.runes-foundry.toml

@@ -7,3 +7,8 @@ run_test_path = "/runes-foundry/run-test"
 share_path = "/runes-foundry/share"
 clean_path = "/sources"
 shared_tags_json_path = "/user/:workspaceId/index.json"
+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

@@ -17,12 +17,18 @@ 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"
+base_path = "/foundry"
+target_path = "/foundry/targets"
+run_test_path = "/foundry/run-test"
 share_path = "/foundry/share"
 clean_path = "/sources"
 shared_tags_json_path = "/user/:workspaceId/index.json"
+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/index.d.ts

@@ -3,6 +3,11 @@
 
 /* auto-generated by NAPI-RS */
 
+export interface StartArguments {
+  shared?: boolean
+  verbose?: boolean
+  playground?: boolean
+}
 export interface EitriLibsArguments {
   bifrost?: boolean
   luminus?: boolean
@@ -11,8 +16,9 @@ export function publish(environment: string, message: string): Promise<void>
 export function runTest(userJwt: string, userWorkspaceId: string, testPath: string): Promise<void>
 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(): Promise<void>
+  export function start(args: StartArguments): Promise<void>
   export function appLogs(): Promise<void>
 }
 export namespace workspace {

package/eitri-cli-v2/index.js

@@ -295,11 +295,12 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { publish, runTest, eitriLibs, doctor, app, workspace } = nativeBinding
+const { publish, runTest, eitriLibs, doctor, start, app, workspace } = nativeBinding
 
 module.exports.publish = publish
 module.exports.runTest = runTest
 module.exports.eitriLibs = eitriLibs
 module.exports.doctor = doctor
+module.exports.start = start
 module.exports.app = app
 module.exports.workspace = workspace

package/index.js

@@ -72,6 +72,10 @@ 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"
@@ -80,12 +84,24 @@ const run = async () => {
       "-e, --emulator <platform>",
       "Abre o Eitri-App no emulador, desde que seja definido qual plataforma será aberto, android ou ios."
     )
-    .option("-sh, --shared", "Executa o Eitri-App no modo compartilhável.");
+    .option("-sh, --shared", "Executa o Eitri-App no modo compartilhável.")
 
   startProgram.action((cmdObj) => {
+    if (process.env.FT_START_V2 === "true") {
+      require('./eitri-cli-v2/eitri-cli-v2.linux-x64-gnu.node').start(cmdObj);
+      return;
+    }
     require("./src/cmd/start")(cmdObj);
   });
 
+  program
+    .command('test-initialization-params <initializationParams>')
+    .option("-v, --verbose", "Exibe mais logs")
+    .description('Define parâmetros na query string para inicializar o Eitri-App. Exemplo: stringChave1=stringValor1&stringChave2=stringValor2...')
+    .action((initializationParams, cmdObj) => {
+      require('./src/cmd/test-initialization-params')(initializationParams, cmdObj)
+    })
+
   program
     .command("push-version")
     .description(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eitri-cli",
-  "version": "1.15.0",
+  "version": "1.16.0-beta.2",
   "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()
+        const setupResult = await workspace.setup(args)
         debug("Informações do setupResult do workspace", { setupResult })
 
         blindGuardian.readConf()

package/src/cmd/start.js

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

package/src/modules/app/AppCommand.js

@@ -6,6 +6,11 @@ module.exports = function AppCommand() {
     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)

package/src/service/Emulator/AndroidEmulatorService.js

@@ -6,10 +6,10 @@ const debug = require('debug')('eitri:AndroidEmulatorService')
 
 module.exports = class AndroidEmulatorService {
 
-    static async open(deepLink, shareId) {
+    static async open(deepLink) {
         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 cmd = `adb -s ${serialNumber} shell am start -a android.intent.action.VIEW -d ${deepLink}`
         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, shareId) {
+    static async open(deepLink) {
         await this.checkHasInstalledXcode()
 
-        const cmd = `xcrun simctl openurl booted ${deepLink}/${shareId}`
+        const cmd = `xcrun simctl openurl booted ${deepLink}`
         const opened = await this.openDeepLink(cmd)
         if (opened) return;
 

package/src/service/EmulatorService.js

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

package/src/service/QRCodeFactory.js

@@ -18,15 +18,11 @@ class QRCodeFactory {
         })
     }
 
-    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('==================================================')
+    async create(data, eitriAppSlug = "", args = {}) {
+        this.displayQrCodeInstruction(args?.playground)
 
         let qrCodeTempPath = `${eitriAppSlug}::${new Date().getTime()}`
-        if(displayOutsideTerminal){
+        if(args?.qrPrinter){
             qrCodeTempPath = await this.tempFile(eitriAppSlug)
             await this.createQRCodeImage(qrCodeTempPath, data)
         }
@@ -63,6 +59,23 @@ 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,6 +35,7 @@ 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 {
 
@@ -194,13 +195,20 @@ 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
+                    appConfig,
+                    runAppMode 
                 },
                 headers
             ); // somente para garantir que a pasta do usuario existe
@@ -377,9 +385,9 @@ class Workspace {
         return bootstrapBaseUrl;
     }
 
-    async getNewWorkspaceURL(args, setupConfig) {
+    async getNewWorkspaceURL(args, setupConfig, eitriAppConf) {
         const qrCodeConfig = await this.getQrCodeConfig(args, setupConfig);
-        const stateData = await this.saveShareState(qrCodeConfig);
+        const stateData = await this.saveShareState(qrCodeConfig, eitriAppConf);
         const stateId = stateData.id;
         const miniAppUrl = `${this.qrCodeUrl}/${stateId}`;
         return {
@@ -391,11 +399,16 @@ class Workspace {
         };
     }
 
-    async saveShareState(qrCodeConfig) {
+    async saveShareState(qrCodeConfig, eitriAppConf) {
         const createWorkspaceStateUrl = `${this.serverUrl}/${this.basePath}/share`;
         const requestBody = {
             id: uuidv4(),
-            state: qrCodeConfig,
+            state: {
+                ...qrCodeConfig,
+                eitriAppId: eitriAppConf?.id || "",
+                organizationId: eitriAppConf?.organizationId || "",
+                applicationId: eitriAppConf?.applicationId || "",
+            },
         };
         const response = await this.http.post(
             createWorkspaceStateUrl,
@@ -425,6 +438,7 @@ 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)
+                const qrCodePath = await new QRCodeFactory().create(fullUrl, "", args)
                 const sanitizedQrCodePath = qrCodePath.replace('/~', '')
                 if(args) {
                     Server.startServer({ qrCodePath: sanitizedQrCodePath, qrPrinter: args.qrPrinter })

package/src/service/factories/QRCodeStarterFactory.js

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

@@ -46,11 +46,11 @@ function WebAppStarter(args, trackingService, watcher, workspace, targetConfig )
         const libsInfoForGA = this.args.libsInfoForGA
         TrackService.track(miniConf, this.trackingService, libsInfoForGA)
 
-        const {miniAppConf} = await this.workspace.getNewWorkspaceURL(this.args, this.targetConfig)
+        const {miniAppConf} = await this.workspace.getNewWorkspaceURL(this.args, this.targetConfig, miniConf)
         const { slug } = miniConf
 
         if(this.args.emulator){
-            Server.startServerEmulator({...this.args, bootstrapUrl: miniAppConf.miniAppBootstrapUrl, slug, http: this.workspace.getHttp() })
+            Server.startServerEmulator({...this.args, bootstrapUrl: miniAppConf.developmentDeeplink, slug, http: this.workspace.getHttp() })
             return
         }