iosignal-cli 1.7.0 → 2.0.0

package/bin/io-keygen.js

@@ -1,45 +1,47 @@
-#!/usr/bin/env node
-
-import { RAND } from 'iosignal'
-
-// base64 from random n-byte 
-function rand_b64(srcByteSize) {
-  return RAND(srcByteSize).toString('base64')
-}
-
-// accept 1 ~ 12
-function rand_number_string(len) {
-  if (len > 12) throw new RangeError("Member: rand_number range is over.")
-
-  let bigNumberBuffer, n, nString;
-  const cropFrom = 1;
-  do {
-    bigNumberBuffer = RAND(8);
-    n = bigNumberBuffer.readBigUInt64LE(0);
-    nString = n.toString()
-    // console.log('>', n )
-  } while ((n < 2 ** 44) || nString[cropFrom] == '0')  // 44-> 14digit.
-
-  nString = nString.substring(cropFrom, len + cropFrom)
-  return nString
-}
-
-
-let key20 = rand_b64(15)
-let did4 = rand_b64(3)
-let did8 = rand_b64(6)
-let randNumber4 = rand_number_string(4)
-let randNumber8 = rand_number_string(8)
-// console.log('rand number 8chars', rand_number_string(8) )
-// console.log('random 15bytes as base64 20chars: ', key )
-// console.log('random 3bytes as base64 4chars: ', did )
-
-console.log('\n random values')
-console.log('+------------------------------------+')
-console.log('| ID:', did4, ' KEY:', key20)
-console.log('+------------------------------------+')
-console.log('| ID_KEY: ', did4 + '.' + key20)
-console.log('+------------------------------------+')
-console.log('| numbers: ', randNumber4, randNumber8)
-console.log('+------------------------------------+')
-console.log('')
+#!/usr/bin/env node
+import { Boho } from 'iosignal'
+
+// base64 from random n-byte 
+function rand_b64(srcByteSize) {
+  return Boho.RAND(srcByteSize).toString('base64')
+}
+
+// accept 1 ~ 12
+function rand_number_string(len) {
+  if (len > 12) throw new RangeError("Member: rand_number range is over.")
+
+  let bigNumberBuffer, n, nString;
+  const cropFrom = 1;
+  do {
+    bigNumberBuffer = Boho.RAND(8);
+    n = bigNumberBuffer.readBigUInt64LE(0);
+    nString = n.toString()
+    // console.log('>', n )
+  } while ((n < 2 ** 44) || nString[cropFrom] == '0')  // 44-> 14digit.
+
+  nString = nString.substring(cropFrom, len + cropFrom)
+  return nString
+}
+
+
+let key20 = rand_b64(15)
+let key40 = rand_b64(30)
+let did4 = rand_b64(3)
+let did8 = rand_b64(6)
+let randNumber4 = rand_number_string(4)
+let randNumber8 = rand_number_string(8)
+// console.log('rand number 8chars', rand_number_string(8) )
+// console.log('random 15bytes as base64 20chars: ', key )
+// console.log('random 3bytes as base64 4chars: ', did )
+
+console.log('\n random values')
+console.log('+----------------------------------------------------+')
+console.log('| ID:', did4, ' KEY L20:', key20)
+console.log('+----------------------------------------------------+')
+console.log('| ID_KEY: ', did4 + '.' + key20)
+console.log('+----------------------------------------------------+')
+console.log('| numbers: ', randNumber4, randNumber8)
+console.log('+----------------------------------------------------+')
+console.log('| b64_L40: ', key40)
+console.log('+----------------------------------------------------+')
+console.log('')

package/bin/io-server.js

