biz-a-cli 2.3.8 → 2.3.10

package/bin/deleteApp.js

@@ -0,0 +1,67 @@
+#!/usr/bin/env node
+
+import yargs from "yargs";
+import axios from "axios";
+
+const options = yargs(process.argv.slice(2))
+    .option("s", {
+        alias: "server",
+        describe: "Server URL (ex: https://biz-a.herokuapp.com or http://192.168.1.1 or https://finaapi.imamatek.com)",
+        type: "string",
+        demandOption: true
+    })
+    .option("i", {
+        alias: "dbindex",
+        describe: "database index",
+        type: "number",
+        demandOption: true
+    })
+    .option("n", {
+        alias: "appName",
+        describe: "Application name",
+        type: "string",
+        demandOption: true,
+        default: ""
+    })
+    .option("sub", {
+        alias: "subdomain",
+        describe: "Subdomain",
+        type: "string",
+        demandOption: false
+    })
+    .option("p", {
+        alias: "apiPort",
+        describe: "FINA API Port",
+        type: "string",
+        demandOption: false,
+        default : "212"
+    })
+    .argv;
+
+
+
+const deleteApp = async () => {
+    try {
+        const baseUrl = 'fina/rest/TOrmMethod/%22deleteApp%22'
+        const url = options.sub ?
+            `${options.server}/hub/${baseUrl}?subdomain=${options.sub}` :
+            `${options.server}:${options.apiPort}/${baseUrl}`
+        const headers = {'Content-Type': 'text/plain'}
+        const deleteApps = options.appName.trim().replace(' ', '').toLowerCase()
+        const param = { _parameters: [options.dbindex, deleteApps] }
+        const res = await axios.post(url, param, { headers: headers });
+        if (res.data.success) {
+            console.log(`${deleteApps=='' ? 'All' : deleteApps} apps removed`)
+        } else {
+            console.error(res.data.error)
+        }
+    } catch (e) {
+        console.error(e.response?.data ? e.response.data : e)
+    }
+}
+
+deleteApp()
+
+// delete all apps ==>> deleteApp -s https://finaapi.imamatek.com:1205 -i 2
+// delete specific apps ==>> deleteApp -s https://finaapi.imamatek.com:1205 -i 2 -n "imamatek"
+// delete multiple apps ==>> deleteApp -s https://finaapi.imamatek.com:1205 -i 2 -n "imamatek, spos"

package/bin/hub.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 import yargs from 'yargs';
 import { io as ioc } from "socket.io-client";
@@ -77,6 +77,7 @@ app.use(express.json());
 
 app.set('args', argv);
 
