eitri-cli 1.3.0-beta.3 → 1.3.0-beta.4

package/package.json

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

package/src/cmd/start.js

@@ -80,7 +80,11 @@ module.exports = async function start(args) {
 
         const loadedTarget = await workspace.getTarget()
         const platform = loadedTarget.platform
-        await handleStartServer(args, trackingService, watcher, workspace, target, targetConfig, platform)
+        const argsWithDeeplinks = {
+            ...args,
+            deepLinks: loadedTarget?.deepLinks || []
+        }
+        await handleStartServer(argsWithDeeplinks, trackingService, watcher, workspace, target, targetConfig, platform)
 
         TrackingEitriAnalytics.sendEvent({
             eventName:"start",

package/src/service/StarterService.js

@@ -24,7 +24,7 @@ async function handleStartServer(args, trackingService, watcher, workspace, fact
     }
 
 
-    const starter = factory.create(args, trackingService, watcher, workspace, targetConfig)
+    const starter = await factory.create(args, trackingService, watcher, workspace, targetConfig)
     await starter.startServer()
 }
 

package/src/service/factories/QRCodeStarterFactory.js

@@ -3,6 +3,7 @@ const { Ios, Android } = require("uri-scheme");
 const readline = require("readline");
 const chalk = require("chalk");
 const os = require("os");
+
 function QRCodeStarter(
     args,
     trackingService,
@@ -56,35 +57,51 @@ function QRCodeStarter(
         _QRCodeFactory.generate({ ...this.args, qrCodePath, fullUrl });
 
         if (this.args.emulator) {
-            tryOpenEmulator(fullUrl, args);
+            await tryOpenEmulator(fullUrl, args);
         }
 
-        listenerKeyPressToOpenEmulator(fullUrl);
+        await listenerKeyPressToOpenEmulator(fullUrl, args.deepLinks);
     };
 }
 
-function tryOpenEmulator(fullUrl, args) {
+async 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`
-                );
+    const { emulator, deepLinks } = args;
+    if(!deepLinks || deepLinks?.length < 1) {
+        console.log("Seu application não contém deep links configurados.")
+        return
+    };
+    
+    let opened = false
+    for await (const deepLink of deepLinks) {
+        if(opened) return
+        try {
+            if (emulator === "ios") {
+                Ios.openAsync({ uri: `${deepLink}/${shareId}` })
+                    .then(() => {opened = true})
+                    .catch(() => {
+                        opened = false; 
+                        console.log(`Houve um erro ao tentar abrir o Eitri-App na plataforma iOS`)
+                    })
+            } else {
+                Android.openAsync({ uri: `${deepLink}/${shareId}` })
+                    .then(() => {opened = true})
+                    .catch(() => {
+                        opened = false; 
+                        console.log(`Houve um erro ao tentar abrir o Eitri-App na plataforma Android`)
+                    })
             }
-        );
-    }
-    return Android.openAsync({ uri: `eitri://workspace/${shareId}` }).catch(
-        () => {
+        } catch (error) {
             console.error(
-                `Houve um erro ao tentar abrir o Eitri-App na plataforma Android`
+                `Houve um erro ao tentar abrir o Eitri-App na plataforma ${emulator}`
             );
         }
-    );
+    }
+
 }
 
-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.green.bold("Abertura de Eitri-App automática")}`);
@@ -104,20 +121,16 @@ function listenerKeyPressToOpenEmulator(url) {
     console.log("================================================");
     readline.emitKeypressEvents(process.stdin);
 
-    process.stdin.on("keypress", (chunk, key) => {
+    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")}`);
-            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")}`);
-            tryOpenEmulator(url, { emulator });
-        }
-        if (key && key.name == "q") {
-            console.log("Parando execução do Eitri-App");
-            process.exit(0);
+            await tryOpenEmulator(url, { emulator, deepLinks });
         }
     });
 }