iosignal 4.7.0 → 4.10.0

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');
   }
 
@@ -460,7 +461,7 @@ export class IOCore extends EventEmitter {
 
         // **IMPORTANT** change state before subscribe.
         this.stateChange('ready', 'cid_ready')
-        this.subscribe_memory_channels()  // tags registered by listen() or link().
+        this.subscribe_channels() 
         break;
 
       case IOMsg.QUOTA_LEVEL:
@@ -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)
               }
@@ -732,6 +733,7 @@ export class IOCore extends EventEmitter {
       console.log('## your maximum signalSize(bytes) is:', this.quota.signalSize)
       return
     }
+    // console.log(`C->[${IOMsg[ data[0]]}]`)
     this.socket_send(data);
   }
 
@@ -958,14 +960,6 @@ export class IOCore extends EventEmitter {
   subscribe(tag) {
     if (typeof tag !== 'string') throw TypeError('tag should be string.')
     if (tag.length > SIZE_LIMIT.TAG_LEN1) throw TypeError('please check tag string length limit:' + SIZE_LIMIT.TAG_LEN1)
-    if (this.state !== STATE.READY) return
-
-    // subscribe 사용시,  사용 'ready' 이벤트시 메뉴얼 등록되므로 여기에 등록하면 2중 호출된다.
-    // 즉, channels 등록은 listen 같은 자동화 구독시만 사용. 
-    // let tagList = tag.split(',')
-    // tagList.forEach(tag => {
-    //   this.channels.add(tag)
-    // })
 
     try {
       let tagEncoded = encoder.encode(tag)
@@ -975,47 +969,27 @@ export class IOCore extends EventEmitter {
           MBP.NB('8', tagEncoded.byteLength),
           tagEncoded]))
     } catch (error) { }
+
   }
 
+
   /**
-   * Subscribes to a channel or channels with a promise.
-   * @param {string} tag - The tag(s) of the channel(s) to subscribe to (comma-separated).
-   * @returns {Promise<any>}
-   * @throws {TypeError} If tag is not a string or exceeds length limit.
+   * Subscribes stored channels.
+   * called client state become 'ready'
    */
-  subscribe_promise(tag) {
-    if (typeof tag !== 'string') throw TypeError('tag should be string.')
-    if (tag.length > SIZE_LIMIT.TAG_LEN2) throw TypeError('please check tag string length limit:' + SIZE_LIMIT.TAG_LEN2)
-
-    if (this.state !== STATE.READY) {
-      return Promise.reject('subscribe_promise:: connection is not ready')
-    }
+  subscribe_channels() {
+    if (this.state !== STATE.READY) return
+    if (this.channels.size == 0) return
+    let tag = Array.from(this.channels).join(',')
 
     try {
       let tagEncoded = encoder.encode(tag)
       this.send_enc_mode(
         Buffer.concat([
-          MBP.NB('8', IOMsg.SUBSCRIBE_REQ),
-          MBP.NB('16', ++this.mid),
-          MBP.NB('16', tagEncoded.byteLength),
+          MBP.NB('8', IOMsg.SUBSCRIBE),
+          MBP.NB('8', tagEncoded.byteLength),
           tagEncoded]))
-      return this.setMsgPromise(this.mid)
     } catch (error) { }
-  }
-
-  /**
-   * Subscribes to channels stored in memory (local cache).
-   */
-  subscribe_memory_channels() { //local cache . auto_resubscribe
-    if (this.channels.size == 0) return
-    let chList = Array.from(this.channels).join(',')
-
-    this.subscribe_promise(chList)
-      .then((res) => {
-        // console.log('>> SUBSCRIBE_REQ result', res ) // return code == map.size
-      }).catch((e) => {
-        console.log('>> SUBSCRIBE FAIL:', e)
-      })
 
   }
 

package/src/server/Remote.js

@@ -187,6 +187,7 @@ export class Remote extends RemoteCore {
 
   // node.js server side remote.
   send(message, isBinary) {
+    // console.log(`<-S [${IOMsg[ message[0]]}]`)
     this.manager.txBytes += message.byteLength;
     this.socket.txCounter++;
     if (this.socketType === 'websocket') {

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
 
 }