biz-a-cli 2.3.61 → 2.3.63

package/bin/directHubEvent.js

@@ -1,6 +1,7 @@
 import { apiRequestListener, RECONNECT_SOCKET_DELAY } from './hubEvent.js'
 import { deploymentListenerForVSCode } from './deployEvent.js'
 import { Tunnel as QuickTunnel } from 'cloudflared'
+import { Server as ioServer } from 'socket.io'
 
 export const CLIENT_ROOM = 'clientRoom'
 
@@ -46,25 +47,40 @@ export async function localhostTunnel(port, notifier){
 
 export function directHubEvent(serverSocket, argv){
     serverSocket.on('connection', (clientSocket) => {
+
+        const setConnectListeners = (sock)=>{
+            // shall not log in production mode
+            if (process.env.NODE_ENV !== 'production') {
+                const id = `<${sock.handshake?.query?.isClient ? `Client` : sock.handshake?.query?.isDeploy ? 'Deployer' : 'Anonymous'}> ${sock.id}`;
+                console.log(id, `connected`)
+                sock.on('disconnect', (reason)=>{
+                    console.log(id, `disconnected. Reason : ${reason}`)
+                })
+            };
+        };
+
         if (clientSocket.handshake.query.isClient) {
-            clientSocket.join(CLIENT_ROOM);
+            setConnectListeners(clientSocket);
             apiRequestListener(clientSocket, argv);
+            clientSocket.join(CLIENT_ROOM);
         }
         else if (clientSocket.handshake.query.isDeploy) {
+            setConnectListeners(clientSocket);
             deploymentListenerForVSCode(clientSocket, argv)
+        } else {
+            clientSocket.disconnect();
         }
-
-        // 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}`;
-            console.log(id, `connected`)
-            clientSocket.on('disconnect', (reason)=>{
-                console.log(id, `disconnected. Reason : ${reason}`)
-            })
-        };
     })
 }
 
-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'])
-}
+export function createSocketServer(httpServer, cliIpAddress='127.0.0.1'){
+    return new ioServer(
+        httpServer,
+        {
+            cors: {origin: ['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'])},
+            maxHttpBufferSize: 1e8, // 100 MB
+            pingInterval: 35000, // default = 25000
+            pingTimeout: 30000 // default = 20000
+        }
+    );
+};

package/bin/hub.js

@@ -8,9 +8,8 @@ import yargs from 'yargs';
 import { io as ioClient } from "socket.io-client";
 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, getSocketCORSOrigin }from './directHubEvent.js'