+
 app.use('/cb', runCliScript);
 
 app.listen((argv.serverport || port), () => {
@@ -85,4 +86,8 @@ app.listen((argv.serverport || port), () => {
 //
 
 let socket = ioc(argv['server']);
-hubEvent(socket, argv);
+hubEvent(socket, argv);
+
+app.set('socket', socket)
+
+export { app }

package/bin/hubEvent.js

@@ -8,7 +8,7 @@ const IDLE_SOCKET_TIMEOUT_MILLISECONDS = 1000 * 30;
 
 // export default (argv) => {
 export default async (socket, argv) => new Promise((resolve, reject) => {
-    socket.on('connect', () => {
+    const connectCb = () => {
         console.log(new Date() + ': connected to socket server');
         console.log(new Date() + ': requesting subdomain ' + argv['subdomain'] + ' via ' + argv['server']);
 
@@ -30,9 +30,8 @@ export default async (socket, argv) => new Promise((resolve, reject) => {
                 resolve(url);
             }
         });
-    });
-
-    socket.on('incomingClient', (clientId) => {
+    }
+    const incomingHubCb = (clientId) => {
         console.log(clientId, 'incoming clientId')
         let client = net.connect(argv['port'], argv['hostname']);
 
@@ -58,9 +57,8 @@ export default async (socket, argv) => new Promise((resolve, reject) => {
             ss(socket).emit(clientId, s);
             s.end();
         });
-    })
-
-    socket.on('cli-req', (data, callback) => {
+    }
+    const cliReqCb = (data, callback) => {
         const { path, method, ...remainData } = data;
 
         Axios.request({
@@ -68,5 +66,8 @@ export default async (socket, argv) => new Promise((resolve, reject) => {
             url: `${process.env.HOST || 'http://localhost'}:${argv.serverport}/cb${path || ''}`,
             data: remainData
         }).subscribe(result => callback(result.data));
-    });
+    }
+    socket.on('connect', connectCb);
+    socket.on('incomingClient', incomingHubCb)
+    socket.on('cli-req', cliReqCb );
 })

package/bin/index.js

@@ -8,7 +8,7 @@ import { runInThisContext } from "vm";
 const options = yargs(process.argv.slice(2))
     .option("s", {
         alias: "server",
-        describe: "Server URL",
+        describe: "Server URL (ex: https://biz-a.herokuapp.com or http://192.168.1.1 or https://finaapi.imamatek.com)",
         type: "string",
         demandOption: true
     })
@@ -30,13 +30,21 @@ const options = yargs(process.argv.slice(2))
         type: "string",
         demandOption: false
     })
+    .option("p", {
+        alias: "apiPort",
+        describe: "FINA API Port",
+        type: "string",
+        demandOption: false,
+        default : "212"
+    })
     .argv;
 
 const sendFile = async (filename, data) => {
     const baseUrl = 'fina/rest/TOrmMethod/%22setTemplate%22'
     const url = options.sub ?
         `${options.server}/hub/${baseUrl}?subdomain=${options.sub}` :
-        `http://${options.server}:212/${baseUrl}`
+        // `http://${options.server}:212/${baseUrl}`
+        `${options.server}:${options.apiPort}/${baseUrl}`
 
     const headers = {
         'Content-Type': 'text/plain'
@@ -51,6 +59,8 @@ function getParam(funcName) {
 }
 
 function replacer(key, value) {
+    // note : cannot handle inline function such as :
+    // onClick: $event=>this.router.navigate(['../list', 'listspk'])
     if (typeof value == 'function') {
         let arr = value.toString().replace(/(\r\n|\n|\r)/gm, "°").split("°");
         if (arr.length < 3) throw 'Function must be minimal 3 lines';
@@ -76,7 +86,8 @@ const readTemplateFile = async (filename) => {
         } catch (error) {
             const fn = `file://${process.cwd()}\\${filename}`;
             const lib = await import(fn);
-            result = JSON.stringify(lib.default(), replacer);
+            // result = JSON.stringify(lib.default(), replacer);
+            result = JSON.stringify((typeof lib.default=='function') ? lib.default() : lib.default, replacer);
         }
 
         return Buffer.from(result).toString('hex');
@@ -88,8 +99,10 @@ const readTemplateFile = async (filename) => {
 }
 
 const loopFiles = async (dir) => {
+    const uploadStart = performance.now()
     try {
         const files = await fs.readdir(dir);
+        let processedFile = 0
         for (const file of files) {
             //const p = path.join(dir, file);
             if (file == 'package.json' || file == 'package-lock.json') continue;
@@ -101,11 +114,13 @@ const loopFiles = async (dir) => {
                 const res = await sendFile(file, data.toString('hex'));
                 if (res.data.success) {
                     console.log(`file: ${file} uploaded`);
+                    processedFile++
                 } else {
                     console.error(res.data.error);
                 }
             }
         }
+        console.log(`Finished uploading ${processedFile} files (${((performance.now()-uploadStart)/1000).toFixed(2)}s)`)
     } catch (e) {
         // console.error(e.response && e.response.data ? e.response.data : e);
         console.error(e.response?.data ? e.response.data : e);
@@ -113,3 +128,7 @@ const loopFiles = async (dir) => {
 }
 
 loopFiles('./');
+
+// ex :
+// uploadbiza -s https:\\finaapi.imamatek.com:1205 -i 2
+// ..cli/bin/index.js -s https:\\finaapi.imamatek.com:1205 -i 2

package/bin/uploadApp.js

@@ -0,0 +1,263 @@
+#!/usr/bin/env node
+
+import yargs from "yargs";
+import axios from "axios";
+import { promises as fs } from "fs";
+import { runInNewContext, runInThisContext } from "vm";
+import uglify from "uglify-js";
+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"
+import { env } from '../envs/env.js';
+import { stringify } from "querystring";
+
+const keyFolderPath = process.argv[1].substring(0, process.argv[1].lastIndexOf("\\bin")) + "\\key"
+
+const options = yargs(process.argv.slice(2))
+    .option("s", {
+        alias: "server",
+        describe: "Server URL (ex: https://biz-a.herokuapp.com or http://192.168.1.1 or https://finaapi.imamatek.com)",
+        type: "string",
+        demandOption: true
+    })
+    .option("i", {
+        alias: "dbindex",
+        describe: "database index",
+        type: "number",
+        demandOption: true
+    })
+    .option("d", {
+        alias: "workingDir",
+        describe: "Path to templates directory",
+        type: "string",
+        demandOption: false,
+        default: process.cwd(),
+    })
+    .option("sub", {
+        alias: "subdomain",
+        describe: "Subdomain",
+        type: "string",
+        demandOption: false
+    })
+    .option("v", {
+        alias: "verbose",
+        describe: "Print info to console",
+        type: "boolean",
+        demandOption: false,
+        default: false,
+    })
+    .option("p", {
+        alias: "apiPort",
+        describe: "FINA API Port",
+        type: "string",
+        demandOption: false,
+        default : "212"
+    })
+    .argv;
+
+function printInfo(msg){if (options.verbose) {console.log(msg)}}
+
+function replacer(key, value) {
+/*
+    // with line break
+    if (typeof value == 'function') {
+        let arr = value.toString().replace(/(\r\n|\n|\r)/gm, "°").split("°");
+        if (arr.length < 3) throw 'Function must be minimal 3 lines';
+        return [
+            'window.Function',
+            getParam(arr[0]),
+            arr.slice(1, arr.length - 1)
+        ];
+    } else {
+        return value;
+    }
+*/
+
+    // without line break
+    if (typeof value == 'function') {
+        const fnScript = value.toString()
+        let params, body = ''
+        if (fnScript.indexOf('{')==-1) {
+            const arr = fnScript.split('=>')
+            params = arr[0]
+            body = arr.slice(1).join()
+        } else {
+            params = fnScript.split('{')[0]
+            body = fnScript.substring(fnScript.indexOf('{')+1,  fnScript.lastIndexOf('}'))
+        }
+        params = params.replace(/(\s|=>|\(|\)|function)/gim, '')
+        printInfo(['window.Function', params, body])
+        return ['window.Function', params, body]
+    } else {
+        return value;
+    }
+}
+
+const getFileMinifiedData = async (fileName) => {
+    const dataFile = await fs.readFile(fileName);
+    printInfo(`===================\n${fileName.toUpperCase()}\n===================`)
+
+    let jsMinData = uglify.minify(dataFile.toString(), {compress: false, mangle: false}).code
+    jsMinData = jsMinData.replace('module.exports=get;', '') // Ex : at "executeBlockLib.js" of Imamatek App, will throw error. We need this line code for testing or debugging
+    const minifiedBuffer = Buffer.from(jsMinData)
+
+    printInfo(['Minify : \n', minifiedBuffer.toString()].join(''))
+    let stringifyData = ''
+    try {
+        printInfo('Running script with VM')
+        // const vmResult = runInThisContext(minifiedBuffer.toString())
+        const vmResult = runInNewContext(minifiedBuffer.toString()) // to handle if "let" function not using global scope
+        if (!vmResult) {
+            throw new Error('Undefined VM result')
+        }
+        printInfo('Array function :')
+        stringifyData = JSON.stringify((typeof vmResult=='function') ? vmResult() : vmResult, replacer)
+        printInfo(['Stringify : \n', stringifyData].join(''))
+    } catch (error) {
+        printInfo(error) // Do not log it as error
+        try {
+            printInfo('Running script with Import function')
+            const fn = `file://${process.cwd()}\\${fileName}`
+            const lib = await import(fn)
+            printInfo('Array function :')
+            stringifyData = JSON.stringify((typeof lib.default=='function') ? lib.default() : lib.default, replacer)
+            stringifyData = stringifyData.replace(/  /g,'') // remove trailing whitespace
+            // stringifyData = stringifyData.replace(/\\r\\n/g,'') // remove line break. We don't do this because "inline css" still requires line breaks
+// console.log('RESULT =>', stringifyData)
+            printInfo(['Stringify : \n', stringifyData].join(''))
+        } catch (error){
+            throw(error)
+        }
+    }
+    printInfo('===================')
+    return Buffer.from(stringifyData)
+}
+
+const prepareKeys = async ()=>{
+    const data = Buffer.from(JSON.stringify({issuer: 'CLI', acquirer: 'Client'})).toString('base64')
+    const privateKey = readFileSync(`${keyFolderPath}\\cliPrivate.pem`)
+    const signature = sign('sha256', data, {key: privateKey, passphrase: 'Biz-A@cli', padding: cryptoConstants.RSA_PKCS1_PSS_PADDING}).toString('base64')
+    // const res = await axios.get('https://biz-a.herokuapp.com/api/issuerKey', {data, signature})
+    const res = await axios.get(env.BIZA_SERVER_LINK+'/api/issuerKey', {params: {data, signature}})
+    if ((res.data.data!=null) && verify('sha256', res.data.data, {key: readFileSync(`${keyFolderPath}\\serverPublic.pem`), padding: cryptoConstants.RSA_PKCS1_PSS_PADDING}, Buffer.from(res.data.signature, 'base64'))) {
+        const resData = JSON.parse(Buffer.from(res.data.data, 'base64').toString())
+        const decryptedAESKey = privateDecrypt({key: privateKey, passphrase: 'Biz-A@cli', padding: cryptoConstants.RSA_PKCS1_OAEP_PADDING}, Buffer.from(resData.issuer.key, 'base64')).toString()
+        const cliSignature = (signedData)=>sign('sha256', signedData, {key: privateKey, passphrase: 'Biz-A@cli', padding: cryptoConstants.RSA_PKCS1_PSS_PADDING}).toString('base64')
+        const acquirerData = Buffer.from(JSON.stringify(resData.acquirer)).toString('base64')
+        const signature = cliSignature(acquirerData)
+        return {encryptKey: decryptedAESKey, metadata: {acquirer: {data: acquirerData, signature}}}
+    }
+    else {
+        return null
+    }
+}
+
+const encryptIt = (data, encryptKey)=>{
+    const initializeVector = randomBytes(16) // "iv" is unique for each template file
+    const cipher = createCipheriv('aes-256-cbc', Buffer.from(encryptKey, 'base64'), initializeVector)
+    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()
+        const rootFolder = './upload/'
+        const bundleName = basename(process.cwd()).trim().replace(' ', '').toLowerCase()
+        const bundleFolder = rootFolder+bundleName+'/'
+        const files = (await fs.readdir(process.cwd())).filter(fileName=>{
+            const stat = statSync(fileName)
+            return stat.isFile() && (stat.size>0) && ((fileName.split('.').pop().toLowerCase().match(/^(js)$/) || (fileName.toLowerCase()=='menu.json')))
+        })
+        if (files.length>0) {
+            const keys = await prepareKeys()
+            let processedFile = 0
+            await fs.rm(rootFolder, {force: true, recursive: true})
+            await fs.mkdir(bundleFolder, {recursive: true})
+            for (const file of files) {
+                const fileName = file.toLowerCase();
+// if (['finalib.js', 'solib.js'].indexOf(fileName)==-1) {continue}
+                const minifiedData = await getFileMinifiedData(fileName);
+                const encryptedData = encryptIt(minifiedData, keys.encryptKey)
+                if (fileName=='menu.json') {
+                    keys.metadata['menu'] = encryptedData.toString('base64')
+                } else {
+                    fs.writeFile(bundleFolder+fileName, encryptedData.toString('base64'))
+                }
+                processedFile++
+            }
+            const bundleFile = `${rootFolder}${bundleName}.tgz`
+            await compressIt(bundleFile, bundleFolder)
+            console.log(`Finished packing ${processedFile} files into "${bundleFile}" (${((performance.now()-bundlingStart)/1000).toFixed(2)}s)`)
+
+            // send to FINAPI
+            const uploadingStart = performance.now()
+            const data = (await fs.readFile(bundleFile)).toString('base64') // *.tgz to base64String
+            const baseUrl = 'fina/rest/TOrmMethod/%22setApp%22'
+            const url = options.sub ?
+                `${options.server}/hub/${baseUrl}?subdomain=${options.sub}` :
+                `${options.server}:${options.apiPort}/${baseUrl}`
+            const headers = {'Content-Type': 'text/plain'}
+            const param = { _parameters: [options.dbindex, bundleName, data, keys.metadata] }
+            const res = await axios.post(url, param, { headers: headers });
+            if (res.data.success) {
+                console.log(`Finished uploading "${bundleFile}" (${((performance.now()-uploadingStart)/1000).toFixed(2)}s)`)
+                await fs.rm(rootFolder, {force: true, recursive: true})
+            } else {
+                console.error(res.data.error)
+            }
+        }
+    } catch (e) {
+        console.error(e.response?.data ? e.response.data : e)
+    }
+}
+
+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 -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/callbackController.js

@@ -6,10 +6,14 @@ export function getInputScript(req) {
     return {
         data: {
             arguments: args,
-            body: req.body.body
+            body: req.body.body,
+            path: req.path,
+            query: req.body.query,
+            headers: req.body.headers,
+            socket : req.app.settings.socket,
         },
         selectedConfig: {
-            API_URL: `http://${args.hostname}:${args.port}`,
+            url: `http://${args.hostname}:${args.port}`,
             dbindex: args.dbindex,
             subdomain: args.subdomain
         }
@@ -17,13 +21,16 @@ export function getInputScript(req) {
 }
 
 export async function runCliScript(req, res) {
+    
     const { data, selectedConfig } = getInputScript(req);
-
+    // console.log('runCliScript data', data)
     loadCliScript(selectedConfig, req.body.query).subscribe({
         next: async script => {
             let functions = extractFunctionScript(script);
             if (functions) {
-                res.send(await functions.onInit(data));
+                let respon = await functions.onInit(data);
+                // console.log('respon cb', respon)
+                res.send(respon);
                 console.log(`Run Callback Successfully!`);
             } else {
                 res.send('CLI Script does not exist.');

package/envs/env.dev.js

@@ -5,6 +5,7 @@ export const envDev = {
   CDM_MONGO_LINK: 'mongodb+srv://imm_cdm:' +
     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://biz-a-dev-41e7c93a25e5.herokuapp.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/key/cliPrivate.pem

@@ -0,0 +1,54 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+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
+-----END ENCRYPTED PRIVATE KEY-----

package/key/serverPublic.pem

@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsygI0CgE30zwazWnM50i
+otXV3FvisoG1oIlpCquhif6aJYCREy6gnn+RFxspMcrCX6dVGjWyEHC9yznOzzO+
+xsPEtzyDWMtqxbfx1rTwVB60qBv1ewvGOWv9KBv8xaMyC+BreLL/iUTH3HjJLV5/
+hcxYibMfGWzYaLAFnHSNwtDfTeraK2MEVjMreMR5tThCHbp/nGIUAWYp9Z/jj09X
+6mbNHT4DL0SRwR7SKFmMmGmgxi8M4Qp6tRYYpx7QvmaXq8KDWL3cIvVwTBW6H+KW
+yhhWvqyGZ9OKV5OLVzdSmeEesV3eTxv6EgRDIoODSn4MLIwHuIGOlRgeuNahm4nB
+MwVkOBDMaf1k8bHrSf+CY7oyf0f1nlxdwZv5kmixEcifL8Ie7XhKO076duwpKyda
+vuv5QdsCJ0aO3Kqq/F1QUYYJgtVsERKE+OFCjLaetqQXy+wlt+naAsUSKsNDBq0h
+XsZPZZxP5+nNjkRyNtujz70iOm1s/oPmkJ1MeqLBFonCW8tkbwKbc2c+iMwXLqE7
+g2TBHzpvJmW3V9h9nJkdits37mi8rP1DQHlhEH/PL6Rd6q+XJ4Owze0eCZOWaMD2
+8FdeodSiQd7mDZssooGsFvjjklo9PMnQfwDJXWwc2GoyCzfJo3KKpeKT/4HuVtfn
+zyxyuV/3sV3hnO7jvuNSILECAwEAAQ==
+-----END PUBLIC KEY-----

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "biz-a-cli",
   "nameDev": "biz-a-cli-dev",
-  "version": "2.3.8",
+  "version": "2.3.10",
   "versionDev": "0.0.27",
   "description": "",
   "main": "bin/index.js",
@@ -22,7 +22,9 @@
     "uploadbiza": "bin/index.js",
     "proxy": "bin/proxy.js",
     "hub": "bin/hub.js",
-    "watcher": "bin/watcher.js"
+    "watcher": "bin/watcher.js",
+    "uploadapp": "bin/uploadApp.js",
+    "deleteapp": "bin/deleteApp.js"
   },
   "dependencies": {
     "axios": "^1.6.8",
@@ -36,6 +38,8 @@
     "socket.io-client": "^4.7.5",
     "socket.io-stream": "^0.9.1",
     "web-push": "^3.6.7",
+    "tar": "^7.1.0",
+    "uglify-js": "^3.17.4",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
@@ -45,4 +49,4 @@
   "jest": {
     "transform": {}
   }
-}
+}

package/tests/callback.test.js

@@ -20,21 +20,34 @@ describe('callback test', () => {
 
         const request = {
             app: { settings: { args: args } },
-            body: { body: { body1: 'value1' } }
+            body: { 
+                body: { body1: 'value1' },
+                headers:{connection:'keep-alive'} 
+            },
+            path:'pqr',
+            
         }
 
         expect(getInputScript(request)).toStrictEqual({
             data: {
                 arguments: args,
-                body: { body1: 'value1' }
+                body: { body1: 'value1' },
+                path:'pqr',
+                query:undefined,
+                headers:{
+                    connection:'keep-alive'
+                },
+                socket:undefined,
+
             },
             selectedConfig: {
-                API_URL: 'http://localhost:212',
+                url: 'http://localhost:212',
                 dbindex: 2,
                 subdomain: 'abc'
             }
         });
     });
 
+
 })
 

package/tests/hub.test.js

@@ -9,104 +9,106 @@ import { Axios } from "axios-observable";
 let socketsBySubdomain = {};
 
 const createSocket2CLI = (socket) => {
-  return (subdomain, responseCb) => {
-    const responseCallback = (error) => { if (responseCb) responseCb(error) }
-    let subdomainStr = subdomain.toString();
+    return (subdomain, responseCb) => {
+        const responseCallback = (error) => { if (responseCb) responseCb(error) }
+        let subdomainStr = subdomain.toString();
 
-    socketsBySubdomain[subdomainStr] = socket;
-    socket.subdomain = subdomainStr;
-    // console.log(new Date() + ': ' + subdomainStr + ' registered successfully');
+        socketsBySubdomain[subdomainStr] = socket;
+        socket.subdomain = subdomainStr;
+        // console.log(new Date() + ': ' + subdomainStr + ' registered successfully');
 
-    responseCallback(null);
-  }
+        responseCallback(null);
+    }
 }
 
 const deleteSubdomain = (socket) => () => {
-  if (socket.subdomain) {
-    delete socketsBySubdomain[socket.subdomain];
-    console.log(new Date() + ': ' + socket.subdomain + ' unregistered');
-  }
+    if (socket.subdomain) {
+        delete socketsBySubdomain[socket.subdomain];
+        console.log(new Date() + ': ' + socket.subdomain + ' unregistered');
+    }
 }
 
 const toPromise = (cb) => new Promise((resolve, reject) => {
-  cb(resolve)
-  setTimeout(() => reject(new Error('timeout')), 1000)
+    cb(resolve)
+    setTimeout(() => reject(new Error('timeout')), 1000)
 })
 
 describe('cli req test', () => {
-  let io, port;
-  const startSocket = function startSocket(server) {
-    let io = new Server(server);
-    io.on('connection', (socket) => {
-      // console.log('socket client connect')
-      socket.on('createTunnel', createSocket2CLI(socket));
-      socket.on('disconnect', deleteSubdomain(socket));
-    });
-
-    return io;
-  }
-
-  beforeAll((done) => {
-    const httpServer = createServer()
-    io = startSocket(httpServer)
-
-    httpServer.listen(async () => {
-      port = httpServer.address().port;
-      done()
-    })
-  })
-
-  afterAll(() => {
-    io.close();
-  })
-
-  test('request to cli', async () => {
-    let mockedRequest = jest.spyOn(Axios, 'request').mockReturnValue(of({ data: 'OK' }));
-
-    let socket;
-    try {
-      socket = ioc(`http://localhost:${port}`);
-      await hubEvent(socket, {
-        server: `http://localhost:${port}`,
-        subdomain: 'scy',
-        hostname: 'localhost',
-        port: 212,
-        serverport: 3002
-      });
-
-      let result = await toPromise(resolve => socketsBySubdomain['scy'].emit(
-        'cli-req', {
-        // path: '/a/b',
-        method: 'POST',
-        query: { subdomain: 'abc' }, body: { data: 'xyz' }
-      }, cb => resolve(cb)
-      ))
-
-      expect(result).toStrictEqual('OK');
-      expect(mockedRequest).toHaveBeenCalledWith({
-        data: { body: { data: "xyz" }, query: { subdomain: "abc" } },
-        method: "POST",
-        url: "http://localhost:3002/cb"
-      });
-
-      result = await toPromise(resolve => socketsBySubdomain['scy'].emit(
-        'cli-req', {
-        path: '/a/b',
-        method: 'POST',
-        query: { subdomain: 'abc' }, body: { data: 'xyz' }
-      }, cb => resolve(cb)
-      ))
-
-      expect(result).toStrictEqual('OK');
-      expect(mockedRequest).toHaveBeenCalledWith({
-        data: { body: { data: "xyz" }, query: { subdomain: "abc" } },
-        method: "POST",
-        url: "http://localhost:3002/cb/a/b",
-      });
-
-      socket.disconnect();
-    } catch (error) {
-      console.log(error);
+    let io, port;
+    const startSocket = function startSocket(server) {
+        let io = new Server(server);
+        io.on('connection', (socket) => {
+            // console.log('socket client connect')
+            socket.on('createTunnel', createSocket2CLI(socket));
+            socket.on('disconnect', deleteSubdomain(socket));
+        });
+
+        return io;
     }
-  })
+
+    beforeAll((done) => {
+        const httpServer = createServer()
+        io = startSocket(httpServer)
+
+        httpServer.listen(async () => {
+            port = httpServer.address().port;
+            done()
+        })
+    })
+
+    afterAll(() => {
+        io.close();
+    })
+
+    test('request to cli', async () => {
+        let mockedRequest = jest.spyOn(Axios, 'request').mockReturnValue(of({ data: 'OK' }));
+
+        let socket;
+        try {
+            socket = ioc(`http://localhost:${port}`);
+            await hubEvent(socket, {
+                server: `http://localhost:${port}`,
+                subdomain: 'scy',
+                hostname: 'localhost',
+                port: 212,
+                serverport: 3002
+            });
+
+            let result = await toPromise(resolve => socketsBySubdomain['scy'].emit(
+                'cli-req', 
+                {
+                    // path: '/a/b',
+                    method: 'POST',
+                    query: { subdomain: 'abc' }, body: { data: 'xyz' }
+                }, 
+                cb => resolve(cb)
+            ))
+
+            expect(result).toStrictEqual('OK');
+            expect(mockedRequest).toHaveBeenCalledWith({
+                data: { body: { data: "xyz" }, query: { subdomain: "abc" } },
+                method: "POST",
+                url: "http://localhost:3002/cb"
+            });
+
+            result = await toPromise(resolve => socketsBySubdomain['scy'].emit(
+                'cli-req', {
+                path: '/a/b',
+                method: 'POST',
+                query: { subdomain: 'abc' }, body: { data: 'xyz' }
+            }, cb => resolve(cb)
+            ))
+
+            expect(result).toStrictEqual('OK');
+            expect(mockedRequest).toHaveBeenCalledWith({
+                data: { body: { data: "xyz" }, query: { subdomain: "abc" } },
+                method: "POST",
+                url: "http://localhost:3002/cb/a/b",
+            });
+
+            socket.disconnect();
+        } catch (error) {
+            console.log(error);
+        }
+    })
 })