remove console log and update package right

Author: KlonD90

lib/connection.js

@@ -6,13 +6,10 @@ var EventEmitter = require('events');
 var msgpack = require('msgpack');
 var vow = require('vow');
 var crypto = require('crypto');
-var shasum = crypto.createHash('sha1');
 var xor = require('bitwise-xor');
 
 var shatransform = function(t){
-    var sha1 = crypto.createHash('sha1');
-    sha1.update(t);
-    return sha1.digest();
+    return crypto.createHash('sha1').update(t).digest();
 };
 
 var states = {
@@ -67,7 +64,6 @@ function TarantoolConnection (options){
 }
 
 TarantoolConnection.prototype.onData = function(data){
-    console.log(data.length, data.toString());
     switch(this.state){
         case states.PREHELLO:
             for (var i = 0; i<this.commandsQueue.length; i++)
@@ -79,12 +75,10 @@ TarantoolConnection.prototype.onData = function(data){
                     i--;
                 }
             }
-            console.log('connect data', data, data.toString(), data.slice(64, 108).toString(), data.length);
             this.salt = data.slice(64, 108).toString('utf8');
             this.state = states.CONNECTED;
             break;
         case states.CONNECTED:
-            //new TarantoolResponse(data);
             var trackResult = this._responseBufferTrack(data);
             if (trackResult.length == 2)
             {
@@ -145,30 +139,23 @@ TarantoolConnection.prototype._responseBufferTrack = function(buffer, length){
 };
 
 TarantoolConnection.prototype._processResponse = function(buffer){
-    try{
-        var success = buffer[1] == 0x00;
-        console.log(buffer)
-        // add fixarraymap with 2 objects before main object
-        var dataBuffer = Buffer.concat([new Buffer([0x92]), buffer]);
-        console.log(dataBuffer);
-        var obj = msgpack.unpack(dataBuffer);
-        console.log(obj);
-        var reqId = obj[0][1];
-        var task = this.commandsQueue.filter(function(t){
-            return t[1] == reqId;
-        })[0];
-        var dfd = task[2];
-        if (success)
-            dfd.resolve(this._processResponseBody(task[0], obj[1][tarantoolConstants.KeysCode.data]));
-        else
-            dfd.reject(obj[1][tarantoolConstants.KeysCode.e]);
-    } catch(e){
-        console.log(e, e.stack);
-    }
+    // add fixarraymap with 2 objects before main object
+    var dataBuffer = Buffer.concat([new Buffer([0x92]), buffer]);
+    var obj = msgpack.unpack(dataBuffer);
+    var reqId = obj[0][1];
+    var task = this.commandsQueue.filter(function(t){
+        return t[1] == reqId;
+    })[0];
+    var dfd = task[2];
+    var success = obj[0][0] == 0 ? true : false;
+    if (success)
+        dfd.resolve(this._processResponseBody(task[0], obj[1][tarantoolConstants.KeysCode.data]));
+    else
+        dfd.reject(obj[1][tarantoolConstants.KeysCode.error]);
 };
 
 TarantoolConnection.prototype._processResponseBody = function(cmd, data){
-    return data;
+    return cmd == tarantoolConstants.RequestCode.rqAuth ? true : data;
 };
 
 TarantoolConnection.prototype._dropAll = function(){
@@ -186,7 +173,6 @@ TarantoolConnection.prototype.onError = function(error){
 };
 
 TarantoolConnection.prototype.connect = function(){
-    console.log('pre connect');
     this.state = states.CONNECTING;
     return new Promise(function(resolve, reject){
         this.commandsQueue.push([commandType.CONNECT, resolve, reject]);
@@ -196,10 +182,8 @@ TarantoolConnection.prototype.connect = function(){
 
 TarantoolConnection.prototype.ping = function(){
     var dfd = vow.defer();
-    console.log('start ping');
     var reqId = requestId.getId();
     var header = this._header(tarantoolConstants.RequestCode.rqPing, reqId);
-    console.log('header', header);
     var body = new Buffer(0);
     this._request(header, body);
     this.commandsQueue.push([tarantoolConstants.RequestCode.rqPing, reqId, dfd]);
@@ -210,7 +194,6 @@ TarantoolConnection.prototype.select = function(spaceId, indexId, limit, offset,
     var dfd = vow.defer();
     var reqId = requestId.getId();
     var header = this._header(tarantoolConstants.RequestCode.rqSelect, reqId);
-    console.log('header', header);
     var buffered = {
         spaceId: msgpack.pack(spaceId),
         indexId: msgpack.pack(indexId),
@@ -226,8 +209,6 @@ TarantoolConnection.prototype.select = function(spaceId, indexId, limit, offset,
             tarantoolConstants.KeysCode.key]),
         buffered.key
         ]);
-    console.log(body, msgpack.unpack(body));
-    console.log(buffered);
     this._request(header, body);
     this.commandsQueue.push([tarantoolConstants.RequestCode.rqSelect, reqId, dfd]);
     return dfd.promise();
@@ -237,7 +218,6 @@ TarantoolConnection.prototype.delete = function(spaceId, indexId, key, limit){
     var dfd = vow.defer();
     var reqId = requestId.getId();
     var header = this._header(tarantoolConstants.RequestCode.rqDelete, reqId);
-    console.log('header', header);
     var buffered = {
         spaceId: msgpack.pack(spaceId),
         indexId: msgpack.pack(indexId),
@@ -246,8 +226,6 @@ TarantoolConnection.prototype.delete = function(spaceId, indexId, key, limit){
     var body = Buffer.concat([new Buffer([0x86,tarantoolConstants.KeysCode.space_id]), buffered.spaceId,
         new Buffer([tarantoolConstants.KeysCode.index_id]), buffered.indexId,
         new Buffer([tarantoolConstants.KeysCode.key]), buffered.key]);
-    console.log(body, msgpack.unpack(body));
-    console.log(buffered);
     this._request(header, body);
     this.commandsQueue.push([tarantoolConstants.RequestCode.rqSelect, reqId, dfd]);
     return dfd.promise();
@@ -258,7 +236,6 @@ TarantoolConnection.prototype.update = function(spaceId, indexId, key, ops){
     if (Array.isArray(ops)){
         var reqId = requestId.getId();
         var header = this._header(tarantoolConstants.RequestCode.rqUpdate, reqId);
-        console.log('header', header);
         var buffered = {
             spaceId: msgpack.pack(spaceId),
             indexId: msgpack.pack(indexId),
@@ -269,8 +246,6 @@ TarantoolConnection.prototype.update = function(spaceId, indexId, key, ops){
             new Buffer([tarantoolConstants.KeysCode.index_id]), buffered.indexId,
             new Buffer([tarantoolConstants.KeysCode.key]), buffered.key,
             new Buffer([tarantoolConstants.KeysCode.tuple]), buffered.ops]);
-        console.log('update body', body, msgpack.unpack(body));
-        console.log(buffered);
         this._request(header, body);
         this.commandsQueue.push([tarantoolConstants.RequestCode.rqUpdate, reqId, dfd]);
     }
@@ -290,8 +265,6 @@ TarantoolConnection.prototype.eval = function(expression, tuple){
     var body = Buffer.concat([new Buffer([0x82,tarantoolConstants.KeysCode.expression]), buffered.expression,
         new Buffer([tarantoolConstants.KeysCode.tuple]), buffered.tuple]);
     this._request(header, body);
-    console.log('eval body', msgpack.unpack(body));
-    console.log('eval hrader', msgpack.unpack(header));
     this.commandsQueue.push([tarantoolConstants.RequestCode.rqEval, reqId, dfd]);
     return dfd.promise();
 };
@@ -327,15 +300,12 @@ TarantoolConnection.prototype._replaceInsert = function(cmd, reqId, spaceId, tup
     var dfd = vow.defer();
     if (Array.isArray(tuple)){
         var header = this._header(cmd, reqId);
-        console.log('header', header);
         var buffered = {
             spaceId: msgpack.pack(spaceId),
             tuple: msgpack.pack(tuple)
         };
         var body = Buffer.concat([new Buffer([0x82,tarantoolConstants.KeysCode.space_id]), buffered.spaceId,
             new Buffer([tarantoolConstants.KeysCode.tuple]), buffered.tuple]);
-        console.log(body, msgpack.unpack(body));
-        console.log(buffered);
         this._request(header, body);
         this.commandsQueue.push([cmd, reqId, dfd]);
     }
@@ -345,65 +315,43 @@ TarantoolConnection.prototype._replaceInsert = function(cmd, reqId, spaceId, tup
 };
 
 TarantoolConnection.prototype.auth = function(username, password){
-    try{
-        var dfd = vow.defer();
-        console.log('auth');
-        var reqId = requestId.getId();
-        var header = this._header(tarantoolConstants.RequestCode.rqAuth, reqId);
-        var buffered = {
-            username: msgpack.pack(username)
-        };
-        var scrambled = scramble(password, this.salt);
-        var body = Buffer.concat([new Buffer([0x82, tarantoolConstants.KeysCode.username]), buffered.username,
-            new Buffer([0x21, 0x92]), tarantoolConstants.passEnter, new Buffer([0xb4]), scrambled]);
-        this._request(header, body);
-        this.commandsQueue.push([tarantoolConstants.RequestCode.rqAuth, reqId, dfd]);
-        return dfd.promise();
-    } catch(e){
-        console.log(e, e.stack);
-    }
-
+    var dfd = vow.defer();
+    var reqId = requestId.getId();
+    var header = this._header(tarantoolConstants.RequestCode.rqAuth, reqId);
+    var buffered = {
+        username: msgpack.pack(username)
+    };
+    var scrambled = scramble(password, this.salt);
+    var body = Buffer.concat([new Buffer([0x82, tarantoolConstants.KeysCode.username]), buffered.username,
+        new Buffer([0x21, 0x92]), tarantoolConstants.passEnter, new Buffer([0xb4]), scrambled]);
+    this._request(header, body);
+    this.commandsQueue.push([tarantoolConstants.RequestCode.rqAuth, reqId, dfd]);
+    return dfd.promise();
 };
 
 function scramble(password, salt){
     var encSalt = new Buffer(salt, 'base64');
-    console.log('encSalt', encSalt, encSalt.toString(), encSalt.length);
     var step1 = shatransform(password);
-    console.log('step1',step1, step1.length);
     var step2 = shatransform(step1);
     var step3 = shatransform(Buffer.concat([encSalt.slice(0, 20), step2]));
-    console.log(password, step1, step2, step3, salt);
-    console.log('salt', salt);
     var scramble = xor(step1, step3);
-    console.log('scramble', step1.length, step2.length, scramble, scramble.length);
     return scramble;
 }
 
-
 TarantoolConnection.prototype._header = function(command, reqId){
-    try {
-        var header = new Buffer([0x82, tarantoolConstants.KeysCode.code, command,
-            tarantoolConstants.KeysCode.sync, 0xce, 0, 0, 0, 0]);
-        header.writeUIntBE(reqId, 5, 4);
-        return header;
-    } catch(e){
-        console.log(e, e.stack);
-    }
+    var header = new Buffer([0x82, tarantoolConstants.KeysCode.code, command,
+        tarantoolConstants.KeysCode.sync, 0xce, 0, 0, 0, 0]);
+    header.writeUIntBE(reqId, 5, 4);
+    return header;
 };
 
 TarantoolConnection.prototype._request = function(header, body){
-    console.log('start request');
     var sumL = header.length + body.length;
     var prefixSizeBuffer = new Buffer(5);
     prefixSizeBuffer[0] = 0xCE;
     prefixSizeBuffer.writeUIntBE(sumL, 1, 4);
-    try {
-        var buffer = Buffer.concat([prefixSizeBuffer, header, body]);
-        console.log(buffer);
-        this.socket.write(buffer);
-    } catch (e){
-        console.log(e, e.stack);
-    }
+    var buffer = Buffer.concat([prefixSizeBuffer, header, body]);
+    this.socket.write(buffer);
 };
 
 TarantoolConnection.prototype.destroy = function(interupt){
@@ -417,52 +365,4 @@ TarantoolConnection.prototype.destroy = function(interupt){
     }
 };
 
-//@InputType(Buffer)
-function TarantoolResponse(buffer){
-    this.ended = false;
-    this.currentBufferLength = 0;
-    var length = buffer.readUIntBE(1, 4);
-    console.log('len', length);
-    this.buffer = buffer.slice(5);
-    if (this.buffer.length >= length)
-    {
-        this.ended = true;
-        if (this.buffer.length > length){
-            var plusResponse = new TarantoolResponse(this.buffer.slice(length));
-            if (plusResponse.ended)
-            {
-
-            }
-            this.buffer = this.buffer.slice(0, length);
-        }
-        this.processing();
-    }
-}
-
-TarantoolResponse.prototype.add = function(buffer){
-    if (this.ended)
-    {
-
-    }
-};
-
-TarantoolResponse.prototype.processing = function(){
-    try{
-        this.success = this.buffer[6] == 0x00;
-        console.log(this.buffer);
-        if (this.success){
-            // add fixarraymap with 2 objects before main object
-            var dataBuffer = Buffer.concat([new Buffer([0x92]), this.buffer.slice(5)]);
-            console.log(dataBuffer);
-            var obj = msgpack.unpack(dataBuffer);
-            console.log(obj);
-        }
-        else{
-            console.log('its error');
-        }
-    } catch(e){
-        console.log(e, e.stack);
-    }
-};
-
 module.exports = TarantoolConnection;

package.json

@@ -23,7 +23,7 @@
   "homepage": "https://github.com/KlonD90/node-tarantool-driver",
   "dependencies": {
     "bitwise-xor": "0.0.0",
-    "msgpack5": "^2.0.0",
+    "msgpack": "^0.2.6",
     "underscore": "^1.8.3",
     "vow": "^0.4.9"
   }