@webiny/tasks 6.3.0 → 6.4.0-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/context.js +36 -42
- package/context.js.map +1 -1
- package/crud/TaskLogPrivateModel.js +33 -27
- package/crud/TaskLogPrivateModel.js.map +1 -1
- package/crud/TaskPrivateModel.js +48 -39
- package/crud/TaskPrivateModel.js.map +1 -1
- package/crud/cleanupTaskSubtree.js +55 -69
- package/crud/cleanupTaskSubtree.js.map +1 -1
- package/crud/crud.tasks.js +289 -352
- package/crud/crud.tasks.js.map +1 -1
- package/crud/definition.tasks.js +13 -16
- package/crud/definition.tasks.js.map +1 -1
- package/crud/service.tasks.js +119 -155
- package/crud/service.tasks.js.map +1 -1
- package/decorators/RunnableTaskDecorator.js +61 -77
- package/decorators/RunnableTaskDecorator.js.map +1 -1
- package/decorators/SelfCleaningTaskDecorator.js +75 -89
- package/decorators/SelfCleaningTaskDecorator.js.map +1 -1
- package/domain/errors.js +35 -39
- package/domain/errors.js.map +1 -1
- package/events/TaskAfterCreateEvent.js +8 -5
- package/events/TaskAfterCreateEvent.js.map +1 -1
- package/events/TaskAfterDeleteEvent.js +8 -5
- package/events/TaskAfterDeleteEvent.js.map +1 -1
- package/events/TaskAfterUpdateEvent.js +8 -5
- package/events/TaskAfterUpdateEvent.js.map +1 -1
- package/events/TaskBeforeCreateEvent.js +8 -5
- package/events/TaskBeforeCreateEvent.js.map +1 -1
- package/events/TaskBeforeDeleteEvent.js +8 -5
- package/events/TaskBeforeDeleteEvent.js.map +1 -1
- package/events/TaskBeforeUpdateEvent.js +8 -5
- package/events/TaskBeforeUpdateEvent.js.map +1 -1
- package/events/abstractions.js +7 -36
- package/events/abstractions.js.map +1 -1
- package/events/index.js +0 -2
- package/features/AbortTask/AbortTaskUseCase.js +9 -8
- package/features/AbortTask/AbortTaskUseCase.js.map +1 -1
- package/features/AbortTask/abstractions.js +2 -1
- package/features/AbortTask/abstractions.js.map +1 -1
- package/features/AbortTask/feature.js +6 -5
- package/features/AbortTask/feature.js.map +1 -1
- package/features/AbortTask/index.js +0 -2
- package/features/CleanupTaskSubtree/CleanupTaskSubtreeUseCase.js +8 -7
- package/features/CleanupTaskSubtree/CleanupTaskSubtreeUseCase.js.map +1 -1
- package/features/CleanupTaskSubtree/abstractions.js +2 -1
- package/features/CleanupTaskSubtree/abstractions.js.map +1 -1
- package/features/CleanupTaskSubtree/index.js +0 -2
- package/features/GetTask/GetTaskUseCase.js +8 -7
- package/features/GetTask/GetTaskUseCase.js.map +1 -1
- package/features/GetTask/abstractions.js +2 -1
- package/features/GetTask/abstractions.js.map +1 -1
- package/features/GetTask/feature.js +6 -5
- package/features/GetTask/feature.js.map +1 -1
- package/features/GetTask/index.js +0 -2
- package/features/GetTaskDefinition/GetTaskDefinitionUseCase.js +18 -16
- package/features/GetTaskDefinition/GetTaskDefinitionUseCase.js.map +1 -1
- package/features/GetTaskDefinition/abstractions.js +2 -1
- package/features/GetTaskDefinition/abstractions.js.map +1 -1
- package/features/GetTaskDefinition/feature.js +6 -5
- package/features/GetTaskDefinition/feature.js.map +1 -1
- package/features/GetTaskDefinition/index.js +0 -2
- package/features/ListTaskDefinitions/ListTaskDefinitionsUseCase.js +18 -12
- package/features/ListTaskDefinitions/ListTaskDefinitionsUseCase.js.map +1 -1
- package/features/ListTaskDefinitions/abstractions.js +2 -1
- package/features/ListTaskDefinitions/abstractions.js.map +1 -1
- package/features/ListTaskDefinitions/feature.js +6 -5
- package/features/ListTaskDefinitions/feature.js.map +1 -1
- package/features/ListTaskDefinitions/index.js +0 -2
- package/features/ListTasks/ListTasksUseCase.js +8 -7
- package/features/ListTasks/ListTasksUseCase.js.map +1 -1
- package/features/ListTasks/abstractions.js +2 -1
- package/features/ListTasks/abstractions.js.map +1 -1
- package/features/ListTasks/feature.js +6 -5
- package/features/ListTasks/feature.js.map +1 -1
- package/features/ListTasks/index.js +0 -2
- package/features/TaskController/TaskController.js +60 -60
- package/features/TaskController/TaskController.js.map +1 -1
- package/features/TaskController/augmentation.js +0 -3
- package/features/TaskController/index.js +0 -5
- package/features/TaskExecutionContext/TaskExecutionContext.js +38 -45
- package/features/TaskExecutionContext/TaskExecutionContext.js.map +1 -1
- package/features/TaskExecutionContext/abstractions.js +2 -10
- package/features/TaskExecutionContext/abstractions.js.map +1 -1
- package/features/TaskExecutionContext/feature.js +6 -5
- package/features/TaskExecutionContext/feature.js.map +1 -1
- package/features/TaskExecutionContext/index.js +0 -2
- package/features/TriggerTask/TriggerTaskUseCase.js +9 -8
- package/features/TriggerTask/TriggerTaskUseCase.js.map +1 -1
- package/features/TriggerTask/abstractions.js +2 -1
- package/features/TriggerTask/abstractions.js.map +1 -1
- package/features/TriggerTask/feature.js +6 -5
- package/features/TriggerTask/feature.js.map +1 -1
- package/features/TriggerTask/index.js +0 -2
- package/global.js +0 -2
- package/graphql/checkPermissions.js +16 -35
- package/graphql/checkPermissions.js.map +1 -1
- package/graphql/index.js +154 -187
- package/graphql/index.js.map +1 -1
- package/graphql/utils.js +15 -14
- package/graphql/utils.js.map +1 -1
- package/handler/index.js +46 -53
- package/handler/index.js.map +1 -1
- package/handler/register.js +7 -15
- package/handler/register.js.map +1 -1
- package/handler/types.js +0 -3
- package/index.js +2 -4
- package/package.json +17 -17
- package/plugins/TaskServicePlugin.js +9 -6
- package/plugins/TaskServicePlugin.js.map +1 -1
- package/plugins/index.js +0 -2
- package/response/DatabaseResponse.js +113 -132
- package/response/DatabaseResponse.js.map +1 -1
- package/response/Response.js +78 -96
- package/response/Response.js.map +1 -1
- package/response/ResponseAbortedResult.js +8 -7
- package/response/ResponseAbortedResult.js.map +1 -1
- package/response/ResponseContinueResult.js +12 -14
- package/response/ResponseContinueResult.js.map +1 -1
- package/response/ResponseDoneResult.js +10 -9
- package/response/ResponseDoneResult.js.map +1 -1
- package/response/ResponseErrorResult.js +9 -8
- package/response/ResponseErrorResult.js.map +1 -1
- package/response/TaskResponse.js +44 -64
- package/response/TaskResponse.js.map +1 -1
- package/response/abstractions/Response.js +0 -3
- package/response/abstractions/ResponseAbortedResult.js +0 -3
- package/response/abstractions/ResponseBaseResult.js +0 -3
- package/response/abstractions/ResponseContinueResult.js +0 -3
- package/response/abstractions/ResponseDoneResult.js +0 -3
- package/response/abstractions/ResponseErrorResult.js +0 -3
- package/response/abstractions/TaskResponse.js +0 -3
- package/response/abstractions/index.js +0 -2
- package/response/index.js +0 -2
- package/runner/TaskControl.js +150 -221
- package/runner/TaskControl.js.map +1 -1
- package/runner/TaskEventValidation.js +12 -13
- package/runner/TaskEventValidation.js.map +1 -1
- package/runner/TaskManager.js +68 -106
- package/runner/TaskManager.js.map +1 -1
- package/runner/TaskManagerStore.js +90 -139
- package/runner/TaskManagerStore.js.map +1 -1
- package/runner/TaskRunner.js +45 -65
- package/runner/TaskRunner.js.map +1 -1
- package/runner/abstractions/TaskControl.js +0 -3
- package/runner/abstractions/TaskEventValidation.js +0 -3
- package/runner/abstractions/TaskManager.js +0 -3
- package/runner/abstractions/TaskManagerStore.js +0 -3
- package/runner/abstractions/TaskRunner.js +0 -3
- package/runner/abstractions/index.js +0 -2
- package/runner/index.js +0 -2
- package/service/EventBridgeEventTransportPlugin.js +43 -42
- package/service/EventBridgeEventTransportPlugin.js.map +1 -1
- package/service/StepFunctionServicePlugin.js +65 -66
- package/service/StepFunctionServicePlugin.js.map +1 -1
- package/service/createService.js +10 -13
- package/service/createService.js.map +1 -1
- package/service/index.js +7 -5
- package/service/index.js.map +1 -1
- package/tasks/testingRunTask.js +11 -10
- package/tasks/testingRunTask.js.map +1 -1
- package/types.js +12 -12
- package/types.js.map +1 -1
- package/utils/ObjectUpdater.js +25 -31
- package/utils/ObjectUpdater.js.map +1 -1
- package/utils/getErrorProperties.js +5 -4
- package/utils/getErrorProperties.js.map +1 -1
- package/utils/getObjectProperties.js +8 -15
- package/utils/getObjectProperties.js.map +1 -1
- package/utils/index.js +0 -2
- package/utils/normalizeSelfCleanup.js +13 -12
- package/utils/normalizeSelfCleanup.js.map +1 -1
- package/events/index.js.map +0 -1
- package/features/AbortTask/index.js.map +0 -1
- package/features/CleanupTaskSubtree/index.js.map +0 -1
- package/features/GetTask/index.js.map +0 -1
- package/features/GetTaskDefinition/index.js.map +0 -1
- package/features/ListTaskDefinitions/index.js.map +0 -1
- package/features/ListTasks/index.js.map +0 -1
- package/features/TaskController/augmentation.js.map +0 -1
- package/features/TaskController/index.js.map +0 -1
- package/features/TaskExecutionContext/index.js.map +0 -1
- package/features/TriggerTask/index.js.map +0 -1
- package/global.js.map +0 -1
- package/handler/types.js.map +0 -1
- package/index.js.map +0 -1
- package/plugins/index.js.map +0 -1
- package/response/abstractions/Response.js.map +0 -1
- package/response/abstractions/ResponseAbortedResult.js.map +0 -1
- package/response/abstractions/ResponseBaseResult.js.map +0 -1
- package/response/abstractions/ResponseContinueResult.js.map +0 -1
- package/response/abstractions/ResponseDoneResult.js.map +0 -1
- package/response/abstractions/ResponseErrorResult.js.map +0 -1
- package/response/abstractions/TaskResponse.js.map +0 -1
- package/response/abstractions/index.js.map +0 -1
- package/response/index.js.map +0 -1
- package/runner/abstractions/TaskControl.js.map +0 -1
- package/runner/abstractions/TaskEventValidation.js.map +0 -1
- package/runner/abstractions/TaskManager.js.map +0 -1
- package/runner/abstractions/TaskManagerStore.js.map +0 -1
- package/runner/abstractions/TaskRunner.js.map +0 -1
- package/runner/abstractions/index.js.map +0 -1
- package/runner/index.js.map +0 -1
- package/utils/index.js.map +0 -1
package/context.js
CHANGED
|
@@ -14,49 +14,43 @@ import { GetTaskDefinitionFeature } from "./features/GetTaskDefinition/feature.j
|
|
|
14
14
|
import { ListTaskDefinitionsFeature } from "./features/ListTaskDefinitions/feature.js";
|
|
15
15
|
import { CleanupTaskSubtreeUseCase, CleanupTaskSubtreeUseCaseImpl } from "./features/CleanupTaskSubtree/index.js";
|
|
16
16
|
import { TestingRunTaskDefinition } from "./tasks/testingRunTask.js";
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
...createServiceCrud(context)
|
|
34
|
-
};
|
|
35
|
-
|
|
36
|
-
// The cleanup use case is a thin wrapper around `context.tasks.cleanupTaskSubtree`,
|
|
37
|
-
// so it must register AFTER the CRUD is wired onto the context.
|
|
38
|
-
context.container.registerInstance(CleanupTaskSubtreeUseCase, new CleanupTaskSubtreeUseCaseImpl(context));
|
|
39
|
-
});
|
|
40
|
-
plugin.name = "tasks.context";
|
|
41
|
-
return plugin;
|
|
42
|
-
};
|
|
43
|
-
const createTasksContext = () => {
|
|
44
|
-
return [...createServicePlugins(), createTasksCrud()];
|
|
17
|
+
import { createRegisterExtensionPlugin } from "@webiny/handler";
|
|
18
|
+
const createTasksCrud = ()=>{
|
|
19
|
+
const tasksCrudPlugin = new ContextPlugin(async (context)=>{
|
|
20
|
+
context.container.registerDecorator(RunnableTaskDecorator);
|
|
21
|
+
context.container.registerDecorator(SelfCleaningTaskDecorator);
|
|
22
|
+
GetTaskDefinitionFeature.register(context.container);
|
|
23
|
+
ListTaskDefinitionsFeature.register(context.container);
|
|
24
|
+
context.tasks = {
|
|
25
|
+
...createDefinitionCrud(context),
|
|
26
|
+
...createTaskCrud(context),
|
|
27
|
+
...createServiceCrud(context)
|
|
28
|
+
};
|
|
29
|
+
context.container.registerInstance(CleanupTaskSubtreeUseCase, new CleanupTaskSubtreeUseCaseImpl(context));
|
|
30
|
+
});
|
|
31
|
+
tasksCrudPlugin.name = "tasks.context";
|
|
32
|
+
return tasksCrudPlugin;
|
|
45
33
|
};
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
// Register a test task
|
|
58
|
-
context.container.register(TestingRunTaskDefinition);
|
|
59
|
-
})];
|
|
34
|
+
const createTasksContext = ()=>{
|
|
35
|
+
const modelsPlugin = createRegisterExtensionPlugin((context)=>{
|
|
36
|
+
context.container.register(TaskPrivateModel);
|
|
37
|
+
context.container.register(TaskLogPrivateModel);
|
|
38
|
+
});
|
|
39
|
+
return [
|
|
40
|
+
...createServicePlugins(),
|
|
41
|
+
createTasksCrud(),
|
|
42
|
+
modelsPlugin
|
|
43
|
+
];
|
|
60
44
|
};
|
|
45
|
+
const createBackgroundTaskContext = ()=>[
|
|
46
|
+
...createTasksContext(),
|
|
47
|
+
new ContextPlugin((context)=>{
|
|
48
|
+
context.container.registerInstance(TaskService, context.tasks);
|
|
49
|
+
TaskExecutionContextFeature.register(context.container);
|
|
50
|
+
context.container.register(TaskController);
|
|
51
|
+
context.container.register(TestingRunTaskDefinition);
|
|
52
|
+
})
|
|
53
|
+
];
|
|
54
|
+
export { createBackgroundTaskContext };
|
|
61
55
|
|
|
62
56
|
//# sourceMappingURL=context.js.map
|
package/context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"context.js","sources":["../src/context.ts"],"sourcesContent":["import type { Plugin } from \"@webiny/plugins\";\nimport { ContextPlugin } from \"@webiny/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 type { Context } from \"~/types.js\";\nimport { TaskPrivateModel } from \"./crud/TaskPrivateModel.js\";\nimport { TaskLogPrivateModel } from \"./crud/TaskLogPrivateModel.js\";\nimport { createDefinitionCrud } from \"./crud/definition.tasks.js\";\nimport { createServiceCrud } from \"~/crud/service.tasks.js\";\nimport { createTaskCrud } from \"./crud/crud.tasks.js\";\nimport { createServicePlugins } from \"~/service/index.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 { TestingRunTaskDefinition } from \"~/tasks/testingRunTask.js\";\nimport { createRegisterExtensionPlugin } from \"@webiny/handler\";\n\nconst createTasksCrud = () => {\n const tasksCrudPlugin = new ContextPlugin<Context>(async context => {\n // Register the RunnableTaskDecorator to wrap all TaskDefinition instances\n context.container.registerDecorator(RunnableTaskDecorator);\n context.container.registerDecorator(SelfCleaningTaskDecorator);\n\n // Register task definition use cases\n GetTaskDefinitionFeature.register(context.container);\n ListTaskDefinitionsFeature.register(context.container);\n\n context.tasks = {\n ...createDefinitionCrud(context),\n ...createTaskCrud(context),\n ...createServiceCrud(context)\n };\n\n // The cleanup use case is a thin wrapper around `context.tasks.cleanupTaskSubtree`,\n // so it must register AFTER the CRUD is wired onto the context.\n context.container.registerInstance(\n CleanupTaskSubtreeUseCase,\n new CleanupTaskSubtreeUseCaseImpl(context)\n );\n });\n\n tasksCrudPlugin.name = \"tasks.context\";\n\n return tasksCrudPlugin;\n};\n\nconst createTasksContext = (): Plugin[] => {\n const modelsPlugin = createRegisterExtensionPlugin(context => {\n context.container.register(TaskPrivateModel);\n context.container.register(TaskLogPrivateModel);\n });\n\n return [...createServicePlugins(), createTasksCrud(), modelsPlugin];\n};\n\nexport const createBackgroundTaskContext = (): Plugin[] => {\n return [\n ...createTasksContext(),\n new ContextPlugin<Context>(context => {\n // Register legacy tasks context via a new abstraction\n context.container.registerInstance(TaskService, context.tasks);\n\n // Register TaskExecutionContext EARLY (singleton, empty)\n TaskExecutionContextFeature.register(context.container);\n\n // Register TaskController (depends on TaskExecutionContext)\n context.container.register(TaskController);\n\n // Register a test task\n context.container.register(TestingRunTaskDefinition);\n })\n ];\n};\n"],"names":["createTasksCrud","tasksCrudPlugin","ContextPlugin","context","RunnableTaskDecorator","SelfCleaningTaskDecorator","GetTaskDefinitionFeature","ListTaskDefinitionsFeature","createDefinitionCrud","createTaskCrud","createServiceCrud","CleanupTaskSubtreeUseCase","CleanupTaskSubtreeUseCaseImpl","createTasksContext","modelsPlugin","createRegisterExtensionPlugin","TaskPrivateModel","TaskLogPrivateModel","createServicePlugins","createBackgroundTaskContext","TaskService","TaskExecutionContextFeature","TaskController","TestingRunTaskDefinition"],"mappings":";;;;;;;;;;;;;;;;;AAuBA,MAAMA,kBAAkB;IACpB,MAAMC,kBAAkB,IAAIC,cAAuB,OAAMC;QAErDA,QAAQ,SAAS,CAAC,iBAAiB,CAACC;QACpCD,QAAQ,SAAS,CAAC,iBAAiB,CAACE;QAGpCC,yBAAyB,QAAQ,CAACH,QAAQ,SAAS;QACnDI,2BAA2B,QAAQ,CAACJ,QAAQ,SAAS;QAErDA,QAAQ,KAAK,GAAG;YACZ,GAAGK,qBAAqBL,QAAQ;YAChC,GAAGM,eAAeN,QAAQ;YAC1B,GAAGO,kBAAkBP,QAAQ;QACjC;QAIAA,QAAQ,SAAS,CAAC,gBAAgB,CAC9BQ,2BACA,IAAIC,8BAA8BT;IAE1C;IAEAF,gBAAgB,IAAI,GAAG;IAEvB,OAAOA;AACX;AAEA,MAAMY,qBAAqB;IACvB,MAAMC,eAAeC,8BAA8BZ,CAAAA;QAC/CA,QAAQ,SAAS,CAAC,QAAQ,CAACa;QAC3Bb,QAAQ,SAAS,CAAC,QAAQ,CAACc;IAC/B;IAEA,OAAO;WAAIC;QAAwBlB;QAAmBc;KAAa;AACvE;AAEO,MAAMK,8BAA8B,IAChC;WACAN;QACH,IAAIX,cAAuBC,CAAAA;YAEvBA,QAAQ,SAAS,CAAC,gBAAgB,CAACiB,aAAajB,QAAQ,KAAK;YAG7DkB,4BAA4B,QAAQ,CAAClB,QAAQ,SAAS;YAGtDA,QAAQ,SAAS,CAAC,QAAQ,CAACmB;YAG3BnB,QAAQ,SAAS,CAAC,QAAQ,CAACoB;QAC/B;KACH"}
|
|
@@ -1,34 +1,40 @@
|
|
|
1
1
|
import { ModelFactory } from "@webiny/api-headless-cms/features/modelBuilder/index.js";
|
|
2
2
|
import { TaskLogItemType } from "../types.js";
|
|
3
|
-
|
|
3
|
+
const WEBINY_TASK_LOG_MODEL_ID = "wbyTaskLog";
|
|
4
4
|
class TaskLogPrivateModelImpl {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
5
|
+
async execute(builder) {
|
|
6
|
+
return [
|
|
7
|
+
builder.private({
|
|
8
|
+
modelId: WEBINY_TASK_LOG_MODEL_ID,
|
|
9
|
+
name: "Webiny Task Log"
|
|
10
|
+
}).fields((fields)=>({
|
|
11
|
+
executionName: fields.text().label("Execution Name"),
|
|
12
|
+
task: fields.text().label("Task").required("Task is required."),
|
|
13
|
+
iteration: fields.number().label("Iteration").required("Iteration is required."),
|
|
14
|
+
items: fields.object().label("Items").list().required("Items is required.").fields((fields)=>({
|
|
15
|
+
message: fields.text().label("Message").required("Message is required."),
|
|
16
|
+
createdOn: fields.datetime().label("Created On").required("Created On is required."),
|
|
17
|
+
type: fields.text().label("Type").required("Type is required.").predefinedValues([
|
|
18
|
+
{
|
|
19
|
+
value: TaskLogItemType.INFO,
|
|
20
|
+
label: "Info"
|
|
21
|
+
},
|
|
22
|
+
{
|
|
23
|
+
value: TaskLogItemType.ERROR,
|
|
24
|
+
label: "Error"
|
|
25
|
+
}
|
|
26
|
+
]),
|
|
27
|
+
data: fields.json().label("Data"),
|
|
28
|
+
error: fields.json().label("Error")
|
|
29
|
+
}))
|
|
30
|
+
}))
|
|
31
|
+
];
|
|
32
|
+
}
|
|
28
33
|
}
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
34
|
+
const TaskLogPrivateModel = ModelFactory.createImplementation({
|
|
35
|
+
implementation: TaskLogPrivateModelImpl,
|
|
36
|
+
dependencies: []
|
|
32
37
|
});
|
|
38
|
+
export { TaskLogPrivateModel, WEBINY_TASK_LOG_MODEL_ID };
|
|
33
39
|
|
|
34
40
|
//# sourceMappingURL=TaskLogPrivateModel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"crud/TaskLogPrivateModel.js","sources":["../../src/crud/TaskLogPrivateModel.ts"],"sourcesContent":["import { ModelFactory } from \"@webiny/api-headless-cms/features/modelBuilder/index.js\";\nimport { TaskLogItemType } from \"~/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"}
|
package/crud/TaskPrivateModel.js
CHANGED
|
@@ -1,46 +1,55 @@
|
|
|
1
1
|
import { ModelFactory } from "@webiny/api-headless-cms/features/modelBuilder/index.js";
|
|
2
2
|
import { TaskDataStatus } from "../types.js";
|
|
3
|
-
|
|
3
|
+
const WEBINY_TASK_MODEL_ID = "wbyTask";
|
|
4
4
|
class TaskPrivateModelImpl {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
5
|
+
async execute(builder) {
|
|
6
|
+
return [
|
|
7
|
+
builder.private({
|
|
8
|
+
modelId: WEBINY_TASK_MODEL_ID,
|
|
9
|
+
name: "Webiny Task"
|
|
10
|
+
}).fields((fields)=>({
|
|
11
|
+
name: fields.text().label("Name").required("Name is required."),
|
|
12
|
+
definitionId: fields.text().label("Definition ID").required("Definition ID is required."),
|
|
13
|
+
parentId: fields.text().label("Parent ID"),
|
|
14
|
+
executionName: fields.text().label("Execution Name"),
|
|
15
|
+
iterations: fields.number().label("Iterations"),
|
|
16
|
+
input: fields.json().label("Input"),
|
|
17
|
+
output: fields.json().label("Output"),
|
|
18
|
+
taskStatus: fields.text().label("Status").predefinedValues([
|
|
19
|
+
{
|
|
20
|
+
value: TaskDataStatus.PENDING,
|
|
21
|
+
label: "Pending"
|
|
22
|
+
},
|
|
23
|
+
{
|
|
24
|
+
value: TaskDataStatus.RUNNING,
|
|
25
|
+
label: "Running"
|
|
26
|
+
},
|
|
27
|
+
{
|
|
28
|
+
value: TaskDataStatus.FAILED,
|
|
29
|
+
label: "Failed"
|
|
30
|
+
},
|
|
31
|
+
{
|
|
32
|
+
value: TaskDataStatus.SUCCESS,
|
|
33
|
+
label: "Success"
|
|
34
|
+
},
|
|
35
|
+
{
|
|
36
|
+
value: TaskDataStatus.ABORTED,
|
|
37
|
+
label: "Aborted"
|
|
38
|
+
}
|
|
39
|
+
]).settings({
|
|
40
|
+
defaultValue: TaskDataStatus.PENDING
|
|
41
|
+
}),
|
|
42
|
+
startedOn: fields.datetime().label("Started On"),
|
|
43
|
+
finishedOn: fields.datetime().label("Finished On"),
|
|
44
|
+
eventResponse: fields.json().label("Event Response")
|
|
45
|
+
}))
|
|
46
|
+
];
|
|
47
|
+
}
|
|
40
48
|
}
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
49
|
+
const TaskPrivateModel = ModelFactory.createImplementation({
|
|
50
|
+
implementation: TaskPrivateModelImpl,
|
|
51
|
+
dependencies: []
|
|
44
52
|
});
|
|
53
|
+
export { TaskPrivateModel, WEBINY_TASK_MODEL_ID };
|
|
45
54
|
|
|
46
55
|
//# sourceMappingURL=TaskPrivateModel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"crud/TaskPrivateModel.js","sources":["../../src/crud/TaskPrivateModel.ts"],"sourcesContent":["import { ModelFactory } from \"@webiny/api-headless-cms/features/modelBuilder/index.js\";\nimport { TaskDataStatus } from \"~/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"}
|
|
@@ -1,76 +1,62 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
const current = order[i++];
|
|
28
|
-
const kids = await listChildren(current.id);
|
|
29
|
-
for (const kid of kids) {
|
|
30
|
-
if (seen.has(kid.id)) {
|
|
31
|
-
continue;
|
|
1
|
+
const createCleanupTaskSubtree = (context)=>{
|
|
2
|
+
const listChildren = async (parentId)=>{
|
|
3
|
+
const { items } = await context.tasks.listTasks({
|
|
4
|
+
where: {
|
|
5
|
+
parentId
|
|
6
|
+
}
|
|
7
|
+
});
|
|
8
|
+
return items;
|
|
9
|
+
};
|
|
10
|
+
const collectSubtree = async (rootId)=>{
|
|
11
|
+
const root = await context.tasks.getTask(rootId);
|
|
12
|
+
if (!root) return [];
|
|
13
|
+
const order = [
|
|
14
|
+
root
|
|
15
|
+
];
|
|
16
|
+
const seen = new Set([
|
|
17
|
+
root.id
|
|
18
|
+
]);
|
|
19
|
+
let i = 0;
|
|
20
|
+
while(i < order.length){
|
|
21
|
+
const current = order[i++];
|
|
22
|
+
const kids = await listChildren(current.id);
|
|
23
|
+
for (const kid of kids)if (!seen.has(kid.id)) {
|
|
24
|
+
seen.add(kid.id);
|
|
25
|
+
order.push(kid);
|
|
26
|
+
}
|
|
32
27
|
}
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
};
|
|
39
|
-
const deleteTaskLogs = async task => {
|
|
40
|
-
const definition = context.tasks.getDefinition(task.definitionId);
|
|
41
|
-
if (!definition || definition.databaseLogs !== true) {
|
|
42
|
-
return;
|
|
43
|
-
}
|
|
44
|
-
try {
|
|
45
|
-
const {
|
|
46
|
-
items
|
|
47
|
-
} = await context.tasks.listLogs({
|
|
48
|
-
where: {
|
|
49
|
-
task: task.id
|
|
50
|
-
}
|
|
51
|
-
});
|
|
52
|
-
for (const log of items) {
|
|
28
|
+
return order.reverse();
|
|
29
|
+
};
|
|
30
|
+
const deleteTaskLogs = async (task)=>{
|
|
31
|
+
const definition = context.tasks.getDefinition(task.definitionId);
|
|
32
|
+
if (!definition || true !== definition.databaseLogs) return;
|
|
53
33
|
try {
|
|
54
|
-
|
|
34
|
+
const { items } = await context.tasks.listLogs({
|
|
35
|
+
where: {
|
|
36
|
+
task: task.id
|
|
37
|
+
}
|
|
38
|
+
});
|
|
39
|
+
for (const log of items)try {
|
|
40
|
+
await context.tasks.deleteLog(log.id);
|
|
41
|
+
} catch (ex) {
|
|
42
|
+
console.warn(`cleanupTaskSubtree: failed to delete log "${log.id}" for task "${task.id}": ${ex.message}`);
|
|
43
|
+
}
|
|
55
44
|
} catch (ex) {
|
|
56
|
-
|
|
45
|
+
console.warn(`cleanupTaskSubtree: failed to list logs for task "${task.id}": ${ex.message}`);
|
|
46
|
+
}
|
|
47
|
+
};
|
|
48
|
+
return async (rootId)=>{
|
|
49
|
+
const ordered = await collectSubtree(rootId);
|
|
50
|
+
for (const task of ordered){
|
|
51
|
+
await deleteTaskLogs(task);
|
|
52
|
+
try {
|
|
53
|
+
await context.tasks.deleteTask(task.id);
|
|
54
|
+
} catch (ex) {
|
|
55
|
+
console.warn(`cleanupTaskSubtree: failed to delete task "${task.id}": ${ex.message}`);
|
|
56
|
+
}
|
|
57
57
|
}
|
|
58
|
-
|
|
59
|
-
} catch (ex) {
|
|
60
|
-
console.warn(`cleanupTaskSubtree: failed to list logs for task "${task.id}": ${ex.message}`);
|
|
61
|
-
}
|
|
62
|
-
};
|
|
63
|
-
return async rootId => {
|
|
64
|
-
const ordered = await collectSubtree(rootId);
|
|
65
|
-
for (const task of ordered) {
|
|
66
|
-
await deleteTaskLogs(task);
|
|
67
|
-
try {
|
|
68
|
-
await context.tasks.deleteTask(task.id);
|
|
69
|
-
} catch (ex) {
|
|
70
|
-
console.warn(`cleanupTaskSubtree: failed to delete task "${task.id}": ${ex.message}`);
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
};
|
|
58
|
+
};
|
|
74
59
|
};
|
|
60
|
+
export { createCleanupTaskSubtree };
|
|
75
61
|
|
|
76
62
|
//# sourceMappingURL=cleanupTaskSubtree.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"crud/cleanupTaskSubtree.js","sources":["../../src/crud/cleanupTaskSubtree.ts"],"sourcesContent":["import type { Context, ITask } from \"~/types.js\";\n\n/**\n * Recursively deletes the task identified by `rootId`, all its descendants, and\n * their logs (when the owning definition has databaseLogs=true). Bottom-up,\n * best-effort: per-record errors are logged and swallowed, the function never\n * throws.\n */\nexport const createCleanupTaskSubtree = (context: Context) => {\n const listChildren = async (parentId: string): Promise<ITask[]> => {\n const { items } = await context.tasks.listTasks({\n where: { parentId }\n });\n return items;\n };\n\n const collectSubtree = async (rootId: string): Promise<ITask[]> => {\n const root = await context.tasks.getTask(rootId);\n if (!root) {\n return [];\n }\n const order: ITask[] = [root];\n const seen = new Set<string>([root.id]);\n let i = 0;\n while (i < order.length) {\n const current = order[i++];\n const kids = await listChildren(current.id);\n for (const kid of kids) {\n if (seen.has(kid.id)) {\n continue;\n }\n seen.add(kid.id);\n order.push(kid);\n }\n }\n return order.reverse();\n };\n\n const deleteTaskLogs = async (task: ITask): Promise<void> => {\n const definition = context.tasks.getDefinition(task.definitionId);\n if (!definition || definition.databaseLogs !== true) {\n return;\n }\n try {\n const { items } = await context.tasks.listLogs({\n where: { task: task.id }\n });\n for (const log of items) {\n try {\n await context.tasks.deleteLog(log.id);\n } catch (ex: any) {\n console.warn(\n `cleanupTaskSubtree: failed to delete log \"${log.id}\" for task \"${task.id}\": ${ex.message}`\n );\n }\n }\n } catch (ex: any) {\n console.warn(\n `cleanupTaskSubtree: failed to list logs for task \"${task.id}\": ${ex.message}`\n );\n }\n };\n\n return async (rootId: string): Promise<void> => {\n const ordered = await collectSubtree(rootId);\n for (const task of ordered) {\n await deleteTaskLogs(task);\n try {\n await context.tasks.deleteTask(task.id);\n } catch (ex: any) {\n console.warn(\n `cleanupTaskSubtree: failed to delete task \"${task.id}\": ${ex.message}`\n );\n }\n }\n };\n};\n"],"names":["createCleanupTaskSubtree","context","listChildren","parentId","items","collectSubtree","rootId","root","order","seen","Set","i","current","kids","kid","deleteTaskLogs","task","definition","log","ex","console","ordered"],"mappings":"AAQO,MAAMA,2BAA2B,CAACC;IACrC,MAAMC,eAAe,OAAOC;QACxB,MAAM,EAAEC,KAAK,EAAE,GAAG,MAAMH,QAAQ,KAAK,CAAC,SAAS,CAAC;YAC5C,OAAO;gBAAEE;YAAS;QACtB;QACA,OAAOC;IACX;IAEA,MAAMC,iBAAiB,OAAOC;QAC1B,MAAMC,OAAO,MAAMN,QAAQ,KAAK,CAAC,OAAO,CAACK;QACzC,IAAI,CAACC,MACD,OAAO,EAAE;QAEb,MAAMC,QAAiB;YAACD;SAAK;QAC7B,MAAME,OAAO,IAAIC,IAAY;YAACH,KAAK,EAAE;SAAC;QACtC,IAAII,IAAI;QACR,MAAOA,IAAIH,MAAM,MAAM,CAAE;YACrB,MAAMI,UAAUJ,KAAK,CAACG,IAAI;YAC1B,MAAME,OAAO,MAAMX,aAAaU,QAAQ,EAAE;YAC1C,KAAK,MAAME,OAAOD,KACd,KAAIJ,KAAK,GAAG,CAACK,IAAI,EAAE;gBAGnBL,KAAK,GAAG,CAACK,IAAI,EAAE;gBACfN,MAAM,IAAI,CAACM;;QAEnB;QACA,OAAON,MAAM,OAAO;IACxB;IAEA,MAAMO,iBAAiB,OAAOC;QAC1B,MAAMC,aAAahB,QAAQ,KAAK,CAAC,aAAa,CAACe,KAAK,YAAY;QAChE,IAAI,CAACC,cAAcA,AAA4B,SAA5BA,WAAW,YAAY,EACtC;QAEJ,IAAI;YACA,MAAM,EAAEb,KAAK,EAAE,GAAG,MAAMH,QAAQ,KAAK,CAAC,QAAQ,CAAC;gBAC3C,OAAO;oBAAE,MAAMe,KAAK,EAAE;gBAAC;YAC3B;YACA,KAAK,MAAME,OAAOd,MACd,IAAI;gBACA,MAAMH,QAAQ,KAAK,CAAC,SAAS,CAACiB,IAAI,EAAE;YACxC,EAAE,OAAOC,IAAS;gBACdC,QAAQ,IAAI,CACR,CAAC,0CAA0C,EAAEF,IAAI,EAAE,CAAC,YAAY,EAAEF,KAAK,EAAE,CAAC,GAAG,EAAEG,GAAG,OAAO,EAAE;YAEnG;QAER,EAAE,OAAOA,IAAS;YACdC,QAAQ,IAAI,CACR,CAAC,kDAAkD,EAAEJ,KAAK,EAAE,CAAC,GAAG,EAAEG,GAAG,OAAO,EAAE;QAEtF;IACJ;IAEA,OAAO,OAAOb;QACV,MAAMe,UAAU,MAAMhB,eAAeC;QACrC,KAAK,MAAMU,QAAQK,QAAS;YACxB,MAAMN,eAAeC;YACrB,IAAI;gBACA,MAAMf,QAAQ,KAAK,CAAC,UAAU,CAACe,KAAK,EAAE;YAC1C,EAAE,OAAOG,IAAS;gBACdC,QAAQ,IAAI,CACR,CAAC,2CAA2C,EAAEJ,KAAK,EAAE,CAAC,GAAG,EAAEG,GAAG,OAAO,EAAE;YAE/E;QACJ;IACJ;AACJ"}
|