biz-a-cli 2.3.55 → 2.3.57

package/bin/app.js

@@ -16,7 +16,7 @@ const keyFolderPath = process.argv[1].substring(0, process.argv[1].lastIndexOf("
 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)",
+    describe: `Server URL (ex: ${env.BIZA_SERVER_LINK} or http://192.168.1.1 or https://finaapi.imamatek.com)`,
     type: "string",
     demandOption: true
 })

package/bin/deleteApp.js

@@ -2,11 +2,12 @@
 
 import yargs from "yargs";
 import axios from "axios";
+import { env } from "../envs/env.js"
 
 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)",
+        describe: `Server URL (ex: ${env.BIZA_SERVER_LINK} or http://192.168.1.1 or https://finaapi.imamatek.com)`,
         type: "string",
         demandOption: true
     })

package/bin/hub.js

@@ -7,6 +7,7 @@ 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 { env } from "../envs/env.js"
 
 const logger = createLogger({
     level: 'info',
@@ -35,7 +36,7 @@ const argv = yargs(process.argv.slice(2))
     .usage('Usage: $0 [options]')
     .options('s', {
         alias: 'server',
-        default: 'https://biz-a.herokuapp.com',
+        default: env.BIZA_SERVER_LINK,
         describe: '(Required) Tunnel server endpoint',
         type: 'string',
         demandOption: false
@@ -87,7 +88,7 @@ const argv = yargs(process.argv.slice(2))
         demandOption: false
     })
     .options('hub', {
-        default: 'https://biz-a-hub-ed77b066db87.herokuapp.com/',
+        default: `${env.BIZA_HUB_SERVER_LINK}`,
         describe: 'BizA hub',
         type: 'string',
         demandOption: false

package/bin/hubEvent.js

@@ -8,18 +8,23 @@ import { Transform } from 'node:stream'
 // import { pipeline } from 'node:stream'
 
 const IDLE_SOCKET_TIMEOUT_MILLISECONDS = 1000 * 30;
+const DISCONNECT_REASON_BY_SOCKET_SERVER = 'io server disconnect'
 
 export const socketAgent = isUsingHttps=>(isUsingHttps==true) ? tls : net
 
+const getIdText = id=>id ? id+' ' : ''
+
 export const streamEvent = async (socket, argv) => new Promise((resolve, reject) => {
+    let id
 
     const connectCb = () => {
+        id = socket.id
         socket.emit('createTunnel', argv['subdomain'], (err) => {
             if (err) {
-                console.log(new Date() + ': [error] ' + err);
+                console.log(`${new Date()}: ${getIdText(id)}connection error to BizA Server. Error : ${err}`);
                 reject(err);
             } else {
-                console.log(`${new Date()}: Connected to BizA Server at ${argv.server} using sub domain "${argv['subdomain']}"`)
+                console.log(`${new Date()}: ${getIdText(id)}connected to BizA Server at ${argv.server} using sub domain "${argv['subdomain']}"`)
                 resolve(argv['server'].toString());
             }
         });
@@ -109,6 +114,18 @@ export const streamEvent = async (socket, argv) => new Promise((resolve, reject)
     socket.on('connect', connectCb);
     socket.on('incomingClient', incomingHubCb)
     socket.on('cli-req', cliReqCb);
+
+    socket.on('disconnect', reason=>{
+        console.log(`${new Date()}: ${getIdText(id)}disconnected from BizA Server. Reason: ${reason}`)
+        id = undefined
+        if (reason.toLowerCase()===DISCONNECT_REASON_BY_SOCKET_SERVER) {
+            socket.connect()
+        }
+    })
+
+    socket.io.on('reconnect', ()=>{
+        console.log(`${new Date()}: ${getIdText(id)}reconnecting to BizA Server`)
+    })
 })
 
 export const hubEvent = (socket, argv, notifier)=>{
@@ -116,13 +133,17 @@ export const hubEvent = (socket, argv, notifier)=>{
     socket.on('connect', ()=>{
         id = socket.id
         notifier(argv['hub'])
-        console.log(`${new Date()}: Connected to BizA Hub at ${argv['hub']} using sub domain "${argv['subdomain']}" with id "${id}"`)
+        console.log(`${new Date()}: ${getIdText(id)}connected to BizA Hub at ${argv['hub']} using sub domain "${argv['subdomain']}"`)
     })
     socket.on('disconnect', (reason)=>{
         notifier('')
-        console.log(`${new Date()}: ${id||''} disconnected from BizA Hub. Reason: ${reason}`)
+        console.log(`${new Date()}: ${getIdText(id)}disconnected from BizA Hub. Reason: ${reason}`)
+        id = undefined
+        if (reason.toLowerCase()===DISCONNECT_REASON_BY_SOCKET_SERVER) {
+            socket.connect()
+        }
     })
-    const logError = msg=>{console.log(`${new Date()}: ${id||''} connection error to BizA Hub. Error : ${msg}`)}
+    const logError = msg=>{console.log(`${new Date()}: ${getIdText(id)}connection error to BizA Hub. Error : ${msg}`)}
     socket.on('connect_error', (error)=>{
         notifier('')
         logError(error.message)
@@ -131,29 +152,46 @@ export const hubEvent = (socket, argv, notifier)=>{
         notifier('')
         logError(error)
     })
+    socket.io.on('reconnect', ()=>{
+        notifier('')
+        console.log(`${new Date()}: ${getIdText(id)}reconnecting to BizA Hub`)
+    })
     apiRequestListener(socket, argv)
 }
 
 export const apiRequestListener = (socket, argv)=>{
     socket.on('apiRequest', (reqData, resCB)=>{
+
+        let apiAddress = `${argv['secure']==true ? 'https://' : 'http://'}${argv['hostname']}:${argv['port']}`
+        let reqBody = reqData.body
+        try{
+            let parsedBody = (typeof reqData.body==='object') ? reqBody : JSON.parse(reqBody)
+            if (parsedBody.apiAddress){
+                apiAddress = parsedBody.apiAddress
+                delete parsedBody.apiAddress
+                reqBody = (typeof reqData.body==='string') ? JSON.stringify(parsedBody) : parsedBody
+            }
+        } catch (error) {}
+
         const socketResponse = (resp)=>{return {
             status: resp.status,
             statusText: resp.statusText,
             headers: resp.headers,
-            body: resp.data, url: `${argv['hostname']}:${argv['port']+resp.config.url}`
+            body: resp.data,
+            url: apiAddress + resp.config.url
         }}
+
         if (argv['subdomain'].localeCompare(reqData.subDomain)==0) {
-            const apiAddress = `${argv['secure']==true ? 'https://' : 'http://'}${argv['hostname']}:${argv['port']}`
             axios.request({
-                timeout: (reqData.timeout || IDLE_SOCKET_TIMEOUT_MILLISECONDS),
-                baseURL: apiAddress,
-                url: reqData.path,
-                method: reqData.method,
-                headers: reqData.headers,
-                data: reqData.body,
-                // decompress: false, // if we need to interfered default Agent compression
-                responseType: reqData.responseType,
-                maxContentLength: Infinity,
+                timeout          : (reqData.timeout || IDLE_SOCKET_TIMEOUT_MILLISECONDS),
+                baseURL          : apiAddress,
+                url              : reqData.path,
+                method           : reqData.method,
+                headers          : reqData.headers,
+                data             : reqBody,
+                // decompress       : false, // if we need to interfered default Agent compression
+                responseType     : reqData.responseType,
+                maxContentLength : Infinity,
             })
             .then(response=>{
                 resCB(null, socketResponse(response))
@@ -163,7 +201,7 @@ export const apiRequestListener = (socket, argv)=>{
             })
         }
         else {
-            resCB({status: 401, statusText: 'bad subdomain', url: `${argv['hostname']}:${argv['port']+reqData.path}`}, null)
+            resCB({status: 401, statusText: 'bad subdomain', url: apiAddress + reqData.path}, null)
         }
     })
 }

package/bin/index.js

@@ -4,11 +4,12 @@ import yargs from "yargs";
 import axios from "axios";
 import { promises as fs } from "fs";
 import { runInThisContext } from "vm";
+import { env } from "../envs/env.js"
 
 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)",
+        describe: `Server URL (ex: ${env.BIZA_SERVER_LINK} or http://192.168.1.1 or https://finaapi.imamatek.com)`,
         type: "string",
         demandOption: true
     })

package/bin/uploadApp.js

@@ -10,14 +10,13 @@ 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)",
+        describe: `Server URL (ex: ${env.BIZA_SERVER_LINK} or http://192.168.1.1 or https://finaapi.imamatek.com)`,
         type: "string",
         demandOption: true
     })
@@ -124,7 +123,6 @@ const getFileMinifiedData = async (fileName) => {
             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)
@@ -138,7 +136,6 @@ 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())

package/envs/env.dev.js

@@ -6,5 +6,5 @@ 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: 'http://localhost:3000',
+  BIZA_HUB_SERVER_LINK: 'https://hub.biz-a.id'
 };

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://server.biz-a.id',
+  BIZA_HUB_SERVER_LINK: 'https://hub.biz-a.id'
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "biz-a-cli",
   "nameDev": "biz-a-cli-dev",
-  "version": "2.3.55",
+  "version": "2.3.57",
   "versionDev": "0.0.34",
   "description": "",
   "main": "bin/index.js",

package/readme.md

@@ -3,13 +3,13 @@
 
 ## I. Add BizA App
 
-  ### a. Using Static IP
+  ### a. Using IP Address
 
     BizA add -s [IP of FINA API] -p [default: 212] -i [dbindex] -d [full or relative path to app folder]
 
     Example :
         BizA add -s http://192.168.1.1 -i 2 -d “c:\biza templates\imamatek”
-        BizA add -s http://192.168.1.1 -p 1205 -i 2 -d “c:\biza templates\imamatek”
+        BizA add -s localhost -p 1205 -i 2 -d “c:\biza templates\imamatek”
 
   ### b. Using BizA Hub
 
@@ -70,16 +70,16 @@
 	hub --server [BizA Hub Server] --sub [subdomain] --hostname [ip_API] --port [port_API]
 
 	Example :
-		hub --server https://biz-a.herokuapp.com --sub imamatek --hostname localhost --port 212
+		hub --server https://server.biz-a.id --sub imamatek --hostname localhost --port 212
 
   ### b. Using HTTPs (SSL)
 	hub --server [BizA Hub Server] --sub [subdomain] --hostname [ip_API] --port [port_API] --secure
 
 	Example :
-		hub --server https://biz-a.herokuapp.com --sub imamatek --hostname localhost --port 212 --secure
-		
+		hub --server https://server.biz-a.id --sub imamatek --hostname localhost --port 212 --secure
+
   ### c. Publish Hub
 	hub --server [BizA Hub Server] --sub [subdomain] --hostname [ip_API] --port [port_API] --publish [true]
 
 	Example :
-		hub --server https://biz-a.herokuapp.com --sub imamatek --hostname localhost --port 212 --publish
+		hub --server https://server.biz-a.id --sub imamatek --hostname localhost --port 212 --publish

package/scheduler/datalib.js

@@ -25,17 +25,6 @@ if (process.env.NODE_ENV !== 'production') {
     logger.add(new transports.Console({ format: format.simple(), level: 'info' }))
 }
 
-
-
-// let BIZA_SERVER_LINK;
-
-// // if ((process.env.NODE_ENV == undefined) || (process.env.NODE_ENV == 'development')) {
-// if ((MODE == undefined) || (MODE == 'development')) {
-//     BIZA_SERVER_LINK = envDev.BIZA_SERVER_LINK;
-// } else {
-//     BIZA_SERVER_LINK = env.BIZA_SERVER_LINK;
-// };
-
 export function mapData2Key(res, cols) {
     return res.map(e => {
         return cols.reduce((o, k) => {

package/tests/hub.test.js

@@ -268,7 +268,7 @@ describe('Hub event tests', () => {
                 statusText: 'Success',
                 headers: {'res-header': 'aa'},
                 body: 'body of response',
-                url: `${apiAddress}:${port}/test`
+                url: `http://${apiAddress}:${port}/test`
             })
 
             expect(error).toBe(null)
@@ -335,7 +335,7 @@ describe('Hub event tests', () => {
             expect(error).toStrictEqual({
                 status: 401,
                 statusText: 'bad subdomain',
-                url: `${apiAddress}:${port}/test`
+                url: `http://${apiAddress}:${port}/test`
             })
 
             expect(mockedRequest).not.toHaveBeenCalledWith()
@@ -349,16 +349,6 @@ describe('Hub event tests', () => {
         let hubServer
 
         try {
-            mockedRequest = jest.spyOn(axios, 'request')
-            mockedRequest.mockClear()
-            mockedRequest.mockResolvedValueOnce({
-                status: 200,
-                statusText: 'Success',
-                headers: {'res-header': 'aa'},
-                data: 'body of response',
-                config: {baseURL: 'localhost', url: '/test'}
-            })
-
             hubServer = new ioServer(9998)
             hubServer.on('connection', (sock)=>hubToCLISocket = sock)
 
@@ -381,24 +371,37 @@ describe('Hub event tests', () => {
 
             await toPromise(resolve => cliToHubSocket.once('connect', ()=>resolve()))
 
-            const [error, response] = await toPromise(resolve => {
+            const emitApiRequest = async (reqData)=>{
+                const [error, response] = await toPromise(resolve => {
                     hubToCLISocket.emit(
-                    'apiRequest'
-                    , {subDomain: subdomain, method: 'POST', path: '/test', headers: {'req-header': 'aa'}, body: 'body of request', responseType: 'json'}
-                    , (res, err)=>{resolve([res, err])}
-                )
+                        'apiRequest'
+                        , {subDomain: subdomain, method: 'POST', path: '/test', headers: {'req-header': 'aa'}, body: reqData, responseType: 'json'}
+                        , (res, err)=>{resolve([res, err])}
+                    )
+                })
+                return {error, response}
+            }
+
+            mockedRequest = jest.spyOn(axios, 'request')
+            mockedRequest.mockResolvedValue({
+                status: 200,
+                statusText: 'Success',
+                headers: {'res-header': 'aa'},
+                data: 'body of response',
+                config: {baseURL: 'localhost', url: '/test'}
             })
 
-            expect(response).toStrictEqual({
+            // without parameterize apiAddress
+            mockedRequest.mockClear()
+            let result = await emitApiRequest('body of request')
+            expect(result.response).toStrictEqual({
                 status: 200,
                 statusText: 'Success',
                 headers: {'res-header': 'aa'},
                 body: 'body of response',
-                url: `127.0.0.1:${port}/test`
+                url: `http://127.0.0.1:${port}/test`
             })
-
-            expect(error).toBe(null)
-
+            expect(result.error).toBe(null)
             expect(mockedRequest).toHaveBeenCalledWith({
                 timeout: 30*1000,
                 baseURL: `http://127.0.0.1:${port}`,
@@ -409,6 +412,51 @@ describe('Hub event tests', () => {
                 responseType: 'json',
                 maxContentLength: Infinity,
             })
+
+            // parameterize API address as String
+            mockedRequest.mockClear()
+            result = await emitApiRequest(JSON.stringify({other: 'data', apiAddress: 'http://apiHost:apiPort'}))
+            expect(result.response).toStrictEqual({
+                status: 200,
+                statusText: 'Success',
+                headers: {'res-header': 'aa'},
+                body: 'body of response',
+                url: 'http://apiHost:apiPort/test'
+            })
+            expect(result.error).toBe(null)
+            expect(mockedRequest).toHaveBeenCalledWith({
+                timeout: 30*1000,
+                baseURL: 'http://apiHost:apiPort',
+                url: '/test',
+                method: "POST",
+                headers: {'req-header': 'aa'},
+                data: JSON.stringify({other: 'data'}),
+                responseType: 'json',
+                maxContentLength: Infinity,
+            })
+
+            // parameterize API address as Object
+            mockedRequest.mockClear()
+            result = await emitApiRequest({other: 'data', apiAddress: 'http://apiHost:apiPort'})
+            expect(result.response).toStrictEqual({
+                status: 200,
+                statusText: 'Success',
+                headers: {'res-header': 'aa'},
+                body: 'body of response',
+                url: 'http://apiHost:apiPort/test'
+            })
+            expect(result.error).toBe(null)
+            expect(mockedRequest).toHaveBeenCalledWith({
+                timeout: 30*1000,
+                baseURL: 'http://apiHost:apiPort',
+                url: '/test',
+                method: "POST",
+                headers: {'req-header': 'aa'},
+                data: {other: 'data'},
+                responseType: 'json',
+                maxContentLength: Infinity,
+            })
+
         }
         finally {
             freeSocketClient(cliToHubSocket)