eitri-cli 1.4.0-beta.1 → 1.4.0-beta.3

package/package.json

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

package/src/cmd/push-version.js

@@ -8,9 +8,9 @@ const config = require('../service/ConfigService')
 const TargetService = require('../service/TargetService')
 const inquirer = require('inquirer')
 const TrackingEitriAnalytics = require('../service/TrackingEitriAnalytics')
-const VegvisirService = require('../modules/vegvisir/VegvisirService')
-const getWorkspace = require('../util/getWorkspace')
 const UserLocalCredential = require('../util/UserLocalCredential')
+const VegvisirService = require('../modules/vegvisir/VegvisirService')
+const {randomUUID} = require('crypto')
 
 const blindGuardian = workspace.blindGuardian
 const trackingService = new TrackingService(blindGuardian)
@@ -39,7 +39,6 @@ module.exports = async function pushVersion(cmdObj) {
         }
         workspace.publishing = true
         const miniConf = workspace.getMiniConf()
-        await vegvisirService.check(miniConf.slug)
 
         let validateResult = checkErros(miniConf)
 
@@ -82,8 +81,12 @@ ${await targetService.getAppConfExampleSnippet()}
         blindGuardian.readConf()
         workspace.setServerUrl(config.get('workspace').url)
         console.log('Conectando ao Eitri...')
-        await workspace.init()
-        const userWorkspace = await getWorkspace()
+        
+        const tempWorkspaceId = randomUUID()
+        vegvisirService.setWorkspaceId(tempWorkspaceId)        
+        await workspace.initPushVersion(tempWorkspaceId)
+        const userWorkspace = await vegvisirService.getWorkspace()
+
         await miniLog.connect(userWorkspace.id)
         console.log(separator)
         console.log("Analisando versões...");

package/src/cmd/start.js

@@ -10,7 +10,6 @@ const handleStartServer = require('../service/StarterService')
 const inquirer = require('inquirer')
 const TrackingEitriAnalytics = require('../service/TrackingEitriAnalytics')
 const VegvisirService = require('../modules/vegvisir/VegvisirService')
-const getWorkspace = require('../util/getWorkspace')
 const UserLocalCredential = require('../util/UserLocalCredential')
 
 const blindGuardian = workspace.blindGuardian
