eitri-cli 1.20.0-beta.1 → 1.20.0-beta.2

package/bitbucket-pipelines.yml

@@ -50,13 +50,13 @@ pipelines:
         - cp -r eitri-cli-v2/tests/fixtures/fake-workspace ~/.eitri/workspaces/workspace
         - cd eitri-cli-v2
         - cargo test -- --test-threads=1 --nocapture
-    - step: &macOSCrossCompile
+    - step: &macOSCrossCompileArm
         image: 
           name: 343482176926.dkr.ecr.us-east-1.amazonaws.com/eitri-base-cli-pipeline:macos
           aws:
             access-key: $EITRI_PROD_AWS_ACCESS_KEY_ID
             secret-key: $EITRI_PROD_AWS_SECRET_ACCESS_KEY
-        name: "macOS cross compile"
+        name: "macOS cross compile ARM"
         caches:
           - node
         script:
@@ -64,14 +64,29 @@ pipelines:
           - cargo add openssl --features vendored
           - npm install
           - npm run build -- --target aarch64-apple-darwin
-          - npm run build -- --target x86_64-apple-darwin
           - rm -rf target
           - cp -r ./eitri-cli-v2.darwin-arm64.node ../eitri-cli-v2.darwin-arm64.node
+        artifacts:
+          - eitri-cli-v2.darwin-arm64.node
+    - step: &macOSCrossCompileX86_64
+        image: 
+          name: 343482176926.dkr.ecr.us-east-1.amazonaws.com/eitri-base-cli-pipeline:macos
+          aws:
+            access-key: $EITRI_PROD_AWS_ACCESS_KEY_ID
+            secret-key: $EITRI_PROD_AWS_SECRET_ACCESS_KEY
+        name: "macOS cross compile x86_64"
+        caches:
+          - node
+        script:
+          - cd eitri-cli-v2
+          - cargo add openssl --features vendored
+          - npm install
+          - npm run build -- --target x86_64-apple-darwin
+          - rm -rf target
           - cp -r ./eitri-cli-v2.darwin-x64.node ../eitri-cli-v2.darwin-x64.node
           - cp -r ./index.d.ts ../index.d.ts
           - cp -r ./index.js ../rust-index.js
         artifacts:
-          - eitri-cli-v2.darwin-arm64.node
           - eitri-cli-v2.darwin-x64.node
           - index.d.ts
           - rust-index.js
@@ -116,7 +131,8 @@ pipelines:
             - step: *runRustTests
             - step: *windowsCrossCompile
             - step: *linuxCrossCompile
-            - step: *macOSCrossCompile
+            - step: *macOSCrossCompileArm
+            - step: *macOSCrossCompileX86_64
       - step:
           name: "Generation of a new version: beta or stable."
           caches:

package/config/dev.js

@@ -1,18 +1,14 @@
 /* eslint-disable no-undef */
-const HOST = "api.eitri.tech";
-const packageJson = require("../package.json");
-const path = require("path");
-const FOUNDRY_CONTEXT_PATH = process.env.FOUNDRY_CONTEXT_PATH ?? 'foundry'
+const HOST = "api.eitri.tech"
+const packageJson = require("../package.json")
+const path = require("path")
+const FOUNDRY_CONTEXT_PATH = process.env.FOUNDRY_CONTEXT_PATH ?? "foundry"
 
 const config = {
     userAgent: packageJson.name,
     signup: {
-        configFilePath: `.eitri/${path
-            .basename(__filename)
-            .replace(".js", ".")}conf.js`,
-        oldConfigFilePath: `.miniapp/${path
-            .basename(__filename)
-            .replace(".js", ".")}conf.js`,
+        configFilePath: `.eitri/${path.basename(__filename).replace(".js", ".")}conf.js`,
+        oldConfigFilePath: `.miniapp/${path.basename(__filename).replace(".js", ".")}conf.js`,
     },
     doc: {
         createUrl: `https://admin.${HOST}/docs`,
@@ -105,13 +101,17 @@ const config = {
         library: {
             url: "https://cdn.83io.com.br/library",
             bifrost: {
-                versions: "/eitri-bifrost/versions/index.json"
+                versions: "/eitri-bifrost/versions/index.json",
             },
             luminusUi: {
-                versions: "/luminus-ui/versions/index.json"
+                versions: "/luminus-ui/versions/index.json",
             },
-        }
-    }
-};
+            commons: {
+                versions: "/eitri-commons/versions/index.json",
+                getVersion: "/eitri-commons/assets/$VERSION_NUMBER/eitri-commons-$VERSION_NUMBER.js",
+            },
+        },
+    },
+}
 