@@ -1,104 +1,104 @@
-#!/usr/bin/env node
-
-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
-} from 'iosignal'
-
-
-
-program
-  .version(version)
-  .usage('[options] (--listen <port> )')
-  .option('-l, --listen <port>', 'listen on port (start WebSocket Server)')
-  .option('-L, --listen-congport <port>', 'listen on cong port (start CongSocket Server)')
-  .option('-d, --auth-file <path>', 'auth data file path')
-  .option('-e, --auth-param <id.key.level>', 'auth data from argument: id.key.level,id2.key2.level2')
-  .option('-E, --auth-env', 'auth data from shell env BOHO_AUTH')
-  .option('-r, --auth-redis', 'connect to redis. if exist use env REDIS_HOST, REDIS_PORT or localhost:6379')
-  .option('-t, --timeout <milliseconds>', 'ping period & timeout')
-  .option('-m, --metric <type>', 'show metric <number> 1:traffic, 2:echo')
-  .option('-s, --show-message <none|message>', 'show receive message. ')
-  .option('-f, --file-logger', 'write log files.')
-  .option('-a, --api-list [list...]', 'one or multiple api names:  -a api_1 api_2 ')
-  .option('-o, --show-options', 'show server init options.')
-  .parse(process.argv)
-
-const options = program.opts()
-
-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
-}
-
-if (options.metric) {
-  serverOption.showMetric = options.metric
-}
-
-if (options.timeout) {
-  serverOption.timeout = options.timeout
-}
-
-
-let authManager;
-let redisClient;
-
-if (options.authFile) {
-  console.log("auth data origin: auth_file")
-  let authFilePath = options.authFile;
-  authManager = new Auth_File(authFilePath)
-} else if (options.authParam) {
-  authManager = new Auth_Env(options.authParam)
-} else if (options.authEnv) {
-  authManager = new Auth_Env()
-} else if (options.authRedis) {
-  console.log("auth data origin: redis")
-  // console.log('####### default redis server url: redis://localhost:6379 ' )   
-  redisClient = createClient();
-  redisClient.on('error', (err) => console.log('Redis Client Error', err));
-  redisClient.connect();
-  authManager = new Auth_Redis(redisClient)
-} else {
-  // console.log("No authentication support.")
-
-}
-
-
-const server = new Server(serverOption, authManager)
-
-if (options.apiList && options.apiList.length > 0) {
-  let apiList = options.apiList
-  console.log('api list', apiList)
-  if (apiList.includes('reply')) server.api('reply', api_reply)
-  if (apiList.includes('sudo')) server.api('sudo', api_sudo)
-  if (apiList.includes('redis')) server.api('redis', new RedisAPI(redisClient))
-
-}
-
-if (options.showOptions) {
-  console.log('ServerOptions:', serverOption)
-  console.log('server api list', server.apiNames)
-}
-
-console.log( serverInfo( serverOption.port , serverOption.congPort ))
-
-if( !serverOption.port && !serverOption.congPort ){
-  process.exit()
+#!/usr/bin/env node
+
+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
+} from 'iosignal'
+
+
+
+program
+  .version(version)
+  .usage('[options] (--listen <port> )')
+  .option('-l, --listen <port>', 'listen on port (start WebSocket Server)')
+  .option('-L, --listen-congport <port>', 'listen on cong port (start CongSocket Server)')
+  .option('-d, --auth-file <path>', 'auth data file path')
+  .option('-e, --auth-param <id.key.level>', 'auth data from argument: id.key.level,id2.key2.level2')
+  .option('-E, --auth-env', 'auth data from shell env BOHO_AUTH')
+  .option('-r, --auth-redis', 'connect to redis. if exist use env REDIS_HOST, REDIS_PORT or localhost:6379')
+  .option('-t, --timeout <milliseconds>', 'ping period & timeout')
+  .option('-m, --metric <type>', 'show metric <number> 1:traffic, 2:echo')
+  .option('-s, --show-message <none|message>', 'show receive message. ')
+  .option('-f, --file-logger', 'write log files.')
+  .option('-a, --api-list [list...]', 'one or multiple api names:  -a api_1 api_2 ')
+  .option('-o, --show-options', 'show server init options.')
+  .parse(process.argv)
+
+const options = program.opts()
+
+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
+}
+
+if (options.metric) {
+  serverOption.showMetric = options.metric
+}
+
+if (options.timeout) {
+  serverOption.timeout = options.timeout
+}
+
+
+let authManager;
+let redisClient;
+
+if (options.authFile) {
+  console.log("auth data origin: auth_file")
+  let authFilePath = options.authFile;
+  authManager = new Auth_File(authFilePath)
+} else if (options.authParam) {
+  authManager = new Auth_Env(options.authParam)
+} else if (options.authEnv) {
+  authManager = new Auth_Env()
+} else if (options.authRedis) {
+  console.log("auth data origin: redis")
+  // console.log('####### default redis server url: redis://localhost:6379 ' )   
+  redisClient = createClient();
+  redisClient.on('error', (err) => console.log('Redis Client Error', err));
+  redisClient.connect();
+  authManager = new Auth_Redis(redisClient)
+} else {
+  // console.log("No authentication support.")
+
+}
+
+
+const server = new Server(serverOption, authManager)
+
+if (options.apiList && options.apiList.length > 0) {
+  let apiList = options.apiList
+  console.log('api list', apiList)
+  if (apiList.includes('reply')) server.api('reply', api_reply)
+  if (apiList.includes('sudo')) server.api('sudo', api_sudo)
+  if (apiList.includes('redis')) server.api('redis', new RedisAPI(redisClient))
+
+}
+
+if (options.showOptions) {
+  console.log('ServerOptions:', serverOption)
+  console.log('server api list', server.apiNames)
+}
+
+console.log(serverInfo(serverOption.port, serverOption.congPort))
+
+if (!serverOption.port && !serverOption.congPort) {
+  process.exit()
 }

