eitri-cli 1.9.0-beta.15 → 1.9.0-beta.17

package/bitbucket-pipelines.yml

@@ -89,6 +89,7 @@ pipelines:
           - export CC=o64-clang
           - export CXX=o64-clang++
           - cd eitri-cli-v2
+          - cargo add openssl --features vendored
           - npm install
           - npm run build -- --target aarch64-apple-darwin
           - npm run build -- --target x86_64-apple-darwin
@@ -102,10 +103,10 @@ pipelines:
           - eitri-cli-v2.darwin-x64.node
           - index.d.ts
           - rust-index.js
-    - step: &linuxAndWindowsCrossCompile
+    - step: &linuxCrossCompile
         caches:
           - node
-        name: 'Linux and Windows cross compile'
+        name: 'Linux compile'
         script:
           - apt-get update
           - apt-get install -y git
@@ -119,18 +120,38 @@ pipelines:
           - export PATH="/root/.cargo/bin:${PATH}"
           - rustup --version
           - curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs
-          - rustup target add x86_64-pc-windows-msvc
           - rustup target add x86_64-unknown-linux-gnu
-          - cargo install cargo-xwin
           - cd eitri-cli-v2
+          - cargo add openssl --features vendored
           - npm install
           - npm run build -- --target x86_64-unknown-linux-gnu
-          - npm run build -- --target x86_64-pc-windows-msvc
-          - ls
           - cp -r ./eitri-cli-v2.linux-x64-gnu.node ../eitri-cli-v2.linux-x64-gnu.node
-          - cp -r ./eitri-cli-v2.win32-x64-msvc.node ../eitri-cli-v2.win32-x64-msvc.node
         artifacts:
           - eitri-cli-v2.linux-x64-gnu.node
+    - step: &windowsCrossCompile
+        caches:
+          - node
+        name: 'Windows cross compile'
+        script:
+          - apt-get update
+          - apt-get install -y git
+          - apt-get install -y libssl-dev
+          - apt-get install -y libudev-dev
+          - apt-get install -y pkg-config
+          - apt-get install -y cargo
+          - apt-get install -y gcc-mingw-w64
+          - apt-get install -y curl
+          - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+          - export PATH="/root/.cargo/bin:${PATH}"
+          - rustup --version
+          - curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs
+          - rustup target add x86_64-pc-windows-msvc
+          - cargo install cargo-xwin
+          - cd eitri-cli-v2
+          - npm install
+          - npm run build -- --target x86_64-pc-windows-msvc
+          - cp -r ./eitri-cli-v2.win32-x64-msvc.node ../eitri-cli-v2.win32-x64-msvc.node
+        artifacts:
           - eitri-cli-v2.win32-x64-msvc.node
   branches:
     "**":
@@ -148,7 +169,8 @@ pipelines:
       - parallel:
           fail-fast: true
           steps:
-            - step: *linuxAndWindowsCrossCompile
+            - step: *windowsCrossCompile
+            - step: *linuxCrossCompile
             - step: *macOSCrossCompile
       - step:
           name: "Generation of a new version: beta or stable."

package/eitri-cli-v2/Cargo.toml

@@ -23,13 +23,13 @@ serde_json = "1.0.114"
 tokio = { version = "1.36.0", features = ["full"] }
 
 [target.x86_64-unknown-linux-gnu]
-openssl = { version = "0.10.64", features = ["vendored"] }
+openssl = { version = "0.9", features = ["vendored"] }
 
 [target.aarch64-apple-darwin]
-openssl = { version = "0.10.64", features = ["vendored"] }
+openssl = { version = "0.9", features = ["vendored"] }
 
 [target.x86_64-apple-darwin]
-openssl = { version = "0.10.64", features = ["vendored"] }
+openssl = { version = "0.9", features = ["vendored"] }
 
 [build-dependencies]
 napi-build = "2.0.1"

package/package.json

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

package/src/cmd/create.js

@@ -76,6 +76,7 @@ module.exports = async function create(projectName, cmdObj) {
             eventName: "create",
             userId: workspace?.userEmail,
         });
