iosignal-cli 3.1.1 → 3.2.0

package/bin/io-client.js

@@ -1,11 +1,15 @@
 #!/usr/bin/env node
 
-import { IO, IOCongSocket, ENC_MODE, serverOption } from 'iosignal'
 import { EventEmitter } from 'events'
 import readline from 'readline'
 import tty from 'tty'
 import { program } from 'commander'
-import { version } from './getVersion.js'
+
+import { IO, IOCongSocket, ENC_MODE, version as iosignal_version } from 'iosignal'
+import pkg from '../package.json' with { type: 'json' };
+const cli_version = pkg.version;
+const version = `CLI ${cli_version} IOSignal ${iosignal_version}`
+
 
 class Console extends EventEmitter {
   constructor() {

package/bin/io-server.js

@@ -2,13 +2,15 @@
 
 import { createClient } from 'redis';
 import { program } from 'commander'
-import { version } from './getVersion.js'
 import { serverInfo } from './serverInfo.js';
 import {
   Server, serverOption, Auth_File, Auth_Env, Auth_Redis,
-  api_reply, api_sudo, RedisAPI
+  api_reply, api_sudo, RedisAPI, version as iosignal_version
 } from 'iosignal'
 
+import pkg from '../package.json' with { type: 'json' };
+const cli_version = pkg.version;
+const version = `CLI ${cli_version} IOSignal ${iosignal_version}`
 
 
 program
@@ -30,20 +32,13 @@ program
 
 const options = program.opts()
 
+// global shared serverOption
 if (options.fileLogger) {
   serverOption.fileLogger.connection.use = true;
   serverOption.fileLogger.auth.use = true;
   serverOption.fileLogger.attack.use = true;
 }
 
-if (options.listen) {
-  serverOption.port = parseInt(options.listen)
-}
-
-if (options.listenCongport) {
-  serverOption.congPort = parseInt(options.listenCongport)
-}
-
 if (options.showMessage) {
   serverOption.showMessage = options.showMessage
 }
@@ -56,6 +51,15 @@ if (options.timeout) {
   serverOption.timeout = options.timeout
 }
 
+// private port, congPort
+let privateServerOptions = { };
+if (options.listen) {
+  privateServerOptions.port = parseInt(options.listen)
+}
+
+if (options.listenCongport) {
+  privateServerOptions.congPort = parseInt(options.listenCongport)
+}
 
 let authManager;
 let redisClient;
@@ -81,7 +85,7 @@ if (options.authFile) {
 }
 
 
-const server = new Server(serverOption, authManager)
+const server = new Server( privateServerOptions , authManager);
 
 if (options.apiList && options.apiList.length > 0) {
   let apiList = options.apiList
@@ -93,12 +97,14 @@ if (options.apiList && options.apiList.length > 0) {
 }
 
 if (options.showOptions) {
-  console.log('ServerOptions:', serverOption)
+  console.log('global ServerOptions:', serverOption)
+  console.log('private ServerOptions:', privateServerOptions)
   console.log('server api list', server.apiNames)
 }
 
-console.log(serverInfo(serverOption.port, serverOption.congPort))
-
-if (!serverOption.port && !serverOption.congPort) {
-  process.exit()
-}
+setTimeout(()=>{
+  console.log(serverInfo(server))
+  if ( server.port === null && server.congPort === null ) {
+    process.exit();
+  }
+},1000)

package/bin/serverInfo.js

@@ -17,12 +17,12 @@ export function getNetworkAddress (){
   };
 
 
-export function serverInfo ( wsPort, congPort ){
-  // console.log('wsPort', wsPort, 'congPort', congPort)
+export function serverInfo ( server ){
+
     let ip = getNetworkAddress();
     let message
     
-    if( wsPort || congPort ){
+    if( server.port == 0 || server.port || server.congPort == 0 || server.congPort ){
       message = chalk.green('Serving');
     }else{
       message = chalk.green('please use -l and -L option to select port number.');
@@ -39,27 +39,27 @@ export function serverInfo ( wsPort, congPort ){
     const prefix = '- '
     const space = '    '
 
-    if(wsPort){
+    if(server.port == 0 || server.port){
       message += `\n\n`;
       message += chalk.green('IOSignal Over WebSocket');
       message += chalk.yellow('\n\n Web Browser & Node.js');
-      message += `\n ${chalk.bold(`${prefix}Local:`)}${space}ws://localhost:${wsPort}`;
-      message += `\n ${chalk.bold('- Network:')}  ws://${ip}:${wsPort}`;
+      message += `\n ${chalk.bold(`${prefix}Local:`)}${space}ws://localhost:${server.port}`;
+      message += `\n ${chalk.bold('- Network:')}  ws://${ip}:${server.port}`;
     }else{
 
     }
 
-    if(congPort){
+    if(server.congPort == 0 || server.congPort){
         message += `\n\n`;
         message += chalk.green('IOSignal Over CongSocket');
         message += chalk.yellow('\n\n Node.js');
 
-        message += `\n ${chalk.bold(`${prefix}Local:`)}${space}cong://localhost:${congPort}`;
-        message += `\n ${chalk.bold('- Network:')}  cong://${ip}:${congPort}`;
+        message += `\n ${chalk.bold(`${prefix}Local:`)}${space}cong://localhost:${server.congPort}`;
+        message += `\n ${chalk.bold('- Network:')}  cong://${ip}:${server.congPort}`;
         
         message += chalk.yellow('\n\n Arduino');
         message += `\n ${chalk.bold(`${prefix}host:`)} ${ip}`;
-        message += `\n ${chalk.bold('- port:')} ${congPort }`;
+        message += `\n ${chalk.bold('- port:')} ${server.congPort }`;
 
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iosignal-cli",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "description": "IOSignal server and client CLI program.",
   "type": "module",
   "bin": {
@@ -21,7 +21,7 @@
     "boxen": "8.0.1",
     "chalk": "5.6.2",
     "commander": "13.1.0",
-    "iosignal": "^3.1.0",
+    "iosignal": "^3.2.0",
     "redis": "4.7.1"
   },
   "repository": {

package/bin/getVersion.js

@@ -1,9 +0,0 @@
-import { readFile } from 'fs/promises';
-
-const json = JSON.parse(
-  await readFile(
-    new URL('../package.json', import.meta.url)
-  )
-);
-
-export let version = json.version