more refactor and fix destroy

Author: KlonD90

lib/connection.js

@@ -16,18 +16,13 @@ var states = {
     CONNECTING: 0,
     CONNECTED: 1,
     AWAITING: 2,
-    REQUESTING: 3,
-    GETTING: 4,
-    INITED: 5,
+    DESTROYED: 5,
     DISONECTED: 6,
     PREHELLO: 7,
     AWAITING_LENGTH: 8
 };
 
-var commandType = {
-    CONNECT: 0,
-    REQUEST: 1
-};
+var requestMethods = ['select', 'delete', 'insert', 'replace', 'update', 'eval', 'call'];
 
 var requestId = {
     _id: 0,
@@ -43,11 +38,9 @@ var defaultOptions = {
     port: '3301',
     username: null,
     password: null,
-    timeout: 5000,
-    reconnect: true
+    timeout: 5000
 };
 
-
 function TarantoolConnection (options){
     this.socket = new net.Socket({
         readable: true,
@@ -57,20 +50,20 @@ function TarantoolConnection (options){
     this.emitter = new EventEmitter();
     this.options = _.extend(defaultOptions, options);
     this.commandsQueue = [];
+    this.awaitingDestroy = false;
     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){
     switch(this.state){
         case states.PREHELLO:
             for (var i = 0; i<this.commandsQueue.length; i++)
             {
-                if (this.commandsQueue[i][0] == commandType.CONNECT)
+                if (this.commandsQueue[i][0] == tarantoolConstants.RequestCode.rqConnect)
                 {
-                    this.commandsQueue[i][1](true);
+                    this.commandsQueue[i][1].resolve(true);
                     this.commandsQueue.splice(i, 1);
                     i--;
                 }
@@ -143,41 +136,55 @@ TarantoolConnection.prototype._processResponse = function(buffer){
     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];
+    for(var i = 0; i<this.commandsQueue.length; i++)
+        if (this.commandsQueue[i][1] == reqId)
+        {
+            var task = this.commandsQueue[i];
+            this.commandsQueue.splice(i, 1);
+            break;
+        }
     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]);
+    if (this.awaitingDestroy && this.commandsQueue.length == 1)
+    {
+        this.commandsQueue[0][2].resolve(true);
+        this.socket.destroy();
+    }
 };
 
 TarantoolConnection.prototype._processResponseBody = function(cmd, data){
     return cmd == tarantoolConstants.RequestCode.rqAuth ? true : data;
 };
 
-TarantoolConnection.prototype._dropAll = function(){
-
-};
-
 TarantoolConnection.prototype.onConnect = function(){
     this.state = states.PREHELLO;
 };
 
 TarantoolConnection.prototype.onError = function(error){
-    for (var i=0; i<this.commandsQueue.length; i++)
-        this.commandsQueue[i][2](error);
+    this._interupt();
+    tihs._stubMethods();
+    this.socket.destroy();
     this.commandsQueue = [];
 };
 
+TarantoolConnection.prototype._interupt = function(){
+    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];
+        dfd.reject(error);
+    }
+}
+
 TarantoolConnection.prototype.connect = function(){
+    var dfd = vow.defer();
     this.state = states.CONNECTING;
-    return new Promise(function(resolve, reject){
-        this.commandsQueue.push([commandType.CONNECT, resolve, reject]);
-        this.socket.connect({port: this.options.port, host: this.options.host});
-    }.bind(this));
+    this.commandsQueue.push([tarantoolConstants.RequestCode.rqConnect, dfd]);
+    this.socket.connect({port: this.options.port, host: this.options.host});
+    return dfd.promise();
 };
 
 TarantoolConnection.prototype.ping = function(){
@@ -269,7 +276,6 @@ TarantoolConnection.prototype.eval = function(expression, tuple){
     return dfd.promise();
 };
 
-
 TarantoolConnection.prototype.call = function(functionName, tuple){
     var dfd = vow.defer();
     var reqId = requestId.getId();
@@ -285,7 +291,6 @@ TarantoolConnection.prototype.call = function(functionName, tuple){
     return dfd.promise();
 };
 
-
 TarantoolConnection.prototype.insert = function(spaceId, tuple){
     var reqId = requestId.getId();
     return this._replaceInsert(tarantoolConstants.RequestCode.rqInsert, reqId, spaceId, tuple);
@@ -355,14 +360,39 @@ TarantoolConnection.prototype._request = function(header, body){
 };
 
 TarantoolConnection.prototype.destroy = function(interupt){
+    var dfd = vow.defer();
     if (interupt)
     {
-        this.socket.destroy();
+        this._interupt();
+        dfd.resolve(true);
     }
     else
     {
-        this.commandsQueue.push('destroy');
+        if (this.commandsQueue.length)
+        {
+            this.commandsQueue.push([tarantoolConstants.RequestCode.rqDestroy, -1, dfd]);
+            this.awaitingDestroy = true;
+            //disable methods
+            this._stubMethods();
+        }
+        else
+        {
+            this.socket.destroy();
+            dfd.resolve(true);
+        }
     }
+    return dfd.promise();
+};
+
+TarantoolConnection.prototype._notAvailableMethod = function(){
+    var dfd = vow.defer();
+    dfd.reject('connection will be destroyed or already destroyed, create another one');
+    return dfd.promise();
+};
+
+TarantoolConnection.prototype._stubMethods = function(){
+    for (var i = 0; i<requestMethods.length; i++)
+        this[requestMethods[i]] = this._notAvailableMethod;
 };
 
 module.exports = TarantoolConnection;

lib/const.js

@@ -1,6 +1,7 @@
 var msgpack = require('msgpack');
 // i steal it from go
 const RequestCode = {
+	rqConnect: 0x00, //fake for connect
 	rqSelect: 0x01,
 	rqInsert: 0x02,
 	rqReplace: 0x03,
@@ -9,6 +10,7 @@ const RequestCode = {
 	rqCall: 0x06,
 	rqAuth: 0x07,
 	rqEval: 0x08,
+	rqDestroy: 0x100, //fake for destroy socket cmd
 	rqPing: 0x40
 };
 
@@ -55,9 +57,6 @@ const ExportPackage = {
 	KeysCode: KeysCode,
 	IteratorsType: IteratorsType,
 	OkCode: OkCode,
-	NetErrCode: NetErrCode,
-	TimeoutErrCode: TimeoutErrCode,
-	PacketLengthBytes: 5,
 	passEnter: msgpack.pack('chap-sha1')
 };