@decaf-ts/core 0.8.5 → 0.8.7

package/lib/tasks/TaskTracker.cjs

@@ -5,10 +5,12 @@ const TaskEventModel_1 = require("./models/TaskEventModel.cjs");
 const decorator_validation_1 = require("@decaf-ts/decorator-validation");
 const constants_1 = require("./constants.cjs");
 const logging_1 = require("./logging.cjs");
+const index_1 = require("./../persistence/index.cjs");
 class TaskTracker {
     constructor(bus, task) {
         this.bus = bus;
         this.task = task;
+        this.resolved = false;
         this.unregistration = bus.observe(this, (table, operation, id, 
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         ...args) => {
@@ -19,10 +21,11 @@ class TaskTracker {
         // eslint-disable-next-line @typescript-eslint/no-this-alias
         const self = this;
         this.promise = new Promise((resolve, reject) => {
-            self.onSuccess = resolve;
-            self.onFail = reject;
+            self.resolveResult = resolve;
+            self.rejectResult = reject;
         });
         this.pipe(this.track.bind(this));
+        this.resolveTerminalState();
     }
     resolve() {
         return this.promise;
@@ -44,21 +47,106 @@ class TaskTracker {
         this.pipes[type].add(pipe);
     }
     succeed(result) {
-        this.unregistration();
-        this.onSuccess(result);
-        this.pipes = undefined;
+        this.complete(result, true);
     }
     fail(error) {
+        this.complete(error, false);
+    }
+    cancel(evt) {
+        if (!evt.payload?.error)
+            return;
+        this.fail(evt.payload.error);
+    }
+    onSucceed(handler) {
+        return this.registerStatusHandler(constants_1.TaskStatus.SUCCEEDED, handler);
+    }
+    onFailure(handler) {
+        return this.registerStatusHandler(constants_1.TaskStatus.FAILED, handler);
+    }
+    onCancel(handler) {
+        return this.registerStatusHandler(constants_1.TaskStatus.CANCELED, handler);
+    }
+    complete(payload, success) {
+        if (this.resolved)
+            return;
+        this.resolved = true;
         this.unregistration();
-        this.onFail(error);
         this.pipes = undefined;
+        if (success)
+            this.resolveResult(payload);
+        else
+            this.rejectResult(payload);
+    }
+    isTerminalStatus(status) {
+        return [
+            constants_1.TaskStatus.SUCCEEDED,
+            constants_1.TaskStatus.CANCELED,
+            constants_1.TaskStatus.FAILED,
+        ].includes(status);
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async track(evt, ctx) {
-        if (evt.payload.status === constants_1.TaskStatus.SUCCEEDED)
-            this.succeed(evt.payload);
-        if (evt.payload.status === constants_1.TaskStatus.FAILED)
-            this.fail(evt.payload);
+        if (!evt.payload)
+            return;
+        this.task.status = evt.payload.status;
+        if (evt.payload.output !== undefined)
+            this.task.output = evt.payload.output;
+        if (evt.payload.error)
+            this.task.error = evt.payload.error;
+        if (evt.payload.status === constants_1.TaskStatus.SUCCEEDED) {
+            this.succeed(evt.payload.output);
+        }
+        if (evt.payload.status === constants_1.TaskStatus.FAILED) {
+            this.fail(evt.payload.error);
+        }
+        if (evt.payload.status === constants_1.TaskStatus.CANCELED)
+            this.cancel(evt);
+    }
+    registerStatusHandler(status, handler) {
+        const wrapped = async (evt, ctx) => {
+            if (evt.payload?.status !== status)
+                return;
+            await handler(evt, ctx);
+        };
+        this.pipe(wrapped, constants_1.TaskEventType.STATUS);
+        if (this.task.status === status) {
+            const terminalEvent = this.buildTerminalEvent(status);
+            void wrapped(terminalEvent, this.getTerminalContext());
+        }
+        return () => {
+            this.pipes?.[constants_1.TaskEventType.STATUS]?.delete(wrapped);
+        };
+    }
+    getTerminalContext() {
+        if (!this.terminalContext)
+            this.terminalContext = new index_1.Context();
+        return this.terminalContext;
+    }
+    buildTerminalEvent(status) {
+        const payload = { status };
+        if (status === constants_1.TaskStatus.SUCCEEDED) {
+            payload.output = this.task.output;
+        }
+        if ((status === constants_1.TaskStatus.FAILED || status === constants_1.TaskStatus.CANCELED) &&
+            this.task.error) {
+            payload.error = this.task.error;
+        }
+        return new TaskEventModel_1.TaskEventModel({
+            classification: constants_1.TaskEventType.STATUS,
+            taskId: this.task.id,
+            payload,
+        });
+    }
+    resolveTerminalState() {
+        if (!this.isTerminalStatus(this.task.status))
+            return;
+        if (this.task.status === constants_1.TaskStatus.SUCCEEDED) {
+            this.succeed(this.task.output);
+            return;
+        }
+        if (this.task.error) {
+            this.fail(this.task.error);
+        }
     }
     async refresh(evt, ctx) {
         if (!this.pipes)

package/lib/tasks/TaskTracker.d.ts

@@ -1,27 +1,39 @@
 import { Observer } from "../interfaces/Observer";
 import { TaskEventModel } from "./models/TaskEventModel";
 import { Logger } from "@decaf-ts/logging";
-import { TaskEventType } from "./constants";
+import { TaskEventType, TaskStatus } from "./constants";
 import { EventPipe, LogPipe, LogPipeOptions } from "./types";
 import { TaskModel } from "./models/TaskModel";
 import { Context } from "../persistence/index";
 import { TaskErrorModel } from "./models/TaskErrorModel";
 import { TaskEventBus } from "./TaskEventBus";
-export declare class TaskTracker<R = any> implements Observer<[TaskEventModel, Context]> {
+export declare class TaskTracker<O = any> implements Observer<[TaskEventModel, Context]> {
     protected bus: TaskEventBus;
     private readonly task;
     protected unregistration: () => void;
-    private onSuccess;
-    private onFail;
+    private resolveResult;
+    private rejectResult;
     protected pipes?: Record<TaskEventType, Set<EventPipe>>;
+    private resolved;
     private readonly promise;
+    private terminalContext?;
     constructor(bus: TaskEventBus, task: TaskModel);
-    resolve(): Promise<R>;
+    resolve(): Promise<O>;
     attach(log: Logger, opts?: LogPipeOptions): void;
     logs(pipe: LogPipe): void;
     protected pipe(pipe: EventPipe, type?: TaskEventType): void;
-    protected succeed(result: any): void;
+    protected succeed(result: O): void;
     protected fail(error: TaskErrorModel): void;
+    protected cancel(evt: TaskEventModel): void;
+    onSucceed(handler: EventPipe): () => void;
+    onFailure(handler: EventPipe): () => void;
+    onCancel(handler: EventPipe): () => void;
+    private complete;
+    protected isTerminalStatus(status: TaskStatus): boolean;
     protected track(evt: TaskEventModel, ctx: Context): Promise<void>;
+    private registerStatusHandler;
+    private getTerminalContext;
+    private buildTerminalEvent;
+    private resolveTerminalState;
     refresh(evt: TaskEventModel, ctx: Context): Promise<void>;
 }

package/lib/tasks/TaskTracker.js.map

@@ -1 +1 @@
-{"version":3,"file":"TaskTracker.js","sourceRoot":"","sources":["../../src/tasks/TaskTracker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TaskTracker.js","sourceRoot":"","sources":["../../src/tasks/TaskTracker.ts"],"names":[],"mappings":"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"}

package/lib/tasks/constants.cjs

@@ -43,5 +43,6 @@ exports.DefaultTaskEngineConfig = {
     streamBufferSize: 5,
     maxLoggingBuffer: 300,
     loggingBufferTruncation: 20,
+    gracefulShutdownMsTimeout: 60 * 2 * 1000,
 };
 //# sourceMappingURL=constants.js.map

package/lib/tasks/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/tasks/constants.ts"],"names":[],"mappings":";;;AAEA,IAAY,UAOX;AAPD,WAAY,UAAU;IACpB,iCAAmB,CAAA;IACnB,iCAAmB,CAAA;IACnB,+BAAiB,CAAA;IACjB,qCAAuB,CAAA;IACvB,mCAAqB,CAAA;IACrB,6CAA+B,CAAA;AACjC,CAAC,EAPW,UAAU,0BAAV,UAAU,QAOrB;AAED,IAAY,eAGX;AAHD,WAAY,eAAe;IACzB,8CAA2B,CAAA;IAC3B,kCAAe,CAAA;AACjB,CAAC,EAHW,eAAe,+BAAf,eAAe,QAG1B;AAED,IAAY,cAGX;AAHD,WAAY,cAAc;IACxB,+BAAa,CAAA;IACb,+BAAa,CAAA;AACf,CAAC,EAHW,cAAc,8BAAd,cAAc,QAGzB;AAED,IAAY,aAKX;AALD,WAAY,aAAa;IACvB,kCAAiB,CAAA;IACjB,4BAAW,CAAA;IACX,sCAAqB,CAAA;IACrB,4BAAW,CAAA;AACb,CAAC,EALW,aAAa,6BAAb,aAAa,QAKxB;AAED,IAAY,QAGX;AAHD,WAAY,QAAQ;IAClB,6BAAiB,CAAA;IACjB,mCAAuB,CAAA;AACzB,CAAC,EAHW,QAAQ,wBAAR,QAAQ,QAGnB;AAEY,QAAA,QAAQ,GAAG,OAAO,CAAC;AAEnB,QAAA,uBAAuB,GAA0B;IAC5D,QAAQ,EAAE,gBAAgB;IAC1B,WAAW,EAAE,EAAE;IACf,OAAO,EAAE,KAAK;IACd,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,GAAG;IACf,UAAU,EAAE,GAAG;IACf,gBAAgB,EAAE,CAAC;IACnB,gBAAgB,EAAE,GAAG;IACrB,uBAAuB,EAAE,EAAE;CACH,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/tasks/constants.ts"],"names":[],"mappings":";;;AAEA,IAAY,UAOX;AAPD,WAAY,UAAU;IACpB,iCAAmB,CAAA;IACnB,iCAAmB,CAAA;IACnB,+BAAiB,CAAA;IACjB,qCAAuB,CAAA;IACvB,mCAAqB,CAAA;IACrB,6CAA+B,CAAA;AACjC,CAAC,EAPW,UAAU,0BAAV,UAAU,QAOrB;AAED,IAAY,eAGX;AAHD,WAAY,eAAe;IACzB,8CAA2B,CAAA;IAC3B,kCAAe,CAAA;AACjB,CAAC,EAHW,eAAe,+BAAf,eAAe,QAG1B;AAED,IAAY,cAGX;AAHD,WAAY,cAAc;IACxB,+BAAa,CAAA;IACb,+BAAa,CAAA;AACf,CAAC,EAHW,cAAc,8BAAd,cAAc,QAGzB;AAED,IAAY,aAKX;AALD,WAAY,aAAa;IACvB,kCAAiB,CAAA;IACjB,4BAAW,CAAA;IACX,sCAAqB,CAAA;IACrB,4BAAW,CAAA;AACb,CAAC,EALW,aAAa,6BAAb,aAAa,QAKxB;AAED,IAAY,QAGX;AAHD,WAAY,QAAQ;IAClB,6BAAiB,CAAA;IACjB,mCAAuB,CAAA;AACzB,CAAC,EAHW,QAAQ,wBAAR,QAAQ,QAGnB;AAEY,QAAA,QAAQ,GAAG,OAAO,CAAC;AAEnB,QAAA,uBAAuB,GAA0B;IAC5D,QAAQ,EAAE,gBAAgB;IAC1B,WAAW,EAAE,EAAE;IACf,OAAO,EAAE,KAAK;IACd,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,GAAG;IACf,UAAU,EAAE,GAAG;IACf,gBAAgB,EAAE,CAAC;IACnB,gBAAgB,EAAE,GAAG;IACrB,uBAAuB,EAAE,EAAE;IAC3B,yBAAyB,EAAE,EAAE,GAAG,CAAC,GAAG,IAAI;CAChB,CAAC"}

package/lib/tasks/models/TaskErrorModel.cjs

@@ -10,10 +10,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskErrorModel = void 0;
-const TaskBaseModel_1 = require("./TaskBaseModel.cjs");
 const decorator_validation_1 = require("@decaf-ts/decorator-validation");
 const decoration_1 = require("@decaf-ts/decoration");
-let TaskErrorModel = class TaskErrorModel extends TaskBaseModel_1.TaskBaseModel {
+let TaskErrorModel = class TaskErrorModel extends decorator_validation_1.Model {
     constructor(arg) {
         super(arg);
     }

package/lib/tasks/models/TaskErrorModel.d.ts

@@ -1,6 +1,5 @@
-import { TaskBaseModel } from "./TaskBaseModel";
-import { type ModelArg } from "@decaf-ts/decorator-validation";
-export declare class TaskErrorModel extends TaskBaseModel {
+import { Model, type ModelArg } from "@decaf-ts/decorator-validation";
+export declare class TaskErrorModel extends Model {
     message: string;
     stack?: string;
     code?: string;

package/lib/tasks/models/TaskErrorModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"TaskErrorModel.js","sourceRoot":"","sources":["../../../src/tasks/models/TaskErrorModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uDAAgD;AAChD,yEAAgF;AAChF,qDAAyD;AAGlD,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,6BAAa;IAc/C,YAAY,GAA8B;QACxC,KAAK,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;CACF,CAAA;AAjBY,wCAAc;AAGzB;IAFC,IAAA,+BAAQ,GAAE;IACV,IAAA,wBAAW,EAAC,mBAAmB,CAAC;;+CAChB;AAGjB;IAFC,IAAA,iBAAI,GAAE;IACN,IAAA,wBAAW,EAAC,iBAAiB,CAAC;;6CAChB;AAGf;IAFC,IAAA,iBAAI,GAAE;IACN,IAAA,wBAAW,EAAC,gBAAgB,CAAC;;4CAChB;AAGd;IAFC,IAAA,iBAAI,GAAE;IACN,IAAA,wBAAW,EAAC,mBAAmB,CAAC;;+CACnB;yBAZH,cAAc;IAD1B,IAAA,4BAAK,GAAE;;GACK,cAAc,CAiB1B"}
+{"version":3,"file":"TaskErrorModel.js","sourceRoot":"","sources":["../../../src/tasks/models/TaskErrorModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yEAKwC;AACxC,qDAAyD;AAGlD,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,4BAAK;IAcvC,YAAY,GAA8B;QACxC,KAAK,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;CACF,CAAA;AAjBY,wCAAc;AAGzB;IAFC,IAAA,+BAAQ,GAAE;IACV,IAAA,wBAAW,EAAC,mBAAmB,CAAC;;+CAChB;AAGjB;IAFC,IAAA,iBAAI,GAAE;IACN,IAAA,wBAAW,EAAC,iBAAiB,CAAC;;6CAChB;AAGf;IAFC,IAAA,iBAAI,GAAE;IACN,IAAA,wBAAW,EAAC,gBAAgB,CAAC;;4CAChB;AAGd;IAFC,IAAA,iBAAI,GAAE;IACN,IAAA,wBAAW,EAAC,mBAAmB,CAAC;;+CACnB;yBAZH,cAAc;IAD1B,IAAA,4BAAK,GAAE;;GACK,cAAc,CAiB1B"}

package/lib/tasks/models/TaskEventModel.cjs

@@ -17,8 +17,7 @@ const decoration_1 = require("@decaf-ts/decoration");
 const db_decorators_1 = require("@decaf-ts/db-decorators");
 const constants_1 = require("./../constants.cjs");
 const decorators_3 = require("./../../persistence/decorators.cjs");
-const BaseModel_1 = require("./../../model/BaseModel.cjs");
-let TaskEventModel = class TaskEventModel extends BaseModel_1.BaseModel {
+let TaskEventModel = class TaskEventModel extends decorator_validation_1.Model {
     constructor(arg) {
         super(arg);
         this.ts = new Date();
@@ -56,7 +55,6 @@ __decorate([
 __decorate([
     (0, decoration_1.prop)(),
     (0, db_decorators_1.readonly)(),
-    (0, db_decorators_1.serialize)(),
     __metadata("design:type", Object)
 ], TaskEventModel.prototype, "payload", void 0);
 exports.TaskEventModel = TaskEventModel = __decorate([

package/lib/tasks/models/TaskEventModel.d.ts

@@ -1,7 +1,6 @@
-import { type ModelArg } from "@decaf-ts/decorator-validation";
+import { Model, type ModelArg } from "@decaf-ts/decorator-validation";
 import { TaskEventType } from "../constants";
-import { BaseModel } from "../../model/BaseModel";
-export declare class TaskEventModel extends BaseModel {
+export declare class TaskEventModel extends Model {
     id: string;
     uuid: string;
     taskId: string;

package/lib/tasks/models/TaskEventModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"TaskEventModel.js","sourceRoot":"","sources":["../../../src/tasks/models/TaskEventModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gEAA+C;AAC/C,yEAMwC;AACxC,6DAA+C;AAC/C,qDAA4C;AAC5C,2DAKiC;AACjC,kDAA6C;AAC7C,mEAAoD;AACpD,2DAAkD;AAI3C,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,qBAAS;IA6B3C,YAAY,GAA8B;QACxC,KAAK,CAAC,GAAG,CAAC,CAAC;QAbb,OAAE,GAAS,IAAI,IAAI,EAAE,CAAC;IActB,CAAC;CACF,CAAA;AAhCY,wCAAc;AAGzB;IAFC,IAAA,wBAAQ,EAAC,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC;IACnD,IAAA,eAAE,GAAE;;0CACO;AAMZ;IAJC,IAAA,wBAAQ,GAAE;IACV,IAAA,+BAAQ,GAAE;IACV,IAAA,yBAAS,GAAE;IACX,IAAA,iBAAI,EAAC,KAAK,CAAC;;4CACE;AAId;IAFC,IAAA,wBAAQ,GAAE;IACV,IAAA,+BAAQ,GAAE;;8CACK;AAIhB;IAFC,IAAA,2BAAI,GAAE;IACN,IAAA,+BAAQ,GAAE;8BACP,IAAI;0CAAc;AAKtB;IAHC,IAAA,wBAAQ,GAAE;IACV,IAAA,+BAAQ,GAAE;IACV,IAAA,6BAAM,EAAC,yBAAa,CAAC;;sDACS;AAK/B;IAHC,IAAA,iBAAI,GAAE;IACN,IAAA,wBAAQ,GAAE;IACV,IAAA,yBAAS,GAAE;;+CACE;yBA3BH,cAAc;IAF1B,IAAA,kBAAK,EAAC,YAAY,CAAC;IACnB,IAAA,4BAAK,GAAE;;GACK,cAAc,CAgC1B"}
+{"version":3,"file":"TaskEventModel.js","sourceRoot":"","sources":["../../../src/tasks/models/TaskEventModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gEAA+C;AAC/C,yEAOwC;AACxC,6DAA+C;AAC/C,qDAA4C;AAC5C,2DAAwE;AACxE,kDAA6C;AAC7C,mEAAoD;AAI7C,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,4BAAK;IA4BvC,YAAY,GAA8B;QACxC,KAAK,CAAC,GAAG,CAAC,CAAC;QAZb,OAAE,GAAS,IAAI,IAAI,EAAE,CAAC;IAatB,CAAC;CACF,CAAA;AA/BY,wCAAc;AAGzB;IAFC,IAAA,wBAAQ,EAAC,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC;IACnD,IAAA,eAAE,GAAE;;0CACO;AAMZ;IAJC,IAAA,wBAAQ,GAAE;IACV,IAAA,+BAAQ,GAAE;IACV,IAAA,yBAAS,GAAE;IACX,IAAA,iBAAI,EAAC,KAAK,CAAC;;4CACE;AAId;IAFC,IAAA,wBAAQ,GAAE;IACV,IAAA,+BAAQ,GAAE;;8CACK;AAIhB;IAFC,IAAA,2BAAI,GAAE;IACN,IAAA,+BAAQ,GAAE;8BACP,IAAI;0CAAc;AAKtB;IAHC,IAAA,wBAAQ,GAAE;IACV,IAAA,+BAAQ,GAAE;IACV,IAAA,6BAAM,EAAC,yBAAa,CAAC;;sDACS;AAI/B;IAFC,IAAA,iBAAI,GAAE;IACN,IAAA,wBAAQ,GAAE;;+CACG;yBA1BH,cAAc;IAF1B,IAAA,kBAAK,EAAC,YAAY,CAAC;IACnB,IAAA,4BAAK,GAAE;;GACK,cAAc,CA+B1B"}

package/lib/tasks/models/TaskLogEntryModel.cjs

@@ -27,7 +27,6 @@ __decorate([
 ], TaskLogEntryModel.prototype, "ts", void 0);
 __decorate([
     (0, decorator_validation_1.required)(),
-    (0, decoration_1.prop)(),
     (0, decorator_validation_1.option)(logging_1.LogLevel),
     __metadata("design:type", String)
 ], TaskLogEntryModel.prototype, "level", void 0);

package/lib/tasks/models/TaskLogEntryModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"TaskLogEntryModel.js","sourceRoot":"","sources":["../../../src/tasks/models/TaskLogEntryModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA6C;AAC7C,yEAOwC;AACxC,qDAA4C;AAGrC,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,4BAAK;IAiB1C,YAAY,GAAiC;QAC3C,KAAK,CAAC,GAAG,CAAC,CAAC;QAfb,OAAE,GAAS,IAAI,IAAI,EAAE,CAAC;IAgBtB,CAAC;CACF,CAAA;AApBY,8CAAiB;AAG5B;IAFC,IAAA,2BAAI,GAAE;IACN,IAAA,+BAAQ,GAAE;8BACP,IAAI;6CAAc;AAKtB;IAHC,IAAA,+BAAQ,GAAE;IACV,IAAA,iBAAI,GAAE;IACN,IAAA,6BAAM,EAAC,kBAAQ,CAAC;;gDACA;AAIjB;IAFC,IAAA,+BAAQ,GAAE;IACV,IAAA,iBAAI,GAAE;;8CACM;AAGb;IADC,IAAA,iBAAI,GAAE;;+CACI;4BAfA,iBAAiB;IAD7B,IAAA,4BAAK,GAAE;;GACK,iBAAiB,CAoB7B"}
+{"version":3,"file":"TaskLogEntryModel.js","sourceRoot":"","sources":["../../../src/tasks/models/TaskLogEntryModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA6C;AAC7C,yEAOwC;AACxC,qDAA4C;AAGrC,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,4BAAK;IAgB1C,YAAY,GAAiC;QAC3C,KAAK,CAAC,GAAG,CAAC,CAAC;QAdb,OAAE,GAAS,IAAI,IAAI,EAAE,CAAC;IAetB,CAAC;CACF,CAAA;AAnBY,8CAAiB;AAG5B;IAFC,IAAA,2BAAI,GAAE;IACN,IAAA,+BAAQ,GAAE;8BACP,IAAI;6CAAc;AAItB;IAFC,IAAA,+BAAQ,GAAE;IACV,IAAA,6BAAM,EAAC,kBAAQ,CAAC;;gDACA;AAIjB;IAFC,IAAA,+BAAQ,GAAE;IACV,IAAA,iBAAI,GAAE;;8CACM;AAGb;IADC,IAAA,iBAAI,GAAE;;+CACI;4BAdA,iBAAiB;IAD7B,IAAA,4BAAK,GAAE;;GACK,iBAAiB,CAmB7B"}

package/lib/tasks/models/TaskModel.cjs

@@ -10,7 +10,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskModel = void 0;
-const TaskBaseModel_1 = require("./TaskBaseModel.cjs");
 const decorator_validation_1 = require("@decaf-ts/decorator-validation");
 const decorators_1 = require("./../../identity/decorators.cjs");
 const constants_1 = require("./../constants.cjs");
@@ -19,61 +18,69 @@ const TaskBackoffModel_1 = require("./TaskBackoffModel.cjs");
 const decoration_1 = require("@decaf-ts/decoration");
 const db_decorators_1 = require("@decaf-ts/db-decorators");
 const decorators_2 = require("./../../model/decorators.cjs");
-let TaskModel = class TaskModel extends TaskBaseModel_1.TaskBaseModel {
+let TaskModel = class TaskModel extends decorator_validation_1.Model {
     constructor(arg) {
         super(arg);
         // required routing / identity
         this.atomicity = constants_1.TaskType.ATOMIC; // atomic handler type OR "composite"
         // execution
         this.status = constants_1.TaskStatus.PENDING;
-        // logging
         this.logTail = [];
     }
 };
 exports.TaskModel = TaskModel;
 __decorate([
     (0, decorators_1.pk)({ type: "uuid" }),
+    (0, decoration_1.description)("the task id"),
     __metadata("design:type", String)
 ], TaskModel.prototype, "id", void 0);
 __decorate([
     (0, decorator_validation_1.required)(),
     (0, decorator_validation_1.type)(String),
     (0, decorator_validation_1.option)(constants_1.TaskType),
+    (0, decoration_1.description)("defines a single or composite task"),
     __metadata("design:type", String)
 ], TaskModel.prototype, "atomicity", void 0);
 __decorate([
     (0, decorator_validation_1.required)(),
+    (0, decoration_1.description)("Holds task classification - must match @task()"),
     __metadata("design:type", String)
 ], TaskModel.prototype, "classification", void 0);
 __decorate([
     (0, decorator_validation_1.required)(),
     (0, decorator_validation_1.type)(String),
     (0, decorator_validation_1.option)(constants_1.TaskStatus),
+    (0, decoration_1.description)("Holds the task current status"),
     __metadata("design:type", String)
 ], TaskModel.prototype, "status", void 0);
 __decorate([
     (0, decoration_1.prop)(),
     (0, db_decorators_1.serialize)(),
+    (0, decoration_1.description)("Holds task input"),
     __metadata("design:type", Object)
 ], TaskModel.prototype, "input", void 0);
 __decorate([
     (0, decoration_1.prop)(),
     (0, db_decorators_1.serialize)(),
+    (0, decoration_1.description)("Holds the task output when successfully completed"),
     __metadata("design:type", Object)
 ], TaskModel.prototype, "output", void 0);
 __decorate([
     (0, decoration_1.prop)(),
     (0, db_decorators_1.serialize)(),
+    (0, decoration_1.description)("Holds the error for failed tasks"),
     __metadata("design:type", TaskErrorModel_1.TaskErrorModel)
 ], TaskModel.prototype, "error", void 0);
 __decorate([
-    (0, decorator_validation_1.min)(0),
     (0, decorator_validation_1.required)(),
+    (0, decorator_validation_1.min)(0),
+    (0, decoration_1.description)("Holds the current attempt"),
     __metadata("design:type", Number)
 ], TaskModel.prototype, "attempt", void 0);
 __decorate([
     (0, decorator_validation_1.min)(1),
     (0, decorator_validation_1.required)(),
+    (0, decoration_1.description)("max attempts for the task"),
     __metadata("design:type", Number)
 ], TaskModel.prototype, "maxAttempts", void 0);
 __decorate([
@@ -100,24 +107,53 @@ __decorate([
 __decorate([
     (0, decoration_1.prop)(),
     (0, db_decorators_1.serialize)(),
+    (0, decoration_1.description)("Holds the various steps definition and inputs - only for type === 'composite'"),
     __metadata("design:type", Array)
 ], TaskModel.prototype, "steps", void 0);
 __decorate([
     (0, decorator_validation_1.min)(0),
     (0, decoration_1.prop)(),
+    (0, decoration_1.description)("Holds the current step - only for type === 'composite'"),
     __metadata("design:type", Number)
 ], TaskModel.prototype, "currentStep", void 0);
 __decorate([
-    (0, db_decorators_1.serialize)(),
     (0, decoration_1.prop)(),
+    (0, db_decorators_1.serialize)(),
+    (0, decoration_1.description)("Holds the step results - only for type === 'composite'"),
     __metadata("design:type", Array)
 ], TaskModel.prototype, "stepResults", void 0);
 __decorate([
-    (0, db_decorators_1.serialize)(),
     (0, decoration_1.prop)(),
+    (0, db_decorators_1.serialize)(),
+    (0, decoration_1.description)("Holds the task log entries"),
     __metadata("design:type", Array)
 ], TaskModel.prototype, "logTail", void 0);
+__decorate([
+    (0, decorators_2.column)(),
+    (0, decorators_2.createdAt)(),
+    (0, decoration_1.description)("timestamp of creation"),
+    __metadata("design:type", Date)
+], TaskModel.prototype, "createdAt", void 0);
+__decorate([
+    (0, decorators_2.column)(),
+    (0, decorators_2.updatedAt)(),
+    (0, decoration_1.description)("timestamp of last update"),
+    __metadata("design:type", Date)
+], TaskModel.prototype, "updatedAt", void 0);
+__decorate([
+    (0, decorators_2.column)(),
+    (0, decorators_2.createdBy)(),
+    (0, decoration_1.description)("Holds the creator of the task"),
+    __metadata("design:type", String)
+], TaskModel.prototype, "createdBy", void 0);
+__decorate([
+    (0, decorators_2.column)(),
+    (0, decorators_2.updatedBy)(),
+    (0, decoration_1.description)("Holds the creator of the task"),
+    __metadata("design:type", String)
+], TaskModel.prototype, "updatedBy", void 0);
 exports.TaskModel = TaskModel = __decorate([
+    (0, decoration_1.description)("Holds the current step when applicable"),
     (0, decorators_2.table)("tasks"),
     (0, decorator_validation_1.model)(),
     __metadata("design:paramtypes", [Object])

package/lib/tasks/models/TaskModel.d.ts

@@ -1,12 +1,11 @@
-import { TaskBaseModel } from "./TaskBaseModel";
-import { type ModelArg } from "@decaf-ts/decorator-validation";
+import { Model, type ModelArg } from "@decaf-ts/decorator-validation";
 import { TaskStatus, TaskType } from "../constants";
 import { TaskErrorModel } from "./TaskErrorModel";
 import { TaskBackoffModel } from "./TaskBackoffModel";
 import { TaskStepSpecModel } from "./TaskStepSpecModel";
 import { TaskStepResultModel } from "./TaskStepResultModel";
 import { TaskLogEntryModel } from "./TaskLogEntryModel";
-export declare class TaskModel<INPUT = any, OUTPUT = any> extends TaskBaseModel {
+export declare class TaskModel<INPUT = any, OUTPUT = any> extends Model {
     id: string;
     atomicity: TaskType;
     classification: string;
@@ -24,5 +23,17 @@ export declare class TaskModel<INPUT = any, OUTPUT = any> extends TaskBaseModel
     currentStep?: number;
     stepResults?: TaskStepResultModel[];
     logTail?: TaskLogEntryModel[];
+    /**
+     * @description Creation timestamp for the model
+     * @summary Automatically set to the current date and time when the model is created
+     */
+    createdAt: Date;
+    /**
+     * @description Last update timestamp for the model
+     * @summary Automatically updated to the current date and time whenever the model is modified
+     */
+    updatedAt: Date;
+    createdBy: string;
+    updatedBy: string;
     constructor(arg?: ModelArg<TaskModel>);
 }

package/lib/tasks/models/TaskModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"TaskModel.js","sourceRoot":"","sources":["../../../src/tasks/models/TaskModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uDAAgD;AAChD,yEAQwC;AACxC,gEAA+C;AAC/C,kDAAoD;AACpD,yDAAkD;AAClD,6DAAsD;AAGtD,qDAAyD;AACzD,2DAAoD;AACpD,6DAA+C;AAKxC,IAAM,SAAS,GAAf,MAAM,SAAqC,SAAQ,6BAAa;IA6ErE,YAAY,GAAyB;QACnC,KAAK,CAAC,GAAG,CAAC,CAAC;QA1Eb,8BAA8B;QAI9B,cAAS,GAAa,oBAAQ,CAAC,MAAM,CAAC,CAAC,qCAAqC;QAK5E,YAAY;QAIZ,WAAM,GAAe,sBAAU,CAAC,OAAO,CAAC;QAsDxC,UAAU;QAIV,YAAO,GAAyB,EAAE,CAAC;IAInC,CAAC;CACF,CAAA;AAhFY,8BAAS;AAEpB;IADC,IAAA,eAAE,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;qCACT;AAMZ;IAHC,IAAA,+BAAQ,GAAE;IACV,IAAA,2BAAI,EAAC,MAAM,CAAC;IACZ,IAAA,6BAAM,EAAC,oBAAQ,CAAC;;4CACqB;AAGtC;IADC,IAAA,+BAAQ,GAAE;;iDACa;AAMxB;IAHC,IAAA,+BAAQ,GAAE;IACV,IAAA,2BAAI,EAAC,MAAM,CAAC;IACZ,IAAA,6BAAM,EAAC,sBAAU,CAAC;;yCACqB;AAIxC;IAFC,IAAA,iBAAI,GAAE;IACN,IAAA,yBAAS,GAAE;;wCACE;AAId;IAFC,IAAA,iBAAI,GAAE;IACN,IAAA,yBAAS,GAAE;;yCACI;AAIhB;IAFC,IAAA,iBAAI,GAAE;IACN,IAAA,yBAAS,GAAE;8BACJ,+BAAc;wCAAC;AAKvB;IAFC,IAAA,0BAAG,EAAC,CAAC,CAAC;IACN,IAAA,+BAAQ,GAAE;;0CACM;AAIjB;IAFC,IAAA,0BAAG,EAAC,CAAC,CAAC;IACN,IAAA,+BAAQ,GAAE;;8CACU;AAKrB;IAHC,IAAA,+BAAQ,GAAE;IACV,IAAA,yBAAS,GAAE;IACX,IAAA,wBAAW,EAAC,uBAAuB,CAAC;8BAC3B,mCAAgB;0CAAC;AAI3B;IAFC,IAAA,2BAAI,GAAE;IACN,IAAA,wBAAW,EAAC,0BAA0B,CAAC;8BAC5B,IAAI;4CAAC;AAKjB;IAFC,IAAA,iBAAI,GAAE;IACN,IAAA,wBAAW,EAAC,6BAA6B,CAAC;;6CACvB;AAIpB;IAFC,IAAA,2BAAI,GAAE;IACN,IAAA,wBAAW,EAAC,iCAAiC,CAAC;8BACjC,IAAI;8CAAC;AAKnB;IAFC,IAAA,iBAAI,GAAE;IACN,IAAA,yBAAS,GAAE;;wCACgB;AAI5B;IAFC,IAAA,0BAAG,EAAC,CAAC,CAAC;IACN,IAAA,iBAAI,GAAE;;8CACc;AAIrB;IAFC,IAAA,yBAAS,GAAE;IACX,IAAA,iBAAI,GAAE;;8CAC6B;AAMpC;IAFC,IAAA,yBAAS,GAAE;IACX,IAAA,iBAAI,GAAE;;0CAC4B;oBA3ExB,SAAS;IAFrB,IAAA,kBAAK,EAAC,OAAO,CAAC;IACd,IAAA,4BAAK,GAAE;;GACK,SAAS,CAgFrB"}
+{"version":3,"file":"TaskModel.js","sourceRoot":"","sources":["../../../src/tasks/models/TaskModel.ts"],"names":[],"mappings":"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"}

package/lib/tasks/models/TaskStepResultModel.cjs

@@ -13,10 +13,8 @@ exports.TaskStepResultModel = void 0;
 const decorator_validation_1 = require("@decaf-ts/decorator-validation");
 const constants_1 = require("./../constants.cjs");
 const TaskErrorModel_1 = require("./TaskErrorModel.cjs");
-const TaskBaseModel_1 = require("./TaskBaseModel.cjs");
-const db_decorators_1 = require("@decaf-ts/db-decorators");
 const decoration_1 = require("@decaf-ts/decoration");
-let TaskStepResultModel = class TaskStepResultModel extends TaskBaseModel_1.TaskBaseModel {
+let TaskStepResultModel = class TaskStepResultModel extends decorator_validation_1.Model {
     constructor(arg) {
         super(arg);
     }
@@ -24,9 +22,7 @@ let TaskStepResultModel = class TaskStepResultModel extends TaskBaseModel_1.Task
 exports.TaskStepResultModel = TaskStepResultModel;
 __decorate([
     (0, decorator_validation_1.required)(),
-    (0, decoration_1.prop)(),
     (0, decoration_1.description)("The status of a step"),
-    (0, db_decorators_1.serialize)(),
     __metadata("design:type", String)
 ], TaskStepResultModel.prototype, "status", void 0);
 __decorate([

package/lib/tasks/models/TaskStepResultModel.d.ts

@@ -1,8 +1,7 @@
-import { type ModelArg } from "@decaf-ts/decorator-validation";
+import { Model, type ModelArg } from "@decaf-ts/decorator-validation";
 import { TaskStatus } from "../constants";
 import { TaskErrorModel } from "./TaskErrorModel";
-import { TaskBaseModel } from "./TaskBaseModel";
-export declare class TaskStepResultModel extends TaskBaseModel {
+export declare class TaskStepResultModel extends Model {
     status: TaskStatus;
     output?: any;
     error?: TaskErrorModel;

package/lib/tasks/models/TaskStepResultModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"TaskStepResultModel.js","sourceRoot":"","sources":["../../../src/tasks/models/TaskStepResultModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yEAAgF;AAChF,kDAA0C;AAC1C,yDAAkD;AAClD,uDAAgD;AAChD,2DAAoD;AACpD,qDAAyD;AAGlD,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,6BAAa;IAepD,YAAY,GAAmC;QAC7C,KAAK,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;CACF,CAAA;AAlBY,kDAAmB;AAK9B;IAJC,IAAA,+BAAQ,GAAE;IACV,IAAA,iBAAI,GAAE;IACN,IAAA,wBAAW,EAAC,sBAAsB,CAAC;IACnC,IAAA,yBAAS,GAAE;;mDACQ;AAIpB;IAFC,IAAA,iBAAI,GAAE;IACN,IAAA,wBAAW,EAAC,iCAAiC,CAAC;;mDAClC;AAIb;IAFC,IAAA,iBAAI,GAAE;IACN,IAAA,wBAAW,EAAC,4BAA4B,CAAC;8BAClC,+BAAc;kDAAC;8BAbZ,mBAAmB;IAD/B,IAAA,4BAAK,GAAE;;GACK,mBAAmB,CAkB/B"}
+{"version":3,"file":"TaskStepResultModel.js","sourceRoot":"","sources":["../../../src/tasks/models/TaskStepResultModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yEAKwC;AACxC,kDAA0C;AAC1C,yDAAkD;AAClD,qDAAyD;AAGlD,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,4BAAK;IAa5C,YAAY,GAAmC;QAC7C,KAAK,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;CACF,CAAA;AAhBY,kDAAmB;AAG9B;IAFC,IAAA,+BAAQ,GAAE;IACV,IAAA,wBAAW,EAAC,sBAAsB,CAAC;;mDAChB;AAIpB;IAFC,IAAA,iBAAI,GAAE;IACN,IAAA,wBAAW,EAAC,iCAAiC,CAAC;;mDAClC;AAIb;IAFC,IAAA,iBAAI,GAAE;IACN,IAAA,wBAAW,EAAC,4BAA4B,CAAC;8BAClC,+BAAc;kDAAC;8BAXZ,mBAAmB;IAD/B,IAAA,4BAAK,GAAE;;GACK,mBAAmB,CAgB/B"}

package/lib/tasks/models/TaskStepSpecModel.cjs

@@ -11,10 +11,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskStepSpecModel = void 0;
 const decorator_validation_1 = require("@decaf-ts/decorator-validation");
-const TaskBaseModel_1 = require("./TaskBaseModel.cjs");
 const decoration_1 = require("@decaf-ts/decoration");
-const db_decorators_1 = require("@decaf-ts/db-decorators");
-let TaskStepSpecModel = class TaskStepSpecModel extends TaskBaseModel_1.TaskBaseModel {
+let TaskStepSpecModel = class TaskStepSpecModel extends decorator_validation_1.Model {
     constructor(arg) {
         super(arg);
     }
@@ -24,13 +22,11 @@ __decorate([
     (0, decorator_validation_1.required)(),
     (0, decoration_1.prop)(),
     (0, decoration_1.description)("task handler type"),
-    (0, db_decorators_1.serialize)(),
     __metadata("design:type", String)
 ], TaskStepSpecModel.prototype, "classification", void 0);
 __decorate([
     (0, decoration_1.description)("optional task step input"),
     (0, decoration_1.prop)(),
-    (0, db_decorators_1.serialize)(),
     __metadata("design:type", Object)
 ], TaskStepSpecModel.prototype, "input", void 0);
 exports.TaskStepSpecModel = TaskStepSpecModel = __decorate([

package/lib/tasks/models/TaskStepSpecModel.d.ts

@@ -1,6 +1,5 @@
-import { type ModelArg } from "@decaf-ts/decorator-validation";
-import { TaskBaseModel } from "./TaskBaseModel";
-export declare class TaskStepSpecModel extends TaskBaseModel {
+import { Model, type ModelArg } from "@decaf-ts/decorator-validation";
+export declare class TaskStepSpecModel extends Model {
     classification: string;
     input?: any;
     constructor(arg?: ModelArg<TaskStepSpecModel>);

package/lib/tasks/models/TaskStepSpecModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"TaskStepSpecModel.js","sourceRoot":"","sources":["../../../src/tasks/models/TaskStepSpecModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yEAAgF;AAChF,uDAAgD;AAChD,qDAAyD;AACzD,2DAAoD;AAG7C,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,6BAAa;IAYlD,YAAY,GAAiC;QAC3C,KAAK,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;CACF,CAAA;AAfY,8CAAiB;AAK5B;IAJC,IAAA,+BAAQ,GAAE;IACV,IAAA,iBAAI,GAAE;IACN,IAAA,wBAAW,EAAC,mBAAmB,CAAC;IAChC,IAAA,yBAAS,GAAE;;yDACY;AAKxB;IAHC,IAAA,wBAAW,EAAC,0BAA0B,CAAC;IACvC,IAAA,iBAAI,GAAE;IACN,IAAA,yBAAS,GAAE;;gDACA;4BAVD,iBAAiB;IAD7B,IAAA,4BAAK,GAAE;;GACK,iBAAiB,CAe7B"}
+{"version":3,"file":"TaskStepSpecModel.js","sourceRoot":"","sources":["../../../src/tasks/models/TaskStepSpecModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yEAKwC;AACxC,qDAAyD;AAGlD,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,4BAAK;IAU1C,YAAY,GAAiC;QAC3C,KAAK,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;CACF,CAAA;AAbY,8CAAiB;AAI5B;IAHC,IAAA,+BAAQ,GAAE;IACV,IAAA,iBAAI,GAAE;IACN,IAAA,wBAAW,EAAC,mBAAmB,CAAC;;yDACT;AAIxB;IAFC,IAAA,wBAAW,EAAC,0BAA0B,CAAC;IACvC,IAAA,iBAAI,GAAE;;gDACK;4BARD,iBAAiB;IAD7B,IAAA,4BAAK,GAAE;;GACK,iBAAiB,CAa7B"}

package/lib/tasks/types.d.ts

@@ -40,6 +40,7 @@ export type TaskEngineConfig<A extends Adapter<any, any, any, any>> = {
     streamBufferSize: number;
     maxLoggingBuffer: number;
     loggingBufferTruncation: number;
+    gracefulShutdownMsTimeout: number;
 };
 export type TaskProgressPayload = {
     status: TaskStatus;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decaf-ts/core",
-  "version": "0.8.5",
+  "version": "0.8.7",
   "description": "Core persistence module for the decaf framework",
   "type": "module",
   "exports": {

package/lib/esm/tasks/models/TaskBaseModel.d.ts

@@ -1,14 +0,0 @@
-import { Model, type ModelArg } from "@decaf-ts/decorator-validation";
-export declare abstract class TaskBaseModel extends Model {
-    /**
-     * @description Creation timestamp for the model
-     * @summary Automatically set to the current date and time when the model is created
-     */
-    createdAt: Date;
-    /**
-     * @description Last update timestamp for the model
-     * @summary Automatically updated to the current date and time whenever the model is modified
-     */
-    updatedAt: Date;
-    protected constructor(arg?: ModelArg<TaskBaseModel>);
-}