biz-a-cli 2.3.9 → 2.3.10

package/bin/uploadApp.js

@@ -5,7 +5,7 @@ import axios from "axios";
 import { promises as fs } from "fs";
 import { runInNewContext, runInThisContext } from "vm";
 import uglify from "uglify-js";
-import tar from "tar";
+import * as tar from "tar";
 import {statSync, readFileSync} from 'fs';
 import { verify, sign, privateDecrypt, constants as cryptoConstants, randomBytes, createCipheriv } from 'node:crypto';
 import { basename } from "node:path"
@@ -159,7 +159,32 @@ const encryptIt = (data, encryptKey)=>{
     return Buffer.concat([initializeVector, cipher.update(data), cipher.final()]) // we put "iv" at beginning of cipherText, seperate it when doing decryption
 }
 
+const compressIt = async (fileName, folderPath)=>{
+    let compressSuccess = false
+    const maxRetry = 10
+    let retryCount = 0
+    do {
+        tar.c({file: fileName, cwd: folderPath, gzip: {level:9}, strict: true, sync: true}, await fs.readdir(folderPath))
+        compressSuccess = true
+        tar.t({file: fileName, cwd: folderPath, sync: true, onentry: (entry)=>{
+            if (entry.size==0) {
+                compressSuccess = false
+            }
+        }})
+        if (compressSuccess==false) {
+            await fs.unlink(fileName)
+            retryCount++
+        }
+    }
+    while ((compressSuccess==false) && (retryCount<=maxRetry))
+}
+
 const uploadTemplateApps = async () => {
+/*
+hex    => 2 char = 1 bytes     => can be encrypted
+base64 => 4 char = 3 bytes     => can be encrypted. Smaller size compare to Hex
+utf8   => 1 char = 1 - 4 bytes => can not be encrypted, encryption need precise bytes per Character. Smallest Size compare to Hex and base64
+*/
     process.chdir(options.workingDir)
     try {
         const bundlingStart = performance.now()
@@ -180,11 +205,6 @@ const uploadTemplateApps = async () => {
 // if (['finalib.js', 'solib.js'].indexOf(fileName)==-1) {continue}
                 const minifiedData = await getFileMinifiedData(fileName);
                 const encryptedData = encryptIt(minifiedData, keys.encryptKey)
-                /*
-                hex    => 2 char = 1 bytes     => can be encrypted
-                base64 => 4 char = 3 bytes     => can be encrypted. Smaller size compare to Hex
-                utf8   => 1 char = 1 - 4 bytes => can not be encrypted, encryption need precise bytes per Character. Smallest Size compare to Hex and base64
-                 */
                 if (fileName=='menu.json') {
                     keys.metadata['menu'] = encryptedData.toString('base64')
                 } else {
@@ -192,11 +212,8 @@ const uploadTemplateApps = async () => {
                 }
                 processedFile++
             }
-
-            // compressor
             const bundleFile = `${rootFolder}${bundleName}.tgz`
-            tar.c({file: bundleFile, cwd: bundleFolder, gzip: {level:9}, portable: true, sync: true}, await fs.readdir(bundleFolder))
-            await fs.rm(bundleFolder, {force: true, recursive: true})
+            await compressIt(bundleFile, bundleFolder)
             console.log(`Finished packing ${processedFile} files into "${bundleFile}" (${((performance.now()-bundlingStart)/1000).toFixed(2)}s)`)
 
             // send to FINAPI
@@ -221,8 +238,26 @@ const uploadTemplateApps = async () => {
     }
 }
 
-uploadTemplateApps()
+await uploadTemplateApps()
+
+/* const testCompressor = async ()=>{
+    const loopCount = 10000
+    let errorCount = 0
+    for(var i=1; i<=loopCount;i++){
+        console.log(i);
+        await uploadTemplateApps()
+        tar.t({file:'upload/spos.tgz', onentry: (entry)=>{
+            if (entry.size==0) {
+                console.log(`${i} : Empty file found...`, entry.type, entry.path, entry.size)
+                errorCount++
+            }
+        }})
+    }
+    console.log(`${errorCount} error of ${loopCount}`)
+}
+
+testCompressor() */
 
-// uploadApp -s https://finaapi.imamatek.com:1205 -i 2 -d "C:\agung\source\biza templates\imamatek"
+// uploadApp -s https://finaapi.imamatek.com -p 1205 -i 2 -d "C:\agung\source\biza templates\imamatek"
 // ..\cli\bin\uploadApp.js -s https://finaapi.imamatek.com:1205 -i 2 -d "C:\agung\source\biza templates\imamatek"
 // uploadApp -s https://finaapi.imamatek.com:1205 -i 2 -d ".\imamatek"

package/envs/env.dev.js

@@ -6,6 +6,6 @@ export const envDev = {
     encodeURIComponent('imm@2019') + '@imm-cdm-dev.rf6wr.mongodb.net/?retryWrites=true&w=majority',
   COMPANY_REGISTER: 'companyregister-dev',
   // BIZA_SERVER_LINK: 'https://biz-a-dev-41e7c93a25e5.herokuapp.com'
-  BIZA_SERVER_LINK: 'https://www.ptimf.id/biz-a-dev.com'
+  BIZA_SERVER_LINK: 'http://localhost:3000'
   // BIZA_SERVER_LINK: 'http://localhost:3000'
 };

package/envs/env.js

@@ -5,5 +5,6 @@ export const env = {
   CDM_MONGO_LINK: 'mongodb+srv://imm_cdm:' +
     encodeURIComponent('imm@2019') + '@imm-cdm.ohcqt.mongodb.net/?retryWrites=true&w=majority',
   COMPANY_REGISTER: 'companyregister',
-  BIZA_SERVER_LINK: 'https://biz-a.herokuapp.com'
+  // BIZA_SERVER_LINK: 'https://biz-a.herokuapp.com'
+  BIZA_SERVER_LINK: 'http://localhost:3000'
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "biz-a-cli",
   "nameDev": "biz-a-cli-dev",
-  "version": "2.3.9",
+  "version": "2.3.10",
   "versionDev": "0.0.27",
   "description": "",
   "main": "bin/index.js",
@@ -38,7 +38,7 @@
     "socket.io-client": "^4.7.5",
     "socket.io-stream": "^0.9.1",
     "web-push": "^3.6.7",
-    "tar": "^6.2.0",
+    "tar": "^7.1.0",
     "uglify-js": "^3.17.4",
     "yargs": "^17.7.2"
   },