@live-change/framework 0.5.8 → 0.5.9

package/index.js

@@ -1,15 +1,18 @@
 const App = require('./lib/App.js')
-App.app = () => {
+
+module.exports = App
+
+module.exports.app = () => {
   if(!global.liveChangeFrameworkApp) {
     global.liveChangeFrameworkApp = new App()
   }
   return global.liveChangeFrameworkApp
 }
 
-App.utils = require('./lib/utils.js')
-App.validation = require('./lib/utils/validation.js')
+module.exports.utils = require('./lib/utils.js')
+module.exports.validation = require('./lib/utils/validation.js')
+module.exports.rangeProperties = module.exports.utils.rangeProperties
 
-module.exports = App
 
 module.exports.ActionDefinition = require('./lib/definition/ActionDefinition.js')
 module.exports.EventDefinition = require('./lib/definition/EventDefinition.js')

package/lib/App.js

@@ -9,8 +9,9 @@ const Service = require("./runtime/Service.js")
 const profileLog = require("./utils/profileLog.js")
 
 const Dao = require("./runtime/Dao.js")
+const SessionDao = require("./runtime/SessionDao.js")
+const LiveDao = require("./runtime/LiveDao.js")
 const ApiServer = require("./runtime/ApiServer.js")
-const SessionApiServer = require("./runtime/SessionApiServer.js")
 
 const reverseRelationProcessor = require("./processors/reverseRelation.js")
 const indexListProcessor = require("./processors/indexList.js")
@@ -73,10 +74,13 @@ class App {
 
     this.instanceId = randomString(4)
     this.uidGenerator = uidGenerator(this.instanceId)
+
+    this.activeTimeouts = new Set()
   }
 
   createServiceDefinition( definition ) {
-    const config = this.config && this.config.services && this.config.services[definition.name]
+    const config = this.config && this.config.services && this.config.services.find
+      && this.config.services.find(c => c.name == definition.name)
     return new ServiceDefinition({ ...definition, config })
   }
 
@@ -150,9 +154,11 @@ class App {
   async createApiServer( config ) {
     return new ApiServer({ ...config, app: this })
   }
-
   async createSessionApiServer( config ) {
-    return new SessionApiServer({ ...config, app: this })
+    return new ApiServer({ ...config, app: this }, SessionDao)
+  }
+  async createLiveApiServer( config ) {
+    return new ApiServer({ ...config, app: this }, LiveDao)
   }
 
   generateUid() {
@@ -253,9 +259,11 @@ class App {
         requestTimeout = this.requestTimeout
       }
       if(requestTimeout) {
-        setTimeout(() => {
+        const timeout = setTimeout(() => {
+          this.activeTimeouts.delete(timeout)
           reject('timeout')
         }, requestTimeout)
+        this.activeTimeouts.add(timeout)
       }
     }).finally(() => {
       objectObservable.unobserve(observer)
@@ -379,6 +387,9 @@ class App {
   }
 
   async close() {
+    for(const timeout of this.activeTimeouts) {
+      clearTimeout(timeout)
+    }
     this.dao.dispose()
   }
 
@@ -386,4 +397,3 @@ class App {
 
 
 module.exports = App
-module.exports.rangeProperties = utils.rangeProperties

package/lib/runtime/Action.js

@@ -42,7 +42,7 @@ class Action {
       parameters: await preFilterParameters(parameters, this.definition.properties)
     }
     if(parameters._commandId) command.id = parameters._commandId
-    console.log("CALL COMMAND", JSON.stringify(command, null, "  "))
+    //console.log("CALL COMMAND", JSON.stringify(command, null, "  "))
     return this.service.app.command(command, this.definition.requestTimeout)
   }
 }

package/lib/runtime/ApiServer.js

@@ -1,14 +1,16 @@
-const ReactiveDao = require("@live-change/dao")
+const LcDao = require("@live-change/dao")
 const Dao = require("./Dao.js")
 const cookie = require('cookie')
 
 const { getIp } = require("./utils.js")
 
 class ApiServer {
-  constructor(config) {
+  constructor(config, DaoConstructor = Dao) {
     this.config = config
-    this.reactiveServer = new ReactiveDao.ReactiveServer(
-       (credentials, connection) => {
+    this.DaoConstructor = DaoConstructor
+
+    this.reactiveServer = new LcDao.ReactiveServer(
+      (credentials, connection) => {
         const ip = getIp(connection)
         if(this.config.fastAuth) {
           if(typeof this.config.fastAuth == 'function') {
@@ -24,16 +26,28 @@ class ApiServer {
       }, config)
   }
 
-  async daoFactory(credentialsp, ip)  {
+  async daoFactory(credentialsp, ip) {
     let credentials = { ...credentialsp, ip, roles: [] }
-    if(this.config.authentication) {
-      let auth = Array.isArray(this.config.authentication)
-          ? this.config.authentication : [this.config.authentication]
-      for(let authenticator of auth) {
-        if(authenticator) await authenticator(credentials, this.config)
+    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)
+      }
+    }
+    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.prepareCredentials)
+            await authenticator.prepareCredentials(credentials, this.config)
+        }
       }
     }
-    return new Dao(this.config, { ...credentials })
+    const dao = new this.DaoConstructor(this.config, { ...credentials })
+    await dao.start()
+    return dao
   }
 
   handleConnection(connection) {

package/lib/runtime/LiveDao.js

@@ -0,0 +1,103 @@
+const LcDao = require("@live-change/dao")
+const Dao = require("./Dao.js")
+
+const { waitForSignal } = require('./utils.js')
+
+class LiveDao extends LcDao.DaoProxy {
+  constructor(config, credentials) {
+    super(null)
+    this.config = config
+    this.initialCredentials = credentials
+
+    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.currentDao = null
+    this.disposed = false
+    this.started = false
+    this.credentials = JSON.parse(JSON.stringify(this.initialCredentials))
+  }
+
+  async refreshCredentials() {
+    if(!this.started) return /// waiting for start
+    const newCredentials = this.computeCredentials()
+    if(JSON.stringify(newCredentials) != JSON.stringify(this.credentials)) {
+      this.credentials = newCredentials
+      this.buildDao()
+    }
+  }
+
+  computeCredentials() {
+    let credentials = JSON.parse(JSON.stringify(this.initialCredentials))
+    for(const credentialsObserver of this.credentialsObservations) {
+      credentials = {
+        ...credentials,
+        ...credentialsObservers.credentials,
+        roles: [...credentials.roles, ...credentialsObserver.credentials.roles]
+      }
+    }
+    return credentials
+  }
+
+  async start() {
+    this.credentialsObservations = this.authenticators.map(authenticator => {
+      const observable = authenticator.authenticatorObservable(this.initialCredentials)
+      const observer = {
+        set: (newCredentials) => {
+          state.credentials = newCredentials
+          this.refreshCredentials()
+        }
+      }
+      const promise = waitForSignal(observable)
+      const state = {
+        observable, observer, promise, credentials: {}
+      }
+      return state
+    })
+
+    await Promise.all(this.credentialsObservations.map(observation => observation.promise))
+
+    const newCredentials = this.computeCredentials()
+    if(JSON.stringify(newCredentials) != JSON.stringify(this.credentials)) {
+      this.credentials = newCredentials
+    }
+    this.buildDao()
+    this.started = true
+
+    if(!this.dao) throw new Error("dao not created?!")
+  }
+
+  buildDao() {
+    const oldDao = this.currentDao
+    this.currentDao = new Dao(this.config, { ...this.credentials })
+    this.setDao(this.currentDao)
+    if(oldDao) oldDao.dispose()
+  }
+  dispose() {
+    if(this.disposed) throw new Error("DAO dispose called twice!")
+    this.disposed = true
+    this.started = false
+    for(const observation of this.credentialsObservations) {
+      observation.observable.unobserver(observation.observer)
+    }
+    super.dispose()
+  }
+}
+
+module.exports = LiveDao

package/lib/utils/CommandQueue.js

@@ -48,7 +48,7 @@ class CommandQueue {
     })
   }
   async handleCommand(command) {
-    console.log("COMMNAD HANDLE!", command)
+    //console.log("COMMNAD HANDLE!", command)
     if(command.state != 'new') return
     if(this.commandsStarted.has(command.id)) return
     this.commandsStarted.set(command.id, command)

package/lib/utils/validation.js

@@ -28,7 +28,7 @@ function getValidators(source, service) {
 }
 
 async function validate(props, validators, context) {
-  console.log("VALIDATE PROPS", props, "WITH", validators)
+  //console.log("VALIDATE PROPS", props, "WITH", validators)
   let propPromises = {}
   for(let propName in validators) {
     let propValidators = validators[propName]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.5.8",
+  "version": "0.5.9",
   "description": "Live Change Framework - ultimate solution for real time mobile/web apps",
   "main": "index.js",
   "scripts": {

package/lib/runtime/SessionApiServer.js

@@ -1,54 +0,0 @@
-const LcDao = require("@live-change/dao")
-const SessionDao = require("./SessionDao.js")
-const cookie = require('cookie')
-
-const { getIp } = require("./utils.js")
-
-class SessionApiServer {
-  constructor(config) {
-    this.config = config
-    this.reactiveServer = new LcDao.ReactiveServer(
-      (credentials, connection) => {
-        const ip = getIp(connection)
-        if(this.config.fastAuth) {
-          if(typeof this.config.fastAuth == 'function') {
-            credentials = this.config.fastAuth(connection)
-          } else {
-            const cookies = cookie.parse(connection.headers.cookie || '')
-            const sessionKey = cookies.sessionKey
-            if(!sessionKey) throw new Error('session key undefined')
-            credentials = { sessionKey }
-          }
-        }
-        return this.daoFactory(credentials, ip)
-      }, config)
-  }
-
-  async daoFactory(credentialsp, ip) {
-    let credentials = { ...credentialsp, ip, roles: [] }
-    if(this.config.authenticators) {
-      const auth = Array.isArray(this.config.authenticators)
-          ? this.config.authenticators : [this.config.authenticators]
-      for(const authenticator of auth) {
-        if(authenticator) await authenticator(credentials, this.config)
-      }
-    }  
-    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) await authenticator(credentials, this.config)
-        }
-      }
-    }
-    const dao = new SessionDao(this.config, { ...credentials })
-    await dao.start()
-    return dao
-  }
-
-  handleConnection(connection) {
-    this.reactiveServer.handleConnection(connection)
-  }
-}
-
-module.exports = SessionApiServer