-module.exports = config;
+module.exports = config

package/config/k8s-eitri.js

@@ -1,41 +1,42 @@
 /* eslint-disable no-undef */
-const HOST = 'k8s.eitri.calindra.com.br'
-const packageJson = require('../package.json')
-const path = require('path')
-const HOST_MINIAPPS = 'k8s.eitri.calindra.com.br'
+const HOST = "k8s.eitri.calindra.com.br"
+const packageJson = require("../package.json")
+const path = require("path")
+const { getVersion } = require("../src/cmd/version")
+const HOST_MINIAPPS = "k8s.eitri.calindra.com.br"
 
 const config = {
     userAgent: packageJson.name,
     signup: {
-        configFilePath: `.eitri/${path.basename(__filename).replace('.js', '.')}conf.js`,
-        oldConfigFilePath: `.miniapp/${path.basename(__filename).replace('.js', '.')}conf.js`
+        configFilePath: `.eitri/${path.basename(__filename).replace(".js", ".")}conf.js`,
+        oldConfigFilePath: `.miniapp/${path.basename(__filename).replace(".js", ".")}conf.js`,
     },
     doc: {
-        createUrl: `https://admin.${HOST_MINIAPPS}/docs`
+        createUrl: `https://admin.${HOST_MINIAPPS}/docs`,
     },
     blindGuardian: {
-        url: `https://${HOST_MINIAPPS}/blind-guardian-api`
+        url: `https://${HOST_MINIAPPS}/blind-guardian-api`,
     },
     shareApi: {
         url: `https://${HOST_MINIAPPS}/share-api/share`,
     },
     workspace: {
         url: `https://${HOST}`,
-        basePath: 'workspace',
-        targetPath: '/workspace/targets',
+        basePath: "workspace",
+        targetPath: "/workspace/targets",
         target: {
             knownTargets: [
                 {
                     default: true,
-                    code: 'CALINDRA_MOBILE',
-                    description: 'CALINDRA_MOBILE',
-                    bootstrapBaseUrl: `https://${HOST}`
-                }
-            ]
+                    code: "CALINDRA_MOBILE",
+                    description: "CALINDRA_MOBILE",
+                    bootstrapBaseUrl: `https://${HOST}`,
+                },
+            ],
         },
         apiVersion: {
-            v1Header: 'application/vnd.workspace.api.v1+json',
-            v2Header: 'application/vnd.workspace.api.v2+json'
+            v1Header: "application/vnd.workspace.api.v1+json",
+            v2Header: "application/vnd.workspace.api.v2+json",
         },
         colossus: {
             // url: 'https://colossus.lab.calindra.com.br/colossus-api/v1',
@@ -43,44 +44,44 @@ const config = {
             url: `https://${HOST}/foundry/server`,
 
             // pasta do miniapp dentro de src
-            watchUserDir: '/server'
+            watchUserDir: "/server",
         },
         credentials: {
-            approvalUrlPath: 'workspace/credential-approval',
-            upsertUrlPath: 'workspace/miniapps/:publicKey/credential',
-            defaultGrantType: 'client_credentials'
+            approvalUrlPath: "workspace/credential-approval",
+            upsertUrlPath: "workspace/miniapps/:publicKey/credential",
+            defaultGrantType: "client_credentials",
         },
         libs: {
-            updateLibsEndpointVersion: 'application/vnd.workspace.api.v2+json'
-        }
+            updateLibsEndpointVersion: "application/vnd.workspace.api.v2+json",
+        },
     },
     qrCode: {
-        url: 'https://k8s.eitri.calindra.com.br/workspace/share',
+        url: "https://k8s.eitri.calindra.com.br/workspace/share",
     },
     miniLog: {
         url: `https://${HOST_MINIAPPS}/mini-log/rooms`,
-        path: '/mini-log/socket.io'
+        path: "/mini-log/socket.io",
     },
     managerApi: {
         url: `https://${HOST_MINIAPPS}/miniapp-manager-api`,
         invites: {
-            send: '/p/invites',
-            slug: '/p/invites/s/:slug',
-            my: '/p/myInvites',
-            remove: '/p/invites/:inviteToken',
-            accept: '/p/invites/accept',
+            send: "/p/invites",
+            slug: "/p/invites/s/:slug",
+            my: "/p/myInvites",
+            remove: "/p/invites/:inviteToken",
+            accept: "/p/invites/accept",
+        },
+        miniapp: {
+            miniAppsPath: "/o/mini-apps",
         },
-        miniapp:{
-            miniAppsPath: '/o/mini-apps',
-        }
     },
     workspaceManager: {
         url: `https://${HOST_MINIAPPS}`,
-        path: '/workspace-manager/socket.io',
-        contextPath: '/workspace-manager'
+        path: "/workspace-manager/socket.io",
+        contextPath: "/workspace-manager",
     },
     eitriAnalytics: {
-        url: "https://analytics.dev.eitri.calindra.com.br/analytics/event"
+        url: "https://analytics.dev.eitri.calindra.com.br/analytics/event",
     },
     managerFront: {
         url: `https://console.eitri.tech`,
@@ -89,13 +90,17 @@ const config = {
         library: {
             url: "https://cdn.83io.com.br/library",
             bifrost: {
-                versions: "/eitri-bifrost/versions/index.json"
+                versions: "/eitri-bifrost/versions/index.json",
             },
             luminusUi: {
-                versions: "/luminus-ui/versions/index.json"
+                versions: "/luminus-ui/versions/index.json",
+            },
+            commons: {
+                versions: "/eitri-commons/versions/index.json",
+                getVersion: "/eitri-commons/assets/$VERSION_NUMBER/eitri-commons-$VERSION_NUMBER.js",
             },
-        }
-    }
+        },
+    },
 }
 
 module.exports = config

