Merge pull request #28 from datapartyjs/nodejs-bundle

Nodejs bundle

Author: sevenbitbyte

examples/party/example-build.js

@@ -0,0 +1,19 @@
+const Path = require('path')
+const debug = require('debug')('example.build')
+
+const Pkg = require('../../package.json')
+const ExampleService = require('./example-service')
+
+async function main(){
+  const service = new ExampleService({ name: Pkg.name, version: Pkg.version })
+
+
+  const build = await service.compile(Path.join(__dirname,'../dataparty'), true)
+
+  debug('compiled')
+}
+
+main().catch(err=>{
+  console.error('CRASH')
+  console.error(err)
+})

examples/party/example-service.js

@@ -0,0 +1,17 @@
+const Dataparty = require('../../src/index')
+const debug = require('debug')('example.service')
+
+const Path = require('path')
+
+class ExampleService extends Dataparty.IService {
+  constructor(opts){
+    super(opts)
+
+    this.addSchema(Path.join(__dirname, './schema/user.js'))
+    this.addSchema(Path.join(__dirname, './schema/basic_types.js'))
+
+  }
+
+}
+
+module.exports = ExampleService

examples/party/schema/basic_types.js

@@ -0,0 +1,32 @@
+'use strict'
+
+const ISchema = require('../../../src/index').Bouncer.ISchema
+
+class BasicTypes extends ISchema {
+
+  static get Type () { return 'basic_types' }
+
+  static get Schema(){
+    return {
+      number: {type: Number, index: true},
+      string: {type: String, index: true},
+      time: {type: Date, index: true},
+      bool: Boolean,
+    }
+  }
+
+  static setupSchema(schema){
+    return schema
+  }
+
+  static permissions (context) {
+    return {
+      read: true,
+      new: true,
+      change: true
+    }
+  }
+}
+
+
+module.exports = BasicTypes

examples/party/schema/user.js

@@ -0,0 +1,38 @@
+'use strict'
+
+const ISchema = require('../../../src/index').Bouncer.ISchema
+
+const Utils = ISchema.Utils
+
+class User extends ISchema {
+
+  static get Type () { return 'user' }
+
+  static get Schema(){
+    return {
+      name: { type: String, maxlength: 50, minlength: 3, unique: true },
+      photo: { type: String, maxlength: 500, description: 'user photo url' },
+      created: Utils.created,
+      enabled: Boolean,
+      profile: Utils.profile,
+      tutorial: {
+        done: Boolean
+      }
+    }
+  }
+
+  static setupSchema(schema){
+    return schema
+  }
+
+  static permissions (context) {
+    return {
+      read: true,
+      new: true,
+      change: true
+    }
+  }
+}
+
+
+module.exports = User

package.json

