@live-change/task-service 0.8.28 → 0.8.30

package/definition.js

@@ -2,7 +2,7 @@ import App from '@live-change/framework'
 const app = App.app()
 
 import relationsPlugin from '@live-change/relations-plugin'
-const accessControlService = require('@live-change/access-control-service')
+import accessControlService from '@live-change/access-control-service'
 
 const definition = app.createServiceDefinition({
   name: "task",

package/index.js

@@ -4,6 +4,12 @@ const app = App.app()
 import definition from './definition.js'
 
 import './model.js'
-import './task.js'
+import task from './task.js'
+
+export { task }
+
+definition.beforeStart(() => {
+  /// TODO: restart stopped tasks
+})
 
 export default definition

package/model.js

@@ -79,6 +79,9 @@ const Task = definition.model({
     },
     byCauseAndState: {
       property: ['causeType', 'cause', 'state']
+    },
+    byState: {
+      property: ['state']
     }
   }
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/task-service",
-  "version": "0.8.28",
+  "version": "0.8.30",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,8 +22,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/framework": "^0.8.28",
-    "@live-change/relations-plugin": "^0.8.28"
+    "@live-change/framework": "^0.8.30",
+    "@live-change/relations-plugin": "^0.8.30"
   },
-  "gitHead": "28db9cd8bdd0a465633a3b25028751e2aca670cd"
+  "gitHead": "aec2a3ede7fe490dcb7db40ee6c2963cd0c62af1"
 }

package/task.js

@@ -1,53 +1,107 @@
 import App from '@live-change/framework'
 const app = App.app()
 