package/config/loc-eitri.js

@@ -1,20 +1,16 @@
-const ipv4 = require("../src/util/ipv4");
-const HOST = ipv4()[0];
-const packageJson = require("../package.json");
-const PORT = process.env.EITRI_APP_TOOLS_PORT || 3333;
-const path = require("path");
-const HOST_EITRIAPPS = "api.eitri.tech";
-const FOUNDRY_CONTEXT_PATH = process.env.FOUNDRY_CONTEXT_PATH ?? 'runes-foundry'
+const ipv4 = require("../src/util/ipv4")
+const HOST = ipv4()[0]
+const packageJson = require("../package.json")
+const PORT = process.env.EITRI_APP_TOOLS_PORT || 3333
+const path = require("path")
+const HOST_EITRIAPPS = "api.eitri.tech"
+const FOUNDRY_CONTEXT_PATH = process.env.FOUNDRY_CONTEXT_PATH ?? "runes-foundry"
 
 const config = {
     userAgent: packageJson.name,
     signup: {
-        configFilePath: `.eitri/${path
-            .basename(__filename)
-            .replace(".js", ".")}conf.js`,
-        oldConfigFilePath: `.miniapp/${path
-            .basename(__filename)
-            .replace(".js", ".")}conf.js`,
+        configFilePath: `.eitri/${path.basename(__filename).replace(".js", ".")}conf.js`,
+        oldConfigFilePath: `.miniapp/${path.basename(__filename).replace(".js", ".")}conf.js`,
     },
     doc: {
         createUrl: "https://developer.eitri.calindra.com.br/#/?id=create",
@@ -107,13 +103,17 @@ const config = {
         library: {
             url: "https://cdn.83io.com.br/library",
             bifrost: {
-                versions: "/eitri-bifrost/versions/index.json"
+                versions: "/eitri-bifrost/versions/index.json",
             },
             luminusUi: {
-                versions: "/luminus-ui/versions/index.json"
+                versions: "/luminus-ui/versions/index.json",
             },
-        }
-    }
-};
+            commons: {
+                versions: "/eitri-commons/versions/index.json",
+                getVersion: "/eitri-commons/assets/$VERSION_NUMBER/eitri-commons-$VERSION_NUMBER.js",
+            },
+        },
+    },
+}
 
