iosignal 1.6.1 → 1.7.1

package/src/server/Server.js

@@ -1,166 +1,163 @@
-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
-  }
-
-}
+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)
+
+  }
+
+
+  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)
+
+    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 (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
+  }
+
+}

package/src/server/serverOption.js

@@ -1,56 +1,56 @@
-
-
-export let serverOption = {
-  clientTracking: false,
-  port: 0, //wsPort
-  httpServer: null,
-  congPort: 0,
-  timeout: 50000,
-  showMessage: 'none',
-  showMetric: 0,
-  showChannel: 0,
-  monitorPeriod: 5000,
-  fileLogger:{
-    connection: { 
-      use: false, 
-      path: 'connection.log'
-    },
-    auth: {
-      use: false, 
-      path: 'auth.log'
-    },
-    attack:{
-      use: false,
-      path:'attack.log'
-    }
-  },
-  useQuota:{
-    signalSize: false,
-    publishCounter: false,
-    trafficRate: false,
-    disconnect: false
-  },
-  defaultQuotaIndex: 3,
-  adminLevel: 255,
-
-  debug:{
-    slow: false,
-    delay: 500,
-    showAuthInfo: false
-  },
-
-  retain:{
-    isAvailable: true,
-    limitSize: 100000,
-    limitCounter: 1000
-  },
-
-  auth:{
-    delay_auth_fail: 1000,
-  },
-
-  memberOnly: false
-
-}
-
-
+
+
+export let serverOption = {
+  clientTracking: false,
+  port: 0, //wsPort
+  httpServer: null,
+  congPort: 0,
+  timeout: 50000,
+  showMessage: 'none',
+  showMetric: 0,
+  showChannel: 0,
+  monitorPeriod: 5000,
+  fileLogger: {
+    connection: {
+      use: false,
+      path: 'connection.log'
+    },
+    auth: {
+      use: false,
+      path: 'auth.log'
+    },
+    attack: {
+      use: false,
+      path: 'attack.log'
+    }
+  },
+  useQuota: {
+    signalSize: false,
+    publishCounter: false,
+    trafficRate: false,
+    disconnect: false
+  },
+  defaultQuotaIndex: 3,
+  adminLevel: 255,
+
+  debug: {
+    slow: false,
+    delay: 500,
+    showAuthInfo: false
+  },
+
+  retain: {
+    isAvailable: true,
+    limitSize: 100000,
+    limitCounter: 1000
+  },
+
+  auth: {
+    delay_auth_fail: 1000,
+  },
+
+  memberOnly: false
+
+}
+
+

package/test-browser/index.html

