Small changes for onsubscribe and added version on mutation instruction to be implemented on protocol

Author: Josema

dist/browser.js

@@ -6,10 +6,8 @@ dop.core.error = {
     },
 
     reject: {
-        // OBJECT_NAME_NOT_FOUND: 1,
-        // 1: 'Object "%s" not found to be subscribed',
-        // OBJECT_ALREADY_SUBSCRIBED: 2,
-        // 2: 'The object "%s" is already subscribed',
+        OBJECT_NOT_FOUND: 'Object not found to be subscribed',
+        // OBJECT_ALREADY_SUBSCRIBED: 'The object "%s" is already subscribed',
     }
 
 };

dist/browser.min.js

@@ -66,13 +66,13 @@ dop.core.setActionMutator = function(destiny, prop, value, typeofValue, path) {
             // Set array and skip path deep
             else if (typeofValue=='array') {
                 dop.set(destiny, prop, dop.util.merge([], value));
-                return true;
+                return true; // Skiping to dont go inside
             }
 
             // Set array and skip path deep
             else if (typeofValue=='object' && typeofDestiny!='object' && typeofDestiny!='array') {
                 dop.set(destiny, prop, dop.util.merge({}, value));
-                return true;
+                return true; // Skiping to dont go inside
             }
 
             // Set value

dist/nodejs.js

@@ -7,25 +7,34 @@ dop.protocol._onsubscribe = function(node, request_id, request, response) {
             request.promise.reject(dop.core.getRejectError(response[0], request[2]));
 
         else {
-            var object_path = response[1],
+            var object_path = typeof response[1]=='number' ? [response[1]] : response[1],
                 object_owner_id = object_path[0],
                 object_owner = response[2],
                 object;
-
-            if (node.object_owner[object_owner_id] === undefined) {
-                var collector = dop.collectFirst();
-                object = dop.register((dop.isObjectRegistrable(request.into)) ? 
-                    dop.core.setAction(request.into, object_owner)
+            
+            if (!isArray(object_path) || typeof object_owner_id!='number')
+                request.promise.reject(dop.core.error.reject.OBJECT_NOT_FOUND);
+
+            else {
+                if (node.object_owner[object_owner_id] === undefined) {
+                    var collector = dop.collectFirst();
+                    object = dop.register((dop.isObjectRegistrable(request.into)) ? 
+                        dop.core.setAction(request.into, object_owner)
+                    :
+                        object_owner);
+                    dop.core.registerOwner(node, object, object_owner_id);
+                    collector.emitAndDestroy();
+                }
+                else
+                    object = dop.data.object[node.object_owner[object_owner_id]].object;
+
+                object = dop.util.get(object, object_path.slice(1));
+
+                (!isObject(object)) ?
+                    request.promise.reject(dop.core.error.reject.OBJECT_NOT_FOUND)
                 :
-                    object_owner);
-                dop.core.registerOwner(node, object, object_owner_id);
-                collector.emitAndDestroy();
+                    request.promise.resolve(object);
             }
-            else
-                object = dop.data.object[node.object_owner[object_owner_id]].object;
-
-
-            request.promise.resolve(dop.util.get(object, object_path.slice(1)));
         }
     }
 

src/core/error.js

@@ -5,7 +5,7 @@ dop.protocol.instructions = {
     // [<request_id>, <instruction>, <params...>]
     // If <request_id> it's greater than 0 is a request, if is less than 0 then is the response of the request.
 
-    // Is possible send multiple requests in one message, just wrapping it in an Array. But the order of the responses is not in order. Which means the response of request_idTwo could be resolved before request_idOne
+    // Is possible send multiple requests in one message, just wrapping it in an Array. But the order of the responses is not determined. Which means the response of request_idTwo could be resolved before request_idOne
     // [[<request_id1>, <instruction>, <params...>], [<request_id2>, <instruction>, <params...>]]
 
     // Is possible send one request with multiple instructions. The response will be recieved when all the requests are resolved. The response could be only one. But if the response is multiple has to respect the order
@@ -25,24 +25,26 @@ dop.protocol.instructions = {
 
 
                         // Server -> Client
-    connect: 0,         // [ 1234, <instruction>, <user_token>, <options>]
+    connect: 0,         // [ 1234, <instruction>, <user_token>]
                         // [-1234, 0]
 
                         // Subscriptor -> Owner
     subscribe: 1,       // [ 1234, <instruction>, <params...>]
-                        // [-1234, 0, [<object_id>], <data_object>]
+                        // [-1234, 0, <object_id>, <data_object>]
                         // [-1234, 0, [<object_id>, 'path']]
 
                         // Subscriptor -> Owner
     unsubscribe: 2,     // [ 1234, <instruction>, <object_id>]
+                        // Owner -> Subscriptor
+                        // [ 1234, <instruction>, -<object_id>]
                         // [-1234, 0]
 
                         // Subscriptor -> Owner
-    call: 3,            // [ 1234, <instruction>, [<object_id>,'path','path'], [<params...>]]
+    call: 3,            // [ 1234, <instruction>, <object_id>, ['path','path'], [<params...>]]
                         // [-1234, 0, <return>]
 
                         // Owner -> Subscriptor
-    mutation: 4,        // [ 1234, <instruction>, <object_id>, <object_data_to_merge>]
+    mutation: 4,        // [ 1234, <instruction>, <object_id>, <version>, <mutation>]
                         // [-1234, 0]
 };
 

src/core/objects/setAction.js

@@ -10,7 +10,8 @@ dop.protocol.onsubscribe = function(node, request_id, request) {
                 var object = dop.register(value),
                     object_id = dop.getObjectId(object),
                     object_root = dop.getObjectRoot(object),
-                    response = dop.core.createResponse(request_id, 0, dop.getObjectDop(object));
+                    object_dop = dop.getObjectDop(object),
+                    response = dop.core.createResponse(request_id, 0, object_dop.length==1 ? object_dop[0] : object_dop);
 
                 if (dop.core.registerSubscriber(node, object_root))
                     response.push(object_root);