venue create-service endpoint

Author: sevenbitbyte

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))
   }
 
   /**
@@ -139,8 +139,11 @@ class IDocument extends EventEmitter {
     delete value.__v
 
     await this.setData(value)
+    debug('data set')
     await this.party.update(value)
+    debug('doc updated')
     await this.pull()
+    debug('doc pulled')
   }
 
 
@@ -298,7 +301,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/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
 

src/venue/endpoints/create-service.js

@@ -0,0 +1,86 @@
+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{
+      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)
+
+      try{
+        await srvDoc.save()
+      }
+      catch(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: false,
+      new: false,
+      change: false
+    }
+  }
+}
+
+
+module.exports = VenueSrv

src/venue/venue-host.js

@@ -7,30 +7,73 @@ const BouncerClientModels = require('@dataparty/bouncer-model/dist/bouncer-model
 
 const VenueService = require('./venue-service')
 
+
+class ExampleService extends Dataparty.IService {
+  constructor(opts){
+    super(opts)
+
+    this.addMiddleware(Dataparty.middleware_paths.pre.decrypt)
+    this.addMiddleware(Dataparty.middleware_paths.pre.validate)
+
+    this.addMiddleware(Dataparty.middleware_paths.post.validate)
+    this.addMiddleware(Dataparty.middleware_paths.post.encrypt)
+
+    this.addEndpoint(Dataparty.endpoint_paths.echo)
+    this.addEndpoint(Dataparty.endpoint_paths.secureecho)
+    this.addEndpoint(Dataparty.endpoint_paths.identity)
+    this.addEndpoint(Dataparty.endpoint_paths.version)
+  }
+
+}
+
+
+
 async function main(){
 
-  const uri = 'mongodb://localhost:27017/server-party-test'
+  const uri = 'mongodb://localhost:27017/venue-test'
   debug('db location', uri)
 
-  let party = new Dataparty.MongoParty({
-    uri,
-    model: BouncerClientModels,
-    serverModels: BouncerServerModels,
-    config: new Dataparty.Config.MemoryConfig()
-  })
+
+
+  const exampleSrv = new ExampleService({ name: '@dataparty/nested-example', version: '0.0.1' })
+  const compiledExampleSrv = await exampleSrv.compile(Path.join(__dirname,'../../dataparty'), true)
+
 
   const service = new VenueService({ name: '@dataparty/venue', version: '0.0.1' })
 
+
   const build = await service.compile(Path.join(__dirname,'../../dataparty'), true)
 
-  debug('built')
+
+  debug('compiled')
+
+  console.log(Object.keys(BouncerServerModels))
+
+  const serverModels = {
+    Utils: BouncerServerModels.Utils,
+    Model: BouncerServerModels.Model,
+    Types: {
+      ...BouncerServerModels.Types,
+      BanList: require('./schema/ban_list'),
+      VenueSrv: require('./schema/venue_service')
+    }
+  }
+
+  let party = new Dataparty.MongoParty({
+    uri,
+    model: build.schemas,
+    serverModels,
+    config: new Dataparty.Config.MemoryConfig()
+  })
+
+  debug('partying')
 
   const runner = new Dataparty.ServiceRunner({
     party, service,
     sendFullErrors: true
   })
 
-  const host = new Dataparty.ServiceHost({runner})
+  const host = new Dataparty.ServiceHost({runner, trust_proxy: true})
 
   await party.start()
   await runner.start()

src/venue/venue-service.js

@@ -8,6 +8,7 @@ class VenueService extends DatapartySrv.IService {
     super(opts)
 
     this.addSchema(Path.join(__dirname, './schema/ban_list.js'))
+    this.addSchema(Path.join(__dirname, './schema/venue_service.js'))
 
     this.addMiddleware(DatapartySrv.middleware_paths.pre.decrypt)
     this.addMiddleware(DatapartySrv.middleware_paths.pre.validate)
@@ -17,6 +18,8 @@ class VenueService extends DatapartySrv.IService {
 
     this.addEndpoint(DatapartySrv.endpoint_paths.identity)
     this.addEndpoint(DatapartySrv.endpoint_paths.version)
+
+    this.addEndpoint(Path.join(__dirname, './endpoints/create-service.js'))
   }
 
 }

test/test-local-db.js

@@ -23,9 +23,12 @@ async function main(){
 
 
   if(!user){
-    user = await local.createDocument('user', {name: 'tester'})
+    debug('creating document')
+    user = await local.createDocument('user', {name: 'tester', created: Date.now()})
+  }
+  else{
+    debug('loaded document')
   }
-    
 
   console.log(user.data)
   process.exit()

test/test-server-party-generic-model.js

@@ -4,7 +4,7 @@ const Dataparty = require('../src')
 
 async function main(){
 
-  const uri = 'mongodb://localhost:27017/server-party-test'
+  const uri = 'mongodb://localhost:27017/server-party-generics-test'
   debug('db location', uri)
 
   let party = new Dataparty.MongoParty({
@@ -21,17 +21,22 @@ async function main(){
     .where('name').equals('tester')
     .exec())[0]
 
-  
+
+
   if(!user){
+    debug('creating document')
     user = await party.createDocument('user', {
       name: 'tester',
       'created': (new Date()).toISOString(),
       profile: {
         'created': (new Date()).toISOString()
       }
     })
+    debug('created document')
+  }
+  else{
+    debug('loaded document')
   }
-    
 
   console.log(user.data)
   process.exit()

test/test-server-party.js

@@ -24,9 +24,14 @@ async function main(){
     .exec())[0]
 
 
-  if(!user){
-    user = await party.createDocument('user', {name: 'tester'})
-  }
+    if(!user){
+      debug('creating document')
+      user = await party.createDocument('user', {name: 'tester', created: Date.now()})
+      debug('created document')
+    }
+    else{
+      debug('loaded document')
+    }
 
 
   console.log(user.data)

test/test-service-host.js

@@ -39,7 +39,7 @@ async function main(){
 
   const build = await service.compile(Path.join(__dirname,'../dataparty'), true)
 
-  debug('built')
+  debug('built', Object.keys(build))
 
   const runner = new Dataparty.ServiceRunner({
     party, service,