-module.exports = config;
+module.exports = config

package/config/prod-eitri.js

@@ -1,20 +1,16 @@
 /* eslint-disable no-undef */
-const HOST = "prod.eitri.calindra.com.br";
-const EITRI_TECH_HOST = "eitri.tech";
+const HOST = "prod.eitri.calindra.com.br"
+const EITRI_TECH_HOST = "eitri.tech"
 const API_EITRI_TECH_URL = `api.${EITRI_TECH_HOST}`
-const packageJson = require("../package.json");
-const path = require("path");
-const FOUNDRY_CONTEXT_PATH = process.env.FOUNDRY_CONTEXT_PATH ?? 'foundry'
+const packageJson = require("../package.json")
+const path = require("path")
+const FOUNDRY_CONTEXT_PATH = process.env.FOUNDRY_CONTEXT_PATH ?? "foundry"
 
 const config = {
     userAgent: packageJson.name,
     signup: {
-        configFilePath: `.eitri/${path
-            .basename(__filename)
-            .replace(".js", ".")}conf.js`,
-        oldConfigFilePath: `.miniapp/${path
-            .basename(__filename)
-            .replace(".js", ".")}conf.js`,
+        configFilePath: `.eitri/${path.basename(__filename).replace(".js", ".")}conf.js`,
+        oldConfigFilePath: `.miniapp/${path.basename(__filename).replace(".js", ".")}conf.js`,
     },
     doc: {
         createUrl: `https://console.${EITRI_TECH_HOST}/docs`,
@@ -45,9 +41,9 @@ const config = {
         },
         hugin: {
             url: `https://${API_EITRI_TECH_URL}/eitri-hugin-api`,
-            uploadZip: '/uploadAll',
-            uploadFile: '/uploadSingle',
-            
+            uploadZip: "/uploadAll",
+            uploadFile: "/uploadSingle",
+
             // pasta do eitriapp dentro de src
             watchUserDir: "/server",
         },
@@ -107,13 +103,17 @@ const config = {
         library: {
             url: "https://cdn.83io.com.br/library",
             bifrost: {
-                versions: "/eitri-bifrost/versions/index.json"
+                versions: "/eitri-bifrost/versions/index.json",
             },
             luminusUi: {
-                versions: "/luminus-ui/versions/index.json"
+                versions: "/luminus-ui/versions/index.json",
+            },
+            commons: {
+                versions: "/eitri-commons/versions/index.json",
+                getVersion: "/eitri-commons/assets/$VERSION_NUMBER/eitri-commons-$VERSION_NUMBER.js",
             },
-        }
-    }
-};
+        },
+    },
+}
 
-module.exports = config;
+module.exports = config

package/package.json

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

package/src/service/LibsService.js