package/bin/ioip.js

@@ -1,6 +1,6 @@
-#!/usr/bin/env node
-
-import { getNetworkAddress } from './serverInfo.js'
-let ip = getNetworkAddress()
-console.log( ip )
-
+#!/usr/bin/env node
+
+import { getNetworkAddress } from './serverInfo.js'
+let ip = getNetworkAddress()
+console.log( ip )
+

package/bin/serverInfo.js

@@ -1,68 +1,68 @@
-import { networkInterfaces as getNetworkInterfaces } from 'node:os';
-const networkInterfaces = getNetworkInterfaces();
-import chalk from 'chalk';
-import boxen from 'boxen';
-
-
-export function getNetworkAddress (){
-    for (const interfaceDetails of Object.values(networkInterfaces)) {
-      if (!interfaceDetails) continue;
-  
-      for (const details of interfaceDetails) {
-        const { address, family, internal } = details;
-  
-        if (family === 'IPv4' && !internal) return address;
-      }
-    }
-  };
-
-
-export function serverInfo ( wsPort, congPort ){
-  // console.log('wsPort', wsPort, 'congPort', congPort)
-    let ip = getNetworkAddress();
-    let message
-    
-    if( wsPort || congPort ){
-      message = chalk.green('Serving');
-    }else{
-      message = chalk.green('please use -l and -L option to select port number.');
-      message += chalk.yellow('\n\n $ io-server -l 7777');
-      message += chalk.green('  // iosignal over websocket.');
-      message += chalk.yellow('\n\n $ io-server -L 8888');
-      message += chalk.green('  // iosignal over congsocket.');
-      message += chalk.yellow('\n\n $ io-server -l 7777 -L 8888');
-      message += chalk.green('  // suppport both.');
-      message += chalk.yellow('\n\n $ io-server -h');
-      message += chalk.green('  // display help');
-    }
-
-    const prefix = '- '
-    const space = '    '
-
-    if(wsPort){
-      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}`;
-    }else{
-
-    }
-
-    if(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 += chalk.yellow('\n\n Arduino');
-        message += `\n ${chalk.bold(`${prefix}host:`)} ${ip}`;
-        message += `\n ${chalk.bold('- port:')} ${congPort }`;
-
-    }
-
-    return boxen(message, { padding: 1, borderColor: 'green', margin: 1, })
-
+import { networkInterfaces as getNetworkInterfaces } from 'node:os';
+const networkInterfaces = getNetworkInterfaces();
+import chalk from 'chalk';
+import boxen from 'boxen';
+
+
+export function getNetworkAddress (){
+    for (const interfaceDetails of Object.values(networkInterfaces)) {
+      if (!interfaceDetails) continue;
+  
+      for (const details of interfaceDetails) {
+        const { address, family, internal } = details;
+  
+        if (family === 'IPv4' && !internal) return address;
+      }
+    }
+  };
+
+
+export function serverInfo ( wsPort, congPort ){
+  // console.log('wsPort', wsPort, 'congPort', congPort)
+    let ip = getNetworkAddress();
+    let message
+    
+    if( wsPort || congPort ){
+      message = chalk.green('Serving');
+    }else{
+      message = chalk.green('please use -l and -L option to select port number.');
+      message += chalk.yellow('\n\n $ io-server -l 7777');
+      message += chalk.green('  // iosignal over websocket.');
+      message += chalk.yellow('\n\n $ io-server -L 8888');
+      message += chalk.green('  // iosignal over congsocket.');
+      message += chalk.yellow('\n\n $ io-server -l 7777 -L 8888');
+      message += chalk.green('  // suppport both.');
+      message += chalk.yellow('\n\n $ io-server -h');
+      message += chalk.green('  // display help');
+    }
+
+    const prefix = '- '
+    const space = '    '
+
+    if(wsPort){
+      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}`;
+    }else{
+
+    }
+
+    if(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 += chalk.yellow('\n\n Arduino');
+        message += `\n ${chalk.bold(`${prefix}host:`)} ${ip}`;
+        message += `\n ${chalk.bold('- port:')} ${congPort }`;
+
+    }
+
+    return boxen(message, { padding: 1, borderColor: 'green', margin: 1, })
+
 }

