Message error as string (splicit message) instead of code error

Author: Josema

src/core/error.js

@@ -1,13 +1,12 @@
 
 dop.core.error = {
 
-    warning: {
-        TOKEN_REJECTED: 'User disconnected because is rejecting too many times the token assigned'
-    },
+    // warning: {
+    //     TOKEN_REJECTED: 'User disconnected because is rejecting too many times the token assigned'
+    // },
 
     reject: {
-        // OBJECT_ALREADY_SUBSCRIBED: 'The object "%s" is already subscribed',
-        OBJECT_NOT_FOUND: 'Object not found to be subscribed',
+        OBJECT_NOT_FOUND: 'Object not found',
         SUBSCRIPTION_NOT_FOUND: 'Not subscription found to unsubscribe this object',
     }
 

src/core/protocol/getRejectError.js

@@ -1,9 +1,9 @@
 
-dop.core.getRejectError = function(error) {
-    if (typeof error == 'number' && dop.core.error.reject[error] !== undefined) {
-        var args = Array.prototype.slice.call(arguments, 1);
-        args.unshift(dop.core.error.reject[error]);
-        return dop.util.sprintf.apply(this, args);
-    }
-    return error;  
-};
+// dop.core.getRejectError = function(error) {
+//     if (typeof error == 'number' && dop.core.error.reject[error] !== undefined) {
+//         var args = Array.prototype.slice.call(arguments, 1);
+//         args.unshift(dop.core.error.reject[error]);
+//         return dop.util.sprintf.apply(this, args);
+//     }
+//     return error;  
+// };

src/protocol/_onsubscribe.js

@@ -4,7 +4,7 @@ dop.protocol._onsubscribe = function(node, request_id, request, response) {
     if (response[0] !== undefined) {
 
         if (response[0] !== 0)
-            request.promise.reject(dop.core.getRejectError(response[0], request[2]));
+            request.promise.reject(response[0]);
 
         else {
             var object_path = typeof response[1]=='number' ? [response[1]] : response[1],

src/protocol/onsubscribe.js

@@ -18,21 +18,26 @@ dop.protocol.onsubscribe = function(node, request_id, request) {
                 dop.core.storeSendMessages(node, response);
                 return object;
             }
+            else if (value === undefined)
+                return Promise.reject(dop.core.error.reject.OBJECT_NOT_FOUND);
             else
                 // http://www.2ality.com/2016/03/promise-rejections-vs-exceptions.html
                 // http://stackoverflow.com/questions/41254636/catch-an-error-inside-of-promise-resolver
                 dop.util.invariant(false, 'dop.onsubscribe callback must return or resolve a regular object');
 
 
-        }, function reject(error) {
-            var response = dop.core.createResponse(request_id);
-            (error instanceof Error) ? console.log(error.stack) : response.push(error);
-            dop.core.storeSendMessages(node, response, JSON.stringify);
-        }, function(req) {
+        }, reject, function(req) {
             req.node = node;
             return req;
         });
 
     }
+    else
+        reject(dop.core.error.reject.OBJECT_NOT_FOUND);
 
+    function reject(error) {
+        var response = dop.core.createResponse(request_id);
+        (error instanceof Error) ? console.log(error.stack) : response.push(error);
+        dop.core.storeSendMessages(node, response, JSON.stringify);
+    }
 };

src/util/sprintf.js

@@ -1,20 +1,20 @@
 
-dop.util.sprintf = function() {
+// dop.util.sprintf = function() {
 
-    var s = -1, result, str=arguments[0], array = Array.prototype.slice.call(arguments, 1);
-    return str.replace(/"/g, "'").replace(/%([0-9]+)|%s/g , function() {
+//     var s = -1, result, str=arguments[0], array = Array.prototype.slice.call(arguments, 1);
+//     return str.replace(/"/g, "'").replace(/%([0-9]+)|%s/g , function() {
 
-        result = array[ 
-            (arguments[1] === undefined || arguments[1] === '') ? ++s : arguments[1]
-        ];
+//         result = array[ 
+//             (arguments[1] === undefined || arguments[1] === '') ? ++s : arguments[1]
+//         ];
 
-        if (result === undefined)
-            result = arguments[0];
+//         if (result === undefined)
+//             result = arguments[0];
 
-        return result;
+//         return result;
 
-    });
+//     });
 
-};
-// Usage: sprintf('Code error %s for %s', 25, 'Hi') -> "Code error 25 for Hi"
-// Usage2: sprintf('Code error %1 for %0', 25, 'Hi') -> "Code error Hi for 25"
+// };
+// // Usage: sprintf('Code error %s for %s', 25, 'Hi') -> "Code error 25 for Hi"
+// // Usage2: sprintf('Code error %1 for %0', 25, 'Hi') -> "Code error Hi for 25"

test/transports/subscribe.js

@@ -20,6 +20,12 @@ server.on('connect', function(node) {
         serverClient = node;
 })
 
+test('Before onsubscribe is defined', function(t) {
+    client.subscribe('DATA').catch(function(err){
+        t.equal(err, dopClient.core.error.reject.OBJECT_NOT_FOUND, 'Object not found');
+        t.end()
+    })
+})
 
 
 test('Client subscribe synchronously', function(t) {
@@ -73,8 +79,8 @@ test('Client subscribe synchronously', function(t) {
         else if (name === 'REJECT') {
             req.reject({message:'Subscription rejected'})
         }
-        else if (name === 'NOOBJECT') {
-            req.resolve('NOOBJECT');
+        else if (name === 'RESOLVESTRING') {
+            req.resolve('RESOLVESTRING');
             setTimeout(t.end.bind(t), 10);
         }
     })
@@ -122,7 +128,11 @@ test('Client subscribe synchronously', function(t) {
     })
     .catch(function(err){
         t.equal(err.message, 'Subscription rejected', 'Subscription rejected');
-        return client.subscribe('NOOBJECT');
+        return client.subscribe();
+    })
+    .catch(function(err){
+        t.equal(err, dopClient.core.error.reject.OBJECT_NOT_FOUND, 'Object not found');
+        return client.subscribe('RESOLVESTRING');
     })
     // .catch(function(err){
     //     console.log( 123131, typeof err );