@@ -1,97 +1,134 @@
-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')
+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)
+        const libsList = libs
+
+        if (eitriAppConf["eitri-commons"]) {
+            libsList.push({
+                name: "eitri-commons",
+                version: eitriAppConf["eitri-commons"],
+            })
+        }
+
+        const { luminusUiVersion, bifrostVersion, commonsVersion } = this.getEitriConfLibsVersions(libsList)
+
+        if (commonsVersion) {
+            const validCommonsVersion = await this.validCommonsVersion(commonsVersion)
+            if (!validCommonsVersion) {
+                throw new Error(`A versão [${commonsVersion}] do [eitri-commons] definida em seu eitri-app.conf é inválida.`)
+            }
+        }
+
         if (!luminusUiVersion) {
-            throw new Error("Nenhuma versão do [luminus-ui/eitri-app-components] encontrada em seu eitri-app.conf");
+            throw new Error("Nenhuma versão do [luminus-ui/eitri-app-components] encontrada em seu eitri-app.conf")
         }
 
         if (!bifrostVersion) {
-            throw new Error("Nenhuma versão do [bifrost/eitri-app-client] encontrada em seu eitri-app.conf");
+            throw new Error("Nenhuma versão do [bifrost/eitri-app-client] encontrada em seu eitri-app.conf")
         }
 
-        const { luminusUiVersions, bifrostVersions } = await this.simultaneousRequestAndHandleData();
-        const allBifrostVersions = bifrostVersions?.versions?.concat(bifrostVersions?.betaVersions, bifrostVersions?.alphaVersions);
-
+        const { luminusUiVersions, bifrostVersions } = await this.simultaneousRequestAndHandleData()
+        const allBifrostVersions = bifrostVersions?.versions?.concat(
+            bifrostVersions?.betaVersions,
+            bifrostVersions?.alphaVersions,
+        )
 
         if (!luminusUiVersion.includes("@") && !validateUUID(luminusUiVersion)) {
-            const existsLuminus = luminusUiVersions?.versions?.some(version => version === luminusUiVersion);
+            const existsLuminus = luminusUiVersions?.versions?.some((version) => version === luminusUiVersion)
             if (!existsLuminus) {
                 this.throwNonExistentLibError({
                     libName: "luminus-ui/eitri-app-components",
                     eitriConfLibVersion: luminusUiVersion,
                     availableVersions: luminusUiVersions,
                     eitriAppConf,
-                });
+                })
             }
         }
 
         if (!bifrostVersion.includes("@")) {
-            const existsBifrost = allBifrostVersions.some(version => version === bifrostVersion);
+            const existsBifrost = allBifrostVersions.some((version) => version === bifrostVersion)
             if (!existsBifrost) {
                 this.throwNonExistentLibError({
                     libName: "bifrost/eitri-app-client",
                     eitriConfLibVersion: bifrostVersion,
                     availableVersions: allBifrostVersions,
                     eitriAppConf,
-                });
+                })
             }
         }
+    }
 
