update with fix destroy

Author: KlonD90

lib/connection.js

@@ -16,10 +16,8 @@ var states = {
     CONNECTING: 0,
     CONNECTED: 1,
     AWAITING: 2,
-    DESTROYED: 5,
-    DISONECTED: 6,
-    PREHELLO: 7,
-    AWAITING_LENGTH: 8
+    INITED: 3,
+    PREHELLO: 4
 };
 
 var requestMethods = ['select', 'delete', 'insert', 'replace', 'update', 'eval', 'call'];
@@ -47,7 +45,6 @@ function TarantoolConnection (options){
         writable: true
     });
     this.state = states.INITED;
-    this.emitter = new EventEmitter();
     this.options = _.extend(defaultOptions, options);
     this.commandsQueue = [];
     this.awaitingDestroy = false;
@@ -171,7 +168,7 @@ TarantoolConnection.prototype.onError = function(error){
     this.commandsQueue = [];
 };
 
-TarantoolConnection.prototype._interupt = function(){
+TarantoolConnection.prototype._interupt = function(error){
     for (var i=0; i<this.commandsQueue.length; i++) {
         var dfd = this.commandsQueue[i][0] == tarantoolConstants.RequestCode.rqConnect ? this.commandsQueue[i][1]
             : this.commandsQueue[i][2];
@@ -181,9 +178,15 @@ TarantoolConnection.prototype._interupt = function(){
 
 TarantoolConnection.prototype.connect = function(){
     var dfd = vow.defer();
-    this.state = states.CONNECTING;
-    this.commandsQueue.push([tarantoolConstants.RequestCode.rqConnect, dfd]);
-    this.socket.connect({port: this.options.port, host: this.options.host});
+    if (this.state == states.INITED)
+    {
+        this.state = states.CONNECTING;
+        this.commandsQueue.push([tarantoolConstants.RequestCode.rqConnect, dfd]);
+        this.socket.connect({port: this.options.port, host: this.options.host});
+
+    }
+    else
+        dfd.reject(this.awaitingDestroy ? 'already destroyed' : 'already connected');
     return dfd.promise();
 };
 
@@ -201,6 +204,9 @@ TarantoolConnection.prototype.select = function(spaceId, indexId, limit, offset,
     var dfd = vow.defer();
     var reqId = requestId.getId();
     var header = this._header(tarantoolConstants.RequestCode.rqSelect, reqId);
+    //don't need a key for all iterator
+    if (iterator == 'all')
+        key = [];
     var buffered = {
         spaceId: msgpack.pack(spaceId),
         indexId: msgpack.pack(indexId),
@@ -221,7 +227,7 @@ TarantoolConnection.prototype.select = function(spaceId, indexId, limit, offset,
     return dfd.promise();
 };
 
-TarantoolConnection.prototype.delete = function(spaceId, indexId, key, limit){
+TarantoolConnection.prototype.delete = function(spaceId, indexId, key){
     var dfd = vow.defer();
     var reqId = requestId.getId();
     var header = this._header(tarantoolConstants.RequestCode.rqDelete, reqId);
@@ -363,7 +369,8 @@ TarantoolConnection.prototype.destroy = function(interupt){
     var dfd = vow.defer();
     if (interupt)
     {
-        this._interupt();
+        this._interupt('force destroy socket');
+        this.socket.destroy();
         dfd.resolve(true);
     }
     else