Calling remote function from caller

Author: Josema

src/api/isRemoteFunction.js

@@ -0,0 +1,4 @@
+
+dop.isRemoteFunction = function(fun) {
+    return (isFunction(fun) && fun.name===dop.cons.REMOTE_FUNCTION);
+};

src/dop.js

@@ -26,7 +26,8 @@ var dop = {
         DOP: '~DOP',
         // CONNECT: '~CONNECT',
         SEND: '~SEND',
-        DISCONNECT: '~DISCONNECT'
+        DISCONNECT: '~DISCONNECT',
+        REMOTE_FUNCTION: '$DOP_REMOTE_FUNCTION',
     }
 
 };

src/protocol/_onsubscribe.js

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

src/protocol/call.js

@@ -29,18 +29,23 @@ dop.protocol.oncall = function(node, request_id, request) {
     if (isObject(object_data) && isObject(object_data.node[node.token]) && object_data.node[node.token].subscriber) {
         var f = dop.util.get(object_data.object, path);
         if (isFunction(f)) {
-            dop.core.localProcedureCall(f, params, function(value) {
+            function resolve(value) {
                 var response = dop.core.createResponse(request_id, 0);
                 if (value !== undefined)
                     response.push(value);
                 dop.core.storeSendMessages(node, response);
                 return value;
-            }, function(err){
+            }
+            function reject(err){
                 dop.core.storeSendMessages(node, dop.core.createResponse(request_id, err));
-            }, function(req) {
-                req.node = node;
-                return req;
-            });
+            }
+            (dop.isRemoteFunction(f)) ?
+                f.apply(null, params).then(resolve).catch(reject)
+            :
+                dop.core.localProcedureCall(f, params, resolve, reject, function(req) {
+                    req.node = node;
+                    return req;
+                });
         }
     }
 };