oncall done

Author: Josema

src/core/objects/mergeSubscription.js

@@ -3,14 +3,15 @@ dop.core.mergeSubscription = function(object, object_remote) {
         object_remote,
         null,
         object,
-        dop.core.mergeSubscriptionMutator
+        dop.util.mergeMutator
+        // dop.core.mergeSubscriptionMutator
     )
 }
 
-dop.core.mergeSubscriptionMutator = function(destiny, prop, value, tof_value) {
-    if (tof_value == 'object' || tof_value == 'array')
-        !destiny.hasOwnProperty(prop)
-            ? (destiny[prop] = tof_value == 'array' ? [] : {})
-            : destiny[prop]
-    else destiny[prop] = value
-}
+// dop.core.mergeSubscriptionMutator = function(destiny, prop, value, tof_value) {
+//     if (tof_value == 'object' || tof_value == 'array')
+//         !destiny.hasOwnProperty(prop)
+//             ? (destiny[prop] = tof_value == 'array' ? [] : {})
+//             : destiny[prop]
+//     else destiny[prop] = value
+// }

src/protocol/oncall.js

@@ -1,5 +1,6 @@
-dop.protocol.oncall = function(node, request_id, request, object_id) {
-    var path = request[2],
+dop.protocol.oncall = function(node, request_id, request) {
+    var object_id = request[1],
+        path = request[2],
         params = request[3],
         subscriber = node.subscriber[object_id]
 

test/ES6/.connect.js

@@ -0,0 +1,34 @@
+const dop = require('../.proxy')
+const transportName = process.argv[2] || 'local'
+const transportListen = require('dop-transports').listen[transportName]
+const transportConnect = require('dop-transports').connect[transportName]
+
+function connect(t, end = true) {
+    return new Promise((response, reject) => {
+        const dopServer = dop.create()
+        const dopClient = dop.create()
+        dopServer.env = 'SERVER'
+        dopClient.env = 'CLIENT1'
+        const transportServer = dopServer.listen({ transport: transportListen })
+        const transportClient = dopClient.connect({
+            transport: transportConnect
+        })
+        transportClient.on('connect', async nodeClient => {
+            const close = () => {
+                nodeClient.disconnect()
+                transportServer.socket.close()
+                if (end) t.end()
+            }
+            response({
+                dopServer,
+                dopClient,
+                transportServer,
+                transportClient,
+                nodeClient,
+                close
+            })
+        })
+    })
+}
+
+module.exports = { connect }

test/ES6/call.js

@@ -1,21 +1,7 @@
-var test = require('tape')
-var dopServer = require('../.proxy').create()
-var dopClient = require('../.proxy').create()
-var transportName = process.argv[2] || 'local'
-var transportListen = require('dop-transports').listen[transportName]
-var transportConnect = require('dop-transports').connect[transportName]
-dopServer.env = 'SERVER'
-dopClient.env = 'CLIENT'
+const test = require('tape')
+const { connect } = require('../ES6/.connect.js')
 
-// this code would be in node.js
-var server = dopServer.listen({ transport: transportListen })
-// this code would be in browser
-var client = dopClient.connect({
-    transport: transportConnect,
-    listener: server
-})
-
-var localFunctions = dopServer.register({
+const localFunctions = {
     okSync: function(req) {
         return 'Ok'
     },
@@ -116,16 +102,18 @@ var localFunctions = dopServer.register({
             resolve(Promise.reject('Error'))
         })
     }
-})
+}
 
-// server
-dopServer.onSubscribe(function() {
-    return localFunctions
-})
-
-var remoteFunctions
+let remoteFunctions
+let closeServer
 test('Matching same values', async function(t) {
-    remoteFunctions = await client.subscribe()
+    const { dopServer, nodeClient, close } = await connect(
+        t,
+        false
+    )
+    closeServer = close
+    dopServer.onSubscribe(() => localFunctions)
+    remoteFunctions = await nodeClient.subscribe()
     t.deepEqual(Object.keys(remoteFunctions), Object.keys(localFunctions))
     t.end()
 })
@@ -285,5 +273,5 @@ test('Promise.reject', async function(t) {
     }
 
     t.end()
-    server.listener.close()
+    closeServer()
 })

test/ES6/subscribe.js

@@ -1,42 +1,12 @@
-var test = require('tape')
-var dop = require('../.proxy')
-var transportName = process.argv[2] || 'local'
-var transportListen = require('dop-transports').listen[transportName]
-var transportConnect = require('dop-transports').connect[transportName]
-
-function connect(t) {
-    return new Promise((response, reject) => {
-        const dopServer = dop.create()
-        const dopClient = dop.create()
-        dopServer.env = 'SERVER'
-        dopClient.env = 'CLIENT1'
-        const transportServer = dopServer.listen({ transport: transportListen })
-        const transportClient = dopClient.connect({
-            transport: transportConnect
-        })
-        transportClient.on('connect', async nodeClient => {
-            const close = () => {
-                nodeClient.disconnect()
-                transportServer.socket.close()
-                t.end()
-            }
-            response({
-                dopServer,
-                dopClient,
-                transportServer,
-                transportClient,
-                nodeClient,
-                close
-            })
-        })
-    })
-}
+const test = require('tape')
+const dop = require('../.proxy')
+const { connect } = require('../ES6/.connect.js')
 
 test('basic', async t => {
     const { dopServer, nodeClient, close } = await connect(t)
     const objectServer = dopServer.register({ hello: 'world' })
     dopServer.onSubscribe(() => objectServer)
-    const objectClient = await nodeClient.subscribe().into({})
+    const objectClient = await nodeClient.subscribe()
     t.deepEqual(objectServer, objectClient)
     close()
 })
@@ -112,12 +82,12 @@ test('into() client and server deep object', async t => {
 
 test('observe mutations after subscription', async t => {
     const { dopServer, dopClient, nodeClient, close } = await connect(t)
-    const objectServer = { hello: 'world' }
+    const objectServer = { hello: 'world', second: 'arg' }
     const objectClient = dopClient.register({})
     dopServer.onSubscribe(() => objectServer)
     dopClient
         .createObserver(mutations => {
-            t.equal(mutations.length, 1)
+            t.equal(mutations.length, 2)
             t.deepEqual(objectServer, objectClient)
             close()
         })