From 7950b7d39a3a71c1353e0b45cf1db922459fdd0e Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Wed, 9 Aug 2017 16:58:15 +0100
Subject: [PATCH] Move msg pack node to more supported lib msgpack-lite

---
 package.json                            |  2 +-
 parsers/msgpack/70-msgpack.html         |  5 ++++-
 parsers/msgpack/70-msgpack.js           |  6 +++---
 parsers/msgpack/README.md               | 10 +++++++++-
 parsers/msgpack/package.json            |  4 ++--
 test/parsers/msgpack/70-msgpack_spec.js |  3 ++-
 6 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 86002f5c..00c1a436 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,6 @@
         "poplib": "^0.1.7",
         "mailparser": "^0.6.1",
         "imap": "^0.8.19",
-        "msgpack-js": "^0.3.0"
+        "msgpack-lite": "^0.1.26"
     }
 }
diff --git a/parsers/msgpack/70-msgpack.html b/parsers/msgpack/70-msgpack.html
index c3fc2094..a256c830 100644
--- a/parsers/msgpack/70-msgpack.html
+++ b/parsers/msgpack/70-msgpack.html
@@ -7,9 +7,12 @@
 </script>
 
 <script type="text/x-red" data-help-name="msgpack">
-    <p>A function that converts the <code>msg.payload</code> to and from <a href = "https://github.com/msgpack/msgpack-node"><i>msgpack</i></a> format.</p>
+    <p>A function that converts the <code>msg.payload</code> to and from
+    <a href = "http://msgpack.org/"><i>msgpack</i></a> format.</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>
+    <p><b>Note</b>: this node does not currently encode raw <code>buffer</code> types.
+    It will automatically try to <i>decode</i> any buffer received, and may not cause an error.</p>
 </script>
 
 <script type="text/javascript">
diff --git a/parsers/msgpack/70-msgpack.js b/parsers/msgpack/70-msgpack.js
index 9e5c392e..2fb1c995 100644
--- a/parsers/msgpack/70-msgpack.js
+++ b/parsers/msgpack/70-msgpack.js
@@ -1,7 +1,7 @@
 
 module.exports = function(RED) {
     "use strict";
-    var msgpack = require('msgpack-js');
+    var msgpack = require('msgpack-lite');
 
     function MsgPackNode(n) {
         RED.nodes.createNode(this,n);
@@ -16,15 +16,15 @@ module.exports = function(RED) {
                         node.status({text:l +" b->o "+ JSON.stringify(msg.payload).length});
                     }
                     catch (e) {
-                        node.warn("Bad decode: "+e);
+                        node.error("Bad decode",msg);
                         node.status({text:"not a msgpack buffer"});
                     }
                 }
                 else {
                     var le = JSON.stringify(msg.payload).length;
                     msg.payload = msgpack.encode(msg.payload);
-                    node.send(msg);
                     node.status({text:le +" o->b "+ msg.payload.length});
+                    node.send(msg);
                 }
             }
             else { node.warn("No payload found to process"); }
diff --git a/parsers/msgpack/README.md b/parsers/msgpack/README.md
index b5c5d124..fc59a93a 100644
--- a/parsers/msgpack/README.md
+++ b/parsers/msgpack/README.md
@@ -10,11 +10,19 @@ Run the following command in your Node-RED user directory - typically `~/.node-r
 
     npm install node-red-node-msgpack
 
+Changes
+-------
+
+Version 1.0.0 - move to msgpack-lite library (more supported and faster) - This uses the more
+recent msgpack specification so please ensure all your endpoints are also using the latest spec.
 
 Usage
 -----
 
-Uses the <a href="https://www.npmjs.org/package/msgpack">msgpack npm</a> to pack and unpack msg.payload objects to <a href="http://msgpack.org/">msgpack</a> format buffers.
+Uses the <a href="https://www.npmjs.org/package/msgpack-lite">msgpack-lite npm</a> to pack and unpack msg.payload objects to <a href="http://msgpack.org/">msgpack</a> format buffers.
+
+**Note**: this node does not currently encode raw <code>buffer</code> types.
+It will automatically try to *decode* any buffer received, and may not cause an error.
 
 If the input is NOT a buffer it converts it into a msgpack buffer.
 
diff --git a/parsers/msgpack/package.json b/parsers/msgpack/package.json
index 705a3d2a..170bb761 100644
--- a/parsers/msgpack/package.json
+++ b/parsers/msgpack/package.json
@@ -1,9 +1,9 @@
 {
     "name"          : "node-red-node-msgpack",
-    "version"       : "0.0.6",
+    "version"       : "1.0.0",
     "description"   : "A Node-RED node to pack and unpack objects to msgpack format",
     "dependencies"  : {
-        "msgpack-js"   : "0.3.0"
+        "msgpack-lite"   : "^0.1.26"
     },
     "repository" : {
         "type":"git",
diff --git a/test/parsers/msgpack/70-msgpack_spec.js b/test/parsers/msgpack/70-msgpack_spec.js
index 8e13d949..b8bd1275 100644
--- a/test/parsers/msgpack/70-msgpack_spec.js
+++ b/test/parsers/msgpack/70-msgpack_spec.js
@@ -66,6 +66,7 @@ describe('msgpack node', function() {
     });
 
     it('should error if the buffer fails to decode', function(done) {
+        buf[0] = 0x87;
         var flow = [{"id":"n1", "type":"msgpack", wires:[["n2"]] },
             {id:"n2", type:"helper"} ];
         helper.load(testNode, flow, function() {
@@ -77,7 +78,7 @@ describe('msgpack node', function() {
             setTimeout(function() {
                 done();
             }, 25);
-            n1.emit("input", {payload:Buffer("12345")});
+            n1.emit("input", {payload:buf});
         });
     });