Merge pull request #17 from datapartyjs/dataparty-service

Dataparty service

Author: sevenbitbyte

package.json

@@ -13,23 +13,30 @@
     "build": "webpack",
     "prepare": "yarn build",
     "watch": "webpack --watch",
-    "watch-test": "nodemon test/test-server-party-generic-model.js",
+    "watch-test": "DEBUG=* nodemon --ignore service test/test-service-compile.js",
     "build-docs": "npx jsdoc -c jsdoc.json"
   },
   "dependencies": {
     "@dataparty/bouncer-db": "1.0.1",
     "@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",
@@ -42,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/index.js

@@ -1,9 +1,13 @@
 const Comms = require('./comms')
 const Config = require('./config')
 const Party = require('./party')
+const Service = require('./service')
+const Sandbox = require('./sandbox')
 
 module.exports = {
   Comms,
   Config,
-  ...Party
+  ...Party,
+  ...Service,
+  ...Sandbox
 }

src/party/idocument.js

@@ -60,6 +60,9 @@ class IDocument extends EventEmitter {
    */
   get version(){ return reach(this._data, '$meta.version') }
 
+  static get DocumentSchema(){
+    return 'document'
+  }
 
   /**
    * @typedef {Object} IdObj

src/party/index.js

@@ -2,7 +2,7 @@ const IParty = require('./iparty')
 const PeerParty = require('./peer/peer-party')
 const CloudParty = require('./cloud/cloud-party')
 const LocalParty = require('./local/local-party')
-const ServerParty = require('./server/server-party')
+const MongoParty = require('./mongo/mongo-party')
 
 const IDocument = require('./idocument')
 const DocumentFactory = require('./document-factory')
@@ -13,6 +13,6 @@ const LokiDb = require('./local/loki-db')
 module.exports = {
   IDocument, IParty, DocumentFactory,
   CloudDocument,
-  CloudParty, LocalParty, PeerParty, ServerParty,
+  CloudParty, LocalParty, PeerParty, MongoParty,
   LokiDb
 }

src/party/iparty.js

@@ -134,6 +134,11 @@ class IParty {
     return this._identity.toJSON(false)
   }
 
+  get privateIdentity(){
+    if (!this.hasIdentity()){ return undefined }
+    return this._identity
+  }
+
   /** @type {IdObj} */
   get actor(){
     if (this.actors && this.actors[0]){

src/party/server/server-party.js src/party/mongo/mongo-party.jssrc/party/server/server-party.js renamed to src/party/mongo/mongo-party.js

@@ -1,18 +1,18 @@
 'use strict'
 
 const BouncerDb = require('@dataparty/bouncer-db')
-const debug = require('debug')('dataparty.server-party')
+const debug = require('debug')('dataparty.mongo-party')
 
 const IParty = require('../iparty')
 const Qb = require('../qb')
 
 
 /**
  * @class 
- * @alias module:dataparty.LocalParty
+ * @alias module:dataparty.MongoParty
  * @interface
  */
-class ServerParty extends IParty {
+class MongoParty extends IParty {
 
   constructor ({uri, mongoOptions, serverModels, ...options}) {
     super(options)
@@ -46,4 +46,4 @@ class ServerParty extends IParty {
   }
 }
 
-module.exports = ServerParty
+module.exports = MongoParty

src/party/peer/peer-party.js

@@ -15,7 +15,7 @@ const RTCSocketComms = require('../../comms/rtc-socket-comms')
  */
 class PeerParty extends IParty {
 
-  constructor ({remoteIdentity, path, host, wrtc, trickle, ...options}) {
+  constructor ({remoteIdentity, host, hostParty, wrtc, trickle=true, ...options}) {
     super(options)
 
     this.comms = new RTCSocketComms({remoteIdentity, host, party: this, wrtc, trickle})
@@ -25,20 +25,18 @@ class PeerParty extends IParty {
       cache: this.cache
     })
 
-    this.db = null
+    this.hostParty = null
 
     if(this.comms.host){
-      this.db = new LokiDb({
-        path, factory: this.factory
-      })
+      this.hostParty = hostParty
     }
   }
 
   async start(){
     await super.start()
     if(this.comms.host){ 
       debug('start - host')
-      await this.db.start()
+      await this.hostParty.start()
     }
     else {
       debug('start - client')
@@ -52,7 +50,7 @@ class PeerParty extends IParty {
 
     if(this.comms.host){
       debug('handleCall - host')
-      return await this.db.handleCall(ask)
+      return await this.hostParty.handleCall(ask)
     } else {
       debug('handleCall - client')
       return await this.comms.call('api-v2-peer-bouncer', ask)

src/party/query.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const debug=require('debug')('dataparty.query')
 const cloneDeep = require('lodash/cloneDeep')
 const Clerk = require('./clerk.js')
 
@@ -76,7 +77,7 @@ module.exports = class Query {
 
     if(hydrate){
       const results = await this.qb.find(this.spec)
-      console.log('hydrating', results)
+      debug('hydrating', results)
       return this.model.hydrate(results)
     }
 

src/sandbox/index.js

@@ -0,0 +1,5 @@
+module.exports = {
+  Sandbox: require('./sandbox'),
+  SandboxError: require('./sandbox-error'),
+  MiddlewareInfoSandbox: require('./middleware-info-sandbox')
+}

src/sandbox/middleware-info-sandbox.js

@@ -0,0 +1,53 @@
+//const debug = require('debug')('dataparty.MiddlewareInfoSandbox')
+const Sandbox = require('./sandbox')
+
+class MiddlewareInfoSandbox extends Sandbox {
+  constructor(code){
+    super(`  
+
+module.exports = async ()=>{
+
+  class ErrorError extends Error { 
+    constructor(msg){
+      super()
+      this.code = 'ErrorError'
+      this.message = 'You did not throw an error object, always throw an Error object! - [' + msg + ']'
+    }
+  }
+
+  try{
+    let Lib = ${code}
+
+    return {
+      Name: Lib.Name,
+      Type: Lib.Type,
+      Description: Lib.Description,
+      ConfigSchema: Lib.ConfigSchema
+    }
+  }
+  catch(err){
+
+    if(!err || !err.stack){
+      err = new ErrorError(err)
+    }
+
+    throw err
+  }
+
+}
+    `)
+
+    this.info = null
+  }
+
+  async run(){
+
+
+    this.info = await super.run()
+
+    return this.info
+  }
+
+}
+
+module.exports = MiddlewareInfoSandbox