match maker works on venue and client can connect to websocket now

Author: nullagent

src/party/peer/match-maker-client.js

@@ -9,7 +9,7 @@ const WebsocketComms = require('../../comms/websocket-comms')
 const PeerInvite = require('./peer-invite')
 
 class MatchMakerClient extends EventEmitter {
-  constructor(identity, contacts, urlOrParty = 'https://postquantum.one/api/', wsUrlOrParty = 'https://postquantum.one/api/ws'){
+  constructor(identity, contacts, urlOrParty = 'https://postquantum.one/api/', wsUrlOrParty = 'https://postquantum.one/ws'){
 
     super()
 
@@ -97,7 +97,7 @@ class MatchMakerClient extends EventEmitter {
       debug('waiting for websocket authorization')
       await this.wsParty.comms.authorized()
 
-      this.invitesRx = this.wsParty.ROSLIB.Topic({
+      this.invitesRx = new this.wsParty.ROSLIB.Topic({
         ros : this.wsParty.comms.ros,
         name : '/invites/' + encodeURIComponent(this.restParty.identity.key.hash) + '/rx',
         messageType: 'Object'
@@ -106,7 +106,7 @@ class MatchMakerClient extends EventEmitter {
       this.invitesRx.subscribe( this.handleInviteRxMsg.bind(this) )
 
 
-      this.invitesTx = this.wsParty.ROSLIB.Topic({
+      this.invitesTx = new this.wsParty.ROSLIB.Topic({
         ros : this.wsParty.comms.ros,
         name : '/invites/' + encodeURIComponent(this.restParty.identity.key.hash) + '/tx',
         messageType: 'Object'

src/service/runner-router.js

@@ -56,8 +56,11 @@ class RunnerRouter {
     debug('getRunnerByDomain -', domain)
     const runner = this.runnersByDomain.get(domain)
     if(!runner){
+      debug('\t', 'failed to locate domain runner, using default')
       return this.defaultRunner
     }
+
+    return runner
   }
 
   /**
@@ -84,11 +87,13 @@ class RunnerRouter {
     debug('addRunner - ', partyId, domain)
 
     if(!this.runnersByHost.has(partyId)){
+      debug('adding to runnersByHost')
       this.runnersByHost.set(partyId, runner)
     }
 
 
     if(domain && !this.runnersByDomain.has(domain)){
+      debug('adding to runnersByDomain map')
       this.runnersByDomain.set(domain, runner)
     }
   }

src/service/service-host-websocket.js

@@ -102,7 +102,7 @@ class ServiceHostWebsocket{
     debug('creating peer party')
 
 
-    let hostRunner = this.runner.party ? this.runner : this.runner.getRunnerByDomain(req.hostname)
+    let hostRunner = this.runner.party ? this.runner : this.runner.getRunnerByDomain(req.headers.host)
     let hostParty = hostRunner.party
 
     let peer = new PeerParty({

src/venue/venue-host.js

@@ -9,6 +9,46 @@ const VenueServiceSchema = require('./dataparty/@dataparty-venue.dataparty-schem
 const VenueSrv = require('./dataparty/@dataparty-venue.dataparty-service.json')
 
 
+async function loadService(runnerRouter, settings, serviceFilePath){
+
+  debug('addService', settings, serviceFilePath)
+
+  const { enabled, workspace, domain, prefix, sendFullErrors, useNative, defaultConfig } = settings
+
+  if(!enabled){ return }
+
+  const serviceFile = JSON.parse( fs.readFileSync( serviceFilePath ) )
+
+  let party = new Dataparty.TingoParty({
+    path: workspace+'/db',
+    model: serviceFile.schemas,
+    config: new Dataparty.Config.JsonFileConfig({basePath: workspace+'/config', ...defaultConfig}),
+    noCache: false
+  })
+  
+  party.topics = new Dataparty.LocalTopicHost()
+  
+  const service = new Dataparty.IService(serviceFile.package, serviceFile)
+
+  debug('loaded service')
+
+  debug('party db location', workspace)
+
+  let runner = new Dataparty.ServiceRunnerNode({
+    party, service,
+    sendFullErrors,
+    useNative,
+    prefix
+  })
+
+  await party.start()
+  await runner.start()
+  
+  await runnerRouter.addRunner({domain, runner})
+
+}
+
+
 async function main(){
 
   const path = '/data/dataparty/venue-service'
@@ -86,9 +126,20 @@ async function main(){
 
   debug('started')
   console.log('partying')
+
+  await loadService(runnerRouter, {
+    enabled: true,
+    domain: 'postquantum.one',
+    prefix: 'api',
+    workspace: '/data/dataparty/match-maker-service',
+    sendFullErrors: true,
+    useNative: false
+
+  }, '/home/ubuntu/match-maker/dataparty/@datapartyjs-match-maker.dataparty-service.json')
 }
 
 
+
 main().catch(err=>{
   console.error(err)
 })