iosignal-cli 4.6.0 → 4.8.0

package/{auth_file.js → auth_file_sample/auth_file.js}

@@ -3,17 +3,14 @@
   Authentication data sample.
 
   device props: ["did", "key", "cid", level ]
-
     did: ( device id ) authentication id.  maximum 8 chars.
-    key: ( device key ) authentication key. no size limit.
+    key: ( device key ) authentication key. no size limit. recommended ~44 base64 chars.
     cid: ( communication id ) signal target id.  maximum 12 chars. 
-    level:( quota level) <Number>   ref. /server/quotaTable.js
+    level:( quota level) <Number>   ref. /src/common/quotaTable.js
 
 */
 export const authInfo = [
   ["did","passowrd","cid",0],
-  ["device1","device1_key","device1_cid",0],
-  ["device2","device2_key","device2_cid",0],
   ["uno","uno-key","uno",1],
   ["go","go-key","go",2],
   ["bro","bro-key","bro",3],

package/auth_file_sample/auth_file.json

@@ -0,0 +1,9 @@
+[
+  ["did","passowrd","cid",0],
+  ["uno","uno-key","uno",1],
+  ["go","go-key","go",2],
+  ["bro","bro-key","bro",3],
+  ["admin","admin-key","admin",255]
+]
+
+

package/bin/io-client.js

@@ -167,7 +167,8 @@ io.on('ready', () => {
 })
 
 io.on('close', () => {
-  wsConsole.print(Console.Types.Control, `closed`, Console.Colors.Yellow)
+  let date = new Date().toLocaleTimeString()
+  wsConsole.print(Console.Types.Control, `closed ${date}`, Console.Colors.Yellow)
 })
 
 
@@ -206,7 +207,13 @@ io.on('iam_res', (...args) => {
 })
 
 io.on('message',(tag,...args)=>{
-     wsConsole.print(Console.Types.Incoming, `message: ${tag} ${args}`, Console.Colors.Green)
+  let msg ;
+  if(typeof args[0] == 'object'){
+    msg = JSON.stringify( args[0])
+  }else{
+    msg = args;
+  }
+  wsConsole.print(Console.Types.Incoming, `message: ${tag} ${msg}`, Console.Colors.Green)
 })
 
 wsConsole.on('line', (data) => {
@@ -255,7 +262,7 @@ wsConsole.on('line', (data) => {
       case 'sudo':
         toks.shift()
         console.log('sudo toks', toks)
-        io.req('sudo', ...toks).then(res => {
+        io.call('sudo', ...toks).then(res => {
           if (res.ok) {
             console.log('>> sudo response:', res.body)
           } else {
@@ -304,18 +311,17 @@ wsConsole.on('line', (data) => {
         io.set(toks[1])
         break;
 
-      case 'api':
-      case 'req':
+      case 'call':
         toks.shift()
         if (toks.length < 2) {
           wsConsole.print(
             Console.Types.Error,
-            '[.req need at least two params]  req target command [, ..args]',
+            '[.call need at least two params]  call target command [, ..args]',
             Console.Colors.Yellow
           )
           return
         }
-        io.req(...toks).then(result => {
+        io.call(...toks).then(result => {
           console.log('>> response:', result)
         }).catch(e => {
           console.log(e)
@@ -328,13 +334,13 @@ wsConsole.on('line', (data) => {
       case 'listen':
         toks.shift()
         let tag = toks[0]
-        io.subscribe( tag )
-        console.log('subscribe tag', tag)
-        // io.listen(tag, (tag, ...args) => {
-        //   console.log(`subscribe & listen  tag: ${tag} args:`, args)
-
-        // })
-        // io.subscribe_memory_channels()
+        if(tag){
+          io.subscribe( tag )
+          let tagList = tag.split(',')
+          tagList.forEach( (v)=>{ 
+            io.channels.add( v )
+          })
+        }
         break;
 
 

package/bin/io-server.js

@@ -4,7 +4,7 @@ import { createClient } from 'redis';
 import { program } from 'commander'
 import { serverInfo } from './serverInfo.js';
 import {
-  Server, serverOption, api_reply, api_sudo, RedisAPI, version as iosignal_version,
+  Server, serverOption, replyService, sudoService, RedisService, version as iosignal_version,
   BohoAuth, FileKeyProvider, StringKeyProvider, RedisKeyProvider
 } from 'iosignal'
 
@@ -19,14 +19,13 @@ program
   .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('-e, --auth-param <id.key.level>', 'auth data from argument: id1.key.cid1.level1,id2.key2.cid2.level2')
   .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('-a, --attach-services [list...]', 'one or multiple service module names:  -a service1 service2')
   .option('-o, --show-options', 'show server init options.')
   .parse(process.argv)
 
@@ -70,8 +69,6 @@ if (options.authFile) {
   authManager = new BohoAuth( new FileKeyProvider(authFilePath) )
 } else if (options.authParam) {
   authManager = new BohoAuth( new StringKeyProvider(options.authParam) )
-} else if (options.authEnv) {
-  authManager = new BohoAuth( new StringKeyProvider(options.authEnv) )
 } else if (options.authRedis) {
   console.log("auth data origin: redis")
   // console.log('####### default redis server url: redis://localhost:6379 ' )   
@@ -87,26 +84,29 @@ if (options.authFile) {
 
 const server = new Server( privateServerOptions , 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')){
+if (options.attachServices && options.attachServices.length > 0) {
+  let attachServices = options.attachServices
+  if (attachServices.includes('reply')){ 
+    server.attach('reply', replyService)
+  }
+  if (attachServices.includes('sudo')){
+    server.attach('sudo', sudoService)
+  } 
+  if (attachServices.includes('redis')){
     if(!redisClient){
       redisClient = createClient();
       redisClient.on('error', (err) => console.log('Redis Client Error', err));
       redisClient.connect();
     }
-    server.api('redis', new RedisAPI(redisClient))
+    server.attach('redis', new RedisService(redisClient))
   } 
-
+  console.log('registed service names', server.serviceNames)
 }
 
 if (options.showOptions) {
   console.log('global ServerOptions:', serverOption)
   console.log('private ServerOptions:', privateServerOptions)
-  console.log('server api list', server.apiNames)
+  console.log('server serviceNames:', server.serviceNames)
 }
 
 setTimeout(()=>{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iosignal-cli",
-  "version": "4.6.0",
+  "version": "4.8.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": "^4.6.0",
+    "iosignal": "^4.8.0",
     "redis": "4.7.1"
   },
   "repository": {

package/auth_file.json

@@ -1,13 +0,0 @@
-[
-  ["sampleid","samplekey","sample_cid",0],
-  ["id_max8","no_key_size_limit","communication_id",0],
-  ["device1","device1_key","device1_cid",0],
-  ["device2","device2_key","device2_cid",0],
-  ["uno","uno","uno",1],
-  ["go","go","go",2],
-  ["bro","bro","bro",3],
-  ["admin","admin","admin",255],
-  ["adminb","adminb","adminb",255]
-]
-
-