Building unsubscribe

Author: Josema

src/core/constructors/node.js

@@ -27,3 +27,48 @@ dop.core.node.prototype.subscribe = function() {
     return dop.protocol.subscribe(this, arguments);
 };
 
+dop.core.node.prototype.unsubscribe = function(object) {
+    return dop.protocol.unsubscribe(this, object);
+};
+
+
+
+dop.protocol.unsubscribe = function(node, object) {
+    var object_id = dop.getObjectId(object),
+        object_data = dop.data.object[object_id];
+
+    if (isObject(object_data) && isObject(object_data.node[node.token]) && object_data.node[node.token].owner) {
+        var request = dop.core.createRequest(node, dop.protocol.instructions.unsubscribe, object_id);
+        dop.core.storeRequest(node, request);
+        if (node.connected)
+            dop.core.sendRequests(node);
+        return request.promise;
+    }
+    else
+        return Promise.reject(dop.core.error.reject.SUBSCRIPTION_NOT_FOUND);
+};
+
+
+dop.protocol.onunsubscribe = function(node, request_id, request) {
+    var object_id = request[1],
+        object_data = dop.data.object[object_id],
+        response = dop.core.createResponse(request_id);
+
+    if (isObject(object_data) && isObject(object_data.node[node.token]) && object_data.node[node.token].subscribed) {
+        
+        var roles = object_data.node[node.token];
+        roles.subscribed = false;
+
+        if (roles.owner === false)
+            object_data.nodes_total -= 1;
+
+        if (object_data.nodes_total === 0)
+            delete dop.data.object[object_id];
+
+        response.push(0);
+    }
+    else
+        response.push(dop.core.error.reject.SUBSCRIPTION_NOT_FOUND);
+
+    dop.core.sendResponse(node, response);
+};

src/core/error.js

@@ -6,8 +6,9 @@ dop.core.error = {
     },
 
     reject: {
-        OBJECT_NOT_FOUND: 'Object not found to be subscribed',
         // OBJECT_ALREADY_SUBSCRIBED: 'The object "%s" is already subscribed',
+        OBJECT_NOT_FOUND: 'Object not found to be subscribed',
+        SUBSCRIPTION_NOT_FOUND: 'Not subscription found to unsubscribe this object',
     }
 
 };

src/core/protocol/registerObjectToNode.js

@@ -16,7 +16,9 @@ dop.core.registerObjectToNode = function(node, object) {
         object_data.nodes_total += 1;
         object_data.node[node.token] = {
             subscribed: false, 
-            owner: false
+            owner: false,
+            subscribed_version: 0, 
+            owner_version: 0
         };
     }
 

src/protocol/instructions.js

@@ -35,8 +35,6 @@ dop.protocol.instructions = {
 
                         // Subscriptor -> Owner
     unsubscribe: 2,     // [ 1234, <instruction>, <object_id>]
-                        // Owner -> Subscriptor
-                        // [ 1234, <instruction>, -<object_id>]
                         // [-1234, 0]
 
                         // Subscriptor -> Owner

test/transports/unsubscribe.js

@@ -0,0 +1,54 @@
+var test = require('tape');
+var dopServer = require('../../dist/nodejs').create();
+var dopClient = require('../../dist/nodejs').create();
+dopServer.env = 'SERVER';
+dopClient.env = 'CLIENT';
+
+
+var transportName = process.argv[2] || 'local';
+var transportListen = require('dop-transports').listen[transportName];
+var transportConnect = require('dop-transports').connect[transportName];
+
+var server = dopServer.listen({transport:transportListen})
+var client = dopClient.connect({transport:transportConnect, listener:server})
+server.on('connect', function(node) {
+    if (typeof serverClient == 'undefined')
+        serverClient = node;
+})
+
+
+
+test('Client unsubscribe Server', function(t) {
+    var objectServer = dopServer.register({test:Math.random()});
+    t.equal(dopServer.data.object[1], undefined, 'Object data not stored on server yet');
+    
+    dopServer.onsubscribe(function() {
+        return objectServer;
+    })
+
+    var objectClient = dopClient.register({});
+    t.equal(dopClient.data.object[1], undefined, 'Object data not stored on client yet');
+    client.subscribe().into(objectClient).then(function(obj){
+        var objectDataServer = dopServer.data.object[1];
+        var objectDataClient = dopClient.data.object[1];
+        t.deepEqual(objectDataServer.node[serverClient.token].subscribed, true, 'Client subscribed');
+        t.deepEqual(objectDataServer.node[serverClient.token].owner, false, 'Client is not owner');
+        t.deepEqual(objectDataClient.node[client.token].subscribed, false, 'Server is not subscribed');
+        t.deepEqual(objectDataClient.node[client.token].owner, true, 'Server is owner');
+
+
+        client.unsubscribe(objectClient)
+        .then(function(){
+            t.deepEqual(objectDataServer.node[serverClient.token].subscribed, false, 'Client subscribed');
+            t.deepEqual(objectDataServer.node[serverClient.token].owner, false, 'Client is not owner');
+            t.deepEqual(objectDataClient.node[client.token].subscribed, false, 'Server is not subscribed');
+            t.deepEqual(objectDataClient.node[client.token].owner, true, 'Server is owner');
+        })
+        .catch(function(err){
+            console.log( err );
+        })
+
+        t.end();
+    })
+
+})