eitri-cli 1.5.1 → 1.6.0-beta.1

package/config/prod-eitri.js

@@ -43,10 +43,12 @@ const config = {
             v1Header: "application/vnd.workspace.api.v1+json",
             v2Header: "application/vnd.workspace.api.v2+json",
         },
-        colossus: {
-            url: `https://${HOST}/foundry/server`,
-
-            // pasta do miniapp dentro de src
+        hugin: {
+            url: `https://${API_EITRI_TECH_URL}/eitri-hugin-api`,
+            uploadZip: '/uploadAll',
+            uploadFile: '/uploadSingle',
+            
+            // pasta do eitriapp dentro de src
             watchUserDir: "/server",
         },
         credentials: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eitri-cli",
-  "version": "1.5.1",
+  "version": "1.6.0-beta.1",
   "description": "Command Line Interface to make \"Eitri-App\" with code and fire.",
   "main": "index.js",
   "bin": {
@@ -45,7 +45,7 @@
     "express-rate-limit": "^6.3.0",
     "figlet": "^1.2.4",
     "folder-hash": "^3.3.0",
-    "form-data": "^3.0.0",
+    "form-data": "^4.0.0",
     "inquirer": "^7.0.0",
     "jsonwebtoken": "^8.5.1",
     "lz-string": "^1.5.0",

package/src/cmd/clean.js

@@ -100,12 +100,6 @@ module.exports = async function clean(cmdObj) {
     }
 }
 
-function printAvailableWebhooks(webhooks) {
-    if(!webhooks || webhooks.length === 0) return
-    console.log('\nWebhooks do Eitri-App.')
-    console.table(webhooks)
-}
-
 async function track(miniConf, start) {
     let libs = await targetService.getLibs()
     let event = {

package/src/cmd/push-version.js

@@ -153,7 +153,8 @@ ${await targetService.getAppConfExampleSnippet()}
         const { target } = await workspace.checkVersions();
 
         console.log("\nPreparando os arquivos do seu Eitri-App...");
-        await workspace.uploadZip();
+        const isDevMode = false
+        await workspace.uploadZip(isDevMode);
         console.log(separator);
         console.log("Gerando versão do Eitri-App");
 
@@ -206,12 +207,6 @@ ${await targetService.getAppConfExampleSnippet()}
     }
 }
 
-function printAvailableWebhooks(webhooks) {
-    if(!webhooks || webhooks.length === 0) return
-    console.log('\nWebhooks do Eitri-App.')
-    console.table(webhooks)
-}
-
 async function track(miniConf, start) {
     // let libs = await targetService.getLibs()
     // let event = {

package/src/cmd/start.js

@@ -74,7 +74,8 @@ module.exports = async function start(args) {
         await miniLog.connect(userWorkspace.id, silentOnConnect)
 
         console.log("Construindo...");
-        await workspace.uploadZip(args);
+        const isDevMode = true
+        await workspace.uploadZip(isDevMode);
         console.log("Pronto!");
 
         const loadedTarget = await workspace.getTarget()

package/src/service/HuginService.js

@@ -0,0 +1,37 @@
+const BlindGuardian = require("./BlindGuardian");
+const Http = require("./Http");
+const configService = require("./ConfigService");
+const VegvisirService = require("../modules/vegvisir/VegvisirService");
+const FormData = require("form-data");
+const fs = require('fs')
+
+module.exports = class HuginService {
+  constructor() {
+    this.config = configService.get("workspace");
+    this.blindGuardian = new BlindGuardian();
+    this.http = new Http(this.blindGuardian);
+    this.vegvisirService = new VegvisirService()
+
+  }
+
+  async postServerless(data, eitriConf) {
+    const { filePath, relativePath, isDevMode } = data
+    const formData = new FormData();
+    const workspace = await this.vegvisirService.getWorkspace();
+    formData.append("file", fs.createReadStream(filePath));
+    formData.append("organizationId", eitriConf.organizationId);
+    formData.append("version", eitriConf.version);
+    formData.append("filepath", relativePath);
+    formData.append("isDevMode", String(isDevMode));
+    formData.append("eitriAppId", eitriConf.id);
+    formData.append("workspaceId", workspace.id);
+    let url = this.getServerlessUploadUrl(filePath);
+    await this.http.postForm(url, formData);
+  }
+
+  getServerlessUploadUrl(filePath) {
+    if (filePath.includes(".zip"))
+      return `${this.config.hugin.url}${this.config.hugin.uploadZip}`;
+    return `${this.config.hugin.url}${this.config.hugin.uploadFile}`;
+  }
+}

package/src/service/Workspace.js

@@ -1,4 +1,5 @@
 const fs = require("fs");
+const os = require('os')
 const path = require("path");
 const Http = require("./Http");
 const Base64 = require("base-64");
@@ -25,7 +26,9 @@ const cliProgress = require("cli-progress");
 const EitriAppManager = require("./EitriAppManager");
 const EitriAppService = require("./EitriAppService");
 const VegvisirService = require("../modules/vegvisir/VegvisirService");
+const HuginService = require("./HuginService");
 const vegvisirService = new VegvisirService()
+const huginService = new HuginService()
 
 class Workspace {
     
@@ -41,11 +44,10 @@ class Workspace {
         this.upsertQueue = [];
         this.requestNumber = 0;
         this.publishing = false;
-        if (!this.config.colossus) {
+        if (!this.config.hugin) {
             console.warn("Missing colossus config inside workspace.");
         }
         this.shareApi = configService.get("shareApi");
-        this.webhooks = [];
         this.targets = [];
 
         /**
@@ -69,14 +71,6 @@ class Workspace {
         this.targets = targets;
     }
 
-    getWebhooks() {
-        return this.webhooks;
-    }
-
-    setWebhooks(webhooks) {
-        this.webhooks = webhooks;
-    }
-
     setServerUrl(url) {
         this.serverUrl = url;
     }
@@ -522,30 +516,26 @@ class Workspace {
             requestNumber: this.requestNumber++,
         });
 
-        const isSaving = opts.why === WatcherOpts.SAVE;
+        const isDevMode = opts.why === WatcherOpts.SAVE;
 
         if (!this.uploading) {
-            await this.execUpsertSequencial(isSaving);
+            await this.execUpsertSequencial(isDevMode);
         }
 
         return holder.promise;
     }
 
-    async postFile(filePath, isSaving, opts) {
+    async postFile(filePath, isDevMode, opts) {
         const start = new Date().getTime();
         const relativePath = this.getRelativePath(filePath);
         const fileName = path.basename(filePath);
-        if (relativePath.startsWith(this.config.colossus.watchUserDir)) {
-            const allFiles = await this.listFilesInCorrectOrder();
-            const commomModulesPaths = allFiles.filter((f) =>
-                f.includes("src/commons")
-            );
-            await this.postLambda(
+        if (relativePath.startsWith(this.config.hugin.watchUserDir)) {
+            const data = {
                 filePath,
-                relativePath,
-                isSaving,
-                commomModulesPaths
-            );
+                relativePath: relativePath.replace(this.config.hugin.watchUserDir, ""),
+                isDevMode,
+            }
+            await huginService.postServerless(data, this.getMiniConf());
         } else {
             await this.postFormData(filePath, relativePath, opts);
         }
@@ -555,7 +545,7 @@ class Workspace {
             fileName,
         };
     }
-    async execUpsertSequencial(isSaving) {
+    async execUpsertSequencial(isDevMode) {
         this.uploading = true;
         for (let i = 0; i < this.upsertQueue.length; i++) {
             const { filePath, opts, holder, requestNumber } =
@@ -564,7 +554,7 @@ class Workspace {
             try {
                 const { relativePath, start } = await this.postFile(
                     filePath,
-                    isSaving,
+                    isDevMode,
                     opts
                 );
 
@@ -638,63 +628,6 @@ class Workspace {
         }
     }
 
-    async postLambda(
-        filePath,
-        relativePath,
-        isSaving,
-        commomModulesPaths = []
-    ) {
-        let commomModules = commomModulesPaths.map((commomFilePath) => {
-            let code = fs.readFileSync(commomFilePath, "utf8");
-
-            let name = path.basename(commomFilePath);
-
-            let compressionResult = this.compressCode(code);
-
-            return { name, ...compressionResult };
-        });
-
-        let code = fs.readFileSync(filePath, "utf8");
-
-        let compressionResult = this.compressCode(code);
-
-        let conf = this.getMiniConf();
-        const envCode = this.getEnvCode();
-        const fileName = path.basename(relativePath);
-        let data = {
-            slug: conf.slug,
-            envCode: envCode,
-            miniAppVersion: conf.version,
-            name: fileName,
-            code: compressionResult.code,
-            compressionType: compressionResult.compressionType,
-            publishing: this.publishing,
-            isSaving: isSaving,
-            restrictedLibs: conf["restricted-libs"],
-            webhooks: this.getCandidatedWebhook(fileName, conf),
-            commomModules,
-        };
-        let url = `${this.config.colossus.url}`;
-        const { data: responseData } = await this.http.post(url, data);
-
-        const { hookData } = responseData;
-        if (hookData) {
-            const _webhooks = [...this.webhooks, hookData];
-            this.setWebhooks(_webhooks);
-        }
-        return responseData;
-    }
-
-    getCandidatedWebhook(fileName, conf) {
-        const webhooks = conf["webhooks"];
-        if (!webhooks || webhooks.length === 0) return undefined;
-        const fileIsCandidatedToWebhook = webhooks.some(
-            (hook) => hook.fileName === fileName
-        );
-        const hook = [{ fileName }];
-        return fileIsCandidatedToWebhook ? hook : undefined;
-    }
-
     async isSynchronized() {
         const res = await Promise.all([
             this.hashFolder.calculate(),
@@ -746,7 +679,7 @@ class Workspace {
         }
     }
 
-    async uploadZip() {
+    async uploadZip(isDevMode) {
         const admZip = new AdmZip();
         await this.mkdirs([this.folder2watch, ...this.resourceFolders2watch]);
         await this.rmAllServerFiles();
@@ -754,28 +687,25 @@ class Workspace {
         const allFiles = await this.listFilesInCorrectOrder();
         const files = allFiles.filter((f) => !f.endsWith("folder.hash"));
         const folderHash = allFiles.filter((f) => f.endsWith("folder.hash"));
-        const commomModulesPaths = allFiles.filter((f) =>
-            f.includes("src/commons")
-        );
-
-        for (let i = 0; i < files.length; i++) {
-            const filePath = files[i];
-            const filename = path.basename(filePath);
-
-            if (this.hasAccent(filename))
-                throw new Error(
-                    `Arquivo com um ou mais caracteres inválidos ${filename}`
-                );
-
-            const relativePath = this.getRelativePath(filePath);
-            if (relativePath.startsWith(this.config.colossus.watchUserDir)) {
-                await this.postLambda(
-                    filePath,
-                    relativePath,
-                    false,
-                    commomModulesPaths
-                );
+        
+        const hasServerless = files.find(file => file.includes(this.config.hugin.watchUserDir))
+        if (hasServerless) {
+            const serverlessFolderPath = path.join(this.folder2watch, this.config.hugin.watchUserDir)
+
+            const serverlessZip = new AdmZip()
+            serverlessZip.addLocalFolder(serverlessFolderPath, undefined, (fileName) => fileName.includes('.'))
+            const now = Date.now()
+            const tempZip = path.join(os.tmpdir(), `eitri-serverless-${now}.zip`)
+            await serverlessZip.writeZipPromise(tempZip, {overwrite: true, perm: 777})
+
+            const data = {
+                filePath: tempZip,
+                // No upload do Zip é ignorado
+                relativePath: tempZip,
+                isDevMode,
             }
+            await huginService.postServerless(data, this.getMiniConf());
+
         }
 
         admZip.addFile(

package/test/service/Workspace.test.js

@@ -180,39 +180,6 @@ describe('Workspace', () => {
             )
         })
     })
-
-    describe('.postLambda()', () => {
-        const filePath = path.resolve(__dirname, '..', '_fixtures', 'src', 'server', 'foo.js')
-        const relativePath = '../_fixtures/src/server/foo.js'
-
-        beforeEach(() => {
-            nock.cleanAll()
-            workspace.setWebhooks([])
-        })
-        it('should on invoke postLambda set webhooks if return hookData', async () => {
-            const fakeHookData = {FunctionUrl: 'FakeUrl.com', fileName: 'fakeFileName'}
-            nock('https://dev.eitri.calindra.com.br', { allowUnmocked: true })
-                .post('/foundry/server', () => {
-                    return true
-                })
-                .reply(200, { ok: true, hookData: fakeHookData })
-            await workspace.postLambda(filePath, relativePath)
-            const webhooks = workspace.getWebhooks()
-            expect(webhooks).toContainEqual(fakeHookData)
-        })
-
-        it('should on invoke postLambda ignore set webhooks if no return', async () => {
-            nock('https://dev.eitri.calindra.com.br', { allowUnmocked: true })
-                .post('/foundry/server', () => {
-                    return true
-                })
-                .reply(200, { ok: true })
-            await workspace.postLambda(filePath, relativePath)
-            const webhooks = workspace.getWebhooks()
-            expect(webhooks).toEqual([])
-        })
-    })
-
     describe('.getTargetConfig() & .getAllTargetConfigs()', () => {
         const target = 'CALINDRA_MOBILE'
         const res = [