eitri-cli 1.12.0-beta.2 → 1.12.0-beta.4

package/bitbucket-pipelines.yml

@@ -27,6 +27,7 @@ pipelines:
         script:
           - cd eitri-cli-v2
           - npm i
+          - npm i puppeteer@21.4.1
           - npm run build:debug
           - cd ..
           - yarn

package/eitri-cli-v2/Cargo.toml

@@ -29,6 +29,8 @@ url = "2.5.0"
 urlencoding = "2.1.3"
 url-parse = "1.0.7"
 config = "0.14.0"
+crossterm = "0.27.0"
+spinners = "4.1.1"
 
 [dependencies.uuid]
 version = "1.8.0"

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

@@ -17,10 +17,12 @@ url = "https://api.eitri.tech/share-api/share"
 
 [foundry]
 url = "https://api.eitri.tech"
-base_path = "runes-foundry"
+base_path = "/runes-foundry"
 target_path = "/runes-foundry/targets"
 run_test_path = "/runes-foundry/run-test"
 share_path = "/foundry/share"
+clean_path = "/sources"
+shared_tags_json_path = "/user/:workspaceId/index.json"
 
 [foundry.libs]
 update_libs_endpoint_version = "application/vnd.workspace.api.v2+json"
@@ -45,6 +47,7 @@ url = "https://api.eitri.tech/miniapp-manager-api"
 url = "https://api.eitri.tech/eitri-manager-api"
 revision_path = "/v2/revisions"
 publish_path = "/revisions/:eitriAppId/publish"
+application_by_id_path = "/applications/:applicationId"
 
 [eitri_analytics]
 url = "https://api.eitri.tech/analytics/event"

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

@@ -17,10 +17,12 @@ url = "https://api.eitri.tech/share-api/share"
 
 [foundry]
 url = "http://localhost:3000"
-base_path = "runes-foundry"
+base_path = "/runes-foundry"
 target_path = "/runes-foundry/targets"
 run_test_path = "/runes-foundry/run-test"
 share_path = "/runes-foundry/share"
+clean_path = "/sources"
+shared_tags_json_path = "/user/:workspaceId/index.json"
 
 [foundry.libs]
 update_libs_endpoint_version = "application/vnd.workspace.api.v2+json"
@@ -45,6 +47,7 @@ url = "https://api.eitri.tech/miniapp-manager-api"
 url = "https://api.eitri.tech/eitri-manager-api"
 revision_path = "/v2/revisions"
 publish_path = "/revisions/:eitriAppId/publish"
+application_by_id_path = "/applications/:applicationId"
 
 [eitri_analytics]
 url = "https://api.eitri.tech/analytics/event"

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

@@ -17,10 +17,12 @@ url = "https://api.eitri.tech/share-api/share"
 
 [foundry]
 url = "https://api.eitri.tech"
-base_path = "foundry"
+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"
 
 [foundry.libs]
 update_libs_endpoint_version = "application/vnd.workspace.api.v2+json"
@@ -40,6 +42,7 @@ path = "/mini-log/socket.io"
 url = "https://api.eitri.tech/eitri-manager-api"
 revision_path = "/v2/revisions"
 publish_path = "/revisions/:eitriAppId/publish"
+application_by_id_path = "/applications/:applicationId"
 
 [eitri_analytics]
 url = "https://api.eitri.tech/analytics/event"

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

@@ -1,7 +1,9 @@
 
 [foundry]
 url = "https://api.eitri.tech"
-base_path = "runes-foundry"
+base_path = "/runes-foundry"
 target_path = "/runes-foundry/targets"
 run_test_path = "/runes-foundry/run-test"
 share_path = "/runes-foundry/share"
+clean_path = "/sources"
+shared_tags_json_path = "/user/:workspaceId/index.json"

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

@@ -17,10 +17,12 @@ url = "https://api.eitri.tech/share-api/share"
 
 [foundry]
 url = "https://api.eitri.tech"
