peer service

Author: sevenbitbyte

examples/test-peer-party-service.js

@@ -0,0 +1,141 @@
+const debug = require('debug')('test.peer-party-service')
+const WRTC = require('wrtc')
+const Path = require('path')
+const BouncerModel = require('@dataparty/bouncer-model/dist/bouncer-model.json')
+const Dataparty = require('../src')
+
+const BouncerServerModels = require('@dataparty/bouncer-model')
+
+class ExampleService extends Dataparty.IService {
+  constructor(opts){
+    super(opts)
+
+    this.addMiddleware(Dataparty.middleware_paths.pre.decrypt)
+    this.addMiddleware(Dataparty.middleware_paths.pre.validate)
+
+    this.addMiddleware(Dataparty.middleware_paths.post.validate)
+    this.addMiddleware(Dataparty.middleware_paths.post.encrypt)
+
+    this.addEndpoint(Dataparty.endpoint_paths.echo)
+    this.addEndpoint(Dataparty.endpoint_paths.secureecho)
+    this.addEndpoint(Dataparty.endpoint_paths.identity)
+    this.addEndpoint(Dataparty.endpoint_paths.version)
+  }
+
+}
+
+async function main(){
+  const dbPath = '/tmp/local-peer-party-service'
+
+  debug('db location', dbPath)
+
+  let hostLocal = new Dataparty.TingoParty({
+    path: dbPath,
+    model: BouncerModel,
+    serverModels: BouncerServerModels,
+    config: new Dataparty.Config.JsonFileConfig({basePath: dbPath})
+  })
+
+  const service = new ExampleService({ name: '@dataparty/example', version: '0.0.1' })
+
+  const build = await service.compile(Path.join(__dirname,'/dataparty'), true)
+
+  debug('built', Object.keys(build))
+
+  const runner = new Dataparty.ServiceRunnerNode({
+    party: hostLocal, service,
+    sendFullErrors: false
+  })
+
+  /*let hostLocal = new Dataparty.LokiParty({
+    path: dbPath,
+    model: BouncerModel,
+    config: new Dataparty.Config.MemoryConfig()
+  })*/
+
+  let peer1 = new Dataparty.PeerParty({
+    comms: new Dataparty.Comms.RTCSocketComms({
+      host: true,
+      wrtc: WRTC,
+      trickle: true,
+      discoverRemoteIdentity: true
+    }),
+    hostParty: hostLocal,
+    hostRunner: runner,
+    model: BouncerModel,
+    config: new Dataparty.Config.MemoryConfig()
+  })
+
+
+  let peer2 = new Dataparty.PeerParty({
+    comms: new Dataparty.Comms.RTCSocketComms({
+      wrtc: WRTC,
+      trickle: true,
+      session: 'foobar'
+    }),
+    model: BouncerModel,
+    config: new Dataparty.Config.MemoryConfig()
+  })
+
+
+
+  await peer1.loadIdentity()
+  await peer2.loadIdentity()
+
+  //peer1.comms.remoteIdentity = peer2.identity
+  peer2.comms.remoteIdentity = peer1.identity
+
+  await peer1.start()
+  await runner.start()
+
+  await peer2.start()
+
+  peer1.comms.socket.on('signal', data=>{
+    debug('p1 >> p2', data)
+    peer2.comms.socket.signal(data)
+  })
+
+  peer2.comms.socket.on('signal', data=>{
+    debug('p1 << p2', data)
+    peer1.comms.socket.signal(data)
+  })
+
+  debug('waiting for auth')
+  await Promise.all([
+    peer1.comms.authorized(),
+    peer2.comms.authorized()
+  ])
+  
+  debug('authed')
+
+  const remoteVersion = await peer2.comms.call('version')
+  const remoteId = await peer2.comms.call('identity')
+
+  
+
+  let user = (await peer2.find()
+    .type('user')
+    .where('name').equals('tester')
+    .exec())[0]
+
+  
+  if(!user){
+    debug('creating document')
+    user = await peer2.createDocument('user', {name: 'tester', created: (new Date()).toISOString() })
+  }
+  else{
+    debug('loaded document')
+  }
+
+
+  console.log(remoteId)
+  console.log(remoteVersion)
+  
+  console.log(user.data)
+  process.exit()
+}
+
+
+main().catch(err=>{
+  console.error(err)
+})

