ok auth now work and delete replace

Author: KlonD90

lib/connection.js

@@ -208,7 +208,6 @@ TarantoolConnection.prototype.ping = function(){
 
 TarantoolConnection.prototype.select = function(spaceId, indexId, limit, offset, iterator, key){
     var dfd = vow.defer();
-    console.log('start ping');
     var reqId = requestId.getId();
     var header = this._header(tarantoolConstants.RequestCode.rqSelect, reqId);
     console.log('header', header);
@@ -234,13 +233,100 @@ TarantoolConnection.prototype.select = function(spaceId, indexId, limit, offset,
     return dfd.promise();
 };
 
+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),
+        key: msgpack.pack(key)
+    };
+    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();
+};
+
+TarantoolConnection.prototype.update = function(spaceId, indexId, key, ops){
+    var dfd = vow.defer();
+    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),
+            ops: msgpack.pack(ops),
+            key: msgpack.pack(key)
+        };
+        var body = Buffer.concat([new Buffer([0x84,tarantoolConstants.KeysCode.space_id]), buffered.spaceId,
+            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]);
+    }
+    else
+        dfd.reject(new Error('need array'));
+    return dfd.promise();
+};
+
+TarantoolConnection.prototype.eval = function(expression, tuple){
+    var dfd = vow.defer();
+    var reqId = requestId.getId();
+    var header = this._header(tarantoolConstants.RequestCode.rqEval, reqId);
+    var buffered = {
+        expression: msgpack.pack(expression),
+        tuple: msgpack.pack(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();
+};
+
+
+TarantoolConnection.prototype.call = function(functionName, tuple){
+    var dfd = vow.defer();
+    var reqId = requestId.getId();
+    var header = this._header(tarantoolConstants.RequestCode.rqCall, reqId);
+    var buffered = {
+        functionName: msgpack.pack(functionName),
+        tuple: msgpack.pack(tuple)
+    };
+    var body = Buffer.concat([new Buffer([0x82,tarantoolConstants.KeysCode.function_name]), buffered.functionName,
+        new Buffer([tarantoolConstants.KeysCode.tuple]), buffered.tuple]);
+    this._request(header, body);
+    this.commandsQueue.push([tarantoolConstants.RequestCode.rqCall, reqId, dfd]);
+    return dfd.promise();
+};
+
 
 TarantoolConnection.prototype.insert = function(spaceId, tuple){
+    var reqId = requestId.getId();
+    return this._replaceInsert(tarantoolConstants.RequestCode.rqInsert, reqId, spaceId, tuple);
+};
+
+TarantoolConnection.prototype.replace = function(spaceId, tuple){
+    var reqId = requestId.getId();
+    return this._replaceInsert(tarantoolConstants.RequestCode.rqReplace, reqId, spaceId, tuple);
+};
+
+TarantoolConnection.prototype._replaceInsert = function(cmd, reqId, spaceId, tuple){
     var dfd = vow.defer();
     if (Array.isArray(tuple)){
-        console.log('start ping');
-        var reqId = requestId.getId();
-        var header = this._header(tarantoolConstants.RequestCode.rqInsert, reqId);
+        var header = this._header(cmd, reqId);
         console.log('header', header);
         var buffered = {
             spaceId: msgpack.pack(spaceId),
@@ -251,7 +337,7 @@ TarantoolConnection.prototype.insert = function(spaceId, tuple){
         console.log(body, msgpack.unpack(body));
         console.log(buffered);
         this._request(header, body);
-        this.commandsQueue.push([tarantoolConstants.RequestCode.rqInsert, reqId, dfd]);
+        this.commandsQueue.push([cmd, reqId, dfd]);
     }
     else
         dfd.reject(new Error('need array'));
@@ -267,42 +353,32 @@ TarantoolConnection.prototype.auth = function(username, password){
         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,
-            msgpack.pack(scramble(password, this.salt).toString('ascii'))]);
-        console.log(body, msgpack.unpack(body));
-        console.log(buffered, msgpack.pack(scramble(password, this.salt)));
+            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);
+        console.log(e, e.stack);
     }
 
 };
 
 function scramble(password, salt){
-    var encSalt = new Buffer(salt, 'base64').toString('ascii');
-    console.log('encSalt', encSalt);
+    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(salt, step2);
+    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).toString('ascii');
+    var scramble = xor(step1, step3);
     console.log('scramble', step1.length, step2.length, scramble, scramble.length);
     return scramble;
 }
 
-function myXor(l, r){
-    var x = [];
-    for (var i=0; i<l.length; i++)
-        x.push(l[i] ^ r[i]);
-    return new Buffer(x);
-}
-
 
 TarantoolConnection.prototype._header = function(command, reqId){
     try {

lib/const.js

@@ -8,7 +8,7 @@ const RequestCode = {
 	rqDelete: 0x05,
 	rqCall: 0x06,
 	rqAuth: 0x07,
-	rqEval: 0x80,
+	rqEval: 0x08,
 	rqPing: 0x40
 };