eitri-cli 1.12.0-beta.8 → 1.12.0

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

@@ -38,7 +38,7 @@ url = "https://prod.eitri.calindra.com.br/workspace/share"
 
 [mini_log]
 url = "https://prod.eitri.calindra.com.br/mini-log"
-path = "/socket.io"
+path = "/socket.io/"
 rooms = "/mini-log/rooms"
 
 [manager_api]

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

@@ -38,7 +38,7 @@ url = "https://prod.eitri.calindra.com.br/workspace/share"
 
 [mini_log]
 url = "https://prod.eitri.calindra.com.br/mini-log"
-path = "/socket.io"
+path = "/socket.io/"
 rooms = "/mini-log/rooms"
 
 [manager_api]

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

@@ -35,7 +35,7 @@ watch_user_dir = "/server"
 
 [mini_log]
 url = "https://prod.eitri.calindra.com.br/mini-log"
-path = "/socket.io"
+path = "/socket.io/"
 rooms = "/mini-log/rooms"
 
 

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

@@ -38,7 +38,7 @@ url = "https://prod.eitri.calindra.com.br/workspace/share"
 
 [mini_log]
 url = "https://prod.eitri.calindra.com.br/mini-log"
-path = "/socket.io"
+path = "/socket.io/"
 rooms = "/mini-log/rooms"
 
 [manager_api]

package/package.json

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

package/src/service/Http.js

@@ -11,6 +11,7 @@ const getWorkspace = require('../util/getWorkspace')
 const filePath = path.join(os.homedir(), './.eitri.cookie.json')
 const jar = new CookieJar(new FileCookieStore(filePath))
 const axios = require('axios').create({ withCredentials: true, jar })
+const debug = require('debug')('eitri:http')
 
 axiosCookieJarSupport(axios)
 
@@ -64,13 +65,18 @@ class Http {
     }
 
     async post(url, data, headers) {
-        if (!this.token) {
-            this.token = await this.tokenFactory.getToken()
-        }
-        const mergedHeaders = {
-            ...(await this._getHeader(url)), ...headers
+        try {
+            if (!this.token) {
+                this.token = await this.tokenFactory.getToken()
+            }
+            const mergedHeaders = {
+                ...(await this._getHeader(url)), ...headers
+            }
+            return await axios.post(url, data, { headers: mergedHeaders })
+        } catch(e) {
+            debug(`Error: url ${url}`)
+            throw e
         }
-        return await axios.post(url, data, { headers: mergedHeaders })
     }
 
     async postForm(url, formData) {

package/src/service/Workspace.js

@@ -25,14 +25,11 @@ const DEFAULT_ENV = "dev";
 const cliProgress = require("cli-progress");
 const EitriAppManager = require("./EitriAppManager");
 const EitriAppService = require("./EitriAppService");
-const VegvisirService = require("../modules/vegvisir/VegvisirService");
 const HuginService = require("./HuginService");
 const EitriAppType = require("../model/EitriAppType");
-const chalk = require("chalk");
 const LibsService = require("./LibsService");
 const { LogSuccess } = require("../util/LogUtil");
 const { extractSlug } = require("../util/LibUtil");
-const vegvisirService = new VegvisirService()
 const huginService = new HuginService()
 const YAML = require('yaml');
 const { readFile } = require("fs/promises");

package/docker/Dockerfile-BaseCLI

@@ -1,15 +0,0 @@
-FROM node:18-buster
-
-RUN apt-get update \
-    && apt-get install -y wget \
-    && wget -q https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
-    && apt-get install -y ./google-chrome-stable_current_amd64.deb \
-    && export PUPPETEER_EXECUTABLE_PATH='/usr/bin/google-chrome-stable' \
-    && apt-get install -y libssl-dev \
-    && apt-get install -y pkg-config \
-    && apt-get install -y git \
-    && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
-    && export PATH="/root/.cargo/bin:${PATH}" \
-    && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs
-
-ENTRYPOINT ["/bin/bash"]

package/docker/Dockerfile-macos

@@ -1,21 +0,0 @@
-FROM joseluisq/rust-linux-darwin-builder:1.76.0
-
-RUN apt-get update \
-    && apt-get install -y wget \
-    && wget -q https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
-    && apt-get install -y ./google-chrome-stable_current_amd64.deb \
-    && export PUPPETEER_EXECUTABLE_PATH='/usr/bin/google-chrome-stable' \
-    && apt-get install -y libssl-dev \
-    && apt-get install -y libudev-dev \
-    && apt-get install -y pkg-config \
-    && apt-get install -y git \
-    && apt-get install -y gcc-mingw-w64 \
-    && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
-    && export PATH="/root/.cargo/bin:${PATH}" \
-    && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs \
-    && rustup update
-
-ENV CC=o64-clang
-ENV CXX=o64-clang++
-
-ENTRYPOINT ["/bin/bash"]

package/docker/build.sh

@@ -1,11 +0,0 @@
-#/bin/bash
-
-# Build base image
-docker build -t eitri-base-cli-pipeline:latest -f Dockerfile-BaseCLI .
-docker tag eitri-base-cli-pipeline:latest 343482176926.dkr.ecr.us-east-1.amazonaws.com/eitri-base-cli-pipeline:latest      
-docker push 343482176926.dkr.ecr.us-east-1.amazonaws.com/eitri-base-cli-pipeline:latest                                                                                                                       ─╯
-
-# Build macos cross compile image
-docker build -t eitri-base-cli-pipeline:macos -f Dockerfile-macos .
-docker tag eitri-base-cli-pipeline:macos 343482176926.dkr.ecr.us-east-1.amazonaws.com/eitri-base-cli-pipeline:macos      
-docker push 343482176926.dkr.ecr.us-east-1.amazonaws.com/eitri-base-cli-pipeline:macos