@live-change/framework 0.5.10 → 0.5.14

package/lib/App.js

@@ -73,7 +73,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()
   }

package/lib/clientSideFilters/clientSideFilter.js

@@ -15,4 +15,12 @@ module.exports = function(service, definition, app) {
 
   delete definition.events
   delete definition.triggers
+  delete definition.authenticators
+  delete definition.processors
+  delete definition.validators
+  delete definition.processed
+  delete definition.foreignModels
+  delete definition.foreignIndexes
+  delete definition.config
+  delete definition.indexes
 }

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/Dao.js

@@ -141,7 +141,7 @@ function prepareReactiveDaoDefinition(config, clientData) {
                   Promise.all(
                     config.services.map(service => service.app.clientSideDefinition(service, clientData))
                   ).then(services => new ReactiveDao.ObservableValue({
-                    client: clientData,
+                    client: { ...clientData, sessionKey: undefined },
                     services
                   }))
                 )
@@ -150,7 +150,7 @@ function prepareReactiveDaoDefinition(config, clientData) {
                 return Promise.all(
                   config.services.map(service => service.app.clientSideDefinition(service, clientData))
                 ).then(services => ({
-                  client: clientData,
+                  client: { ...clientData, sessionKey: undefined },
                   services
                 }))
               }

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/utils/validators.js

@@ -11,6 +11,21 @@ function nonEmpty(value) {
     if(Object.keys(value).length == 0) return 'empty'
   }
 }
+
+function getField(context, fieldName) {
+  const propPath = context.propName ? context.propName.split('.') : []
+  propPath.pop()
+  let path
+  if(fieldName[0] == '/') {
+    path = fieldName.slice(1).split('.')
+  } else {
+    path = propPath.concat(fieldName.split('.'))
+  }
+  let p = context.props
+  for(let part of path) p = p[part]
+  return p
+}
+
 nonEmpty.isRequired = () => true
 
 let validators = {
@@ -49,7 +64,7 @@ let validators = {
       }
     }
     validator.isRequired = (context) => {
-      if(getField(context.props, prop) == to) {
+      if(getField(context, prop) == to) {
         for(let v of validators) {
           if(v.isRequired && v.isRequired(context)) return true
         }

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.10",
+  "version": "0.5.14",
   "description": "Live Change Framework - ultimate solution for real time mobile/web apps",
   "main": "index.js",
   "scripts": {
@@ -21,12 +21,12 @@
   },
   "homepage": "https://github.com/live-change/framework",
   "devDependencies": {
-    "@live-change/dao": "^0.3.6",
-    "@live-change/dao-websocket": "^0.3.1",
-    "@live-change/db": "^0.3.62",
+    "@live-change/dao": "^0.3.13",
+    "@live-change/dao-websocket": "^0.3.2",
+    "@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",
@@ -34,13 +34,13 @@
     "leveldown": "^6.1.0",
     "levelup": "^5.1.1",
     "memdown": "^6.1.1",
-    "node-lmdb": "^0.9.5",
+    "node-lmdb": "^0.8.0",
     "os-service": "^2.2.0",
     "rimraf": "^3.0.2",
-    "rocksdb": "^5.1.1",
-    "sockjs": "^0.3.21",
+    "rocksdb": "^5.2.0",
+    "@live-change/sockjs": "^0.4.0-rc.1",
     "subleveldown": "^6.0.1",
-    "tape": "^5.3.1",
+    "tape": "^5.3.2",
     "websocket": "^1.0.34"
   }
 }