biz-a-cli 2.3.57 → 2.3.59

package/bin/deployEvent.js

@@ -0,0 +1,105 @@
+import axios from 'axios';
+import { prepareScript, encryptScript } from './script.js';
+import { IDLE_SOCKET_TIMEOUT_MILLISECONDS } from './hubEvent.js';
+import { CLIENT_ROOM } from './directHubEvent.js';
+
+export async function getAppData(apiOpts){
+    return await axios.request({
+        timeout : IDLE_SOCKET_TIMEOUT_MILLISECONDS,
+        baseURL : `${apiOpts['secure']==true ? 'https://' : 'http://'}${apiOpts['hostname']}:${apiOpts['port']}`,
+        url : 'fina/rest/TOrmMethod/%22list%22',
+        method : 'POST',
+        "data" : {
+            "dbIndex": apiOpts['dbindex'],
+            "object":{
+                "columns":[
+                    {"title":"app", "data":"SYS$APPS.APPNAME"},
+                    {"title":"metadata", "data":"SYS$APPS.METADATA"}
+                ]
+            }
+        }
+    })
+    .then(response=>{
+        return {error: null, apps: JSON.parse(response.data.data)};
+    })
+    .catch(err=>{
+        return {"error": ((err && (err instanceof Error)) ? err.message : err), apps: []};
+    });
+};
+
+async function getDeployScript(serverUrl, appList, data){
+    let script = await prepareScript(data.fileName, data.script, false);
+    if (script) {
+        script = await axios.request({
+            timeout : IDLE_SOCKET_TIMEOUT_MILLISECONDS,
+            baseURL : serverUrl,
+            url : 'api/acquirerKey',
+            method : 'POST',
+            "data" : {"metadata": JSON.stringify(JSON.parse((appList.find((app)=>app['SYS$APPS.APPNAME']===data.appName))['SYS$APPS.METADATA'])['acquirer'])},
+        })
+        .then(response=>encryptScript(script, response.data).toString('base64'));
+    };
+    return script;
+};
+
+export async function onScriptChangeFromVsCode(sock, serverUrl, appList, data){
+    let script;
+    try {
+        script = await getDeployScript(serverUrl, appList, data);
+        if (script) {
+            sock.to(CLIENT_ROOM).emit('scriptDeploy', {...data, ...{script}});
+            return {error: null, script};
+        }
+        else {
+            throw new Error('Invalid Script');
+        };
+    }
+    catch (err) {
+        return {"error": ((err && (err instanceof Error)) ? err.message : err), script};
+    };
+};
+
+const addAppListListener = (sock,argv)=>{
+    sock.on('appList', async (data, cb)=>{
+        const result = await getAppData(argv);
+        cb(result.error, ((result.error) ? [] : result.apps.map((app)=>app['SYS$APPS.APPNAME'])));
+    });
+};
+
+const addOnScriptChangeListener = (sock, argv, deployFn)=>{
+    sock.on('scriptChange', async (data, cb)=>{
+        const result = await getAppData(argv);
+        if (result.error) {
+            cb(result);
+        }
+        else {
+            const deployResult = await deployFn(result.apps, data);
+            cb(deployResult.error, deployResult.script);
+        };
+    });
+};
+
+export const deploymentListenerForVSCode = (socket, argv)=>{
+    addAppListListener(socket,argv);
+    addOnScriptChangeListener(socket, argv, async (apps, data)=>{
+        return (await onScriptChangeFromVsCode(socket, argv['server'], apps, data));
+    });
+};
+
+export async function onScriptChangeFromHubServer(serverUrl, appList, data){
+    let script;
+    try {
+        script = await getDeployScript(serverUrl, appList, data);
+        return {error: (script ? null : 'Invalid Script'), script};
+    }
+    catch (err) {
+        return {"error": ((err && (err instanceof Error)) ? err.message : err), script};
+    };
+};
+
+export const deploymentListenerForHubServer = (socket, argv)=>{
+    addAppListListener(socket, argv);
+    addOnScriptChangeListener(socket, argv, async (apps, data)=>{
+        return (await onScriptChangeFromHubServer(argv['server'], apps, data));
+    });
+};

package/bin/directHubEvent.js

