From 7474905b08d590a9092db3f6f51744fd61345334 Mon Sep 17 00:00:00 2001
From: Dave C-J <conway@uk.ibm.com>
Date: Sun, 9 Nov 2014 14:28:09 +0000
Subject: [PATCH] Fix msgpack node to handle more than just objects... Fix to
 close Issue #482 and #483

---
 parsers/msgpack/70-msgpack.html |  5 ++---
 parsers/msgpack/70-msgpack.js   | 14 +++++---------
 parsers/msgpack/package.json    |  2 +-
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/parsers/msgpack/70-msgpack.html b/parsers/msgpack/70-msgpack.html
index 0bc935c4..7a754d14 100644
--- a/parsers/msgpack/70-msgpack.html
+++ b/parsers/msgpack/70-msgpack.html
@@ -24,9 +24,8 @@
 
 <script type="text/x-red" data-help-name="msgpack">
     <p>A function that converts the <b>msg.payload</b> to and from <a href = "https://github.com/msgpack/msgpack-node"><i>msgpack</i></a> format.</p>
-    <p>If the input is an object it converts it to a msgpack buffer.</p>
-    <p>If the input is a msgpack buffer it converts it back to an object.</p>
-    <p>Current only supports object type.</p>
+    <p>If the input is NOT a buffer it tries to convert it to a msgpack buffer.</p>
+    <p>If the input is a msgpack buffer it tries to decode it back.</p>
 </script>
 
 <script type="text/javascript">
diff --git a/parsers/msgpack/70-msgpack.js b/parsers/msgpack/70-msgpack.js
index bffd5c70..f50d276b 100644
--- a/parsers/msgpack/70-msgpack.js
+++ b/parsers/msgpack/70-msgpack.js
@@ -24,26 +24,22 @@ module.exports = function(RED) {
         this.on("input", function(msg) {
             if (Buffer.isBuffer(msg.payload)) {
                 var l = msg.payload.length;
-                msg.payload = msgpack.decode(msg.payload);
-                if (typeof msg.payload === "object") {
+                try {
+                    msg.payload = msgpack.decode(msg.payload);
                     node.send(msg);
                     node.status({text:l +" b->o "+ JSON.stringify(msg.payload).length});
                 }
-                else {
-                    node.warn("Input not a MsgPack buffer");
+                catch (e) {
+                    node.warn("Bad decode: "+e);
                     node.status({text:"not a msgpack buffer"});
                 }
             }
-            else if (typeof msg.payload === "object") {
+            else {
                 var l = JSON.stringify(msg.payload).length;
                 msg.payload = msgpack.encode(msg.payload);
                 node.send(msg);
                 node.status({text:l +" o->b "+ msg.payload.length});
             }
-            else {
-                node.warn("This node only handles js objects or msgpack buffers.");
-                node.status({text:"error"});
-            }
         });
     }
     RED.nodes.registerType("msgpack",MsgPackNode);
diff --git a/parsers/msgpack/package.json b/parsers/msgpack/package.json
index d8810df3..23a675b8 100644
--- a/parsers/msgpack/package.json
+++ b/parsers/msgpack/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-msgpack",
-    "version"       : "0.0.2",
+    "version"       : "0.0.3",
     "description"   : "A Node-RED node to pack and unpack objects to msgpack format",
     "dependencies"  : {
         "msgpack-js"   : "0.3.0"