Merge pull request #24 from datapartyjs/venue-hosting

Venue hosting

Author: sevenbitbyte

src/party/document-factory.js

@@ -2,6 +2,36 @@ const Ajv = require('ajv')
 const debug = require('debug')('dataparty.document-factory')
 const IDocument = require('./idocument')
 
+class DocumentValidationError extends Error {
+  constructor(ajvErrors){
+    super()
+
+    /*[
+        {
+          "keyword": "required",
+          "dataPath": "",
+          "schemaPath": "#/required",
+          "params": {
+            "missingProperty": "name"
+          },
+          "message": "should have required property 'name'"
+        }
+      ]
+    */
+
+    this.message='Validation failure\n'
+
+    for(let i=0; i<ajvErrors.length; i++){
+      const error = ajvErrors[i]
+      this.message += error.message + 'at data.'+error.dataPath
+    }
+
+    this.stack=''
+    this.name='DocumentValidationError'
+    this.code=this.name
+  }
+}
+
 /**
  * @class
  */
@@ -111,6 +141,7 @@ class DocumentFactory {
    * @param {*} data 
    */
   validate(type, data){
+    debug('validate',type)
     return new Promise((resolve, reject)=>{
 
       if(!this.validators[type]){
@@ -122,7 +153,8 @@ class DocumentFactory {
 
       if(!valid){
         let errors = this.validators[type].errors
-        return reject({error: errors})
+
+        return reject(new DocumentValidationError(errors))
       }
 
       return resolve(data)

src/party/idocument.js

@@ -114,7 +114,7 @@ class IDocument extends EventEmitter {
    * @returns {object}
    */
   async mergeData(input){
-    return this.setData(Object.assign({}, this.data, input))
+    return await this.setData(Object.assign({}, this.data, input))
   }
 
   /**
@@ -124,7 +124,9 @@ class IDocument extends EventEmitter {
    * @returns {object}
    */
   async setData(input){
+    debug('setData start')
     let valid = await this.party.factory.validate(this.type, input)
+    debug('setData done')
     this._data = valid
   }
 
@@ -138,9 +140,13 @@ class IDocument extends EventEmitter {
     delete value.$meta.version
     delete value.__v
 
+    debug('asign data')
     await this.setData(value)
+    debug('data set')
     await this.party.update(value)
+    debug('doc updated')
     await this.pull()
+    debug('doc pulled')
   }
 
 
@@ -298,7 +304,7 @@ class IDocument extends EventEmitter {
     const newMsg = this.party.cache.findById(this.type, this.id)
     const oldMsg = Object.assign({}, this.getData())
 
-    debug('new message', newMsg)
+    debug('new message', event.event, newMsg)
 
     switch (event.event){
       case 'remove':

src/party/local/loki-db.js

@@ -39,7 +39,7 @@ module.exports = class LokiDb extends EventEmitter {
             autoload: true,
             autoloadCallback : resolve,
             autosave: true, 
-            autosaveInterval: 10000
+            autosaveInterval: 1000
           }
         )
 

src/service/iservice.js

@@ -7,6 +7,7 @@ const gitRepoInfo = require('git-repo-info')
 const BouncerDb = require('@dataparty/bouncer-db')
 const mongoose = BouncerDb.mongoose()
 const json2ts = require('json-schema-to-typescript')
+const { build } = require('@hapi/joi')
 const debug = require('debug')('dataparty.service.IService')
 
 module.exports = class IService {
@@ -59,6 +60,9 @@ module.exports = class IService {
     }
    }
 
+  importBuild(buildOutput){
+    this.compiled = buildOutput
+  }
 
   /**
    * 
@@ -83,7 +87,7 @@ module.exports = class IService {
   }
 
   addEndpoint(endpoint_path){
-    debug('andEndpoint', endpoint_path)
+    debug('addEndpoint', endpoint_path)
     const endpoint = require(endpoint_path)
     const name = endpoint.Name
 
@@ -141,7 +145,7 @@ module.exports = class IService {
       fs.writeFileSync(schemaOutput, JSON.stringify({
         package: this.compiled.package,
         ...this.compiled.schemas
-      }))
+      }, null, 2))
     }
 
     return this.compiled

src/service/service-runner.js

@@ -28,13 +28,14 @@ class ServiceRunner {
     debug('starting endpoints')
 
     const eps = Hoek.reach(this.service, 'compiled.endpoints')
-    const endpointsLoading = []
+    //const endpointsLoading = []
     for(let name in eps){
       debug('\t',name)
-      endpointsLoading.push( this.loadEndpoint(name) )
+      await this.loadEndpoint(name)
+      //endpointsLoading.push( this.loadEndpoint(name) )
     }
 
-    await Promise.all(endpointsLoading)
+    //await Promise.all(endpointsLoading)
     debug('endpoints ready:')
     for(let name in this.endpoint){
       debug('\t', Path.join('/', name))
@@ -86,6 +87,7 @@ class ServiceRunner {
 
   async loadMiddleware(name, type='pre'){ 
     if(this.middleware[type][name]){
+      debug('cached',type,'middleware',name)
       return this.middleware[type][name]
     }
 
@@ -107,7 +109,7 @@ class ServiceRunner {
     this.middleware[type][name] = runner
 
     dt.end()
-    debug('loaded middleware',name,'in',dt.deltaMs,'ms')
+    debug('loaded',type,'middleware',name,'in',dt.deltaMs,'ms')
 
     return runner
   }
@@ -150,7 +152,7 @@ class ServiceRunner {
   endpointHandler(endpoint){
     return async (event)=>{
 
-      debug('event',event.method, event.pathname)
+      debug('event',event.method, event.pathname, event.request.ip, event.request.ips)
 
 
       const context = new EndpointContext({

src/venue/endpoints/create-service.js

@@ -0,0 +1,94 @@
+const Joi = require('@hapi/joi')
+const Hoek = require('@hapi/hoek')
+const {Message, Routines} = require('@dataparty/crypto')
+const debug = require('debug')('dataparty.endpoint.create-service')
+
+const IEndpoint = require('../../service/iendpoint')
+const { exist } = require('@hapi/joi')
+
+module.exports = class CreateSrvEndpoint extends IEndpoint {
+
+  static get Name(){
+    return 'create-service'
+  }
+
+
+  static get Description(){
+    return 'Create venue service'
+  }
+
+  static get MiddlewareConfig(){
+    return {
+      pre: {
+        decrypt: false,
+        validate: Joi.object().keys(null)
+      },
+      post: {
+        encrypt: false,
+        validate: Joi.object().keys(null).description('any output allowed')
+      }
+    }
+  }
+
+  static async run(ctx){
+
+    ctx.debug('hello')
+    debug('echo')
+    ctx.debug('ctx.input', ctx.input)
+
+    const compiledSrv = JSON.parse(ctx.input.service)
+    const serviceId = compiledSrv.package.name + '-' + compiledSrv.package.version
+    debug('addService', serviceId)
+
+    let srvDoc = (await ctx.party.find()
+    .type('venue_srv')
+    .where('name').equals(compiledSrv.package.name)
+    .exec())[0]
+
+    
+
+    if(!srvDoc){
+      debug('creating service')
+      srvDoc = await ctx.party.createDocument('venue_srv', {
+        name: compiledSrv.package.name,
+        'created': (new Date()).toISOString(),
+        package: compiledSrv.package,
+        schemas: compiledSrv.schemas,
+        endpoints: compiledSrv.endpoints,
+        midddleware: compiledSrv.middleware,
+        middleware_order: compiledSrv.middleware_order
+      })
+
+      debug('service created')
+    }
+    else{
+
+
+      try{
+
+        debug('updating service')
+        debug(srvDoc.data)
+        await srvDoc.mergeData({
+          package: compiledSrv.package,
+          schemas: compiledSrv.schemas,
+          endpoints: compiledSrv.endpoints,
+          midddleware: compiledSrv.middleware,
+          middleware_order: compiledSrv.middleware_order
+        })
+  
+        //debug(srvDoc.data)
+  
+        debug('saving doc')
+
+
+        await srvDoc.save()
+      }
+      catch(err){
+        console.log(err)
+      }
+      debug('updated service')
+    }
+
+    return {srv:srvDoc.data}
+  }
+}

src/venue/schema/venue_service.js

@@ -0,0 +1,65 @@
+'use strict'
+
+const Hoek = require('hoek')
+//const BouncerDb = require('@dataparty/bouncer-db')
+/*
+require('mongoose-schema-jsonschema')(BouncerDb.mongoose())
+BouncerDb.mongoose().plugin(require("mongoose-ajv-plugin"))
+*/
+const debug = require('debug')('venue.venue_srv')
+
+const Dataparty = require('../../service')
+
+const Utils = Dataparty.ISchema.Utils
+
+
+class VenueSrv extends Dataparty.ISchema {
+
+  static get Type () { return 'venue_srv' }
+
+  static get Schema(){
+    return {
+      //project: Utils.actor(['venue_project']),
+      name: {type: String, required: true},
+      created: Utils.created,
+      //owner: Utils.actor(['user']),
+      package: {
+        name: String,
+        version: String,
+        githash: String,
+        branch: String
+      },
+      schemas: {
+        Package: {},
+        IndexSettings: {},
+        JSONSchema: {},
+        Permissions: {}
+      },
+      endpoints: {},
+      middleware: {
+        pre: {},
+        post: {}
+      },
+      middleware_order: {
+        pre: [String],
+        post: [String]
+      }
+    }
+  }
+
+  static setupSchema(schema){
+    schema.index({ name: 1 }, {unique: true})
+    return schema
+  }
+
+  static permissions (context) {
+    return {
+      read: true,
+      new: true,
+      change: true
+    }
+  }
+}
+
+
+module.exports = VenueSrv