-const task = (taskDefinition) => { /// TODO: modify to use triggers
-  return async (props, context, emit) => {
-    if(!emit) emit = (events) => app.emitEvents(definition.name, Array.isArray(events) ? events : [events], {})
-    const propertiesJson = JSON.stringify(props)
-    const hash = crypto
-      .createHash('sha256')
-      .update(taskDefinition.name + ':' + propertiesJson)
-      .digest('hex')
-
-    const similarTasks = App.serviceViewGet('task', 'tasksByCauseAndHash', {
-      causeType: context.causeType,
-      cause: context.cause,
-      hash
-    })
-    const oldTask = similarTasks.find(similarTask => similarTask.name === taskDefinition.name
-      && JSON.stringify(similarTask.properties) === propertiesJson)
-
-    let taskObject = oldTask
-      ? await App.serviceViewGet('task', 'task', { task: oldTask.to })
-      : {
-        id: app.generateUid(),
-        name: taskDefinition.name,
-        properties: props,
-        hash,
-        state: 'created'
-      }
+import crypto from 'crypto'
 
-    if(!oldTask) {
-      /// app.emitEvents
-      await App.triggerService('task', 'task_createCaseOwnedTask', {
-        ...taskObject,
-        causeType: context.causeType,
-        cause: context.cause,
-        task: taskObject.id
-      })
+function upperFirst(string) {
+  return string.charAt(0).toUpperCase() + string.slice(1)
+}
+
+async function triggerOnTaskStateChange(taskObject, causeType, cause) {
+  await app.trigger({
+    ...taskObject,
+    type: 'task'+upperFirst(taskObject.state),
+    task: taskObject.id,
+    causeType,
+    cause
+  })
+  await app.trigger({
+    ...taskObject,
+    type: 'task'+upperFirst(taskObject.name)+upperFirst(taskObject.state),
+    task: taskObject.id,
+    causeType,
+    cause
+  })
+  await app.trigger({
+    ...taskObject,
+    type: `${taskObject.causeType}_${taksObject.cause}OwnedTask`
+      +`${upperFirst(taskObject.name)}${upperFirst(taskObject.state)}`,
+    task: taskObject.id,
+    causeType,
+    cause
+  })
+}
+
+async function createOrReuseTask(taskDefinition, props, causeType, cause) {
+
+  const propertiesJson = JSON.stringify(props)
+  const hash = crypto
+    .createHash('sha256')
+    .update(taskDefinition.name + ':' + propertiesJson)
+    .digest('hex')
+
+  const similarTasks = await app.serviceViewGet('task', 'tasksByCauseAndHash', {
+    causeType,
+    cause,
+    hash
+  })
+  const oldTask = similarTasks.find(similarTask => similarTask.name === taskDefinition.name
+    && JSON.stringify(similarTask.properties) === propertiesJson)
+
+  let taskObject = oldTask
+    ? await app.serviceViewGet('task', 'task', { task: oldTask.to })
+    : {
+      id: app.generateUid(),
+      name: taskDefinition.name,
+      properties: props,
+      hash,
+      state: 'created'
     }
 
-    const maxRetries = taskDefinition.maxRetries ?? 5
+  if(!oldTask) {
+    /// app.emitEvents
+    await app.triggerService('task', {
+      ...taskObject,
+      type: 'task_createCaseOwnedTask',
+      causeType,
+      cause,
+      task: taskObject.id
+    })
+    await triggerOnTaskStateChange(taskObject, causeType, cause)
+  }
+
+}
+
+async function startTask(taskFunction, props, causeType, cause){
+  const taskObject = createOrReuseTask(taskFunction.definition, props, causeType, cause)
+  const context = {
+    causeType,
+    cause,
+    taskObject
+  }
+  const promise = taskFunction(props, context)
+  return { task: taskObject.id, taskObject, promise }
+}
+
+export default function task(definition) {
+  const taskFunction = async (props, context, emit) => {
+    if(!emit) emit = (events) =>
+      app.emitEvents(definition.name, Array.isArray(events) ? events : [events], {})
+
+    let taskObject = context.taskObject
+      ?? await createOrReuseTask(taskDefinition, props, context.causeType, context.cause)
+
+    const maxRetries = definition.maxRetries ?? 5
 
     async function updateTask(data) {
-      await App.triggerService('task', 'task_updateCaseOwnedTask', {
+      await app.triggerService('task', {
         ...data,
+        type: 'task_updateCaseOwnedTask',
         causeType: context.causeType,
         cause: context.cause,
         task: taskObject.id
       })
-      taskObject = await App.serviceViewGet('task', 'task', { task: oldTask.to })
+      taskObject = await app.serviceViewGet('task', 'task', { task: oldTask.to })
     }
 
     const runTask = async () => {
@@ -55,8 +109,9 @@ const task = (taskDefinition) => { /// TODO: modify to use triggers
         state: 'running',
         startedAt: new Date()
       })
+      await triggerOnTaskStateChange(taskObject, context.causeType, context.cause)
       try {
-        const result = await taskDefinition.execute(props, {
+        const result = await definition.execute(props, {
           ...context,
           task: {
             async run(taskFunction, props) {
@@ -79,6 +134,7 @@ const task = (taskDefinition) => { /// TODO: modify to use triggers
           doneAt: new Date(),
           result
         })
+        await triggerOnTaskStateChange(taskObject, context.causeType, context.cause)
       } catch(error) {
         if(taskObject.retries.length >= maxRetries) {
           await updateTask({
@@ -86,6 +142,7 @@ const task = (taskDefinition) => { /// TODO: modify to use triggers
             doneAt: new Date(),
             error: error.message
           })
+          await triggerOnTaskStateChange(taskObject, context.causeType, context.cause)
         }
         await updateTask(taskObject.id, {
           state: 'retrying',
@@ -95,6 +152,7 @@ const task = (taskDefinition) => { /// TODO: modify to use triggers
             error: error.message
           }]
         })
+        await triggerOnTaskStateChange(taskObject, context.causeType, context.cause)
       }
     }
 
@@ -105,4 +163,11 @@ const task = (taskDefinition) => { /// TODO: modify to use triggers
 
     return taskObject.result
   }
+
+  taskFunction.definition = definition
+  taskFunction.start = async (props, causeType, cause) => {
+    return await startTask(taskFunction, props, causeType, cause)
+  }
+  return taskFunction
+
 }