eitri-cli 1.1.3 → 1.1.5-alpha.1

package/.releaserc.json

@@ -0,0 +1,35 @@
+{
+    "branches": [
+        "master",
+        {
+            "name": "beta",
+            "prerelease": true
+        },
+        {
+            "name": "alpha",
+            "prerelease": true
+        }
+    ],
+    "plugins": [
+        "@semantic-release/commit-analyzer",
+        "@semantic-release/release-notes-generator",
+        "@semantic-release/npm",
+        "@semantic-release/git",
+        [
+            "@semantic-release/changelog",
+            {
+                "changelogFile": "CHANGELOG.md"
+            }
+        ],
+        [
+            "@semantic-release/git",
+            {
+                "assets": [
+                    "CHANGELOG.md",
+                    "package.json"
+                ],
+                "message": "chore(release): ${nextRelease.version}\n\n${nextRelease.notes}"
+            }
+        ]
+    ]
+}

package/CHANGELOG.md

@@ -0,0 +1,10 @@
+## [1.1.5-alpha.1](http://bitbucket.org/smartsolutionteam/eitri-cli/compare/v1.1.4...v1.1.5-alpha.1) (2023-10-04)
+
+
+### Bug Fixes
+
+* Adicionado release/npm ao .releaserc ([15a7e7d](http://bitbucket.org/smartsolutionteam/eitri-cli/commits/15a7e7d2e0648d10cf3c6f409a81ef3fc00dd383))
+* Alterada ordem de escrita ([eafbec7](http://bitbucket.org/smartsolutionteam/eitri-cli/commits/eafbec783aa5bc6f8fdb20ff35d2a343b411f2db))
+* alterado log ([0ec103a](http://bitbucket.org/smartsolutionteam/eitri-cli/commits/0ec103a44311bfae3044d0816ec4d9cae07a78e9))
+* Log da versão do process.env ([716b4f6](http://bitbucket.org/smartsolutionteam/eitri-cli/commits/716b4f6f41238f0a69f6ac587e8d5171c4051dcf))
+* teste de log de versão em novo step ([27f715d](http://bitbucket.org/smartsolutionteam/eitri-cli/commits/27f715d2709484b4c33627413f2974bfa433e2d0))

package/bitbucket-pipelines.yml

@@ -1,15 +1,17 @@
-image: node:14
+image: node:18
 pipelines:
-  default:
-    - step: &npmPublish
-        name: Publicação no NPM
-        caches:
-          - node
-        script:
-          - yarn
-          - echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc
-          - node publisher.js
-
   branches:
-    master:
-      - step: *npmPublish
+    '{alpha,beta,master}':
+      - step:
+          name: "Generation of a new version: alpha, beta, or stable."
+          caches:
+            - node
+          script:
+            - echo 'Start release'
+            - echo 'If there is a new version, it will be automatically published on NPM according to the channel/branch (alpha, beta or master (stable)).'
+            - yarn
+            - yarn run release
+            - RELEASE_VERSION=$(git describe --tags --abbrev=0 | sed 's/^v//')
+            - node -e "const fs = require('fs'); const packageJson = JSON.parse(fs.readFileSync('package.json')); packageJson.version = process.env.RELEASE_VERSION; fs.writeFileSync('package.json', JSON.stringify(packageJson, null, 4));"
+            - echo 'New release'
+            - echo $RELEASE_VERSION

package/check-version.js

@@ -1,12 +1,13 @@
 const semver = require('semver')
 const packageJson = require('./package')
 
-var minVersion = packageJson.engines.node
+const minVersion = packageJson.engines.node
 
 const systemVersion = semver.clean(process.version)
 
 if (!semver.satisfies(systemVersion, minVersion)){
-    console.error('Versão não suportada do node', systemVersion)
-    console.error('Por favor, considere atualizar', minVersion)
+    console.error(' O Eitri-CLI requer uma versão mais recente do Node.js')
+    console.error(' Por favor, atualize o Node.js para a versão mínima necessária: ', minVersion)
+    console.error(' Versão atual em seu dispositivo: ', systemVersion)
     process.exit(1)
 }

package/config/prod-eitri.js

@@ -2,7 +2,7 @@
 const HOST = "prod.eitri.calindra.com.br";
 const packageJson = require("../package.json");
 const path = require("path");
-const HOST_MINIAPPS = "prod.eitri.calindra.com.br";
+const FOUNDRY_CONTEXT_PATH = process.env.FOUNDRY_CONTEXT_PATH ?? 'foundry'
 
 const config = {
     userAgent: packageJson.name,
@@ -15,17 +15,17 @@ const config = {
             .replace(".js", ".")}conf.js`,
     },
     doc: {
-        createUrl: `https://admin.${HOST_MINIAPPS}/docs`,
+        createUrl: `https://admin.${HOST}/docs`,
     },
     blindGuardian: {
-        url: `https://${HOST_MINIAPPS}/blind-guardian-api`,
+        url: `https://${HOST}/blind-guardian-api`,
     },
     shareApi: {
-        url: `https://${HOST_MINIAPPS}/share-api/share`,
+        url: `https://${HOST}/share-api/share`,
     },
     workspace: {
         url: `https://${HOST}`,
-        basePath: "foundry",
+        basePath: FOUNDRY_CONTEXT_PATH,
         targetPath: "/foundry/targets",
         target: {
             knownTargets: [
@@ -42,8 +42,6 @@ const config = {
             v2Header: "application/vnd.workspace.api.v2+json",
         },
         colossus: {
-            // url: 'https://colossus.lab.calindra.com.br/colossus-api/v1',
-            // url: 'https://a32bcb528a6a.ngrok.io/colossus-api/v1',
             url: `https://${HOST}/workspace/server`,
 
             // pasta do miniapp dentro de src
@@ -62,11 +60,11 @@ const config = {
         url: "https://prod.eitri.calindra.com.br/workspace/share",
     },
     miniLog: {
-        url: `https://${HOST_MINIAPPS}/mini-log/rooms`,
+        url: `https://${HOST}/mini-log/rooms`,
         path: "/mini-log/socket.io",
     },
     managerApi: {
-        url: `https://${HOST_MINIAPPS}/miniapp-manager-api`,
+        url: `https://${HOST}/miniapp-manager-api`,
         invites: {
             send: "/p/invites",
             slug: "/p/invites/s/:slug",
@@ -79,10 +77,10 @@ const config = {
         },
     },
     eitriManager: {
-        url: `https://${HOST_MINIAPPS}/eitri-manager-api`,
+        url: `https://${HOST}/eitri-manager-api`,
     },
     workspaceManager: {
-        url: `https://${HOST_MINIAPPS}`,
+        url: `https://${HOST}`,
         path: "/workspace-manager/socket.io",
         contextPath: "/workspace-manager",
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eitri-cli",
-  "version": "1.1.3",
+  "version": "1.1.5-alpha.1",
   "description": "Command Line Interface to make \"eitri app\" with code and fire.",
   "main": "index.js",
   "bin": {
@@ -10,10 +10,12 @@
     "test-eitri": "NODE_APP_INSTANCE=eitri jest --detectOpenHandles",
     "linter": "./node_modules/.bin/eslint --fix ./src/**/*.js",
     "docsify:run": "cd docsify && docsify serve",
-    "build": "echo \"no build\""
+    "build": "echo \"no build\"",
+    "release": "semantic-release",
+    "release:dry": "semantic-release --dry-run"
   },
   "engines": {
-    "node": ">=10.0.0",
+    "node": ">=16.0.0",
     "npm": ">=3.0.0"
   },
   "keywords": [],
@@ -68,7 +70,10 @@
     "husky": "^3.1.0",
     "jest": "^24.9.0",
     "lint-staged": "^9.5.0",
-    "nock": "^13.3.0"
+    "nock": "^13.3.0",
+    "semantic-release": "^22.0.5",
+    "@semantic-release/changelog": "^6.0.3",
+    "@semantic-release/git": "^10.0.1"
   },
   "resolutions": {
     "lodash": "4.17.21",

package/publisher.js

@@ -1,48 +1,54 @@
 const fs = require('fs');
 const path = require('path');
-const { execSync, exec } = require('child_process');
+const {execSync, exec} = require('child_process');
 
 publishAsNeeded();
 
 function publishAsNeeded() {
     fs.readFile(path.join(__dirname, 'package.json'), 'utf8', (err, data) => {
+
         if (err) {
             console.error('Error:', err);
             return;
         }
-        let packageJson = JSON.parse(data);
-        let localVersion = packageJson.version;
-        let publishedVersions = JSON.parse(execSync('npm show ' + packageJson.name + ' versions --json').toString());
-        if (publishedVersions.includes(localVersion)) {
-            console.log('published version is the same of package.json:', localVersion);
-            return;
-        }
 
-        console.log('publishing new version', localVersion, '...');
+        const _BRANCHS = {
+            MASTER: "master",
+            BETA: "beta",
+        }
 
         const branch = process.env.BITBUCKET_BRANCH
-        console.log('current branch on build', branch);
+        console.log('Current branch on build: ', branch);
 
-        //apenas beta e alpha pode ser publicado fora da master
-        if("master" !== branch && !(/beta|alpha/.test(localVersion))){
-            console.log('main channel out of master branch SKIPPED...');
+        const allowedBranchs = [_BRANCHS.MASTER, _BRANCHS.BETA]
+        if(!allowedBranchs?.includes(branch)){
+            console.log(`${branch} is different from ${JSON.stringify(allowedBranchs)}. Skipping...`);
             return;
         }
 
-        let commandSuffix = "";
+        const packageJson = JSON.parse(data);
+        const localVersion = packageJson.version;
+        
+        if (branch === _BRANCHS.BETA && !(/beta/.test(localVersion))) {
+            console.log(`${localVersion} version does not contain the "beta" suffix in the version name. Skipping...`);
+            return;
+        }
 
-        if(/beta/.test(localVersion)) {
-            commandSuffix = "--tag beta";
-        } else if(/alpha/.test(localVersion)) {
-            commandSuffix = "--tag alpha";
+        const publishedVersions = JSON.parse(execSync('npm show ' + packageJson.name + ' versions --json').toString());
+        if (publishedVersions.includes(localVersion)) {
+            console.log('There is a published version identical to the one in package.json: ', localVersion);
+            return;
         }
 
+        console.log('Previously unpublished version. Allowed version name for publishing: ', localVersion);
+
+        const commandSuffix = branch === _BRANCHS.BETA ? "--tag beta" : "";
+
         exec('npm run build && npm publish ' + commandSuffix, (err, stdout, stderr) => {
             if (err) {
                 // node couldn't execute the command
                 console.log('Error:', err);
                 process.exit(2);
-                return;
             }
 
             // the *entire* stdout and stderr (buffered)

package/src/cmd/version.js

@@ -1,6 +1,6 @@
 const path = require('path')
 const { execSync } = require('child_process')
-
+const semver = require('semver')
 
 /**
  * Loga a versao de um pacote npm
@@ -8,7 +8,7 @@ const { execSync } = require('child_process')
 function version() {
     let packageJson = require(path.resolve(__dirname, '..', '..', 'package.json'))
     let publishedVersion = getVersion(packageJson.name)
-    if (packageJson.version !== publishedVersion) {
+    if (semver.lt(packageJson.version, publishedVersion)) {
         console.log(packageJson.version)
         console.log(
             `\n> Você está usando a versão ${packageJson.version}, temos uma nova versão: ${publishedVersion}!`

package/src/service/CliLogin.js

@@ -27,8 +27,6 @@ class CliLogin {
             process.exit(1)
         }
 
-        console.log("\n", "Eis que a jornada tem início...")
-
         await new UserLocalCredential().asyncSaveContent({devUser, devKey})
         TrackingEitriAnalytics.sendEvent({
             command: "login",
@@ -38,7 +36,7 @@ class CliLogin {
                 devUser
             }
         })
-        console.log("\n", `✔  Triunfo! O acesso foi concedido! Você está logado como ${email}.`)
+        console.log("\n", `✔  Credencial gerada! Você está logado como ${email}.`)
         process.exit(0)
     }
 

package/src/service/Http.js

@@ -50,7 +50,7 @@ class Http {
 
     getCookieSession(url) {
         return new Promise((resolve, reject) => {
-            jar.getCookies(url, function (err, cookies) {
+            jar.getCookies(url, { allPaths: true }, function (err, cookies) {
                 if (err) return reject(err)
                 resolve(cookies.find((cookie) => cookie))
             })

package/src/service/QRCodeFactory.js

@@ -1,15 +1,29 @@
 const tmp = require('tmp')
 const qrcode = require('qrcode')
+const GenericUtils = require('../util/GenericUtils')
+const qrcodeTerminal = require('qrcode-terminal')
+const open = require('open')
 
 // Fabrica de QR code :-)
 class QRCodeFactory {
-    async create(data) {
+
+    generate(args) {
+        if (args?.qrPrinter) {
+            console.log(`Abrindo QR-Code no ${args?.qrPrinter}`)
+            open(args?.qrCodePath, {app: args?.qrPrinter})
+            return
+        }
+
+        qrcodeTerminal.generate(args?.fullUrl ?? "", {small: true})
+    }
+
+    async create(data, eitriAppSlug = "") {
         console.log('==================================================')
         console.log('Utilize o QR-Code para iniciar o seu eitri-app')
         console.log('É importante utilizar o leitor de QR-Code do')
         console.log('aplicativo à qual destina-se o seu eitri-app')
         console.log('==================================================')
-        let qrCodeTempPath = await this.tempFile()
+        const qrCodeTempPath = await this.tempFile(eitriAppSlug)
         await this.createQRCodeImage(qrCodeTempPath, data)
         return qrCodeTempPath
     }
@@ -25,10 +39,12 @@ class QRCodeFactory {
         })
     }
 
-    tempFile() {
+    tempFile(eitriAppSlug = "") {
         return new Promise((resolve, reject) => {
+            const currentDateTime = GenericUtils.formatQrCodeCurrentDateTime()
+            const qrCodeName = `[eitri] ${eitriAppSlug} ${currentDateTime}.png`
             tmp.file(
-                { prefix: 'eitri-qrcode-', postfix: '.png', keep: true },
+                { name: qrCodeName, keep: true },
                 function (err, tempPath) {
                     if (err) {
                         return reject(err)

package/src/service/factories/QRCodeStarterFactory.js

@@ -1,8 +1,4 @@
 const QRCodeFactory = require('../QRCodeFactory')
-const TrackService = require('../TrackService')
-const Server  = require('../Server')
-const qrcodeTerminal = require('qrcode-terminal')
-const TERMINAL_PRINTER_NAME = 'terminal'
 
 function QRCodeStarter(args, trackingService, watcher, workspace, targetConfig ) {
     this.args = args
@@ -23,22 +19,8 @@ function QRCodeStarter(args, trackingService, watcher, workspace, targetConfig )
         if (this.args.verbose) {
             console.log(`QrCodeUrl: ${fullUrl}`)
         }
-        const qrCodePath = await new QRCodeFactory().create(fullUrl)
-
-        if (this.args.verbose) {
-            console.log(`QrCode Path: ${qrCodePath}`)
-        }
-
-        if(process.env.AAT_QRCODE_PRINTER === TERMINAL_PRINTER_NAME || this.args.qrPrinter === TERMINAL_PRINTER_NAME) {
-            qrcodeTerminal.generate(fullUrl, {small: true})
-        }
-
-        const libsInfoForGA = this.args.libsInfoForGA
 
         this.watcher.start()
-        let miniConf = this.workspace.getMiniConf()
-        TrackService.track(miniConf, this.trackingService, libsInfoForGA)
-        // tryToOpenAndroidEmulator(fullUrl, this.args)
         if(this.args.showDeeplink){
             console.log('######################################')
             console.log('########### Deep Link URL ############')
@@ -46,7 +28,17 @@ function QRCodeStarter(args, trackingService, watcher, workspace, targetConfig )
             console.log(`${fullUrl}`)
             console.log('######################################')
         }
-        Server.startServer({ ...this.args, qrCodePath})
+
+        const _QRCodeFactory = new QRCodeFactory()
+
+        const eitriAppSlug = this.workspace?._miniConf?.slug ?? ""
+        const qrCodePath = await _QRCodeFactory.create(fullUrl, eitriAppSlug)
+
+        if (this.args.verbose) {
+            console.log(`QrCode Path: ${qrCodePath}`)
+        }
+
+        _QRCodeFactory.generate({...this.args, qrCodePath, fullUrl})
     }
 }
 

package/src/util/GenericUtils.js

@@ -0,0 +1,19 @@
+class GenericUtils {
+
+    static formatQrCodeCurrentDateTime = () => {
+        const now = new Date();
+
+        const year = now.getFullYear();
+        const month = String(now.getMonth() + 1).padStart(2, '0'); // Mês começa em 0, então adicionamos 1 e formatamos com zero à esquerda, se necessário.
+        const day = String(now.getDate()).padStart(2, '0');
+        const hours = String(now.getHours()).padStart(2, '0');
+        const minutes = String(now.getMinutes()).padStart(2, '0');
+        const seconds = String(now.getSeconds()).padStart(2, '0');
+
+        const formattedDateTime = `${hours}:${minutes}:${seconds} ${day}-${month}-${year}`;
+        return formattedDateTime;
+    }
+
+}
+
+module.exports = GenericUtils