iosignal 4.8.0 → 5.0.0

package/src/server/RemoteCore.js

@@ -27,7 +27,7 @@ export class RemoteCore {
     this.ssid = RemoteCore.ssid++;  // ordered index number
     this.manager = manager;
 
-    this.cid = ''; // Communication Id
+    this.cid = ''; // Client Id
     this.did = ''; // Device Id
     this.uid = ''; // User Id
     this.nick = ''
@@ -50,7 +50,7 @@ export class RemoteCore {
     this.state = state
     if (serverOption.debug.showAuthInfo) {
       this.stateLog.push(  state + ":" + STATE[ state]   )
-      if( state == STATE.AUTH_ACK){
+      if( state == STATE.AUTH_RES){
         console.log('[auth success]', this.cid, this.stateLog.join('>'))
       }else if( state == STATE.AUTH_FAIL){
         console.log('[auth_fail]',this.stateLog.join('>'))
@@ -291,29 +291,16 @@ export class RemoteCore {
           break;
 
 
-        // Auth
+        // client's auth requst
         case Boho.BohoMsg.AUTH_REQ:
           if (!this.manager.authManager) return
           if (this.state < STATE.SERVER_READY) {
-            console.log('protocol error. auth_req before server_ready')
+            console.log('protocol error. must called auth_req after server_ready')
             this.close();
           }
           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(STATE.AUTH_NONCE)
-          break;
-
-        case Boho.BohoMsg.AUTH_HMAC:
-          if (!this.manager.authManager) return
-          if (this.state < STATE.AUTH_NONCE) {
-            console.log('protocol error. auth_hmac before server_nonce')
-            this.close();
-          }
-          this.setState(STATE.AUTH_HMAC)
           //async
-          this.manager.authManager.verify_auth_hmac(message, this)
+          this.manager.authManager.verify_auth_req(message, this)
             .then(authInfo => {
               if (authInfo?.name) {
                 this.manager.deligateSignal(this, '@$name', authInfo.name)
@@ -321,7 +308,7 @@ export class RemoteCore {
                 // this.manager.sender('@$name', authInfo.name )
               }
 
-              // console.log('[VERIFY AUTH_HMAC] SubClass of BohoAuth return authInfo:', authInfo )
+              // console.log('[VERIFY AUTH_REQ] SubClass of BohoAuth return authInfo:', authInfo )
             })
             .catch(e => {
               console.log('authInfo return fail.', e )

package/src/server/Server.js

@@ -131,25 +131,25 @@ export class Server extends EventEmitter {
 
 /**
  * RPC service register.
- * target:  service_name <string>
- * service: service_module <function module|class instance>
+ * service: service_name <string>
+ * service_module <function module|class instance>
  * return this
  */
-  attach(target, service_module) {
+  attach(service, service_module) {
 
-    if( typeof target !== 'string'){
-      throw new Error(`service( target ,service ) target name is not a string.`)
+    if( typeof service !== 'string'){
+      throw new Error(`attach service name is not a string.`)
     }
     if (!service_module.checkPermission || typeof service_module.checkPermission != 'function') {
-      throw new Error(`Service ${target} : no checkPermission or not a function.`)
+      throw new Error(`Service ${service} : no checkPermission or not a function.`)
     }
     if(!service_module.commands || !Array.isArray(service_module.commands) ){
-      throw new Error(`Service ${target} : no commands or !Array.`)
+      throw new Error(`Service ${service} : no commands or !Array.`)
     }
     
     // Service TYPE 1. single call() function.
     if ( service_module.call && typeof service_module.call == 'function' ) {
-      this.on(target, async (remote, req) => {
+      this.on(service, (remote, req) => {
         try {
           if (!service_module.checkPermission(remote, req)) {
             remote.response(req.mid, STATUS.ERROR, "NO_PERMISSION.")
@@ -157,36 +157,36 @@ export class Server extends EventEmitter {
           }
           if( service_module.commands.includes( req.topic )){
             // console.log('server service_module req', req )
-            await service_module.call(remote, req)
+            service_module.call(remote, req)
           }else{
             remote.response(req.mid, STATUS.ERROR, "UNKNOWN_COMMAND");
           }
         } catch (error) {
-          console.error(`Unhandled Service Error in target [${target}]:`, error);
+          console.error(`Unhandled Service Error in service [${service}]:`, error);
           remote.response(req.mid, STATUS.ERROR, "INTERNAL_SERVER_ERROR");
         }
       })
     } else {
       // Service TYPE 2. multiple functions.
-      this.on(target, async (remote, req) => {
+      this.on(service, (remote, req) => {
         try {
           if (!service_module.checkPermission(remote, req)) {
             remote.response(req.mid, STATUS.ERROR, "NO_PERMISSION.")
             return
           }
           if( service_module.commands.includes( req.topic )){
-            await service_module[req.topic](remote, req)
+            service_module[req.topic](remote, req)
           }else{
             remote.response(req.mid, STATUS.ERROR, "UNKNOWN_COMMAND");
           }
         } catch (error) {
-          console.error(`Unhandled Service Error in target [${target}]:`, error);
+          console.error(`Unhandled Service Error in service [${service}]:`, error);
           remote.response(req.mid, STATUS.ERROR, "INTERNAL_SERVER_ERROR");
         }
       })
     }
-    this.serviceNames.add(target)
-    // console.log(`[Service attached: ${target} ] accept commands: ${service_module.commands}`)
+    this.serviceNames.add(service)
+    // console.log(`[Service attached: ${service} ] accept commands: ${service_module.commands}`)
     return this
   }
 

package/src/server/serverOption.js

@@ -47,9 +47,8 @@ export let serverOption = {
   },
 
   auth: {
-    delay_auth_fail: 600,
+    delay_auth_fail: 600
   },
-
   membersOnly: false
 
 }

package/src/services/sudoService.js

@@ -21,18 +21,18 @@ export async function call(remote, req) {
     let cmd = req.topic;
     cmd = cmd.toLowerCase()
     if (cmd == 'cid') {
-      result = remote.manager.metric.getCIdList()
+      result = remote.manager.metrics.getCIdList()
     } else if (cmd == 'remotes' || cmd == 'clients') {
-      result = remote.manager.metric.getRemotes()
+      result = remote.manager.metrics.getRemotes()
     } else if (cmd == 'channels') {
-      result = remote.manager.metric.getChannelList()
+      result = remote.manager.metrics.getChannelList()
     } else if (cmd == 'subscribers') {
       let ch = req.$[0]
-      if (ch) result = remote.manager.metric.getSubscribers(ch)
+      if (ch) result = remote.manager.metrics.getSubscribers(ch)
     } else if (cmd == 'remote' || cmd == 'client') {
       let cid = req.$[0]
       let mode = req.$[1]
-      if (cid) result = remote.manager.metric.getRemoteByCId(cid, mode)
+      if (cid) result = remote.manager.metrics.getRemoteByCId(cid, mode)
 
     } else if (cmd == 'close') {
       if (req.$[0]) result = remote.manager.closeRemoteByCId(req.$[0])