eitri-cli 1.16.1 → 1.17.0-beta.10

package/.eslintrc.json

@@ -0,0 +1,26 @@
+{
+    "root": true,
+    "extends": ["eslint:recommended", "google", "plugin:prettier/recommended", "plugin:jest/recommended"],
+    "plugins": ["prettier", "jest"],
+    "env": {
+        "es6": true,
+        "node": true
+    },
+    "globals": {
+        "Atomics": "readonly",
+        "SharedArrayBuffer": "readonly"
+    },
+    "parserOptions": {
+        "sourceType": "commonjs"
+    },
+    "rules": {
+        "jest/no-conditional-expect": "warn",
+        "jest/no-focused-tests": "warn",
+        "prefer-const": "warn",
+        "prefer-rest-params": "warn",
+        "no-unused-expressions": "error",
+        "no-undef": "error",
+        "prettier/prettier": "error",
+        "no-console": "off"
+    }
+}

package/.prettierrc

@@ -0,0 +1,6 @@
+{
+    "printWidth": 130,
+    "tabWidth": 4,
+    "singleQuote": false,
+    "semi": false
+}

package/eitri-cli-v2/Cargo.toml

@@ -30,7 +30,7 @@ urlencoding = "2.1.3"
 url-parse = "1.0.7"
 config = "0.14.0"
 futures-util = "0.3.30"
-rust_socketio = { version = "0.4.2", features = ["async"] }
+rust_socketio = { version = "0.6.0", features = ["async"] }
 log = "0.4.21"
 env_logger = "0.11.3"
 crossterm = "0.27.0"
@@ -41,6 +41,7 @@ zip = "2.1.0"
 sha1 = "0.10.6"
 file-hashing = "0.1.2"
 qr2term = "0.3.1"
+fs_extra = "1.3.0"
 
 [dependencies.uuid]
 version = "1.8.0"

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

@@ -27,6 +27,7 @@ setup = "/v2/workspace/setup"
 version = "/version"
 upload_all = "/uploadAll"
 file_upload = "/fileupload"
+setup_app = "/v2/workspace/setup-app"
 
 [foundry.libs]
 update_libs_endpoint_version = "application/vnd.workspace.api.v2+json"

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

@@ -27,6 +27,7 @@ setup = "/v2/workspace/setup"
 version = "/version"
 upload_all = "/uploadAll"
 file_upload = "/fileupload"
+setup_app = "/v2/workspace/setup-app"
 
 
 [foundry.libs]

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

@@ -27,6 +27,7 @@ setup = "/v2/workspace/setup"
 version = "/version"
 upload_all = "/uploadAll"
 file_upload = "/fileupload"
+setup_app = "/v2/workspace/setup-app"
 
 
 [foundry.libs]
@@ -39,7 +40,7 @@ upload_file = "/uploadSingle"
 watch_user_dir = "/server"
 
 [mini_log]
-url = "https://prod.eitri.calindra.com.br/mini-log"
+url = "https://api.eitri.tech/mini-log"
 path = "/socket.io/"
 rooms = "/mini-log/rooms"
 

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

@@ -11,3 +11,4 @@ setup = "/v2/workspace/setup"
 version = "/version"
 upload_all = "/uploadAll"
 file_upload = "/fileupload"
+setup_app = "/v2/workspace/setup-app"

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

@@ -27,6 +27,7 @@ setup = "/v2/workspace/setup"
 version = "/version"
 upload_all = "/uploadAll"
 file_upload = "/fileupload"
+setup_app = "/v2/workspace/setup-app"
 
 
 [foundry.libs]

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