-base_path = "runes-foundry"
+base_path = "/runes-foundry"
 target_path = "/runes-foundry/targets"
 run_test_path = "/runes-foundry/run-test"
 share_path = "/foundry/share"
+clean_path = "/sources"
+shared_tags_json_path = "/user/:workspaceId/index.json"
 
 [foundry.libs]
 update_libs_endpoint_version = "application/vnd.workspace.api.v2+json"
@@ -45,6 +47,7 @@ url = "https://api.eitri.tech/miniapp-manager-api"
 url = "https://api.eitri.tech/eitri-manager-api"
 revision_path = "/v2/revisions"
 publish_path = "/revisions/:eitriAppId/publish"
+application_by_id_path = "/applications/:applicationId"
 
 [eitri_analytics]
 url = "https://api.eitri.tech/analytics/event"

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

@@ -11,3 +11,6 @@ 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 namespace app {
+  export function start(): Promise<void>
+}

package/eitri-cli-v2/index.js

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

package/index.js

@@ -7,6 +7,7 @@ const path = require("path");
 const { workspace } = require("./src/service/Workspace");
 const configService = require("./src/service/ConfigService");
 const VegvisirCommand = require("./src/modules/vegvisir/VegvisirCommand");
+const AppCommand = require("./src/modules/app/AppCommand");
 const debug = require('debug')('eitri:run')
 
 