src/comms/peer-comms.js

@@ -1,5 +1,6 @@
 const debug = require('debug')('dataparty.comms.peercomms')
 
+const HttpMocks = require('node-mocks-http')
 
 const SocketOp = require('./op/socket-op')
 const SocketComms = require('./socket-comms')
@@ -200,7 +201,9 @@ class PeerComms extends SocketComms {
 
     debug('running peer-call endpoint =', path, data)
 
-    return await callOp.run()
+    const reply = await callOp.run()
+
+    return reply.result
   }
 
   async start(){
@@ -275,11 +278,58 @@ class PeerComms extends SocketComms {
   }
 
   async handleCallOp(op){
-    debug('peer-call')
-    if(op.input.endpoint == 'api-v2-peer-bouncer'){
+    debug('peer-call', op.input.endpoint)
+
+    if(this.party.hostRunner){
+
+      debug('calling runner')
+
+      if(op.input.endpoint == 'api-v2-peer-bouncer'){
+        debug('ask->',op.input.data)
+        op.result = {result: await this.party.handleCall(op.input.data) }
+
+        op.setState(HostOp.STATES.Finished_Success)
+        return
+      }
+
+      const req = HttpMocks.createRequest({
+        method: 'GET',
+        url: '/'+op.input.endpoint,
+        body: (op.input.data) ? JSON.parse(op.msg.toString()) : undefined
+      })
+
+      const res = HttpMocks.createResponse()
+
+      debug('\tthe request', req)
+
+      debug('req ip type', typeof req.ip)
+
+      const route = this.party.hostRunner.router.get(op.input.endpoint)
+
+      debug('route',route)
+
+      debug('call route', await route._events.route({
+        method: req.method,
+        pathname: req.url,
+        request: req,
+        response: res
+      }))
+
+      //debug('route via runner router')
+
+      //await this.party.hostRunner.onRequest(req, res)
+
+      op.result = {result: res._getData() }
+
+      debug('got result', op.result)
+
+      op.setState(HostOp.STATES.Finished_Success)
+      return
+
+    } else if(op.input.endpoint == 'api-v2-peer-bouncer'){
 
       debug('ask->',op.input.data)
-      op.result = await this.party.handleCall(op.input.data)
+      op.result = {result: await this.party.handleCall(op.input.data) }
 
       op.setState(HostOp.STATES.Finished_Success)
 

src/party/peer/peer-party.js

@@ -12,7 +12,7 @@ const IParty = require('../iparty')
  */
 class PeerParty extends IParty {
 
-  constructor ({comms, hostParty, qbOptions={debounce: 10, find_dedup:true, timeout: 10000}, ...options}) {
+  constructor ({comms, hostParty, hostRunner, qbOptions={debounce: 10, find_dedup:true, timeout: 10000}, ...options}) {
     super(options)
 
     this.comms = comms
@@ -26,9 +26,11 @@ class PeerParty extends IParty {
     })
 
     this.hostParty = null
+    this.hostRunner = null
 
     if(this.comms.host){
       this.hostParty = hostParty
+      this.hostRunner = hostRunner
     }
   }
 

src/service/service-runner-node.js

@@ -144,7 +144,7 @@ class ServiceRunnerNode {
 
     this.endpoint[name] = endpoint
 
-    this.router.add(name, this.endpointHandler(endpoint))
+    this.router.add(name, name, this.endpointHandler(endpoint))
     dt.end()
     debug('loaded endpoint',name,'in',dt.deltaMs,'ms')
   }
@@ -233,7 +233,7 @@ class ServiceRunnerNode {
   async onRequest(req, res){
     debug('onRequest')
 
-    debug('req', req.method, req.hostname, req.url, req.ips, req.body)
+    debug('req', req.method, req.hostname,'-', req.url, req.ips, req.body)