@live-change/framework 0.8.31 → 0.8.33

package/lib/App.js

@@ -181,15 +181,14 @@ class App {
     if(!(serviceDefinition instanceof ServiceDefinition))
       serviceDefinition = new ServiceDefinition(serviceDefinition)
     let service = new Service(serviceDefinition, this)
-    await service.start(config)
-    console.log("service started", serviceDefinition.name, "!")
-    await this.profileLog.end(profileOp)
-    this.startedServices[serviceDefinition.name] = service
-
     for(const viewName in serviceDefinition.views) {
       const viewDefinition = serviceDefinition.views[viewName]
       if(viewDefinition.global) this.globalViews[viewName] = service.views[viewName]
     }
+    await service.start(config)
+    console.log("service started", serviceDefinition.name, "!")
+    await this.profileLog.end(profileOp)
+    this.startedServices[serviceDefinition.name] = service
 
     return service
   }
@@ -234,20 +233,26 @@ class App {
     return definition
   }
 
-  async trigger(data) {
+  async trigger(trigger, data) {
+    if(!trigger) throw new Error("trigger must have type")
+    if(typeof trigger !== 'object') throw new Error("trigger must be object")
+    if(typeof trigger.type !== 'string') throw new Error("trigger type must be string")
+    if(!data) throw new Error("trigger must have data")
+    if(typeof data !== 'object') throw new Error("trigger must be object")
+    if(trigger.service) return await this.triggerService(trigger, data, true)
     if(this.shortTriggers) {
-      const triggers = this.triggerRoutes[data.route]
+      const triggers = this.triggerRoutes[trigger.type] /// TODO: check if it is right
       return await Promise.all(triggers.map(t => t.execute(data)))
     }
     const profileOp = await this.profileLog.begin({
-      operation: "callTrigger", triggerType: data.type, id: data.id, by: data.by
+      operation: "callTrigger", triggerType: trigger.type, id: data.id, by: data.by
     })
     const routes = await this.dao.get(['database', 'tableRange', this.databaseName, 'triggerRoutes',
-      { gte: data.type+'=', lte: data.type+'=\xFF\xFF\xFF\xFF' }])
-    console.log("TRIGGER ROUTES", data.type, '=>', routes)
+      { gte: trigger.type+'=', lte: trigger.type+'=\xFF\xFF\xFF\xFF' }])
+    console.log("TRIGGER ROUTES", trigger.type, '=>', routes)
     let promises = []
     for(const route of routes) {
-      promises.push(this.triggerService(route.service, { ...data }, true))
+      promises.push(this.triggerService({ ...trigger, service: route.service }, { ...data }, true))
     }
     const promise = Promise.all(promises)
     await this.profileLog.endPromise(profileOp, promise)
@@ -256,31 +261,37 @@ class App {
     return result
   }
 
