@webiny/background-tasks 0.0.0-unstable.0d717d18dd → 0.0.0-unstable.5387e5f7c8

package/api/BackgroundTasksFeature.js

@@ -1,19 +1,28 @@
 import { createFeature } from "@webiny/feature/api";
-import { TaskService } from "@webiny/api-core/features/task/TaskService/index.js";
-import { RunnableTaskDecorator } from "./decorators/RunnableTaskDecorator.js";
-import { SelfCleaningTaskDecorator } from "./decorators/SelfCleaningTaskDecorator.js";
+import { TaskDefinitionDefaultsDecorator } from "./decorators/TaskDefinitionDefaultsDecorator.js";
+import { SelfCleaningTaskHandlerDecorator } from "./decorators/SelfCleaningTaskHandlerDecorator.js";
 import { TaskController } from "./features/TaskController/index.js";
 import { TaskPrivateModel } from "./crud/TaskPrivateModel.js";
 import { TaskLogPrivateModel } from "./crud/TaskLogPrivateModel.js";
 import { BackgroundTaskSettingsModel } from "./models/BackgroundTaskSettingsModel.js";
-import { createDefinitionCrud } from "./crud/definition.tasks.js";
-import { createServiceCrud } from "./crud/service.tasks.js";
-import { createTaskCrud } from "./crud/crud.tasks.js";
+import { TaskModelProvider } from "./domain/task/TaskModelProvider.js";
+import { TaskLogModelProvider } from "./domain/task/TaskLogModelProvider.js";
+import { TasksRepository } from "./domain/task/TasksRepository.js";
+import { TaskLogsRepository } from "./domain/task/TaskLogsRepository.js";
 import { TaskExecutionContextFeature } from "./features/TaskExecutionContext/feature.js";
-import { GetTaskDefinitionFeature } from "./features/GetTaskDefinition/feature.js";
+import { TaskHandlerResolverFeature } from "./features/TaskHandlerResolver/feature.js";
+import { GetRunnableTaskDefinitionFeature } from "./features/GetRunnableTaskDefinition/feature.js";
 import { ListTaskDefinitionsFeature } from "./features/ListTaskDefinitions/feature.js";
-import { CleanupTaskSubtreeUseCase, CleanupTaskSubtreeUseCaseImpl } from "./features/CleanupTaskSubtree/index.js";
-import { TasksCrud } from "./TasksCrud.js";
+import { CleanupTaskSubtreeFeature } from "./features/CleanupTaskSubtree/index.js";
+import { CreateTaskFeature } from "./features/CreateTask/index.js";
+import { UpdateTaskFeature } from "./features/UpdateTask/index.js";
+import { DeleteTaskFeature } from "./features/DeleteTask/index.js";
+import { BackgroundTaskServiceFeature } from "./features/TaskService/index.js";
+import { CreateTaskLogFeature } from "./features/CreateTaskLog/index.js";
+import { UpdateTaskLogFeature } from "./features/UpdateTaskLog/index.js";
+import { DeleteTaskLogFeature } from "./features/DeleteTaskLog/index.js";
+import { GetLatestTaskLogFeature } from "./features/GetLatestTaskLog/index.js";
+import { ListTaskLogsFeature } from "./features/ListTaskLogs/index.js";
 import { TriggerTaskFeature } from "./features/TriggerTask/feature.js";
 import { AbortTaskFeature } from "./features/AbortTask/feature.js";
 import { GetTaskFeature } from "./features/GetTask/feature.js";
@@ -22,36 +31,43 @@ import { TestingRunTaskDefinition } from "./tasks/testingRunTask.js";
 import { BackgroundTaskPermissionsFeature } from "./features/BackgroundTaskPermissions/feature.js";
 import { GetBackgroundTaskSettingsFeature } from "./features/GetBackgroundTaskSettings/feature.js";
 import { UpdateBackgroundTaskSettingsFeature } from "./features/UpdateBackgroundTaskSettings/feature.js";
-import { BackgroundTasksContextualSchema } from "./graphql/BackgroundTasksContextualSchema.js";
+import { BackgroundTasksGraphQLSchema } from "./graphql/BackgroundTasksGraphQLSchema.js";
 const BackgroundTasksFeature = createFeature({
     name: "BackgroundTasks",
     register (container) {
         container.register(TaskPrivateModel);
         container.register(TaskLogPrivateModel);
         container.register(BackgroundTaskSettingsModel);
-        container.registerDecorator(RunnableTaskDecorator);
-        container.registerDecorator(SelfCleaningTaskDecorator);
-        GetTaskDefinitionFeature.register(container);
+        container.registerDecorator(TaskDefinitionDefaultsDecorator);
+        container.registerDecorator(SelfCleaningTaskHandlerDecorator);
+        TaskHandlerResolverFeature.register(container);
+        GetRunnableTaskDefinitionFeature.register(container);
         ListTaskDefinitionsFeature.register(container);
-        const tasksCrud = {
-            ...createDefinitionCrud(container),
-            ...createTaskCrud(container),
-            ...createServiceCrud(container)
-        };
-        container.registerInstance(TasksCrud, tasksCrud);
-        container.registerInstance(TaskService, tasksCrud);
-        TriggerTaskFeature.register(container);
-        AbortTaskFeature.register(container);
+        container.register(TaskModelProvider);
+        container.register(TaskLogModelProvider);
+        container.register(TasksRepository);
+        container.register(TaskLogsRepository);
         GetTaskFeature.register(container);
         ListTasksFeature.register(container);
-        container.registerInstance(CleanupTaskSubtreeUseCase, new CleanupTaskSubtreeUseCaseImpl(container.resolve(TasksCrud)));
+        CreateTaskFeature.register(container);
+        UpdateTaskFeature.register(container);
+        DeleteTaskFeature.register(container);
+        CleanupTaskSubtreeFeature.register(container);
+        CreateTaskLogFeature.register(container);
+        UpdateTaskLogFeature.register(container);
+        DeleteTaskLogFeature.register(container);
+        GetLatestTaskLogFeature.register(container);
+        ListTaskLogsFeature.register(container);
+        BackgroundTaskServiceFeature.register(container);
+        TriggerTaskFeature.register(container);
+        AbortTaskFeature.register(container);
         TaskExecutionContextFeature.register(container);
         container.register(TaskController);
         container.register(TestingRunTaskDefinition);
         BackgroundTaskPermissionsFeature.register(container);
         GetBackgroundTaskSettingsFeature.register(container);
         UpdateBackgroundTaskSettingsFeature.register(container);
-        container.register(BackgroundTasksContextualSchema);
+        container.register(BackgroundTasksGraphQLSchema);
     }
 });
 export { BackgroundTasksFeature };

package/api/BackgroundTasksFeature.js.map

