iosignal 1.4.2 → 1.5.0

package/src/server/Metric.js

@@ -1,154 +1,154 @@
-import { memoryUsage } from 'process';
-import { ENC_MODE } from '../common/constants.js'
-
-const MAX = 10
-let period = 10000
-
-export class Metric{
-  constructor(manager){
-    this.manager = manager;
-
-    this.metricsPack= {
-      remotes:[0],
-      channels:[0],
-      txBytes:[0],
-      rxBytes:[0],
-      unixTime: [Math.floor( Date.now() /1000)],
-      period: 0
-    }
-
-    this.tickId = setInterval( e=>{
-
-      this.metricsPack.remotes.push( this.manager.remotes.size )
-      if(this.metricsPack.remotes.length > MAX ) this.metricsPack.remotes.shift()
-
-      this.metricsPack.channels.push( this.manager.channel_map.size )
-      if(this.metricsPack.channels.length > MAX ) this.metricsPack.channels.shift()
-
-      
-      this.metricsPack.txBytes.push( this.manager.txBytes )
-      if(this.metricsPack.txBytes.length > MAX ) this.metricsPack.txBytes.shift()
-
-      this.metricsPack.rxBytes.push( this.manager.rxBytes )
-      if(this.metricsPack.rxBytes.length > MAX ) this.metricsPack.rxBytes.shift()
-
-      this.metricsPack.unixTime = Math.floor( Date.now() /1000)
-      this.metricsPack.period = period;
-      this.manager.txBytes = 0
-      this.manager.rxBytes = 0
-    
-
-    },10000)
-  }
-
-
-
-  oneline(prn){
-    let memoryUse = memoryUsage();
-    let memoryInfo = [{
-      ...memoryUse
-    }]
-
-    if ( prn ) console.table(memoryInfo, [ 'rss','heapTotal','heapUsed', 'external','arrayBuffers' ]);
-
-    let metric = [{
-      lastSSID: this.manager.lastSSID,
-      remotes: this.manager.remotes.size,
-      channels: this.manager.channel_map.size,
-      txBytes: this.manager.txBytes,
-      rxBytes: this.manager.rxBytes,
-    }]
-
-    if ( prn ) console.table(metric, [ 'lastSSID', 'remotes', 'channels','txBytes','rxBytes' ]);
-
-    return metric[0]
-  }
-
-  getRemotes( prn ){
-    let remoteList =  Array.from(this.manager.remotes.values())
-    let remoteStates = remoteList.map(v=>{
-      return  "#"+v.ssid+":"+ v.cid +"("+v.state+")"
-    })
-    if (prn ) console.table(remoteStates)
-    return remoteStates
-  }
-  getCIdList( prn ){
-    let CIdList =  Array.from(this.manager.cid2remote.keys())
-    if (prn ) console.table(CIdList)
-    return CIdList
-  }
-
-  getChannelList(prn){
-    let chList =  Array.from(this.manager.channel_map.keys())
-    if (prn ) console.table(chList)
-    return chList
-  }
-
-  getSubscribers(ch){
-    let list = [];
-    if( this.manager.channel_map.has(ch)){
-      let subscribers = this.manager.channel_map.get(ch) //set
-      subscribers.forEach( c =>{
-        list.push(c.cid)
-      })
-    }
-    // console.log(list)
-    return list
-  }
-
-  getRemoteByCId( cid , mode = 1){
-
-    if( this.manager.cid2remote.has(cid)){
-      let remote = this.manager.cid2remote.get(cid)
-      if(mode == 1){
-        return {
-          ip: remote.ip,
-          id: remote.cid,
-          ssid: remote.ssid,
-          cid: remote.cid,
-          uptime:  Math.trunc( ( Date.now() - remote.socket.openTime ) / 1000),
-          tx: remote.socket.txCounter,
-          rx: remote.socket.rxCounter,
-          txBytes: remote.socket.bytesWritten || remote.socket._socket?.bytesWritten,
-          rxBytes: remote.socket.bytesRead || remote.socket._socket?.bytesRead
-        }
-      }else if( mode == 2){
-        return {
-          ip: remote.ip,
-          uptime:  Math.trunc( ( Date.now() - remote.socket.openTime ) / 1000),
-          nick: remote.nick,
-          ssid: remote.ssid,
-          echo: remote.lastEchoMessage
-        }
-      }else if( mode == 3){
-        return {
-          ip: remote.ip,
-          uptime:  Math.trunc( ( Date.now() - remote.socket.openTime ) / 1000),
-          nick: remote.nick,
-          ssid: remote.ssid,
-          isSecure: remote.TLS,
-          isAuth: remote.boho.isAuthorized,
-          encMode:  ENC_MODE[remote.encMode]
-        }
-      }else if( mode == 4){
-        let channels = Array.from( remote.channels.keys() )
-        let set_memory = Array.from( remote.memory.keys() )
-        let retain_signal = Array.from( remote.retain_signal.keys() )
-        return {
-          ip: remote.ip,
-          uptime:  Math.trunc( ( Date.now() - remote.socket.openTime ) / 1000),
-          channels: channels,
-          set: set_memory,
-          retain: retain_signal
-        }
-      }
-
-    }else{
-      return { result: "nop" }
-    }
-
-  }
-
-
-}
-
+import { memoryUsage } from 'process';
+import { ENC_MODE } from '../common/constants.js'
+
+const MAX = 10
+let period = 10000
+
+export class Metric{
+  constructor(manager){
+    this.manager = manager;
+
+    this.metricsPack= {
+      remotes:[0],
+      channels:[0],
+      txBytes:[0],
+      rxBytes:[0],
+      unixTime: [Math.floor( Date.now() /1000)],
+      period: 0
+    }
+
+    this.tickId = setInterval( e=>{
+
+      this.metricsPack.remotes.push( this.manager.remotes.size )
+      if(this.metricsPack.remotes.length > MAX ) this.metricsPack.remotes.shift()
+
+      this.metricsPack.channels.push( this.manager.channel_map.size )
+      if(this.metricsPack.channels.length > MAX ) this.metricsPack.channels.shift()
+
+      
+      this.metricsPack.txBytes.push( this.manager.txBytes )
+      if(this.metricsPack.txBytes.length > MAX ) this.metricsPack.txBytes.shift()
+
+      this.metricsPack.rxBytes.push( this.manager.rxBytes )
+      if(this.metricsPack.rxBytes.length > MAX ) this.metricsPack.rxBytes.shift()
+
+      this.metricsPack.unixTime = Math.floor( Date.now() /1000)
+      this.metricsPack.period = period;
+      this.manager.txBytes = 0
+      this.manager.rxBytes = 0
+    
+
+    },10000)
+  }
+
+
+
+  oneline(prn){
+    let memoryUse = memoryUsage();
+    let memoryInfo = [{
+      ...memoryUse
+    }]
+
+    if ( prn ) console.table(memoryInfo, [ 'rss','heapTotal','heapUsed', 'external','arrayBuffers' ]);
+
+    let metric = [{
+      lastSSID: this.manager.lastSSID,
+      remotes: this.manager.remotes.size,
+      channels: this.manager.channel_map.size,
+      txBytes: this.manager.txBytes,
+      rxBytes: this.manager.rxBytes,
+    }]
+
+    if ( prn ) console.table(metric, [ 'lastSSID', 'remotes', 'channels','txBytes','rxBytes' ]);
+
+    return metric[0]
+  }
+
+  getRemotes( prn ){
+    let remoteList =  Array.from(this.manager.remotes.values())
+    let remoteStates = remoteList.map(v=>{
+      return  "#"+v.ssid+":"+ v.cid +"("+v.state+")"
+    })
+    if (prn ) console.table(remoteStates)
+    return remoteStates
+  }
+  getCIdList( prn ){
+    let CIdList =  Array.from(this.manager.cid2remote.keys())
+    if (prn ) console.table(CIdList)
+    return CIdList
+  }
+
+  getChannelList(prn){
+    let chList =  Array.from(this.manager.channel_map.keys())
+    if (prn ) console.table(chList)
+    return chList
+  }
+
+  getSubscribers(ch){
+    let list = [];
+    if( this.manager.channel_map.has(ch)){
+      let subscribers = this.manager.channel_map.get(ch) //set
+      subscribers.forEach( c =>{
+        list.push(c.cid)
+      })
+    }
+    // console.log(list)
+    return list
+  }
+
+  getRemoteByCId( cid , mode = 1){
+
+    if( this.manager.cid2remote.has(cid)){
+      let remote = this.manager.cid2remote.get(cid)
+      if(mode == 1){
+        return {
+          ip: remote.ip,
+          id: remote.cid,
+          ssid: remote.ssid,
+          cid: remote.cid,
+          uptime:  Math.trunc( ( Date.now() - remote.socket.openTime ) / 1000),
+          tx: remote.socket.txCounter,
+          rx: remote.socket.rxCounter,
+          txBytes: remote.socket.bytesWritten || remote.socket._socket?.bytesWritten,
+          rxBytes: remote.socket.bytesRead || remote.socket._socket?.bytesRead
+        }
+      }else if( mode == 2){
+        return {
+          ip: remote.ip,
+          uptime:  Math.trunc( ( Date.now() - remote.socket.openTime ) / 1000),
+          nick: remote.nick,
+          ssid: remote.ssid,
+          echo: remote.lastEchoMessage
+        }
+      }else if( mode == 3){
+        return {
+          ip: remote.ip,
+          uptime:  Math.trunc( ( Date.now() - remote.socket.openTime ) / 1000),
+          nick: remote.nick,
+          ssid: remote.ssid,
+          isSecure: remote.TLS,
+          isAuth: remote.boho.isAuthorized,
+          encMode:  ENC_MODE[remote.encMode]
+        }
+      }else if( mode == 4){
+        let channels = Array.from( remote.channels.keys() )
+        let set_memory = Array.from( remote.memory.keys() )
+        let retain_signal = Array.from( remote.retain_signal.keys() )
+        return {
+          ip: remote.ip,
+          uptime:  Math.trunc( ( Date.now() - remote.socket.openTime ) / 1000),
+          channels: channels,
+          set: set_memory,
+          retain: retain_signal
+        }
+      }
+
+    }else{
+      return { result: "nop" }
+    }
+
+  }
+
+
+}
+