@@ -1,49 +1,70 @@
-import { apiRequestListener } from './hubEvent.js'
+import { apiRequestListener, RECONNECT_SOCKET_DELAY } from './hubEvent.js'
+import { deploymentListenerForVSCode } from './deployEvent.js'
 import { Tunnel as QuickTunnel } from 'cloudflared'
 
+export const CLIENT_ROOM = 'clientRoom'
+
 export async function localhostTunnel(port, notifier){
-    let tunnelUrl = ''
-    let qt = QuickTunnel.quick('127.0.0.1:'+port)
+    let tunnelUrl = '';
+    let qt = QuickTunnel.quick('127.0.0.1:'+port);
+    function reconnectTunnel(){
+        setTimeout(()=>{qt = localhostTunnel(port, notifier)}, RECONNECT_SOCKET_DELAY);
+    };
     qt.on('url', (qtUrl)=>{
         // console.log('qt url', qtUrl)
-        tunnelUrl = qtUrl
+        tunnelUrl = qtUrl;
     })
-    qt.on('connected', (conn)=>{
+    .on('connected', (conn)=>{
         // console.log('qt connect', conn)
-        notifier(tunnelUrl)
-        console.log(`${new Date()}: Connected to Direct Hub at public URL`)
+        notifier(tunnelUrl);
+        console.log(`${new Date()}: Connected to Direct Hub at public URL ${tunnelUrl}`)
     })
-    qt.on('disconnected', (conn)=>{
+    .on('disconnected', (conn)=>{
         // console.log('qt disconnect', conn)
-        notifier('')
-        qt.stop
+        notifier('');
+        qt.stop();
     })
-    qt.on('error', (err)=>{
+    .on('error', (err)=>{
         // console.log('qt err', err)
-        notifier('')
-        qt.stop
+        notifier('');
+        qt.stop();
     })
-    qt.on('exit', (code)=>{
+    .on('exit', (code)=>{
         // console.log('qt exit', code)
-        notifier('')
-        console.log(`${new Date()}: Direct Hub is not available, will try to reinitiate it in 5 minutes. Error code : `, code)
-        setTimeout(()=>{qt = localhostTunnel(port, notifier)}, 5*60000)
-    })
-    // qt.on('stdout', (data)=>{
+        notifier('');
+        console.log(`${new Date()}: Direct Hub is not available, will try to reinitiate it in ${RECONNECT_SOCKET_DELAY/1000} seconds. Error code : `, code);
+        reconnectTunnel();
+    // })
+    // on('stdout', (data)=>{
     //     console.log('qt stdout', data)
     // })
-    // qt.on('stderr', (data)=>{
+    // on('stderr', (data)=>{
     //     console.log('qt stderr', data)
-    // })
+    });
     return qt
 }
 
 export function directHubEvent(serverSocket, argv){
     serverSocket.on('connection', (clientSocket) => {
-        if (process.env.NODE_ENV !== 'production') {
-            console.log(clientSocket.id, 'connected')
-            clientSocket.on('disconnect', (reason)=>{console.log(`${clientSocket.id||'Direct Hub'} disconnected. Reason : ${reason}`)})
+        if (clientSocket.handshake.query.isClient) {
+            clientSocket.join(CLIENT_ROOM);
+            apiRequestListener(clientSocket, argv);
         }
-        apiRequestListener(clientSocket, argv)
+        else if (clientSocket.handshake.query.isDeploy) {
+            deploymentListenerForVSCode(clientSocket, argv)
+        }
+
+        // shall not log in production mode
+        if (process.env.NODE_ENV !== 'production') {
+            const id = `<${clientSocket.handshake?.query?.isClient ? `Client` : clientSocket.handshake?.query?.isDeploy ? 'Deployer' : 'Anonymous'}> ${clientSocket.id}`;
+            clientSocket.on('disconnect', (reason)=>{
+                console.log(id, `disconnected. Reason : ${reason}`)
+            })
+            console.log(id, `connected`)
+        };
     })
+}
+
+export function getSocketCORSOrigin(cliIpAddress){
+    return ['https://biz-a.id', 'https://test.biz-a.id', /\.biz-a\.id$/, 'vscode-file://vscode-app', /\.vscode-cdn\.net$/].concat((process.env.NODE_ENV === 'production') ? [] : [`http://${cliIpAddress}:4200`, 'http://localhost:4200'])
 }

package/bin/hub.js

@@ -2,11 +2,11 @@
 
 import yargs from 'yargs';
 import { io as ioClient } from "socket.io-client";
-import { streamEvent, hubEvent } from './hubEvent.js'
+import { streamEvent, hubEvent, RECONNECT_SOCKET_DELAY } from './hubEvent.js'
 import { createLogger, transports, format } from "winston";
 import { Server as ioServer } from 'socket.io'
 import os from 'node:os'
-import { directHubEvent, localhostTunnel }from './directHubEvent.js'
+import { directHubEvent, localhostTunnel, getSocketCORSOrigin }from './directHubEvent.js'
 import { env } from "../envs/env.js"
 
 const logger = createLogger({
@@ -149,16 +149,15 @@ await streamEvent(ioClient(argv['server'], {query: {isSockStream: true }}), argv
 
 // as socket client to BizA HUB
 if (argv.hub) {
-    hubEvent(ioClient(argv['hub'], { reconnectionDelay: 5*60*1000, reconnectionDelayMax: 5*60*1000, query: {isCLI: true, room: argv['subdomain']} }), argv, (url)=>{
+    hubEvent(ioClient(argv['hub'], { reconnectionDelay: RECONNECT_SOCKET_DELAY, reconnectionDelayMax: RECONNECT_SOCKET_DELAY, query: {isCLI: true, room: argv['subdomain']} }), argv, (url)=>{
         if (url!==argv.connectedHubUrl) {
             argv.connectedHubUrl = url
         }
     })
 }
 
-// as socket server from BizA Client
-const serverCORSOrigin = ['https://biz-a.id', 'https://test.biz-a.id', /\.biz-a\.id$/].concat((process.env.NODE_ENV === 'production') ? [] : [`http://${argv.cliAddress().ip}:4200`, 'http://localhost:4200'])
-directHubEvent(new ioServer(server, {cors: {origin: serverCORSOrigin}}), argv);
+// as socket server for BizA Client and BizA devTools
+directHubEvent(new ioServer(server, {cors: {origin: getSocketCORSOrigin(argv.cliAddress().ip)}}), argv);
 if (argv.publish==true) {
     localhostTunnel(argv.serverport, (url)=>{ // publish CLI
         if (url!==argv.connectedPublicUrl) {

package/bin/hubEvent.js

@@ -6,8 +6,10 @@ const require = createRequire(import.meta.url);
 const ss = require('socket.io-stream');  //SCY: Temporary, next will be replaced with import
 import { Transform } from 'node:stream'
 // import { pipeline } from 'node:stream'
+import { deploymentListenerForHubServer } from './deployEvent.js';
 
-const IDLE_SOCKET_TIMEOUT_MILLISECONDS = 1000 * 30;
+export const IDLE_SOCKET_TIMEOUT_MILLISECONDS = 1000 * 30;
+export const RECONNECT_SOCKET_DELAY = 60 * 1000;
 const DISCONNECT_REASON_BY_SOCKET_SERVER = 'io server disconnect'
 
 export const socketAgent = isUsingHttps=>(isUsingHttps==true) ? tls : net
@@ -156,7 +158,8 @@ export const hubEvent = (socket, argv, notifier)=>{
         notifier('')
         console.log(`${new Date()}: ${getIdText(id)}reconnecting to BizA Hub`)
     })
-    apiRequestListener(socket, argv)
+    apiRequestListener(socket, argv);
+    deploymentListenerForHubServer(socket, argv);
 }
 
 export const apiRequestListener = (socket, argv)=>{

package/bin/script.js

@@ -0,0 +1,125 @@
+import { runInNewContext } from "vm"
+import uglify from "uglify-js"
+import * as vm from 'node:vm'
+import { randomBytes, createCipheriv } from "node:crypto"
+
+export const prepareScript = async (file, script, shallLog=false) => {
+
+    const printInfo = (msg) => {
+        if (shallLog) {
+            console.log(msg)
+        }
+    }
+
+    const minifyiedWithUglify = (fileName, scriptText)=>{
+        const minifyResult = uglify.minify(scriptText, {compress: false, mangle: false})
+        if (minifyResult.error ) {throw (`${fileName}:${minifyResult.error.line}:${minifyResult.error.col}: ` + minifyResult.error)}
+
+        let jsMinData = minifyResult.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(''))
+
+        return minifiedBuffer.toString()
+    }
+
+    const isJsonFile = (fileName)=>{
+        return fileName.split('.').pop().toLowerCase().match(/^(json)$/)
+    }
+
+    const jsonReplacer = (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 compileScriptWithNodeVM  = (fileName, scriptText)=>{
+        try {
+            printInfo('Running script with VM')
+            const minifiedScript = minifyiedWithUglify(fileName, scriptText)
+            if (isJsonFile(fileName)) {
+                const vmResult = runInNewContext(minifiedScript)
+                return vmResult ? JSON.stringify((typeof vmResult=='function') ? vmResult() : (vmResult || ''), jsonReplacer) : ''
+            } else {
+                // for handling "get" function in local scope (let, var, const)
+                const sandbox = vm.createContext({'script': ''});
+                vm.runInContext(
+                    minifiedScript + "\n script = (typeof get=='undefined') ? '' : (typeof get=='function') ? get() : (get||'')",
+                    sandbox
+                )
+                return JSON.stringify(sandbox.script, jsonReplacer)
+            }
+        } catch (err){
+            printInfo((err.toString().indexOf(fileName)===-1 ? `${fileName} : ` : '') + err) // Do not log it as error, we will try to compile the script using ES6 Import
+            return ''
+        }
+    }
+
+    const compileScriptWithESImport = async (fileName, scriptText)=>{
+        try {
+            printInfo('Running script with Import function')
+            // const lib = await import(`file://${process.cwd()}\\${fileName}`, isJsonFile(fileName) ? {with: {type: "json"}} : {}) // we can not use file import if script in memory
+            const lib = await import(`data:text/javascript,${scriptText}`, isJsonFile(fileName) ? {with: {type: "json"}} : {}) // used data import if script in memory
+            return JSON.stringify((typeof lib.default=='function') ? lib.default() : (lib.default || ''), jsonReplacer) // remove trailing whitespace
+            // stringifyData = stringifyData.replace(/\\r\\n/g,'') // remove line break. We can not do this because "inline css" still requires line breaks
+        } catch (error){
+            throw(`${fileName} : ` + error)
+        }
+    }
+
+    const isEmptyScript = (scriptText) => {
+        return ((typeof scriptText=='undefined') || (scriptText===null) || (scriptText.trim()==='""') || (typeof scriptText=='string' && scriptText.trim().length==0))
+    }
+
+    printInfo(`===================\n${file.toUpperCase()}\n===================`)
+    let stringifyData = ''
+    try {
+        stringifyData = compileScriptWithNodeVM(file, script)
+        stringifyData = isEmptyScript(stringifyData) ? await compileScriptWithESImport(file, script) : stringifyData
+        if (isEmptyScript(stringifyData)) {
+            throw(`${file} : ` + 'Failed to compile template script.\nPlease make sure the script is correct and not returning empty result')
+        } else {
+            printInfo('Array function :')
+            printInfo(['Stringify : \n', stringifyData].join(''))
+        }
+        return Buffer.from(stringifyData)
+    } finally {
+        printInfo(`===================\nEOF ${file.toUpperCase()}\n===================`)
+    }
+}
+
+export const encryptScript = (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()]) // put "iv" at beginning of cipherText, must seperate it when doing decryption
+}

package/bin/uploadApp.js

@@ -121,7 +121,7 @@ const getFileMinifiedData = async (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(/ /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
             printInfo(['Stringify : \n', stringifyData].join(''))
         } catch (error){

package/debug.log

@@ -0,0 +1,2 @@
+[0605/214850.930:ERROR:registration_protocol_win.cc(108)] CreateFile: The system cannot find the file specified. (0x2)
+[0605/220241.671:ERROR:registration_protocol_win.cc(108)] CreateFile: The system cannot find the file specified. (0x2)