bug fixes

Author: sevenbitbyte

examples/test-service-node-host.js

@@ -55,27 +55,27 @@ async function main(){
 
   const runner = new Dataparty.ServiceRunnerNode({
     party,
-    prefix: '',
+    //prefix: 'foo',
     service: live,
     sendFullErrors: false,
     useNative: false
   })
-  
-  await party.start()
-  await runner.start()
-
 
+  
+  
+  
   const runnerRouter = new Dataparty.RunnerRouter(runner)
 
-  //const srvRouter = new ServiceRouter()
-  //srvRouter.addRunner(domain, prefix, runner)
-
+  
   const host = new Dataparty.ServiceHost({
     runner: runnerRouter,
     trust_proxy: true,
     wsEnabled: true,
   })
-
+  
+  debug(runner.party.identity)
+  await party.start()
+  await runnerRouter.start()
   await host.start()
 
   console.log('started')

src/service/endpoints/service-identity.js

@@ -43,8 +43,6 @@ module.exports = class ServiceIdentity extends IEndpoint {
 
     const identity = ctx.party.identity
 
-    return {
-      ...identity
-    }
+    return identity.toJSON()
   }
 }

src/service/runner-router.js

@@ -12,18 +12,21 @@ class RunnerRouter {
     this.runnersByHost = new Map()
 
     this.started = false
-  }
 
+  }
+  
   async start(){
-
+    
     if(this.started){ return }
-
+    
     debug('start')
-
+    
     this.started = true
+    
+    this.addRunner({runner: this.defaultRunner})
 
     for(let runner of this.runnersByHost){
-      await runner.start()
+      await runner[1].start()
     }
   }
 
@@ -48,12 +51,12 @@ class RunnerRouter {
     const partyId = runner.party.identity.toString()
     debug('addRunner - ', partyId, domain)
 
-    if(!this.runnersByHost.has(party)){
+    if(!this.runnersByHost.has(partyId)){
       this.runnersByHost.set(partyId, runner)
     }
 
 
-    if(domain && !this.runnersByDomain.has(party)){
+    if(domain && !this.runnersByDomain.has(domain)){
       this.runnersByDomain.set(domain, runner)
     }
   }

src/service/service-host.js

@@ -59,10 +59,16 @@ class ServiceHost {
       })
     }
 
+    this.started = false
+
   }
 
   async start(){
 
+    if(this.started){return}
+
+    this.started = true
+
     debug('starting server', this.apiServerUri.toString())
 
     if(this.apiServer==null){

src/service/service-runner-node.js

@@ -23,12 +23,17 @@ class ServiceRunnerNode {
     this.prefix=prefix
     this.router = router
     this.taskRunner = new Runner()
+
+    this.started = false
   }
 
   async start(){
 
+    if(this.started){return}
     debug('starting tasks')
 
+    this.started = true
+
     const taskMap = Hoek.reach(this.service, 'compiled.tasks')
     //const endpointsLoading = []
     for(let name in taskMap){

src/service/service-runner.js

@@ -23,9 +23,14 @@ class ServiceRunner {
 
     this.prefix = prefix
     this.router = router
+    this.started = false
   }
 
   async start(){
+
+    if(this.started){return}
+
+    this.started = true
     debug('starting endpoints')
 
     const eps = Hoek.reach(this.service, 'compiled.endpoints')