Merge branch 'features'

Josema · Josema · commit 89343c3232b8 · 2018-06-22T15:00:43.000+02:00
* features:
  Bug fixed when unsubscribe and resubscribe same object
  Allowing registrable Classes
diff --git a/examples/todomvc/package-lock.json b/examples/todomvc/package-lock.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dop",
-  "version": "0.26.2",
+  "version": "0.27.0",
   "main": "./dist/dop.nodejs.js",
   "browser": "./dist/dop.js",
   "unpkg": "./dist/dop.min.js",
diff --git a/src/api/isObjectRegistrable.js b/src/api/isObjectRegistrable.js
@@ -1,25 +1,3 @@
-
 dop.isObjectRegistrable = function(object) {
-    if (object === null || typeof object !== "object") return false;
-    var prototype = Object.getPrototypeOf(object);
-    return prototype === Object.prototype || prototype === Array.prototype;
-};
-
-//dop.isObjectRegistrable = function(object) {
-//     var tof = dop.util.typeof(object);
-//     return (tof === 'object' || tof == 'array');
-// };
-
-// function Test(){}
-// console.log(isObjectRegistrable({}));
-// console.log(isObjectRegistrable([]));
-// console.log(isObjectRegistrable(new Test));
-// console.log(isObjectRegistrable(new Map));
-// console.log(isObjectRegistrable(new Date()));
-// console.log(isObjectRegistrable(null));
-// console.log(isObjectRegistrable(Symbol('')));
-// console.log(isObjectRegistrable(function(){}));
-// console.log(isObjectRegistrable(1));
-// console.log(isObjectRegistrable("s"));
-// console.log(isObjectRegistrable(true));
-// console.log(isObjectRegistrable(/a/));
+    return isObject(object);
+};
diff --git a/src/api/isPojoObject.js b/src/api/isPojoObject.js
@@ -0,0 +1,24 @@
+dop.isPojoObject = function(object) {
+    if (object === null || typeof object !== "object") return false;
+    var prototype = Object.getPrototypeOf(object);
+    return prototype === Object.prototype || prototype === Array.prototype;
+};
+
+
+// dop.isPojoObject = function(object) {
+//     var tof = dop.util.typeof(object);
+//     return (tof === 'object' || tof == 'array');
+// };
+
+// function Test(){}
+// console.log(dop.isPojoObject({}));
+// console.log(dop.isPojoObject([]));
+// console.log(dop.isPojoObject(new Error));
+// console.log(dop.isPojoObject(new Date()));
+// console.log(dop.isPojoObject(null));
+// console.log(dop.isPojoObject(Symbol('')));
+// console.log(dop.isPojoObject(function(){}));
+// console.log(dop.isPojoObject(1));
+// console.log(dop.isPojoObject("s"));
+// console.log(dop.isPojoObject(true));
+// console.log(dop.isPojoObject(/a/));
diff --git a/src/api/register.js b/src/api/register.js
@@ -1,6 +1,6 @@
 
 dop.register = function(object) {
-    dop.util.invariant(dop.isObjectRegistrable(object) && !isArray(object), 'dop.register needs a regular plain object as first parameter');
+    dop.util.invariant(dop.isObjectRegistrable(object) && !isArray(object), 'dop.register needs an object or an array as first parameter');
     return (dop.isRegistered(object)) ?
         dop.getObjectProxy(object)
     :
diff --git a/src/core/mutators/set.js b/src/core/mutators/set.js
@@ -25,7 +25,7 @@ dop.core.set = function(object, property, value, options) {
             //     property = Number(property);
 
             // object or array
-            if (options.deep && dop.isObjectRegistrable(value) && !(dop.isRegistered(value) && dop.getObjectParent(value) === objectProxy))
+            if (options.deep && dop.isPojoObject(value) && !(dop.isRegistered(value) && dop.getObjectParent(value) === objectProxy))
                 objectTarget[property] = dop.core.configureObject(value, property, objectProxy);
             // computed value
             else if (isFunction(value) && value._name==dop.cons.COMPUTED_FUNCTION)
diff --git a/src/core/mutators/splice.js b/src/core/mutators/splice.js
@@ -45,7 +45,7 @@ dop.core.splice = function(array, args) {
         // We must register new objects
         for (;index<argslength; ++index, ++start) {
             item = args[index];
-            if (dop.isObjectRegistrable(item))
+            if (dop.isPojoObject(item))
                 objectTarget[start] = dop.core.configureObject(
                     item,
                     start,
diff --git a/src/core/objects/configureObject.js b/src/core/objects/configureObject.js
@@ -74,7 +74,7 @@ dop.core.configureObject = function(object, propertyParent, parent) {
         else if (is_function && value._name==dop.cons.COMPUTED_FUNCTION)
             object_target[property] = value(object_proxy, property, false, undefined);
         // object or array
-        else if (dop.isObjectRegistrable(value))
+        else if (dop.isPojoObject(value))
             object_target[property] = dop.core.configureObject(value, property, object_proxy);
     }
 
diff --git a/src/protocol/_onunsubscribe.js b/src/protocol/_onunsubscribe.js
@@ -16,8 +16,17 @@ dop.protocol._onunsubscribe = function(node, request_id, request, response) {
                 if (roles.subscriber === 0)
                     object_data.nodes_total -= 1;
 
-                if (object_data.nodes_total === 0)
+                if (object_data.nodes_total === 0) {
+                    // Deleting object
                     delete dop.data.object[object_id];
+                    // Deleting reference of the object in the node instance
+                    for (var id in node.owner) {
+                        if (node.owner[id] === object_id) {
+                            delete node.owner[id];
+                            break;
+                        }
+                    }
+                }
                 
                 request.promise.resolve();
             }
diff --git a/src/protocol/onsubscribe.js b/src/protocol/onsubscribe.js
@@ -6,7 +6,7 @@ dop.protocol.onsubscribe = function(node, request_id, request) {
         var params = Array.prototype.slice.call(request, 1);
 
         dop.core.localProcedureCall(dop.data.onsubscribe, params, function resolve(value) {
-            if (dop.isObjectRegistrable(value)) {
+            if (dop.isPojoObject(value)) {
                 var object = dop.register(value),
                     object_root = dop.getObjectRoot(object),
                     object_path = dop.getObjectPath(object),
diff --git a/src/protocol/subscribe.js b/src/protocol/subscribe.js
@@ -4,7 +4,7 @@ dop.protocol.subscribe = function(node, params) {
     params.unshift(node, dop.protocol.instructions.subscribe);
     var request = dop.core.createRequest.apply(node, params);
     request.promise.into = function(object) {
-        if (dop.isObjectRegistrable(object))
+        if (dop.isPojoObject(object))
             request.into = (dop.isRegistered(object)) ? dop.getObjectProxy(object) : object;
         delete request.promise.into
         return request.promise;
diff --git a/src/util/clone.js b/src/util/clone.js
@@ -1,6 +1,6 @@
 
 dop.util.clone = function(value) {
-    return (dop.isObjectRegistrable(value)) ?
+    return (dop.isPojoObject(value)) ?
         dop.util.merge(isArray(value) ? [] : {}, value)
     :
         value;
diff --git a/test/protocol/unsubscribe.js b/test/protocol/unsubscribe.js
@@ -56,4 +56,26 @@ test('Client unsubscribe Server', function(t) {
 
     })
 
+})
+
+// https://github.com/DistributedObjectProtocol/dop/issues/4
+test('Subscribe Unsubscribe and Subscribe same object', function(t) {
+
+    var x = dopServer.register({ hi:'world' });
+    dopServer.onSubscribe(function(name){return x});
+
+    var a, b
+    client.subscribe().then(function(_) {
+        a = _
+        return client.unsubscribe(a)
+    }).then(function() {
+        return client.subscribe()
+    }).then(function (_) {
+        b = _
+        t.deepEqual(x, a, "x and a deepEqual")
+        t.deepEqual(a, b, "a and b deepEqual")
+        t.notEqual(x, a, "x and a notEqual")
+        t.notEqual(a, b, "a and b notEqual")
+        t.end()
+    })
 })
diff --git a/test/register.js b/test/register.js
@@ -1,10 +1,6 @@
 var test = require('tape');
 // require('tabe').createStream( test );
 var dop = require('./.proxy').create();
-var dopClient = dop.create();
-var dopClientTwo = dop.create();
-
-
 var objectTarget = {deep1:{deep2:{}}}
 var object = dop.register(objectTarget);
 
@@ -59,6 +55,28 @@ test('Correct configuration on deleted neested object', function(t) {
 });
 
 
+test('register({})', function(t) {
+    var o = dop.register({})
+    t.equal(typeof o, 'object')
+    t.end()
+})
+
+
+test('register(new Date)', function(t) {
+    var o = dop.register(new Date)
+    t.equal(typeof o, 'object')
+    t.end()
+})
+
+test('register([])', function(t) {
+    try {
+    var o = dop.register([])
+    } catch(e) {
+        t.equal(typeof e, 'object')
+        t.end()
+    }
+})
+
 // var object = dop.register({
 //     prop: "prop",
 //     subobject:{ value:1, valua:2, subsubobject:{val:3}},
diff --git a/test/zarrays.js b/test/zarrays.js
@@ -10,7 +10,7 @@ function gify(obj) {
     this.myClassProperty=123;
     return JSON.stringify(obj);
 }
-var isObjectRegistrable = dop.isObjectRegistrable;
+var isPojoObject = dop.isPojoObject;
 
 
 
@@ -34,7 +34,7 @@ test('Splice', function(t) {
 
         for (var index=0,total=register.length; index<total; ++index) {
             var item = register[index];
-            if (isObjectRegistrable(item)) {
+            if (isPojoObject(item)) {
 
                 if (dop.isRegistered(item)) {
                     var property = dop.getObjectProperty(item);
@@ -61,7 +61,7 @@ test('Shift', function(t) {
         t.deepEqual(original,register, 'deepEqual case: '+description);
         for (var index=0,total=register.length; index<total; ++index) {
             var item = register[index];
-            if (isObjectRegistrable(item)) {
+            if (isPojoObject(item)) {
 
                 if (dop.isRegistered(item)) {
                     var property = dop.getObjectProperty(item);
@@ -89,7 +89,7 @@ test('Pop', function(t) {
         t.deepEqual(original,register, 'deepEqual case: '+description);
         for (var index=0,total=register.length; index<total; ++index) {
             var item = register[index];
-            if (isObjectRegistrable(item)) {
+            if (isPojoObject(item)) {
 
                 if (dop.isRegistered(item)) {
                     var property = dop.getObjectProperty(item);
@@ -115,7 +115,7 @@ test('Push', function(t) {
         t.equal(gify(register.push.apply(register, paramsCase)), gify(original.push.apply(original, paramsCase)), 'output case: '+description);
         for (var index=0,total=register.length; index<total; ++index) {
             var item = register[index];
-            if (isObjectRegistrable(item)) {
+            if (isPojoObject(item)) {
 
                 if (dop.isRegistered(item)) {
                     var property = dop.getObjectProperty(item);
@@ -144,7 +144,7 @@ test('Unshift', function(t) {
 
         for (var index=0,total=register.length; index<total; ++index) {
             var item = register[index];
-            if (isObjectRegistrable(item)) {
+            if (isPojoObject(item)) {
 
                 if (dop.isRegistered(item)) {
                     var property = dop.getObjectProperty(item);
@@ -168,7 +168,7 @@ test('Reverse', function(t) {
     t.deepEqual(original,register, 'deepEqual case');
     for (var index=0,total=register.length; index<total; ++index) {
         var item = register[index];
-        if (isObjectRegistrable(item)) {
+        if (isPojoObject(item)) {
             dop.getObjectPath(item);
             if (dop.isRegistered(item)) {
                 var property = dop.getObjectProperty(item);
@@ -232,7 +232,7 @@ test('Sort', function(t) {
         t.deepEqual(arrayOriginal, copy, 'deepEqual function:'+compareFunction);
         for (var index=0,total=arrayOriginal.length; index<total; ++index) {
             var item = arrayOriginal[index];
-            if (isObjectRegistrable(item)) {
+            if (isPojoObject(item)) {
 
                 if (dop.isRegistered(item)) {
                     dop.getObjectPath(item);

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "dop",`
`3`		`- "version": "0.26.2",`
	`3`	`+ "version": "0.27.0",`
`4`	`4`	`"main": "./dist/dop.nodejs.js",`
`5`	`5`	`"browser": "./dist/dop.js",`
`6`	`6`	`"unpkg": "./dist/dop.min.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`
`2`	`2`	`dop.register = function(object) {`
`3`		`- dop.util.invariant(dop.isObjectRegistrable(object) && !isArray(object), 'dop.register needs a regular plain object as first parameter');`
	`3`	`+ dop.util.invariant(dop.isObjectRegistrable(object) && !isArray(object), 'dop.register needs an object or an array as first parameter');`
`4`	`4`	`return (dop.isRegistered(object)) ?`
`5`	`5`	`dop.getObjectProxy(object)`
`6`	`6`	`:`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ dop.core.configureObject = function(object, propertyParent, parent) {`
`74`	`74`	`else if (is_function && value._name==dop.cons.COMPUTED_FUNCTION)`
`75`	`75`	`object_target[property] = value(object_proxy, property, false, undefined);`
`76`	`76`	`// object or array`
`77`		`- else if (dop.isObjectRegistrable(value))`
	`77`	`+ else if (dop.isPojoObject(value))`
`78`	`78`	`object_target[property] = dop.core.configureObject(value, property, object_proxy);`
`79`	`79`	`}`
`80`	`80`