service host

Author: sevenbitbyte

package.json

@@ -21,17 +21,22 @@
     "@dataparty/crypto": "1.0.1",
     "@zeit/ncc": "^0.22.3",
     "ajv": "6.9.1",
+    "body-parser": "^1.19.0",
     "bson-objectid": "^1.3.0",
     "colors": "1.3.1",
+    "cors": "^2.8.5",
     "debug": "^3.1.0",
     "deep-set": "^1.0.1",
     "dom-storage": "^2.1.0",
+    "express": "^4.17.1",
+    "express-list-routes": "^0.1.4",
     "git-repo-info": "^2.1.1",
     "jsonpath-plus": "^0.20.1",
     "last-eventemitter": "^1.1.1",
     "lodash": "^4.17.4",
     "lokijs": "1.5.6",
     "mkdirp": "^0.5.1",
+    "morgan": "^1.10.0",
     "nconf": "^0.10.0",
     "node-persist": "^3.0.1",
     "nodemon-webpack-plugin": "^3.0.1",
@@ -44,6 +49,7 @@
     "touch": "^3.1.0",
     "url-parse": "^1.4.7",
     "uuid": "^3.2.1",
+    "vm2": "^3.9.2",
     "websocket": "^1.0.26",
     "wreck": "14.0.2",
     "wrtc": "^0.4.4"

src/service/index.js

