Change message type to binary Buffer

interpretor · Jul 11, 2017 · 81970e6 · 81970e6
1 parent e4bfb66
commit 81970e6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/lib/zre_msg.js b/lib/zre_msg.js
@@ -138,7 +138,7 @@ class ZreMsg {
    * @param {object} [options] - Options object
    * @param {number} [options.sequence=1] - Sequence of the message
    * @param {string} [options.group] - Group which the node/peer joins or leaves
-   * @param {string} [options.content] - Content of the message
+   * @param {Buffer} [options.content] - Content of the message
    * @param {string} [options.endpoint] - TCP address of the node/peer
    * @param {string[]} [options.groups] - Groups in which the node/peer participates
    * @param {number} [options.status] - Groups status of the node/peer
@@ -179,7 +179,7 @@ class ZreMsg {
   }
 
   /**
-   * @return {string} Content of the message
+   * @return {Buffer} Content of the message
    */
   getContent() {
     return this._content;
@@ -330,9 +330,7 @@ class ZreMsg {
 
           const sequence = getNumber2(position);
 
-          const content = frame.toString();
-
-          return new ZreMsg(WHISPER, { sequence, content });
+          return new ZreMsg(WHISPER, { sequence, content: frame });
         }
 
         case SHOUT: {
@@ -345,9 +343,7 @@ class ZreMsg {
 
           const group = getString(position);
 
-          const content = frame.toString();
-
-          return new ZreMsg(SHOUT, { sequence, group, content });
+          return new ZreMsg(SHOUT, { sequence, group, content: frame });
         }
 
         case JOIN: {

diff --git a/lib/zyre.js b/lib/zyre.js
@@ -159,7 +159,7 @@ class Zyre extends EventEmitter {
    * Sends a message to a ZyrePeer.
    *
    * @param {string} identity - Identity of the peer
-   * @param {string} message - Message to send
+   * @param {Buffer} message - Message to send
    */
   whisper(identity, message) {
     if (this._zyrePeers.exists(identity)) {
@@ -173,7 +173,7 @@ class Zyre extends EventEmitter {
    * Sends a message to a ZyreGroup.
    *
    * @param {string} group - Name of the group
-   * @param {string} message - Message to send
+   * @param {Buffer} message - Message to send
    */
   shout(group, message) {
     if (this._zyreGroups.exists(group)) {
@@ -289,7 +289,7 @@ class Zyre extends EventEmitter {
        * @event Zyre#whisper
        * @property {string} identity - Identity of the peer
        * @property {string} name - Name of the peer
-       * @property {string} message - Message
+       * @property {Buffer} message - Message
        */
       this.emit('whisper', peer.getIdentity(), peer.getName(), message);
     };
@@ -299,7 +299,7 @@ class Zyre extends EventEmitter {
        * @event Zyre#shout
        * @property {string} identity - Identity of the peer
        * @property {string} name - Name of the peer
-       * @property {string} message - Message
+       * @property {Buffer} message - Message
        * @property {string} group - Group where the message came from
        */
       this.emit('shout', peer.getIdentity(), peer.getName(), message, group);

diff --git a/lib/zyre_node.js b/lib/zyre_node.js
@@ -202,7 +202,7 @@ class ZyreNode extends EventEmitter {
           /**
            * @event ZyreNode#whisper
            * @property {ZyrePeer} zyrePeer - ZyrePeer
-           * @property {string} message - Message
+           * @property {Buffer} message - Message
            */
           this.emit('whisper', zyrePeer, zreMsg.getContent());
           break;
@@ -212,7 +212,7 @@ class ZyreNode extends EventEmitter {
             /**
              * @event ZyreNode#shout
              * @property {ZyrePeer} zyrePeer - ZyrePeer
-             * @property {string} message - Message
+             * @property {Buffer} message - Message
              * @property {string} group - Group where the message came from
              */
             this.emit('shout', zyrePeer, zreMsg.getContent(), zreMsg.getGroup());