@@ -71,7 +70,7 @@ module.exports = async function start(args) {
         workspace.setQrCodeUrl(qrCodeUrl)
         await workspace.init()
         const silentOnConnect = args.verbose ? false : true
-        const userWorkspace = await getWorkspace()
+        const userWorkspace = await vegvisirService.getWorkspace()
         await miniLog.connect(userWorkspace.id, silentOnConnect)
 
         console.log("Construindo...");

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/VegvisirService.js

@@ -2,14 +2,26 @@ const { default: axios } = require("../../../node_modules/axios/index");
 const BlindGuardian = require("../../service/BlindGuardian");
 const Http = require("../../service/Http");
 const configService = require("../../service/ConfigService");
-const getWorkspace = require("../../util/getWorkspace");
 const writeGlobalWorkspaceConfig = require("./utils/writeGlobalWorkspaceConfig");
-
+const { readFile } = require("fs/promises");
+const os = require("os");
+const {validateUUID} = require("../../util/GenericUtils");
+const path = require("path");
+const fs = require('fs')
 module.exports = class VegvisirService {
     constructor() {
         const blindGuardian = new BlindGuardian();
         this.http = new Http(blindGuardian);
         this.config = configService.get("vegvisir");
+        this.workspaceId = "";
+    }
+
+    getWorkspaceId() {
+        return this.workspaceId;
+    }
+
+    setWorkspaceId(id) {
+        this.workspaceId = id;
     }
 
     async listMyWorkspaces() {
@@ -44,7 +56,7 @@ module.exports = class VegvisirService {
 
     async check(slug) {
         try {
-            let workspace = await getWorkspace()
+            let workspace = await this.getWorkspace()
             if(!workspace) {
                 const workspaces = await this.listMyWorkspaces();
                 const defaultWorkspace = await workspaces.find(w => w.name === 'DEFAULT')
@@ -78,4 +90,40 @@ module.exports = class VegvisirService {
         }
 
     }
+
+    async getWorkspace() {
+        try {
+            const workspaceEitriAppProjectPath = path.resolve(
+                process.cwd(),
+                ".workspaces",
+                "workspace"
+            );
+        
+            if (fs.existsSync(workspaceEitriAppProjectPath)) {
+                const fileContent = await readFile(
+                    workspaceEitriAppProjectPath,
+                    "utf8"
+                );
+                const workspace = JSON.parse(fileContent);
+                return workspace;
+            }
+            const workspaceGlobalPath = path.resolve(
+                os.homedir(),
+                ".eitri",
+                "workspaces",
+                "workspace"
+            );
+            const fileContent = await readFile(workspaceGlobalPath, "utf8");
+            const workspace = JSON.parse(fileContent);
+            console.log("Consutrindo de ", workspace.id)
+            workspace.id = validateUUID(this.workspaceId) ? this.workspaceId : workspace.id;
+            return workspace;
+        } catch (error) {
+            if(error.code === "ENOENT") {
+                return;
+            }
+            console.error("Ocorreu um erro inesperado ao tentar ler o workspace atual.", error?.message)
+            return process.exit(1)
+        }
+    };
 };

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

@@ -1,8 +1,9 @@
-const getWorkspace = require("../../../util/getWorkspace");
+const VegvisirService = require("../../vegvisir/VegvisirService");
+const vegvisirService = new VegvisirService()
 
 module.exports = async function current(cmdObj) {
     try {
-        const workspace = await getWorkspace()
+        const workspace = await vegvisirService.getWorkspace()
         if(!workspace) {
             console.log("Você não possui workspace selecionado para desenvolvimento.")
             return;

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/Http.js

@@ -5,12 +5,11 @@ const CookieJar = require('tough-cookie').CookieJar
 const os = require('os')
 const path = require('path')
 const getCliVersion = require('../util/getCliVersion')
-const getWorkspace = require('../util/getWorkspace')
 const { randomUUID } = require('crypto')
+const getWorkspace = require('../util/getWorkspace')
 
 const filePath = path.join(os.homedir(), './.eitri.cookie.json')
 const jar = new CookieJar(new FileCookieStore(filePath))
-
 const axios = require('axios').create({ withCredentials: true, jar })
 
 axiosCookieJarSupport(axios)
@@ -38,6 +37,7 @@ class Http {
     constructor(tokenFactory) {
         this.tokenFactory = tokenFactory
         this.newTokenAttempt = 0
+        this.workspaceId = ""
     }
 
     setTokenFactory(tokenFactory) {
@@ -48,6 +48,10 @@ class Http {
         this.token = token
     }
 
+    setWorkspaceId(id){
+        this.workspaceId = id
+    }
+
     getCookieSession(url) {
         return new Promise((resolve, reject) => {
             jar.getCookies(url, { allPaths: true }, function (err, cookies) {
@@ -87,7 +91,7 @@ class Http {
             'App-Tools-Version': getCliVersion()
         }
         if (url.includes("foundry") || url.includes("runes-foundry")) {
-            headers["Workspace-Id"] = (await getWorkspace()).id;
+            headers["Workspace-Id"] = this.workspaceId ? this.workspaceId : (await getWorkspace()).id;
         }
 
         return headers

package/src/service/Workspace.js

@@ -23,8 +23,9 @@ const Buffer = require("buffer");
 const DEFAULT_ENV = "dev";
 const cliProgress = require("cli-progress");
 const EitriAppManager = require("./EitriAppManager");
-const getWorkspace = require("../util/getWorkspace");
 const EitriAppService = require("./EitriAppService");
+const VegvisirService = require("../modules/vegvisir/VegvisirService");
+const vegvisirService = new VegvisirService()
 
 class Workspace {
     
@@ -96,6 +97,7 @@ class Workspace {
         return this.resourceFolders2watch;
     }
 
+
     async getTargetConfig(id, target) {
         try {
             const configs = await this.getAllTargetConfigs(target);
@@ -152,6 +154,11 @@ class Workspace {
         this.userEmail = token.email;
     }
 
+    async initPushVersion(workspaceId = "") {
+        this.http.setWorkspaceId(workspaceId);
+        this.init()
+    }
+
     getMiniConf() {
         if (!this._miniConf) {
             const eitriAppConfPath = path.resolve(
@@ -364,7 +371,7 @@ class Workspace {
         let miniAppUrl = `${this.getBootstrapURL(
             targetConfig.bootstrapBaseUrl
         )}/${this.config.basePath || "workspace"
-            }/user/${(await getWorkspace()).id}/${viewHtml}?data=${encodedData}${paramOrderId}${paramShareId}&devmode=true`;
+            }/user/${(await vegvisirService.getWorkspace()).id}/${viewHtml}?data=${encodedData}${paramOrderId}${paramShareId}&devmode=true`;
 
         if (cid) {
             miniAppUrl = miniAppUrl + "&cid=" + cid;
@@ -1043,6 +1050,7 @@ class Workspace {
     toBase64(content) {
         return Buffer.from(content).toString("base64");
     }
+
 }
 
 module.exports = {

package/src/util/GenericUtils.js

@@ -14,6 +14,11 @@ class GenericUtils {
         return formattedDateTime;
     }
 
+    static validateUUID = (uuid = "") => {
+        const regexExp = /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/gi;
+        return uuid && typeof uuid === "string" && regexExp.test(uuid)
+    }
+
 }
 
 module.exports = GenericUtils

package/src/util/getWorkspace.js

@@ -1,5 +1,5 @@
-const { existsSync } = require("fs");
-const { readFile } = require("fs/promises");
+const {existsSync} = require("fs");
+const {readFile} = require("fs/promises");
 const path = require("path");
 const os = require("os");
 module.exports = async function getWorkspace() {
@@ -9,7 +9,7 @@ module.exports = async function getWorkspace() {
             ".workspaces",
             "workspace"
         );
-    
+
         if (existsSync(workspaceEitriAppProjectPath)) {
             const fileContent = await readFile(
                 workspaceEitriAppProjectPath,
@@ -28,10 +28,10 @@ module.exports = async function getWorkspace() {
         const workspace = JSON.parse(fileContent);
         return workspace;
     } catch (error) {
-        if(error.code === "ENOENT") {
+        if (error.code === "ENOENT") {
             return;
         }
         console.error("Houve um erro inesperado ao tentar ler o workspace atual.")
         return process.exit(1)
     }
-};
+};

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);

package/test/utils/getWorkspaceId.test.js

@@ -1,5 +1,6 @@
-const getWorkspace = require("../../src/util/getWorkspace");
+const VegvisirService = require("../../src/modules/vegvisir/VegvisirService");
 const fs = require('fs/promises')
+const vegvisirService = new VegvisirService()
 
 
 jest.mock('fs', () => ({
@@ -9,7 +10,7 @@ jest.mock('fs', () => ({
 describe('Get WorkspaceID Tests', () => {
     
     it('should return error if workspace file not found', async () => {
-        const promise = getWorkspace()
+        const promise = vegvisirService.getWorkspace()
         await expect(promise).rejects.toThrow("Você não tem nenhum workspace definido para desenvolvimento, execute o comando 'eitri workspace use' para definir um workspace.")
     });