+    static async validCommonsVersion(commonsVersion) {
+        try {
+            const fullUrl = `${CDN_83io_LIBRARY.url}${CDN_83io_LIBRARY.commons.getVersion}`.replace(
+                /\$VERSION_NUMBER/g,
+                commonsVersion,
+            )
+            const response = await axios.get(fullUrl)
+            if (response.data) {
+                return true
+            }
+        } catch (error) {
+            const errorMessage = error?.message || "Erro na obtenção de versões do Bifrost"
+            this.sendErrorToAnalytics("getBifrostVersions", errorMessage)
+        }
+
+        return false
     }
 
     static getEitriConfLibsVersions(libs = []) {
-        const luminusUiNames = ["eitri-app-components", "eitri-luminus"];
-        const biFrostNames = ["eitri-app-client", "eitri-bifrost"];
-        const bifrostVersion = libs.find(lib => biFrostNames?.includes(lib.name))?.version;
-        const luminusUiVersion = libs.find(lib => luminusUiNames?.includes(lib.name))?.version;
+        const luminusUiNames = ["eitri-app-components", "eitri-luminus"]
+        const biFrostNames = ["eitri-app-client", "eitri-bifrost"]
+        const commonsNames = ["eitri-commons"]
+        const bifrostVersion = libs.find((lib) => biFrostNames?.includes(lib.name))?.version
+        const luminusUiVersion = libs.find((lib) => luminusUiNames?.includes(lib.name))?.version
+        const commonsVersion = libs.find((lib) => commonsNames?.includes(lib.name))?.version
 
         return {
             luminusUiVersion,
-            bifrostVersion
+            bifrostVersion,
+            commonsVersion,
         }
     }
 
     static async simultaneousRequestAndHandleData() {
-        const promises = await Promise.allSettled([
-            this.getBifrostVersions(), this.getLuminusUiVersions()
-        ]).then(res => res).catch(err => err)
+        const promises = await Promise.allSettled([this.getBifrostVersions(), this.getLuminusUiVersions()])
+            .then((res) => res)
+            .catch((err) => err)
 
-        const [bifrost, luminus] = promises;
+        const [bifrost, luminus] = promises
 
-        let allBifrostVersions = {};
+        let allBifrostVersions = {}
         if (bifrost?.status === "fulfilled") {
             allBifrostVersions = bifrost.value
         }
 
-        let allLuminusVersions = {};
+        let allLuminusVersions = {}
         if (luminus?.status === "fulfilled") {
             allLuminusVersions = luminus.value
         }
 
         return {
             luminusUiVersions: allLuminusVersions,
-            bifrostVersions: allBifrostVersions
+            bifrostVersions: allBifrostVersions,
         }
     }
 
     static handleRawDatas(promises = []) {
+        const [bifrost, luminus] = promises
 
-        const [bifrost, luminus] = promises;
-
-        const allBifrostVersions = [];
+        const allBifrostVersions = []
         if (bifrost?.status === "fulfilled") {
-            const versions = bifrost?.value?.versions?.concat(bifrost?.value?.betaVersions, bifrost?.value?.alphaVersions);
+            const versions = bifrost?.value?.versions?.concat(bifrost?.value?.betaVersions, bifrost?.value?.alphaVersions)
             allBifrostVersions.push(...versions)
         }
 
-        const allLuminusVersions = [];
+        const allLuminusVersions = []
         if (luminus?.status === "fulfilled") {
             allLuminusVersions.push(...luminus.value.versions)
         }
@@ -102,9 +139,8 @@ class LibsService {
         }
     }
 
-
     static async getBifrostVersions() {
-        const fullUrl = `${CDN_83io_LIBRARY.url}${CDN_83io_LIBRARY.bifrost.versions}`;
+        const fullUrl = `${CDN_83io_LIBRARY.url}${CDN_83io_LIBRARY.bifrost.versions}`
         try {
             const response = await axios.get(fullUrl)
             return response.data
@@ -115,7 +151,7 @@ class LibsService {
     }
 
     static async getLuminusUiVersions() {
-        const fullUrl = `${CDN_83io_LIBRARY.url}${CDN_83io_LIBRARY.luminusUi.versions}`;
+        const fullUrl = `${CDN_83io_LIBRARY.url}${CDN_83io_LIBRARY.luminusUi.versions}`
         try {
             const response = await axios.get(fullUrl)
             return response.data
@@ -129,16 +165,16 @@ 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
 
-        const friendlyErrorMessage = `Versão da biblioteca [${libName}] não encontrada`;
-        console.log(`\n\x1b[1m\x1b[31m${friendlyErrorMessage}\x1b[0m\n`);
-        console.log("Veja as versões disponíveis abaixo e atualize o arquivo eitri-app.conf\n");
+        const friendlyErrorMessage = `Versão da biblioteca [${libName}] não encontrada`
+        console.log(`\n\x1b[1m\x1b[31m${friendlyErrorMessage}\x1b[0m\n`)
+        console.log("Veja as versões disponíveis abaixo e atualize o arquivo eitri-app.conf\n")
         console.log(availableVersions)
 
         TrackingEitriAnalytics.sendEvent({
@@ -149,12 +185,11 @@ class LibsService {
                 eitriConfLibVersion,
                 availableVersions,
                 eitriAppConf,
-            }
+            },
         })
 
         process.exit(1)
     }
-
 }
 
-module.exports = LibsService
+module.exports = LibsService