eitri-cli 1.3.0 → 1.4.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eitri-cli",
-  "version": "1.3.0",
+  "version": "1.4.0-beta.2",
   "description": "Command Line Interface to make \"Eitri-App\" with code and fire.",
   "main": "index.js",
   "bin": {
@@ -61,7 +61,6 @@
     "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": {

package/src/cmd/create.js

@@ -44,7 +44,7 @@ const slug = (inpt) => {
 
 // eslint-disable-next-line no-unused-vars
 module.exports = async function create(projectName, cmdObj) {
-
+    blindGuardian.verbose = cmdObj.verbose
     try {
         UserLocalCredential.checkForCredentials()
     } catch (error) {

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/modules/vegvisir/VegvisirCommand.js

@@ -18,6 +18,10 @@ module.exports = function VegvisirCommand() {
             "--local",
             "Seleciona um workspace para um diretório de Eitri-App específico"
         )
+        .option(
+            "--name <workspace-name>",
+            "Permite selecionar um workspace previamente criado pelo nome"
+        )
         .action(async (cmdObj) => {
             require("./cmd/use.js")(cmdObj);
         });

package/src/modules/vegvisir/cmd/use.js

@@ -11,18 +11,28 @@ module.exports = async function use(cmdArgs) {
     const workspaces = await vegvisirService.listMyWorkspaces();
     if (!workspaces) return;
 
-    const { workspaceName } = await inquirer.prompt([
-        {
-            name: "workspaceName",
-            type: "rawlist",
-            message: "Selecione qual workspace você deseja utilizar:",
-            choices: workspaces,
-        },
-    ]);
+    let workspaceNameSelected = cmdArgs?.name
+
+    if(!cmdArgs?.name){
+        const { workspaceName } = await inquirer.prompt([
+            {
+                name: "workspaceName",
+                type: "rawlist",
+                message: "Selecione qual workspace você deseja utilizar:",
+                choices: workspaces,
+            },
+        ]);
+        workspaceNameSelected = workspaceName
+    }
 
     const selectedWorkspace = workspaces.find(
-        (work) => work.name === workspaceName
+        (work) => work?.name === workspaceNameSelected
     );
+    if(!selectedWorkspace){
+        const workspacesNames = Array.isArray(workspaces) && workspaces?.length > 0 ? workspaces?.map(w => w.name) : [];
+        console.warn(`O workspace [${cmdArgs?.name}] não existe. Workspaces existentes: `, JSON.stringify(workspacesNames));
+        return;
+    };
 
     if (cmdArgs.local) {
         await writeLocalWorkspaceConfig(selectedWorkspace);

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

@@ -1,8 +1,10 @@
 const QRCodeFactory = require("../QRCodeFactory");
-const { Ios, Android } = require("uri-scheme");
 const readline = require("readline");
 const chalk = require("chalk");
 const os = require("os");
+const util = require('util')
+const exec = util.promisify(require("child_process").exec)
+
 function QRCodeStarter(
     args,
     trackingService,
@@ -56,35 +58,48 @@ 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
+    };
+    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;
+        }
     }
-    return Android.openAsync({ uri: `eitri://workspace/${shareId}` }).catch(
-        () => {
-            console.error(
-                `Houve um erro ao tentar abrir o Eitri-App na plataforma Android`
-            );
+}
+
+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)
+    }
 }
 
-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 +119,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 });
         }
     });
 }

package/test/e2e/cli.test.js

@@ -190,6 +190,27 @@ describe("eitri-cli", () => {
         2 * minutes
     );
 
+    it(
+        "should select workspace by name",
+        async () => {
+            try {
+                await execAsync(
+                    `cd ${EITRI_WORK_DIR} && rm -rf ./eitri-test-*`,
+                    { env: process.env }
+                );
+
+                const executor = new Executor({ env: devEnv });
+                await executor
+                    .exec("eitri workspace use --name DEFAULT")
+                    .waitFor(/Workspace configurado com sucesso!/);
+            } catch (e) {
+                console.error(e);
+                throw e;
+            }
+        },
+        2 * minutes
+    );
+
     const getPublishedVersion = async (version, eitriAppId) => {
         const blindGuardian = new BlindGuardian();
         const http = new Http(blindGuardian);