Merge pull request #31 from datapartyjs/nodejs-bundle

zangodb support

Author: sevenbitbyte

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dataparty/api",
   "private": false,
-  "version": "1.2.11",
+  "version": "1.2.12",
   "main": "dist/dataparty.js",
   "frontend": "dist/dataparty-browser.js",
   "backend": "dist/dataparty.js",
@@ -95,14 +95,16 @@
     "uuid": "^3.2.1",
     "uuidv4": "^6.2.12",
     "vm2": "^3.9.2",
-    "websocket": "github:sevenbitbyte/WebSocket-Node#parcel-build"
+    "websocket": "github:sevenbitbyte/WebSocket-Node#parcel-build",
+    "zangodb": "github:sevenbitbyte/zangodb#hash-patch"
   },
   "devDependencies": {
     "@dataparty/bouncer-model": "1.4.3",
     "@hapi/code": "^9.0.1",
     "@hapi/lab": "^25.0.1",
     "better-docs": "^1.1.6",
     "docdash": "^1.1.1",
+    "fake-indexeddb": "^4.0.0",
     "jsdoc": "^3.6.2",
     "minami": "^1.2.3",
     "mongodb-client-encryption": "^2.2.1",

src/bouncer/crufler-admin.js

@@ -95,7 +95,7 @@ module.exports = class AdminCrufler extends ICrufler {
 
     let resultSet = await this.db.find(crufl.type, mongoQuery)
 
-    debug('set',resultSet)
+    debug('resultSet',resultSet)
 
     let msgs = []
 
@@ -118,7 +118,7 @@ module.exports = class AdminCrufler extends ICrufler {
       }
     }
 
-    debug(msgs)
+    debug('applyFind found msgs', msgs)
     return msgs
   }
 

src/bouncer/db/loki-db.js

@@ -9,7 +9,7 @@ const ObjectId = require('bson-objectid')
 
 const MongoQuery = require('../mongo-query')
 const { promisfy } = require('promisfy')
-const debug = require('debug')('dataparty.local.loki-db')
+const debug = require('debug')('bouncer.db.loki-db')
 
 
 module.exports = class LokiDb extends IDb {

src/bouncer/db/zango-db.js

@@ -0,0 +1,232 @@
+'use strict'
+
+const IDb = require('../idb')
+const Hoek = require('@hapi/hoek')
+const zango = require('zangodb')
+const reach = require('../../utils/reach')
+const ObjectId = require('bson-objectid')
+
+const MongoQuery = require('../mongo-query')
+const { promisfy } = require('promisfy')
+const debug = require('debug')('bouncer.db.zango-db')
+
+
+module.exports = class ZangoDb extends IDb {
+
+  constructor ({dbname, factory}) {
+    super(factory)
+    debug('constructor')
+    this.zango = null
+    this.dbname = dbname
+    this.error = null
+  }
+
+
+  async start(){
+
+    debug('starting')
+
+
+    let collectionSettings = {}
+
+    for(const name of this.factory.getValidators()){
+      debug('creating collection', name)
+
+      const indexSettings = reach(this.factory, 'model.IndexSettings.'+name)
+
+      const indices = ['$meta.id'].concat(indexSettings.unique).concat(indexSettings.indices)
+
+      collectionSettings[this.prefix+name] = indices.length > 0 ? indices : true
+    }
+
+    debug('dbname',this.dbname, collectionSettings)
+
+    this.zango = new zango.Db(this.dbname, collectionSettings)
+    
+  }
+
+  async getCollectionNames(){
+
+    const names = this.factory.getValidators()
+
+    return names.map(name=>{return name.replace(this.prefix,'')})
+  }
+
+
+  async getCollection(name){ 
+    let collection = this.zango.collection(this.prefix+name)
+
+    return collection
+  }
+
+  /** convert db documnet to plain object with $meta field */
+  documentToObject(doc){
+    let obj = Object.assign({},doc)
+    obj.$meta = {
+      id: Hoek.reach(obj,'meta.id', {default: obj._id}),
+      type: Hoek.reach(doc,'meta.type'),
+      created: Hoek.reach(obj,'meta.created', {default: (new Date()).toISOString()}),
+      revision: Hoek.reach(obj,'meta.revision', {default: 1}),
+      removed: Hoek.reach(obj,'meta.removed')
+    }
+    
+    delete obj.meta
+    delete obj._id
+
+    return obj
+  }
+
+
+  /** convert object with $meta field to db representation*/
+  documentFromObject(obj){ 
+    let doc = Object.assign({},obj)
+    doc._id = Hoek.reach(obj,'$meta.id', {default: obj._id}),
+    doc.meta = {
+      id: Hoek.reach(obj,'$meta.id', {default: obj._id}),
+      type: Hoek.reach(obj,'$meta.type'),
+      created: Hoek.reach(obj,'$meta.created', {default: (new Date()).toISOString()}),
+      revision: Hoek.reach(obj,'$meta.revision', {default: 1}),
+      removed: Hoek.reach(obj,'$meta.removed')
+    }
+    
+
+    delete doc.$meta
+
+    return doc
+  }
+
+  ensureId(obj){
+    let temp = {...obj}
+    if(!reach(temp,'$meta.id')){
+      temp.$meta.id = (new ObjectId()).toHexString()
+    }
+
+    let dbDoc = this.documentFromObject(temp)
+    
+    return dbDoc
+  }
+
+  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 resultSet = collection.find(query)
+
+
+    if(mongoQuery.hasLimit()){
+      resultSet = resultSet.limit(mongoQuery.getLimit())
+    }
+
+    if(mongoQuery.hasSort()){
+      resultSet = resultSet.sort( mongoQuery.getSort() )
+    }
+
+    return (await resultSet.toArray()).map(this.documentToObject) || []
+  }
+
+  async insertMany(collectionName, docs){ 
+    debug('insert collection=', collectionName, ' docs=', JSON.stringify(docs,null,2))
+    let collection = await this.getCollection(collectionName)
+
+    let resultSet = []
+
+    for(let obj of docs){
+      let temp = {...obj}
+      if(temp._id===undefined){ temp._id = (new ObjectId()).toString(); temp.$meta.id=temp._id;  }
+
+      let dbDoc = this.documentFromObject(temp)
+
+      const stripped = this.stripMeta(temp)
+
+      debug('validating', stripped,'from', temp)
+
+      await this.factory.validate(collectionName, stripped)
+
+      debug('its good, inserting', dbDoc)
+
+      await collection.insert( dbDoc )
+
+      debug('inserted', dbDoc)
+
+      const finalObj = this.documentToObject(dbDoc)
+
+      debug('returning', finalObj)
+
+      this.emitChange(finalObj, 'create')
+
+      resultSet.push(finalObj)
+    }
+
+
+    return resultSet
+
+  }
+  
+  async update(collectionName, docs){ 
+    debug('update collection', collectionName, ' docs', docs)
+
+    let collection = await this.getCollection(collectionName)
+
+    let objs = []
+
+    for(let obj of docs){
+      let dbDoc = this.documentFromObject(obj)
+
+      debug('updating',obj, 'to', dbDoc)
+
+      const stripped = this.stripMeta(dbDoc)
+      const meta = this.onlyMeta(obj)
+
+      debug('validating', stripped,'from', dbDoc)
+
+      await this.factory.validate(collectionName, stripped)
+
+      debug('its good, updating', dbDoc)
+
+      let old = await collection.findOne( {'_id': dbDoc._id})
+
+      debug('found old', old)
+      dbDoc.meta.revision = old.meta.revision++
+
+      
+      let mergedDoc = {...old, ...dbDoc}
+
+      await collection.update({'_id': dbDoc._id}, mergedDoc)
+
+      const finalObj = this.documentToObject(mergedDoc)
+
+      this.emitChange(finalObj, 'update')
+
+      objs.push( finalObj )
+
+    }
+
+    return objs
+  }
+
+  async findAndRemove(collectionName, obj){ 
+    debug('findAndRemove collection', collectionName, ' obj', obj)
+
+    let collection = await this.getCollection(collectionName)
+
+    const dbDoc = await collection.findOne( {'_id': obj.$meta.id})
+
+    debug('found old doc', dbDoc)
+
+    await collection.remove( { '_id': obj.$meta.id } )
+
+    debug('dbDoc', dbDoc)
+
+    let finalObj = this.documentToObject(dbDoc)
+
+    finalObj.$meta.removed = true
+
+    this.emitChange(finalObj, 'remove')
+
+    debug('obj', finalObj)
+
+    return finalObj
+  }
+}

