@live-change/framework 0.5.24 → 0.6.0

package/lib/App.js

@@ -192,16 +192,16 @@ class App {
     console.log("TRIGGER ROUTES", data.type, '=>', routes)
     let promises = []
     for(const route of routes) {
-      promises.push(this.triggerService(route.service, { ...data }))
+      promises.push(this.triggerService(route.service, { ...data }, true))
     }
     const promise = Promise.all(promises)
     await this.profileLog.endPromise(profileOp, promise)
-    const result = await promise
+    const result = (await promise).flat()
     console.log("TRIGGER FINISHED!", result)
     return result
   }
 
-  async triggerService(service, data) {
+  async triggerService(service, data, returnArray = false) {
 
     if(!data.id) data.id = this.generateUid()
     data.service = service
@@ -233,7 +233,10 @@ class App {
       objectObservable.unobserve(observer)
     })
     await this.profileLog.endPromise(profileOp, promise)
-    return promise
+
+    const result = await promise
+    if(!returnArray && Array.isArray(result) && result.length == 1) return result[0]
+    return result
   }
 
   async command(data, requestTimeout) {

package/lib/clientSideFilters/clientSideFilter.js

@@ -23,4 +23,6 @@ module.exports = function(service, definition, app) {
   delete definition.foreignIndexes
   delete definition.config
   delete definition.indexes
+  delete definition.endpoints
+  delete definition.beforeStartCallbacks
 }

package/lib/definition/ServiceDefinition.js

@@ -85,6 +85,7 @@ class ServiceDefinition {
     this.processors = []
     this.authenticators = []
     this.beforeStartCallbacks = []
+    this.endpoints = []
     this.validators = defaultValidators
     for(let key in definition) this[key] = definition[key]
   }
@@ -133,7 +134,8 @@ class ServiceDefinition {
 
   trigger(definition) {
     const trigger = new TriggerDefinition(definition)
-    this.triggers[trigger.name] = trigger
+    //if(this.triggers[trigger.name]) throw new Error('trigger ' + trigger.name + ' already exists')
+    this.triggers[trigger.name] = [ ...(this.triggers[trigger.name] || []) , trigger ]
     return trigger
   }
 
@@ -149,6 +151,10 @@ class ServiceDefinition {
     this.beforeStartCallbacks.push(callback)
   }
 
+  endpoint(endpoint) {
+    this.endpoints.push(endpoint)
+  }
+
   toJSON() {
     let models = {}
     for(let key in this.models) models[key] = this.models[key].toJSON()
@@ -165,7 +171,7 @@ class ServiceDefinition {
     let views = {}
     for(let key in this.views) views[key] = this.views[key].toJSON()
     let triggers = {}
-    for(let key in this.triggers) triggers[key] = this.triggers[key].toJSON()
+    for(let key in this.triggers) triggers[key] = this.triggers[key].map(t=>t.toJSON())
     return {
       ...this,
       _runtime: undefined,

package/lib/runtime/TriggerHandler.js

@@ -7,28 +7,35 @@ class TriggerHandler {
     this.service = service
   }
 
-  async execute(parameters, emit) {
+  async executeSingleTrigger(definition, parameters, emit) {
     //console.log("PARAMETERS", JSON.stringify(parameters), "DEFN", this.definition.properties)
-    let preparedParams = await prepareParameters(parameters, this.definition.properties, this.service)
+    const preparedParams = await prepareParameters(parameters, definition.properties, this.service)
     //console.log("PREP PARAMS", preparedParams)
 
-    let resultPromise = this.definition.execute({
+    let resultPromise = definition.execute({
       ...preparedParams
     }, {
       action: this,
       service: this.service,
-      trigger: (...args) => this.service.trigger(...args) /// TODO: collet call traces
+      trigger: (...args) => this.service.trigger(...args) /// TODO: collect call traces
     }, emit)
 
     resultPromise = resultPromise.then(async result => {
-      let processedResult = await processReturn(result, this.definition.returns, this.service)
+      const processedResult = await processReturn(result, definition.returns, this.service)
       return processedResult
     })
     resultPromise.catch(error => {
-      console.error(`Trigger ${this.definition.name} error `, error)
+      console.error(`Trigger ${definition.name} error `, error)
     })
     return resultPromise
   }
+
+  async execute(parameters, emit) {
+    const resultsPromises = this.definition.map(defn => this.executeSingleTrigger(defn, parameters, emit))
+    const results = await Promise.all(resultsPromises)
+    return results
+  }
+
 }
 
 module.exports = TriggerHandler

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.5.24",
+  "version": "0.6.0",
   "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.4.2",
-    "@live-change/dao-websocket": "0.4.1",
+    "@live-change/dao": "0.4.3",
+    "@live-change/dao-websocket": "0.4.2",
     "@live-change/db": "0.5.4",
     "@live-change/db-store-level": "0.5.4",
     "@live-change/db-store-lmdb": "0.5.4",
     "@live-change/sockjs": "^0.4.0-rc.1",
-    "@live-change/uid": "0.5.20",
+    "@live-change/uid": "^0.6.0",
     "cookie": "^0.4.1",
     "express": "^4.17.1",
     "os-service": "^2.2.0",
@@ -35,5 +35,5 @@
     "tape": "^5.3.2",
     "websocket": "^1.0.34"
   },
-  "gitHead": "2fb6050c59e88d0dd285d640e454819d30130b0b"
+  "gitHead": "5e4250b3a6fcf11e46f36e6b9713c2a9f4a4dc92"
 }