@live-change/task-service 0.9.6 → 0.9.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/task-service",
-  "version": "0.9.6",
+  "version": "0.9.7",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,8 +22,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/framework": "^0.9.6",
-    "@live-change/relations-plugin": "^0.9.6"
+    "@live-change/framework": "^0.9.7",
+    "@live-change/relations-plugin": "^0.9.7"
   },
-  "gitHead": "96dafb43cced09c59326ee3318d6f45b1b614d6f"
+  "gitHead": "f936468bf39ea3c5b07ce14666f4b3a4a4a9287d"
 }

package/task.ts

@@ -321,7 +321,7 @@ export default function task(definition:TaskDefinition, serviceDefinition) {
         /*console.log("RETRIES", taskObject.retries?.length, maxRetries)*/
         if((taskObject.retries?.length || 0) >= taskObject.maxRetries - 1) {
           await updateTask({
-            state: 'failed',
+            state: definition.fallback ? 'fallback' : 'failed',
             doneAt: new Date(),
             error: /*error.stack ??*/ error.message ?? error,
             retries: [...(taskObject.retries || []), {
@@ -333,9 +333,19 @@ export default function task(definition:TaskDefinition, serviceDefinition) {
           console.error("TASK", taskObject.id, "OF TYPE", definition.name,
             "WITH PARAMETERS", props, "FAILED WITH ERROR", error.stack ?? error.message ?? error)
           if(definition.fallback) {
-            if(typeof definition.fallback !== 'function') return definition.fallback
-            return await definition.fallback(props, runContext, error.message ?? error)
+            await triggerOnTaskStateChange(taskObject, context.causeType, context.cause)
+            let result
+            if(typeof definition.fallback !== 'function') {
+              result = definition.fallback
+            } else {
+              result = definition.fallback(props, runContext, error.message ?? error)
+            }
+            await updateTask({
+              state: 'fallbackDone',
+              result
+            })
           } else {
+            await triggerOnTaskStateChange(taskObject, context.causeType, context.cause)
             throw error
           }
         } else {
@@ -363,6 +373,10 @@ export default function task(definition:TaskDefinition, serviceDefinition) {
      // console.log("TASK", definition.name, "AFTER RUNTASK", taskObject)
     }
 
+    if(taskObject.state === 'failed') {
+      throw new Error(taskObject.retries[taskObject.retries.length - 1].error)
+    }
+
     return taskObject.result
   }