iosignal 1.0.0 → 1.2.0

package/src/client/IOWebSocket.js

@@ -13,7 +13,6 @@ export class IO extends IOCore{
 
   browserVisiblePing(){
     if (document.visibilityState === 'visible') {
-      console.log('[Remote connection check] visibilityState is visible.')
       this.ping()
     }
   }

package/src/common/payload.js

@@ -0,0 +1,77 @@
+import { MBP } from 'meta-buffer-pack'
+import { PAYLOAD_TYPE, IOMsg } from "./constants.js";
+const encoder = new TextEncoder()
+
+
+export function getSignalPack( tag, ...args ){
+  if( typeof tag !== 'string') throw TypeError('tag should be string.')
+  let tagEncoded = encoder.encode( tag)
+  let payload = parsePayload( args )
+
+  let sigPack;
+  if( payload.type == PAYLOAD_TYPE.EMPTY ){
+    sigPack = MBP.pack( 
+      MBP.MB('#MsgType','8', IOMsg.SIGNAL) , 
+      MBP.MB('#tagLen','8', tagEncoded.byteLength),
+      MBP.MB('#tag', tagEncoded),
+      MBP.MB('#payloadType', '8', payload.type )
+      )
+  }else if( payload.type == PAYLOAD_TYPE.MBA ){
+    sigPack = MBP.pack( 
+      MBP.MB('#MsgType','8', IOMsg.SIGNAL) , 
+      MBP.MB('#tagLen','8', tagEncoded.byteLength),
+      MBP.MB('#tag', tagEncoded),
+      MBP.MB('#payloadType', '8', payload.type ),
+      MBP.MBA(...args)
+      )
+  }else { 
+    sigPack = MBP.pack( 
+      MBP.MB('#MsgType','8', IOMsg.SIGNAL) , 
+      MBP.MB('#tagLen','8', tagEncoded.byteLength),
+      MBP.MB('#tag', tagEncoded),
+      MBP.MB('#payloadType', '8', payload.type ),
+      MBP.MB('#payload', payload.buffer )
+      )
+  }
+  return sigPack
+}
+
+
+export function parsePayload( args){
+  let type, pack;
+  if( args.length == 0){
+    type = PAYLOAD_TYPE.EMPTY 
+    pack = null
+  }else if( args.length == 1){
+    if( typeof args[0] === 'string' || typeof args[0] === 'number'){
+     type = PAYLOAD_TYPE.TEXT
+     pack = encoder.encode( args[0] + ".") // add null area.
+     pack[pack.byteLength - 1 ] = 0 // set null.
+
+    }else if( ArrayBuffer.isView( args[0]) || args[0] instanceof ArrayBuffer ){  //one buffer
+      type = PAYLOAD_TYPE.BINARY
+      pack = MBP.B8( args[0 ] )
+    }else if(typeof args[0] === 'object'){ 
+      type = PAYLOAD_TYPE.OBJECT
+      pack = encoder.encode( JSON.stringify( args[0]) )
+    }else{
+      throw new Error('unknown payload arguments')
+    }
+  }else{ // args 2 and more
+    let containsBuffer = false
+    args.forEach( item =>{
+      if( ArrayBuffer.isView( item ) || item instanceof ArrayBuffer ) containsBuffer = true;
+    })
+
+    if( containsBuffer ){
+      type = PAYLOAD_TYPE.MBA;
+    }else{
+      type = PAYLOAD_TYPE.MJSON;
+        // args is array
+      pack = encoder.encode( JSON.stringify( args ) )
+    }
+    
+  }
+  
+  return { type: type, buffer: pack }
+}

package/src/server/Manager.js

@@ -1,7 +1,8 @@
 import { MBP } from 'meta-buffer-pack'
 import { ServerRemote } from './ServerRemote.js'
 import { serverOption } from './serverOption.js'
-import { IOMsg, PAYLOAD_TYPE, CLIENT_STATE } from '../common/constants.js'
+import { IOMsg, CLIENT_STATE } from '../common/constants.js'
+import { getSignalPack } from '../common/payload.js';
 import { FileLogger } from './FileLogger.js'
 import { Metric } from './Metric.js'
 
@@ -142,8 +143,6 @@ export class Manager{
 
 
   serverSignal(obj) {
-    // obj.event  obj.data
-    console.log('server signal', obj)
     let sigPack = MBP.pack(
       MBP.MB('#MsgType', '8', IOMsg.SERVER_SIGNAL),
       MBP.MB('#signalObject', obj)
@@ -172,90 +171,10 @@ export class Manager{
   }
 
 
-  parsePayload(args) {
-    // console.log( 'parsePayload args', args )
-    let type, pack;
-    if (args.length == 0) {
-      type = PAYLOAD_TYPE.EMPTY
-      pack = null
-    } else if (args.length == 1) {
-      if (typeof args[0] === 'string' || typeof args[0] === 'number') {
-        type = PAYLOAD_TYPE.TEXT
-        pack = encoder.encode(args[0] + ".") // add null area.
-        pack[pack.byteLength - 1] = 0 // set null.
-
-      } else if (ArrayBuffer.isView(args[0]) || args[0] instanceof ArrayBuffer) {  //one buffer
-        type = PAYLOAD_TYPE.BINARY
-        pack = MBP.B8(args[0])
-      } else if (typeof args[0] === 'object') {
-        type = PAYLOAD_TYPE.OBJECT
-        pack = encoder.encode(JSON.stringify(args[0]))
-      } else {
-        //
-        console.log('unknown type payload arguments')
-      }
-    } else { // args 2 and more
-      let containsBuffer = false
-      args.forEach(item => {
-        if (ArrayBuffer.isView(item) || item instanceof ArrayBuffer) containsBuffer = true;
-        // console.log('payload item', item )
-      })
-
-      if (containsBuffer) {
-        type = PAYLOAD_TYPE.MBA;
-        // pack 
-      } else {
-        type = PAYLOAD_TYPE.MJSON;
-        // args is array
-        pack = encoder.encode(JSON.stringify(args))
-      }
-
-    }
-
-    return { type: type, buffer: pack }
-
-  }
-
-  get_signal_pack(tag, ...args) {
-    if (typeof tag !== 'string') throw TypeError('tag should be string.')
-    let tagEncoded = encoder.encode(tag)
-    let payload = this.parsePayload(args)
-
-    let sigPack;
-    if (payload.type == PAYLOAD_TYPE.EMPTY) {
-      sigPack = MBP.pack(
-        MBP.MB('#MsgType', '8', IOMsg.SIGNAL),
-        MBP.MB('#tagLen', '8', tagEncoded.byteLength),
-        MBP.MB('#tag', tagEncoded),
-        MBP.MB('#payloadType', '8', payload.type)
-      )
-    } else if (payload.type == PAYLOAD_TYPE.MBA) {
-      sigPack = MBP.pack(
-        MBP.MB('#MsgType', '8', IOMsg.SIGNAL),
-        MBP.MB('#tagLen', '8', tagEncoded.byteLength),
-        MBP.MB('#tag', tagEncoded),
-        MBP.MB('#payloadType', '8', payload.type),
-        MBP.MBA(...args)
-      )
-    } else {
-      sigPack = MBP.pack(
-        MBP.MB('#MsgType', '8', IOMsg.SIGNAL),
-        MBP.MB('#tagLen', '8', tagEncoded.byteLength),
-        MBP.MB('#tag', tagEncoded),
-        MBP.MB('#payloadType', '8', payload.type),
-        MBP.MB('#payload', payload.buffer)
-      )
-    }
-    return sigPack
-  }
-
-
-
-
   // signaling to the cid subscribers.
   // example.  sending cid close signal.
   deligateSignal(remote, tag, ...args) {
-    let sigPack = this.get_signal_pack(tag, ...args)
+    let sigPack = getSignalPack(tag, ...args)
     this.sender(tag, remote, sigPack)
   }
 

package/src/server/Server.js

@@ -9,22 +9,8 @@ export class Server extends EventEmitter {
 
   constructor(options, authManager , remoteManager) {
     super();
-    // console.log('Server input options', options )
-    this.manager = new Manager(this, authManager, remoteManager)
     this.apiNames = new Set()
 
-    if(options.port != 0){
-      this.startWSServer(options)
-    }
-    if (options.congPort) {
-      this.startCongServer(options)
-    }
-
-
-  }
-
-
-  startWSServer(options) {
     if (options.timeout) {
       let pingT = parseInt(options.timeout)
       if (pingT && pingT >= 1000) serverOption.timeout = pingT
@@ -35,13 +21,44 @@ export class Server extends EventEmitter {
       if (monitorT && monitorT >= 1000) serverOption.monitorPeriod = monitorT
     }
 
+    if (options.fileLogger) {
+      serverOption.fileLogger.connection.use = true;
+      serverOption.fileLogger.auth.use = true;
+      serverOption.fileLogger.attack.use = true;
+    }
+
+    if (options.showMessage) {
+      serverOption.showMessage = options.showMessage
+    }
+
+    if (options.showMetric) {
+      serverOption.showMetric = options.showMetric
+    }
+
+    if (options.timeout) {
+      serverOption.timeout = options.timeout
+    }
+
     if (options.port) {
-      let port = parseInt(options.port)
-      if (port) serverOption.port = port
+      serverOption.port = parseInt(options.port)
     }
+    
+    if (options.congPort) {
+      serverOption.congPort = parseInt(options.congPort)
+    }
+    
+    this.manager = new Manager(this, authManager, remoteManager)
+    if (serverOption.port) this.startWSServer(serverOption.port)
+    if( serverOption.congPort) this.startCongServer(serverOption.congPort)
+    
+    // console.log('serverOption:', serverOption)
+  }
+
+
+  startWSServer(port) {
 
-    console.log('WebSocketServer listen:', options.port)
-    this.wss = new WebSocketServer(options)
+    console.log('opening WebSocket Server:', port)
+    this.wss = new WebSocketServer({ port })
     // this.wss.setMaxListeners(0)
 
     this.wss.on('error', (err) => {
@@ -63,8 +80,8 @@ export class Server extends EventEmitter {
 
   }
 
-  startCongServer(options) {
-    console.log('congServer listen:', options.congPort)
+  startCongServer( congPort ) {
+    console.log('opening CongSocket Server:', congPort)
 
     this.congServer = net.createServer((socket) => {
       this.manager.addRemote(socket)
@@ -74,7 +91,7 @@ export class Server extends EventEmitter {
         if(err.code == 'EADDRINUSE'){
           process.exit()
         }
-      }).listen(serverOption.congPort, () => {
+      }).listen( congPort, () => {
         // console.log('congsocket server bound' );
       });
   }

package/src/server/serverOption.js

@@ -2,8 +2,8 @@
 
 export let serverOption = {
   clientTracking: false,
-  port: 7777,
-  congPort: null,
+  port: 0,
+  congPort: 0,
   timeout: 50000,
   showMessage: 'none',
   showMetric: 0,

package/test-browser/server.js

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

package/test-client-nodejs/client.cjs

@@ -1,7 +1,7 @@
 
 const { IO } = require('iosignal')
 
-const io = new IO('wss://io.remocon.kr/ws')
+const io = new IO('ws://localhost:7777')
 
 io.on('ready', ()=>{
   console.log('ready cid:', io.cid)

package/test-client-nodejs/client.mjs

@@ -1,7 +1,7 @@
 
 import { IO } from "iosignal"
 
-const io = new IO('wss://io.remocon.kr/ws')
+const io = new IO('ws://localhost:7777')
 
 io.on('ready', ()=>{
   console.log('ready cid:', io.cid)

package/test-client-nodejs/client_api_reply.mjs

@@ -0,0 +1,15 @@
+
+import { IO } from "iosignal"
+
+const io = new IO('ws://localhost:7777')
+
+io.on('ready', async ()=>{
+  let res_echo = await io.req('reply', 'echo', 'hello' )
+  let res_date = await io.req('reply', 'date' )
+  let res_unixtime = await io.req('reply', 'unixtime' )
+
+  if( res_echo.ok ) console.log( res_echo.body  )
+  if( res_date.ok ) console.log( res_date.body  )
+  if( res_unixtime.ok ) console.log( res_unixtime.body  )
+
+});

package/test-client-nodejs/stateChange.mjs

@@ -0,0 +1,19 @@
+
+import { IO } from "iosignal"
+
+const io = new IO('ws://localhost:7777')
+
+io.on('ready', ()=>{
+  console.log('ready cid:', io.cid)
+});
+
+io.on('change', ( evt )=>{
+  console.log('\nchange event:', evt  )
+  console.log('io.state<Number>', io.state  )
+  console.log('io.stateName<String>:', io.stateName )
+});
+
+
+io.on('error',err=>{
+    console.log('err', err)
+})

package/test-server/{test-Auth_Env.js → server-Auth_Env.js}

@@ -1,8 +1,10 @@
-import { Server, serverOption , Auth_Env } from '../index.js'
-
-serverOption.showMetric = 2;
-serverOption.showMessage = 'message';
+import { Server, Auth_Env } from '../index.js'
 
+const options = {
+  port: 7777,
+  showMetric: 2,
+  showMessage: 'message'
+}
 // You can use environment variable BOHO_AUTH
 
 // $ BOHO_AUTH=id1.key1.255,id2.key2.200 node app.js
@@ -12,6 +14,6 @@ serverOption.showMessage = 'message';
 let authInfo = 'id1.key1.255,id2.key2.200'
 
 let authManager = new Auth_Env( authInfo ) 
-const server = new Server( serverOption, authManager )   
-// console.log( 'serverOption:', serverOption )
+const server = new Server( options, authManager )   
+
 

package/test-server/server-Auth_File.js

@@ -0,0 +1,12 @@
+import { Server, Auth_File } from '../index.js'
+
+const options = {
+  port: 7777,
+  showMetric: 2,
+  showMessage: 'message'
+}
+
+// const server = new Server( options, new Auth_File('../authInfo.json') )  // JSON version.  cannot add comments.
+const server = new Server( options, new Auth_File('../auth_file.mjs') )      // JS version. it support comments. 
+
+

package/test-server/server-api_reply.js

@@ -0,0 +1,6 @@
+import { Server ,api_reply  } from 'iosignal'
+
+const server = new Server( { port: 7777 }  )
+
+// api  response module
+server.api('reply', api_reply)

package/test-server/server-api_sudo.js

@@ -0,0 +1,7 @@
+import { Server ,api_sudo , Auth_Env } from 'iosignal'
+
+let authManager = new Auth_Env('admin.adminkey.255')
+const server = new Server( { port: 7777 } ,authManager )
+
+// api  response module
+server.api('sudo', api_sudo )

package/test-server/server-commonjs.cjs

@@ -1,8 +1,9 @@
-let { Server, serverOption } = require('iosignal')
-
-  serverOption.showMetric = 2;
-  // serverOption.port = 7777  // default. websocket port 7777 will be open.
-  serverOption.congPort = 8888  // additional tcp cong port open.  for Arduino like devices.
-  const server = new Server( serverOption )
-  console.log( 'serverOption:', serverOption )
+let { Server } = require('iosignal')
 
+const server = new Server(
+  {
+    port: 7777,     // WebSocket
+    congPort: 8888, // CongSocket
+    showMetric: 2,  // show clients cid(state) info
+    showMessage: 'message' // show raw signal buffer
+  })

package/test-server/server-esm.mjs

@@ -1,12 +1,12 @@
-import { Server, serverOption } from '../index.js'
+import { Server } from '../index.js'
 
-// serverOption.showMetric = 2;
-// serverOption.showMessage = 'message';
-// serverOption.port = '6666'
-// serverOption.congPort = '6667'
+const server = new Server( 
+  { port: 7777,     // WebSocket
+    congPort: 8888, // CongSocket
+    showMetric: 2,
+    showMessage: 'message'
+  } )
 
-const server = new Server( serverOption )
-console.log( 'serverOption:', serverOption )
 
 // text message handler (No binary message)
 // print text message

package/test-server/simple-server.mjs

@@ -0,0 +1,12 @@
+import { Server  } from '../index.js'
+
+const server = new Server({
+  port: 7777 ,
+  congPort: 8888,
+  showMessage: 'message'
+} )
+
+server.on('text_message', (data, client)=>{
+  console.log( 'text_message', data ,'from', client.cid )
+  client.send('from server. your cid is '+ client.cid + ".")
+})

package/test-server/test-Auth_File.js

@@ -1,9 +0,0 @@
-import { Server, serverOption , Auth_File } from '../index.js'
-
-serverOption.showMetric = 2;
-serverOption.showMessage = 'message';
-
-// const server = new Server( serverOption, new Auth_File('../authInfo.json') )  // JSON version.  cannot add comments.
-const server = new Server( serverOption, new Auth_File('../auth_file.mjs') )      // JS version. it support comments. 
-// console.log( 'serverOption:', serverOption )
-

package/test-server/test-api_reply.js

@@ -1,10 +0,0 @@
-import { Server, serverOption ,api_reply  } from 'iosignal'
-serverOption.showMessage = 'message';
-
-// no authManager
-serverOption.port = 7777
-const rs = new Server( serverOption  )
-// api  response module
-rs.api('reply', api_reply)
-
-// console.log( 'serverOption:', serverOption )

package/test-server/test-api_sudo.js

@@ -1,11 +0,0 @@
-import { Server, serverOption ,api_sudo , Auth_Env } from 'iosignal'
-serverOption.showMessage = 'message';
-
-//  authManager
-serverOption.port = 7777
-let authManager = new Auth_Env('admin.adminkey.255')
-const rs = new Server( serverOption ,authManager )
-// api  response module
-rs.api('sudo', api_sudo )
-
-// console.log( 'serverOption:', serverOption )