some improvements to check args and some call test update

Author: KlonD90

lib/connection.js

@@ -175,7 +175,7 @@ TarantoolConnection.prototype._processResponse = function(buffer){
     if (success)
         dfd.resolve(this._processResponseBody(task[0], obj[1][tarantoolConstants.KeysCode.data]));
     else
-        dfd.reject(obj[1][tarantoolConstants.KeysCode.error]);
+        dfd.reject(new Error(obj[1][tarantoolConstants.KeysCode.error]));
     if (this.awaitingDestroy && this.commandsQueue.length == 1)
     {
         this.commandsQueue[0][2].resolve(true);
@@ -192,7 +192,7 @@ TarantoolConnection.prototype.onConnect = function(){
 };
 
 TarantoolConnection.prototype.onError = function(error){
-    this._interupt();
+    this._interupt(error);
     this._stubMethods();
     this.socket.destroy();
     this.commandsQueue = [];
@@ -222,7 +222,7 @@ TarantoolConnection.prototype.connect = function(){
         }
         else
         {
-            reject(this.awaitingDestroy ? 'already destroyed' : 'already connected');
+            reject(new Error(this.awaitingDestroy ? 'already destroyed' : 'already connected'));
             if (this.options.log)
             {
                 console.log('connection already destroyed');
@@ -270,24 +270,29 @@ TarantoolConnection.prototype.select = function(spaceId, indexId, limit, offset,
 
 TarantoolConnection.prototype.delete = function(spaceId, indexId, key){
     return new Promise(function (resolve, reject) {
-        var reqId = requestId.getId();
-        var header = this._header(tarantoolConstants.RequestCode.rqDelete, reqId);
-        var buffered = {
-            spaceId: msgpack.encode(spaceId),
-            indexId: msgpack.encode(indexId),
-            key: msgpack.encode(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]);
-        this._request(header, body);
-        this.commandsQueue.push([tarantoolConstants.RequestCode.rqSelect, reqId, {resolve: resolve, reject: reject}]);
+        if (Array.isArray(key))
+        {
+            var reqId = requestId.getId();
+            var header = this._header(tarantoolConstants.RequestCode.rqDelete, reqId);
+            var buffered = {
+                spaceId: msgpack.encode(spaceId),
+                indexId: msgpack.encode(indexId),
+                key: msgpack.encode(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]);
+            this._request(header, body);
+            this.commandsQueue.push([tarantoolConstants.RequestCode.rqSelect, reqId, {resolve: resolve, reject: reject}]);
+        }
+        else
+            reject(new Error('need array'));
     }.bind(this));
 };
 
 TarantoolConnection.prototype.update = function(spaceId, indexId, key, ops){
     return new Promise(function (resolve, reject) {
-        if (Array.isArray(ops)){
+        if (Array.isArray(ops) && Array.isArray(key)){
             var reqId = requestId.getId();
             var header = this._header(tarantoolConstants.RequestCode.rqUpdate, reqId);
             var buffered = {
@@ -325,7 +330,7 @@ TarantoolConnection.prototype.eval = function(expression){
 };
 
 TarantoolConnection.prototype.call = function(functionName){
-    var tuple = Array.prototype.slice.call(arguments, 1);
+    var tuple = arguments.length > 1 ? Array.prototype.slice.call(arguments, 1): [];
     return new Promise(function (resolve, reject) {
         var reqId = requestId.getId();
         var header = this._header(tarantoolConstants.RequestCode.rqCall, reqId);
@@ -412,7 +417,7 @@ TarantoolConnection.prototype.destroy = function(interupt){
     return new Promise(function (resolve, reject) {
         if (interupt)
         {
-            this._interupt('force destroy socket');
+            this._interupt(new Error('force destroy socket'));
             this.socket.destroy();
             resolve(true);
         }
@@ -437,7 +442,7 @@ TarantoolConnection.prototype.destroy = function(interupt){
 
 TarantoolConnection.prototype._notAvailableMethod = function(){
     return new Promise(function (resolve, reject) {
-        reject('connection will be destroyed or already destroyed, create another one');
+        reject(new Error('connection will be destroyed or already destroyed, create another one'));
     });
 };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tarantool-driver",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Tarantool driver for 1.6",
   "main": "index.js",
   "scripts": {

test/app.js

@@ -36,6 +36,9 @@ describe('Tarantool Connection tests', function(){
 			console.log('before call');
 			try{
 				Promise.all([conn.delete(514, 0, [1]),conn.delete(514, 0, [2]),conn.delete(514, 0, [3]),conn.delete(514, 0, [4]	)])
+					.then(function(){
+						return conn.call('clearaddmore');
+					})
 					.then(function(){
 						done();
 					})
@@ -100,6 +103,15 @@ describe('Tarantool Connection tests', function(){
 				done();
 			}, function(e){done(e);});
 		});
+		it('dup error', function(done){
+			conn.insert(512, insertTuple)
+			.then(function(a){
+				done(new Error('can insert'));
+			}, function(e){
+					assert(e instanceof Error);
+					done();
+				});
+		});
 		it('update', function(done){
 			conn.update(512, 0, [50], [['+',3,10]])
 			.then(function(a){
@@ -110,8 +122,8 @@ describe('Tarantool Connection tests', function(){
 		});
 		it('a lot of insert', function(done){
 			var promises = [];
-			for (var i = 0; i <= 1000; i++) {
-				conn.insert(512, ['key' + i, i]);
+			for (var i = 0; i <= 5000; i++) {
+				conn.insert(515, ['key' + i, i]);
 			}
 			Promise.all(promises)
 				.then(function(pr){

test/box.lua

@@ -51,12 +51,29 @@ if not box.space.batched then
 end
 
 function batch (data)
-    for index, value in pairs(data) do
+    print(data)
+    for index,value in pairs(data) do
         box.space.batched:insert(value)
     end
 end
 
 function myget(id)
     val = box.space.batched:select{id}
     return val[1]
-end
+end
+
+if not box.space.toaddmore then
+    local toaddmore = box.schema.space.create('toaddmore')
+    toaddmore:create_index('primary', {type = 'TREE', unique = true, parts = {1, 'STR'}})
+    box.schema.user.grant('test', 'read,write,execute', 'space', 'toaddmore')
+    box.schema.user.grant('test', 'read,write,execute', 'space', '_index')
+end
+
+function clearaddmore()
+    local values = box.space.toaddmore:select{}
+    for k,v in pairs(values) do
+        if v[1] then
+            box.space.toaddmore:delete{v[1]}
+        end
+    end
+end