iosignal 3.3.0 → 4.5.0

package/src/server/Manager.js

@@ -1,7 +1,7 @@
 import MBP from 'meta-buffer-pack'
 import { Remote } from './Remote.js'
 import { serverOption } from './serverOption.js'
-import { IOMsg, CLIENT_STATE } from '../common/constants.js'
+import { IOMsg, STATE } from '../common/constants.js'
 import { getSignalPack } from '../common/payload.js';
 import { FileLogger } from './FileLogger.js'
 import { Metric } from './Metric.js'
@@ -73,7 +73,7 @@ export class Manager {
     let remote = new Remote(socket, req, this)
     this.remotes.add(remote)
     remote.send(Buffer.from([IOMsg.SERVER_READY]))
-    remote.setState(CLIENT_STATE.SENT_SERVER_READY)
+    remote.setState(STATE.SERVER_READY)
     this.lastSSID = remote.ssid;
     let connectionInfo = `+ IP:${remote.ip} #${remote.ssid} ${socket.socketType === 'websocket' ? "WS" : "CS"} `;
     // console.log( connectionInfo)
@@ -181,8 +181,8 @@ export class Manager {
   serverSignalTo(tag, ...args) {
     let cid = tag.split('@')[0]
     let topic = tag.split('@')[1]
-    let sigPack = getSignalPack('@' + topic, ...args)
     if (cid && this.cid2remote.has(cid)) {
+      let sigPack = getSignalPack('@' + topic, ...args)
       let targetRemote = this.cid2remote.get(cid)
       console.log('target', targetRemote.state, targetRemote.cid)
       targetRemote.send_enc_mode(sigPack)
@@ -194,8 +194,8 @@ export class Manager {
 
   sender(tag, remote, message) {
     if (serverOption.membersOnly && !remote.boho.isAuthorized) {
-      console.log("[membersOnly] unAuthorized remote.",tag  )
-      remote.send(Buffer.from([IOMsg.SERVER_CLEAR_AUTH]))
+      // console.log("### server reject client signal reason: [membersOnly]" ,tag, remote.cid  )
+      remote.send(Buffer.from([IOMsg.AUTH_CLEAR]))
       remote.close()
       return ['err', 'unAuthorized']
     }
@@ -284,17 +284,18 @@ export class Manager {
             // console.log('## null remote' )
             break;
           }
-          if (c !== remote) {
+          // change: from v4.x allow receiveSelfMessages.
+          // if (c !== remote) { 
             c.send_enc_mode(message);
             sentCounter++;
-          }
+          // }
         }
 
-        if (serverOption.useQuota.publishCounter) {
-          // console.log(`pub >> [${tag}] sent: ${sentCounter} [use quota limit: ${remote.quota.publishCounter }] total: ${remotes.size} subscribers. ` )
-        } else {
-          // console.log(`pub >> [${tag}] sent: ${sentCounter} [no quota limit] total: ${remotes.size} subscribers. ` )
-        }
+        // if (serverOption.useQuota.publishCounter) {
+        //   // console.log(`pub >> [${tag}] sent: ${sentCounter} [use quota limit: ${remote.quota.publishCounter }] total: ${remotes.size} subscribers. ` )
+        // } else {
+        //   // console.log(`pub >> [${tag}] sent: ${sentCounter} [no quota limit] total: ${remotes.size} subscribers. ` )
+        // }
         return ['ok', sentCounter]
       }
     }

package/src/server/Remote.js

@@ -185,6 +185,7 @@ export class Remote extends RemoteCore {
     }
   }
 
+  // node.js server side remote.
   send(message, isBinary) {
     this.manager.txBytes += message.byteLength;
     this.socket.txCounter++;
@@ -196,13 +197,15 @@ export class Remote extends RemoteCore {
           this.socket.send(message);
         }
       } else {
+        console.log('server(ws)Remote.send() called. not open state. current readyState:', this.socket.readyState )
         this.close(true)
       }
-
+      
     } else { //CongSocket
       if (this.socket.readyState == 'open') {
         this.socket.write(pack(message))
       } else {
+        console.log('server(cong)Remote.send() called. not open state. current readyState:', this.socket.readyState )
         this.close(true)
       }
     }

package/src/server/RemoteCore.js

@@ -1,7 +1,7 @@
 import MBP from 'meta-buffer-pack'
 import Boho from 'boho'
 import { serverOption } from './serverOption.js';
-import { IOMsg, ENC_MODE, CLIENT_STATE } from '../common/constants.js'
+import { IOMsg, ENC_MODE, STATE } from '../common/constants.js'
 import { quotaTable } from '../common/quotaTable.js'
 
 const decoder = new TextDecoder()
@@ -40,7 +40,7 @@ export class RemoteCore {
 
     this.state;
     this.stateLog = [];
-    this.setState(CLIENT_STATE.INIT)
+    this.setState(STATE.OPEN)
 
   }
 
@@ -49,7 +49,7 @@ export class RemoteCore {
   setState(state) {
     this.state = state
     if (serverOption.debug.showAuthInfo) {
-      // let s = state + ":" + CLIENT_STATE[ state] 
+      state = state + ":" + STATE[ state] 
       this.stateLog.push( state  )
       console.log(this.stateLog.join('>'))
     }
@@ -60,24 +60,30 @@ export class RemoteCore {
   }
 
   getStateName() { // <String>
-    return (CLIENT_STATE[this.state]).toLowerCase()
+    return (STATE[this.state]).toLowerCase()
   }
 
 
   showMessageLog(message, isBinary) {
-    let from = this.boho.isAuthorized ? `[FROM]did: ${this.did} cid:${this.cid}` : `[FROM]cid:${this.cid}`
+    let h = '->S '
+    let from = this.boho.isAuthorized ? ` did: ${this.did} cid: ${this.cid}` : ` cid: ${this.cid}`
+    let prnLimit = 20
     if (isBinary) {
       let msgTypeName = IOMsg[message[0]]
       if (!msgTypeName) msgTypeName = Boho.BohoMsg[message[0]]
-      msgTypeName = ' [' + msgTypeName + ']';
-      if (message.byteLength > 40) {
-        console.log(from + msgTypeName + ' LEN:', message.length);
+
+      msgTypeName = '[' + msgTypeName + ']';
+      let size = message.byteLength;
+      if (size < prnLimit) {
+        console.log( h + msgTypeName + from +` [${size}]`, message);
       } else {
-        console.log(from + msgTypeName, message);
+        let elseLen = size - prnLimit
+        let some = message.subarray(0,prnLimit)
+        console.log( h + msgTypeName + from +` [${size}]` , some , ' ... else: ', elseLen);
       }
 
     } else {
-      console.log(from + ' [TEXT] %s', message);
+      console.log( h + ' [TEXT] %s' + from, message);
     }
   }
 
@@ -162,7 +168,7 @@ export class RemoteCore {
           break;
 
         case IOMsg.CID_REQ:
-          if (this.state < CLIENT_STATE.SENT_SERVER_READY) {
+          if (this.state < STATE.SERVER_READY) {
             // Protocol violation: CID_REQ was sent before receiving the SERVER_READY signal.
             console.log('CID_REQ before SERVER_READY')
             this.close()
@@ -179,7 +185,7 @@ export class RemoteCore {
             MB('#cid', this.cid)
           ))
 
-          this.setState(CLIENT_STATE.CID_READY)
+          this.setState(STATE.CID_RES)
           break;
 
         case IOMsg.ECHO:
@@ -285,24 +291,24 @@ export class RemoteCore {
         // Auth
         case Boho.BohoMsg.AUTH_REQ:
           if (!this.manager.authManager) return
-          if (this.state < CLIENT_STATE.SENT_SERVER_READY) {
+          if (this.state < STATE.SERVER_READY) {
             console.log('protocol error. auth_req before server_ready')
             this.close();
           }
-          this.setState(CLIENT_STATE.RECV_AUTH_REQ)
+          this.setState(STATE.AUTH_REQ)
           let auth_nonce_pack = this.boho.auth_nonce()
           // console.log('## auth_nonce_pack', auth_nonce_pack )
           this.send(auth_nonce_pack)
-          this.setState(CLIENT_STATE.SENT_SERVER_NONCE)
+          this.setState(STATE.AUTH_NONCE)
           break;
 
         case Boho.BohoMsg.AUTH_HMAC:
           if (!this.manager.authManager) return
-          if (this.state < CLIENT_STATE.SENT_SERVER_NONCE) {
+          if (this.state < STATE.AUTH_NONCE) {
             console.log('protocol error. auth_hmac before server_nonce')
             this.close();
           }
-          this.setState(CLIENT_STATE.RECV_AUTH_HMAC)
+          this.setState(STATE.AUTH_HMAC)
           //async
           this.manager.authManager.verify_auth_hmac(message, this)
             .then(authInfo => {

package/src/server/Server.js

@@ -81,7 +81,7 @@ export class Server extends EventEmitter {
 
     this.wss.once('listening', () => {
       this.port = this.wss.address().port;
-      console.log('wss server bound port:',  this.port );
+      // console.log('wss server bound port:',  this.port );
       this.listeningServerCount++;
       if (this.listeningServerCount === this.serverCountToListen) {
         this.emit('ready');
@@ -97,7 +97,7 @@ export class Server extends EventEmitter {
     })
 
     this.wss.on('close', () => {
-      console.log('### WS server is closed.')
+      // console.log('### WS server is closed.')
     })
 
     this.wss.on('connection', (ws, req) => {
@@ -118,10 +118,10 @@ export class Server extends EventEmitter {
           process.exit()
         }
       }).on('close', () => {
-        console.log('### congsocket server is closed.')
+        // console.log('### congsocket server is closed.')
       }).listen(this.congPort, () => {
         this.congPort = this.congServer.address().port;
-        console.log('congsocket server bound port:', this.congPort );
+        // console.log('congsocket server bound port:', this.congPort );
         this.listeningServerCount++;
         if (this.listeningServerCount === this.serverCountToListen) {
           this.emit('ready');
@@ -156,7 +156,7 @@ export class Server extends EventEmitter {
             return
           }
           if( api.commands.includes( req.topic )){
-            console.log('server api req', req )
+            // console.log('server api req', req )
             await api.request(remote, req)
           }else{
             remote.response(req.mid, STATUS.ERROR, "UNKNOWN_COMMAND");
@@ -186,7 +186,7 @@ export class Server extends EventEmitter {
       })
     }
     this.apiNames.add(target)
-    console.log(`[API registed: ${target} ] accept commands: ${api.commands}`)
+    // console.log(`[API registed: ${target} ] accept commands: ${api.commands}`)
     return this
   }
 
@@ -226,7 +226,7 @@ export class Server extends EventEmitter {
 
     if (this.congServer) {
       this.congServer.close((err) => {
-        if (err) console.error('congServer close error', err)
+        // if (err) console.error('congServer close error', err)
         // console.log('cong server closed.')
         onClosed()
       })