package/package.json

@@ -1,42 +1,42 @@
-{
-  "name": "iosignal-cli",
-  "version": "1.7.0",
-  "description": "IOSignal server and client CLI program.",
-  "type": "module",
-  "bin": {
-    "io-server": "./bin/io-server.js",
-    "io-client": "./bin/io-client.js",
-    "ios": "./bin/io-server.js",
-    "io": "./bin/io-client.js",
-    "ioip": "./bin/ioip.js",
-    "io-keygen": "./bin/io-keygen.js"
-  },
-  "author": {
-    "name": "Lee Dongeun",
-    "email": "sixgen@gmail.com"
-  },
-  "license": "MIT",
-  "dependencies": {
-    "boxen": "^7.1.1",
-    "chalk": "^5.3.0",
-    "commander": "^12.1.0",
-    "iosignal": "^1.7.0",
-    "meta-buffer-pack": "^1.4.0",
-    "redis": "^4.6.12"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/remocons/iosignal-cli.git"
-  },
-  "homepage": "https://iosignal.net",
-  "keywords": [
-    "websocket",
-    "pubsub",
-    "arduino",
-    "iot",
-    "auth",
-    "signal",
-    "CLI",
-    "remocon"
-  ]
-}
+{
+  "name": "iosignal-cli",
+  "version": "2.0.0",
+  "description": "IOSignal server and client CLI program.",
+  "type": "module",
+  "bin": {
+    "io-server": "./bin/io-server.js",
+    "io-client": "./bin/io-client.js",
+    "ios": "./bin/io-server.js",
+    "io": "./bin/io-client.js",
+    "ioip": "./bin/ioip.js",
+    "io-keygen": "./bin/io-keygen.js"
+  },
+  "author": {
+    "name": "Lee Taeo",
+    "email": "taeo.mocha@gmail.com"
+  },
+  "license": "MIT",
+  "dependencies": {
+    "boxen": "^8.0.1",
+    "chalk": "^5.3.0",
+    "commander": "^12.1.0",
+    "iosignal": "^2.0.0",
+    "meta-buffer-pack": "^2.0.2",
+    "redis": "^4.7.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/remocons/iosignal-cli.git"
+  },
+  "homepage": "https://iosignal.net",
+  "keywords": [
+    "websocket",
+    "pubsub",
+    "arduino",
+    "iot",
+    "auth",
+    "signal",
+    "CLI",
+    "remocon"
+  ]
+}

