runner router

Author: sevenbitbyte

examples/test-service-node-host.js

@@ -1,9 +1,7 @@
 const Path = require('path')
 const debug = require('debug')('test.server-db')
 const Dataparty = require('../src')
-
-const BouncerServerModels = require('@dataparty/bouncer-model')
-const BouncerClientModels = require('@dataparty/bouncer-model/dist/bouncer-model.json')
+const dataparty_crypto = require('@dataparty/crypto')
 
 class ExampleService extends Dataparty.IService {
   constructor(opts){
@@ -19,6 +17,8 @@ class ExampleService extends Dataparty.IService {
     this.addEndpoint(Dataparty.endpoint_paths.secureecho)
     this.addEndpoint(Dataparty.endpoint_paths.identity)
     this.addEndpoint(Dataparty.endpoint_paths.version)
+
+    this.addSchema(Path.join(__dirname, './party/schema/basic_types.js'))
   }
 
 }
@@ -29,38 +29,53 @@ async function main(){
   //const uri = 'mongodb://localhost:27017/server-party-test'
   //debug('db location', uri)
 
-  const path = '/data/datparty/srv-party'
+  
+  const service = new ExampleService({ name: '@dataparty/example', version: '0.0.1' })
+  const build = await service.compile(Path.join(__dirname,'/dataparty'), true)
+  
+  const serviceName = build.package.name
+  const basePath = '/data/datparty/'
+  const servicePath = Path.join(basePath, serviceName.replace('/','-'))
+
+  let config = new Dataparty.Config.JsonFileConfig({ basePath: servicePath })
+  config.touchDir('/tingo')
 
+  const dbPath = Path.join(servicePath, '/tingo')
 
   let party = new Dataparty.TingoParty({
-    path,
-    model: BouncerClientModels,
-    serverModels: BouncerServerModels,
-    config: new Dataparty.Config.JsonFileConfig({basePath: '/data/datparty/'})
+    config,
+    path: dbPath,
+    model: build
   })
 
   party.topics = new Dataparty.LocalTopicHost()
 
-  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 live = new Dataparty.IService(build.package, build)
 
+  
   const runner = new Dataparty.ServiceRunnerNode({
-    party, service,
+    party,
+    prefix: '',
+    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,
+    runner: runnerRouter,
     trust_proxy: true,
     wsEnabled: true,
   })
 
-  await party.start()
-  await runner.start()
   await host.start()
 
   console.log('started')

src/bouncer/idb.js

@@ -24,7 +24,7 @@ module.exports = class IDb extends EventEmitter {
     for(const collectionName of this.factory.getValidators()){
       debug('creating collection', collectionName)
 
-      const indexSettings = reach(this.factory, 'model.IndexSettings.'+collectionName)
+      const indexSettings = reach(this.factory, 'model.schemas.IndexSettings.'+collectionName)
       await this.createCollection(collectionName, indexSettings)
     }
   }

src/config/json-file.js

@@ -1,6 +1,8 @@
 'use strict';
 
 const fs = require('fs')
+const Path = require('path')
+const mkdirp = require('mkdirp')
 const deepSet = require('deep-set')
 const reach = require('../utils/reach')
 const logger = require('debug')('dataparty.config.json-file');
@@ -12,7 +14,8 @@ const logger = require('debug')('dataparty.config.json-file');
 class JsonFileConfig {
 
   constructor(defaults={}){
-    this.path = reach(defaults, 'basePath') +'/config.json'
+    this.basePath = reach(defaults, 'basePath')
+    this.path = this.basePath +'/config.json'
     this.defaults = defaults || {}
     this.content = Object.assign({}, this.defaults)
   }
@@ -40,6 +43,7 @@ class JsonFileConfig {
   }
 
   async start () {
+    await this.touchDir('')
     await this.load()
     logger('started')
   }
@@ -72,6 +76,23 @@ class JsonFileConfig {
   async save(){
     fs.writeFileSync(this.path, JSON.stringify(this.content, null, 2))
   }
+
+  async touchDir (path) {
+    return new Promise((resolve, reject) => {
+      const basedPath = Path.join(this.basePath, path)
+      logger('touching', basedPath)
+      mkdirp(basedPath, (error) => {
+        if (error) {
+          logger(`failed to mkdirp '${basedPath}':`, error)
+          return reject(error)
+        }
+
+        logger('touched', basedPath)
+        // resolve to adjusted path on success
+        resolve(basedPath)
+      })
+    })
+  }
 }
 
 module.exports = JsonFileConfig

src/party/document-factory.js

@@ -2,6 +2,8 @@ const Ajv = require('ajv')
 const debug = require('debug')('dataparty.document-factory')
 const IDocument = require('./idocument')
 
+const reach = require('../utils/reach')
+
 const DocumentValidationError = require('../errors/document-validation-error')
 
 
@@ -18,7 +20,8 @@ class DocumentFactory {
     this.validators = {}
 
     if(this.model){
-      for(let schema of this.model.JSONSchema){
+
+      for(let schema of this.model.schemas.JSONSchema){
         const v = this.ajv.compile(schema)
         this.validators[schema.title] = v
         debug(schema.title)

src/party/iparty.js

@@ -140,7 +140,7 @@ class IParty {
    */
   get identity(){
     if (!this.hasIdentity()){ return undefined }
-    return this._identity.toJSON(false)
+    return dataparty_crypto.Identity.fromString(this._identity.toString())
   }
 
   get privateIdentity(){

src/service/index.js

@@ -6,6 +6,7 @@ module.exports = {
   IEndpoint: require('./iendpoint'),
   IMiddleware: require('./imiddleware'),
   ServiceHost: require('./service-host'),
+  RunnerRouter: require('./runner-router'),
   ServiceRunner: require('./service-runner'),
   ServiceRunnerNode: require('./service-runner-node'),
   EndpointRunner: require('./endpoint-runner'),

src/service/iservice.js

@@ -12,7 +12,7 @@ const debug = require('debug')('dataparty.service.IService')
 module.exports = class IService {
   constructor({
     name, version, githash='', branch=''
-  }){
+  }, build){
 
     this.constructors = {
       schemas: {},
@@ -79,6 +79,10 @@ module.exports = class IService {
       quiet: false, // default
       debugLog: false // default
     }
+
+    if(build){
+      this.importBuild(build)
+    }
    }
 
   importBuild(buildOutput){

src/service/runner-router.js

@@ -0,0 +1,69 @@
+const Debug = require('debug')
+const debug = Debug('dataparty.service.runner-router')
+
+class RunnerRouter {
+  constructor(defaultRunner){
+    debug('constructor')
+    this.defaultRunner = defaultRunner
+
+    debug('default runner - ', this.defaultRunner.party.identity)    
+
+    this.runnersByDomain = new Map()
+    this.runnersByHost = new Map()
+
+    this.started = false
+  }
+
+  async start(){
+
+    if(this.started){ return }
+
+    debug('start')
+
+    this.started = true
+
+    for(let runner of this.runnersByHost){
+      await runner.start()
+    }
+  }
+
+  getRunnerByDomain(domain){
+    debug('getRunnerByDomain -', domain)
+    const runner = this.runnersByDomain.get(domain)
+    if(!runner){
+      return this.defaultRunner
+    }
+  }
+
+  getRunnerByHostIdentity(identity){
+    const partyId = identity.toString()
+    debug('getRunnerByHostIdentity -', partyId)
+    const runner = this.runnersByHost.get(partyId)
+    
+    return runner
+  }
+
+  addRunner({domain, runner}){
+
+    const partyId = runner.party.identity.toString()
+    debug('addRunner - ', partyId, domain)
+
+    if(!this.runnersByHost.has(party)){
+      this.runnersByHost.set(partyId, runner)
+    }
+
+    
+    if(domain && !this.runnersByDomain.has(party)){
+      this.runnersByDomain.set(domain, runner)
+    }
+  }
+
+
+  onRequest(req, res){
+    const runner = this.getRunnerByDomain(req.hostname)
+
+    return runner.onRequest.bind(runner)(req,res)
+  }
+}
+
+module.exports = RunnerRouter

src/service/service-host-websocket.js

@@ -100,11 +100,15 @@ class ServiceHostWebsocket{
 
     debug('creating peer party')
 
+    
+    let hostRunner = this.runner.party ? this.runner : this.runner.getRunnerByDomain(req.hostname)
+    let hostParty = hostRunner.party
+
     let peer = new PeerParty({
-      hostParty: this.runner.party,
-      hostRunner: this.runner,
-      model: this.runner.party.factory.model,
-      config: this.runner.party.config,
+      hostParty,
+      hostRunner,
+      model: hostParty.factory.model,
+      config: hostParty.config,
       comms: new Comms.WebsocketComms({
         host: true,
         connection: conn,

src/service/service-runner-node.js

@@ -10,7 +10,7 @@ const Router = require('origin-router').Router
 const Runner = require('@dataparty/tasker').Runner
 
 class ServiceRunnerNode {
-  constructor({service, party, sendFullErrors=false, useNative=true}){
+  constructor({service, party, sendFullErrors=false, useNative=true, prefix='', router=new Router()}){
     this.party = party
     this.service = service
     this.sendFullErrors = sendFullErrors
@@ -20,7 +20,8 @@ class ServiceRunnerNode {
     this.endpoint = {}
     this.tasks = {}
 
-    this.router = new Router()
+    this.prefix=prefix
+    this.router = router
     this.taskRunner = new Runner()
   }
 
@@ -143,9 +144,11 @@ class ServiceRunnerNode {
 
     this.endpoint[name] = endpoint
 
-    this.router.add(name, name, this.endpointHandler(endpoint))
+    const routablePath = Path.join(this.prefix, Path.normalize(name))
+
+    this.router.add(name, routablePath, this.endpointHandler(endpoint))
     dt.end()
-    debug('loaded endpoint',name,'in',dt.deltaMs,'ms')
+    debug('loaded endpoint', routablePath,'in',dt.deltaMs,'ms')
   }
 
 
@@ -230,12 +233,11 @@ class ServiceRunnerNode {
   }
 
   async onRequest(req, res){
-    debug('onRequest')
+    debug('onRequest', req)
 
     debug('req', req.method, req.hostname,'-', req.url, req.ips, req.body)
 
 
-
     let route = await this.router.route(req, res)
 
     debug('req done')