biz-a-cli 2.3.60 → 2.3.61

package/bin/directHubEvent.js

@@ -57,10 +57,10 @@ export function directHubEvent(serverSocket, 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}`;
+            console.log(id, `connected`)
             clientSocket.on('disconnect', (reason)=>{
                 console.log(id, `disconnected. Reason : ${reason}`)
             })
-            console.log(id, `connected`)
         };
     })
 }

package/bin/hub.js

@@ -1,5 +1,9 @@
 #!/usr/bin/env node
 
+if (!process.env.NODE_ENV) {
+    process.env.NODE_ENV = 'production';
+};
+
 import yargs from 'yargs';
 import { io as ioClient } from "socket.io-client";
 import { streamEvent, hubEvent, RECONNECT_SOCKET_DELAY } from './hubEvent.js'
@@ -87,7 +91,8 @@ const argv = yargs(process.argv.slice(2))
         type: 'number',
         demandOption: false
     })
-    .options('hub', {
+    .options('hs', {
+        alias: 'hubServer',
         default: `${env.BIZA_HUB_SERVER_LINK}`,
         describe: 'BizA hub',
         type: 'string',
@@ -129,6 +134,10 @@ app.set('args', argv);
 
 app.use('/cb', runCliScript);
 
+app.use('/status', (req, res)=>{
+    res.status(200).json(argv.cliAddress());
+});
+
 // create HTTP(s) Server
 const keyFile = path.join(import.meta.dirname,  "../cert/key.pem")
 const certFile = path.join(import.meta.dirname,  "../cert/cert.pem")
@@ -148,8 +157,8 @@ server.listen(argv.serverport, () => {
 await streamEvent(ioClient(argv['server'], {query: {isSockStream: true }}), argv); // as socket client to BizA SERVER
 
 // as socket client to BizA HUB
-if (argv.hub) {
-    hubEvent(ioClient(argv['hub'], { reconnectionDelay: RECONNECT_SOCKET_DELAY, reconnectionDelayMax: RECONNECT_SOCKET_DELAY, query: {isCLI: true, room: argv['subdomain']} }), argv, (url)=>{
+if (argv.hubServer) {
+    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
         }

package/bin/hubEvent.js

@@ -134,8 +134,8 @@ export const hubEvent = (socket, argv, notifier)=>{
     let id
     socket.on('connect', ()=>{
         id = socket.id
-        notifier(argv['hub'])
-        console.log(`${new Date()}: ${getIdText(id)}connected to BizA Hub at ${argv['hub']} using sub domain "${argv['subdomain']}"`)
+        notifier(argv['hubServer'])
+        console.log(`${new Date()}: ${getIdText(id)}connected to BizA Hub at ${argv['hubServer']} using sub domain "${argv['subdomain']}"`)
     })
     socket.on('disconnect', (reason)=>{
         notifier('')

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "biz-a-cli",
   "nameDev": "biz-a-cli-dev",
-  "version": "2.3.60",
+  "version": "2.3.61",
   "versionDev": "0.0.34",
   "description": "",
   "main": "bin/index.js",
@@ -14,7 +14,7 @@
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js --watch a",
     "testOnce": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
     "dev": "node --watch server.js",
-    "hub": "set NODE_ENV=production && node --experimental-vm-modules bin/hub.js"
+    "hub": "set NODE_ENV=dev&& node --experimental-vm-modules bin/hub.js"
   },
   "author": "Imamatek",
   "license": "ISC",

package/tests/hub.test.js

@@ -154,7 +154,7 @@ describe('Hub event tests', () => {
                 port: 212,
                 serverport: 3002,
                 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'}},
-                hub: 'https://some.hub.url'
+                hubServer: 'https://some.hub.url'
             })
 
             mockAPIServer = net.createServer((clientSocket)=>{
@@ -363,7 +363,7 @@ describe('Hub event tests', () => {
                     port,
                     serverport: 3002,
                     cliAddress: ()=>{return {ip: '59.60.1.22', port: '3002', address: `59.60.1.22:3002`, publicUrl: 'https://some.tunnel.url'}},
-                    hub: 'https://some.hub.url'
+                    hubServer: 'https://some.hub.url'
                 },
                 (hubUrl)=>{
                     expect(hubUrl).toBe('https://some.hub.url')