package/src/server/Server.js

@@ -1,148 +1,166 @@
-import net from 'net'
-import EventEmitter from 'events'
-import { WebSocketServer } from 'ws'
-import { Manager } from './Manager.js'
-import { serverOption } from './serverOption.js'
-import { STATUS } from '../api/api_constant.js'
-
-export class Server extends EventEmitter {
-
-  constructor(options, authManager ) {
-    super();
-    this.apiNames = new Set()
-
-    if (options.timeout) {
-      let pingT = parseInt(options.timeout)
-      if (pingT && pingT >= 1000) serverOption.timeout = pingT
-    }
-
-    if (options.monitorPeriod) {
-      let monitorT = parseInt(options.monitorPeriod)
-      if (monitorT && monitorT >= 1000) serverOption.monitorPeriod = monitorT
-    }
-
-
-    if (options.showMessage) {
-      serverOption.showMessage = options.showMessage
-    }
-
-    if (options.showMetric) {
-      serverOption.showMetric = options.showMetric
-    }
-
-    if (options.timeout) {
-      serverOption.timeout = options.timeout
-    }
-
-    if (options.port) {
-      serverOption.port = parseInt(options.port)
-    }
-    
-    if (options.congPort) {
-      serverOption.congPort = parseInt(options.congPort)
-    }
-    
-    this.manager = new Manager(this, authManager)
-    if (serverOption.port) this.startWSServer(serverOption.port)
-    if( serverOption.congPort) this.startCongServer(serverOption.congPort)
-    
-    // console.log('serverOption:', serverOption)
-  }
-
-
-  startWSServer(port) {
-
-    console.log('opening WebSocket Server:', port)
-    this.wss = new WebSocketServer({ port })
-    // this.wss.setMaxListeners(0)
-
-    this.wss.on('error', (err) => {
-      console.error('### ws server error:', err.message)
-      if(err.code == 'EADDRINUSE'){
-        process.exit()
-      }
-    })
-
-    this.wss.on('close', (err) => {
-      console.log('### WS server closed.', err)
-    })
-
-    this.wss.on('connection', (ws, req) => {
-      ws.socketType = 'websocket'
-      this.manager.addRemote(ws, req)
-    })
-
-
-  }
-
-  startCongServer( congPort ) {
-    console.log('opening CongSocket Server:', congPort)
-
-    this.congServer = net.createServer((socket) => {
-      this.manager.addRemote(socket)
-    })
-      .on('error', (err) => {
-        console.log('### cong server error:', err.message)
-        if(err.code == 'EADDRINUSE'){
-          process.exit()
-        }
-      }).listen( congPort, () => {
-        // console.log('congsocket server bound' );
-      });
-  }
-
-
-
-  api(target, api) {
-   
-    this.apiNames.add(target)
-
-    // common checkPermission
-    if (!api.checkPermission || typeof api.checkPermission != 'function') {
-      throw new Error('wrong api interface. no checkPermission function.')
-    }
-
-
-    if(typeof api.request == 'function' && Array.isArray( api.commands )){
-      console.log(`API TYPE1. A Class with one request function. target: ${target} list: ${api.commands}` )
-
-      this.on(target, (remote, req) => {
-        if (api.checkPermission(remote, req)) {
-          api.request(remote, req)
-        } else {
-          remote.response(req.mid, STATUS.ERROR, "NO_PERMISSION.")
-        }
-      })
-
-    }else{
-      let apiList = []
-      Object.keys(api).forEach(v => {
-        if (typeof api[v] === 'function') apiList.push(v)
-        console.log('api list',typeof api[v] ,v )
-      })
-
-      console.log(`API TYPE2. Multiple function list.  target: ${target} list:${apiList}`)
-
-      this.on(target, (remote, req) => {
-        let r;
-        if (!api.checkPermission(remote, req)) {
-          r = "NO_PERMISSION."
-        } else {
-          // if (apiList.includes(req.topic)) {
-          if ( api[req.topic] ) {
-        console.log(`API TYPE2. request target: ${target}  has topic:${req.topic}`)
-            api[req.topic](remote, req)
-            return
-          } else {
-            r = `target: ${req.target} has not topic name: ${req.topic}`
-          }
-        }
-
-        remote.response(req.mid, STATUS.ERROR, r)
-      })
-    }
-
-    return this
-  }
-
-}
+import net from 'net'
+import EventEmitter from 'events'
+import { WebSocketServer } from 'ws'
+import { Manager } from './Manager.js'
+import { serverOption } from './serverOption.js'
+import { STATUS } from '../api/api_constant.js'
+
+export class Server extends EventEmitter {
+
+  constructor(options, authManager ) {
+    super();
+    this.apiNames = new Set()
+    this.wss = {};
+
+    if (options.timeout) {
+      let pingT = parseInt(options.timeout)
+      if (pingT && pingT >= 1000) serverOption.timeout = pingT
+    }
+
+    if (options.monitorPeriod) {
+      let monitorT = parseInt(options.monitorPeriod)
+      if (monitorT && monitorT >= 1000) serverOption.monitorPeriod = monitorT
+    }
+
+
+    if (options.showMessage) {
+      serverOption.showMessage = options.showMessage
+    }
+
+    if (options.showMetric) {
+      serverOption.showMetric = options.showMetric
+    }
+
+    if (options.timeout) {
+      serverOption.timeout = options.timeout
+    }
+
+    if (options.port) {
+      serverOption.port = parseInt(options.port)
+    }
+
+    if (options.httpServer) {
+      serverOption.httpServer = options.httpServer
+    }
+    
+    if (options.congPort) {
+      serverOption.congPort = parseInt(options.congPort)
+    }
+    
+    this.manager = new Manager(this, authManager)
+
+    if (serverOption.port || serverOption.httpServer ) this.startWSServer(serverOption)
+    if( serverOption.congPort) this.startCongServer(serverOption.congPort)
+    
+    // console.log('serverOption:', serverOption)
+  }
+
+
+  startWSServer(serverOption) {
+
+    if(serverOption.port ){
+      console.log('opening WebSocket Server port:', serverOption.port)
+      this.wss = new WebSocketServer({ port: serverOption.port })
+    }else if( serverOption.httpServer ){
+      console.log('opening WebSocket Server external httpServer:' )
+      this.wss = new WebSocketServer({ server: serverOption.httpServer })
+    }else{
+      throw new TypeError(
+        'One and only one of the "port", "httpServer"' +
+          'must be specified'
+      );
+    }
+
+
+    // this.wss.setMaxListeners(0)
+
+    this.wss.on('error', (err) => {
+      console.error('### ws server error:', err.message)
+      if(err.code == 'EADDRINUSE'){
+        process.exit()
+      }
+    })
+
+    this.wss.on('close', (err) => {
+      console.log('### WS server closed.', err)
+    })
+
+    this.wss.on('connection', (ws, req) => {
+      ws.socketType = 'websocket'
+      this.manager.addRemote(ws, req)
+    })
+
+
+  }
+
+  startCongServer( congPort ) {
+    console.log('opening CongSocket Server:', congPort)
+
+    this.congServer = net.createServer((socket) => {
+      this.manager.addRemote(socket)
+    })
+      .on('error', (err) => {
+        console.log('### cong server error:', err.message)
+        if(err.code == 'EADDRINUSE'){
+          process.exit()
+        }
+      }).listen( congPort, () => {
+        // console.log('congsocket server bound' );
+      });
+  }
+
+
+
+  api(target, api) {
+   
+    this.apiNames.add(target)
+
+    // common checkPermission
+    if (!api.checkPermission || typeof api.checkPermission != 'function') {
+      throw new Error('wrong api interface. no checkPermission function.')
+    }
+
+
+    if(typeof api.request == 'function' && Array.isArray( api.commands )){
+      console.log(`API TYPE1. A Class with one request function. target: ${target} list: ${api.commands}` )
+
+      this.on(target, (remote, req) => {
+        if (api.checkPermission(remote, req)) {
+          api.request(remote, req)
+        } else {
+          remote.response(req.mid, STATUS.ERROR, "NO_PERMISSION.")
+        }
+      })
+
+    }else{
+      let apiList = []
+      Object.keys(api).forEach(v => {
+        if (typeof api[v] === 'function') apiList.push(v)
+        console.log('api list',typeof api[v] ,v )
+      })
+
+      console.log(`API TYPE2. Multiple function list.  target: ${target} list:${apiList}`)
+
+      this.on(target, (remote, req) => {
+        let r;
+        if (!api.checkPermission(remote, req)) {
+          r = "NO_PERMISSION."
+        } else {
+          // if (apiList.includes(req.topic)) {
+          if ( api[req.topic] ) {
+        console.log(`API TYPE2. request target: ${target}  has topic:${req.topic}`)
+            api[req.topic](remote, req)
+            return
+          } else {
+            r = `target: ${req.target} has not topic name: ${req.topic}`
+          }
+        }
+
+        remote.response(req.mid, STATUS.ERROR, r)
+      })
+    }
+
+    return this
+  }
+
+}