eitri-cli 1.12.0 → 1.13.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eitri-cli",
-  "version": "1.12.0",
+  "version": "1.13.0-beta.2",
   "description": "Command Line Interface to make \"Eitri-App\" with code and fire.",
   "main": "index.js",
   "bin": {
@@ -54,8 +54,7 @@
     "node-watch": "^0.6.3",
     "open": "^7.0.0",
     "ps-node": "^0.1.6",
-    "qrcode": "^1.4.4",
-    "qrcode-terminal": "^0.12.0",
+    "qrcode": "^1.5.3",
     "semver": "^7.1.3",
     "slugify": "^1.4.0",
     "socket.io-client": "^4.5.2",

package/src/service/QRCodeFactory.js

@@ -1,7 +1,6 @@
 const tmp = require('tmp')
 const qrcode = require('qrcode')
 const GenericUtils = require('../util/GenericUtils')
-const qrcodeTerminal = require('qrcode-terminal')
 const open = require('open')
 
 // Fabrica de QR code :-)
@@ -14,7 +13,9 @@ class QRCodeFactory {
             return
         }
 
-        qrcodeTerminal.generate(args?.fullUrl ?? "", {small: true})
+        qrcode.toString(args?.fullUrl, {type:"terminal", small: true}, function(_, qrCode) {
+            console.log(qrCode)
+        })
     }
 
     async create(data, eitriAppSlug = "", displayOutsideTerminal = false) {
@@ -34,12 +35,16 @@ class QRCodeFactory {
 
     createQRCodeImage(qrCodeTempPath, data) {
         return new Promise((resolve, reject) => {
-            qrcode.toFile(qrCodeTempPath, data, (err) => {
-                if (err) {
-                    return reject(err)
-                }
-                resolve()
-            })
+            qrcode.toFile(
+                qrCodeTempPath,
+                data,
+                {small: true},
+                (err) => {
+                    if (err) {
+                        return reject(err)
+                    }
+                    resolve()
+                })
         })
     }
 

package/src/service/TrackingEitriAnalytics.js

@@ -1,6 +1,7 @@
 const axios = require('axios')
 const configService = require('./ConfigService')
 const EITRI_ANALYTICS_URL = configService.get('eitriAnalytics')?.url
+const packageJson = require('../../package.json')
 
 class TrackingEitriAnalytics {
 
@@ -12,7 +13,10 @@ class TrackingEitriAnalytics {
             eventName,
             sessionId: process?.env?.["NODE_APP_SESSION_ID"] ?? "",
             userId,
-            data
+            data: {
+                cliVersion: packageJson?.version || "0.0.0",
+               ...data
+            }
         }
         await axios.post(EITRI_ANALYTICS_URL, event).catch(_err => null)
     }

package/src/service/Workspace.js

@@ -54,6 +54,7 @@ class Workspace {
             console.warn("Missing colossus config inside workspace.");
         }
         this.shareApi = configService.get("shareApi");
+        this.vegvisir = configService.get("vegvisir");
         this.targets = [];
 
         /**
@@ -432,9 +433,89 @@ class Workspace {
             },
         };
 
+        if(process.env.APP_START_WORKSPACE_CONFIG){
+            const startAppsConfig = await this.getEitriStartAppsWorkspacesConfig()
+            if(startAppsConfig){
+                config.focusedEitriApp = startAppsConfig.focusedEitriApp
+                config.applicationId = startAppsConfig.applicationId
+                config.environmentId = startAppsConfig.environmentId
+                config.devEnvKey = startAppsConfig.devEnvKey
+                config.workspaces = startAppsConfig.workspaces
+            }
+        }
+
         return config;
     }
 
+    async getEitriStartAppsWorkspacesConfig() {
+        try {
+            const appConfig = await this.getAppConfig()
+            const url = `${this.vegvisir.url}${this.vegvisir.basePath}${this.vegvisir.my}`
+            const responseWorkspaces = await this.http.get(url)
+
+            const workspaces = [];
+            let focusedEitriApp = ""
+            let workspaceFocused = ""
+
+            for (const eitriApp of appConfig.eitriApps) {
+                const eitriAppPath = eitriApp.path;
+
+                const eitriAppConfPath = path.resolve(
+                    process.cwd(),
+                    "..",
+                    eitriAppPath,
+                    'eitri-app.conf.js'
+                );
+
+
+                if (fs.existsSync(eitriAppConfPath)) {
+                    const eitriAppContent = require(eitriAppConfPath);
+                    const workspaceRemoteInfo = responseWorkspaces.find(rw => rw.name === eitriApp.workspace)
+                    
+                    if(eitriApp.focus){
+                        focusedEitriApp = eitriAppContent.slug
+                        workspaceFocused = workspaceRemoteInfo.id
+                    }
+
+                    
+                    const foundryContextPath = process.env.FOUNDRY_CONTEXT_PATH || 'foundry'
+                    const workspaceUrl = `https://api.eitri.tech/${foundryContextPath}/user/${workspaceRemoteInfo.id}/index.html`
+                    
+                    workspaces.push({
+                        name: eitriApp?.workspace,
+                        id: workspaceRemoteInfo?.id,
+                        url: workspaceUrl,
+                        slug: eitriAppContent?.slug,
+                        eitriAppId: eitriAppContent?.id,
+                    });
+                } else {
+                    console.error(`Eitri-App Conf não encontrado: ${eitriAppConfPath}`);
+                }
+            }
+
+            const isValidConfigs = startAppsConfig.applicationId
+                && startAppsConfig.devEnvKey
+                && startAppsConfig.focusedEitriApp
+                && startAppsConfig.environmentId
+                && startAppsConfig.workspaces?.length > 0
+
+            if(!isValidConfigs){
+                return
+            }
+
+            const fakerDevEnvKey = `dev-${new Date().getTime()}-${workspaceFocused}`
+            return {
+                focusedEitriApp,
+                applicationId: appConfig?.applicationId,
+                environmentId: appConfig?.environmentId,
+                devEnvKey: fakerDevEnvKey,
+                workspaces,
+            };
+        } catch (error) {
+            console.error("Erro ao obter configurações do Workspaces: ", error?.message)
+        }
+    }
+
     getRelativePath(filePath) {
         return filePath
             .replace(this.folder2watch, "")

package/src/service/WorkspaceManager.js

@@ -5,7 +5,7 @@ const QRCodeFactory = require('../service/QRCodeFactory')
 const TrackingService = require('../service/TrackingService')
 const configService = require('./ConfigService')
 const Server = require('../service/Server')
-const qrcodeTerminal = require('qrcode-terminal')
+const qrcode = require('qrcode')
 const TERMINAL_PRINTER_NAME = 'terminal'
 
 class WorkspaceManager {
@@ -36,7 +36,9 @@ class WorkspaceManager {
             }
 
             if(process.env.AAT_QRCODE_PRINTER === TERMINAL_PRINTER_NAME || args && args.qrPrinter === TERMINAL_PRINTER_NAME) {
-                qrcodeTerminal.generate(fullUrl, { small: true } )
+                qrcode.toString(fullUrl, {type:"terminal", small: true}, function(_, qrCode) {
+                    console.log(qrCode)
+                })
             } else {
                 const qrCodePath = await new QRCodeFactory().create(fullUrl)
                 const sanitizedQrCodePath = qrCodePath.replace('/~', '')