Unsubscribe implemented

Author: Josema

dist/browser.js

@@ -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",

dist/browser.min.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);
 };

dist/nodejs.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
         };
     }

package.json

@@ -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;
 };

src/core/constructors/node.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;
     }
 };

src/core/protocol/registerObjectToNode.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;

src/core/protocol/registerOwner.js

@@ -24,7 +24,7 @@ var dop = {
     cons: {
         TOKEN: '~TOKEN_DOP',
         DOP: '~DOP',
-        CONNECT: '~CONNECT',
+        // CONNECT: '~CONNECT',
         SEND: '~SEND',
         DISCONNECT: '~DISCONNECT'
     }