@@ -6,6 +6,7 @@ module.exports = {
   IService: require('./iservice'),
   IEndpoint: require('./iendpoint'),
   IMiddleware: require('./imiddleware'),
+  ServiceHost: require('./service-host'),
   middleware: {
     pre: {
       decrypt: require('./middleware/pre/decrypt')

src/service/iservice.js

@@ -106,7 +106,7 @@ module.exports = class IService {
   }
 
 
-  async compile(outputPath){
+  async compile(outputPath, writeFile=true){
 
     if(!outputPath){
       throw new Error('no output path')
@@ -127,14 +127,16 @@ module.exports = class IService {
 
     this.compiled.middleware_order = this.middleware_order
 
-    const buildOutput = outputPath+'/'+ this.compiled.package.name.replace('/', '-') +'.dataparty-service.json'
-    fs.writeFileSync(buildOutput, JSON.stringify(this.compiled))
+    if(writeFile){
+      const buildOutput = outputPath+'/'+ this.compiled.package.name.replace('/', '-') +'.dataparty-service.json'
+      fs.writeFileSync(buildOutput, JSON.stringify(this.compiled))
 
-    const schemaOutput = outputPath+'/'+ this.compiled.package.name.replace('/', '-') +'.dataparty-schema.json'
-    fs.writeFileSync(schemaOutput, JSON.stringify({
-      package: this.compiled.package,
-      ...this.compiled.schemas
-    }))
+      const schemaOutput = outputPath+'/'+ this.compiled.package.name.replace('/', '-') +'.dataparty-schema.json'
+      fs.writeFileSync(schemaOutput, JSON.stringify({
+        package: this.compiled.package,
+        ...this.compiled.schemas
+      }))
+    }
 
     return this.compiled
 
@@ -173,7 +175,7 @@ module.exports = class IService {
       // provide a custom cache path or disable caching
       cache: false,
       // externals to leave as requires of the build
-      //externals: ["externalpackage"],
+      externals: ['debug', '@dataparty/crypto', '@hapi/joi', '@hapi/hoek'],
       // directory outside of which never to emit assets
       //filterAssetBase: process.cwd(), // default
       minify: false, // default

src/service/middleware/pre/decrypt.js

@@ -6,7 +6,6 @@ const debug = require('debug')('roshub.middleware.pre.decrypt')
 const IMiddleware = require('../../imiddleware')
 
 module.exports = class Decrypt extends IMiddleware {
-  constructor(opts){ super(opts) }
 
   static get Name(){
     return 'decrypt'

src/service/service-host.js

@@ -1,28 +1,26 @@
+const CORS = require('cors')
+const Pify = require('pify')
+const {URL} = require('url')
 const net = require('net')
 const http = require('http')
 const https = require('https')
-
-const Pify = require('pify')
-const debug = require('debug')('roshub.server')
-const Hoek = require('hoek')
 const morgan = require('morgan')
 const express = require('express')
-const CORS = require('cors')
-const expressListRoutes = require('express-list-routes')
 const bodyParser = require('body-parser')
-const {URL} = require('url');
+const expressListRoutes = require('express-list-routes')
+const debug = require('debug')('dataparty.service-host')
+
 
 
 class ServiceHost {
   constructor({
-    listenUri = 'http://0.0.0.0:4001',
-    cors = null,
-    trust_proxy = false
-  }){
+    cors = {},
+    trust_proxy = false,
+    listenUri = 'http://0.0.0.0:4001'
+  }={}){
     this.apiApp = express()
     this.router = express.Router()
 
-
     if(cors){
       this.apiApp.use(CORS())
       this.apiApp.options('*', CORS(cors))
@@ -42,6 +40,10 @@ class ServiceHost {
     this.apiServerUri = new URL(listenUri)
   }
 
+  async onRequest(req, res){
+    debug('request')
+    res.end('nope')
+  }
 
   async start(){
 
@@ -50,13 +52,13 @@ class ServiceHost {
     if(this.apiServer==null){
       debug('adding default endpoints')
       //Setup router
-      //this.apiApp.use(this.router);
+      this.apiApp.use(this.onRequest.bind(this))
 
       if(debug.enabled){ expressListRoutes('API:', this.router ) }
     }
 
     let listenPort = this.apiServerUri.port
-    let listenHost = this.apiServerUri.host
+    let listenHost = this.apiServerUri.hostname
 
     if(this.apiServerUri.protocol == 'http:'){
 
@@ -77,7 +79,11 @@ class ServiceHost {
 
     }
 
-    await (Pify(this.apiServer.listen)(listenPort, listenHost))
+    debug('server listening', this.apiServerUri.toString())
+
+    await new Promise((resolve,reject)=>{
+      this.apiServer.listen(listenPort, listenHost, resolve)
+    })
 
     clearTimeout(this.errorHandlerTimer)
     this.errorHandlerTimer = null

src/service/service-runner.js

@@ -0,0 +1,24 @@
+const {VM, VMScript} = require('vm2')
+const debug = require('debug')('dataparty.server-runner')
+
+
+class CodeAccessor {
+  constructor(code){
+    this.script = new VMScript(code)
+  }
+}
+
+class ServiceRunner {
+  constructor({service}){
+    //
+  }
+
+  async buildEndpointVM(name){ /**/ }
+
+  async buildMiddlewareVM(name){ /**/ }
+
+  async onRequest(req, res){
+    debug('onRequest')
+  }
+}
+

test/test-service-compile.js

@@ -1,7 +1,9 @@
 const Path = require('path')
-const debug = require('debug')('test.server-db')
+const debug = require('debug')('test.service-compile')
 const Dataparty = require('../src')
 
+const {VM, NodeVM, VMScript} = require('vm2')
+
 class ExampleService extends Dataparty.IService {
     constructor(opts){
       super(opts)
@@ -11,13 +13,70 @@ class ExampleService extends Dataparty.IService {
 
 }
 
+class CodeAccessor {
+  constructor(code){
+    debug('code-accessor', code)
+    this.script = new VMScript(code)
+    debug('compiled')  
+  }
+
+  run(context, sandbox){
+    debug('run')
+
+
+    let vm = new NodeVM({
+      sandbox,
+      require: {
+        external: {
+          modules: ['debug', '@dataparty/crypto', '@hapi/joi', '@hapi/hoek']
+        },
+        //builtin: ['*']
+      }
+    })
+
+    debug('has run')
+    let fn = vm.run(this.script)
+    const retVal = fn(context)
+    debug('retVal', retVal)
+    debug('context', context)
+    return retVal
+  }
+
+}
+
+class MiddlewareInfoAccessor extends CodeAccessor {
+  constructor(code){
+    super(`
+      
+      let lib = ${code}
+     
+      module.exports = ()=>{
+
+      return {
+        Name: lib.Name,
+        Type: lib.Type,
+        Description: lib.Description,
+        ConfigSchema: lib.ConfigSchema
+      }
+    }
+    `)
+  }
+
+}
+
 async function main(){
 
   console.log(Object.keys(Dataparty))
 
   const service = new ExampleService({ name: '@dataparty/example', version: '0.0.1' })
 
-  const build = await service.compile(Path.join(__dirname,'../dataparty'))
+  const build = await service.compile(Path.join(__dirname,'../dataparty'), false)
+
+  //debug(build.middleware.pre.decrypt)
+
+  let accessor = new MiddlewareInfoAccessor(build.middleware.pre.decrypt.code)
+
+  console.log(accessor.run('derp'))
 
   console.log(build)
 

test/test-service-host.js

@@ -0,0 +1,31 @@
+const Path = require('path')
+const debug = require('debug')('test.server-db')
+const Dataparty = require('../src')
+
+/*class ExampleService extends Dataparty.IService {
+    constructor(opts){
+      super(opts)
+
+      this.addMiddleware(Dataparty.middleware_paths.pre.decrypt)
+    }
+
+}*/
+
+async function main(){
+
+  console.log(Object.keys(Dataparty))
+
+  const host = new Dataparty.ServiceHost()
+
+  await host.start()
+
+  console.log('started')
+  
+  //process.exit()
+}
+
+
+
+main().catch(err=>{
+  console.error(err)
+})