@@ -1,94 +1,97 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Document</title>
-  <style>
-    #messageView{
-      border: 1px solid red;
-      padding: 2em;
-    }
-  </style>
-</head>
-<body>
-  <h2>Simple pub sub example.</h2>
-  <p>you should start server first.</p>
-  <p>this index.html load two types of modules. </p>
-  <h5>1. IIFE: iosignal.min.js</h5>
-  <p>use global name:  IO </p>
-  <p>IO has props: Boho, MBP, Buffer,, </p>
-  <h5>2. ESM: iosignal.esm.js</h5>
-  <p> check the console.</p>
-  <h2>message log</h2>
-  <div id="messageView">...</div>
-  <script src="../dist/iosignal.min.js"></script>
-  <script>
-    console.log('IIFE:')
-    console.log('IO', IO)
-    console.log('MBP', IO.MBP )
-    console.log('Buffer', IO.Buffer)
-    console.log('Boho', IO.Boho )
-    console.log('sha256.hash("hi")',  IO.Boho.sha256.hash('hi'))
-
-    var ESM_IO ;
-    // IO.binaryType = "blob"
-    var io1 = new IO('ws://localhost:7777')
-    var io2 = new IO('ws://localhost:7777')
-    var io3 = new IO('ws://localhost:7777')
-
-    io1.on('error', errorHandler )
-    io2.on('error', errorHandler )
-    io3.on('error', errorHandler )
-
-    let channelName = 'io'
-    // classic style subsribing
-    io1.on('ready',e=>{
-      io1.subscribe(channelName)
-      io1.on(channelName, (...args)=>{
-        // console.log('io1 received', args )
-        let msg = '[io1] ' + JSON.stringify( args )
-        addMessage(msg)
-      })
-    })
-
-    // modern style subscribing
-    io2.listen(channelName, (...args)=>{
-      // console.log('io2 receive', args )
-      let msg = '[io2] ' + JSON.stringify( args )
-        addMessage(msg)
-    })
-
-    setInterval(e=>{
-      io3.signal(channelName, 'single string')   // single string payload
-      io3.signal(channelName, Date.now(), 'a', 2 , {key: 3} ) //multiple payload 
-      io3.signal(channelName ) // pure signal without payload.
-    },3000)
-
-    function addMessage(msg){
-    
-      let p = document.createElement('p')
-      p.textContent = msg
-      let v = document.querySelector('#messageView')
-      if(v.childElementCount > 20) v.innerHTML = ""
-      v.prepend( p )
-    }
-
-    function errorHandler(e){
-      console.log(e.target)
-      addMessage('ws.error')
-    }
-  </script>
-  <!-- <script type="module">
-    import { IO, Boho, MBP, Buffer, sha256  } from "../dist/iosignal.esm.js"
-    ESM_IO = IO 
-    console.log('ESM:')
-    console.log('IO', IO)
-    console.log('Boho', Boho )
-    console.log('MBP', MBP )
-    console.log('Buffer', Buffer)
-    console.log('sha256.hash("hi")',  sha256.hash('hi'))
-  </script> -->
-</body>
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Document</title>
+  <style>
+    #messageView {
+      border: 1px solid red;
+      padding: 2em;
+    }
+  </style>
+</head>
+
+<body>
+  <h2>Simple pub sub example.</h2>
+  <p>you should start server first.</p>
+  <p>this index.html load two types of modules. </p>
+  <h5>1. IIFE: iosignal.min.js</h5>
+  <p>use global name: IO </p>
+  <p>IO has props: Boho, MBP, Buffer,, </p>
+  <h5>2. ESM: iosignal.esm.js</h5>
+  <p> check the console.</p>
+  <h2>message log</h2>
+  <div id="messageView">...</div>
+  <script src="../dist/iosignal.min.js"></script>
+  <script>
+    console.log('IIFE:')
+    console.log('IO', IO)
+    console.log('MBP', IO.MBP)
+    console.log('Buffer', IO.Buffer)
+    console.log('Boho', IO.Boho)
+    console.log('sha256.hash("hi")', IO.Boho.sha256.hash('hi'))
+
+    var ESM_IO;
+    IO.binaryType = "blob"
+    var io1 = new IO('ws://localhost:7777')
+    var io2 = new IO('ws://localhost:7777')
+    var io3 = new IO('ws://localhost:7777')
+
+    io1.on('error', errorHandler)
+    io2.on('error', errorHandler)
+    io3.on('error', errorHandler)
+
+    let channelName = 'io'
+    // classic style subsribing
+    io1.on('ready', e => {
+      io1.subscribe(channelName)
+      io1.on(channelName, (...args) => {
+        // console.log('io1 received', args )
+        let msg = '[io1] ' + JSON.stringify(args)
+        addMessage(msg)
+      })
+    })
+
+    // modern style subscribing
+    io2.listen(channelName, (...args) => {
+      // console.log('io2 receive', args )
+      let msg = '[io2] ' + JSON.stringify(args)
+      addMessage(msg)
+    })
+
+    setInterval(e => {
+      io3.signal(channelName, 'single string')   // single string payload
+      io3.signal(channelName, Date.now(), 'a', 2, { key: 3 }) //multiple payload 
+      io3.signal(channelName) // pure signal without payload.
+    }, 3000)
+
+    function addMessage(msg) {
+
+      let p = document.createElement('p')
+      p.textContent = msg
+      let v = document.querySelector('#messageView')
+      if (v.childElementCount > 20) v.innerHTML = ""
+      v.prepend(p)
+    }
+
+    function errorHandler(e) {
+      console.log(e.target)
+      addMessage('ws.error')
+    }
+  </script>
+  <!-- <script type="module">
+    import { IO, Boho, MBP, Buffer, sha256  } from "../dist/iosignal.esm.js"
+    ESM_IO = IO 
+    console.log('ESM:')
+    console.log('IO', IO)
+    console.log('Boho', Boho )
+    console.log('MBP', MBP )
+    console.log('Buffer', Buffer)
+    console.log('sha256.hash("hi")',  sha256.hash('hi'))
+  </script> -->
+</body>
+
 </html>

package/test-browser/server.js

@@ -1,11 +1,11 @@
-import { Server } from 'iosignal'
-
-const options = {
-  port: 7777,
-  showMetric: 2,
-  showMessage: 'message'
-}
-
-const server = new Server( options )
-
-
+import { Server } from 'iosignal'
+
+const options = {
+  port: 7777,
+  showMetric: 2,
+  showMessage: 'message'
+}
+
+const server = new Server(options)
+
+