в поисках чуда

Author: KlonD90

lib/connection.js

@@ -4,6 +4,7 @@ var net = require('net');
 var _ = require('underscore');
 var EventEmitter = require('events');
 var msgpack = require('msgpack');
+var vow = require('vow');
 
 var states = {
     CONNECTING: 0,
@@ -52,6 +53,7 @@ function TarantoolConnection (options){
     this.socket.on('connect', this.onConnect.bind(this));
     this.socket.on('error', this.onError.bind(this));
     this.socket.on('data', this.onData.bind(this));
+    this.responseEnded = true;
 }
 
 TarantoolConnection.prototype.onData = function(data){
@@ -70,11 +72,51 @@ TarantoolConnection.prototype.onData = function(data){
             this.state = states.CONNECTED;
             break;
         case states.CONNECTED:
-            new TarantoolResponse(data);
+            //new TarantoolResponse(data);
+            this.responseEnded = false;
+            this.curResponseLength = buffer.readUIntBE(1, 4);
+            console.log('len', this.curResponseLength);
+            this.buffer = buffer.slice(5);
+            if (this.buffer.length >= this.curResponseLength)
+            {
+                this.ended = true;
+                if (this.buffer.length > length){
+                    var plusResponse = new TarantoolResponse(this.buffer.slice(this.curResponseLength));
+                    if (plusResponse.ended)
+                    {
+
+                    }
+                    this.buffer = this.buffer.slice(0, length);
+                }
+                this.processing();
+            }
             break;
     }
 };
 
+TarantoolConnection.prototype._responseBufferTrack = function(){
+    
+};
+
+TarantoolConnection.prototype._processResponse = function(buffer){
+    try{
+        var success = buffer[1] == 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);
+    }
+}
+
 TarantoolConnection.prototype.onConnect = function(){
     this.state = states.PREHELLO;
 };
@@ -95,19 +137,23 @@ TarantoolConnection.prototype.connect = function(){
 };
 
 TarantoolConnection.prototype.ping = function(){
+    var dfd = vow.defer();
     console.log('start ping');
-    var header = this._header(tarantoolConstants.RequestCode.rqPing);
+    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]);
+    return dfd.promise();
 };
 
 
-TarantoolConnection.prototype._header = function(command){
+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(requestId.getId(), 5, 4);
+        header.writeUIntBE(reqId, 5, 4);
         return header;
     } catch(e){
         console.log(e, e.stack);
@@ -144,22 +190,39 @@ 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;
-    if (this.buffer.length - 5 == 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){
-            var dataBuffer = this.buffer.slice(13);
+            // 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);