@@ -1 +1 @@
-{"version":3,"file":"api/BackgroundTasksFeature.js","sources":["../../src/api/BackgroundTasksFeature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { TaskService } from \"@webiny/api-core/features/task/TaskService/index.js\";\nimport { RunnableTaskDecorator } from \"./decorators/RunnableTaskDecorator.js\";\nimport { SelfCleaningTaskDecorator } from \"./decorators/SelfCleaningTaskDecorator.js\";\nimport { TaskController } from \"./features/TaskController/index.js\";\nimport { TaskPrivateModel } from \"./crud/TaskPrivateModel.js\";\nimport { TaskLogPrivateModel } from \"./crud/TaskLogPrivateModel.js\";\nimport { BackgroundTaskSettingsModel } from \"./models/BackgroundTaskSettingsModel.js\";\nimport { createDefinitionCrud } from \"./crud/definition.tasks.js\";\nimport { createServiceCrud } from \"./crud/service.tasks.js\";\nimport { createTaskCrud } from \"./crud/crud.tasks.js\";\nimport { TaskExecutionContextFeature } from \"./features/TaskExecutionContext/feature.js\";\nimport { GetTaskDefinitionFeature } from \"./features/GetTaskDefinition/feature.js\";\nimport { ListTaskDefinitionsFeature } from \"./features/ListTaskDefinitions/feature.js\";\nimport {\n    CleanupTaskSubtreeUseCase,\n    CleanupTaskSubtreeUseCaseImpl\n} from \"./features/CleanupTaskSubtree/index.js\";\nimport { TasksCrud } from \"./TasksCrud.js\";\nimport { TriggerTaskFeature } from \"./features/TriggerTask/feature.js\";\nimport { AbortTaskFeature } from \"./features/AbortTask/feature.js\";\nimport { GetTaskFeature } from \"./features/GetTask/feature.js\";\nimport { ListTasksFeature } from \"./features/ListTasks/feature.js\";\nimport { TestingRunTaskDefinition } from \"./tasks/testingRunTask.js\";\nimport { BackgroundTaskPermissionsFeature } from \"./features/BackgroundTaskPermissions/feature.js\";\nimport { GetBackgroundTaskSettingsFeature } from \"./features/GetBackgroundTaskSettings/feature.js\";\nimport { UpdateBackgroundTaskSettingsFeature } from \"./features/UpdateBackgroundTaskSettings/feature.js\";\nimport { BackgroundTasksContextualSchema } from \"./graphql/BackgroundTasksContextualSchema.js\";\n\nexport const BackgroundTasksFeature = createFeature({\n    name: \"BackgroundTasks\",\n    register(container) {\n        // Register models at register() time so they are available to GetModelUseCase when the\n        // ModelsFetcher cache is first filled (which may happen during an earlier feature's enhance).\n        container.register(TaskPrivateModel);\n        container.register(TaskLogPrivateModel);\n        container.register(BackgroundTaskSettingsModel);\n\n        // Decorators wrapping all TaskDefinition instances.\n        container.registerDecorator(RunnableTaskDecorator);\n        container.registerDecorator(SelfCleaningTaskDecorator);\n\n        // Task definition use cases.\n        GetTaskDefinitionFeature.register(container);\n        ListTaskDefinitionsFeature.register(container);\n\n        // Build the tasks CRUD facade from the container and register it as the canonical TasksCrud\n        // abstraction (plus the legacy TaskService alias). The factory methods resolve TasksCrud\n        // lazily for sibling calls, so registering the assembled object up front is sufficient.\n        const tasksCrud = {\n            ...createDefinitionCrud(container),\n            ...createTaskCrud(container),\n            ...createServiceCrud(container)\n        };\n        container.registerInstance(TasksCrud, tasksCrud);\n        container.registerInstance(TaskService, tasksCrud);\n\n        // Task CRUD use cases (must be after TasksCrud is registered).\n        TriggerTaskFeature.register(container);\n        AbortTaskFeature.register(container);\n        GetTaskFeature.register(container);\n        ListTasksFeature.register(container);\n        container.registerInstance(\n            CleanupTaskSubtreeUseCase,\n            new CleanupTaskSubtreeUseCaseImpl(container.resolve(TasksCrud))\n        );\n\n        // Execution context (singleton), controller, and the built-in test task.\n        TaskExecutionContextFeature.register(container);\n        container.register(TaskController);\n        container.register(TestingRunTaskDefinition);\n\n        // Permissions + settings features.\n        BackgroundTaskPermissionsFeature.register(container);\n        GetBackgroundTaskSettingsFeature.register(container);\n        UpdateBackgroundTaskSettingsFeature.register(container);\n\n        // GraphQL schema — rendered per-request from the CMS task/log content models.\n        container.register(BackgroundTasksContextualSchema);\n    }\n});\n"],"names":["BackgroundTasksFeature","createFeature","container","TaskPrivateModel","TaskLogPrivateModel","BackgroundTaskSettingsModel","RunnableTaskDecorator","SelfCleaningTaskDecorator","GetTaskDefinitionFeature","ListTaskDefinitionsFeature","tasksCrud","createDefinitionCrud","createTaskCrud","createServiceCrud","TasksCrud","TaskService","TriggerTaskFeature","AbortTaskFeature","GetTaskFeature","ListTasksFeature","CleanupTaskSubtreeUseCase","CleanupTaskSubtreeUseCaseImpl","TaskExecutionContextFeature","TaskController","TestingRunTaskDefinition","BackgroundTaskPermissionsFeature","GetBackgroundTaskSettingsFeature","UpdateBackgroundTaskSettingsFeature","BackgroundTasksContextualSchema"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AA6BO,MAAMA,yBAAyBC,cAAc;IAChD,MAAM;IACN,UAASC,SAAS;QAGdA,UAAU,QAAQ,CAACC;QACnBD,UAAU,QAAQ,CAACE;QACnBF,UAAU,QAAQ,CAACG;QAGnBH,UAAU,iBAAiB,CAACI;QAC5BJ,UAAU,iBAAiB,CAACK;QAG5BC,yBAAyB,QAAQ,CAACN;QAClCO,2BAA2B,QAAQ,CAACP;QAKpC,MAAMQ,YAAY;YACd,GAAGC,qBAAqBT,UAAU;YAClC,GAAGU,eAAeV,UAAU;YAC5B,GAAGW,kBAAkBX,UAAU;QACnC;QACAA,UAAU,gBAAgB,CAACY,WAAWJ;QACtCR,UAAU,gBAAgB,CAACa,aAAaL;QAGxCM,mBAAmB,QAAQ,CAACd;QAC5Be,iBAAiB,QAAQ,CAACf;QAC1BgB,eAAe,QAAQ,CAAChB;QACxBiB,iBAAiB,QAAQ,CAACjB;QAC1BA,UAAU,gBAAgB,CACtBkB,2BACA,IAAIC,8BAA8BnB,UAAU,OAAO,CAACY;QAIxDQ,4BAA4B,QAAQ,CAACpB;QACrCA,UAAU,QAAQ,CAACqB;QACnBrB,UAAU,QAAQ,CAACsB;QAGnBC,iCAAiC,QAAQ,CAACvB;QAC1CwB,iCAAiC,QAAQ,CAACxB;QAC1CyB,oCAAoC,QAAQ,CAACzB;QAG7CA,UAAU,QAAQ,CAAC0B;IACvB;AACJ"}
+{"version":3,"file":"api/BackgroundTasksFeature.js","sources":["../../src/api/BackgroundTasksFeature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { TaskDefinitionDefaultsDecorator } from \"./decorators/TaskDefinitionDefaultsDecorator.js\";\nimport { SelfCleaningTaskHandlerDecorator } from \"./decorators/SelfCleaningTaskHandlerDecorator.js\";\nimport { TaskController } from \"./features/TaskController/index.js\";\nimport { TaskPrivateModel } from \"./crud/TaskPrivateModel.js\";\nimport { TaskLogPrivateModel } from \"./crud/TaskLogPrivateModel.js\";\nimport { BackgroundTaskSettingsModel } from \"./models/BackgroundTaskSettingsModel.js\";\nimport { TaskModelProvider } from \"./domain/task/TaskModelProvider.js\";\nimport { TaskLogModelProvider } from \"./domain/task/TaskLogModelProvider.js\";\nimport { TasksRepository } from \"./domain/task/TasksRepository.js\";\nimport { TaskLogsRepository } from \"./domain/task/TaskLogsRepository.js\";\nimport { TaskExecutionContextFeature } from \"./features/TaskExecutionContext/feature.js\";\nimport { TaskHandlerResolverFeature } from \"./features/TaskHandlerResolver/feature.js\";\nimport { GetRunnableTaskDefinitionFeature } from \"./features/GetRunnableTaskDefinition/feature.js\";\nimport { ListTaskDefinitionsFeature } from \"./features/ListTaskDefinitions/feature.js\";\nimport { CleanupTaskSubtreeFeature } from \"./features/CleanupTaskSubtree/index.js\";\nimport { CreateTaskFeature } from \"./features/CreateTask/index.js\";\nimport { UpdateTaskFeature } from \"./features/UpdateTask/index.js\";\nimport { DeleteTaskFeature } from \"./features/DeleteTask/index.js\";\nimport { BackgroundTaskServiceFeature } from \"./features/TaskService/index.js\";\nimport { CreateTaskLogFeature } from \"./features/CreateTaskLog/index.js\";\nimport { UpdateTaskLogFeature } from \"./features/UpdateTaskLog/index.js\";\nimport { DeleteTaskLogFeature } from \"./features/DeleteTaskLog/index.js\";\nimport { GetLatestTaskLogFeature } from \"./features/GetLatestTaskLog/index.js\";\nimport { ListTaskLogsFeature } from \"./features/ListTaskLogs/index.js\";\nimport { TriggerTaskFeature } from \"./features/TriggerTask/feature.js\";\nimport { AbortTaskFeature } from \"./features/AbortTask/feature.js\";\nimport { GetTaskFeature } from \"./features/GetTask/feature.js\";\nimport { ListTasksFeature } from \"./features/ListTasks/feature.js\";\nimport { TestingRunTaskDefinition } from \"./tasks/testingRunTask.js\";\nimport { BackgroundTaskPermissionsFeature } from \"./features/BackgroundTaskPermissions/feature.js\";\nimport { GetBackgroundTaskSettingsFeature } from \"./features/GetBackgroundTaskSettings/feature.js\";\nimport { UpdateBackgroundTaskSettingsFeature } from \"./features/UpdateBackgroundTaskSettings/feature.js\";\nimport { BackgroundTasksGraphQLSchema } from \"./graphql/BackgroundTasksGraphQLSchema.js\";\n\nexport const BackgroundTasksFeature = createFeature({\n    name: \"BackgroundTasks\",\n    register(container) {\n        // Register models at register() time so they are available to GetModelUseCase when the\n        // ModelsFetcher cache is first filled (which may happen during an earlier feature's enhance).\n        container.register(TaskPrivateModel);\n        container.register(TaskLogPrivateModel);\n        container.register(BackgroundTaskSettingsModel);\n\n        // Metadata rules, applied to every registered TaskDefinition.\n        container.registerDecorator(TaskDefinitionDefaultsDecorator);\n\n        // Self-cleanup runs in the lifecycle hooks, which belong to the handler. Applied when the\n        // runner resolves the handler a definition names.\n        container.registerDecorator(SelfCleaningTaskHandlerDecorator);\n\n        // Task definition use cases.\n        TaskHandlerResolverFeature.register(container);\n        GetRunnableTaskDefinitionFeature.register(container);\n        ListTaskDefinitionsFeature.register(container);\n\n        // Task and log storage.\n        container.register(TaskModelProvider);\n        container.register(TaskLogModelProvider);\n        container.register(TasksRepository);\n        container.register(TaskLogsRepository);\n\n        // Task use cases, and the public TaskService (trigger, abort, service info) on top of them.\n        GetTaskFeature.register(container);\n        ListTasksFeature.register(container);\n        CreateTaskFeature.register(container);\n        UpdateTaskFeature.register(container);\n        DeleteTaskFeature.register(container);\n        CleanupTaskSubtreeFeature.register(container);\n        CreateTaskLogFeature.register(container);\n        UpdateTaskLogFeature.register(container);\n        DeleteTaskLogFeature.register(container);\n        GetLatestTaskLogFeature.register(container);\n        ListTaskLogsFeature.register(container);\n        BackgroundTaskServiceFeature.register(container);\n        TriggerTaskFeature.register(container);\n        AbortTaskFeature.register(container);\n\n        // Execution context (singleton), controller, and the built-in test task.\n        TaskExecutionContextFeature.register(container);\n        container.register(TaskController);\n        container.register(TestingRunTaskDefinition);\n\n        // Permissions + settings features.\n        BackgroundTaskPermissionsFeature.register(container);\n        GetBackgroundTaskSettingsFeature.register(container);\n        UpdateBackgroundTaskSettingsFeature.register(container);\n\n        // GraphQL schema, rendered from the CMS task/log content models.\n        container.register(BackgroundTasksGraphQLSchema);\n    }\n});\n"],"names":["BackgroundTasksFeature","createFeature","container","TaskPrivateModel","TaskLogPrivateModel","BackgroundTaskSettingsModel","TaskDefinitionDefaultsDecorator","SelfCleaningTaskHandlerDecorator","TaskHandlerResolverFeature","GetRunnableTaskDefinitionFeature","ListTaskDefinitionsFeature","TaskModelProvider","TaskLogModelProvider","TasksRepository","TaskLogsRepository","GetTaskFeature","ListTasksFeature","CreateTaskFeature","UpdateTaskFeature","DeleteTaskFeature","CleanupTaskSubtreeFeature","CreateTaskLogFeature","UpdateTaskLogFeature","DeleteTaskLogFeature","GetLatestTaskLogFeature","ListTaskLogsFeature","BackgroundTaskServiceFeature","TriggerTaskFeature","AbortTaskFeature","TaskExecutionContextFeature","TaskController","TestingRunTaskDefinition","BackgroundTaskPermissionsFeature","GetBackgroundTaskSettingsFeature","UpdateBackgroundTaskSettingsFeature","BackgroundTasksGraphQLSchema"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmCO,MAAMA,yBAAyBC,cAAc;IAChD,MAAM;IACN,UAASC,SAAS;QAGdA,UAAU,QAAQ,CAACC;QACnBD,UAAU,QAAQ,CAACE;QACnBF,UAAU,QAAQ,CAACG;QAGnBH,UAAU,iBAAiB,CAACI;QAI5BJ,UAAU,iBAAiB,CAACK;QAG5BC,2BAA2B,QAAQ,CAACN;QACpCO,iCAAiC,QAAQ,CAACP;QAC1CQ,2BAA2B,QAAQ,CAACR;QAGpCA,UAAU,QAAQ,CAACS;QACnBT,UAAU,QAAQ,CAACU;QACnBV,UAAU,QAAQ,CAACW;QACnBX,UAAU,QAAQ,CAACY;QAGnBC,eAAe,QAAQ,CAACb;QACxBc,iBAAiB,QAAQ,CAACd;QAC1Be,kBAAkB,QAAQ,CAACf;QAC3BgB,kBAAkB,QAAQ,CAAChB;QAC3BiB,kBAAkB,QAAQ,CAACjB;QAC3BkB,0BAA0B,QAAQ,CAAClB;QACnCmB,qBAAqB,QAAQ,CAACnB;QAC9BoB,qBAAqB,QAAQ,CAACpB;QAC9BqB,qBAAqB,QAAQ,CAACrB;QAC9BsB,wBAAwB,QAAQ,CAACtB;QACjCuB,oBAAoB,QAAQ,CAACvB;QAC7BwB,6BAA6B,QAAQ,CAACxB;QACtCyB,mBAAmB,QAAQ,CAACzB;QAC5B0B,iBAAiB,QAAQ,CAAC1B;QAG1B2B,4BAA4B,QAAQ,CAAC3B;QACrCA,UAAU,QAAQ,CAAC4B;QACnB5B,UAAU,QAAQ,CAAC6B;QAGnBC,iCAAiC,QAAQ,CAAC9B;QAC1C+B,iCAAiC,QAAQ,CAAC/B;QAC1CgC,oCAAoC,QAAQ,CAAChC;QAG7CA,UAAU,QAAQ,CAACiC;IACvB;AACJ"}

package/api/crud/TaskLogPrivateModel.js

@@ -6,7 +6,8 @@ class TaskLogPrivateModelImpl {
         return [
             builder.private({
                 modelId: WEBINY_TASK_LOG_MODEL_ID,
-                name: "Webiny Task Log"
+                name: "Webiny Task Log",
+                lifecycleEvents: false
             }).fields((fields)=>({
                     executionName: fields.text().label("Execution Name"),
                     task: fields.text().label("Task").required("Task is required."),

package/api/crud/TaskLogPrivateModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"api/crud/TaskLogPrivateModel.js","sources":["../../../src/api/crud/TaskLogPrivateModel.ts"],"sourcesContent":["import { ModelFactory } from \"@webiny/api-headless-cms/features/modelBuilder/index.js\";\nimport { TaskLogItemType } from \"~/api/types.js\";\n\nexport const WEBINY_TASK_LOG_MODEL_ID = \"wbyTaskLog\";\n\nclass TaskLogPrivateModelImpl implements ModelFactory.Interface {\n    public async execute(builder: ModelFactory.Builder) {\n        return [\n            builder\n                .private({\n                    modelId: WEBINY_TASK_LOG_MODEL_ID,\n                    name: \"Webiny Task Log\"\n                })\n                .fields(fields => ({\n                    executionName: fields.text().label(\"Execution Name\"),\n                    task: fields.text().label(\"Task\").required(\"Task is required.\"),\n                    iteration: fields\n                        .number()\n                        .label(\"Iteration\")\n                        .required(\"Iteration is required.\"),\n                    items: fields\n                        .object()\n                        .label(\"Items\")\n                        .list()\n                        .required(\"Items is required.\")\n                        .fields(fields => ({\n                            message: fields\n                                .text()\n                                .label(\"Message\")\n                                .required(\"Message is required.\"),\n                            createdOn: fields\n                                .datetime()\n                                .label(\"Created On\")\n                                .required(\"Created On is required.\"),\n                            type: fields\n                                .text()\n                                .label(\"Type\")\n                                .required(\"Type is required.\")\n                                .predefinedValues([\n                                    {\n                                        value: TaskLogItemType.INFO,\n                                        label: \"Info\"\n                                    },\n                                    {\n                                        value: TaskLogItemType.ERROR,\n                                        label: \"Error\"\n                                    }\n                                ]),\n                            data: fields.json().label(\"Data\"),\n                            error: fields.json().label(\"Error\")\n                        }))\n                }))\n        ];\n    }\n}\n\nexport const TaskLogPrivateModel = ModelFactory.createImplementation({\n    implementation: TaskLogPrivateModelImpl,\n    dependencies: []\n});\n"],"names":["WEBINY_TASK_LOG_MODEL_ID","TaskLogPrivateModelImpl","builder","fields","TaskLogItemType","TaskLogPrivateModel","ModelFactory"],"mappings":";;AAGO,MAAMA,2BAA2B;AAExC,MAAMC;IACF,MAAa,QAAQC,OAA6B,EAAE;QAChD,OAAO;YACHA,QACK,OAAO,CAAC;gBACL,SAASF;gBACT,MAAM;YACV,GACC,MAAM,CAACG,CAAAA,SAAW;oBACf,eAAeA,OAAO,IAAI,GAAG,KAAK,CAAC;oBACnC,MAAMA,OAAO,IAAI,GAAG,KAAK,CAAC,QAAQ,QAAQ,CAAC;oBAC3C,WAAWA,OACN,MAAM,GACN,KAAK,CAAC,aACN,QAAQ,CAAC;oBACd,OAAOA,OACF,MAAM,GACN,KAAK,CAAC,SACN,IAAI,GACJ,QAAQ,CAAC,sBACT,MAAM,CAACA,CAAAA,SAAW;4BACf,SAASA,OACJ,IAAI,GACJ,KAAK,CAAC,WACN,QAAQ,CAAC;4BACd,WAAWA,OACN,QAAQ,GACR,KAAK,CAAC,cACN,QAAQ,CAAC;4BACd,MAAMA,OACD,IAAI,GACJ,KAAK,CAAC,QACN,QAAQ,CAAC,qBACT,gBAAgB,CAAC;gCACd;oCACI,OAAOC,gBAAgB,IAAI;oCAC3B,OAAO;gCACX;gCACA;oCACI,OAAOA,gBAAgB,KAAK;oCAC5B,OAAO;gCACX;6BACH;4BACL,MAAMD,OAAO,IAAI,GAAG,KAAK,CAAC;4BAC1B,OAAOA,OAAO,IAAI,GAAG,KAAK,CAAC;wBAC/B;gBACR;SACP;IACL;AACJ;AAEO,MAAME,sBAAsBC,aAAa,oBAAoB,CAAC;IACjE,gBAAgBL;IAChB,cAAc,EAAE;AACpB"}
+{"version":3,"file":"api/crud/TaskLogPrivateModel.js","sources":["../../../src/api/crud/TaskLogPrivateModel.ts"],"sourcesContent":["import { ModelFactory } from \"@webiny/api-headless-cms/features/modelBuilder/index.js\";\nimport { TaskLogItemType } from \"~/api/types.js\";\n\nexport const WEBINY_TASK_LOG_MODEL_ID = \"wbyTaskLog\";\n\nclass TaskLogPrivateModelImpl implements ModelFactory.Interface {\n    public async execute(builder: ModelFactory.Builder) {\n        return [\n            builder\n                .private({\n                    modelId: WEBINY_TASK_LOG_MODEL_ID,\n                    name: \"Webiny Task Log\",\n                    lifecycleEvents: false\n                })\n                .fields(fields => ({\n                    executionName: fields.text().label(\"Execution Name\"),\n                    task: fields.text().label(\"Task\").required(\"Task is required.\"),\n                    iteration: fields\n                        .number()\n                        .label(\"Iteration\")\n                        .required(\"Iteration is required.\"),\n                    items: fields\n                        .object()\n                        .label(\"Items\")\n                        .list()\n                        .required(\"Items is required.\")\n                        .fields(fields => ({\n                            message: fields\n                                .text()\n                                .label(\"Message\")\n                                .required(\"Message is required.\"),\n                            createdOn: fields\n                                .datetime()\n                                .label(\"Created On\")\n                                .required(\"Created On is required.\"),\n                            type: fields\n                                .text()\n                                .label(\"Type\")\n                                .required(\"Type is required.\")\n                                .predefinedValues([\n                                    {\n                                        value: TaskLogItemType.INFO,\n                                        label: \"Info\"\n                                    },\n                                    {\n                                        value: TaskLogItemType.ERROR,\n                                        label: \"Error\"\n                                    }\n                                ]),\n                            data: fields.json().label(\"Data\"),\n                            error: fields.json().label(\"Error\")\n                        }))\n                }))\n        ];\n    }\n}\n\nexport const TaskLogPrivateModel = ModelFactory.createImplementation({\n    implementation: TaskLogPrivateModelImpl,\n    dependencies: []\n});\n"],"names":["WEBINY_TASK_LOG_MODEL_ID","TaskLogPrivateModelImpl","builder","fields","TaskLogItemType","TaskLogPrivateModel","ModelFactory"],"mappings":";;AAGO,MAAMA,2BAA2B;AAExC,MAAMC;IACF,MAAa,QAAQC,OAA6B,EAAE;QAChD,OAAO;YACHA,QACK,OAAO,CAAC;gBACL,SAASF;gBACT,MAAM;gBACN,iBAAiB;YACrB,GACC,MAAM,CAACG,CAAAA,SAAW;oBACf,eAAeA,OAAO,IAAI,GAAG,KAAK,CAAC;oBACnC,MAAMA,OAAO,IAAI,GAAG,KAAK,CAAC,QAAQ,QAAQ,CAAC;oBAC3C,WAAWA,OACN,MAAM,GACN,KAAK,CAAC,aACN,QAAQ,CAAC;oBACd,OAAOA,OACF,MAAM,GACN,KAAK,CAAC,SACN,IAAI,GACJ,QAAQ,CAAC,sBACT,MAAM,CAACA,CAAAA,SAAW;4BACf,SAASA,OACJ,IAAI,GACJ,KAAK,CAAC,WACN,QAAQ,CAAC;4BACd,WAAWA,OACN,QAAQ,GACR,KAAK,CAAC,cACN,QAAQ,CAAC;4BACd,MAAMA,OACD,IAAI,GACJ,KAAK,CAAC,QACN,QAAQ,CAAC,qBACT,gBAAgB,CAAC;gCACd;oCACI,OAAOC,gBAAgB,IAAI;oCAC3B,OAAO;gCACX;gCACA;oCACI,OAAOA,gBAAgB,KAAK;oCAC5B,OAAO;gCACX;6BACH;4BACL,MAAMD,OAAO,IAAI,GAAG,KAAK,CAAC;4BAC1B,OAAOA,OAAO,IAAI,GAAG,KAAK,CAAC;wBAC/B;gBACR;SACP;IACL;AACJ;AAEO,MAAME,sBAAsBC,aAAa,oBAAoB,CAAC;IACjE,gBAAgBL;IAChB,cAAc,EAAE;AACpB"}

package/api/crud/TaskPrivateModel.js

@@ -6,7 +6,8 @@ class TaskPrivateModelImpl {
         return [
             builder.private({
                 modelId: WEBINY_TASK_MODEL_ID,
-                name: "Webiny Task"
+                name: "Webiny Task",
+                lifecycleEvents: false
             }).fields((fields)=>({
                     name: fields.text().label("Name").required("Name is required."),
                     definitionId: fields.text().label("Definition ID").required("Definition ID is required."),

package/api/crud/TaskPrivateModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"api/crud/TaskPrivateModel.js","sources":["../../../src/api/crud/TaskPrivateModel.ts"],"sourcesContent":["import { ModelFactory } from \"@webiny/api-headless-cms/features/modelBuilder/index.js\";\nimport { TaskDataStatus } from \"~/api/types.js\";\n\nexport const WEBINY_TASK_MODEL_ID = \"wbyTask\";\n\nclass TaskPrivateModelImpl implements ModelFactory.Interface {\n    public async execute(builder: ModelFactory.Builder) {\n        return [\n            builder\n                .private({\n                    modelId: WEBINY_TASK_MODEL_ID,\n                    name: \"Webiny Task\"\n                })\n                .fields(fields => ({\n                    name: fields.text().label(\"Name\").required(\"Name is required.\"),\n                    definitionId: fields\n                        .text()\n                        .label(\"Definition ID\")\n                        .required(\"Definition ID is required.\"),\n                    parentId: fields.text().label(\"Parent ID\"),\n                    executionName: fields.text().label(\"Execution Name\"),\n                    iterations: fields.number().label(\"Iterations\"),\n                    input: fields.json().label(\"Input\"),\n                    output: fields.json().label(\"Output\"),\n                    taskStatus: fields\n                        .text()\n                        .label(\"Status\")\n                        .predefinedValues([\n                            {\n                                value: TaskDataStatus.PENDING,\n                                label: \"Pending\"\n                            },\n                            {\n                                value: TaskDataStatus.RUNNING,\n                                label: \"Running\"\n                            },\n                            {\n                                value: TaskDataStatus.FAILED,\n                                label: \"Failed\"\n                            },\n                            {\n                                value: TaskDataStatus.SUCCESS,\n                                label: \"Success\"\n                            },\n                            {\n                                value: TaskDataStatus.ABORTED,\n                                label: \"Aborted\"\n                            }\n                        ])\n                        .settings({ defaultValue: TaskDataStatus.PENDING }),\n                    startedOn: fields.datetime().label(\"Started On\"),\n                    finishedOn: fields.datetime().label(\"Finished On\"),\n                    eventResponse: fields.json().label(\"Event Response\")\n                }))\n        ];\n    }\n}\n\nexport const TaskPrivateModel = ModelFactory.createImplementation({\n    implementation: TaskPrivateModelImpl,\n    dependencies: []\n});\n"],"names":["WEBINY_TASK_MODEL_ID","TaskPrivateModelImpl","builder","fields","TaskDataStatus","TaskPrivateModel","ModelFactory"],"mappings":";;AAGO,MAAMA,uBAAuB;AAEpC,MAAMC;IACF,MAAa,QAAQC,OAA6B,EAAE;QAChD,OAAO;YACHA,QACK,OAAO,CAAC;gBACL,SAASF;gBACT,MAAM;YACV,GACC,MAAM,CAACG,CAAAA,SAAW;oBACf,MAAMA,OAAO,IAAI,GAAG,KAAK,CAAC,QAAQ,QAAQ,CAAC;oBAC3C,cAAcA,OACT,IAAI,GACJ,KAAK,CAAC,iBACN,QAAQ,CAAC;oBACd,UAAUA,OAAO,IAAI,GAAG,KAAK,CAAC;oBAC9B,eAAeA,OAAO,IAAI,GAAG,KAAK,CAAC;oBACnC,YAAYA,OAAO,MAAM,GAAG,KAAK,CAAC;oBAClC,OAAOA,OAAO,IAAI,GAAG,KAAK,CAAC;oBAC3B,QAAQA,OAAO,IAAI,GAAG,KAAK,CAAC;oBAC5B,YAAYA,OACP,IAAI,GACJ,KAAK,CAAC,UACN,gBAAgB,CAAC;wBACd;4BACI,OAAOC,eAAe,OAAO;4BAC7B,OAAO;wBACX;wBACA;4BACI,OAAOA,eAAe,OAAO;4BAC7B,OAAO;wBACX;wBACA;4BACI,OAAOA,eAAe,MAAM;4BAC5B,OAAO;wBACX;wBACA;4BACI,OAAOA,eAAe,OAAO;4BAC7B,OAAO;wBACX;wBACA;4BACI,OAAOA,eAAe,OAAO;4BAC7B,OAAO;wBACX;qBACH,EACA,QAAQ,CAAC;wBAAE,cAAcA,eAAe,OAAO;oBAAC;oBACrD,WAAWD,OAAO,QAAQ,GAAG,KAAK,CAAC;oBACnC,YAAYA,OAAO,QAAQ,GAAG,KAAK,CAAC;oBACpC,eAAeA,OAAO,IAAI,GAAG,KAAK,CAAC;gBACvC;SACP;IACL;AACJ;AAEO,MAAME,mBAAmBC,aAAa,oBAAoB,CAAC;IAC9D,gBAAgBL;IAChB,cAAc,EAAE;AACpB"}
+{"version":3,"file":"api/crud/TaskPrivateModel.js","sources":["../../../src/api/crud/TaskPrivateModel.ts"],"sourcesContent":["import { ModelFactory } from \"@webiny/api-headless-cms/features/modelBuilder/index.js\";\nimport { TaskDataStatus } from \"~/api/types.js\";\n\nexport const WEBINY_TASK_MODEL_ID = \"wbyTask\";\n\nclass TaskPrivateModelImpl implements ModelFactory.Interface {\n    public async execute(builder: ModelFactory.Builder) {\n        return [\n            builder\n                .private({\n                    modelId: WEBINY_TASK_MODEL_ID,\n                    name: \"Webiny Task\",\n                    lifecycleEvents: false\n                })\n                .fields(fields => ({\n                    name: fields.text().label(\"Name\").required(\"Name is required.\"),\n                    definitionId: fields\n                        .text()\n                        .label(\"Definition ID\")\n                        .required(\"Definition ID is required.\"),\n                    parentId: fields.text().label(\"Parent ID\"),\n                    executionName: fields.text().label(\"Execution Name\"),\n                    iterations: fields.number().label(\"Iterations\"),\n                    input: fields.json().label(\"Input\"),\n                    output: fields.json().label(\"Output\"),\n                    taskStatus: fields\n                        .text()\n                        .label(\"Status\")\n                        .predefinedValues([\n                            {\n                                value: TaskDataStatus.PENDING,\n                                label: \"Pending\"\n                            },\n                            {\n                                value: TaskDataStatus.RUNNING,\n                                label: \"Running\"\n                            },\n                            {\n                                value: TaskDataStatus.FAILED,\n                                label: \"Failed\"\n                            },\n                            {\n                                value: TaskDataStatus.SUCCESS,\n                                label: \"Success\"\n                            },\n                            {\n                                value: TaskDataStatus.ABORTED,\n                                label: \"Aborted\"\n                            }\n                        ])\n                        .settings({ defaultValue: TaskDataStatus.PENDING }),\n                    startedOn: fields.datetime().label(\"Started On\"),\n                    finishedOn: fields.datetime().label(\"Finished On\"),\n                    eventResponse: fields.json().label(\"Event Response\")\n                }))\n        ];\n    }\n}\n\nexport const TaskPrivateModel = ModelFactory.createImplementation({\n    implementation: TaskPrivateModelImpl,\n    dependencies: []\n});\n"],"names":["WEBINY_TASK_MODEL_ID","TaskPrivateModelImpl","builder","fields","TaskDataStatus","TaskPrivateModel","ModelFactory"],"mappings":";;AAGO,MAAMA,uBAAuB;AAEpC,MAAMC;IACF,MAAa,QAAQC,OAA6B,EAAE;QAChD,OAAO;YACHA,QACK,OAAO,CAAC;gBACL,SAASF;gBACT,MAAM;gBACN,iBAAiB;YACrB,GACC,MAAM,CAACG,CAAAA,SAAW;oBACf,MAAMA,OAAO,IAAI,GAAG,KAAK,CAAC,QAAQ,QAAQ,CAAC;oBAC3C,cAAcA,OACT,IAAI,GACJ,KAAK,CAAC,iBACN,QAAQ,CAAC;oBACd,UAAUA,OAAO,IAAI,GAAG,KAAK,CAAC;oBAC9B,eAAeA,OAAO,IAAI,GAAG,KAAK,CAAC;oBACnC,YAAYA,OAAO,MAAM,GAAG,KAAK,CAAC;oBAClC,OAAOA,OAAO,IAAI,GAAG,KAAK,CAAC;oBAC3B,QAAQA,OAAO,IAAI,GAAG,KAAK,CAAC;oBAC5B,YAAYA,OACP,IAAI,GACJ,KAAK,CAAC,UACN,gBAAgB,CAAC;wBACd;4BACI,OAAOC,eAAe,OAAO;4BAC7B,OAAO;wBACX;wBACA;4BACI,OAAOA,eAAe,OAAO;4BAC7B,OAAO;wBACX;wBACA;4BACI,OAAOA,eAAe,MAAM;4BAC5B,OAAO;wBACX;wBACA;4BACI,OAAOA,eAAe,OAAO;4BAC7B,OAAO;wBACX;wBACA;4BACI,OAAOA,eAAe,OAAO;4BAC7B,OAAO;wBACX;qBACH,EACA,QAAQ,CAAC;wBAAE,cAAcA,eAAe,OAAO;oBAAC;oBACrD,WAAWD,OAAO,QAAQ,GAAG,KAAK,CAAC;oBACnC,YAAYA,OAAO,QAAQ,GAAG,KAAK,CAAC;oBACpC,eAAeA,OAAO,IAAI,GAAG,KAAK,CAAC;gBACvC;SACP;IACL;AACJ;AAEO,MAAME,mBAAmBC,aAAa,oBAAoB,CAAC;IAC9D,gBAAgBL;IAChB,cAAc,EAAE;AACpB"}

package/api/decorators/{SelfCleaningTaskDecorator.d.ts → SelfCleaningTaskHandlerDecorator.d.ts}

@@ -1,30 +1,33 @@
-import { TaskDefinition } from "@webiny/api-core/features/task/TaskDefinition/index.js";
+import { TaskHandler } from "@webiny/api-core/features/task/TaskDefinition/index.js";
+import { Logger } from "@webiny/api-core/features/logger/index.js";
 import { CleanupTaskSubtreeUseCase } from "../../api/features/CleanupTaskSubtree/index.js";
-type LifecycleHook = TaskDefinition.Interface["onDone"];
-type HookParams = Parameters<NonNullable<LifecycleHook>>[0];
-export declare class SelfCleaningTaskDecoratorImpl implements TaskDefinition.Interface {
+type HookParams = TaskHandler.LifecycleHookParams;
+/**
+ * Deletes a finished task, and its descendants, for the events its definition asked for.
+ *
+ * Registered against `TaskHandler`, so it wraps every task's handler. Which task it is wrapping, and
+ * whether that task wants cleaning up, both come from `params.definition` rather than from anything
+ * captured at construction: one decorator instance serves whichever handler is resolved.
+ *
+ * The user's hook runs first and its failure is swallowed, so a task that throws on the way out is
+ * still cleaned up. That is what the previous single-object implementation did.
+ */
+export declare class SelfCleaningTaskHandlerDecoratorImpl implements TaskHandler.Interface {
     private readonly cleanupTaskSubtree;
-    private decoratee;
-    private readonly events;
-    constructor(cleanupTaskSubtree: CleanupTaskSubtreeUseCase.Interface, decoratee: TaskDefinition.Interface);
-    get id(): string;
-    get title(): string;
-    get description(): string | undefined;
-    get isPrivate(): boolean | undefined;
-    get maxIterations(): number | undefined;
-    get selfCleanup(): import("@webiny/api-core/features/task/TaskDefinition/abstractions").ISelfCleanup | undefined;
-    get createInputValidation(): ((params: import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskCreateInputValidationParams) => import("@webiny/api/types").GenericRecord<PropertyKey, import("zod").ZodType<unknown, unknown, import("zod/v4/core").$ZodTypeInternals<unknown, unknown>>> | import("zod").ZodType<unknown, unknown, import("zod/v4/core").$ZodTypeInternals<unknown, unknown>>) | undefined;
+    private readonly logger;
+    private readonly decoratee;
+    constructor(cleanupTaskSubtree: CleanupTaskSubtreeUseCase.Interface, logger: Logger.Interface, decoratee: TaskHandler.Interface);
     get run(): (params: import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskRunParams<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskInput, import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskOutput>) => Promise<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskResult<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskInput, import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskOutput>>;
     get onBeforeTrigger(): ((params: import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskBeforeTriggerParams<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskInput>) => Promise<void>) | undefined;
     get onMaxIterations(): ((params: import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskLifecycleHook<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskInput, import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskOutput>) => Promise<void>) | undefined;
-    get databaseLogs(): boolean | undefined;
+    get createInputValidation(): ((params: import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskCreateInputValidationParams) => import("@webiny/api/types").GenericRecord<PropertyKey, import("zod").ZodType<unknown, unknown, import("zod/v4/core").$ZodTypeInternals<unknown, unknown>>> | import("zod").ZodType<unknown, unknown, import("zod/v4/core").$ZodTypeInternals<unknown, unknown>>) | undefined;
     get onDone(): (params: HookParams) => Promise<void>;
     get onError(): (params: HookParams) => Promise<void>;
     get onAbort(): (params: HookParams) => Promise<void>;
-    private runCleanup;
+    private cleanUpIfAsked;
     private safeCall;
 }
-export declare const SelfCleaningTaskDecorator: typeof SelfCleaningTaskDecoratorImpl & {
-    __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskDefinition<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskInput, import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskOutput>>;
+export declare const SelfCleaningTaskHandlerDecorator: typeof SelfCleaningTaskHandlerDecoratorImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskHandler<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskInput, import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskOutput>>;
 };
 export {};

package/api/decorators/SelfCleaningTaskHandlerDecorator.js

@@ -0,0 +1,69 @@
+import { TaskHandler } from "@webiny/api-core/features/task/TaskDefinition/index.js";
+import { Logger } from "@webiny/api-core/features/logger/index.js";
+import { normalizeSelfCleanup } from "../utils/normalizeSelfCleanup.js";
+import { CleanupTaskSubtreeUseCase } from "../features/CleanupTaskSubtree/index.js";
+import { getErrorProperties } from "../utils/getErrorProperties.js";
+class SelfCleaningTaskHandlerDecoratorImpl {
+    constructor(cleanupTaskSubtree, logger, decoratee){
+        this.cleanupTaskSubtree = cleanupTaskSubtree;
+        this.logger = logger;
+        this.decoratee = decoratee;
+    }
+    get run() {
+        return this.decoratee.run.bind(this.decoratee);
+    }
+    get onBeforeTrigger() {
+        return this.decoratee.onBeforeTrigger?.bind(this.decoratee);
+    }
+    get onMaxIterations() {
+        return this.decoratee.onMaxIterations?.bind(this.decoratee);
+    }
+    get createInputValidation() {
+        return this.decoratee.createInputValidation?.bind(this.decoratee);
+    }
+    get onDone() {
+        return async (params)=>{
+            await this.safeCall(this.decoratee.onDone, params, "onDone");
+            await this.cleanUpIfAsked(params, "onSuccess");
+        };
+    }
+    get onError() {
+        return async (params)=>{
+            await this.safeCall(this.decoratee.onError, params, "onError");
+            await this.cleanUpIfAsked(params, "onError");
+        };
+    }
+    get onAbort() {
+        return async (params)=>{
+            await this.safeCall(this.decoratee.onAbort, params, "onAbort");
+            await this.cleanUpIfAsked(params, "onAbort");
+        };
+    }
+    async cleanUpIfAsked(params, event) {
+        const events = normalizeSelfCleanup(params.definition.selfCleanup);
+        if (!events.has(event)) return;
+        await this.cleanupTaskSubtree.execute(params.task.id);
+    }
+    async safeCall(hook, params, name) {
+        if (!hook) return;
+        try {
+            await hook.call(this.decoratee, params);
+        } catch (ex) {
+            this.logger.error({
+                error: getErrorProperties(ex),
+                taskId: params.task.id,
+                hook: name
+            }, "Error executing task lifecycle hook.");
+        }
+    }
+}
+const SelfCleaningTaskHandlerDecorator = TaskHandler.createDecorator({
+    decorator: SelfCleaningTaskHandlerDecoratorImpl,
+    dependencies: [
+        CleanupTaskSubtreeUseCase,
+        Logger
+    ]
+});
+export { SelfCleaningTaskHandlerDecorator, SelfCleaningTaskHandlerDecoratorImpl };
+
+//# sourceMappingURL=SelfCleaningTaskHandlerDecorator.js.map

package/api/decorators/SelfCleaningTaskHandlerDecorator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"api/decorators/SelfCleaningTaskHandlerDecorator.js","sources":["../../../src/api/decorators/SelfCleaningTaskHandlerDecorator.ts"],"sourcesContent":["import { TaskHandler } from \"@webiny/api-core/features/task/TaskDefinition/index.js\";\nimport { Logger } from \"@webiny/api-core/features/logger/index.js\";\nimport { normalizeSelfCleanup } from \"~/api/utils/normalizeSelfCleanup.js\";\nimport { CleanupTaskSubtreeUseCase } from \"~/api/features/CleanupTaskSubtree/index.js\";\nimport { getErrorProperties } from \"~/api/utils/getErrorProperties.js\";\n\ntype HookParams = TaskHandler.LifecycleHookParams;\n\n/**\n * Deletes a finished task, and its descendants, for the events its definition asked for.\n *\n * Registered against `TaskHandler`, so it wraps every task's handler. Which task it is wrapping, and\n * whether that task wants cleaning up, both come from `params.definition` rather than from anything\n * captured at construction: one decorator instance serves whichever handler is resolved.\n *\n * The user's hook runs first and its failure is swallowed, so a task that throws on the way out is\n * still cleaned up. That is what the previous single-object implementation did.\n */\nexport class SelfCleaningTaskHandlerDecoratorImpl implements TaskHandler.Interface {\n    public constructor(\n        private readonly cleanupTaskSubtree: CleanupTaskSubtreeUseCase.Interface,\n        private readonly logger: Logger.Interface,\n        private readonly decoratee: TaskHandler.Interface\n    ) {}\n\n    get run() {\n        return this.decoratee.run.bind(this.decoratee);\n    }\n\n    get onBeforeTrigger() {\n        return this.decoratee.onBeforeTrigger?.bind(this.decoratee);\n    }\n\n    get onMaxIterations() {\n        return this.decoratee.onMaxIterations?.bind(this.decoratee);\n    }\n\n    get createInputValidation() {\n        return this.decoratee.createInputValidation?.bind(this.decoratee);\n    }\n\n    get onDone() {\n        return async (params: HookParams) => {\n            await this.safeCall(this.decoratee.onDone, params, \"onDone\");\n            await this.cleanUpIfAsked(params, \"onSuccess\");\n        };\n    }\n\n    get onError() {\n        return async (params: HookParams) => {\n            await this.safeCall(this.decoratee.onError, params, \"onError\");\n            await this.cleanUpIfAsked(params, \"onError\");\n        };\n    }\n\n    get onAbort() {\n        return async (params: HookParams) => {\n            await this.safeCall(this.decoratee.onAbort, params, \"onAbort\");\n            await this.cleanUpIfAsked(params, \"onAbort\");\n        };\n    }\n\n    private async cleanUpIfAsked(\n        params: HookParams,\n        event: \"onSuccess\" | \"onError\" | \"onAbort\"\n    ): Promise<void> {\n        const events = normalizeSelfCleanup(params.definition.selfCleanup);\n        if (!events.has(event)) {\n            return;\n        }\n\n        await this.cleanupTaskSubtree.execute(params.task.id);\n    }\n\n    private async safeCall(\n        hook: TaskHandler.Interface[\"onDone\"],\n        params: HookParams,\n        name: string\n    ): Promise<void> {\n        if (!hook) {\n            return;\n        }\n\n        try {\n            await hook.call(this.decoratee, params);\n        } catch (ex) {\n            this.logger.error(\n                { error: getErrorProperties(ex), taskId: params.task.id, hook: name },\n                \"Error executing task lifecycle hook.\"\n            );\n        }\n    }\n}\n\nexport const SelfCleaningTaskHandlerDecorator = TaskHandler.createDecorator({\n    decorator: SelfCleaningTaskHandlerDecoratorImpl,\n    dependencies: [CleanupTaskSubtreeUseCase, Logger]\n});\n"],"names":["SelfCleaningTaskHandlerDecoratorImpl","cleanupTaskSubtree","logger","decoratee","params","event","events","normalizeSelfCleanup","hook","name","ex","getErrorProperties","SelfCleaningTaskHandlerDecorator","TaskHandler","CleanupTaskSubtreeUseCase","Logger"],"mappings":";;;;;AAkBO,MAAMA;IACT,YACqBC,kBAAuD,EACvDC,MAAwB,EACxBC,SAAgC,CACnD;aAHmBF,kBAAkB,GAAlBA;aACAC,MAAM,GAANA;aACAC,SAAS,GAATA;IAClB;IAEH,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS;IACjD;IAEA,IAAI,kBAAkB;QAClB,OAAO,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,KAAK,IAAI,CAAC,SAAS;IAC9D;IAEA,IAAI,kBAAkB;QAClB,OAAO,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,KAAK,IAAI,CAAC,SAAS;IAC9D;IAEA,IAAI,wBAAwB;QACxB,OAAO,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE,KAAK,IAAI,CAAC,SAAS;IACpE;IAEA,IAAI,SAAS;QACT,OAAO,OAAOC;YACV,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAEA,QAAQ;YACnD,MAAM,IAAI,CAAC,cAAc,CAACA,QAAQ;QACtC;IACJ;IAEA,IAAI,UAAU;QACV,OAAO,OAAOA;YACV,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAEA,QAAQ;YACpD,MAAM,IAAI,CAAC,cAAc,CAACA,QAAQ;QACtC;IACJ;IAEA,IAAI,UAAU;QACV,OAAO,OAAOA;YACV,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAEA,QAAQ;YACpD,MAAM,IAAI,CAAC,cAAc,CAACA,QAAQ;QACtC;IACJ;IAEA,MAAc,eACVA,MAAkB,EAClBC,KAA0C,EAC7B;QACb,MAAMC,SAASC,qBAAqBH,OAAO,UAAU,CAAC,WAAW;QACjE,IAAI,CAACE,OAAO,GAAG,CAACD,QACZ;QAGJ,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAACD,OAAO,IAAI,CAAC,EAAE;IACxD;IAEA,MAAc,SACVI,IAAqC,EACrCJ,MAAkB,EAClBK,IAAY,EACC;QACb,IAAI,CAACD,MACD;QAGJ,IAAI;YACA,MAAMA,KAAK,IAAI,CAAC,IAAI,CAAC,SAAS,EAAEJ;QACpC,EAAE,OAAOM,IAAI;YACT,IAAI,CAAC,MAAM,CAAC,KAAK,CACb;gBAAE,OAAOC,mBAAmBD;gBAAK,QAAQN,OAAO,IAAI,CAAC,EAAE;gBAAE,MAAMK;YAAK,GACpE;QAER;IACJ;AACJ;AAEO,MAAMG,mCAAmCC,YAAY,eAAe,CAAC;IACxE,WAAWb;IACX,cAAc;QAACc;QAA2BC;KAAO;AACrD"}

package/api/decorators/TaskDefinitionDefaultsDecorator.d.ts

@@ -0,0 +1,27 @@
+import { TaskDefinition } from "@webiny/api-core/features/task/TaskDefinition/index.js";
+/**
+ * Fills in the defaults a definition is allowed to leave out, applies the one rule that overrides
+ * what a definition asked for (self-cleanup forces `databaseLogs` off), and rejects an id that is
+ * not camelCase.
+ *
+ * Everything here is metadata. A definition carries no behaviour, so there is nothing to forward:
+ * `GetRunnableTaskDefinitionUseCase` takes `run` and the hooks from the handler that `handler` names, after
+ * this decorator has run.
+ */
+export declare class TaskDefinitionDefaultsDecoratorImpl implements TaskDefinition.Interface {
+    private decoratee;
+    private readonly cleansUp;
+    constructor(decoratee: TaskDefinition.Interface);
+    get id(): string;
+    get title(): string;
+    get description(): string | undefined;
+    get handler(): import("@webiny/di").Constructor<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskHandler<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskInput, import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskOutput>>;
+    get isPrivate(): boolean;
+    get databaseLogs(): boolean;
+    get maxIterations(): number;
+    get selfCleanup(): import("@webiny/api-core/features/task/TaskDefinition/abstractions").ISelfCleanup | undefined;
+    private validate;
+}
+export declare const TaskDefinitionDefaultsDecorator: typeof TaskDefinitionDefaultsDecoratorImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskDefinition<import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskInput, import("@webiny/api-core/features/task/TaskDefinition/abstractions").ITaskOutput>>;
+};

package/api/decorators/TaskDefinitionDefaultsDecorator.js

@@ -0,0 +1,47 @@
+import camelCase from "lodash/camelCase.js";
+import error from "@webiny/error";
+import { TaskDefinition } from "@webiny/api-core/features/task/TaskDefinition/index.js";
+import { normalizeSelfCleanup } from "../utils/normalizeSelfCleanup.js";
+const DEFAULT_MAX_ITERATIONS = 50;
+class TaskDefinitionDefaultsDecoratorImpl {
+    constructor(decoratee){
+        this.decoratee = decoratee;
+        this.validate();
+        this.cleansUp = normalizeSelfCleanup(decoratee.selfCleanup).size > 0;
+    }
+    get id() {
+        return this.decoratee.id;
+    }
+    get title() {
+        return this.decoratee.title;
+    }
+    get description() {
+        return this.decoratee.description;
+    }
+    get handler() {
+        return this.decoratee.handler;
+    }
+    get isPrivate() {
+        return this.decoratee.isPrivate || false;
+    }
+    get databaseLogs() {
+        if (this.cleansUp) return false;
+        return this.decoratee.databaseLogs || false;
+    }
+    get maxIterations() {
+        return this.decoratee.maxIterations || DEFAULT_MAX_ITERATIONS;
+    }
+    get selfCleanup() {
+        return this.decoratee.selfCleanup;
+    }
+    validate() {
+        if (camelCase(this.decoratee.id) !== this.decoratee.id) throw new error(`Task ID "${this.decoratee.id}" is invalid. It must be in camelCase format, for example: "myCustomTask".`);
+    }
+}
+const TaskDefinitionDefaultsDecorator = TaskDefinition.createDecorator({
+    decorator: TaskDefinitionDefaultsDecoratorImpl,
+    dependencies: []
+});
+export { TaskDefinitionDefaultsDecorator, TaskDefinitionDefaultsDecoratorImpl };
+
+//# sourceMappingURL=TaskDefinitionDefaultsDecorator.js.map

package/api/decorators/TaskDefinitionDefaultsDecorator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"api/decorators/TaskDefinitionDefaultsDecorator.js","sources":["../../../src/api/decorators/TaskDefinitionDefaultsDecorator.ts"],"sourcesContent":["import camelCase from \"lodash/camelCase.js\";\nimport WebinyError from \"@webiny/error\";\nimport { TaskDefinition } from \"@webiny/api-core/features/task/TaskDefinition/index.js\";\nimport { normalizeSelfCleanup } from \"~/api/utils/normalizeSelfCleanup.js\";\n\nconst DEFAULT_MAX_ITERATIONS = 50;\n\n/**\n * Fills in the defaults a definition is allowed to leave out, applies the one rule that overrides\n * what a definition asked for (self-cleanup forces `databaseLogs` off), and rejects an id that is\n * not camelCase.\n *\n * Everything here is metadata. A definition carries no behaviour, so there is nothing to forward:\n * `GetRunnableTaskDefinitionUseCase` takes `run` and the hooks from the handler that `handler` names, after\n * this decorator has run.\n */\nexport class TaskDefinitionDefaultsDecoratorImpl implements TaskDefinition.Interface {\n    private readonly cleansUp: boolean;\n\n    constructor(private decoratee: TaskDefinition.Interface) {\n        this.validate();\n        this.cleansUp = normalizeSelfCleanup(decoratee.selfCleanup).size > 0;\n    }\n\n    get id() {\n        return this.decoratee.id;\n    }\n\n    get title() {\n        return this.decoratee.title;\n    }\n\n    get description() {\n        return this.decoratee.description;\n    }\n\n    get handler() {\n        return this.decoratee.handler;\n    }\n\n    // The three defaults.\n    get isPrivate() {\n        return this.decoratee.isPrivate || false;\n    }\n\n    get databaseLogs() {\n        // A task that deletes itself on the way out has nowhere to keep logs, so asking for any\n        // cleanup event overrides the task's own choice.\n        if (this.cleansUp) {\n            return false;\n        }\n        return this.decoratee.databaseLogs || false;\n    }\n\n    get maxIterations() {\n        return this.decoratee.maxIterations || DEFAULT_MAX_ITERATIONS;\n    }\n\n    get selfCleanup() {\n        return this.decoratee.selfCleanup;\n    }\n\n    private validate(): void {\n        if (camelCase(this.decoratee.id) !== this.decoratee.id) {\n            throw new WebinyError(\n                `Task ID \"${this.decoratee.id}\" is invalid. It must be in camelCase format, for example: \"myCustomTask\".`\n            );\n        }\n    }\n}\n\nexport const TaskDefinitionDefaultsDecorator = TaskDefinition.createDecorator({\n    decorator: TaskDefinitionDefaultsDecoratorImpl,\n    dependencies: []\n});\n"],"names":["DEFAULT_MAX_ITERATIONS","TaskDefinitionDefaultsDecoratorImpl","decoratee","normalizeSelfCleanup","camelCase","WebinyError","TaskDefinitionDefaultsDecorator","TaskDefinition"],"mappings":";;;;AAKA,MAAMA,yBAAyB;AAWxB,MAAMC;IAGT,YAAoBC,SAAmC,CAAE;aAArCA,SAAS,GAATA;QAChB,IAAI,CAAC,QAAQ;QACb,IAAI,CAAC,QAAQ,GAAGC,qBAAqBD,UAAU,WAAW,EAAE,IAAI,GAAG;IACvE;IAEA,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE;IAC5B;IAEA,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK;IAC/B;IAEA,IAAI,cAAc;QACd,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW;IACrC;IAEA,IAAI,UAAU;QACV,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO;IACjC;IAGA,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,IAAI;IACvC;IAEA,IAAI,eAAe;QAGf,IAAI,IAAI,CAAC,QAAQ,EACb,OAAO;QAEX,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,IAAI;IAC1C;IAEA,IAAI,gBAAgB;QAChB,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,IAAIF;IAC3C;IAEA,IAAI,cAAc;QACd,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW;IACrC;IAEQ,WAAiB;QACrB,IAAII,UAAU,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC,SAAS,CAAC,EAAE,EAClD,MAAM,IAAIC,MACN,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,0EAA0E,CAAC;IAGrH;AACJ;AAEO,MAAMC,kCAAkCC,eAAe,eAAe,CAAC;IAC1E,WAAWN;IACX,cAAc,EAAE;AACpB"}

package/api/domain/errors.d.ts

@@ -54,4 +54,8 @@ export declare class BackgroundTaskNotAuthorizedError extends BaseError {
     readonly code: "BackgroundTasks/NotAuthorized";
     constructor();
 }
+export declare class TaskInputValidationError extends BaseError<Record<string, any>> {
+    readonly code: "VALIDATION_FAILED_INVALID_FIELDS";
+    constructor(error: ZodError);
+}
 export {};

package/api/domain/errors.js

@@ -1,5 +1,5 @@
 import { BaseError } from "@webiny/feature/api";
-import { parseZodError } from "@webiny/utils";
+import { createZodError, parseZodError } from "@webiny/utils";
 class TaskDefinitionNotFoundError extends BaseError {
     constructor(id){
         super({
@@ -96,6 +96,14 @@ class BackgroundTaskNotAuthorizedError extends BaseError {
         }), this.code = "BackgroundTasks/NotAuthorized";
     }
 }
-export { BackgroundTaskModelNotFoundError, BackgroundTaskNotAuthorizedError, BackgroundTaskPersistenceError, BackgroundTaskValidationError, TaskAbortError, TaskDefinitionNotFoundError, TaskLogNotFoundError, TaskNotFoundError, TaskServiceInfoError };
+class TaskInputValidationError extends BaseError {
+    constructor(error){
+        super({
+            message: "Validation failed.",
+            data: createZodError(error).data ?? {}
+        }), this.code = "VALIDATION_FAILED_INVALID_FIELDS";
+    }
+}
+export { BackgroundTaskModelNotFoundError, BackgroundTaskNotAuthorizedError, BackgroundTaskPersistenceError, BackgroundTaskValidationError, TaskAbortError, TaskDefinitionNotFoundError, TaskInputValidationError, TaskLogNotFoundError, TaskNotFoundError, TaskServiceInfoError };
 
 //# sourceMappingURL=errors.js.map

package/api/domain/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"api/domain/errors.js","sources":["../../../src/api/domain/errors.ts"],"sourcesContent":["import { BaseError } from \"@webiny/feature/api\";\nimport type { ZodError } from \"zod\";\nimport { parseZodError } from \"@webiny/utils\";\nimport type { ValidationIssue } from \"@webiny/utils\";\n\nexport class TaskDefinitionNotFoundError extends BaseError<{ id: string }> {\n    override readonly code = \"BackgroundTasks/TaskDefinition/NotFoundError\" as const;\n\n    constructor(id: string) {\n        super({\n            message: \"Task definition not found.\",\n            data: {\n                id\n            }\n        });\n    }\n}\n\nexport class TaskNotFoundError extends BaseError {\n    override readonly code = \"BackgroundTasks/Task/NotFoundError\" as const;\n\n    constructor() {\n        super({\n            message: \"Task not found.\"\n        });\n    }\n}\n\nexport class TaskAbortError extends BaseError<{ id: string; status: string }> {\n    override readonly code = \"BackgroundTasks/Task/Abort\" as const;\n\n    constructor(data: { id: string; status: string }) {\n        super({\n            message: \"Cannot abort a task that is not pending or running!\",\n            data\n        });\n    }\n}\n\nexport class TaskLogNotFoundError extends BaseError {\n    override readonly code = \"BackgroundTasks/Log/NotFoundError\" as const;\n\n    constructor() {\n        super({\n            message: \"Task log not found.\"\n        });\n    }\n}\n\nexport class TaskServiceInfoError extends BaseError {\n    override readonly code = \"BackgroundTasks/Service/InfoUnavailable\" as const;\n\n    constructor() {\n        super({\n            message: \"Unable to fetch service info.\"\n        });\n    }\n}\n\ninterface BackgroundTaskValidationErrorData {\n    issues: ValidationIssue[];\n}\n\nexport class BackgroundTaskValidationError extends BaseError<BackgroundTaskValidationErrorData> {\n    override readonly code = \"BackgroundTasks/ValidationError\" as const;\n\n    constructor(error: string | ZodError) {\n        if (typeof error === \"string\") {\n            super({ message: error, data: { issues: [] } });\n        } else {\n            const issues = parseZodError(error);\n            super({ message: \"Validation failed.\", data: { issues } });\n        }\n    }\n}\n\ninterface BackgroundTaskPersistenceErrorData {\n    originalMessage: string;\n    originalCode?: string;\n    originalData?: unknown;\n}\n\nexport class BackgroundTaskPersistenceError extends BaseError<BackgroundTaskPersistenceErrorData> {\n    override readonly code = \"BackgroundTasks/PersistenceError\" as const;\n\n    constructor(error: Error) {\n        super({ message: error.message, data: { originalMessage: error.message } });\n    }\n\n    static from(error: unknown): BackgroundTaskPersistenceError {\n        if (error instanceof Error) {\n            const instance = new BackgroundTaskPersistenceError(error);\n            const data: BackgroundTaskPersistenceErrorData = {\n                originalMessage: error.message,\n                originalCode: (error as any).code,\n                originalData: (error as any).data\n            };\n            (instance as any).data = data;\n            instance.stack = error.stack;\n            return instance;\n        }\n\n        return new BackgroundTaskPersistenceError(new Error(String(error)));\n    }\n}\n\nexport class BackgroundTaskModelNotFoundError extends BaseError {\n    override readonly code = \"BackgroundTasks/ModelNotFound\" as const;\n\n    constructor(modelId: string) {\n        super({ message: `Background task model \"${modelId}\" was not found.` });\n    }\n}\n\nexport class BackgroundTaskNotAuthorizedError extends BaseError {\n    override readonly code = \"BackgroundTasks/NotAuthorized\" as const;\n\n    constructor() {\n        super({ message: \"Not authorized!\" });\n    }\n}\n"],"names":["TaskDefinitionNotFoundError","BaseError","id","TaskNotFoundError","TaskAbortError","data","TaskLogNotFoundError","TaskServiceInfoError","BackgroundTaskValidationError","error","issues","parseZodError","BackgroundTaskPersistenceError","Error","instance","String","BackgroundTaskModelNotFoundError","modelId","BackgroundTaskNotAuthorizedError"],"mappings":";;AAKO,MAAMA,oCAAoCC;IAG7C,YAAYC,EAAU,CAAE;QACpB,KAAK,CAAC;YACF,SAAS;YACT,MAAM;gBACFA;YACJ;QACJ,SARc,IAAI,GAAG;IASzB;AACJ;AAEO,MAAMC,0BAA0BF;IAGnC,aAAc;QACV,KAAK,CAAC;YACF,SAAS;QACb,SALc,IAAI,GAAG;IAMzB;AACJ;AAEO,MAAMG,uBAAuBH;IAGhC,YAAYI,IAAoC,CAAE;QAC9C,KAAK,CAAC;YACF,SAAS;YACTA;QACJ,SANc,IAAI,GAAG;IAOzB;AACJ;AAEO,MAAMC,6BAA6BL;IAGtC,aAAc;QACV,KAAK,CAAC;YACF,SAAS;QACb,SALc,IAAI,GAAG;IAMzB;AACJ;AAEO,MAAMM,6BAA6BN;IAGtC,aAAc;QACV,KAAK,CAAC;YACF,SAAS;QACb,SALc,IAAI,GAAG;IAMzB;AACJ;AAMO,MAAMO,sCAAsCP;IAG/C,YAAYQ,KAAwB,CAAE;QAClC,IAAI,AAAiB,YAAjB,OAAOA,OACP,KAAK,CAAC;YAAE,SAASA;YAAO,MAAM;gBAAE,QAAQ,EAAE;YAAC;QAAE,SAJnC,IAAI,GAAG;aAKd;YACH,MAAMC,SAASC,cAAcF;YAC7B,KAAK,CAAC;gBAAE,SAAS;gBAAsB,MAAM;oBAAEC;gBAAO;YAAE,SAP9C,IAAI,GAAG;QAQrB;IACJ;AACJ;AAQO,MAAME,uCAAuCX;IAGhD,YAAYQ,KAAY,CAAE;QACtB,KAAK,CAAC;YAAE,SAASA,MAAM,OAAO;YAAE,MAAM;gBAAE,iBAAiBA,MAAM,OAAO;YAAC;QAAE,SAH3D,IAAI,GAAG;IAIzB;IAEA,OAAO,KAAKA,KAAc,EAAkC;QACxD,IAAIA,iBAAiBI,OAAO;YACxB,MAAMC,WAAW,IAAIF,+BAA+BH;YACpD,MAAMJ,OAA2C;gBAC7C,iBAAiBI,MAAM,OAAO;gBAC9B,cAAeA,MAAc,IAAI;gBACjC,cAAeA,MAAc,IAAI;YACrC;YACCK,SAAiB,IAAI,GAAGT;YACzBS,SAAS,KAAK,GAAGL,MAAM,KAAK;YAC5B,OAAOK;QACX;QAEA,OAAO,IAAIF,+BAA+B,IAAIC,MAAME,OAAON;IAC/D;AACJ;AAEO,MAAMO,yCAAyCf;IAGlD,YAAYgB,OAAe,CAAE;QACzB,KAAK,CAAC;YAAE,SAAS,CAAC,uBAAuB,EAAEA,QAAQ,gBAAgB,CAAC;QAAC,SAHvD,IAAI,GAAG;IAIzB;AACJ;AAEO,MAAMC,yCAAyCjB;IAGlD,aAAc;QACV,KAAK,CAAC;YAAE,SAAS;QAAkB,SAHrB,IAAI,GAAG;IAIzB;AACJ"}
+{"version":3,"file":"api/domain/errors.js","sources":["../../../src/api/domain/errors.ts"],"sourcesContent":["import { BaseError } from \"@webiny/feature/api\";\nimport type { ZodError } from \"zod\";\nimport { createZodError, parseZodError } from \"@webiny/utils\";\nimport type { ValidationIssue } from \"@webiny/utils\";\n\nexport class TaskDefinitionNotFoundError extends BaseError<{ id: string }> {\n    override readonly code = \"BackgroundTasks/TaskDefinition/NotFoundError\" as const;\n\n    constructor(id: string) {\n        super({\n            message: \"Task definition not found.\",\n            data: {\n                id\n            }\n        });\n    }\n}\n\nexport class TaskNotFoundError extends BaseError {\n    override readonly code = \"BackgroundTasks/Task/NotFoundError\" as const;\n\n    constructor() {\n        super({\n            message: \"Task not found.\"\n        });\n    }\n}\n\nexport class TaskAbortError extends BaseError<{ id: string; status: string }> {\n    override readonly code = \"BackgroundTasks/Task/Abort\" as const;\n\n    constructor(data: { id: string; status: string }) {\n        super({\n            message: \"Cannot abort a task that is not pending or running!\",\n            data\n        });\n    }\n}\n\nexport class TaskLogNotFoundError extends BaseError {\n    override readonly code = \"BackgroundTasks/Log/NotFoundError\" as const;\n\n    constructor() {\n        super({\n            message: \"Task log not found.\"\n        });\n    }\n}\n\nexport class TaskServiceInfoError extends BaseError {\n    override readonly code = \"BackgroundTasks/Service/InfoUnavailable\" as const;\n\n    constructor() {\n        super({\n            message: \"Unable to fetch service info.\"\n        });\n    }\n}\n\ninterface BackgroundTaskValidationErrorData {\n    issues: ValidationIssue[];\n}\n\nexport class BackgroundTaskValidationError extends BaseError<BackgroundTaskValidationErrorData> {\n    override readonly code = \"BackgroundTasks/ValidationError\" as const;\n\n    constructor(error: string | ZodError) {\n        if (typeof error === \"string\") {\n            super({ message: error, data: { issues: [] } });\n        } else {\n            const issues = parseZodError(error);\n            super({ message: \"Validation failed.\", data: { issues } });\n        }\n    }\n}\n\ninterface BackgroundTaskPersistenceErrorData {\n    originalMessage: string;\n    originalCode?: string;\n    originalData?: unknown;\n}\n\nexport class BackgroundTaskPersistenceError extends BaseError<BackgroundTaskPersistenceErrorData> {\n    override readonly code = \"BackgroundTasks/PersistenceError\" as const;\n\n    constructor(error: Error) {\n        super({ message: error.message, data: { originalMessage: error.message } });\n    }\n\n    static from(error: unknown): BackgroundTaskPersistenceError {\n        if (error instanceof Error) {\n            const instance = new BackgroundTaskPersistenceError(error);\n            const data: BackgroundTaskPersistenceErrorData = {\n                originalMessage: error.message,\n                originalCode: (error as any).code,\n                originalData: (error as any).data\n            };\n            (instance as any).data = data;\n            instance.stack = error.stack;\n            return instance;\n        }\n\n        return new BackgroundTaskPersistenceError(new Error(String(error)));\n    }\n}\n\nexport class BackgroundTaskModelNotFoundError extends BaseError {\n    override readonly code = \"BackgroundTasks/ModelNotFound\" as const;\n\n    constructor(modelId: string) {\n        super({ message: `Background task model \"${modelId}\" was not found.` });\n    }\n}\n\nexport class BackgroundTaskNotAuthorizedError extends BaseError {\n    override readonly code = \"BackgroundTasks/NotAuthorized\" as const;\n\n    constructor() {\n        super({ message: \"Not authorized!\" });\n    }\n}\n\n/*\n * Keeps the code, message and `invalidFields` data that `createZodError` produced before task input\n * validation moved into a use case, so clients that read them see no difference.\n */\nexport class TaskInputValidationError extends BaseError<Record<string, any>> {\n    override readonly code = \"VALIDATION_FAILED_INVALID_FIELDS\" as const;\n\n    constructor(error: ZodError) {\n        super({\n            message: \"Validation failed.\",\n            data: createZodError(error).data ?? {}\n        });\n    }\n}\n"],"names":["TaskDefinitionNotFoundError","BaseError","id","TaskNotFoundError","TaskAbortError","data","TaskLogNotFoundError","TaskServiceInfoError","BackgroundTaskValidationError","error","issues","parseZodError","BackgroundTaskPersistenceError","Error","instance","String","BackgroundTaskModelNotFoundError","modelId","BackgroundTaskNotAuthorizedError","TaskInputValidationError","createZodError"],"mappings":";;AAKO,MAAMA,oCAAoCC;IAG7C,YAAYC,EAAU,CAAE;QACpB,KAAK,CAAC;YACF,SAAS;YACT,MAAM;gBACFA;YACJ;QACJ,SARc,IAAI,GAAG;IASzB;AACJ;AAEO,MAAMC,0BAA0BF;IAGnC,aAAc;QACV,KAAK,CAAC;YACF,SAAS;QACb,SALc,IAAI,GAAG;IAMzB;AACJ;AAEO,MAAMG,uBAAuBH;IAGhC,YAAYI,IAAoC,CAAE;QAC9C,KAAK,CAAC;YACF,SAAS;YACTA;QACJ,SANc,IAAI,GAAG;IAOzB;AACJ;AAEO,MAAMC,6BAA6BL;IAGtC,aAAc;QACV,KAAK,CAAC;YACF,SAAS;QACb,SALc,IAAI,GAAG;IAMzB;AACJ;AAEO,MAAMM,6BAA6BN;IAGtC,aAAc;QACV,KAAK,CAAC;YACF,SAAS;QACb,SALc,IAAI,GAAG;IAMzB;AACJ;AAMO,MAAMO,sCAAsCP;IAG/C,YAAYQ,KAAwB,CAAE;QAClC,IAAI,AAAiB,YAAjB,OAAOA,OACP,KAAK,CAAC;YAAE,SAASA;YAAO,MAAM;gBAAE,QAAQ,EAAE;YAAC;QAAE,SAJnC,IAAI,GAAG;aAKd;YACH,MAAMC,SAASC,cAAcF;YAC7B,KAAK,CAAC;gBAAE,SAAS;gBAAsB,MAAM;oBAAEC;gBAAO;YAAE,SAP9C,IAAI,GAAG;QAQrB;IACJ;AACJ;AAQO,MAAME,uCAAuCX;IAGhD,YAAYQ,KAAY,CAAE;QACtB,KAAK,CAAC;YAAE,SAASA,MAAM,OAAO;YAAE,MAAM;gBAAE,iBAAiBA,MAAM,OAAO;YAAC;QAAE,SAH3D,IAAI,GAAG;IAIzB;IAEA,OAAO,KAAKA,KAAc,EAAkC;QACxD,IAAIA,iBAAiBI,OAAO;YACxB,MAAMC,WAAW,IAAIF,+BAA+BH;YACpD,MAAMJ,OAA2C;gBAC7C,iBAAiBI,MAAM,OAAO;gBAC9B,cAAeA,MAAc,IAAI;gBACjC,cAAeA,MAAc,IAAI;YACrC;YACCK,SAAiB,IAAI,GAAGT;YACzBS,SAAS,KAAK,GAAGL,MAAM,KAAK;YAC5B,OAAOK;QACX;QAEA,OAAO,IAAIF,+BAA+B,IAAIC,MAAME,OAAON;IAC/D;AACJ;AAEO,MAAMO,yCAAyCf;IAGlD,YAAYgB,OAAe,CAAE;QACzB,KAAK,CAAC;YAAE,SAAS,CAAC,uBAAuB,EAAEA,QAAQ,gBAAgB,CAAC;QAAC,SAHvD,IAAI,GAAG;IAIzB;AACJ;AAEO,MAAMC,yCAAyCjB;IAGlD,aAAc;QACV,KAAK,CAAC;YAAE,SAAS;QAAkB,SAHrB,IAAI,GAAG;IAIzB;AACJ;AAMO,MAAMkB,iCAAiClB;IAG1C,YAAYQ,KAAe,CAAE;QACzB,KAAK,CAAC;YACF,SAAS;YACT,MAAMW,eAAeX,OAAO,IAAI,IAAI,CAAC;QACzC,SANc,IAAI,GAAG;IAOzB;AACJ"}

package/api/domain/task/TaskLogModelProvider.d.ts

@@ -0,0 +1,12 @@
+import type { CmsModel } from "@webiny/api-headless-cms/types/index.js";
+import { GetModelUseCase } from "@webiny/api-headless-cms/features/contentModel/GetModel/index.js";
+import { TaskLogModelProvider as Abstraction } from "./abstractions.js";
+declare class TaskLogModelProviderImpl implements Abstraction.Interface {
+    private readonly getModel;
+    constructor(getModel: GetModelUseCase.Interface);
+    get(): Promise<CmsModel>;
+}
+export declare const TaskLogModelProvider: typeof TaskLogModelProviderImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("./abstractions.js").ITaskLogModelProvider>;
+};
+export {};

package/api/domain/task/TaskLogModelProvider.js

@@ -0,0 +1,23 @@
+import { GetModelUseCase } from "@webiny/api-headless-cms/features/contentModel/GetModel/index.js";
+import { TaskLogModelProvider } from "./abstractions.js";
+import { BackgroundTaskModelNotFoundError } from "../errors.js";
+import { WEBINY_TASK_LOG_MODEL_ID } from "../../crud/TaskLogPrivateModel.js";
+class TaskLogModelProviderImpl {
+    constructor(getModel){
+        this.getModel = getModel;
+    }
+    async get() {
+        const result = await this.getModel.execute(WEBINY_TASK_LOG_MODEL_ID);
+        if (result.isFail()) throw new BackgroundTaskModelNotFoundError(WEBINY_TASK_LOG_MODEL_ID);
+        return result.value;
+    }
+}
+const TaskLogModelProvider_TaskLogModelProvider = TaskLogModelProvider.createImplementation({
+    implementation: TaskLogModelProviderImpl,
+    dependencies: [
+        GetModelUseCase
+    ]
+});
+export { TaskLogModelProvider_TaskLogModelProvider as TaskLogModelProvider };
+
+//# sourceMappingURL=TaskLogModelProvider.js.map

package/api/domain/task/TaskLogModelProvider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"api/domain/task/TaskLogModelProvider.js","sources":["../../../../src/api/domain/task/TaskLogModelProvider.ts"],"sourcesContent":["import type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport { GetModelUseCase } from \"@webiny/api-headless-cms/features/contentModel/GetModel/index.js\";\nimport { TaskLogModelProvider as Abstraction } from \"./abstractions.js\";\nimport { BackgroundTaskModelNotFoundError } from \"~/api/domain/errors.js\";\nimport { WEBINY_TASK_LOG_MODEL_ID } from \"~/api/crud/TaskLogPrivateModel.js\";\n\nclass TaskLogModelProviderImpl implements Abstraction.Interface {\n    constructor(private readonly getModel: GetModelUseCase.Interface) {}\n\n    async get(): Promise<CmsModel> {\n        const result = await this.getModel.execute(WEBINY_TASK_LOG_MODEL_ID);\n        if (result.isFail()) {\n            throw new BackgroundTaskModelNotFoundError(WEBINY_TASK_LOG_MODEL_ID);\n        }\n        return result.value;\n    }\n}\n\nexport const TaskLogModelProvider = Abstraction.createImplementation({\n    implementation: TaskLogModelProviderImpl,\n    dependencies: [GetModelUseCase]\n});\n"],"names":["TaskLogModelProviderImpl","getModel","result","WEBINY_TASK_LOG_MODEL_ID","BackgroundTaskModelNotFoundError","TaskLogModelProvider","Abstraction","GetModelUseCase"],"mappings":";;;;AAMA,MAAMA;IACF,YAA6BC,QAAmC,CAAE;aAArCA,QAAQ,GAARA;IAAsC;IAEnE,MAAM,MAAyB;QAC3B,MAAMC,SAAS,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAACC;QAC3C,IAAID,OAAO,MAAM,IACb,MAAM,IAAIE,iCAAiCD;QAE/C,OAAOD,OAAO,KAAK;IACvB;AACJ;AAEO,MAAMG,4CAAuBC,qBAAAA,oBAAgC,CAAC;IACjE,gBAAgBN;IAChB,cAAc;QAACO;KAAgB;AACnC"}

package/api/domain/task/TaskLogsRepository.d.ts

@@ -0,0 +1,34 @@
+import { Result } from "@webiny/feature/api";
+import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
+import { GetEntryByIdUseCase } from "@webiny/api-headless-cms/features/contentEntry/GetEntryById/index.js";
+import { ListLatestEntriesUseCase } from "@webiny/api-headless-cms/features/contentEntry/ListEntries/index.js";
+import { CreateEntryUseCase } from "@webiny/api-headless-cms/features/contentEntry/CreateEntry/index.js";
+import { UpdateEntryUseCase } from "@webiny/api-headless-cms/features/contentEntry/UpdateEntry/index.js";
+import { DeleteEntryUseCase } from "@webiny/api-headless-cms/features/contentEntry/DeleteEntry/index.js";
+import { CmsWhereMapper } from "@webiny/api-headless-cms";
+import { TaskLogModelProvider, TaskLogsRepository as Abstraction } from "./abstractions.js";
+import { BackgroundTaskPersistenceError, TaskLogNotFoundError } from "../../../api/domain/errors.js";
+declare class TaskLogsRepositoryImpl implements Abstraction.Interface {
+    private readonly identityContext;
+    private readonly modelProvider;
+    private readonly getEntryById;
+    private readonly listLatestEntries;
+    private readonly createEntry;
+    private readonly updateEntry;
+    private readonly deleteEntry;
+    private readonly whereMapper;
+    constructor(identityContext: IdentityContext.Interface, modelProvider: TaskLogModelProvider.Interface, getEntryById: GetEntryByIdUseCase.Interface, listLatestEntries: ListLatestEntriesUseCase.Interface, createEntry: CreateEntryUseCase.Interface, updateEntry: UpdateEntryUseCase.Interface, deleteEntry: DeleteEntryUseCase.Interface, whereMapper: CmsWhereMapper.Interface);
+    create(task: Parameters<Abstraction.Interface["create"]>[0], data: Parameters<Abstraction.Interface["create"]>[1]): Promise<Result<never, BackgroundTaskPersistenceError> | Result<import("../../types.js").ITaskLog, never>>;
+    update(id: string, data: Parameters<Abstraction.Interface["update"]>[1]): Promise<Result<never, BackgroundTaskPersistenceError | TaskLogNotFoundError> | Result<import("../../types.js").ITaskLog, never>>;
+    delete(id: string): Promise<Result<void, never> | Result<never, BackgroundTaskPersistenceError | TaskLogNotFoundError>>;
+    get(id: string): Promise<Result<never, BackgroundTaskPersistenceError | TaskLogNotFoundError> | Result<import("../../types.js").ITaskLog, never>>;
+    getLatest(taskId: string): Promise<Result<never, BackgroundTaskPersistenceError> | Result<never, TaskLogNotFoundError> | Result<import("../../types.js").ITaskLog, never>>;
+    list(params: Parameters<Abstraction.Interface["list"]>[0]): Promise<Result<never, BackgroundTaskPersistenceError> | Result<{
+        items: import("../../types.js").ITaskLog[];
+        meta: import("@webiny/api-headless-cms/types/types.js").CmsEntryMeta;
+    }, never>>;
+}
+export declare const TaskLogsRepository: typeof TaskLogsRepositoryImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("./abstractions.js").ITaskLogsRepository>;
+};
+export {};