+import { directHubEvent, localhostTunnel, createSocketServer }from './directHubEvent.js'
 import { env } from "../envs/env.js"
 
 const logger = createLogger({
@@ -132,7 +131,11 @@ app.use(express.json({ limit: '100mb' }));
 
 app.set('args', argv);
 
-app.use('/cb', runCliScript);
+let socket = null
+app.use('/cb', (req, res)=>{
+    req.socket = socket
+    runCliScript(req, res)
+});
 
 app.use('/status', (req, res)=>{
     res.status(200).json(argv.cliAddress());
@@ -158,7 +161,7 @@ await streamEvent(ioClient(argv['server'], {query: {isSockStream: true }}), argv
 
 // as socket client to BizA HUB
 if (argv.hubServer) {
-    hubEvent(ioClient(argv['hubServer'], { reconnectionDelay: RECONNECT_SOCKET_DELAY, reconnectionDelayMax: RECONNECT_SOCKET_DELAY, query: {isCLI: true, room: argv['subdomain']} }), argv, (url)=>{
+    socket = hubEvent(ioClient(argv['hubServer'], { reconnectionDelay: RECONNECT_SOCKET_DELAY, reconnectionDelayMax: RECONNECT_SOCKET_DELAY, query: {isCLI: true, room: argv['subdomain']} }), argv, (url)=>{
         if (url!==argv.connectedHubUrl) {
             argv.connectedHubUrl = url
         }
@@ -166,7 +169,8 @@ if (argv.hubServer) {
 }
 
 // as socket server for BizA Client and BizA devTools
-directHubEvent(new ioServer(server, {cors: {origin: getSocketCORSOrigin(argv.cliAddress().ip)}}), argv);
+directHubEvent(createSocketServer(server, argv.cliAddress().ip), argv);
+
 if (argv.publish==true) {
     localhostTunnel(argv.serverport, (url)=>{ // publish CLI
         if (url!==argv.connectedPublicUrl) {

package/bin/hubEvent.js

@@ -128,6 +128,7 @@ export const streamEvent = async (socket, argv) => new Promise((resolve, reject)
     socket.io.on('reconnect', ()=>{
         console.log(`${new Date()}: ${getIdText(id)}reconnecting to BizA Server`)
     })
+    return socket
 })
 
 export const hubEvent = (socket, argv, notifier)=>{
@@ -160,11 +161,11 @@ export const hubEvent = (socket, argv, notifier)=>{
     })
     apiRequestListener(socket, argv);
     deploymentListenerForHubServer(socket, argv);
+    return socket
 }
 
 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{
@@ -176,14 +177,23 @@ export const apiRequestListener = (socket, argv)=>{
             }
         } catch (error) {}
 
-        const socketResponse = (resp)=>{return {
-            status: resp.status,
-            statusText: resp.statusText,
-            headers: resp.headers,
-            body: resp.data,
-            url: apiAddress + resp.config.url
-        }}
-
+        const socketResponse = (resp)=>{
+            const cliAddress = argv.cliAddress();
+            let cliAddressHeaders = {};
+            if (cliAddress.publicUrl) {
+                cliAddressHeaders['biza-cli-address'] = cliAddress.publicUrl;
+            };
+            if (cliAddress.hubUrl) {
+                cliAddressHeaders['biza-hub-address'] = cliAddress.hubUrl;
+            };
+            return {
+                status: resp.status,
+                statusText: resp.statusText,
+                headers: {...resp.headers, ...cliAddressHeaders},
+                body: resp.data,
+                url: apiAddress + resp.config.url
+            };
+        };
         if (argv['subdomain'].localeCompare(reqData.subDomain)==0) {
             axios.request({
                 timeout          : (reqData.timeout || IDLE_SOCKET_TIMEOUT_MILLISECONDS),

package/callbackController.js

@@ -26,7 +26,7 @@ export async function runCliScript(req, res) {
         let script = await loadCliScript(selectedConfig, 'ID', req.body.query.scriptid);
         let functions = await extractFunctionScript(selectedConfig, script);
         if (functions) {
-            let respon = await functions.onInit(data);
+            let respon = await functions.onInit(data, req.socket);
             res.send(respon);
 
             console.log(`Run Callback Successfully!`);

package/package.json

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

package/scheduler/datalib.js

@@ -167,7 +167,8 @@ export async function extractFunctionScript(selectedConfig, data) {
         axios: axios.default,
         dayjs: dayjs.default,
         crypto: crypto,
-        log: logger
+        log: logger,
+        data: {sendModel, queryData, crudData, genId, getUrlAndParam}
     }
 
     if (scriptFn().functions.useLibrary) {

package/tests/deployment.test.js

@@ -3,7 +3,7 @@ import { getAppData, onScriptChangeFromVsCode, onScriptChangeFromHubServer} from
 import { io as ioClient, Socket, Manager } from "socket.io-client";
 import { expect, jest } from '@jest/globals';
 import axios from "axios";
-import { directHubEvent, getSocketCORSOrigin, CLIENT_ROOM } from '../bin/directHubEvent.js'
+import { directHubEvent, CLIENT_ROOM } from '../bin/directHubEvent.js'
 import { createDecipheriv } from 'node:crypto'
 import { hubEvent } from '../bin/hubEvent.js';
 
@@ -38,18 +38,6 @@ describe('Deployment', () => {
         jest.restoreAllMocks()
     })
 
-    it('shall allow origins', ()=>{
-        expect(getSocketCORSOrigin(hostname)).toStrictEqual([
-            'https://biz-a.id',
-            'https://test.biz-a.id',
-            /\.biz-a\.id$/,
-            'vscode-file://vscode-app',
-            /\.vscode-cdn\.net$/,
-            `http://${hostname}:4200`,
-            'http://localhost:4200'
-        ])
-    })
-
     it('shall get app list from database', async ()=>{
         // Failed : check for error message
         const requestSpy = jest.spyOn(axios, 'request').mockResolvedValueOnce({
@@ -174,7 +162,7 @@ describe('Deployment', () => {
                 jest.spyOn(console, 'log').mockImplementation()
 
                 vsCodeToCLISock = await toPromise((resolve)=>{
-                    const sock = ioClient(`http://${hostname}:${port}`).on('connect', async ()=>{
+                    const sock = ioClient(`http://${hostname}:${port}`, {query: {isDeploy: true}}).on('connect', async ()=>{
                         serverSideSock = (await cliSocketServer.fetchSockets()).find((s)=>s.id==sock.id)
 
                         // if using socket.broadcast.emit()

package/tests/hub.test.js

@@ -9,7 +9,7 @@ import tls from 'node:tls'
 import ss from 'socket.io-stream'
 import { Writable, pipeline } from 'node:stream'
 import { text } from 'node:stream/consumers'
-import { directHubEvent } from '../bin/directHubEvent.js'
+import { directHubEvent, createSocketServer } from '../bin/directHubEvent.js'
 
 let socketsBySubdomain = {};
 
@@ -234,8 +234,7 @@ describe('Hub event tests', () => {
 
         beforeAll(()=>{
             cliSocketServer = new ioServer(9999)// mocking of CLI socket server
-            directHubEvent(cliSocketServer, {subdomain, hostname: apiAddress, port, secure: false})
-
+            directHubEvent(cliSocketServer, {subdomain, hostname: apiAddress, port, secure: false, cliAddress: ()=>{return {ip: '59.60.1.22', port: '3002', address: `59.60.1.22:3002`, publicUrl: 'https://some.public.url', hubUrl: 'https://some.hub.url'}}});
             clientToCliSocket = ioClient('http://localhost:9999', {query: {isClient:true}})
         })
 
@@ -260,14 +259,16 @@ describe('Hub event tests', () => {
                 clientToCliSocket.emit(
                     'apiRequest'
                     , {subDomain: subdomain, method: 'POST', path: '/test', headers: {'req-header': 'aa'}, body: 'body of request', responseType: 'json'}
-                    , (err, res)=>{resolve([err, res])}
+                    , (err, res)=>{
+                        resolve([err, res])
+                    }
                 )
             })
 
             expect(response).toStrictEqual({
                 status: 200,
                 statusText: 'Success',
-                headers: {'res-header': 'aa'},
+                headers: {'res-header': 'aa', "biza-cli-address": "https://some.public.url", "biza-hub-address": "https://some.hub.url"},
                 body: 'body of response',
                 url: `http://${apiAddress}:${port}/test`
             })
@@ -398,7 +399,7 @@ describe('Hub event tests', () => {
             expect(result.response).toStrictEqual({
                 status: 200,
                 statusText: 'Success',
-                headers: {'res-header': 'aa'},
+                headers: {'res-header': 'aa', "biza-cli-address": "https://some.tunnel.url"},
                 body: 'body of response',
                 url: `http://127.0.0.1:${port}/test`
             })
@@ -420,7 +421,7 @@ describe('Hub event tests', () => {
             expect(result.response).toStrictEqual({
                 status: 200,
                 statusText: 'Success',
-                headers: {'res-header': 'aa'},
+                headers: {'res-header': 'aa', 'biza-cli-address': 'https://some.tunnel.url'},
                 body: 'body of response',
                 url: 'http://apiHost:apiPort/test'
             })
@@ -442,7 +443,7 @@ describe('Hub event tests', () => {
             expect(result.response).toStrictEqual({
                 status: 200,
                 statusText: 'Success',
-                headers: {'res-header': 'aa'},
+                headers: {'res-header': 'aa', 'biza-cli-address': 'https://some.tunnel.url'},
                 body: 'body of response',
                 url: 'http://apiHost:apiPort/test'
             })
@@ -467,4 +468,27 @@ describe('Hub event tests', () => {
         }
     })
 
+    test('shall create socket server with correct options', ()=>{
+        const sockHttpServer = createServer();
+        const sockServer = createSocketServer(sockHttpServer, '1.2.3.4');
+        try {
+            const opts = sockServer.opts;
+            expect(opts.cors.origin).toStrictEqual([
+                'https://biz-a.id',
+                'https://test.biz-a.id',
+                /\.biz-a\.id$/,
+                'vscode-file://vscode-app',
+                /\.vscode-cdn\.net$/,
+                'http://1.2.3.4:4200',
+                'http://localhost:4200'
+            ]);
+            expect(opts.maxHttpBufferSize).toBe(1e8);
+            expect(opts.pingInterval).toBe(35000);
+            expect(opts.pingTimeout).toBe(30000);
+        } finally {
+            sockServer.close();
+            sockHttpServer.close();
+        };
+    });
+
 })

package/constanta.js

@@ -1,8 +0,0 @@
-export const ECODE = {
-    API: 'EAPI',
-    FULL: 'full'
-}
-export const MSG = {
-    E_USER_PASS_IN_API: 'Username or password is not valid. Check database no:1 in API',
-    E_LICENSE_FULL: 'The license is full.',
-}