package/test_auth_redis/redis_addAdmin.js

@@ -1,32 +1,32 @@
-import { Auth_Redis } from 'iosignal'
-import { createClient  } from 'redis';
-
-let redisClient = createClient();
-redisClient.on('error', (err) => console.log('Redis Client Error', err));
-redisClient.connect();
-
-let auth = new Auth_Redis( redisClient)
-
-//addUSer(did,dkey,cid,level)
-if( process.argv.length != 5 ){
-  console.log('=> $ node addAdmin.js id key cid')
-  process.exit()
-}
-
-let did = process.argv[2] 
-let dkey = process.argv[3]
-let cid = process.argv[4] 
-
-let addResult = await auth.addAuth( did, dkey, cid ,255)
-let getResult = await auth.getAuth( did )
-let saveResult = await auth.save();
-
-console.log('add',addResult )
-console.log('get',getResult)
-console.log('data.key',getResult.key)
-console.log('save result', saveResult)
-
-process.exit()
-
-
-
+import { Auth_Redis } from 'iosignal'
+import { createClient  } from 'redis';
+
+let redisClient = createClient();
+redisClient.on('error', (err) => console.log('Redis Client Error', err));
+redisClient.connect();
+
+let auth = new Auth_Redis( redisClient)
+
+//addUSer(did,dkey,cid,level)
+if( process.argv.length != 5 ){
+  console.log('=> $ node addAdmin.js id key cid')
+  process.exit()
+}
+
+let did = process.argv[2] 
+let dkey = process.argv[3]
+let cid = process.argv[4] 
+
+let addResult = await auth.addAuth( did, dkey, cid ,255)
+let getResult = await auth.getAuth( did )
+let saveResult = await auth.save();
+
+console.log('add',addResult )
+console.log('get',getResult)
+console.log('data.key',getResult.key)
+console.log('save result', saveResult)
+
+process.exit()
+
+
+

package/test_auth_redis/redis_addMultipleDevice.js

@@ -1,29 +1,29 @@
-import { Auth_Redis } from 'iosignal'
-import { createClient  } from 'redis';
-
-let redisClient = createClient();
-redisClient.on('error', (err) => console.log('Redis Client Error', err));
-redisClient.connect();
-
-let auth = new Auth_Redis( redisClient)
-
-// node filename base_id level number
-// node uno 1 10
-//addUSer(did,dey,cid,level)
-let baseId = process.argv[2] ? process.argv[2] : 'uno'
-let level = process.argv[3] ? process.argv[3] : 1;
-let n = process.argv[4] ? process.argv[4] : 10;
-
-console.log( baseId, n )
-for(let i=0; i< n ;i++){
-  let id = baseId + i;
-  let addResult = await auth.addAuth( id, id, id ,level)
-  console.log('add',addResult )
-}
-
-await auth.save();
-
-process.exit()
-
-
-
+import { Auth_Redis } from 'iosignal'
+import { createClient  } from 'redis';
+
+let redisClient = createClient();
+redisClient.on('error', (err) => console.log('Redis Client Error', err));
+redisClient.connect();
+
+let auth = new Auth_Redis( redisClient)
+
+// node filename base_id level number
+// node uno 1 10
+//addUSer(did,dey,cid,level)
+let baseId = process.argv[2] ? process.argv[2] : 'uno'
+let level = process.argv[3] ? process.argv[3] : 1;
+let n = process.argv[4] ? process.argv[4] : 10;
+
+console.log( baseId, n )
+for(let i=0; i< n ;i++){
+  let id = baseId + i;
+  let addResult = await auth.addAuth( id, id, id ,level)
+  console.log('add',addResult )
+}
+
+await auth.save();
+
+process.exit()
+
+
+