@live-change/framework 0.8.6 → 0.8.8

package/lib/App.js

@@ -1,4 +1,4 @@
-import { uidGenerator, randomString } from '@live-change/uid'
+import {randomString, uidGenerator} from '@live-change/uid'
 
 import ReactiveDao from "@live-change/dao"
 
@@ -36,6 +36,7 @@ import SplitEmitQueue from "./utils/SplitEmitQueue.js"
 import SingleEmitQueue from "./utils/SingleEmitQueue.js"
 
 import Debug from 'debug'
+
 const debug = Debug('framework')
 
 class App {
@@ -86,6 +87,7 @@ class App {
 
     this.startedServices = {}
     this.triggerRoutes = {}
+    this.globalViews = {}
   }
 
   createServiceDefinition( definition ) {
@@ -177,9 +179,19 @@ class App {
     console.log("service started", serviceDefinition.name, "!")
     await this.profileLog.end(profileOp)
     this.startedServices[serviceDefinition.name] = service
+
+    for(const viewName in serviceDefinition.views) {
+      const view = serviceDefinition.views[viewName]
+      if(view.global) this.globalViews[viewName] = view
+    }
+
     return service
   }
 
+  async createDao( config, clientData ) {
+    return new Dao(config, clientData)
+  }
+
   async createReactiveDao( config, clientData ) {
     return new Dao(config, clientData)
   }
@@ -541,6 +553,35 @@ class App {
     this.dao.dispose()
   }
 
+
+  serviceViewObservable(serviceName, viewName, params) {
+    const service = this.startedServices[serviceName]
+    const view = service.views[viewName]
+    if(!view) throw new Error(`View ${viewName} not found in service ${serviceName}`)
+    const result = view.observable(params)
+    return result.then ? new LcDao.ObservablePromiseProxy(result) : result
+  }
+
+  async serviceViewGet(serviceName, viewName, params) {
+    const service = this.startedServices[serviceName]
+    const view = service.views[viewName]
+    if(!view) throw new Error(`View ${viewName} not found in service ${serviceName}`)
+    return await view.get(params)
+  }
+
+  viewObservable(viewName, params) {
+    const view = this.globalViews[viewName]
+    if(!view) throw new Error(`Global view ${viewName} not found`)
+    const result = view.observable(params)
+    return result.then ? new LcDao.ObservablePromiseProxy(result) : result
+  }
+
+  async viewGet(viewName, params) {
+    const view = this.globalViews[viewName]
+    if(!view) throw new Error(`Global view ${viewName} not found`)
+    return await view.get(params)
+  }
+
 }
 
 export default App

package/lib/definition/ServiceDefinition.js

@@ -71,7 +71,6 @@ function createForeignIndexProxy(definition, model) {
 }
 
 class ServiceDefinition {
-
   constructor(definition) {
     this.models = {}
     this.foreignModels = {}
@@ -79,6 +78,7 @@ class ServiceDefinition {
     this.foreignIndexes = {}
     this.actions = {}
     this.views = {}
+    this.internalViews = {}
     this.events = {}
     this.triggers = {}
     this.use = []

package/lib/processors/accessMethod.js

@@ -3,10 +3,18 @@ export default function getAccessMethod(access) {
     return access
   } else if(Array.isArray(access)) {
     return (params, { service, client }) => {
+      if(client.internal) return true
       if(client.roles.includes('administrator')) return true
       if(client.roles.includes('admin')) return true
       for(let role of access) if(client.roles.includes(role)) return true
       return false
     }
-  } else throw new Error("unknown view access definition "+access)
+  } else if(access === 'internal') {
+    return (params, { service, client }) => {
+      if(client.internal) return true
+      if(client.roles.includes('administrator')) return true
+      if(client.roles.includes('admin')) return true
+      return false
+    }
+  } else throw new Error("unknown view access definition " + access)
 }

package/lib/processors/fetchView.js

@@ -18,4 +18,21 @@ export default function(service, app) {
       }
     }
   }
+  for(let viewName in service.internalViews) {
+    const view = service.internalViews[viewName]
+    if(view.fetch) {
+      if(!view.observable) view.observable = async (...args) => {
+        try {
+          const data = await view.fetch(...args)
+          return new ReactiveDao.ObservableValue(data)
+        } catch(error) {
+          console.error(error)
+        }
+      }
+      if(!view.get) view.get = async (...args) => {
+        const path = await view.fetch(...args)
+        return path
+      }
+    }
+  }
 }

package/lib/runtime/ApiServer.js

@@ -27,7 +27,7 @@ class ApiServer {
   }
 
   async daoFactory(credentialsp, ip) {
-    let credentials = { ...credentialsp, ip, roles: [] }
+    let credentials = { ...credentialsp, ip, roles: [], ignoreRemoteViews: false }
     const allAuthenticators = []
     if(this.config.authenticators) {
       const auth = Array.isArray(this.config.authenticators)

package/lib/runtime/View.js

@@ -10,6 +10,16 @@ class View {
   }
 
   async observable(parameters, clientData) {
+    if(this.definition.remote) {
+      if(clientData?.ignoreRemoteView) {
+        return this.service.app.serviceViewObservable(this.service.name, this.name, {
+          ...parameters,
+          ___forwardedClientData: clientData
+        })
+      } else if(!this.definition.internal) {
+        clientData = parameters.___forwardedClientData ?? clientData
+      }
+    }
     const context = {
       service: this.service, client: clientData
     }
@@ -20,6 +30,16 @@ class View {
   }
 
   async get(parameters, clientData) {
+    if(this.definition.remote) {
+      if(clientData?.ignoreRemoteView) {
+        return this.service.app.serviceViewGet(this.service.name, this.name, {
+          ...parameters,
+          ___forwardedClientData: clientData
+        })
+      } else if(!this.definition.internal) {
+        clientData = parameters.___forwardedClientData ?? clientData
+      }
+    }
     const context = {
       service: this.service, client: clientData
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.8.6",
+  "version": "0.8.8",
   "description": "Live Change Framework - ultimate solution for real time mobile/web apps",
   "main": "index.js",
   "scripts": {
@@ -22,8 +22,8 @@
   },
   "homepage": "https://github.com/live-change/live-change-framework",
   "devDependencies": {
-    "@live-change/dao": "^0.8.6",
-    "@live-change/uid": "^0.8.6"
+    "@live-change/dao": "^0.8.8",
+    "@live-change/uid": "^0.8.8"
   },
-  "gitHead": "9964e05eb01bfbaf0436249e97745cb2b29c96b3"
+  "gitHead": "77eafa414e091c8d34ae63ee8927d53f3bde893d"
 }