@live-change/task-service 0.8.30 → 0.8.32

package/model.js

@@ -106,7 +106,7 @@ definition.view({
       type: Task
     }
   },
-  async daoPath({ hash }) {
+  async daoPath({ causeType, cause, hash }) {
     return Task.indexRangePath('byCauseAndHash', [causeType, cause, hash], { limit: 23 })
   }
 })

package/package.json

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

package/task.js

@@ -4,28 +4,29 @@ const app = App.app()
 import crypto from 'crypto'
 
 function upperFirst(string) {
-  return string.charAt(0).toUpperCase() + string.slice(1)
+  return string[0].toUpperCase() + string.slice(1)
 }
 
 async function triggerOnTaskStateChange(taskObject, causeType, cause) {
-  await app.trigger({
+  if(!taskObject?.state) throw new Error('Task object state is not defined in ' + taskObject)
+  if(!taskObject?.id) throw new Error('Task object id is not defined in '+taskObject)
+  await app.trigger({ type: 'task'+upperFirst(taskObject.state), }, {
     ...taskObject,
-    type: 'task'+upperFirst(taskObject.state),
     task: taskObject.id,
     causeType,
     cause
   })
-  await app.trigger({
+  await app.trigger({ type: 'task'+upperFirst(taskObject.name)+upperFirst(taskObject.state) }, {
     ...taskObject,
-    type: 'task'+upperFirst(taskObject.name)+upperFirst(taskObject.state),
     task: taskObject.id,
     causeType,
     cause
   })
   await app.trigger({
+    type: `${taskObject.causeType}_${taskObject.cause}OwnedTask`
+           +`${upperFirst(taskObject.name)}${upperFirst(taskObject.state)}`
+  }, {
     ...taskObject,
-    type: `${taskObject.causeType}_${taksObject.cause}OwnedTask`
-      +`${upperFirst(taskObject.name)}${upperFirst(taskObject.state)}`,
     task: taskObject.id,
     causeType,
     cause
@@ -33,7 +34,6 @@ async function triggerOnTaskStateChange(taskObject, causeType, cause) {
 }
 
 async function createOrReuseTask(taskDefinition, props, causeType, cause) {
-
   const propertiesJson = JSON.stringify(props)
   const hash = crypto
     .createHash('sha256')
@@ -48,32 +48,32 @@ async function createOrReuseTask(taskDefinition, props, causeType, cause) {
   const oldTask = similarTasks.find(similarTask => similarTask.name === taskDefinition.name
     && JSON.stringify(similarTask.properties) === propertiesJson)
 
-  let taskObject = oldTask
+  const taskObject = oldTask
     ? await app.serviceViewGet('task', 'task', { task: oldTask.to })
     : {
       id: app.generateUid(),
       name: taskDefinition.name,
       properties: props,
       hash,
-      state: 'created'
+      state: 'created',
+      retries: []
     }
 
   if(!oldTask) {
     /// app.emitEvents
-    await app.triggerService('task', {
+    await app.triggerService({ service: 'task', type: 'task_createCauseOwnedTask' }, {
       ...taskObject,
-      type: 'task_createCaseOwnedTask',
       causeType,
       cause,
       task: taskObject.id
     })
     await triggerOnTaskStateChange(taskObject, causeType, cause)
   }
-
+  return taskObject
 }
 
 async function startTask(taskFunction, props, causeType, cause){
-  const taskObject = createOrReuseTask(taskFunction.definition, props, causeType, cause)
+  const taskObject = await createOrReuseTask(taskFunction.definition, props, causeType, cause)
   const context = {
     causeType,
     cause,
@@ -91,17 +91,31 @@ export default function task(definition) {
     let taskObject = context.taskObject
       ?? await createOrReuseTask(taskDefinition, props, context.causeType, context.cause)
 
+    if(!taskObject?.state) throw new Error('Task object state is not defined in ' + taskObject)
+    if(!taskObject?.id) throw new Error('Task object id is not defined in '+taskObject)
+
     const maxRetries = definition.maxRetries ?? 5
 
     async function updateTask(data) {
-      await app.triggerService('task', {
+      if(typeof data !== 'object') throw new Error('Task update data is not an object' + JSON.stringify(data))
+      if(!taskObject?.state) throw new Error('Task object state is not defined in ' + JSON.stringify(taskObject))
+      if(!taskObject?.id) throw new Error('Task object id is not defined in ' + JSON.stringify(taskObject))
+/*      console.log("UPDATING TASK", {
         ...data,
-        type: 'task_updateCaseOwnedTask',
+        type: 'task_updateCauseOwnedTask',
         causeType: context.causeType,
         cause: context.cause,
         task: taskObject.id
       })
-      taskObject = await app.serviceViewGet('task', 'task', { task: oldTask.to })
+      console.trace("UPDATING TASK!")*/
+      const result = await app.triggerService({ service: 'task', type: 'task_updateCauseOwnedTask' }, {
+        ...data,
+        causeType: context.causeType,
+        cause: context.cause,
+        task: taskObject.id
+      })
+      taskObject = await app.serviceViewGet('task', 'task', { task: taskObject.id })
+      //console.log("UPDATED TASK", taskObject, result)
     }
 
     const runTask = async () => {
@@ -136,22 +150,24 @@ export default function task(definition) {
         })
         await triggerOnTaskStateChange(taskObject, context.causeType, context.cause)
       } catch(error) {
-        if(taskObject.retries.length >= maxRetries) {
+        console.log("TASK ERROR", error.message, error.stack)
+        /*console.log("RETRIES", taskObject.retries?.length, maxRetries)*/
+        if((taskObject.retries?.length || 0) >= maxRetries) {
           await updateTask({
             state: 'failed',
             doneAt: new Date(),
-            error: error.message
+            error: error.stack ?? error.message ?? error
+          })
+        } else {
+          await updateTask({
+            state: 'retrying',
+            retries: [...(taskObject.retries || []), {
+              startedAt: taskObject.startedAt,
+              failedAt: new Date(),
+              error: error.stack ?? error.message ?? error
+            }]
           })
-          await triggerOnTaskStateChange(taskObject, context.causeType, context.cause)
         }
-        await updateTask(taskObject.id, {
-          state: 'retrying',
-          retries: [...taskObject.retries, {
-            startedAt: taskObject.startedAt,
-            failedAt: new Date(),
-            error: error.message
-          }]
-        })
         await triggerOnTaskStateChange(taskObject, context.causeType, context.cause)
       }
     }
@@ -159,6 +175,7 @@ export default function task(definition) {
     /// TODO: implement task queues
     while(taskObject.state !== 'done' && taskObject.state !== 'failed') {
       await runTask()
+      //console.log("TASK OBJECT AFTER RUNTASK", taskObject)
     }
 
     return taskObject.result