iosignal 4.8.0 → 4.10.0

package/dist/iosignal.js

@@ -13,7 +13,7 @@ import require$$2, { networkInterfaces } from 'os';
 import require$$0$1 from 'buffer';
 import { memoryUsage } from 'process';
 
-var version$1 = "4.8.0";
+var version$1 = "4.10.0";
 var pkg = {
 	version: version$1};
 
@@ -1003,6 +1003,7 @@ class IOCore extends EventEmitter {
  stop() {
    this.autoReconnect = false;
    this.close();
+   this.cid = '';
    this.stateChange('stop','stop');
   }
 
@@ -1319,7 +1320,7 @@ class IOCore extends EventEmitter {
               }
               let oneString = decoder$4.decode(payloadStringWithoutNull);
               if (tag.indexOf('@') === 0) this.emit('@', tag, oneString);
-              if (tag !== '@') {
+              else {
                 this.emit(tag, tag, oneString);
                 this.emit('message', tag, oneString);
               }
@@ -1327,7 +1328,7 @@ class IOCore extends EventEmitter {
 
             case PAYLOAD_TYPE.BINARY:
               if (tag.indexOf('@') === 0) this.emit('@', tag, payloadBuffer);
-              if (tag !== '@') {
+              else {
                 this.emit(tag, tag, payloadBuffer);
                 this.emit('message', tag, payloadBuffer);
               }
@@ -1337,7 +1338,7 @@ class IOCore extends EventEmitter {
               let oneObjectBuffer = decoder$4.decode(payloadBuffer);
               let oneJSONObject = JSON.parse(oneObjectBuffer);
               if (tag.indexOf('@') === 0) this.emit('@', tag, oneJSONObject);
-              if (tag !== '@') {
+              else {
                 this.emit(tag, tag, oneJSONObject);
                 this.emit('message', tag, oneJSONObject);
               }
@@ -1347,7 +1348,7 @@ class IOCore extends EventEmitter {
               let mjsonBuffer = decoder$4.decode(payloadBuffer);
               let mjson = JSON.parse(mjsonBuffer);
               if (tag.indexOf('@') === 0) this.emit('@', tag, ...mjson);
-              if (tag !== '@') {
+              else {
                 this.emit(tag, tag, ...mjson);
                 this.emit('message', tag, ...mjson);
               }
@@ -1356,7 +1357,7 @@ class IOCore extends EventEmitter {
             case PAYLOAD_TYPE.MBA:
               let mbaObject = M$1.unpack(payloadBuffer);
               if (tag.indexOf('@') === 0) this.emit('@', tag, ...mbaObject.args);
-              if (tag !== '@') {
+              else {
                 this.emit(tag, tag, ...mbaObject.args);
                 this.emit('message', tag, ...mbaObject.args);
               }
@@ -7635,9 +7636,8 @@ let serverOption = {
   },
 
   auth: {
-    delay_auth_fail: 600,
+    delay_auth_fail: 600
   },
-
   membersOnly: false
 
 };
@@ -9093,7 +9093,7 @@ class Server extends require$$0$3 {
     
     // Service TYPE 1. single call() function.
     if ( service_module.call && typeof service_module.call == 'function' ) {
-      this.on(target, async (remote, req) => {
+      this.on(target, (remote, req) => {
         try {
           if (!service_module.checkPermission(remote, req)) {
             remote.response(req.mid, STATUS.ERROR, "NO_PERMISSION.");
@@ -9101,7 +9101,7 @@ class Server extends require$$0$3 {
           }
           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");
           }
@@ -9112,14 +9112,14 @@ class Server extends require$$0$3 {
       });
     } else {
       // Service TYPE 2. multiple functions.
-      this.on(target, async (remote, req) => {
+      this.on(target, (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");
           }
@@ -9186,7 +9186,7 @@ class BohoAuth {
       throw new Error('BohoAuth must be initialized with a keyProvider.');
     }
     this.keyProvider = keyProvider;
-
+    this.keepOldConnection = true;
     this.authLogger;
     if (serverOption.fileLogger.auth.use) {
       this.authLogger = new FileLogger(serverOption.fileLogger.auth.path);
@@ -9201,42 +9201,40 @@ class BohoAuth {
     }
     // console.log('##### AUTH_FAIL reason: ', reason)
     peer.setState(STATE.AUTH_FAIL);
-    peer.send(Buffer.from([tt.BohoMsg.AUTH_FAIL]));
     // add some delay time.
-    // setTimeout(e => {
-    // }, serverOption.auth.delay_auth_fail)
+    setTimeout(e => {
+      peer.send(Buffer.from([tt.BohoMsg.AUTH_FAIL]));
+    }, serverOption.auth.delay_auth_fail);
   }
 
+
   async verify_auth_hmac(auth_hmac, peer) {
     try {
       //1. unpack 
       let infoPack = M$1.unpack(auth_hmac, tt.Meta.AUTH_HMAC);
-
       if (!infoPack) {
         this.send_auth_fail(peer, 'unpack auth_pack fail');
         return
       }
-      
+
       let id = "";
       if (infoPack.id8.includes(0)) {
         id = decoder.decode(infoPack.id8.subarray(0, infoPack.id8.indexOf(0)));
       } else {
         id = decoder.decode(infoPack.id8);
       }
-      
+
       //2. get key of id from DB
       let authInfo = await this.keyProvider.getAuth(id);
-
       if (!authInfo) {
         this.send_auth_fail(peer, 'NO ID:' + id);
         return
       }
 
       if (serverOption.debug.showAuthInfo) {
-        console.log('[debug]showAuthInfo',authInfo );
+        console.log('[debug]showAuthInfo', authInfo);
       }
 
-      // console.log('db authInfo.key: ', authInfo.key)
       peer.boho.copy_id8(infoPack.id8);
       // type of key
       let authKey;
@@ -9251,46 +9249,43 @@ class BohoAuth {
       }
 
       //3. check hmac
-      // console.log('-- found: authKey of id: ', id, authKey.toString('hex'))
       let auth_ack = peer.boho.check_auth_hmac(infoPack);
-
-      // console.log('auth_ack',  auth_ack )
       if (!auth_ack) {
         this.send_auth_fail(peer, 'hmac dismatched');
         return
       }
 
       //4. get info
-      // console.log('#### auth success' )
 
       //5. check duplicate login.
-      // current policy. Deny duplicate login
-
-      // duplicate login policy.  
-      // 1. send clear_auth signal to the old connection. 
-      // 2. close old connection.
-      // 3. close new connection. retry from begining.
       if (peer.manager.cid2remote.has(authInfo.cid)) {
         let old = peer.manager.cid2remote.get(authInfo.cid);
+        console.log('[WARN]DUPLICATE_LOGIN detected.', old.cid);
+        old.ping(); // check the connection.
         if (old == peer) {
-          console.log('## trying RELOGIN with SAME ID. ignored.');
+          console.log('## trying to RELOGIN after login.');
           return
         }
-        console.log('### DUPLICATE_LOGIN detected.', old.cid);
-        let sigPack = M$1.pack(
+
+        let authClearSignal = M$1.pack(
           M$1.MB('#MsgType', '8', IOMsg.AUTH_CLEAR),
           M$1.MB('#reason', 'duplicate login.')
         );
-        old.send( sigPack);
-        // old.close()  client will close and stop.
-        peer.close();  // auto relogin
+        if (this.keepOldConnection) { // default true
+          // keep old connection. reject new connection by sending auth_fail signal.
+          this.send_auth_fail(peer, 'duplicate login');
+          // peer.send(authClearSignal)
+        } else {
+          // accept new connection. stop the old connection by sending auth_clear signal.
+          old.send(authClearSignal);
+          peer.close();
+        }
         return
       }
 
-
-      //6. delete current (temp rand)cid if exist.
+      //6. delete current (or anonymouse)cid if exist.
       if (peer.cid) {
-        console.log('duplicate cid');
+        // console.log('if peer has cid', peer.cid)
         peer.manager.cid2remote.delete(peer.cid);
       }
 
@@ -9298,7 +9293,7 @@ class BohoAuth {
       peer.did = id;
       peer.cid = authInfo.cid;
       peer.nick = authInfo.cid; // temporary: nick as cid
-      if( authInfo.uid ) peer.uid = authInfo.uid; 
+      if (authInfo.uid) peer.uid = authInfo.uid;
 
       //8. setting quota level. 
       let quotaLevel = serverOption.defaultQuotaIndex;
@@ -9307,7 +9302,6 @@ class BohoAuth {
       let newQuota = quotaTable[quotaLevel];
       if (!newQuota) {
         let err = 'no index quotaTable for auth.level: ' + quotaLevel;
-        console.log('##AUTH:DATA ERROR##', err);
         this.send_auth_fail(peer, err);
         return
       } else {
@@ -9319,14 +9313,11 @@ class BohoAuth {
         console.log('## LOGIN ADMIN CID:', peer.cid);
         peer.isAdmin = true;
       }
-      // console.log('auth: peer.quota', peer.quota )
       // send quota.level
       peer.send(Buffer.from([IOMsg.QUOTA_LEVEL, quotaLevel]));
 
       //9. set cid2remote
       peer.manager.cid2remote.set(peer.cid, peer);
-      // console.log( 'done: cid2remote:', peer.manager.cid2remote.keys()  )
-      // console.log("LOGIN: ", `id: ${ peer.did}(${peer.cid})` )
       //10. send ack.
       peer.send(auth_ack);
       peer.setState(STATE.AUTH_ACK);
@@ -9337,9 +9328,9 @@ class BohoAuth {
       }
       return authInfo
     } catch (error) {
+      console.log('verify_auth_hmac error', error);
       this.send_auth_fail(peer, '[BohoAuth]caught: unknown error:' + error);
     }
-
   }
 
   async getAuth(id) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iosignal",
-  "version": "4.8.0",
+  "version": "4.10.0",
   "description": "iosignal",
   "type": "module",
   "exports": {

package/src/auth/BohoAuth.js

@@ -12,7 +12,7 @@ export class BohoAuth {
       throw new Error('BohoAuth must be initialized with a keyProvider.');
     }
     this.keyProvider = keyProvider;
-
+    this.keepOldConnection = true;
     this.authLogger;
     if (serverOption.fileLogger.auth.use) {
       this.authLogger = new FileLogger(serverOption.fileLogger.auth.path)
@@ -27,42 +27,40 @@ export class BohoAuth {
     }
     // console.log('##### AUTH_FAIL reason: ', reason)
     peer.setState(STATE.AUTH_FAIL)
-    peer.send(Buffer.from([Boho.BohoMsg.AUTH_FAIL]))
     // add some delay time.
-    // setTimeout(e => {
-    // }, serverOption.auth.delay_auth_fail)
+    setTimeout(e => {
+      peer.send(Buffer.from([Boho.BohoMsg.AUTH_FAIL]))
+    }, serverOption.auth.delay_auth_fail)
   }
 
+
   async verify_auth_hmac(auth_hmac, peer) {
     try {
       //1. unpack 
       let infoPack = MBP.unpack(auth_hmac, Boho.Meta.AUTH_HMAC)
-
       if (!infoPack) {
         this.send_auth_fail(peer, 'unpack auth_pack fail');
         return
       }
-      
+
       let id = ""
       if (infoPack.id8.includes(0)) {
         id = decoder.decode(infoPack.id8.subarray(0, infoPack.id8.indexOf(0)));
       } else {
         id = decoder.decode(infoPack.id8);
       }
-      
+
       //2. get key of id from DB
       let authInfo = await this.keyProvider.getAuth(id)
-
       if (!authInfo) {
         this.send_auth_fail(peer, 'NO ID:' + id);
         return
       }
 
       if (serverOption.debug.showAuthInfo) {
-        console.log('[debug]showAuthInfo',authInfo )
+        console.log('[debug]showAuthInfo', authInfo)
       }
 
-      // console.log('db authInfo.key: ', authInfo.key)
       peer.boho.copy_id8(infoPack.id8)
       // type of key
       let authKey;
@@ -77,46 +75,43 @@ export class BohoAuth {
       }
 
       //3. check hmac
-      // console.log('-- found: authKey of id: ', id, authKey.toString('hex'))
       let auth_ack = peer.boho.check_auth_hmac(infoPack)
-
-      // console.log('auth_ack',  auth_ack )
       if (!auth_ack) {
         this.send_auth_fail(peer, 'hmac dismatched');
         return
       }
 
       //4. get info
-      // console.log('#### auth success' )
 
       //5. check duplicate login.
-      // current policy. Deny duplicate login
-
-      // duplicate login policy.  
-      // 1. send clear_auth signal to the old connection. 
-      // 2. close old connection.
-      // 3. close new connection. retry from begining.
       if (peer.manager.cid2remote.has(authInfo.cid)) {
         let old = peer.manager.cid2remote.get(authInfo.cid)
+        console.log('[WARN]DUPLICATE_LOGIN detected.', old.cid)
+        old.ping(); // check the connection.
         if (old == peer) {
-          console.log('## trying RELOGIN with SAME ID. ignored.')
+          console.log('## trying to RELOGIN after login.')
           return
         }
-        console.log('### DUPLICATE_LOGIN detected.', old.cid)
-        let sigPack = MBP.pack(
+
+        let authClearSignal = MBP.pack(
           MBP.MB('#MsgType', '8', IOMsg.AUTH_CLEAR),
           MBP.MB('#reason', 'duplicate login.')
         )
-        old.send( sigPack)
-        // old.close()  client will close and stop.
-        peer.close()  // auto relogin
+        if (this.keepOldConnection) { // default true
+          // keep old connection. reject new connection by sending auth_fail signal.
+          this.send_auth_fail(peer, 'duplicate login')
+          // peer.send(authClearSignal)
+        } else {
+          // accept new connection. stop the old connection by sending auth_clear signal.
+          old.send(authClearSignal)
+          peer.close()
+        }
         return
       }
 
-
-      //6. delete current (temp rand)cid if exist.
+      //6. delete current (or anonymouse)cid if exist.
       if (peer.cid) {
-        console.log('duplicate cid')
+        // console.log('if peer has cid', peer.cid)
         peer.manager.cid2remote.delete(peer.cid)
       }
 
@@ -124,7 +119,7 @@ export class BohoAuth {
       peer.did = id
       peer.cid = authInfo.cid
       peer.nick = authInfo.cid // temporary: nick as cid
-      if( authInfo.uid ) peer.uid = authInfo.uid 
+      if (authInfo.uid) peer.uid = authInfo.uid
 
       //8. setting quota level. 
       let quotaLevel = serverOption.defaultQuotaIndex;
@@ -133,7 +128,6 @@ export class BohoAuth {
       let newQuota = quotaTable[quotaLevel];
       if (!newQuota) {
         let err = 'no index quotaTable for auth.level: ' + quotaLevel
-        console.log('##AUTH:DATA ERROR##', err)
         this.send_auth_fail(peer, err);
         return
       } else {
@@ -145,14 +139,11 @@ export class BohoAuth {
         console.log('## LOGIN ADMIN CID:', peer.cid)
         peer.isAdmin = true;
       }
-      // console.log('auth: peer.quota', peer.quota )
       // send quota.level
       peer.send(Buffer.from([IOMsg.QUOTA_LEVEL, quotaLevel]))
 
       //9. set cid2remote
       peer.manager.cid2remote.set(peer.cid, peer)
-      // console.log( 'done: cid2remote:', peer.manager.cid2remote.keys()  )
-      // console.log("LOGIN: ", `id: ${ peer.did}(${peer.cid})` )
       //10. send ack.
       peer.send(auth_ack)
       peer.setState(STATE.AUTH_ACK)
@@ -163,9 +154,9 @@ export class BohoAuth {
       }
       return authInfo
     } catch (error) {
+      console.log('verify_auth_hmac error', error)
       this.send_auth_fail(peer, '[BohoAuth]caught: unknown error:' + error);
     }
-
   }
 
   async getAuth(id) {

package/src/client/IOCore.js

@@ -246,6 +246,7 @@ export class IOCore extends EventEmitter {
  stop() {
    this.autoReconnect = false;
    this.close();
+   this.cid = ''
    this.stateChange('stop','stop');
   }
 
@@ -567,7 +568,7 @@ export class IOCore extends EventEmitter {
               }
               let oneString = decoder.decode(payloadStringWithoutNull)
               if (tag.indexOf('@') === 0) this.emit('@', tag, oneString)
-              if (tag !== '@') {
+              else {
                 this.emit(tag, tag, oneString)
                 this.emit('message', tag, oneString)
               }
@@ -575,7 +576,7 @@ export class IOCore extends EventEmitter {
 
             case PAYLOAD_TYPE.BINARY:
               if (tag.indexOf('@') === 0) this.emit('@', tag, payloadBuffer)
-              if (tag !== '@') {
+              else {
                 this.emit(tag, tag, payloadBuffer)
                 this.emit('message', tag, payloadBuffer)
               }
@@ -585,7 +586,7 @@ export class IOCore extends EventEmitter {
               let oneObjectBuffer = decoder.decode(payloadBuffer)
               let oneJSONObject = JSON.parse(oneObjectBuffer)
               if (tag.indexOf('@') === 0) this.emit('@', tag, oneJSONObject)
-              if (tag !== '@') {
+              else {
                 this.emit(tag, tag, oneJSONObject)
                 this.emit('message', tag, oneJSONObject)
               }
@@ -595,7 +596,7 @@ export class IOCore extends EventEmitter {
               let mjsonBuffer = decoder.decode(payloadBuffer)
               let mjson = JSON.parse(mjsonBuffer)
               if (tag.indexOf('@') === 0) this.emit('@', tag, ...mjson)
-              if (tag !== '@') {
+              else {
                 this.emit(tag, tag, ...mjson)
                 this.emit('message', tag, ...mjson)
               }
@@ -604,7 +605,7 @@ export class IOCore extends EventEmitter {
             case PAYLOAD_TYPE.MBA:
               let mbaObject = MBP.unpack(payloadBuffer)
               if (tag.indexOf('@') === 0) this.emit('@', tag, ...mbaObject.args)
-              if (tag !== '@') {
+              else {
                 this.emit(tag, tag, ...mbaObject.args)
                 this.emit('message', tag, ...mbaObject.args)
               }

package/src/server/Server.js

@@ -149,7 +149,7 @@ export class Server extends EventEmitter {
     
     // Service TYPE 1. single call() function.
     if ( service_module.call && typeof service_module.call == 'function' ) {
-      this.on(target, async (remote, req) => {
+      this.on(target, (remote, req) => {
         try {
           if (!service_module.checkPermission(remote, req)) {
             remote.response(req.mid, STATUS.ERROR, "NO_PERMISSION.")
@@ -157,7 +157,7 @@ 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");
           }
@@ -168,14 +168,14 @@ export class Server extends EventEmitter {
       })
     } else {
       // Service TYPE 2. multiple functions.
-      this.on(target, async (remote, req) => {
+      this.on(target, (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");
           }

package/src/server/serverOption.js

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