@live-change/framework 0.8.50 → 0.8.52

package/lib/App.js

@@ -323,7 +323,7 @@ class App {
       const command = data
       const service = this.startedServices[data.service]
       const action = service.actions[data.type]
-      const reportFinished = action.definition.waitForEvents ? 'command_' + command.id : undefined
+      const reportFinished = action.definition.waitForEvents ? command.id : undefined
       const flags = {commandId: command.id, reportFinished}
       const emit = (!this.splitEvents || this.shortEvents)
         ? new SingleEmitQueue(service, flags)
@@ -458,10 +458,9 @@ class App {
       return
     }
     const [action, id] = reportId.split('_')
-    const triggerId = action === 'trigger' ? id : undefined
-    const commandId = action === 'command' ? id : undefined
+    const commandId = id
     const profileOp = await this.profileLog.begin({
-      operation: "waitForEvents", action: action, commandId, triggerId, reportId, events, timeout
+      operation: "waitForEvents", action: action, commandId, reportId, events, timeout
     })
     const promise = new Promise((resolve, reject) => {
       let done = false
@@ -524,6 +523,12 @@ class App {
     return promise
   }
 
+  async emitEventsAndWait(service, events, flags = {}) {
+    const reportId = 'trigger_' + this.generateUid()
+    await this.emitEvents(service, events, { reportFinished: reportId, ...flags })
+    return await this.waitForEvents(reportId, events)
+  }
+
   async assertTime(taskName, duration, task, ...data) {
     const profileOp = await this.profileLog.begin({ operation: 'assertTime', taskName })
     const taskTimeout = setTimeout(() => {

package/lib/definition/ServiceDefinition.js

@@ -85,6 +85,7 @@ class ServiceDefinition {
     this.processors = []
     this.authenticators = []
     this.beforeStartCallbacks = []
+    this.afterStartCallbacks = []
     this.endpoints = []
     this.validators = { ...defaultValidators }
     this.clientSideFilters = []
@@ -158,6 +159,10 @@ class ServiceDefinition {
     this.beforeStartCallbacks.push(callback)
   }
 
+  afterStart(callback) {
+    this.afterStartCallbacks.push(callback)
+  }
+
   endpoint(endpoint) {
     this.endpoints.push(endpoint)
   }

package/lib/processes/commandExecutor.js

@@ -26,7 +26,7 @@ async function startCommandExecutor(service, config) {
           commandId: command.id, client: command.client
         })
         const reportFinished = action.definition.waitForEvents ? 'command_' + command.id : undefined
-        const flags = {commandId: command.id, reportFinished}
+        const flags = { commandId: command.id, reportFinished }
         const emit = (!service.app.splitEvents || this.shortEvents)
           ? new SingleEmitQueue(service, flags)
           : new SplitEmitQueue(service, flags)

package/lib/runtime/Service.js

@@ -93,6 +93,14 @@ class Service {
     console.log("Service", this.definition.name, "started")
   }
 
+  async afterStart(config){
+    if(config.runCommands) {
+      for (const afterStartCallback of this.definition.afterStartCallbacks) {
+        await afterStartCallback(this)
+      }
+    }
+  }
+
   async trigger(trigger, data) {
     return this.app.trigger({
       causeType: 'service',

package/lib/utils/CommandQueue.js

@@ -95,9 +95,6 @@ class CommandQueue {
           delay: command.timestamp  && (started.getTime() - (new Date(command.timestamp)).getTime()),
           execution: finished.getTime() - started.getTime()
         }
-        console.log("UPDATE DATABASE", ['database', 'update'], this.database, this.tableName, command.id, [
-          { op: 'merge', property: null, value: { state: 'done', result, stats } }
-        ])
         await this.connection.request(['database', 'update'], this.database, this.tableName, command.id, [
           { op: 'merge', property: null, value: { state: 'done', result, stats } }
         ])

package/lib/utils/SingleEmitQueue.js

@@ -26,7 +26,7 @@ class SingleEmitQueue {
       events.push(event)
     }
     if(this.commited) {
-      if(events.length == 0) return
+      if(events.length === 0) return
       this.service.dao.request(['database', 'putLog'], this.service.databaseName,
           'events', { type: 'bucket', events, ...this.flags })
     }
@@ -34,7 +34,7 @@ class SingleEmitQueue {
 
   async commit() {
     this.commited = true
-    if(this.emittedEvents.length == 0) return []
+    if(this.emittedEvents.length === 0) return []
     await this.service.dao.request(['database', 'putLog'], this.service.databaseName,
           'events', { type: 'bucket', events: this.emittedEvents, ...this.flags })
     return this.emittedEvents

package/lib/utils/SplitEmitQueue.js

@@ -43,7 +43,7 @@ class SplitEmitQueue {
       events.push(event)
     }
     if(this.commited) {
-      if(events.length == 0) return
+      if(events.length === 0) return
       this.service.dao.request(['database', 'putLog'], this.service.databaseName,
           this.service.name+'_events', { type: 'bucket', events, ...this.flags })
     }
@@ -52,7 +52,7 @@ class SplitEmitQueue {
   async commit() {
     let promises = []
     this.commited = true
-    if(this.emittedEvents.length == 0) return []
+    if(this.emittedEvents.length === 0) return []
     let allEvents = []
     for(const [service, events] of this.emittedEvents.keys()) {
       promises.push(this.service.dao.request(['database', 'putLog'], this.service.databaseName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.8.50",
+  "version": "0.8.52",
   "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.50",
-    "@live-change/uid": "^0.8.50"
+    "@live-change/dao": "^0.8.52",
+    "@live-change/uid": "^0.8.52"
   },
-  "gitHead": "c967d5304bdac5150a6272c8d7cbe8974d7c25e6"
+  "gitHead": "d06ad62415cc92e15b5dee87078614d4f883eb83"
 }