src/bouncer/idb.js

@@ -46,7 +46,7 @@ module.exports = class IDb extends EventEmitter {
   ensureId(obj){ throw new Error('not implemented') }
 
   stripMeta(doc){
-    const {meta, $meta, ...rawMsg} = doc
+    const {_id, meta, $meta, ...rawMsg} = doc
     return rawMsg
   }
 

src/bouncer/index.js

@@ -6,5 +6,6 @@ module.exports = {
   MongoQuery: require('./mongo-query'),
 
   LokiDb: require('./db/loki-db'),
-  TingoDb: require('./db/tingo-db')
+  TingoDb: require('./db/tingo-db'),
+  ZangoDb: require('./db/zango-db')
 }

src/party/idocument.js

@@ -144,7 +144,7 @@ class IDocument extends EventEmitter {
     const rawDocument = (await this.party.update(value))[0]
     debug('doc updated')
     if(expectedRevision != reach(rawDocument, '$meta.revision')){
-      console.log('pull')
+      debug('pull')
       await this.pull()
     }
   }

src/party/index-browser.js

@@ -2,6 +2,7 @@ const IParty = require('./iparty')
 const PeerParty = require('./peer/peer-party')
 const CloudParty = require('./cloud/cloud-party')
 const LokiParty = require('./local/loki-party')
+const ZangoParty = require('./local/zango-party')
 
 const IDocument = require('./idocument')
 const DocumentFactory = require('./document-factory')
@@ -12,6 +13,6 @@ const LokiDb = require('../bouncer/db/loki-db')
 module.exports = {
   IDocument, IParty, DocumentFactory,
   CloudDocument,
-  CloudParty, LokiParty, PeerParty,
+  CloudParty, LokiParty, ZangoParty, PeerParty,
   LokiDb
-}
+}

src/party/index.js

@@ -3,8 +3,10 @@ const PeerParty = require('./peer/peer-party')
 const CloudParty = require('./cloud/cloud-party')
 const LokiParty = require('./local/loki-party')
 const TingoParty = require('./local/tingo-party')
+const ZangoParty = require('./local/zango-party')
 const MongoParty = require('./mongo/mongo-party')
 
+
 const IDocument = require('./idocument')
 const DocumentFactory = require('./document-factory')
 const CloudDocument = require('./cloud/cloud-document')
@@ -13,5 +15,5 @@ module.exports = {
   IDocument, IParty, DocumentFactory,
   CloudDocument,
   CloudParty, LokiParty, PeerParty, MongoParty,
-  TingoParty
+  TingoParty, ZangoParty
 }