@live-change/task-service 0.8.33 → 0.8.35

package/model.js

@@ -223,6 +223,6 @@ definition.view({
     const { name } = props
     const range = App.extractRange(props)
     if(!range.limit) range.limit = 256
-    return Task.indexRangePath('runningRootsByName', [name], range)
+    return Task.sortedIndexRangePath('runningRootsByName', [name], range)
   }
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/task-service",
-  "version": "0.8.33",
+  "version": "0.8.35",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,8 +22,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/framework": "^0.8.33",
-    "@live-change/relations-plugin": "^0.8.33"
+    "@live-change/framework": "^0.8.35",
+    "@live-change/relations-plugin": "^0.8.35"
   },
-  "gitHead": "98ff6f9c09e5fc1f408010df6cc8038eff571276"
+  "gitHead": "90fbb746dc7270895daf17b437ca48c0b0a01c01"
 }

package/task.js

@@ -82,6 +82,7 @@ async function startTask(taskFunction, props, causeType, cause){
     cause,
     taskObject,
   }
+  console.log("START TASK!", taskFunction.name)
   const promise = taskFunction(props, context)
   return { task: taskObject.id, taskObject, promise, causeType, cause }
 }
@@ -160,6 +161,10 @@ export default function task(definition, serviceDefinition) {
           task: {
             id: taskObject.id,
             async run(taskFunction, props, progressFactor = 1) {
+              if(typeof taskFunction !== 'function') {
+                console.log("TASK FUNCTION", taskFunction)
+                throw new Error('Task function is not a function')
+              }
               //console.log("SUBTASK RUN", taskFunction.definition.name, props)
               const subtaskProgress = { current: 0, total: 1, factor: progressFactor }
               subtasksProgress.push(subtaskProgress)
@@ -192,6 +197,16 @@ export default function task(definition, serviceDefinition) {
               }
               updateProgress()
             }
+          },
+          async trigger(trigger, props) {
+            return await app.trigger({
+              causeType: 'task_Task',
+              cause: taskObject.id,
+              ...trigger,
+            }, props)
+          },
+          async triggerService(trigger, props, returnArray = false) {
+            return await app.triggerService(trigger, props, returnArray)
           }
         })
         await updateTask({
@@ -207,7 +222,12 @@ export default function task(definition, serviceDefinition) {
           await updateTask({
             state: 'failed',
             doneAt: new Date(),
-            error: error.stack ?? error.message ?? error
+            error: error.stack ?? error.message ?? error,
+            retries: [...(taskObject.retries || []), {
+              startedAt: taskObject.startedAt,
+              failedAt: new Date(),
+              error: error.stack ?? error.message ?? error
+            }]
           })
         } else {
           const retriesCount = (taskObject.retries || []).length
@@ -227,7 +247,7 @@ export default function task(definition, serviceDefinition) {
 
     while(taskObject.state !== 'done' && taskObject.state !== 'failed') {
       await runTask()
-      console.log("TASK", definition.name, "AFTER RUNTASK", taskObject)
+     // console.log("TASK", definition.name, "AFTER RUNTASK", taskObject)
     }
 
     return taskObject.result
@@ -235,7 +255,8 @@ export default function task(definition, serviceDefinition) {
 
   serviceDefinition.beforeStart(async () => {
     setTimeout(async () => {
-      let gt = ""
+      let gt = undefined
+      console.log("GT", gt)
       let tasksToRestart = await app.viewGet('runningTaskRootsByName', {
         name: definition.name,
         gt,
@@ -256,6 +277,7 @@ export default function task(definition, serviceDefinition) {
           await new Promise(resolve => setTimeout(resolve, 1000)) // wait a second
         }
         gt = tasksToRestart[tasksToRestart.length - 1].id
+        console.log("GT", gt)
         tasksToRestart = await app.viewGet('runningTaskRootsByName', {
           name: definition.name,
           gt,