@live-change/framework 0.7.15 → 0.7.17

package/lib/runtime/ApiServer.js

@@ -12,13 +12,13 @@ class ApiServer {
     this.reactiveServer = new LcDao.ReactiveServer(
       (credentials, connection) => {
         const ip = getIp(connection)
-        if(this.config.fastAuth) {
+        if(!credentials && 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')
+            if(!sessionKey) return null // noFastAuth
             credentials = { sessionKey }
           }
         }
@@ -44,7 +44,7 @@ class ApiServer {
       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

@@ -10,22 +10,31 @@ function promiseMap(promise, fn) {
 function prepareReactiveDaoDefinition(config, clientData) {
   if(!clientData.roles) throw new Error("no roles")
   let dao = {}
+  let staticDefinitions = []
   if(config.remote) {
-    const remote = config.remote(clientData)
-    for (let remoteName of remote) {
+    const remotes = config.remote(clientData)
+    for (let remoteName in remotes) {
+      const remote = remotes[remoteName]
       dao[remoteName] = {
         type: "remote",
         generator: ReactiveDao.ObservableList,
         ...remote
       }
+      if(remote.definition) {
+        staticDefinitions.push(remote.definition)
+      }
     }
   }
   if(config.local) {
-    const local = config.local(clientData)
-    for (let localName in local) {
+    const locals = config.local(clientData)
+    for (let localName in locals) {
+      const local = locals[localName]
       dao[localName] = {
         type: "local",
-        source: local[localName]
+        source: local
+      }
+      if(local.definition) {
+        staticDefinitions.push(local.definition)
       }
     }
   }
@@ -109,6 +118,10 @@ function prepareReactiveDaoDefinition(config, clientData) {
       }
     }
     if(config.shareDefinition) {
+      const definitionsPromise = Promise.all([
+        ...(config.services.map(service => service.app.clientSideDefinition(service, clientData))),
+        ...staticDefinitions
+      ])
       dao['metadata'] = {
         type: "local",
         source: new ReactiveDao.SimpleDao({
@@ -125,32 +138,26 @@ function prepareReactiveDaoDefinition(config, clientData) {
             serviceDefinitions: {
               observable(parameters) {
                 return new ReactiveDao.ObservablePromiseProxy(
-                    Promise.all(
-                      config.services.map(service => service.app.clientSideDefinition(service, clientData))
-                    ).then(x => new ReactiveDao.ObservableValue(x))
+                  definitionsPromise.then(x => new ReactiveDao.ObservableValue(x))
                 )
                 /*let definitions = config.services.map(s => s.definition.toJSON())
                 return new ReactiveDao.ObservableValue(definitions)*/
               },
               async get(parameters) {
-                return Promise.all(config.services.map(s => s.app.clientSideDefinition(s, clientData)))
+                return definitionsPromise
               }
             },
             api: {
               observable(parameters) {
                 return new ReactiveDao.ObservablePromiseProxy(
-                  Promise.all(
-                    config.services.map(service => service.app.clientSideDefinition(service, clientData))
-                  ).then(services => new ReactiveDao.ObservableValue({
+                  definitionsPromise.then(services => new ReactiveDao.ObservableValue({
                     client: { ...clientData, sessionKey: undefined },
                     services
                   }))
                 )
               },
               async get(parameters) {
-                return Promise.all(
-                  config.services.map(service => service.app.clientSideDefinition(service, clientData))
-                ).then(services => ({
+                return definitionsPromise.then(services => ({
                   client: { ...clientData, sessionKey: undefined },
                   services
                 }))
@@ -167,7 +174,8 @@ function prepareReactiveDaoDefinition(config, clientData) {
 
 class RTCMSDao extends ReactiveDao {
   constructor(config, clientData) {
-    super(clientData.sessionId, prepareReactiveDaoDefinition(config, clientData))
+    console.log("CD", clientData)
+    super(clientData, prepareReactiveDaoDefinition(config, clientData))
     //console.log("Created dao with clientData",clientData)
     if( !clientData.roles ) throw new Error("NO ROLES!!")
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.7.15",
+  "version": "0.7.17",
   "description": "Live Change Framework - ultimate solution for real time mobile/web apps",
   "main": "index.js",
   "scripts": {
@@ -21,13 +21,13 @@
   },
   "homepage": "https://github.com/live-change/live-change-framework",
   "devDependencies": {
-    "@live-change/dao": "0.5.9",
-    "@live-change/dao-websocket": "0.5.9",
-    "@live-change/db": "0.5.23",
-    "@live-change/db-store-level": "0.5.23",
-    "@live-change/db-store-lmdb": "0.5.23",
+    "@live-change/dao": "0.5.10",
+    "@live-change/dao-websocket": "0.5.10",
+    "@live-change/db": "0.5.24",
+    "@live-change/db-store-level": "0.5.24",
+    "@live-change/db-store-lmdb": "0.5.24",
     "@live-change/sockjs": "0.4.1",
-    "@live-change/uid": "0.7.11",
+    "@live-change/uid": "0.7.16",
     "cookie": "^0.4.1",
     "express": "^4.18.1",
     "os-service": "^2.2.0",
@@ -35,5 +35,5 @@
     "tape": "^5.3.2",
     "websocket": "^1.0.34"
   },
-  "gitHead": "9e2d54359edb2619024512f95ba6900734e7b3a1"
+  "gitHead": "5380408808cfe3c6150bddc6ba809f02a4e72071"
 }