iosignal 1.6.0 → 1.7.0

package/indexWebBrowser.js

@@ -1,5 +1,5 @@
 import { IO } from './src/client/IOWebSocket.js'
-import { Boho, RAND, MBP, BohoMsg, Meta, MetaSize , sha256, Buffer } from 'boho'
+import { Boho, RAND, MBP, BohoMsg, Meta, MetaSize, sha256, Buffer } from 'boho'
 
 Boho.RAND = RAND;
 Boho.BohoMsg = BohoMsg;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iosignal",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "iosignal",
   "type": "module",
   "main": "./dist/iosignal.cjs",
@@ -49,7 +49,7 @@
   },
   "homepage": "https://iosignal.net",
   "keywords": [
-    "io",
+    "websocket",
     "pubsub",
     "arduino",
     "iot",

package/src/api/RedisAPI.js

@@ -2,18 +2,18 @@ import { STATUS } from './api_constant.js'
 
 const MIN_LEVEL = 200;
 const COMMANDS = [
-  'GET',       'SET',
-  'HGETALL',   'HGET',
-  'HSET',      'SADD',
+  'GET', 'SET',
+  'HGETALL', 'HGET',
+  'HSET', 'SADD',
   'SISMEMBER', 'SMEMBERS',
-  'EXISTS',    'SREM',
-  'DEL',       'KEYS',
+  'EXISTS', 'SREM',
+  'DEL', 'KEYS',
   'SAVE'
 ]
 
-export class RedisAPI{
-  constructor( redisClient, _minLevel ){
-    if( !redisClient ){
+export class RedisAPI {
+  constructor(redisClient, _minLevel) {
+    if (!redisClient) {
       throw new Error("RedisAPI constructor: no redisClient")
     }
     this.redisClient = redisClient
@@ -22,47 +22,44 @@ export class RedisAPI{
   }
 
 
-  checkPermission(remote ,req){
-    console.log('checkPermission', remote.level , 'vs', this.minLevel  )
-    if( remote.level >= this.minLevel ){
+  checkPermission(remote, req) {
+    console.log('checkPermission', remote.level, 'vs', this.minLevel)
+    if (remote.level >= this.minLevel) {
       return true
-    }else{
+    } else {
       return false
     }
   }
 
 
-  async request(remote, req ){
+  async request(remote, req) {
 
     let result;
-    let status = STATUS.OK; // *0~127: ok ,  128~*255 :error
+    let status = STATUS.OK;
     try {
-      // console.log(req)
       let cmd = req.topic
       cmd = cmd.toUpperCase()
-      if( COMMANDS.includes(cmd)){
+      if (COMMANDS.includes(cmd)) {
         console.log('RedisAPI call:', cmd, req.args)
 
-        if( req.args.length > 0 ){
-          result = await this.redisClient[cmd]( ...req.args )
-        }else{
+        if (req.args.length > 0) {
+          result = await this.redisClient[cmd](...req.args)
+        } else {
           result = await this.redisClient[cmd]()
         }
 
-        // console.log('RedisAPI: result:', result)
 
-      }else{
-        // result = 'RedisAPI: no such a cmd '+ cmd;
+      } else {
         status = STATUS.ERROR;
       }
-      remote.response( req.mid, status , result)
+      remote.response(req.mid, status, result)
     } catch (e) {
-      remote.response( req.mid, STATUS.ERROR ,e.message )
+      remote.response(req.mid, STATUS.ERROR, e.message)
     }
 
   }
 
 }
 
-  
-  
+
+

package/src/api/api_reply.js

@@ -4,31 +4,28 @@ import { STATUS } from './api_constant.js'
 
 const MIN_LEVEL = 0;
 
-export function checkPermission(remote){
-  if( remote.level >= MIN_LEVEL ){
+export function checkPermission(remote) {
+  if (remote.level >= MIN_LEVEL) {
     return true
-  }else{
+  } else {
     return false
   }
 }
 
-export async function echo( remote , req)
-{
-  if( !req.args)
-    remote.response( req.mid, STATUS.ERROR , 'no message to echo' )
+export async function echo(remote, req) {
+  if (!req.args)
+    remote.response(req.mid, STATUS.ERROR, 'no message to echo')
   else
-    remote.response( req.mid, STATUS.OK , req.args )
+    remote.response(req.mid, STATUS.OK, req.args)
 }
 
-export async function date( remote , req)
-{
+export async function date(remote, req) {
   let r = new Date().toUTCString()
-  remote.response( req.mid, STATUS.OK , r)
+  remote.response(req.mid, STATUS.OK, r)
 }
 
-export async function unixtime( remote , req)
-{
-  let r = Math.floor( Date.now() /1000)
-  remote.response( req.mid, STATUS.OK , r)
+export async function unixtime(remote, req) {
+  let r = Math.floor(Date.now() / 1000)
+  remote.response(req.mid, STATUS.OK, r)
 }
 

package/src/api/api_sudo.js

@@ -3,94 +3,89 @@ import { STATUS } from './api_constant.js'
 const MIN_LEVEL = 255;
 
 export const commands = [
-  'cid','remotes','clients',
-  'channels','subscribers',
+  'cid', 'remotes', 'clients',
+  'channels', 'subscribers',
   'remote', 'client', 'close',
-  'addauth' , 'getauth' ,'delauth',
+  'addauth', 'getauth', 'delauth',
   'getauthidlist', 'getdevicelist',
-  'adddevice' ,'getdevice','deldevice' 
+  'adddevice', 'getdevice', 'deldevice'
 ]
 
 
-export function checkPermission(remote){
-  if( remote.level >= MIN_LEVEL ){
+export function checkPermission(remote) {
+  if (remote.level >= MIN_LEVEL) {
     return true
-  }else{
-    return false 
+  } else {
+    return false
   }
 }
 
-export async function request( remote, req) {
-    // console.log(req )
-    let result;
-    let status = 0;
-    try {
-      let cmd = req.topic;
-      cmd = cmd.toLowerCase()
-      if (cmd == 'cid') {
-        result = remote.manager.metric.getCIdList()
-      } else if (cmd == 'remotes' || cmd == 'clients') {
-        result = remote.manager.metric.getRemotes()
-      } else if (cmd == 'channels') {
-        result = remote.manager.metric.getChannelList()
-      } else if (cmd == 'subscribers') {
-        let ch = req.$[0]
-        if (ch) result = remote.manager.metric.getSubscribers(ch)
-      } else if (cmd == 'remote' || cmd == 'client') {
-        let cid = req.$[0]
-        let mode = req.$[1]
-        if (cid) result = remote.manager.metric.getRemoteByCId(cid, mode)
-  
-      } else if (cmd == 'close') {
-        if (req.$[0]) result = remote.manager.closeRemoteByCId(req.$[0])
-  
-      } else if (cmd == 'addauth' || cmd == 'adddevice') {
-        // console.log('## api_sudo: addauth ', remote.manager.authManager , req.$.length)
-        if (remote.manager.authManager && req.$.length == 4) {
-          if (remote.manager.authManager.addAuth) {
-            let did = req.$[0]
-            let dkey = req.$[1]
-            let cid = req.$[2]
-            let level = req.$[3]
-            // console.log('###### did,dkey,cid,level: ', did,dkey,cid,level)
-            result = await remote.manager.authManager.addAuth(did, dkey, cid, level)
-          }
-  
+export async function request(remote, req) {
+  let result;
+  let status = 0;
+  try {
+    let cmd = req.topic;
+    cmd = cmd.toLowerCase()
+    if (cmd == 'cid') {
+      result = remote.manager.metric.getCIdList()
+    } else if (cmd == 'remotes' || cmd == 'clients') {
+      result = remote.manager.metric.getRemotes()
+    } else if (cmd == 'channels') {
+      result = remote.manager.metric.getChannelList()
+    } else if (cmd == 'subscribers') {
+      let ch = req.$[0]
+      if (ch) result = remote.manager.metric.getSubscribers(ch)
+    } else if (cmd == 'remote' || cmd == 'client') {
+      let cid = req.$[0]
+      let mode = req.$[1]
+      if (cid) result = remote.manager.metric.getRemoteByCId(cid, mode)
+
+    } else if (cmd == 'close') {
+      if (req.$[0]) result = remote.manager.closeRemoteByCId(req.$[0])
+
+    } else if (cmd == 'addauth' || cmd == 'adddevice') {
+      if (remote.manager.authManager && req.$.length == 4) {
+        if (remote.manager.authManager.addAuth) {
+          let did = req.$[0]
+          let dkey = req.$[1]
+          let cid = req.$[2]
+          let level = req.$[3]
+          result = await remote.manager.authManager.addAuth(did, dkey, cid, level)
         }
-      } else if (cmd == 'delauth' || cmd == 'deldevice') {
-        if (remote.manager.authManager && req.$.length == 1) {
-          if (remote.manager.authManager.delAuth) {
-            let did = req.$[0]
-            result = await remote.manager.authManager.delAuth(did)
-          }
+
+      }
+    } else if (cmd == 'delauth' || cmd == 'deldevice') {
+      if (remote.manager.authManager && req.$.length == 1) {
+        if (remote.manager.authManager.delAuth) {
+          let did = req.$[0]
+          result = await remote.manager.authManager.delAuth(did)
         }
-      } else if (cmd == 'getauth' || cmd == 'getdevice') {
-        if (remote.manager.authManager && req.$.length == 1) {
-          if (remote.manager.authManager.getAuth) {
-            let did = req.$[0]
-            result = await remote.manager.authManager.getAuth(did)
-          }
+      }
+    } else if (cmd == 'getauth' || cmd == 'getdevice') {
+      if (remote.manager.authManager && req.$.length == 1) {
+        if (remote.manager.authManager.getAuth) {
+          let did = req.$[0]
+          result = await remote.manager.authManager.getAuth(did)
         }
-      } else if (cmd == 'getauthidlist' || cmd == 'getdevicelist') {
-        if (remote.manager.authManager ) {
-          if (remote.manager.authManager.getAuthIdList ) {
-            result = await remote.manager.authManager.getAuthIdList()
-          }
+      }
+    } else if (cmd == 'getauthidlist' || cmd == 'getdevicelist') {
+      if (remote.manager.authManager) {
+        if (remote.manager.authManager.getAuthIdList) {
+          result = await remote.manager.authManager.getAuthIdList()
         }
-      } else{
-        status = STATUS.ERROR;
-        result = "api sudo: no such a cmd: " + cmd
       }
-  
-      // console.log('req_sudo: result', result)
-      remote.response(req.mid, status, result)
-  
-    } catch (e) {
-      // console.log('req_sudo err:',e.message)
-      remote.response(req.mid, STATUS.ERROR , e.message )
+    } else {
+      status = STATUS.ERROR;
+      result = "api sudo: no such a cmd: " + cmd
     }
-  
+
+    remote.response(req.mid, status, result)
+
+  } catch (e) {
+    remote.response(req.mid, STATUS.ERROR, e.message)
   }
 
+}
+
 
 

package/src/auth/Auth_Env.js

@@ -21,19 +21,19 @@ import { BohoAuth } from './BohoAuth.js';
 import { sha256 } from 'boho'
 
 export class Auth_Env extends BohoAuth {
-  constructor( authInfo) {
+  constructor(authInfo) {
     super()
     let id_keys;
-    if( authInfo ){
+    if (authInfo) {
       id_keys = authInfo.split(',')
-    }else if ( process.env.BOHO_AUTH) {
+    } else if (process.env.BOHO_AUTH) {
       authInfo = process.env.BOHO_AUTH
       id_keys = process.env.BOHO_AUTH.split(',')
-    }else{
+    } else {
       console.log("Auth_Env: None of process.env.BOHO_AUTH or authInfo")
       process.exit()
     }
-    
+
     this.AUTH = new Map();
 
     if (id_keys.length >= 1) {
@@ -44,9 +44,7 @@ export class Auth_Env extends BohoAuth {
         let level = v.split('.')[2]
         level = parseInt(level)
 
-        // console.log('typeof level', level, typeof level)
-
-        if (did && key && typeof level =='number') {
+        if (did && key && typeof level == 'number') {
           let cid = did;
           this.addAuth(did, key, cid, level)
         } else {
@@ -66,7 +64,7 @@ export class Auth_Env extends BohoAuth {
     return this.AUTH.get(id)
   }
   async getAuthIdList() {
-    return Array.from( this.AUTH.keys() )
+    return Array.from(this.AUTH.keys())
   }
 
   addAuth(id, keyStr, cid, level = 0) {

package/src/auth/Auth_File.js

@@ -1,72 +1,68 @@
-/**
- * Auth_File
- */
 import { BohoAuth } from './BohoAuth.js';
 import { readFileSync } from 'fs'
 import { sha256 } from 'boho'
 import path from 'path'
 
-export class Auth_File extends BohoAuth{
-  constructor( _path ){
+export class Auth_File extends BohoAuth {
+  constructor(_path) {
     super()
     this.AUTH = new Map();
     let pathObj = path.parse(_path)
     this.path = path.resolve(_path)
-    console.log('auth from file path:', this.path )
+    console.log('auth from file path:', this.path)
     let ext = pathObj.ext;
-    if( ext.toLowerCase() == '.js' || ext.toLowerCase() == '.mjs'){
+    if (ext.toLowerCase() == '.js' || ext.toLowerCase() == '.mjs') {
       // Read auth data from file
-      console.log( "#JS path:", this.path ); 
-      this.loadAuthInfoFile_JS( this.path)
-    }else if( ext.toLowerCase() == '.json') {
-      console.log( "#JSON path:", this.path ); 
+      console.log("#JS path:", this.path);
+      this.loadAuthInfoFile_JS(this.path)
+    } else if (ext.toLowerCase() == '.json') {
+      console.log("#JSON path:", this.path);
       this.loadAuthInfoFile_JSON(this.path)
-    }else{
+    } else {
       console.log('no authinfofile path.')
     }
   }
 
 
-  async getAuth( id ){
-    return this.AUTH.get( id )
+  async getAuth(id) {
+    return this.AUTH.get(id)
   }
- 
+
   async getAuthIdList() {
-    return Array.from( this.AUTH.keys() )
+    return Array.from(this.AUTH.keys())
   }
 
   //loaded when server start.
-   loadAuthInfoFile_JS(path){ 
+  loadAuthInfoFile_JS(path) {
+
+    import(path).then((file) => {
 
-    import( path ).then(( file ) => {
-      
-      console.log( file.authInfo ); 
-      file.authInfo.forEach( item =>{
-        this.addAuth(...item )
+      console.log(file.authInfo);
+      file.authInfo.forEach(item => {
+        this.addAuth(...item)
       })
-      console.log('total AUTH INFO size: ', this.AUTH.size  )
-    }).catch(e=>{
+      console.log('total AUTH INFO size: ', this.AUTH.size)
+    }).catch(e => {
       console.log(e)
     })
 
 
   }
 
-   loadAuthInfoFile_JSON(path){ 
-    let file = readFileSync( path )
-    file = new TextDecoder().decode( file )
-    // console.log(file )
-    let list = JSON.parse( file )
-    list.forEach( item =>{
-      this.addAuth(...item )
+  loadAuthInfoFile_JSON(path) {
+    let file = readFileSync(path)
+    file = new TextDecoder().decode(file)
+    let list = JSON.parse(file)
+    list.forEach(item => {
+      this.addAuth(...item)
     })
-    console.log('total AUTH INFO size: ', this.AUTH.size  )
+    console.log('total AUTH INFO size: ', this.AUTH.size)
 
   }
 
-  addAuth( id, keyStr , cid , level = 0){
-    let Base64hashKey = Buffer.from( sha256.hash(keyStr)).toString('base64')
-    this.AUTH.set( id, { key: Base64hashKey, cid: cid, level: level } )
+  addAuth(id, keyStr, cid, level = 0) {
+    let Base64hashKey = Buffer.from(sha256.hash(keyStr)).toString('base64')
+    this.AUTH.set(id, { key: Base64hashKey, cid: cid, level: level })
   }
 
 

package/src/auth/Auth_Redis.js

@@ -1,48 +1,42 @@
-
-/**
- * Auth_Redis
- */
 import { BohoAuth } from './BohoAuth.js';
 import { sha256 } from 'boho'
 const DEVICE_PREFIX = "device:"
 
-export class Auth_Redis extends BohoAuth{
-  constructor( redisClient ){
+export class Auth_Redis extends BohoAuth {
+  constructor(redisClient) {
     super()
-    if( !redisClient ){
+    if (!redisClient) {
       throw new Error("AuthRedis constructor: no redisClient")
     }
     this.redis = redisClient
   }
 
   // get device key from DB. (for Boho auth.)
-  async getAuth( id ){
+  async getAuth(id) {
     let result = await this.redis.hGetAll(DEVICE_PREFIX + id)
-    // console.log('Auth_Redis: getAuth req id result',id, result)
-    if(result.key) return result
+    if (result.key) return result
   }
 
 
   async getAuthIdList() {
-    let result = await this.redis.keys( DEVICE_PREFIX + '*')
-    result = result.map( v=> {
+    let result = await this.redis.keys(DEVICE_PREFIX + '*')
+    result = result.map(v => {
       return v.split(':')[1]
     })
-    if(result) return result
+    if (result) return result
   }
 
-// add device auth info
-  async addAuth( id, keyStr , cid = '', level = 0){
-    // console.log('addAuth', id, keyStr, cid, level)
-    let Base64hashKey = Buffer.from( sha256.hash( keyStr)).toString('base64')
-    return this.redis.hSet( DEVICE_PREFIX + id, {'key': Base64hashKey, 'cid': cid ,'level': level} )
+  // add device auth info
+  async addAuth(id, keyStr, cid = '', level = 0) {
+    let Base64hashKey = Buffer.from(sha256.hash(keyStr)).toString('base64')
+    return this.redis.hSet(DEVICE_PREFIX + id, { 'key': Base64hashKey, 'cid': cid, 'level': level })
   }
 
-  async delAuth( id ){
-    return this.redis.del( DEVICE_PREFIX + id )
+  async delAuth(id) {
+    return this.redis.del(DEVICE_PREFIX + id)
   }
 
-  async save( id ){
+  async save(id) {
     return this.redis.save()
   }