-  async triggerService(service, data, returnArray = false) {
+  async triggerService(trigger, data, returnArray = false) {
+    if(!trigger.service) throw new Error("trigger must have service")
+    if(typeof trigger !== 'object') throw new Error("trigger must be object")
+    if(typeof trigger.service !== 'string') throw new Error("trigger service must be string")
+    if(typeof trigger.type !== 'string') throw new Error("trigger type must be string")
+    trigger.data = data
+    if(!trigger.data) throw new Error("trigger must have data")
+    if(typeof trigger.data !== 'object') throw new Error("trigger must be object")
     if(this.shortTriggers) {
-      const service = this.startedServices[service]
-      const triggers = service.triggers[data.type]
+      const service = this.startedServices[trigger.service]
+      const triggers = service.triggers[trigger.type]
       if(!triggers) return []
       const result = await Promise.all(triggers.map(t => t.execute(data)))
       if(!returnArray && Array.isArray(result) && result.length === 1) return result[0]
       return result
     }
-    if(!data.id) data.id = this.generateUid()
-    data.service = service
-    data.state = 'new'
-    if(!data.timestamp) data.timestamp = (new Date()).toISOString()
+    if(!trigger.id) trigger.id = this.generateUid()
+    trigger.state = 'new'
+    if(!trigger.timestamp) trigger.timestamp = (new Date()).toISOString()
 
     const profileOp = await this.profileLog.begin({
-      operation: "callTriggerService", triggerType: data.type, service, triggerId: data.id, by: data.by
+      operation: "callTriggerService", triggerType: trigger.type, service: trigger.service, triggerId: trigger.id, by: data.by
     })
 
     const triggersTable = this.splitCommands ? `${this.name}_triggers` : 'triggers'
     const objectObservable = this.dao.observable(
-        ['database', 'tableObject', this.databaseName, triggersTable, data.id],
+        ['database', 'tableObject', this.databaseName, triggersTable, trigger.id],
         ReactiveDao.ObservableValue
     )
-    await this.dao.request(['database', 'update', this.databaseName, triggersTable, data.id, [
-      { op: 'reverseMerge', value: data }
+    await this.dao.request(['database', 'update', this.databaseName, triggersTable, trigger.id, [
+      { op: 'reverseMerge', value: trigger }
     ]])
     let observer
     const promise = new Promise((resolve, reject) => {

package/lib/definition/ServiceDefinition.js

@@ -202,9 +202,9 @@ class ServiceDefinition {
     }
   }
 
-  callTrigger(data) {
+  callTrigger(trigger, data) {
     if(!this._runtime) throw new Error("triggers can be called only on runtime")
-    this._runtime.trigger(data)
+    this._runtime.trigger(trigger, data)
   }
 
   computeChanges( oldModuleParam ) {

package/lib/processors/crudGenerator.js

@@ -143,9 +143,7 @@ export default function(service, app) {
         ...writeOptions,
         execute: async function (props, {service}, emit) {
           if(crud.deleteTrigger || crud.triggers) {
-            let trig = { type: genName("Deleted") }
-            trig[idName] = props[idName]
-            await service.trigger(trig)
+            await service.trigger({ type: genName("Deleted") }, { [idName] : props[idName ] })
           }
           emit({
             ...props,

package/lib/runtime/Service.js

@@ -93,12 +93,12 @@ class Service {
     console.log("Service", this.definition.name, "started")
   }
 
-  async trigger(data) {
-    return this.app.trigger(data)
+  async trigger(...args) {
+    return this.app.trigger(...args)
   }
 
-  async triggerService(service, data) {
-    return this.app.triggerService(service, data)
+  async triggerService(...args) {
+    return this.app.triggerService(...args)
   }
 
 }

package/lib/runtime/TriggerHandler.js

@@ -16,17 +16,19 @@ class TriggerHandler {
     }
   }
 
-  async doExecute(parameters, emit) {
+  async doExecute(trig, emit) {
     //console.log("PARAMETERS", JSON.stringify(parameters), "DEFN", this.definition.properties)
+    const parameters = trig.data
     const preparedParams = await prepareParameters(parameters, this.definition.properties, this.service)
     //console.log("PREP PARAMS", preparedParams)
 
     let resultPromise = this.definition.execute({
       ...preparedParams
     }, {
+      ...trig,
       action: this,
       service: this.service,
-      trigger: (...args) => this.service.trigger(...args) /// TODO: collect call traces
+      trigger: (...args) => this.service.trigger(...args) /// TODO: collect call traces,
     }, emit)
 
     resultPromise = resultPromise.then(async result => {

package/lib/utils/CommandQueue.js

@@ -59,7 +59,7 @@ class CommandQueue {
   }
   async handleCommand(command) {
     //console.log("COMMNAD HANDLE!", command)
-    if(command.state != 'new') return
+    if(command.state !== 'new') return
     if(this.commandsStarted.has(command.id)) return
     this.commandsStarted.set(command.id, command)
     const started = new Date()
@@ -69,7 +69,7 @@ class CommandQueue {
       let commandHandlers = this.commandTypeHandlers.get(command.type) || []
       for(let handler of commandHandlers) {
         result = handler(command)
-        if(result != 'ignored') {
+        if(result !== 'ignored') {
           handled = true
           break
         }
@@ -77,7 +77,7 @@ class CommandQueue {
       if(!handled) {
         for(let handler of this.allCommandHandlers) {
           const result = handler(command)
-          if(result != 'ignored') {
+          if(result !== 'ignored') {
             handled = true
             break
           }
@@ -104,7 +104,7 @@ class CommandQueue {
         // hold it for one second in case of delayed event:
         setTimeout(() => this.commandsStarted.delete(command.id), 1000)
       }).catch(async error => {
-        return this.connection.request(['database', 'update'], this.database, this.tableName, command.id, [
+        const result = await this.connection.request(['database', 'update'], this.database, this.tableName, command.id, [
           {
             op: 'merge', property: null,
             value: { state: 'failed', error: (error && (error.stack || error.message)) || error }
@@ -112,13 +112,13 @@ class CommandQueue {
         ])
         // hold it for one second in case of delayed event:
         setTimeout(() => this.commandsStarted.delete(command.id), 1000)
+        return result
       })
     } catch(e) {
       console.error(`COMMAND ${JSON.stringify(command, null, "  ")} HANDLING ERROR`, e, ' => STOPPING!')
-      this.dispose()
+      await this.dispose()
       throw e
     }
-    return 'ok'
   }
   set(value) {
     if(this.resolveStart) {

package/lib/utils/validators.js

@@ -1,4 +1,4 @@
-import {mergeDeep} from "../utils.js"
+import { mergeDeep } from "../utils.js"
 
 function nonEmpty(value) {
   if(!value) return 'empty'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.8.31",
+  "version": "0.8.33",
   "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-stack",
   "devDependencies": {
-    "@live-change/dao": "^0.8.31",
-    "@live-change/uid": "^0.8.31"
+    "@live-change/dao": "^0.8.33",
+    "@live-change/uid": "^0.8.33"
   },
-  "gitHead": "9ab10c6f2854dd5472cc6becb128951db16218e3"
+  "gitHead": "98ff6f9c09e5fc1f408010df6cc8038eff571276"
 }