Merge pull request #2 from monolithed/msgpack5

msgpack -> msgpack5

Author: KlonD90

lib/connection.js

@@ -3,7 +3,7 @@ var tarantoolConstants = require('./const');
 var net = require('net');
 var _ = require('underscore');
 var EventEmitter = require('events');
-var msgpack = require('msgpack');
+var msgpack = require('msgpack5')();
 var vow = require('vow');
 var crypto = require('crypto');
 var xor = require('bitwise-xor');
@@ -128,7 +128,8 @@ TarantoolConnection.prototype._responseBufferTrack = function(buffer, length){
 TarantoolConnection.prototype._processResponse = function(buffer){
     // add fixarraymap with 2 objects before main object
     var dataBuffer = Buffer.concat([new Buffer([0x92]), buffer]);
-    var obj = msgpack.unpack(dataBuffer);
+    var obj = msgpack.decode(dataBuffer);
+
     var reqId = obj[0][1];
     for(var i = 0; i<this.commandsQueue.length; i++)
         if (this.commandsQueue[i][1] == reqId)
@@ -205,11 +206,11 @@ TarantoolConnection.prototype.select = function(spaceId, indexId, limit, offset,
     if (iterator == 'all')
         key = [];
     var buffered = {
-        spaceId: msgpack.pack(spaceId),
-        indexId: msgpack.pack(indexId),
-        limit: msgpack.pack(limit),
-        offset: msgpack.pack(offset),
-        key: msgpack.pack(key)
+        spaceId: msgpack.encode(spaceId),
+        indexId: msgpack.encode(indexId),
+        limit: msgpack.encode(limit),
+        offset: msgpack.encode(offset),
+        key: msgpack.encode(key)
     };
     var body = Buffer.concat([new Buffer([0x86,tarantoolConstants.KeysCode.space_id]), buffered.spaceId,
         new Buffer([tarantoolConstants.KeysCode.index_id]), buffered.indexId,
@@ -229,9 +230,9 @@ TarantoolConnection.prototype.delete = function(spaceId, indexId, key){
     var reqId = requestId.getId();
     var header = this._header(tarantoolConstants.RequestCode.rqDelete, reqId);
     var buffered = {
-        spaceId: msgpack.pack(spaceId),
-        indexId: msgpack.pack(indexId),
-        key: msgpack.pack(key)
+        spaceId: msgpack.encode(spaceId),
+        indexId: msgpack.encode(indexId),
+        key: msgpack.encode(key)
     };
     var body = Buffer.concat([new Buffer([0x86,tarantoolConstants.KeysCode.space_id]), buffered.spaceId,
         new Buffer([tarantoolConstants.KeysCode.index_id]), buffered.indexId,
@@ -247,10 +248,10 @@ TarantoolConnection.prototype.update = function(spaceId, indexId, key, ops){
         var reqId = requestId.getId();
         var header = this._header(tarantoolConstants.RequestCode.rqUpdate, reqId);
         var buffered = {
-            spaceId: msgpack.pack(spaceId),
-            indexId: msgpack.pack(indexId),
-            ops: msgpack.pack(ops),
-            key: msgpack.pack(key)
+            spaceId: msgpack.encode(spaceId),
+            indexId: msgpack.encode(indexId),
+            ops: msgpack.encode(ops),
+            key: msgpack.encode(key)
         };
         var body = Buffer.concat([new Buffer([0x84,tarantoolConstants.KeysCode.space_id]), buffered.spaceId,
             new Buffer([tarantoolConstants.KeysCode.index_id]), buffered.indexId,
@@ -269,8 +270,8 @@ TarantoolConnection.prototype.eval = function(expression, tuple){
     var reqId = requestId.getId();
     var header = this._header(tarantoolConstants.RequestCode.rqEval, reqId);
     var buffered = {
-        expression: msgpack.pack(expression),
-        tuple: msgpack.pack(tuple)
+        expression: msgpack.encode(expression),
+        tuple: msgpack.encode(tuple)
     };
     var body = Buffer.concat([new Buffer([0x82,tarantoolConstants.KeysCode.expression]), buffered.expression,
         new Buffer([tarantoolConstants.KeysCode.tuple]), buffered.tuple]);
@@ -284,8 +285,8 @@ TarantoolConnection.prototype.call = function(functionName, tuple){
     var reqId = requestId.getId();
     var header = this._header(tarantoolConstants.RequestCode.rqCall, reqId);
     var buffered = {
-        functionName: msgpack.pack(functionName),
-        tuple: msgpack.pack(tuple)
+        functionName: msgpack.encode(functionName),
+        tuple: msgpack.encode(tuple)
     };
     var body = Buffer.concat([new Buffer([0x82,tarantoolConstants.KeysCode.function_name]), buffered.functionName,
         new Buffer([tarantoolConstants.KeysCode.tuple]), buffered.tuple]);
@@ -309,8 +310,8 @@ TarantoolConnection.prototype._replaceInsert = function(cmd, reqId, spaceId, tup
     if (Array.isArray(tuple)){
         var header = this._header(cmd, reqId);
         var buffered = {
-            spaceId: msgpack.pack(spaceId),
-            tuple: msgpack.pack(tuple)
+            spaceId: msgpack.encode(spaceId),
+            tuple: msgpack.encode(tuple)
         };
         var body = Buffer.concat([new Buffer([0x82,tarantoolConstants.KeysCode.space_id]), buffered.spaceId,
             new Buffer([tarantoolConstants.KeysCode.tuple]), buffered.tuple]);
@@ -327,7 +328,7 @@ TarantoolConnection.prototype.auth = function(username, password){
     var reqId = requestId.getId();
     var header = this._header(tarantoolConstants.RequestCode.rqAuth, reqId);
     var buffered = {
-        username: msgpack.pack(username)
+        username: msgpack.encode(username)
     };
     var scrambled = scramble(password, this.salt);
     var body = Buffer.concat([new Buffer([0x82, tarantoolConstants.KeysCode.username]), buffered.username,

lib/const.js

@@ -1,4 +1,5 @@
-var msgpack = require('msgpack');
+var msgpack = require('msgpack5')();
+
 // i steal it from go
 const RequestCode = {
 	rqConnect: 0x00, //fake for connect
@@ -57,7 +58,7 @@ const ExportPackage = {
 	KeysCode: KeysCode,
 	IteratorsType: IteratorsType,
 	OkCode: OkCode,
-	passEnter: msgpack.pack('chap-sha1')
+	passEnter: msgpack.encode('chap-sha1')
 };
 
 module.exports = ExportPackage;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tarantool-driver",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Tarantool driver for 1.6",
   "main": "index.js",
   "scripts": {
@@ -14,7 +14,7 @@
     "tarantool",
     "driver",
     "db",
-	"msgpack"
+    "msgpack"
   ],
   "author": "KlonD90",
   "license": "MIT",
@@ -24,7 +24,7 @@
   "homepage": "https://github.com/KlonD90/node-tarantool-driver",
   "dependencies": {
     "bitwise-xor": "0.0.0",
-    "msgpack": "^0.2.6",
+    "msgpack5": "^3.0.0",
     "underscore": "^1.8.3",
     "vow": "^0.4.9"
   },