Use json as default message encoder.

lsm · Apr 13, 2016 · 9eb012e · 9eb012e
1 parent edd46f3
commit 9eb012e
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 11 deletions.
diff --git a/lib/queue/index.js b/lib/queue/index.js
@@ -1,3 +1,4 @@
+var msg = require('./msg')
 var type = require('../message/type')
 var pubsub = require('./pubsub')
 var reqrep = require('./reqrep')
@@ -57,6 +58,12 @@ Queue.prototype.rep = reqrep.rep
 Queue.prototype.onReq = reqrep.onReq
 Queue.prototype.onRep = reqrep.onRep
 
+/**
+ * Message API
+ */
+
+Queue.prototype.encode = msg.encode
+Queue.prototype.decode = msg.decode
 
 /**
  * Common sending patterns

diff --git a/lib/queue/msg.js b/lib/queue/msg.js
@@ -0,0 +1,25 @@
+var json = require('../message/json')
+var Buffer = require('../message/type').Buffer
+var Message = require('../message/index')
+
+var encode = Message.encode
+var decode = Message.decode
+
+var formatId = Buffer(json.FORMAT_ID)
+var encodeMsg = json.encodeMsg
+var decodeMsg = json.decodeMsg
+
+
+exports.encode = function(type, event, msg, meta) {
+  return encode({
+    type: type,
+    event: event,
+    formatId: formatId,
+    msg: msg,
+    meta: meta
+  }, encodeMsg)
+}
+
+exports.decode = function(buf) {
+  return decode(buf, decodeMsg)
+}
diff --git a/lib/socket/channel.js b/lib/socket/channel.js
@@ -7,8 +7,6 @@ var QueueChannel = require('../queue/channel')
 var SocketChannel = module.exports = function SocketChannel(socket, ns, chn) {
   if (socket) {
     this.queue = new QueueChannel(socket, ns, chn)
-    this.queue.encode = socket.queue.encode
-    this.queue.decode = socket.queue.decode
     this.streams = socket.streams
   } else {
     Socket.call(this, new QueueChannel(this, ns, chn))

diff --git a/lib/socket/index.js b/lib/socket/index.js
@@ -15,7 +15,6 @@ var Socket = module.exports = function(QueueClass) {
     queue = QueueClass
   this.queue = queue
   this.streams = []
-  this.setMsgEncoder()
 }
 
 inherits(Socket, EventEmitter)

diff --git a/lib/socket/msg.js b/lib/socket/msg.js
@@ -1,5 +1,3 @@
-var json = require('../message/json')
-var Buffer = require('../message/type').Buffer
 var Message = require('../message/index')
 
 var encode = Message.encode
@@ -19,12 +17,8 @@ exports.setMsgEncoder = function(encoder, formatId) {
     decodeMsg = encoder.decode || encoder.unpack
   }
 
-  if (!encodeMsg && !decodeMsg) {
-    // Default using JSON encoder.
-    encodeMsg = json.encodeMsg
-    decodeMsg = json.decodeMsg
-    formatId = Buffer(json.FORMAT_ID)
-  }
+  if (!encodeMsg || !decodeMsg)
+    throw new Error('Missing either encode/pack or decode/unpack function.')
 
   this.queue.encode = function(type, event, msg, meta) {
     return encode({