@live-change/framework 0.5.12 → 0.5.16

package/lib/App.js

@@ -34,6 +34,8 @@ const eventListener = require('./processes/eventListener.js')
 
 const utils = require('./utils.js')
 
+const debug = require('debug')('framework')
+
 class App {
 
   constructor(config = {}) {
@@ -73,7 +75,7 @@ class App {
     this.databaseName = config?.db?.name || 'test'
 
     this.instanceId = randomString(4)
-    this.uidGenerator = uidGenerator(this.instanceId)
+    this.uidGenerator = uidGenerator(this.instanceId, this.config.uidBorders)
 
     this.activeTimeouts = new Set()
   }
@@ -104,7 +106,7 @@ class App {
   }
 
   async applyChanges(changes, service, updaters, force) {
-    console.log("APPLY CHANGES", JSON.stringify(changes, null, '  '))
+    debug("APPLY CHANGES", JSON.stringify(changes, null, '  '))
     updaters = updaters || this.defaultUpdaters
     for(let updater of updaters) {
       await updater(changes, service, this, force)
@@ -179,7 +181,7 @@ class App {
     })
     const routes = await this.dao.get(['database', 'tableRange', this.databaseName, 'triggerRoutes',
       { gte: data.type+'=', lte: data.type+'=\xFF\xFF\xFF\xFF' }])
-    console.log("TRIGGER ROUTES", routes)
+    console.log("TRIGGER ROUTES", data.type, '=>', routes)
     let promises = []
     for(const route of routes) {
       promises.push(this.triggerService(route.service, { ...data }))
@@ -386,6 +388,19 @@ class App {
     }
   }
 
+
+  query(query, params) {
+    return ['database', 'query', this.databaseName, `(${ query }}`, params]
+  }
+
+  queryGet(query, params) {
+    return this.dao.get(this.query(query, params))
+  }
+
+  queryObservable(query, params) {
+    return this.dao.observable(this.query(query, params))
+  }
+
   async close() {
     for(const timeout of this.activeTimeouts) {
       clearTimeout(timeout)

package/lib/definition/ServiceDefinition.js

@@ -84,6 +84,7 @@ class ServiceDefinition {
     this.use = []
     this.processors = []
     this.authenticators = []
+    this.beforeStartCallbacks = []
     this.validators = defaultValidators
     for(let key in definition) this[key] = definition[key]
   }
@@ -144,6 +145,10 @@ class ServiceDefinition {
     this.authenticators.push(authenticator)
   }
 
+  beforeStart(callback) {
+    this.beforeStartCallbacks.push(callback)
+  }
+
   toJSON() {
     let models = {}
     for(let key in this.models) models[key] = this.models[key].toJSON()

package/lib/runtime/Action.js

@@ -20,7 +20,8 @@ class Action {
       action: this,
       service: this.service,
       client: command.client,
-      command
+      command,
+      trigger: (...args) => this.service.trigger(...args) /// TODO: collet call traces
     }, emit)
 
     resultPromise = resultPromise.then(async result => {

package/lib/runtime/ApiServer.js

@@ -28,24 +28,24 @@ class ApiServer {
 
   async daoFactory(credentialsp, ip) {
     let credentials = { ...credentialsp, ip, roles: [] }
+    const allAuthenticators = []
     if(this.config.authenticators) {
       const auth = Array.isArray(this.config.authenticators)
           ? this.config.authenticators : [this.config.authenticators]
-      for(const authenticator of auth) {
-        if(authenticator && authenticator.prepareCredentials)
-          await authenticator.prepareCredentials(credentials, this.config)
-      }
+      allAuthenticators.push(...auth.filter(a => !!a))
     }
     for(const service of this.config.services) {
-      console.log("SERIVCE AUTH", service.name, service.authenticators)
+      //console.log("SERIVCE AUTH", service.name, service.authenticators)
       if(service.authenticators) {
-        for(const authenticator of service.authenticators) {
-          if(authenticator && authenticator.prepareCredentials)
-            await authenticator.prepareCredentials(credentials, this.config)
-        }
+        allAuthenticators.push(...service.authenticators.filter(a => !!a))
       }
     }
-    const dao = new this.DaoConstructor(this.config, { ...credentials })
+    for(const authenticator of allAuthenticators) {
+      if(authenticator.prepareCredentials) {
+        await authenticator.prepareCredentials(credentials, this.config)
+      }
+    }     
+    const dao = new this.DaoConstructor({ ...this.config, authenticators: allAuthenticators }, { ...credentials })
     await dao.start()
     return dao
   }

package/lib/runtime/LiveDao.js

@@ -11,21 +11,7 @@ class LiveDao extends LcDao.DaoProxy {
 
     this.authenticators = []
     if(this.config.authenticators) {
-      const auth = Array.isArray(this.config.authenticators)
-          ? this.config.authenticators : [this.config.authenticators]
-      for(const authenticator of auth) {
-        if(authenticator && authenticator.authenticatorObservable)
-          this.authenticators.push(authenticator)
-      }
-    }
-    for(const service of this.config.services) {
-      console.log("SERIVCE AUTH", service.name, service.authenticators)
-      if(service.authenticators) {
-        for(const authenticator of service.authenticators) {
-          if(authenticator && authenticator.authenticatorObservable)
-            this.authenticators.push(authenticator)
-        }
-      }
+      this.authenticators = this.config.authenticators.filter(a => a.credentialsObservable)
     }
 
     this.currentDao = null
@@ -48,8 +34,8 @@ class LiveDao extends LcDao.DaoProxy {
     for(const credentialsObserver of this.credentialsObservations) {
       credentials = {
         ...credentials,
-        ...credentialsObservers.credentials,
-        roles: [...credentials.roles, ...credentialsObserver.credentials.roles]
+        ...credentialsObserver.credentials,
+        roles: [...credentials.roles, ...(credentialsObserver.credentials.roles || [])]
       }
     }
     return credentials
@@ -57,13 +43,21 @@ class LiveDao extends LcDao.DaoProxy {
 
   async start() {
     this.credentialsObservations = this.authenticators.map(authenticator => {
-      const observable = authenticator.authenticatorObservable(this.initialCredentials)
+      const result = authenticator.credentialsObservable(this.initialCredentials)
+      const observable = result.then ? new LcDao.ObservablePromiseProxy(result) : result
       const observer = {
-        set: (newCredentials) => {
-          state.credentials = newCredentials
+        set: (data) => {
+          console.log("NEW CREDENTIALS", data)
+          if(data) {
+            const { id, ...newCredentials } = data
+            state.credentials = newCredentials
+          } else {
+            state.credentials = {}
+          }
           this.refreshCredentials()
         }
       }
+      observable.observe(observer)
       const promise = waitForSignal(observable)
       const state = {
         observable, observer, promise, credentials: {}

package/lib/runtime/ReaderModel.js

@@ -14,6 +14,31 @@ class ReaderModel {
     return ['database', 'tableObject', this.service.databaseName, this.tableName, id]
   }
 
+  limitedPath(id, fields) { // takes object or list of fields
+    if(Array.isArray(fields)) {
+      fields = utils.fieldListToFieldsObject(fields)
+    }
+    fields.id = true // id is required
+    return ['database', 'queryObject', this.service.databaseName, `(${
+      async (input, output, { tableName, id, fields }) => {
+        function mapper(obj, fields) {
+          if(!obj) return obj
+          const out = {}
+          for(const key in fields) {
+            if(typeof fields[key] == 'object') {
+              out[key] = mapper(obj[key], fields[key])
+            } else {
+              out[key] = obj[key]
+            }
+          }
+          return out
+        }
+        await input.table(tableName).object(id).onChange((obj, oldObj) =>
+          output.change(mapper(obj, fields), mapper(oldObj, fields)))
+      }
+    })`, { tableName: this.tableName, id, fields }]
+  }
+
   rangePath(range = {}) {
     if(typeof range != 'object') {
       const str = range.toString()
@@ -218,39 +243,30 @@ class ReaderModel {
   observable(id) {
     return this.service.dao.observable(this.path(id), ReactiveDao.ObservableValue)
   }
-
   async get(id) {
     return this.service.dao.get(this.path(id), ReactiveDao.ObservableValue)
   }
-
   rangeObservable(range) {
     return this.service.dao.observable(this.rangePath(range), ReactiveDao.ObservableList)
   }
-
   async rangeGet(range) {
     return this.service.dao.get(this.rangePath(range), ReactiveDao.ObservableList)
   }
-
   indexRangeObservable(index, range, pathRange = null) {
     return this.service.dao.observable(this.indexRangePath(index, range, pathRange), ReactiveDao.ObservableList)
   }
-
   async indexRangeGet(index, range, pathRange = null) {
     return this.service.dao.get(this.indexRangePath(index, range, pathRange), ReactiveDao.ObservableList)
   }
-
   indexObjectObservable(index, range, pathRange = null) {
     return this.service.dao.observable(this.indexObjectPath(index, range, pathRange))
   }
-
   async indexObjectGet(index, range, pathRange) {
     return this.service.dao.get(this.indexObjectPath(index, range, pathRange))
   }
-
   sortedIndexRangeObservable(index, range, pathRange = null) {
     return this.service.dao.observable(this.sortedIndexRangePath(index, range, pathRange), ReactiveDao.ObservableList)
   }
-
   async sortedIndexRangeGet(index, range, pathRange = null) {
     return this.service.dao.get(this.sortedIndexRangePath(index, range, pathRange), ReactiveDao.ObservableList)
   }

package/lib/runtime/Service.js

@@ -61,7 +61,6 @@ class Service {
     }
 
     this.authenticators = this.definition.authenticators
-
   }
 
   async start(config) {
@@ -76,7 +75,9 @@ class Service {
     let promises = config.processes.map(proc => proc(this, config))
     await Promise.all(promises)
 
-    //if(config.startEventListener) this.startEventListener()
+    for(const beforeStartCallback of this.definition.beforeStartCallbacks) {
+      await beforeStartCallback(this)
+    }
 
     console.log("Service", this.definition.name, "started")
   }

package/lib/runtime/TriggerHandler.js

@@ -16,7 +16,8 @@ class TriggerHandler {
       ...preparedParams
     }, {
       action: this,
-      service: this.service
+      service: this.service,
+      trigger: (...args) => this.service.trigger(...args) /// TODO: collet call traces
     }, emit)
 
     resultPromise = resultPromise.then(async result => {

package/lib/updaters/database.js

@@ -1,5 +1,5 @@
 const utils = require("../utils.js")
-
+const debug = require('debug')('framework:updaters:db')
 async function update(changes, service, app, force) {
 
   const dao = app.dao
@@ -39,7 +39,7 @@ async function update(changes, service, app, force) {
       indexName = generateTableName(indexName)
     }
 
-    console.log("CREATE INDEX", indexName)
+    debug("CREATE INDEX", indexName)
 
     const options = {
       multi: index.multi || false
@@ -99,19 +99,19 @@ async function update(changes, service, app, force) {
       }
     }
 
-    console.log("INDEX CREATED!", index)
+    debug("INDEX CREATED!", index)
   }
 
-  console.log("DATABASE UPDATER")
+  debug("DATABASE UPDATER")
 
   for(let change of changes) {
-    console.log("PROCESSING CHANGE", change)
+    debug("PROCESSING CHANGE", change)
     switch(change.operation) {
       case "createModel": {
         const model = change.model
         const tableName = generateTableName(model.name)
         await dao.request(['database', 'createTable'], database, tableName)
-        console.log("TABLE CREATED!", tableName)
+        debug("TABLE CREATED!", tableName)
         for(let indexName in model.indexes) {
           const index = model.indexes[indexName]
           await createIndex(tableName, indexName, index)
@@ -134,7 +134,7 @@ async function update(changes, service, app, force) {
       } break
       case "deleteModel": {
         const tableName = generateTableName(change.name)
-        console.log("DELETE TABLE")
+        debug("DELETE TABLE")
         const model = change.model
         for(let indexName in model.indexes) {
           let indexName = change.name
@@ -188,9 +188,9 @@ async function update(changes, service, app, force) {
         const property = change.property
         let update = {}
         update[change.name] = property.defaultValue
-        console.log("CREATE PROPERTY UPDATE", update)
+        debug("CREATE PROPERTY UPDATE", update)
         await dao.request(['database', 'query'], database, `(${
-            async (input, output, { table, update }) => 
+            async (input, output, { table, update }) =>
               await input.table(table).onChange((obj, oldObj) => {
                 if(obj) output.table(table).update(obj.id, [{ op: 'merge', value: update }])
               })
@@ -231,14 +231,14 @@ async function update(changes, service, app, force) {
       default:
     }
   }
-  console.log("DATABASE UPDATED")
+  debug("DATABASE UPDATED")
 
-  console.log("CHECKING DATABASE INTEGRITY...")
+  debug("CHECKING DATABASE INTEGRITY...")
   const indexes = await dao.get(['database', 'indexesList', database])
   for(const indexName in service.indexes) {
     const fullIndexName = generateTableName(indexName)
     if(!indexes.includes(fullIndexName)) {
-      console.log("index", fullIndexName, "not found! creating...")
+      debug("index", fullIndexName, "not found! creating...")
       await createIndex(null, indexName, service.index[indexName])
     }
   }
@@ -248,8 +248,8 @@ async function update(changes, service, app, force) {
     for(const indexName in model.indexes) {
       const fullIndexName = tableName + '_' + indexName
       if(!indexes.includes(fullIndexName)) {
-        console.log("I", indexes)
-        console.log("table ", modelName, " index", fullIndexName, "not found! creating...")
+        debug("I", indexes)
+        debug("table ", modelName, " index", fullIndexName, "not found! creating...")
         await createIndex(generateTableName(modelName), indexName, model.indexes[indexName])
       }
     }

package/lib/utils/CommandQueue.js

@@ -22,7 +22,7 @@ class CommandQueue {
     }
   }
   async start() {
-    console.log("START QUEUE", this.tableName, this.indexName)
+    //console.log("START QUEUE", this.tableName, this.indexName)
     await this.connection.request(['database', 'createTable'], this.database, this.tableName).catch(e => 'ok')
     await this.connection.request(['database', 'createIndex'], this.database, this.indexName, `(${
         async function(input, output, { tableName }) {

package/lib/utils/EventSourcing.js

@@ -29,7 +29,7 @@ class EventSourcing {
     await this.connection.request(['database', 'createLog'], this.database, this.logName).catch(e => 'ok')
     this.state = await this.connection.get(
         ['database', 'tableObject', this.database, 'eventConsumers', this.consumerId])
-    console.log("GOT CONSUMER STATE", this.state)
+    //console.log("GOT CONSUMER STATE", this.state)
     if(!this.state) {
       this.state = {
         id: this.consumerId,
@@ -83,12 +83,12 @@ class EventSourcing {
       try {
         await this.doHandleEvent(event, mainEvent)
         done = true
-      } catch(e) {    
-        if(e == 'timeout' && retry < maxRetry) {        
+      } catch(e) {
+        if(e == 'timeout' && retry < maxRetry) {
           retry++
           const sleepTime = Math.pow(2, retry) * 100
           console.error(`Event \n${JSON.stringify(event, null, "  ")}\n handling timeout, will retry `,
-            retry, ' time after ', sleepTime, 'ms sleep')          
+            retry, ' time after ', sleepTime, 'ms sleep')
           sleep(retry)
         } else {
           console.error(`EVENT \n${JSON.stringify(event, null, "  ")}\n HANDLING ERROR`, e, ' => STOPPING!')

package/lib/utils.js

@@ -231,8 +231,23 @@ const rangeProperties = {
   }
 }
 
+function fieldListToFieldsObject(fieldList) {
+  const fields = {}
+  for(const fieldName of fieldList) {
+    const parts = fieldName.split('.')
+    let at = fields
+    let i = 0
+    for(; i < parts.length - 1; i ++) {
+      if(!at[parts[i]]) at[parts[i]] = {}
+      at = at[parts[i]]
+    }
+    at[parts[i]] = true
+  }
+  return fields
+}
+
 module.exports = {
   typeName, toJSON, setDifference, mapDifference, crudChanges,
   getProperty, setProperty, getField, setField, isObject, mergeDeep, generateDefault,
-  prefixRange, rangeProperties
+  prefixRange, rangeProperties, fieldListToFieldsObject
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.5.12",
+  "version": "0.5.16",
   "description": "Live Change Framework - ultimate solution for real time mobile/web apps",
   "main": "index.js",
   "scripts": {
@@ -26,20 +26,12 @@
     "@live-change/db": "^0.3.64",
     "@live-change/db-store-level": "^0.1.15",
     "@live-change/db-store-lmdb": "^0.1.22",
-    "@live-change/uid": "^0.1.3",
+    "@live-change/uid": "^0.1.4",
     "cookie": "^0.4.1",
-    "encoding-down": "^7.1.0",
     "express": "^4.17.1",
-    "level-rocksdb": "^5.0.0",
-    "leveldown": "^6.1.0",
-    "levelup": "^5.1.1",
-    "memdown": "^6.1.1",
-    "node-lmdb": "^0.8.0",
     "os-service": "^2.2.0",
     "rimraf": "^3.0.2",
-    "rocksdb": "^5.2.0",
     "@live-change/sockjs": "^0.4.0-rc.1",
-    "subleveldown": "^6.0.1",
     "tape": "^5.3.2",
     "websocket": "^1.0.34"
   }