@@ -1,23 +1,37 @@
 {
   "name": "@dataparty/api",
   "private": false,
-  "version": "1.2.9",
+  "version": "1.2.11",
   "main": "dist/dataparty.js",
-  "browser": "src/index-browser.js",
-  "source": "src/index.js",
   "frontend": "dist/dataparty-browser.js",
   "backend": "dist/dataparty.js",
+  "embedded": "dist/dataparty-embedded.js",
+  "alias": {
+    "events": "eventemitter3"
+  },
   "targets": {
     "frontend": {
       "context": "browser",
       "source": "src/index-browser.js",
+      "includeNodeModules": true,
       "engines": {
         "browsers": "Chrome 80"
       }
     },
     "backend": {
       "context": "node",
       "source": "src/index.js",
+      "optimize": false,
+      "includeNodeModules": false,
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "embedded": {
+      "context": "electron-main",
+      "source": "src/index-embedded.js",
+      "optimize": false,
+      "includeNodeModules": true,
       "engines": {
         "node": ">= 12"
       }
@@ -32,13 +46,15 @@
     "build": "parcel build --no-scope-hoist",
     "prepare": "npm run build",
     "watch": "parcel watch",
+    "build-test": "node ./examples/party/example-build.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",
+    "@dataparty/crypto": "datapartyjs/dataparty-crypto#parcel-build",
     "@hapi/joi": "^17.1.1",
+    "@hapi/wreck": "18.0.0",
     "@zeit/ncc": "^0.22.3",
     "ajv": "6.9.1",
     "body-parser": "^1.19.0",
@@ -49,14 +65,17 @@
     "debug": "^3.1.0",
     "deep-set": "^1.0.1",
     "dom-storage": "^2.1.0",
+    "eventemitter3": "^4.0.7",
     "express": "^4.17.1",
     "express-list-routes": "^0.1.4",
     "git-repo-info": "^2.1.1",
+    "jshashes": "^1.0.8",
     "jsonpath-plus": "^0.20.1",
     "last-eventemitter": "^1.1.1",
     "lodash": "^4.17.4",
     "lokijs": "1.5.6",
     "mkdirp": "^0.5.1",
+    "moment": "^2.29.4",
     "morgan": "^1.10.0",
     "nconf": "^0.10.0",
     "node-persist": "^3.0.1",
@@ -76,24 +95,19 @@
     "uuid": "^3.2.1",
     "uuidv4": "^6.2.12",
     "vm2": "^3.9.2",
-    "websocket": "^1.0.26",
-    "wreck": "14.0.2"
+    "websocket": "github:sevenbitbyte/WebSocket-Node#parcel-build"
   },
   "devDependencies": {
     "@dataparty/bouncer-model": "1.4.3",
     "@hapi/code": "^9.0.1",
     "@hapi/lab": "^25.0.1",
     "better-docs": "^1.1.6",
-    "compression-webpack-plugin": "^2.0.0",
     "docdash": "^1.1.1",
     "jsdoc": "^3.6.2",
     "minami": "^1.2.3",
+    "mongodb-client-encryption": "^2.2.1",
     "parcel": "^2.3.1",
     "tmp": "^0.2.1",
-    "webpack": "^4.17.2",
-    "webpack-bundle-analyzer": "^3.8.0",
-    "webpack-cli": "^3.1.0",
-    "webpack-node-externals": "^1.7.2",
     "wrtc": "^0.4.7"
   },
   "repository": {

src/bouncer/crufler-admin.js

@@ -20,6 +20,7 @@ module.exports = class AdminCrufler extends ICrufler {
     for(let crufl of ask.crufls){
       let result = {
         op: crufl.op,
+        type: crufl.type,
         uuid: crufl.uuid,
         msgs: [],
         complete: true,
@@ -51,6 +52,7 @@ module.exports = class AdminCrufler extends ICrufler {
         }
       }
       catch(err){
+        debug('crufl error')
         debug(err)
         result.error = err
 
@@ -74,17 +76,24 @@ module.exports = class AdminCrufler extends ICrufler {
 
     debug('replying', JSON.stringify(freshness,null,2))
 
-    return {freshness: results }
+
+    return freshness
   }
 
 
   async applyFind(crufl, includeData = false){
     debug('find', JSON.stringify(crufl,null,2))
-    let mongoQuery = new MongoQuery(crufl.spec)
 
-    let query = mongoQuery.getQueryDoc()
+    let spec = crufl.spec ? crufl.spec : {
+      ids: crufl.msgs.map(m=>{ debug(typeof m.$meta.id); return m.$meta.id}),
+      type: crufl.type
+    }
+
+    let mongoQuery = new MongoQuery(spec)
+
+
 
-    let resultSet = await this.db.find(crufl.type, query)
+    let resultSet = await this.db.find(crufl.type, mongoQuery)
 
     debug('set',resultSet)
 

src/bouncer/db/loki-db.js

@@ -14,10 +14,11 @@ const debug = require('debug')('dataparty.local.loki-db')
 
 module.exports = class LokiDb extends IDb {
 
-  constructor ({path, factory, dbAdapter}) {
+  constructor ({path, factory, dbAdapter, lokiOptions}) {
     super(factory)
     debug('constructor')
     this.loki = null
+    this.lokiOptions = lokiOptions
     this.path = path
     this.dbAdapter = dbAdapter || new LFSA()
     this.error = null
@@ -32,7 +33,8 @@ module.exports = class LokiDb extends IDb {
     this.loki = new Loki(
       this.path,
       { 
-        adapter : this.dbAdapter
+        adapter : this.dbAdapter,
+        ...this.lokiOptions
       }
     )
 
@@ -185,12 +187,25 @@ module.exports = class LokiDb extends IDb {
     return {freshness: results }
   }*/
 
-  async find(collectionName, query){
+  async find(collectionName, mongoQuery){
+
+    let query = mongoQuery.getQueryDoc()
+
     debug('find collection=', collectionName, ' query=', JSON.stringify(query,null,2))
     let collection = await this.getCollection(collectionName)
-    let resultArray = collection.find(query)
+    let resultSet = collection.chain().find(query)
+
+
+    if(mongoQuery.hasLimit()){
+      resultSet = resultSet.limit(mongoQuery.getLimit())
+    }
+
+    if(mongoQuery.hasSort()){
+      let sortPath = Object.keys(mongoQuery.getSort())[0]
+      resultSet = resultSet.simplesort( sortPath )
+    }
 
-    return resultArray.map(this.documentToObject) || []
+    return resultSet.data().map(this.documentToObject) || []
   }
 
   async insertMany(collectionName, docs){ 
@@ -232,7 +247,7 @@ module.exports = class LokiDb extends IDb {
     return resultSet
 
   }
-
+  
   async update(collectionName, docs){ 
     debug('update collection', collectionName, ' docs', docs)