+        console.log("Eitri-App criado com sucesso!")
         return responseAskProjMetadata
     } catch (e) {
         TrackingEitriAnalytics.sendEvent({
@@ -187,6 +188,7 @@ async function askProjMetadata(clientApplication, cmdObj, projectName) {
 
             // Cria no banco no final das configs locais
             const eitriApp = await eitriAppManager.create(eitriAppToCreate);
+            
             conf["id"] = eitriApp.id;
             conf["public-key"] = eitriApp.publicKey;
 
@@ -194,12 +196,12 @@ async function askProjMetadata(clientApplication, cmdObj, projectName) {
                 templateProject?.structure?.eitriAppConf;
 
             const finalConf = {
-                ...templateEitriAppConf,
-                ...conf,
-                organizationId: clientApplication.organization.id,
+                    ...templateEitriAppConf,
+                    ...conf,
+                    organizationId: clientApplication.organization.id,
                 applicationId: clientApplication.id,
             };
-
+            
             await factory.writeEitriAppConf(templateProject, finalConf);
         } catch (err) {
             if (cmdObj.verbose) {

package/test/e2e/cli.test.js

@@ -1,3 +1,4 @@
+const os = require('os');
 const util = require("util");
 const puppeteer = require("puppeteer");
 const path = require("path");
@@ -9,6 +10,8 @@ const Helper = require("../Helper.js");
 const ConfigService = require("../../src/service/ConfigService.js");
 const Http = require("../../src/service/Http.js");
 const BlindGuardian = require("../../src/service/BlindGuardian.js");
+const childProcess = require('child_process');
+const { writeFile, rm } = require("fs/promises");
 const FOUNDRY_CONTEXT_PATH = process.env.FOUNDRY_CONTEXT_PATH ?? 'foundry'
 
 describe("eitri-cli", () => {
@@ -44,7 +47,7 @@ describe("eitri-cli", () => {
                         `cd ${EITRI_WORK_DIR} && eitri create ${EITRI_APP_NAME} --yes --application=APPLICATION_CALINDRA`,
                         { env: devEnv }
                     )
-                    .waitFor(/Download de template completo/);
+                    .waitFor(/Eitri-App criado com sucesso!/);
                 await sleep(200);
                 const EITRI_APP_FOLDER = path.resolve(
                     EITRI_WORK_DIR,
@@ -141,9 +144,8 @@ describe("eitri-cli", () => {
             inputPassword.type(pass);
             await sleep(500);
 
-            // TODO: xpath quebra bastante...
             const buttonElement = await page.waitForXPath(
-                '//*[@id="root"]/div/div/div[2]/div/div/div/form/div/button'
+                '//*[@id="button-do-login"]'
             );
             console.log("Clicando no botão");
             await sleep(1000);
@@ -151,7 +153,15 @@ describe("eitri-cli", () => {
             await sleep(3000);
             await browser.close();
             await loginPromise;
-            // TODO: testes sem assert...
+            const homeDir = os.homedir();
+            const executorLS = new Executor({ env: devEnv });
+            await executorLS.exec(`ls ${path.join(homeDir, '.eitri')}`)
+                .waitFor(/.*/);
+            console.log('ls output', executorLS.stdout)
+            const configFilePath = path.join(homeDir, '.eitri', 'dev.conf.js')
+            const config = require(configFilePath);
+            expect(config.devUser).toBeDefined();
+            expect(config.devKey).toBeDefined();
         } catch (error) {
             console.error(error);
             throw error;
@@ -177,7 +187,7 @@ describe("eitri-cli", () => {
                         `cd ${EITRI_WORK_DIR} && eitri create ${EITRI_APP_NAME} --yes --application=APPLICATION_CALINDRA`,
                         { env: devEnv }
                     )
-                    .waitFor(/Download de template completo/);
+                    .waitFor(/Eitri-App criado com sucesso!/);
                 await sleep(200);
 
                 const EITRI_APP_FOLDER = path.resolve(
@@ -280,7 +290,7 @@ describe("eitri-cli", () => {
                         `cd ${EITRI_WORK_DIR} && eitri create ${EITRI_APP_NAME} --yes --application=APPLICATION_CALINDRA`,
                         { env: devEnv }
                     )
-                    .waitFor(/Download de template completo/);
+                    .waitFor(/Eitri-App criado com sucesso!/);
                 executor.child.kill("SIGKILL");
                 await sleep(1000)
                 const EITRI_APP_FOLDER = path.resolve(
@@ -318,6 +328,135 @@ describe("eitri-cli", () => {
         3 * minutes
     );
 
+    it("should do start and push-version using shared-eitri-app", async () => {
+        console.log("should do start and push-version using shared-eitri-app - init")
+        const EITRI_APP_NAME = `eitri-test-${Date.now()}`;
+        const executor = new Executor({ env: devEnv });
+        const startExecution = new Executor({ env: devEnv });
+        const pushVersion = new Executor({ env: devEnv });
+        try {
+            console.log("==========================================")
+            console.log("Create")
+            console.log("==========================================")
+            await executor
+                .exec(
+                    `cd ${EITRI_WORK_DIR} && eitri create ${EITRI_APP_NAME} --yes --application=APPLICATION_CALINDRA --verbose`,
+                    { env: devEnv }
+                )
+                .waitFor(/Eitri-App criado com sucesso!/);
+
+            const EITRI_APP_FOLDER = path.resolve(
+                EITRI_WORK_DIR,
+                EITRI_APP_NAME
+            );
+
+             // Use Shared Eitri-App
+            const conf = require(`../../developer-folder/${EITRI_APP_NAME}/eitri-app.conf.js`);
+            expect(conf.id).toBeDefined()
+            expect(conf.name).toBe(EITRI_APP_NAME)
+
+            console.log({ conf })
+            conf['eitri-luminus'] = "@baldurs-gate:0.1.24"
+            const eitriConfPath = path.join(EITRI_APP_FOLDER, 'eitri-app.conf.js')
+            await writeFile(eitriConfPath, `module.exports = ${JSON.stringify(conf)}`)
+
+            const componentsFolderPath = path.join(EITRI_APP_FOLDER, 'src', 'components')
+            await rm(componentsFolderPath, { recursive: true, force: true })
+
+            console.log("==========================================")
+            console.log("Start")
+            console.log("==========================================")
+            await startExecution
+                .exec(`cd ${EITRI_APP_FOLDER} && eitri start`)
+                .waitFor(/Utilize o QR-Code para iniciar o seu Eitri-App/);
+            startExecution.child.kill("SIGKILL");
+
+            console.log("==========================================")
+            console.log("PUSH VERSION")
+            console.log("==========================================")
+
+            await pushVersion
+                .exec(`cd ${EITRI_APP_FOLDER} && eitri push-version`)
+                .waitFor(/disponível no Eitri Console/);
+
+            const data = await getPublishedVersion(conf.version, conf.id);
+
+            expect(data.length).toBe(1);
+            expect(data[0].version).toBe(conf.version);
+            expect(data[0].eitriAppId).toBe(conf.id);
+        } catch (e) {
+            executor.child.kill("SIGKILL");
+            startExecution.child.kill("SIGKILL");
+            pushVersion.child.kill("SIGKILL");
+            console.error(e);
+            throw e;
+        } finally {
+            const conf = require(`../../developer-folder/${EITRI_APP_NAME}/eitri-app.conf.js`);
+            await Helper.delete(conf.id);
+        }
+        console.log("should do push-version as shared-eitri-app - end")
+    }, 2 * minutes);
+
+    it("should do push-version as shared-eitri-app", async () => {
+        console.log("should do push-version as shared-eitri-app - init")
+        const EITRI_APP_NAME = `eitri-test-${Date.now()}`;
+        const executor = new Executor({ env: devEnv });
+        const startExecution = new Executor({ env: devEnv });
+        const pushVersion = new Executor({ env: devEnv });
+        try {
+            console.log("==========================================")
+            console.log("Create")
+            console.log("==========================================")
+            await executor
+                .exec(
+                    `cd ${EITRI_WORK_DIR} && eitri create ${EITRI_APP_NAME} --yes --application=APPLICATION_CALINDRA`,
+                    { env: devEnv }
+                )
+                .waitFor(/Eitri-App criado com sucesso!/);
+
+            const EITRI_APP_FOLDER = path.resolve(
+                EITRI_WORK_DIR,
+                EITRI_APP_NAME
+            );
+            console.log("==========================================")
+            console.log("Start")
+            console.log("==========================================")
+            await startExecution
+                .exec(`cd ${EITRI_APP_FOLDER} && eitri start`)
+                .waitFor(/Utilize o QR-Code para iniciar o seu Eitri-App/);
+
+            startExecution.child.kill("SIGKILL");
+
+            const exportComponentsPath = path.join(EITRI_APP_FOLDER, 'src', 'export.js')
+            await writeFile(exportComponentsPath, `export {default as HeaderComponent} from './components/HeaderComponent.js'`)
+
+            console.log("==========================================")
+            console.log("PUSH VERSION")
+            console.log("==========================================")
+
+            await pushVersion
+                .exec(`cd ${EITRI_APP_FOLDER} && eitri push-version --shared`)
+                .waitFor(/disponível no Eitri Console/);
+
+            const conf = require(`../../developer-folder/${EITRI_APP_NAME}/eitri-app.conf.js`);
+            const data = await getPublishedVersion(conf.version, conf.id);
+
+            expect(data.length).toBe(1);
+            expect(data[0].version).toBe(conf.version);
+            expect(data[0].eitriAppId).toBe(conf.id);
+        } catch (e) {
+            executor.child.kill("SIGKILL");
+            startExecution.child.kill("SIGKILL");
+            pushVersion.child.kill("SIGKILL");
+            console.error(e);
+            throw e;
+        } finally {
+            const conf = require(`../../developer-folder/${EITRI_APP_NAME}/eitri-app.conf.js`);
+            await Helper.delete(conf.id);
+        }
+        console.log("should do push-version as shared-eitri-app - end")
+    }, 2 * minutes);
+
     const getPublishedVersion = async (version, eitriAppId) => {
         const blindGuardian = new BlindGuardian();
         const http = new Http(blindGuardian);