iosignal 1.6.1 → 1.7.0

package/test-client-nodejs/client.mjs

@@ -3,15 +3,15 @@ import { IO } from "iosignal"
 
 const io = new IO('ws://localhost:7777')
 
-io.on('ready', ()=>{
+io.on('ready', () => {
   console.log('ready cid:', io.cid)
-  io.signal('#screen','playToggle')
+  io.signal('#screen', 'playToggle')
 });
 
-io.listen('#notify', (...args)=>{
-  console.log( args )
+io.listen('#notify', (...args) => {
+  console.log(args)
 })
 
-io.on('error',err=>{
-    console.log('err', err)
+io.on('error', err => {
+  console.log('err', err)
 })

package/test-client-nodejs/client_api_reply.mjs

@@ -3,13 +3,13 @@ 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  )
+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

@@ -3,17 +3,17 @@ import { IO } from "iosignal"
 
 const io = new IO('ws://localhost:7777')
 
-io.on('ready', ()=>{
+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('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)
+io.on('error', err => {
+  console.log('err', err)
 })

package/test-server/server-Auth_Env.js

@@ -13,7 +13,7 @@ const options = {
 // or, as constructor argument.
 let authInfo = 'id1.key1.255,id2.key2.200'
 
-let authManager = new Auth_Env( authInfo ) 
-const server = new Server( options, authManager )   
+let authManager = new Auth_Env(authInfo)
+const server = new Server(options, authManager)
 
 

package/test-server/server-Auth_File.js

@@ -7,6 +7,6 @@ const options = {
 }
 
 // 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. 
+const server = new Server(options, new Auth_File('../auth_file.mjs'))      // JS version. it support comments. 
 
 

package/test-server/server-api_reply.js

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

package/test-server/server-api_sudo.js

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

package/test-server/server-esm.mjs

@@ -1,19 +1,20 @@
 import { Server } from '../index.js'
 
-const server = new Server( 
-  { port: 7777,     // WebSocket
+const server = new Server(
+  {
+    port: 7777,     // WebSocket
     congPort: 8888, // CongSocket
     showMetric: 2,
     showMessage: 'message'
-  } )
+  })
 
 
 // text message handler (No binary message)
 // print text message
 // then reply.
-server.on('text_message', (msg, remote)=>{
-  console.log('text_message from(cid): ', remote.cid,  msg.toString() )
-  let result = { msg: msg, yourcid: remote.cid , date: new Date().toUTCString() }
-  let res = JSON.stringify( result )
-  remote.send( res )
+server.on('text_message', (msg, remote) => {
+  console.log('text_message from(cid): ', remote.cid, msg.toString())
+  let result = { msg: msg, yourcid: remote.cid, date: new Date().toUTCString() }
+  let res = JSON.stringify(result)
+  remote.send(res)
 })

package/test-server/simple-server.mjs

@@ -1,12 +1,12 @@
-import { Server  } from '../index.js'
+import { Server } from '../index.js'
 
 const server = new Server({
-  port: 7777 ,
+  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 + ".")
+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-signal-payloadType/signalPack.js

@@ -23,7 +23,7 @@ console.log(PAYLOAD_TYPE[parsePayload(type5).type], type5)  // MBA
 
 
 let signalTag = 'channel'
-let signalPack = getSignalPack( signalTag, ...type5)
+let signalPack = getSignalPack(signalTag, ...type5)
 console.log('signalPack', signalPack)
 
 let payloadBuffer = getPayloadFromSignalPack(signalPack)

package/test-signal-payloadType/signaling.js

@@ -1,10 +1,10 @@
-import { IO, Server} from 'iosignal'
+import { IO, Server } from 'iosignal'
 
 let url = 'ws://localhost:5555'
 let server = new Server({
-   port: 5555 
+  port: 5555
   //  ,showMessage: 'message'
-  })
+})
 let done = false;
 
 let tx = new IO(url)
@@ -48,7 +48,7 @@ function sendSignals() {
 const arg1 = ['a1']
 const arg2 = ['a2', 222]
 const arg3 = [{ name: 'a3' }, 333]
-const arg4 = [{a:1}, Buffer.from('KKKKK')]
+const arg4 = [{ a: 1 }, Buffer.from('KKKKK')]
 const arg5 = [new Uint8Array(20)]
 
 

package/src/server/ServerRemote.js

@@ -1,227 +0,0 @@
-import { pack, CongRx } from '../client/CongPacket.js'
-import { ServerRemoteCore } from './ServerRemoteCore.js';
-import { serverOption } from './serverOption.js';
-import { IOMsg } from '../common/constants.js';
-import * as util from '../common/util.js'
-
-const decoder = new TextDecoder()
-
-export class ServerRemote extends ServerRemoteCore {
-  constructor(socket, req, manager) {
-    super(socket, manager);
-    this.socketType = socket.socketType
-
-    if( this.socketType === 'websocket' ){
-      this.TLS = req.headers["x-forwarded-proto"] === 'https' ?  true : false;
-      this.ip = this.getRemoteIP(req);
-    }else{
-      this.TLS = false;
-      this.ip = this.getRemoteIP( socket.remoteAddress )
-    }
-    
-
-    // default channel : HOME_CHANNEL
-    // console.log('connected ip:', this.ip)
-
-    if( util.isPrivateIP(this.ip)){
-      // connection from local or private network has default private channel.
-      this.HOME_CHANNEL = 'PRIVATE:'
-      this.privateNode = true 
-    }else{
-      // client have default channel name as global IP address.
-      this.HOME_CHANNEL = 'IP:'+ util.getIPv4HexString(this.ip)
-    }
-
-    
-    if(this.socketType === 'websocket' ){ // WS
-      if(serverOption.debug.slow){
-        socket.on("message", this.onTimeDelayMessage.bind(this));
-      }else{
-        socket.on("message", this.onSocketMessage.bind(this));
-      }
-      socket.on("pong", this.receiveMonitor.bind(this));
-      socket.on("ping", this.receiveMonitor.bind(this));
-      socket.on("error", (e) => { console.log('Websocket error',e, e.code) }); 
-      socket.onclose = (e) => {
-        this.manager.removeRemote(this);
-      };
-    }else{ // TCP else
-      this.congRx = new CongRx();
-      socket.on('data', data=>{ this.congRx.write(data)} )
-
-      this.congRx.on('wrong',this.onWrongCongPacketMessage.bind(this))
-      // readable.pipe( destination )
-      // tcpSocket -> congRx(parser) -> onMessage
-      // socket.pipe( this.congRx )
-
-      if(serverOption.debug.slow){
-        this.congRx.on('data', this.onTimeDelayMessage.bind(this))
-      }else{
-        this.congRx.on('data', this.onSocketMessage.bind(this))
-      }
-      
-      socket.on('error', e=>{ console.log('TCP Socket error',e )})
-      socket.on('close', e=>{ 
-        this.manager.removeRemote(this);
-        })
-      
-    }
-  }
-
-  onWrongCongPacketMessage( message){
-    /*
-      * three category CongSocket connection.
-      1. anonymouse, tcp connection.
-        > no cid_req, no auth_req
-        > It's attacker. close it.
-      2. not authorized but cid ready connnection.
-        > anonymouse remote client.
-        > allowed some wrong(broken) message. small quota.
-      3. authorized remote connection.
-        > allowed some wrong(broken) message. large quota.
-    */
-    if(this.cid){ // category  2 and 3.
-      // temporary broken message.
-      console.log('wrong congpack from user:', Date(), this.ip, this.ssid, this.cid )
-    }else{
-      // attacker
-      let msg =""
-      try {
-        msg = decoder.decode(message)
-      } catch (error) {
-        msg += 'Len: '+ message.byteLength
-      }
-
-      // console.log('attacker message:', attackMsg)
-      if(this.manager.attackLogger){
-        let attackMsg = `> ${this.ssid} ${this.ip} ${msg}`
-        this.manager.attackLogger.log( attackMsg )
-      } 
-
-      this.close( true );
-    }
-  }
-
-
-  permissionChecker(){    
-    // type1.
-    // accept some traffic before authorize.
-    const limitBytes = 100
-    
-    let txBytes =  this.socket.bytesWritten || this.socket._socket?.bytesWritten
-    let rxBytes = this.socket.bytesRead || this.socket._socket?.bytesRead 
-
-    if( txBytes == undefined) txBytes = 0
-    if( rxBytes == undefined) rxBytes = 0
-    // console.log( txBytes, rxBytes )
-
-  }
- 
-
-// any type of received messages:  message, ping, pong
-  receiveMonitor(){
-    this.socket.rxCounter++
-    this.socket.isAlive = true;
-    // manager manages connection (ping) check.
-  }
-
-  isConnectionHTTPS(req){ 
-    //In case of reverse proxy environment.  i.e. using nginx proxy_pass.
-    return req.headers["x-forwarded-proto"];   //https or undefined
-  }
-
-
-  // nginx https reversproxy , http redirect , direct tcp 
-  getRemoteIP(req) { //req or ip string
-    let ip;
-    if( req && req.headers ){
-      ip = req.headers["x-forwarded-for"];
-      if (ip == undefined ) ip = req.socket.remoteAddress;
-    }else{
-      ip = req;
-    }
-
-    if (ip) {
-      if (ip.indexOf("::ffff:") == 0) ip = ip.substring(7);
-      if (ip == "::1") ip = "127.0.0.1";
-    } else {
-      ip = "0.0.0.0";
-    }
-    // console.log('getRemoteIP', ip )
-    return ip;
-  }
-
-  ping(){
-    if(this.socketType === 'websocket'){
-      this.socket.ping()
-      this.socket.txCounter++
-    }else{
-      this.send( Buffer.from( [ IOMsg.PING ]))
-    }
-  }
-
-  pong(){
-    if(this.socketType === 'websocket'){
-      this.socket.pong()
-      this.socket.txCounter++
-    }else{
-      this.send( Buffer.from( [ IOMsg.PONG ]))
-    }
-  }
-
-  getTraffic(){
-    let txb =  this.socket.bytesWritten || this.socket._socket?.bytesWritten
-    let rxb = this.socket.bytesRead || this.socket._socket?.bytesRead 
-    let tx = this.socket.txCounter
-    let rx = this.socket.rxCounter
-    let traffic = { tx, txb, rx, rxb }
-    // console.log('traffic before close', traffic )
-  }
-
-  close( terminateNow = false){
-    this.getTraffic()
-    // let info = `call close() [${this.ssid}] socket: readyState:${this.socket.readyState} ${this.socket}`
-    // console.log( info )
-    if( this.socketType === 'websocket' ){
-      if( terminateNow ) this.socket.terminate();
-        else this.socket.close();
-    }else{
-      if( terminateNow ) this.socket.destroy();
-        else this.socket.end();
-    }
-  }
-
-  send( message, isBinary ){
-    this.manager.txBytes += message.byteLength;
-    this.socket.txCounter++;
-    if(this.socketType === 'websocket' ){ //WebSocket
-      if( this.socket.readyState === 1) {
-        if( isBinary != undefined ){
-          this.socket.send(message, { binary: isBinary });
-        }else{
-          this.socket.send(message );
-        }
-      }else{
-        // not open 
-        // console.log('ServerRemote::send(), WS not open. #'+this.ssid + ' cid:', this.cid +":"+ this.getStateName() )
-        // console.log('message not sent:', message )
-        this.close( true )
-      }
-
-    }else{ //CongSocket
-      if( this.socket.readyState == 'open'){
-        this.socket.write( pack(message) )
-      }else{
-        // console.log('ServerRemote::send(), CongSocket not open #'+this.ssid + ' cid:' , this.cid + ':' + this.getStateName() )
-        this.close( true )
-      }
-    }
-
-  }
-
-}
-
-
-// process.on('uncaughtException', (err, origin) => {
-//   console.log('serverRemote::uncaughtException', err,origin)
-// })