@@ -6,6 +6,8 @@
 export interface StartArguments {
   shared?: boolean
   verbose?: boolean
+  playground?: boolean
+  initializationParams?: string
 }
 export interface EitriLibsArguments {
   bifrost?: boolean
@@ -17,8 +19,9 @@ export function eitriLibs(eitriLibsArgs: EitriLibsArguments): Promise<void>
 export function doctor(): Promise<void>
 export function start(args: StartArguments): Promise<void>
 export namespace app {
-  export function start(): Promise<void>
+  export function start(args: StartArguments): Promise<void>
   export function appLogs(): Promise<void>
+  export function clean(): Promise<void>
 }
 export namespace workspace {
   export function clean(): Promise<void>

package/index.js

@@ -42,14 +42,15 @@ const run = async () => {
     .option("--yes", "Aceita o redirecionamento para o console")
     .option("-v, --verbose", "Exibe mais logs")
     .action(async (cmdObj) => {
-      const isLoginV2 = process.env.FT_LOGIN_V2
-      if (isLoginV2) {
-        console.log("\n\n Iniciando login (v2) \n");
-        require("./src/cmd/loginV2")(cmdObj);
+      const isLoginV1 = process.env.FT_LOGIN_V1
+      if (isLoginV1) {
+        console.log("\n\n Iniciando login (@deprecated) \n");
+        require("./src/cmd/login")(cmdObj);
         return
       }
 
-      require("./src/cmd/login")(cmdObj);
+        console.log("\n\n Iniciando login \n");
+        require("./src/cmd/loginV2")(cmdObj);
     });
 
   program
@@ -73,8 +74,12 @@ const run = async () => {
     .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"
+      "-p, --playground",
+      "Gera um QR code com a URL de abertura do Eitri Playground"
+    )
+    .option(
+      "-i, --initializationParams <initializationParams>",
+      "Define os parâmetros de inicialização do Eitri-App"
     )
     .option(
       "-e, --emulator <platform>",
@@ -90,14 +95,6 @@ const run = async () => {
     require("./src/cmd/start")(cmdObj);
   });
 
-  program
-    .command('test-initialization-params <initializationParams>')
-    .option("-v, --verbose", "Exibe mais logs")
-    .description('Define parâmetros na query string para inicializar o Eitri-App. Exemplo: stringChave1=stringValor1&stringChave2=stringValor2...')
-    .action((initializationParams, cmdObj) => {
-      require('./src/cmd/test-initialization-params')(initializationParams, cmdObj)
-    })
-
   program
     .command("push-version")
     .description(

package/package.json

@@ -1,93 +1,97 @@
 {
-  "name": "eitri-cli",
-  "version": "1.16.1",
-  "description": "Command Line Interface to make \"Eitri-App\" with code and fire.",
-  "main": "index.js",
-  "bin": {
-    "eitri": "index-eitri.js"
-  },
-  "scripts": {
-    "test-eitri": "NODE_APP_INSTANCE=eitri jest --detectOpenHandles",
-    "test": "NODE_APP_INSTANCE=eitri jest --detectOpenHandles",
-    "linter": "./node_modules/.bin/eslint --fix ./src/**/*.js",
-    "docsify:run": "cd docsify && docsify serve",
-    "build": "echo \"no build\"",
-    "release": "semantic-release",
-    "release:dry": "semantic-release --dry-run"
-  },
-  "engines": {
-    "node": ">=16.0.0",
-    "npm": ">=3.0.0"
-  },
-  "keywords": [],
-  "author": "Calindra",
-  "license": "ISC",
-  "lint-staged": {
-    "*.js": [
-      "./node_modules/.bin/eslint --fix",
-      "git add"
-    ]
-  },
-  "dependencies": {
-    "adm-zip": "^0.5.9",
-    "axios": "0.21.3",
-    "axios-cookiejar-support": "^0.5.1",
-    "base-64": "^0.1.0",
-    "base64url": "^3.0.1",
-    "camelcase": "^6.3.0",
-    "chalk": "^3.0.0",
-    "cheerio": "^1.0.0-rc.3",
-    "cli-progress": "^3.4.0",
-    "commander": "^9.2.0",
-    "config": "^3.3.0",
-    "cors": "^2.8.5",
-    "emojilib": "^2.4.0",
-    "express": "^4.17.3",
-    "express-rate-limit": "^6.3.0",
-    "figlet": "^1.2.4",
-    "folder-hash": "^3.3.0",
-    "form-data": "^4.0.0",
-    "inquirer": "^7.0.0",
-    "js-yaml": "^4.1.0",
-    "jsonwebtoken": "^8.5.1",
-    "lz-string": "^1.5.0",
-    "node-watch": "^0.6.3",
-    "open": "^7.0.0",
-    "ps-node": "^0.1.6",
-    "qrcode": "^1.5.3",
-    "semver": "^7.1.3",
-    "slugify": "^1.4.0",
-    "socket.io-client": "^4.5.2",
-    "standard-version": "^9.5.0",
-    "temp-dir": "^2.0.0",
-    "tmp": "^0.1.0",
-    "tough-cookie": "^3.0.1",
-    "tough-cookie-file-store": "^2.0.2",
-    "uuid": "^7.0.2",
-    "yaml": "^2.4.2"
-  },
-  "devDependencies": {
-    "@commitlint/cli": "^17.7.2",
-    "@commitlint/config-conventional": "^17.7.0",
-    "@faker-js/faker": "^7.6.0",
-    "@semantic-release/changelog": "^6.0.3",
-    "@semantic-release/git": "^10.0.1",
-    "docsify-cli": "^4.4.4",
-    "eslint": "^6.7.2",
-    "eslint-config-google": "^0.14.0",
-    "husky": "^8.0.3",
-    "jest": "^29.7.0",
-    "lint-staged": "^9.5.0",
-    "nock": "^13.3.0",
-    "puppeteer": "^21.4.1",
-    "semantic-release": "^22.0.8"
-  },
-  "resolutions": {
-    "lodash": "4.17.21",
-    "minimist": "1.2.6",
-    "ansi-regex": "5.0.1",
-    "merge": "2.1.1",
-    "tar": "6.1.9",
-    "handlebars": "4.7.7"
-  }
+    "name": "eitri-cli",
+    "version": "1.17.0-beta.10",
+    "description": "Command Line Interface to make \"Eitri-App\" with code and fire.",
+    "main": "index.js",
+    "bin": {
+        "eitri": "index-eitri.js"
+    },
+    "scripts": {
+        "test-eitri": "NODE_APP_INSTANCE=eitri jest --detectOpenHandles",
+        "test": "NODE_APP_INSTANCE=eitri jest --detectOpenHandles",
+        "linter": "./node_modules/.bin/eslint --fix ./src/**/*.js",
+        "docsify:run": "cd docsify && docsify serve",
+        "build": "echo \"no build\"",
+        "release": "semantic-release",
+        "release:dry": "semantic-release --dry-run"
+    },
+    "engines": {
+        "node": ">=16.0.0",
+        "npm": ">=3.0.0"
+    },
+    "keywords": [],
+    "author": "Calindra",
+    "license": "ISC",
+    "lint-staged": {
+        "*.js": [
+            "./node_modules/.bin/eslint --fix",
+            "git add"
+        ]
+    },
+    "dependencies": {
+        "adm-zip": "^0.5.9",
+        "axios": "^1.7.2",
+        "axios-cookiejar-support": "^5.0.2",
+        "base-64": "^0.1.0",
+        "base64url": "^3.0.1",
+        "camelcase": "^6.3.0",
+        "chalk": "^3.0.0",
+        "cheerio": "^1.0.0-rc.3",
+        "cli-progress": "^3.4.0",
+        "commander": "^9.2.0",
+        "config": "^3.3.0",
+        "cors": "^2.8.5",
+        "emojilib": "^2.4.0",
+        "express": "^4.17.3",
+        "express-rate-limit": "^6.3.0",
+        "figlet": "^1.2.4",
+        "folder-hash": "^3.3.0",
+        "form-data": "^4.0.0",
+        "get-folder-size": "^2.0.1",
+        "inquirer": "^7.0.0",
+        "js-yaml": "^4.1.0",
+        "jsonwebtoken": "^9.0.2",
+        "lz-string": "^1.5.0",
+        "node-watch": "^0.6.3",
+        "open": "^7.0.0",
+        "ps-node": "^0.1.6",
+        "qrcode": "^1.5.3",
+        "semver": "^7.1.3",
+        "slugify": "^1.4.0",
+        "socket.io-client": "^4.5.2",
+        "standard-version": "^9.5.0",
+        "temp-dir": "^2.0.0",
+        "tmp": "^0.1.0",
+        "tough-cookie": "^4.1.4",
+        "tough-cookie-file-store": "^2.0.2",
+        "uuid": "^7.0.2",
+        "yaml": "^2.4.2"
+    },
+    "devDependencies": {
+        "@commitlint/cli": "^17.7.2",
+        "@commitlint/config-conventional": "^17.7.0",
+        "@faker-js/faker": "^7.6.0",
+        "@semantic-release/changelog": "^6.0.3",
+        "@semantic-release/git": "^10.0.1",
+        "docsify-cli": "^4.4.2",
+        "eslint": "^9.5.0",
+        "eslint-config-google": "^0.14.0",
+        "eslint-plugin-jest": "^28.6.0",
+        "eslint-plugin-prettier": "^5.1.3",
+        "husky": "^8.0.3",
+        "jest": "^29.7.0",
+        "lint-staged": "^9.5.0",
+        "nock": "^13.3.0",
+        "prettier": "^3.3.2",
+        "puppeteer": "^22.11.2",
+        "semantic-release": "^22.0.8"
+    },
+    "resolutions": {
+        "lodash": "4.17.21",
+        "minimist": "1.2.6",
+        "ansi-regex": "5.0.1",
+        "merge": "2.1.1",
+        "tar": "6.1.9",
+        "handlebars": "4.7.7"
+    }
 }

package/src/cmd/runTests.js

@@ -70,7 +70,7 @@ module.exports = async function runTests(args) {
         debug("Fim da busca e validação do EitriAppConf", { miniConf })
 
         const url = config.get('workspace').url
-        const setupResult = await workspace.setup()
+        const setupResult = await workspace.setup(args)
         debug("Informações do setupResult do workspace", { setupResult })
 
         blindGuardian.readConf()

package/src/cmd/start.js

@@ -54,7 +54,10 @@ module.exports = async function start(args) {
         const applicationName = setupResult?.application?.name
 
         blindGuardian.readConf()
-        const qrCodeUrl = config.get('qrCode').url
+        let qrCodeUrl = setupResult?.eitriAppBootstrapURL
+        if(args.playground){
+            qrCodeUrl = config.get('qrCode').url
+        }
         if (args.verbose) {
             blindGuardian.verbose = true
             miniLog.verbose = true

package/src/modules/app/AppCommand.js

@@ -3,11 +3,17 @@ module.exports = function AppCommand() {
     const app = commander.command("app")
         .description("Gerencia a execução de Eitri-Apps do Aplicativo declarado no app-config.yaml 'eitri app --help'")
 
+    const eitriCLIV2 = require("../../../eitri-cli-v2/index.js");
+
     app
         .command("start")
         .description("Inicializa todos os Eitri-Apps do arquivo de configuração app-config.yaml")
+        .option("-v, --verbose", "Exibe mais logs")
+        .option(
+            "-p, --playground",
+            "Gera um QR code com a URL de abertura do Eitri Playground"
+        )
         .action(async (cmdObj) => {
-            const eitriCLIV2 = require("../../../eitri-cli-v2/index.js");
             await eitriCLIV2.app.start(cmdObj)
         });
 
@@ -15,9 +21,15 @@ module.exports = function AppCommand() {
         .command("logs")
         .description("Exibe os logs dos Eitri-Apps em execução do comando 'eitri app start'")
         .action(async () => {
-            const eitriCLIV2 = require("../../../eitri-cli-v2/index.js");
             await eitriCLIV2.app.appLogs();
         });
 
+    app
+        .command("clean")
+        .description("Realiza a limpeza do workspace remoto")
+        .action(async () => {
+            await eitriCLIV2.app.clean();
+        });
+
     return app;
 };