Unsubscribe implemented

Josema · Josema · commit 3fa1c28318f6 · 2016-12-28T17:32:49.000+08:00
diff --git a/dist/browser.js b/dist/browser.js
diff --git a/dist/browser.min.js b/dist/browser.min.js
diff --git a/dist/nodejs.js b/dist/nodejs.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dop",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "main": "./dist/nodejs.js",
   "browser": "./dist/browser.js",
   "unpkg": "./dist/browser.min.js",
diff --git a/src/core/constructors/node.js b/src/core/constructors/node.js
@@ -6,8 +6,8 @@ dop.core.node = function() {
     this.request_inc = 1;
     this.requests = {};
     this.message_queue = []; // Response / Request / instrunctions queue
-    this.object_subscribed = {};
-    this.object_owner = {};
+    this.subscriber = {};
+    this.owner = {};
     // Generating token
     do { this.token = dop.util.uuid() }
     while (typeof dop.data.node[this.token]=='object');
@@ -29,45 +29,4 @@ dop.core.node.prototype.subscribe = function() {
 
 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.storeSendMessages(node, request);
-        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.storeSendMessages(node, response);
 };
diff --git a/src/core/protocol/registerObjectToNode.js b/src/core/protocol/registerObjectToNode.js
@@ -15,9 +15,9 @@ dop.core.registerObjectToNode = function(node, object) {
     if (object_data.node[node.token] === undefined) {
         object_data.nodes_total += 1;
         object_data.node[node.token] = {
-            subscribed: false, 
-            owner: false,
-            subscribed_version: 0, 
+            subscriber: 0, // 0 or 1 || false true 
+            owner: 0, // object_id_owner
+            subscriber_version: 0, 
             owner_version: 0
         };
     }
diff --git a/src/core/protocol/registerOwner.js b/src/core/protocol/registerOwner.js
@@ -2,6 +2,6 @@
 dop.core.registerOwner = function(node, object, object_owner_id) {
     var object_data = dop.core.registerObjectToNode(node, object),
         object_id = dop.getObjectId(object_data.object);
-    object_data.node[node.token].owner = true;
-    node.object_owner[object_owner_id] = object_id;
+    object_data.node[node.token].owner = object_owner_id;
+    node.owner[object_owner_id] = object_id;
 };
diff --git a/src/core/protocol/registerSubscriber.js b/src/core/protocol/registerSubscriber.js
@@ -2,11 +2,11 @@
 dop.core.registerSubscriber = function(node, object) {
     var object_data = dop.core.registerObjectToNode(node, object),
         object_id = dop.getObjectId(object_data.object);
-    node.object_subscribed[object_id] = true;
-    if (object_data.node[node.token].subscribed)
+    node.subscriber[object_id] = true;
+    if (object_data.node[node.token].subscriber)
         return false;
     else {
-        object_data.node[node.token].subscribed = true;
+        object_data.node[node.token].subscriber = 1;
         return true;
     }
 };
diff --git a/src/core/protocol/unregisterNode.js b/src/core/protocol/unregisterNode.js
@@ -1,17 +1,17 @@
 
 dop.core.unregisterNode = function(node) {
     var object_id, object_owner_id, object_data;
-    // Removing subscribed objects
-    for (object_id in node.object_subscribed) {
+    // Removing subscriber objects
+    for (object_id in node.subscriber) {
         object_data = dop.data.object[object_id];
         if (object_data.node[node.token] !== undefined) {
             object_data.nodes_total -= 1;
             delete object_data.node[node.token];
         }
     }
     // Removing owner objects
-    for (object_owner_id in node.object_owner) {
-        object_id = node.object_owner[object_owner_id];
+    for (object_owner_id in node.owner) {
+        object_id = node.owner[object_owner_id];
         object_data = dop.data.object[object_id];
         if (object_data.node[node.token] !== undefined) {
             object_data.nodes_total -= 1;
diff --git a/src/dop.js b/src/dop.js
@@ -24,7 +24,7 @@ var dop = {
     cons: {
         TOKEN: '~TOKEN_DOP',
         DOP: '~DOP',
-        CONNECT: '~CONNECT',
+        // CONNECT: '~CONNECT',
         SEND: '~SEND',
         DISCONNECT: '~DISCONNECT'
     }
diff --git a/src/protocol/_onsubscribe.js b/src/protocol/_onsubscribe.js
@@ -16,7 +16,7 @@ dop.protocol._onsubscribe = function(node, request_id, request, response) {
                 request.promise.reject(dop.core.error.reject.OBJECT_NOT_FOUND);
 
             else {
-                if (node.object_owner[object_owner_id] === undefined) {
+                if (node.owner[object_owner_id] === undefined) {
                     var collector = dop.collectFirst();
                     object = dop.register((dop.isObjectRegistrable(request.into)) ? 
                         dop.core.setAction(request.into, object_owner)
@@ -26,7 +26,7 @@ dop.protocol._onsubscribe = function(node, request_id, request, response) {
                     collector.emitAndDestroy();
                 }
                 else
-                    object = dop.data.object[node.object_owner[object_owner_id]].object;
+                    object = dop.data.object[node.owner[object_owner_id]].object;
 
                 object = dop.util.get(object, object_path.slice(1));
 
diff --git a/src/protocol/_onunsubscribe.js b/src/protocol/_onunsubscribe.js
@@ -0,0 +1,26 @@
+
+dop.protocol._onunsubscribe = function(node, request_id, request, response) {
+
+    if (response[0] !== undefined) {
+        if (response[0] !== 0)
+            request.promise.reject(response[0]);
+        else {
+            var object_owner_id = request[2],
+                object_id = node.owner[object_owner_id],
+                object_data = dop.data.object[object_id];
+
+            if (isObject(object_data) && isObject(object_data.node[node.token]) && object_data.node[node.token].owner===object_owner_id) {
+                var roles = object_data.node[node.token];
+                roles.owner = 0;
+
+                if (roles.subscriber === 0)
+                    object_data.nodes_total -= 1;
+
+                if (object_data.nodes_total === 0)
+                    delete dop.data.object[object_id];
+                
+                request.promise.resolve();
+            }
+        }
+    }
+};
diff --git a/src/protocol/onunsubscribe.js b/src/protocol/onunsubscribe.js
@@ -0,0 +1,24 @@
+
+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].subscriber) {
+        
+        var roles = object_data.node[node.token];
+        roles.subscriber = 0;
+
+        if (roles.owner === 0)
+            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.storeSendMessages(node, response);
+};
diff --git a/src/protocol/unsubscribe.js b/src/protocol/unsubscribe.js
@@ -0,0 +1,17 @@
+
+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_data.node[node.token].owner
+        );
+        dop.core.storeSendMessages(node, request);
+        return request.promise;
+    }
+    else
+        return Promise.reject(dop.core.error.reject.SUBSCRIPTION_NOT_FOUND);
+};
diff --git a/test/transports/subscribe.js b/test/transports/subscribe.js
@@ -92,10 +92,10 @@ test('Client subscribe synchronously', function(t) {
         objectDataClient = dopClient.data.object[1];
         t.deepEqual(obj, DATA, 'deepEqual data received from server');
         t.deepEqual(objectDataServer.object, dopServer.getObjectProxy(DATA), 'Same object stored in server');
-        t.equal(objectDataServer.node[serverClient.token].subscribed, true, 'Client subscribed');
-        t.equal(objectDataServer.node[serverClient.token].owner, false, 'Client is not owner');
-        t.equal(objectDataClient.node[client.token].subscribed, false, 'Server is not subscribed');
-        t.equal(objectDataClient.node[client.token].owner, true, 'Server is owner');
+        t.equal(objectDataServer.node[serverClient.token].subscriber, 1, 'Client subscriber');
+        t.equal(objectDataServer.node[serverClient.token].owner, 0, 'Client is not owner');
+        t.equal(objectDataClient.node[client.token].subscriber, 0, 'Server is not subscriber');
+        t.equal(objectDataClient.node[client.token].owner, 1, 'Server is owner');
         return client.subscribe('DATA_DEEP');
     })
     .then(function(obj_deep){
@@ -120,10 +120,10 @@ test('Client subscribe synchronously', function(t) {
         t.deepEqual(objectDataServer.object, objectDataServer2.object[1], 'deepEqual to DATA');
         t.deepEqual(dopClient.getObjectId(obj), 2, 'Correct objectId');
         t.deepEqual(obj[1], DATA, 'deepEqual data received from server');
-        t.deepEqual(objectDataServer2.node[serverClient.token].subscribed, true, 'Client subscribed');
-        t.deepEqual(objectDataServer2.node[serverClient.token].owner, false, 'Client is not owner');
-        t.deepEqual(objectDataClient2.node[client.token].subscribed, false, 'Server is not subscribed');
-        t.deepEqual(objectDataClient2.node[client.token].owner, true, 'Server is owner');
+        t.deepEqual(objectDataServer2.node[serverClient.token].subscriber, 1, 'Client subscriber');
+        t.deepEqual(objectDataServer2.node[serverClient.token].owner, 0, 'Client is not owner');
+        t.deepEqual(objectDataClient2.node[client.token].subscriber, 0, 'Server is not subscriber');
+        t.deepEqual(objectDataClient2.node[client.token].owner, 2, 'Server is owner');
         return client.subscribe('REJECT');
     })
     .catch(function(err){
@@ -200,10 +200,10 @@ test('Server subscribe client object', function(t) {
         var objectDataClient = dopClient.data.object[dopServer.getObjectId(objClient)];
         t.equal(objServer.hasOwnProperty('test'), true, 'obj hasOwnProperty test');
         t.deepEqual(objServer, objClient);
-        t.equal(objectDataClient.node[client.token].subscribed, true, 'Server is subscribed');
-        t.equal(objectDataClient.node[client.token].owner, false, 'Server is not owner');
-        t.equal(objectDataServer.node[serverClient.token].subscribed, false, 'Client is not subscribed');
-        t.equal(objectDataServer.node[serverClient.token].owner, true, 'Client is owner');
+        t.equal(objectDataClient.node[client.token].subscriber, 1, 'Server is subscriber');
+        t.equal(objectDataClient.node[client.token].owner, 0, 'Server is not owner');
+        t.equal(objectDataServer.node[serverClient.token].subscriber, 0, 'Client is not subscriber');
+        t.equal(objectDataServer.node[serverClient.token].owner>0, true, 'Client is owner');
         t.end();
     })
 })
@@ -230,12 +230,12 @@ test('Server subscribe client object that is from server', function(t) {
             var objectDataServer = dopServer.data.object[dopServer.getObjectId(objServer)];
             var objectDataServer2 = dopServer.data.object[dopServer.getObjectId(objServer2)];
             var objectDataClient = dopClient.data.object[dopServer.getObjectId(objClient)];
-            t.equal(objectDataServer.node[serverClient.token].subscribed, true, 'Client is subscribed');
-            t.equal(objectDataServer.node[serverClient.token].owner, false, 'Client is not owner');
-            t.equal(objectDataServer2.node[serverClient.token].subscribed, false, 'Client is not subscribed');
-            t.equal(objectDataServer2.node[serverClient.token].owner, true, 'Client is owner');
-            t.equal(objectDataClient.node[client.token].subscribed, true, 'Server is subscribed');
-            t.equal(objectDataClient.node[client.token].owner, true, 'Server is not owner');
+            t.equal(objectDataServer.node[serverClient.token].subscriber, 1, 'Client is subscriber');
+            t.equal(objectDataServer.node[serverClient.token].owner, 0, 'Client is not owner');
+            t.equal(objectDataServer2.node[serverClient.token].subscriber, 0, 'Client is not subscriber');
+            t.equal(objectDataServer2.node[serverClient.token].owner>0, true, 'Client is owner');
+            t.equal(objectDataClient.node[client.token].subscriber, 1, 'Server is subscriber');
+            t.equal(objectDataClient.node[client.token].owner>0, true, 'Server is not owner');
 
             t.end();
         })
@@ -306,10 +306,10 @@ test('Server <-> Client subscribe into the same object', function(t) {
             t.deepEqual(objClient, objServer);
             var objectDataServer = dopServer.data.object[dopServer.getObjectId(objServer)];
             var objectDataClient = dopClient.data.object[dopServer.getObjectId(objClient)];
-            t.equal(objectDataServer.node[serverClient.token].subscribed, true, 'Client is subscribed');
-            t.equal(objectDataServer.node[serverClient.token].owner, true, 'Client is owner');
-            t.equal(objectDataClient.node[client.token].subscribed, true, 'Server is subscribed');
-            t.equal(objectDataClient.node[client.token].owner, true, 'Server is owner');
+            t.equal(objectDataServer.node[serverClient.token].subscriber, 1, 'Client is subscriber');
+            t.equal(objectDataServer.node[serverClient.token].owner>0, true, 'Client is owner');
+            t.equal(objectDataClient.node[client.token].subscriber, 1, 'Server is subscriber');
+            t.equal(objectDataClient.node[client.token].owner>0, true, 'Server is owner');
             t.end();
         })
     })
@@ -376,16 +376,16 @@ test('Server -> Client -> ClientClient', function(t) {
             var objectDataServer = dopServer.data.object[dopServer.getObjectId(objServer)];
             var objectDataClient = dopClient.data.object[dopClient.getObjectId(objClient)];
             var objectDataClientClient = dopClientClient.data.object[dopClient.getObjectId(obj2)];
-            t.equal(objectDataServer.node[serverClient.token].subscribed, true, 'Client is subscribed');
-            t.equal(objectDataServer.node[serverClient.token].owner, false, 'Client is not owner');
-            t.equal(objectDataClient.node[client.token].subscribed, false, 'Server is not subscribed');
-            t.equal(objectDataClient.node[client.token].owner, true, 'Server is owner');
+            t.equal(objectDataServer.node[serverClient.token].subscriber, 1, 'Client is subscriber');
+            t.equal(objectDataServer.node[serverClient.token].owner, 0, 'Client is not owner');
+            t.equal(objectDataClient.node[client.token].subscriber, 0, 'Server is not subscriber');
+            t.equal(objectDataClient.node[client.token].owner>0, true, 'Server is owner');
 
 
-            t.equal(objectDataClient.node[clientClient.token].subscribed, true, 'ClientClient is subscribed');
-            t.equal(objectDataClient.node[clientClient.token].owner, false, 'ClientClient is not owner');
-            t.equal(objectDataClientClient.node[clientclient.token].subscribed, false, 'Client is not subscribed');
-            t.equal(objectDataClientClient.node[clientclient.token].owner, true, 'Client is owner');
+            t.equal(objectDataClient.node[clientClient.token].subscriber, 1, 'ClientClient is subscriber');
+            t.equal(objectDataClient.node[clientClient.token].owner, 0, 'ClientClient is not owner');
+            t.equal(objectDataClientClient.node[clientclient.token].subscriber, 0, 'Client is not subscriber');
+            t.equal(objectDataClientClient.node[clientclient.token].owner>0, true, 'Client is owner');
 
             t.end();
         })
@@ -424,14 +424,14 @@ test('Server <-> Client <-> ClientClient into the same object', function(t) {
                     var objectDataServer = dopServer.data.object[dopServer.getObjectId(objServer)];
                     var objectDataClient = dopClient.data.object[dopServer.getObjectId(objClient)];
                     var objectDataClientClient = dopClientClient.data.object[dopServer.getObjectId(objClientClient)];
-                    t.equal(objectDataServer.node[serverClient.token].subscribed, true, 'Client is subscribed');
-                    t.equal(objectDataServer.node[serverClient.token].owner, true, 'Client is owner');
-                    t.equal(objectDataClient.node[client.token].subscribed, true, 'Server is subscribed');
-                    t.equal(objectDataClient.node[client.token].owner, true, 'Server is owner');
-                    t.equal(objectDataClient.node[clientClient.token].subscribed, true, 'ClientClient is subscribed');
-                    t.equal(objectDataClient.node[clientClient.token].owner, true, 'ClientClient is owner');
-                    t.equal(objectDataClientClient.node[clientclient.token].subscribed, true, 'Client is subscribed');
-                    t.equal(objectDataClientClient.node[clientclient.token].owner, true, 'Client is owner');
+                    t.equal(objectDataServer.node[serverClient.token].subscriber, 1, 'Client is subscriber');
+                    t.equal(objectDataServer.node[serverClient.token].owner>0, true, 'Client is owner');
+                    t.equal(objectDataClient.node[client.token].subscriber, 1, 'Server is subscriber');
+                    t.equal(objectDataClient.node[client.token].owner>0, true, 'Server is owner');
+                    t.equal(objectDataClient.node[clientClient.token].subscriber, 1, 'ClientClient is subscriber');
+                    t.equal(objectDataClient.node[clientClient.token].owner>0, true, 'ClientClient is owner');
+                    t.equal(objectDataClientClient.node[clientclient.token].subscriber, 1, 'Client is subscriber');
+                    t.equal(objectDataClientClient.node[clientclient.token].owner>0, true, 'Client is owner');
                     t.end()
                 })
             })
diff --git a/test/transports/unsubscribe.js b/test/transports/unsubscribe.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "dop",`
`3`		`- "version": "0.6.0",`
	`3`	`+ "version": "0.7.0",`
`4`	`4`	`"main": "./dist/nodejs.js",`
`5`	`5`	`"browser": "./dist/browser.js",`
`6`	`6`	`"unpkg": "./dist/browser.min.js",`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ var dop = {`
`24`	`24`	`cons: {`
`25`	`25`	`TOKEN: '~TOKEN_DOP',`
`26`	`26`	`DOP: '~DOP',`
`27`		`- CONNECT: '~CONNECT',`
	`27`	`+ // CONNECT: '~CONNECT',`
`28`	`28`	`SEND: '~SEND',`
`29`	`29`	`DISCONNECT: '~DISCONNECT'`
`30`	`30`	`}`