service host endpoints working now

sevenbitbyte · sevenbitbyte · commit d19de760f164 · 2020-06-16T18:25:11.000-07:00
diff --git a/package.json b/package.json
@@ -40,6 +40,7 @@
     "nconf": "^0.10.0",
     "node-persist": "^3.0.1",
     "nodemon-webpack-plugin": "^3.0.1",
+    "origin-router": "^1.6.4",
     "parse-url": "^5.0.1",
     "prompt": "^1.0.0",
     "roslib": "^0.20.0",
diff --git a/src/sandbox/endpoint-info-sandbox.js b/src/sandbox/endpoint-info-sandbox.js
@@ -1,4 +1,4 @@
-//const debug = require('debug')('dataparty.EndpointInfoSandbox')
+const debug = require('debug')('dataparty.EndpointInfoSandbox')
 const Sandbox = require('./sandbox')
 
 class EndpointInfoSandbox extends Sandbox {
@@ -20,7 +20,6 @@ module.exports = async ()=>{
 
     return {
       Name: Lib.Name,
-      Type: Lib.Type,
       Description: Lib.Description,
       MiddlewareConfig: Lib.MiddlewareConfig
     }
@@ -42,6 +41,7 @@ module.exports = async ()=>{
 
   async run(){
 
+    debug('running')
 
     this.info = await super.run()
 
diff --git a/src/sandbox/middleware-exec-sandbox.js b/src/sandbox/middleware-exec-sandbox.js
@@ -1,4 +1,4 @@
-//const debug = require('debug')('dataparty.MiddlewareExecSandbox')
+const debug = require('debug')('dataparty.MiddlewareExecSandbox')
 const Sandbox = require('./sandbox')
 
 class MiddlewareExecSandbox extends Sandbox {
@@ -35,8 +35,9 @@ module.exports = async (ctx, static_ctx)=>{
     this.result = null
   }
 
-  async run({ctx, static_ctx, party}){
+  async run(ctx, static_ctx){
 
+    debug('running', ctx)
 
     this.result = await super.run(ctx, static_ctx)
 
diff --git a/src/sandbox/middleware-info-sandbox.js b/src/sandbox/middleware-info-sandbox.js
@@ -1,4 +1,4 @@
-//const debug = require('debug')('dataparty.MiddlewareInfoSandbox')
+const debug = require('debug')('dataparty.MiddlewareInfoSandbox')
 const Sandbox = require('./sandbox')
 
 class MiddlewareInfoSandbox extends Sandbox {
@@ -42,7 +42,7 @@ module.exports = async ()=>{
 
   async run(){
 
-
+    debug('running', this.code)
     this.info = await super.run()
 
     return this.info
diff --git a/src/sandbox/sandbox.js b/src/sandbox/sandbox.js
@@ -5,7 +5,7 @@ const SandboxError = require('./sandbox-error')
 
 class Sandbox {
   constructor(code){
-    debug('compiling code')
+    debug('compiling code', typeof code)
     this.code = code
     this.script = new VMScript(code)
     debug('compiled')  
diff --git a/src/service/endpoint-context.js b/src/service/endpoint-context.js
@@ -8,16 +8,16 @@ class EndpointContext {
 
     this.req = req
     this.res = res
-    this.actor = actor
+    this.actor = null
     this.stats = {
       start: Date.now(),
       bytes_in: !req ? null : JSON.stringify(req.body).length
     }
-    this.oauth_cloud = oauth_cloud
-    this.session = session
-    this.identity = identity
-    this.input = input
-    this.input_session_id = input_session_id
+    this.oauth_cloud = null
+    this.session = null
+    this.identity = null
+    this.input = null
+    this.input_session_id = null
     this._debug = Debug('dataparty.context.undefined')
     this._debugContent = []
   }
@@ -40,7 +40,9 @@ class EndpointContext {
   setActor(actor){ this.actor = actor }
   setInputSession(input_session_id){ this.input_session_id = input_session_id }
 
-  applyMiddleware
+  /*async applyMiddleware(){
+    
+  }*/
 
   debug(msg, ...args){
     let line = ((new Error().stack).split('at ')[2]).trim()
diff --git a/src/service/endpoints/service-identity.js b/src/service/endpoints/service-identity.js
@@ -1,47 +1,36 @@
 const Joi = require('@hapi/joi')
 const Hoek = require('@hapi/hoek')
 const {Message, Routines} = require('@dataparty/crypto')
-const debug = require('debug')('roshub.middleware.pre.decrypt')
+const debug = require('debug')('roshub.endpoint.identity')
 
-const IMiddleware = require('../../imiddleware')
+const IEndpoint = require('../iendpoint')
 
-module.exports = class Decrypt extends IMiddleware {
+module.exports = class ServiceIdentity extends IEndpoint {
 
   static get Name(){
-    return 'decrypt'
+    return 'identity'
   }
 
-  static get Type(){
-    return 'pre'
-  }
 
   static get Description(){
-    return 'Decrypt inbound data'
+    return 'Get host identity'
   }
 
-  static get ConfigSchema(){
-    return Joi.boolean()
+  static get MiddlewareConfig(){
+    return {
+      pre: {
+        decrpyt: false
+      }
+    }
   }
 
   static async run(ctx, static_ctx){
 
-    if (!Hoek.reach(ctx, 'endpoint.MiddlewareConfig.pre.decrypt', false)){
-      return
-    }
   
-
-    const msg = new Message(ctx.input)
-    const jsonContent = await msg.decrpyt(this.serviceParty.privateIdentity)
-    const publicKeys = Routines.extractPublicKeys(msg.enc)
-
-    ctx.setInputSession(jsonContent.session)
+    const identity = ctx.party.identity
 
     return {
-      input: Hoek.reach(content, 'data'),
-      sender: {
-        type: 'ecdsa',
-        public: publicKeys
-      }
+      ...identity
     }
   }
 }
diff --git a/src/service/index.js b/src/service/index.js
@@ -7,6 +7,10 @@ module.exports = {
   IEndpoint: require('./iendpoint'),
   IMiddleware: require('./imiddleware'),
   ServiceHost: require('./service-host'),
+  ServiceRunner: require('./service-runner'),
+  EndpointRunner: require('./endpoint-runner'),
+  EndpointContext: require('./endpoint-context'),
+  MiddlewareRunner: require('./middleware-runner'),
   middleware: {
     pre: {
       decrypt: require('./middleware/pre/decrypt')
@@ -16,5 +20,11 @@ module.exports = {
     pre: {
       decrypt: Path.join(__dirname, './middleware/pre/decrypt.js')
     }
+  },
+  endpoint: {
+    identity: require('./endpoints/service-identity')
+  },
+  endpoint_paths: {
+    identity: Path.join(__dirname, './endpoints/service-identity.js')
   }
 }
diff --git a/src/service/iservice.js b/src/service/iservice.js
@@ -80,6 +80,7 @@ module.exports = class IService {
   }
 
   addEndpoint(endpoint_path){
+    debug('andEndpoint', endpoint_path)
     const endpoint = require(endpoint_path)
     const name = endpoint.Name
 
diff --git a/src/service/middleware/pre/decrypt.js b/src/service/middleware/pre/decrypt.js
@@ -11,12 +11,16 @@ module.exports = class Decrypt extends IMiddleware {
     return 'decrypt'
   }
 
+  static get Type(){
+    return 'pre'
+  }
+
   static get Description(){
     return 'Decrypt inbound data'
   }
 
-  static get MiddlewareConfig(){
-    throw new Error('not implemented')
+  static get ConfigSchema(){
+    return Joi.boolean()
   }
 
   static async start(party){
diff --git a/src/service/service-runner.js b/src/service/service-runner.js
@@ -1,56 +1,12 @@
+const Joi = require('@hapi/joi')
 const Hoek = require('@hapi/hoek')
 const {VM, VMScript} = require('vm2')
 const debug = require('debug')('dataparty.server-runner')
+const MiddlewareRunner = require('./middleware-runner')
+const EndpointContext = require('./endpoint-context')
+const EndpointRunner = require('./endpoint-runner')
 
-class Runner {
-  constructor({info, exec, start}){
-    this.sandboxes = {
-      info, exec, start
-    }
-  }
-
-  get info(){
-    return Hoek.reach(this.sandboxes, 'info.info')
-  }
-
-  async getInfo(){
-    if(!this.sandboxes.info.info){
-      await this.sandboxes.info.run()
-    }
-
-    return this.sandboxes.info.info
-  }
-
-  async start(serviceContext){
-    return await this.sandboxes.start.run(serviceContext)
-  }
-
-  async run(context){
-    return await this.sandboxes.exec.run(context)
-  }
-}
-
-class MiddlewareRunner extends Runner {
-  constructor(code){
-    super({
-      info: new MiddlewareInfoSandbox(code),
-      exec: new MiddlewareExecSandbox(code),
-      start: new MiddlewareExecSandbox(code,'start')
-    })
-  }
-}
-
-class EndpointRunner extends Runner {
-  constructor(code){
-    super({
-      info: new EndpointInfoSandbox(code),
-      exec: new MiddlewareExecSandbox(code),
-      start: new MiddlewareExecSandbox(code,'start')
-    })
-  }
-}
-
-
+const Router = require('origin-router').Router
 
 class ServiceRunner {
   constructor({service, party}){
@@ -59,14 +15,17 @@ class ServiceRunner {
 
     this.middleware = { pre: {}, post: {} }
     this.endpoint = {}
+
+    this.router = new Router()
   }
 
   async start(){
-    debug('starting')
+    debug('starting endpoints')
 
     const eps = Hoek.reach(this.service, 'compiled.endpoints')
     const endpointsLoading = []
     for(let name in eps){
+      debug('\t',name)
       endpointsLoading.push( this.loadEndpoint(name) )
     }
 
@@ -80,19 +39,49 @@ class ServiceRunner {
     }
 
     debug('loadEndpoint', name)
-    let endpoint = new EndpointRunner(this.service.compiled.endpoints[name])
+    let endpoint = new EndpointRunner(this.service.compiled.endpoints[name].code)
 
+    debug('getting info')
     await endpoint.getInfo()
+
+    debug('got info')
+
     await this.checkEndpointConfig(endpoint)
 
-    await loadEndpointMiddleware(endpoint)
-    await loadEndpointMiddleware(endpoint, 'post')
+    await this.loadEndpointMiddleware(endpoint, 'pre')
+    await this.loadEndpointMiddleware(endpoint, 'post')
 
     await endpoint.start(this.party)
 
     this.endpoint[name] = endpoint
 
+    this.router.add(name, this.endpointHandler(endpoint))
+  }
+
+  endpointHandler(endpoint){
+    return async (event)=>{
+
+      debug('event',event)
+
+      //const result = await endpoint.run(context)
+
+      debug(Object.keys(event))
+
+      const context = new EndpointContext({
+        req: event.request, res: event.response,
+        endpoint,
+        party: this.party,
+      })
+
+      debug('running')
+  
+      const result = await endpoint.run(context)
 
+      debug('result', result)
+
+      context.res.send(result)
+
+    }
   }
 
   async loadEndpointMiddleware(endpoint, type='pre'){
@@ -114,7 +103,7 @@ class ServiceRunner {
 
     debug('loadMiddleware', type, name)
 
-    let middleware = new MiddlewareRunner(this.service.compiled.middlware[type][name])
+    let middleware = new MiddlewareRunner(this.service.compiled.middlware[type][name].code)
 
     await middleware.getInfo()
     await middleware.start(this.party)
@@ -143,10 +132,20 @@ class ServiceRunner {
   async onRequest(req, res){
     debug('onRequest')
 
-    const context = new EndpointContext({
-      req, res,
-      party: this.party,
-    })
+    debug('req', Object.keys(req), req.body)
+
+    debug('endpoints', Object.keys(this.endpoint))
+
+
+    let route = await this.router.route(req, res)
+
+    debug(route)
+
+    if(!route){
+      res.status(404).end()
+      return
+    }
   }
 }
 
+module.exports = ServiceRunner
diff --git a/test/test-service-compile.js b/test/test-service-compile.js
diff --git a/test/test-service-host.js b/test/test-service-host.js

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ module.exports = class IService {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`addEndpoint(endpoint_path){`
	`83`	`+ debug('andEndpoint', endpoint_path)`
`83`	`84`	`const endpoint = require(endpoint_path)`
`84`	`85`	`const name = endpoint.Name`
`85`	`86`
Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,16 @@ module.exports = class Decrypt extends IMiddleware {`
`11`	`11`	`return 'decrypt'`
`12`	`12`	`}`
`13`	`13`
	`14`	`+ static get Type(){`
	`15`	`+ return 'pre'`
	`16`	`+ }`
	`17`	`+`
`14`	`18`	`static get Description(){`
`15`	`19`	`return 'Decrypt inbound data'`
`16`	`20`	`}`
`17`	`21`
`18`		`- static get MiddlewareConfig(){`
`19`		`- throw new Error('not implemented')`
	`22`	`+ static get ConfigSchema(){`
	`23`	`+ return Joi.boolean()`
`20`	`24`	`}`
`21`	`25`
`22`	`26`	`static async start(party){`