eitri-cli 1.38.0 → 1.39.0-beta.2

package/index.js

@@ -3,8 +3,6 @@ const commander = require("commander");
 const program = new commander.Command();
 const emoji = require("emojilib");
 const path = require("path");
-const { workspace } = require("./src/service/Workspace");
-const configService = require("./src/service/ConfigService");
 const VegvisirCommand = require("./src/modules/vegvisir/VegvisirCommand");
 const AppCommand = require("./src/modules/app/AppCommand");
 const debug = require("debug")("eitri:run");
@@ -32,17 +30,7 @@ const run = async () => {
   // Temporariamente necessário por conta de no contexto do Rust não saber o diretório atual, dessa forma exportando o fullPath do config é possível.
   // Quando se tornar uma CLI somente em rust no processo de instalação podemos declarar o caminho, como é via NPM pode ter caminhos variados de acordo com sistema de versionamento, NVM, Volta, ASDF é necessário a variável abaixo.
   process.env.CONFIG_DIR_PATH = path.join(__dirname, "eitri-cli-v2", "config");
-  try {
-    const srcFolder2watch = path.join(process.cwd(), "src");
-    workspace.setFolder2Watch(srcFolder2watch);
-    workspace.setServerUrl(`${configService.get("workspace").url}`);
-  } catch (e) {
-    debug("Erro no set da pasta", { message: e?.message, error: e });
-    if (process.env.LOG_LEVEL === "full") {
-      console.log("Current directory listening has failed", e);
-    }
-    // Continuando como antes...
-  }
+
 
 
   try {
@@ -72,14 +60,9 @@ const run = async () => {
     .option("--yes", "Aceita o redirecionamento para o console")
     .option("-v, --verbose", "Exibe mais logs")
     .action(async (cmdObj) => {
-      const isLoginV3 = process.env.FT_LOGIN_V3
-      if (isLoginV3 === 'true') {
-        await globalEitriCLIV2.login(cmdObj)
-        return
-      }
+      await globalEitriCLIV2.login(cmdObj)
+      return
 
-      console.log("\n\n Iniciando login \n");
-      require("./src/cmd/loginV2")(cmdObj);
     });
 
   program

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eitri-cli",
-    "version": "1.38.0",
+    "version": "1.39.0-beta.2",
     "description": "Command Line Interface to make \"Eitri-App\" with code and fire.",
     "main": "index.js",
     "bin": {
@@ -24,43 +24,12 @@
     "author": "Calindra",
     "license": "ISC",
     "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",
+        "debug": "^4.4.0",
         "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"
+        "semver": "^7.7.0",
+        "uuid": "^7.0.2"
     },
     "devDependencies": {
         "@commitlint/cli": "^17.7.2",
@@ -68,24 +37,10 @@
         "@faker-js/faker": "^7.6.0",
         "@semantic-release/changelog": "^6.0.3",
         "@semantic-release/git": "^10.0.1",
-        "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.12.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"
     }
 }

package/.eslintrc.json

@@ -1,26 +0,0 @@
-{
-    "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

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

package/src/cmd/clean.js

@@ -1,144 +0,0 @@
-const { workspace } = require('../service/Workspace')
-const validator = require('./validate')
-const TrackingService = require('../service/TrackingService')
-const config = require('../service/ConfigService')
-const TargetService = require('../service/TargetService')
-const inquirer = require('inquirer')
-const TrackingEitriAnalytics = require('../service/TrackingEitriAnalytics')
-const UserLocalCredential = require('../util/UserLocalCredential')
-
-const blindGuardian = workspace.blindGuardian
-const trackingService = new TrackingService(blindGuardian)
-const targetService = new TargetService(workspace)
-
-module.exports = async function clean(cmdObj) {
-    try {
-        UserLocalCredential.checkForCredentials()
-    } catch (error) {
-        const errorMessage = cmdObj?.verbose ? error : error?.message
-        console.error("\n", errorMessage, "\n")
-        return
-    }
-
-    try {
-        await validator.assertCommandNotRunning('clean')
-
-        blindGuardian.readConf()
-        workspace.setServerUrl(config.get('workspace').url)
-        await workspace.init()
-
-        console.log('Limpando compilador')
-
-        await workspace.clean()
-
-        console.log('[1] Limpo.')
-
-        TrackingEitriAnalytics.sendEvent({
-            eventName: "clean",
-            userId: workspace?.userEmail
-        })
-        process.exit(0)
-    } catch (e) {
-        TrackingEitriAnalytics.sendEvent({
-            eventName: "clean.error",
-            userId: workspace?.userEmail,
-            data: {
-                errorMessage: e?.message || ""
-            }
-        })
-
-        if(!e) {
-            console.error('Erro desconhecido')
-            process.exit(1)
-        }
-
-        if (cmdObj.verbose) {
-            console.error('Falha deletando workspace remoto', e)
-        }
-
-        const exit = async () => {
-            await trackingService.sendError(e)
-            process.exit(1)
-        }
-
-        const { httpStatus, response } = e
-
-        if(response){
-            const { data } = response
-
-            const transactionId = data.req_id
-
-            const printError = (message) => console.error(`${transactionId}: ${message}`)
-
-            const tryExitWithFriendlyMessage = async () => {
-                if(data && data.friendlyMessage) {
-                    const {friendlyMessage} = data
-                    printError(friendlyMessage)
-                    await exit()
-                }
-            }
-
-            if(httpStatus === 403) {
-                await tryExitWithFriendlyMessage()
-                printError('Acesso negado! Confira se você está registrado como desenvolvedor deste Eitri-App.')
-                await exit()
-            }
-            if(httpStatus === 500) {
-                if(data && data.error.includes('ENOENT: no such file or directory')) {
-                    // O workspace remoto ja nao existe, portanto nada fazemos.
-                    console.log('[2] Limpeza finalizada com sucesso.')
-                    await exit()
-                }
-                await tryExitWithFriendlyMessage()
-                printError('Erro interno!')
-                await exit()
-            }
-            printError('Ops: ocorreu um erro inesperado realizar a limpeza :-(')
-        }
-        console.error(`Ops: ocorreu um erro durante a limpeza: ${e.message}`)
-        await exit()
-    }
-}
-
-async function track(miniConf, start) {
-    let libs = await targetService.getLibs()
-    let event = {
-        superClientVersion: miniConf[libs.superAppClientLibName],
-        componentsVersion: miniConf[libs.componentsLibName],
-        miniAppSlug: miniConf.slug,
-        miniAppVersion: miniConf.version,
-        timeMs: Date.now() - start,
-    }
-    await trackingService.sendPushedVersion(event)
-}
-
-function checkErros(miniConf) {
-    let validateResult = validator.validate(miniConf)
-    validateResult.errors.forEach(message => console.log(message))
-    return validateResult
-}
-
-async function logPermissionsAndOpenPrompt(addedPermissions, removedPermissions, cmdObj) {
-    const GREEN_COLOR = '\x1b[32m'
-    const RED_COLOR = '\x1b[31m'
-    const MINIMAL_LENGTH = 0
-    if(addedPermissions.length > MINIMAL_LENGTH) {
-        console.log(`${GREEN_COLOR}\nPermissões adicionadas: ${addedPermissions}${GREEN_COLOR}`)
-    }
-    if(removedPermissions.length > MINIMAL_LENGTH) {
-        console.log(`${RED_COLOR}Permissões removidas: ${removedPermissions}\n${RED_COLOR}`)
-    }
-    if(!cmdObj.yes && (addedPermissions.length > MINIMAL_LENGTH || removedPermissions.length > MINIMAL_LENGTH)) {
-        const answer = await inquirer.prompt([
-            {
-                name: 'option',
-                message: 'Houve uma alteração nas permissões em relação a versão publicada. Deseja Continuar?',
-                type: 'rawlist',
-                choices: ['Sim', 'Não']
-            }
-        ])
-        if(answer.option === 'Não') {
-            process.exit(0)
-        }
-    }
-}

package/src/cmd/create.js

@@ -1,332 +0,0 @@
-const Watcher = require("../service/Watcher");
-const inquirer = require("inquirer");
-const slugify = require("slugify");
-const configService = require("../service/ConfigService");
-const { Workspace } = require("../service/Workspace");
-const BlindGuardian = require("../service/BlindGuardian");
-const HashFolder = require("../service/HashFolder");
-const TrackingService = require("../service/TrackingService");
-const { NAME_TITLE_REGEX, SLUG_REGEX } = require("./validate");
-const handleStartServer = require("../service/StarterService");
-const getCreateFactory = require("../util/getCreateFactory");
-const UrlUtils = require("../util/UrlUtils");
-const open = require("open");
-// eslint-disable-next-line no-unused-vars
-const Target = require("../model/Target");
-const EitriAppManager = require("../service/EitriAppManager");
-const WoodCoffee = require("../service/factories/WoodCoffeeFactory");
-const TrackingEitriAnalytics = require("../service/TrackingEitriAnalytics");
-const UserLocalCredential = require("../util/UserLocalCredential");
-
-const blindGuardian = new BlindGuardian();
-const hashFolder = new HashFolder();
-const workspace = new Workspace(blindGuardian, hashFolder);
-const trackingService = new TrackingService(blindGuardian, {
-    ignoreCredentialError: true,
-});
-const watcher = new Watcher(workspace, hashFolder, trackingService);
-const ITEM_DOUBT = "DOUBTS";
-const eitriAppManager = new EitriAppManager(blindGuardian);
-
-const nameOrTitle = (inpt) => {
-    if (!NAME_TITLE_REGEX.test(inpt)) {
-        return "Não use caracteres especiais";
-    }
-    return true;
-};
-
-const slug = (inpt) => {
-    if (!SLUG_REGEX.test(inpt)) {
-        return "Não use caracteres especiais";
-    }
-    return true;
-};
-
-// eslint-disable-next-line no-unused-vars
-module.exports = async function create(projectName, cmdObj) {
-    blindGuardian.verbose = cmdObj.verbose
-    try {
-        UserLocalCredential.checkForCredentials()
-    } catch (error) {
-        const errorMessage = cmdObj?.verbose ? error : error?.message
-        console.error("\n", errorMessage, "\n")
-        return
-    }
-
-    console.log(
-        "Vamos criar o seu Eitri-App. Carregando configurações..."
-    );
-
-    try {
-        const url = configService.get("workspace").url;
-        workspace.setServerUrl(url);
-        const clientApplication = await askClientApplication(cmdObj.application);
-        if (clientApplication.name === ITEM_DOUBT) {
-            open("https://docs.eitri.tech/")
-            handleStartServer(
-                cmdObj,
-                trackingService,
-                watcher,
-                workspace,
-                clientApplication.name
-            );
-            return;
-        }
-        const responseAskProjMetadata = await askProjMetadata(clientApplication, cmdObj, projectName);
-        TrackingEitriAnalytics.sendEvent({
-            eventName: "create",
-            userId: workspace?.userEmail,
-        });
-        console.log("Eitri-App criado com sucesso!")
-        return responseAskProjMetadata
-    } catch (e) {
-        TrackingEitriAnalytics.sendEvent({
-            eventName: "create.error",
-            userId: workspace?.userEmail,
-            data: {
-                errorMessage: e?.message,
-            }
-        });
-        console.error(e?.message);
-    }
-};
-
-async function askClientApplication(applicationName) {
-    const availableApplications = await eitriAppManager.findAllApplications();
-
-    console.log(
-        "\x1b[34m \nAgora, responda algumas perguntas:\n\x1b[0m"
-    );
-
-    if (availableApplications.length <= 0) {
-        console.log(
-            "Sua organização não contém nenhuma aplicação disponível para prosseguir com a criação."
-        );
-        process.exit(0);
-    }
-    if (applicationName) {
-        const clientApplication = availableApplications.find(application => application.name === applicationName)
-        if (clientApplication) {
-            return clientApplication
-        } else {
-            throw new Error(`Application not found by name ${applicationName}`)
-        }
-    }
-    const cliOptions = [
-        { name: ITEM_DOUBT, label: "Dúvidas? Veja documentação no browser" },
-        ...availableApplications,
-    ];
-    const createLabel = (tgt) => {
-        const orgLabel = tgt.organization?.name ? `(${tgt.organization?.name})`: ''
-        return `${tgt.label || tgt.name} ${orgLabel}`;
-    };
-
-    const res = await inquirer.prompt([
-        {
-            name: "accepted",
-            type: "rawlist",
-            message:
-                "Selecione o Aplicativo para o Eitri-App:",
-            choices: cliOptions.map(createLabel),
-            pageSize: 10,
-            loop: false,
-        },
-    ]);
-    const clientApplication = cliOptions.find(
-        (tgt) => createLabel(tgt) === res.accepted
-    );
-    clientApplication.onSelected && clientApplication.onSelected();
-    return clientApplication;
-}
-
-async function askProjMetadata(clientApplication, cmdObj, projectName) {
-    const factory = new WoodCoffee();
-    let questions = createQuestions(projectName);
-    try {
-        await workspace.init();
-    } catch (e) {
-        console.log(e.message);
-        return;
-    }
-    let answers;
-    if (cmdObj.yes) {
-        answers = {
-            name: projectName,
-            title: projectName,
-            slug: projectName,
-        };
-    } else {
-        answers = await inquirer.prompt(questions);
-    }
-    let conf = {
-        ...answers,
-        organization: { id: clientApplication.organizationId },
-    };
-    delete conf.organizationName;
-
-    let keepGoing = true;
-    while (keepGoing) {
-        try {
-            keepGoing = false;
-            await factory.verifyFolder(projectName, { supressLog: true });
-
-            // Comentado até implementarmos os múltiplos boilerplates nos targets do banco
-            //const {template} = cmdObj
-
-            const selectedTemplate = _getBoilerplateUrl(
-                clientApplication,
-                cmdObj
-            );
-            cmdObj.verbose &&
-                console.log(`Usando template ${selectedTemplate}`);
-
-            let templateProject = await factory.create(
-                projectName,
-                selectedTemplate,
-                clientApplication
-            );
-
-            // conf sera usado pra escrever o arquivo miniapp.conf.js e nao queremos 'target' la.
-            const eitriAppToCreate = {
-                ...conf,
-                organizationId: clientApplication.organization.id,
-                applicationId: clientApplication.id,
-            };
-
-            // Cria no banco no final das configs locais
-            const eitriApp = await eitriAppManager.create(eitriAppToCreate);
-            
-            conf["id"] = eitriApp.id;
-            conf["public-key"] = eitriApp.publicKey;
-
-            const templateEitriAppConf =
-                templateProject?.structure?.eitriAppConf;
-
-            const finalConf = {
-                    ...templateEitriAppConf,
-                    ...conf,
-                    organizationId: clientApplication.organization.id,
-                applicationId: clientApplication.id,
-                "type":"module",
-            };
-            
-            await factory.writeEitriAppConf(templateProject, finalConf);
-        } catch (err) {
-            if (cmdObj.verbose) {
-                console.error(
-                    "Houve uma falha durante a criação do Eitri-App",
-                    err
-                );
-            }
-
-            if (err.isDuplicatedError) {
-                if (cmdObj.yes) {
-                    process.exit(1);
-                }
-                if (err.field === "name") {
-                    keepGoing = true;
-                    conf.name = await askName(projectName);
-                }
-                if (err.field === "slug") {
-                    keepGoing = true;
-                    conf.slug = await askSlug(projectName);
-                }
-            } else {
-                if (err.isAxiosError) {
-                    console.log(err.response && err.response.status);
-                } else {
-                    console.log(err);
-                }
-                await trackingService.sendError(err);
-            }
-        }
-    }
-}
-
-function createQuestions(projectName) {
-    return [
-        {
-            type: "input",
-            name: "name",
-            message: "Digite um nome legível para seu Eitri-App",
-            validate: nameOrTitle,
-            default: () => {
-                return projectName;
-            },
-        },
-        {
-            type: "input",
-            name: "title",
-            message: "Digite um nome para divulgação",
-            validate: nameOrTitle,
-            default: () => {
-                return projectName;
-            },
-        },
-        {
-            type: "input",
-            name: "slug",
-            message:
-                "Digite um nome único para seu Eitri-App. Não pode conter espaços",
-            default: (currentAnswers) => {
-                return slugify(currentAnswers.name).toLowerCase();
-            },
-            validate: slug,
-        },
-    ];
-}
-
-async function askSlug(projectName) {
-    let answer = await inquirer.prompt([
-        {
-            type: "input",
-            name: "slug",
-            message: "Outro nome único para o Eitri-App:",
-            validate: slug,
-            default: () => {
-                return slugify(projectName).toLowerCase();
-            },
-        },
-    ]);
-    return answer.slug;
-}
-
-async function askName(projectName) {
-    let answer = await inquirer.prompt([
-        {
-            type: "input",
-            name: "name",
-            message: "Outro nome para o Eitri-App:",
-            validate: nameOrTitle,
-            default: () => {
-                return projectName;
-            },
-        },
-    ]);
-    return answer.name;
-}
-
-/**
- *
- * @param {Target} target
- * @param {*} cmdObj
- */
-function _getBoilerplateUrl(target, cmdObj) {
-    const { template } = cmdObj;
-    if (!template || !target.miniAppBoilerplateList) {
-        return target.boilerplateUrl;
-    }
-
-    const boilerplate = target.miniAppBoilerplateList.find(
-        (bp) => bp.name === template
-    );
-
-    if (!boilerplate) {
-        console.error(
-            `O template [${template}] não existe para a aplicação que você selecionou.`
-        );
-        return process.exit(0);
-    }
-
-    return boilerplate.boilerplateUrl;
-}