@@ -66,6 +67,7 @@ const run = async () => {
         .option("-v, --verbose", "Exibe mais logs")
         .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, --qr-printer <qrPrinter>",
             "Indica qual programa imprimirá o QR Code. Se omitido, exibe o QrCode no terminal. Valores válidos: terminal|chrome|msedge|firefox"
@@ -73,6 +75,10 @@ const run = async () => {
         .option(
             "-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."
         );
 
     startProgram.action((cmdObj) => {
@@ -141,7 +147,7 @@ const run = async () => {
         .command("doctor")
         .description("Valida as dependências externas para execução da CLI do Eitri")
         .action(async (cmdObj) => {
-            if(NEW_CLI_VERSION){
+            if (NEW_CLI_VERSION) {
                 console.log("doctor (v2)")
                 const eitriCLIV2 = require('./eitri-cli-v2/index.js')
                 return await eitriCLIV2.doctor()
@@ -175,6 +181,7 @@ const run = async () => {
         .action(async (cmdObj) => { return require("./src/cmd/runTests")(cmdObj) });
 
     program.addCommand(VegvisirCommand());
+    program.addCommand(AppCommand());
 
     if (
         process.argv.length > 2 &&

package/package.json

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

package/src/cmd/start.js

@@ -10,7 +10,7 @@ const handleStartServer = require('../service/StarterService')
 const TrackingEitriAnalytics = require('../service/TrackingEitriAnalytics')
 const VegvisirService = require('../modules/vegvisir/VegvisirService')
 const PrerequisitesValidator = require('../service/PrerequisitesValidator')
-const {LogVerbose} = require('../util/LogUtil')
+const { LogVerbose } = require('../util/LogUtil')
 
 const blindGuardian = workspace.blindGuardian
 const hashFolder = workspace.hashFolder
@@ -25,7 +25,7 @@ module.exports = async function start(args) {
     const miniConf = workspace.getMiniConf()
 
     await vegvisirService.isCurrentWorkspaceOwnedByUser(miniConf.slug)
-    
+
     const separator = '======================================================================='
     let displayFriendlyErrorAtEnd = ""
 
@@ -45,11 +45,11 @@ module.exports = async function start(args) {
         }
 
         await vegvisirService.check(miniConf.slug)
-        debug("Fim da busca e validação do EitriAppConf", {miniConf})
-        
+        debug("Fim da busca e validação do EitriAppConf", { miniConf })
+
         const url = config.get('workspace').url
-        const setupResult = await workspace.setup()
-        debug("Informações do setupResult do workspace", {setupResult})
+        const setupResult = await workspace.setup(args)
+        debug("Informações do setupResult do workspace", { setupResult })
 
 
         const target = setupResult.target.name
@@ -64,23 +64,25 @@ module.exports = async function start(args) {
         workspace.setServerUrl(url)
         workspace.setQrCodeUrl(qrCodeUrl)
 
-        debug("Iniciando workspace", {workspace})
+        debug("Iniciando workspace", { workspace })
         await workspace.init()
-        debug("Workspace iniciado", {workspace})
+        debug("Workspace iniciado", { workspace })
 
         const silentOnConnect = args.verbose ? false : true
         const userWorkspace = await vegvisirService.getWorkspace()
         console.log(`Construindo para o Workspace [${userWorkspace.id}]`)
-        await miniLog.connect(userWorkspace.id, silentOnConnect)
+        if (!args.skipMiniLog) {
+            await miniLog.connect(userWorkspace.id, silentOnConnect)
+        }
 
         LogVerbose(args.verbose, "Construindo...");
         const isDevMode = true
         try {
-            debug("Iniciando workspace.uploadZip", {isDevMode, workspace})
+            debug("Iniciando workspace.uploadZip", { isDevMode, workspace })
             await workspace.uploadZip(isDevMode);
         } catch (error) {
-            debug("Erro no workspace.uploadZip", {isDevMode, workspace, error})
-            if(args.verbose){
+            debug("Erro no workspace.uploadZip", { isDevMode, workspace, error })
+            if (args.verbose) {
                 console.error("::uploadZip::", error?.message)
                 console.error(":::uploadZip::: ", error)
             }
@@ -90,29 +92,29 @@ module.exports = async function start(args) {
             const friendlyMessage3 = "Se o problema persistir, por favor, entre em contato com o suporte técnico do Eitri."
             const friendlyMessage4 = "Você pode continuar o desenvolvimento localmente, mesmo que a sincronização não esteja disponível no momento."
             displayFriendlyErrorAtEnd = `\x1b[1m\x1b[31m\n${friendlyMessage1}\n${friendlyMessage2} \x1b[0m` + "\n" + `\n${friendlyMessage3}\n${friendlyMessage4}\n\x1b[0m`
-            
+
             const errorData = error.response.data
             const commonStartErrors = ['CodeCompileError', 'TagNotFound']
-            if(commonStartErrors.includes(errorData.name)) {
+            if (commonStartErrors.includes(errorData.name)) {
                 displayFriendlyErrorAtEnd += `\n\x1b[1m\x1b[31mMotivo: ${errorData.friendlyMessage}\x1b[0m\n`;
             }
         }
         console.log("Pronto!\n");
 
         const loadedTarget = await workspace.getTarget()
-        debug("Target carregado do workspace", {loadedTarget})
+        debug("Target carregado do workspace", { loadedTarget })
 
         const platform = loadedTarget.platform
         const argsWithDeeplinks = {
             ...args,
             deepLinks: loadedTarget?.deepLinks || []
         }
-        debug("Iniciando servidor", {argsWithDeeplinks, trackingService, watcher, workspace, target, setupResult, platform})
+        debug("Iniciando servidor", { argsWithDeeplinks, trackingService, watcher, workspace, target, setupResult, platform })
         await handleStartServer(argsWithDeeplinks, trackingService, watcher, workspace, target, setupResult, platform)
-        debug("Servidor iniciado", {loadedTarget})
+        debug("Servidor iniciado", { loadedTarget })
 
         TrackingEitriAnalytics.sendEvent({
-            eventName:"start",
+            eventName: "start",
             userId: workspace?.userEmail,
             data: {
                 workspaceId: userWorkspace.id,
@@ -121,7 +123,7 @@ module.exports = async function start(args) {
             }
         })
     } catch (e) {
-        debug("Erro no processo de start", {message: e?.message, error: e})
+        debug("Erro no processo de start", { message: e?.message, error: e })
         TrackingEitriAnalytics.sendEvent({
             eventName: "start.error",
             userId: workspace?.userEmail,
@@ -149,8 +151,8 @@ module.exports = async function start(args) {
         await trackingService.sendError(e)
 
         process.exit(1)
-    } finally{
-        if(displayFriendlyErrorAtEnd){
+    } finally {
+        if (displayFriendlyErrorAtEnd) {
             const folderHash = workspace.getFolderHashPath()
             await workspace.transpile([folderHash])
             console.log("\n\n" + separator + "\n" + displayFriendlyErrorAtEnd + "\n" + separator + "\n\n")

package/src/cmd/validate.js

@@ -9,10 +9,10 @@ module.exports.SLUG_REGEX = SLUG_REGEX
 
 module.exports.assertCommandNotRunning = function (commandName) {
     return new Promise((resolve, reject) => {
-        ps.lookup({command: 'node'}, (err, processes) => {
+        ps.lookup({ command: 'node' }, (err, processes) => {
             if (err) throw new Error('erro ao executar comando')
 
-            console.log('\x1b[1m\x1b[34m Iniciando Eitri builder\x1b[0m');
+            console.log('\x1b[1m\x1b[34mIniciando Eitri builder\x1b[0m');
 
             const runningProcesses = processes.filter((process) => {
                 let isAmeToolsRunning = false
@@ -34,7 +34,7 @@ module.exports.assertCommandNotRunning = function (commandName) {
             //     reject()
             //     process.exit(1)
             // } else {
-                resolve()
+            resolve()
             // }
         })
     })

package/src/modules/app/AppCommand.js

@@ -0,0 +1,15 @@
+const commander = require("commander");
+module.exports = function AppCommand() {
+    const app = commander.command("app")
+        .description("Gerencia os workspaces do desenvolvedor, para mais informações execute 'eitri workspace --help'")
+
+    app
+        .command("start")
+        .description("Lista os workspaces do usuário")
+        .action(async (cmdObj) => {
+            const eitriCLIV2 = require("../../../eitri-cli-v2/index.js");
+            await eitriCLIV2.app.start(cmdObj)
+        });
+
+    return app;
+};

package/src/service/LibsService.js

@@ -2,11 +2,12 @@ const axios = require('axios')
 const configService = require('./ConfigService')
 const CDN_83io_LIBRARY = configService.get('cdn')?.library
 const TrackingEitriAnalytics = require('./TrackingEitriAnalytics')
+const { validateUUID } = require('../util/GenericUtils')
 
 class LibsService {
 
-    static async validateLibsVersions({libs = [], eitriAppConf = {}}) {
-        const {luminusUiVersion, bifrostVersion} = this.getEitriConfLibsVersions(libs)
+    static async validateLibsVersions({ libs = [], eitriAppConf = {} }) {
+        const { luminusUiVersion, bifrostVersion } = this.getEitriConfLibsVersions(libs)
         if (!luminusUiVersion) {
             throw new Error("Nenhuma versão do [luminus-ui/eitri-app-components] encontrada em seu eitri-app.conf");
         }
@@ -15,10 +16,11 @@ class LibsService {
             throw new Error("Nenhuma versão do [bifrost/eitri-app-client] encontrada em seu eitri-app.conf");
         }
 
-        const {luminusUiVersions, bifrostVersions} = await this.simultaneousRequestAndHandleData();
+        const { luminusUiVersions, bifrostVersions } = await this.simultaneousRequestAndHandleData();
         const allBifrostVersions = bifrostVersions?.versions?.concat(bifrostVersions?.betaVersions, bifrostVersions?.alphaVersions);
 
-        if(!luminusUiVersion.includes("@")){
+
+        if (!luminusUiVersion.includes("@") && !validateUUID(luminusUiVersion)) {
             const existsLuminus = luminusUiVersions?.versions?.some(version => version === luminusUiVersion);
             if (!existsLuminus) {
                 this.throwNonExistentLibError({
@@ -30,7 +32,7 @@ class LibsService {
             }
         }
 
-        if(!bifrostVersion.includes("@")){
+        if (!bifrostVersion.includes("@")) {
             const existsBifrost = allBifrostVersions.some(version => version === bifrostVersion);
             if (!existsBifrost) {
                 this.throwNonExistentLibError({
@@ -127,12 +129,12 @@ class LibsService {
         TrackingEitriAnalytics.sendEvent({
             eventName: `${method}.error`,
             userId: "",
-            data: {errorMessage}
+            data: { errorMessage }
         })
     }
 
-    static throwNonExistentLibError(input = {libName: "", eitriConfLibVersion: "", availableVersions: [], eitriAppConf: {}}) {
-        const {libName, eitriConfLibVersion, availableVersions, eitriAppConf} = input
+    static throwNonExistentLibError(input = { libName: "", eitriConfLibVersion: "", availableVersions: [], eitriAppConf: {} }) {
+        const { libName, eitriConfLibVersion, availableVersions, eitriAppConf } = input
 
         const friendlyErrorMessage = `Versão da biblioteca [${libName}] não encontrada`;
         console.log(`\n\x1b[1m\x1b[31m${friendlyErrorMessage}\x1b[0m\n`);

package/src/service/Watcher.js

@@ -30,7 +30,7 @@ class Watcher {
                     return
                 }
                 if (stat.isFile()) {
-                    console.log('\x1b[34mAlterações em: %s\x1b[0m', filePath)
+                    console.log('\x1b[34meitri:Alterações em: %s\x1b[0m', filePath)
                     this.workspace
                         .upsert(filePath, { why: WatcherOpts.SAVE })
                         .then((result) => {
@@ -43,10 +43,10 @@ class Watcher {
                             }
                             if (result.relativePath === '/folder.hash') {
 
-                                console.log(`\x1b[94mForjado em ${result.time} milissegundos\x1b[0m`);
+                                console.log(`\x1b[94meitri:Forjado em ${result.time} milissegundos\x1b[0m`);
                                 this.trackingService.sendSave(event)
                             } else {
-                                console.log(`\x1b[94mTransportado em ${result.time} milissegundos\x1b[0m`);
+                                console.log(`\x1b[94meitri:Transportado em ${result.time} milissegundos\x1b[0m`);
                                 this.trackingService.sendCompile(event)
                             }
                             return this.hashFolder.updateHashFile()

package/src/service/Workspace.js

@@ -31,7 +31,7 @@ const EitriAppType = require("../model/EitriAppType");
 const chalk = require("chalk");
 const LibsService = require("./LibsService");
 const { LogSuccess } = require("../util/LogUtil");
-const {extractSlug} = require("../util/LibUtil");
+const { extractSlug } = require("../util/LibUtil");
 const vegvisirService = new VegvisirService()
 const huginService = new HuginService()
 
@@ -139,6 +139,9 @@ class Workspace {
                 throw Error("Arquivo eitri-app.conf.js sem version");
             }
         }
+        if (process.env.WORKSPACE_SHARED) {
+            this._miniConf['eitri-luminus'] = process.env.WORKSPACE_SHARED
+        }
         return this._miniConf;
     }
 
@@ -183,8 +186,9 @@ class Workspace {
         });
     }
 
-    async setup() {
+    async setup(args) {
         const miniConf = this.getMiniConf();
+        miniConf.isShared = args.shared
         const headers = {
             accept: this.config.libs.updateLibsEndpointVersion,
         };
@@ -242,7 +246,7 @@ class Workspace {
         let libVersionsOutput = "";
         state.libs.forEach((lib) => {
             let libraryDisplayName = lib.name
-            if(libraryDisplayName === "eitri-luminus"){
+            if (libraryDisplayName === "eitri-luminus") {
                 libraryDisplayName = extractSlug(miniConf[lib.name])
             }