anbaric-tsapi 1.12.0 → 1.13.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anbaric-tsapi",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "description": "These are the shared libraries - types, classes, etc - that both the public state-machine and hosting services share",
   "license": "MIT",
   "author": "chris@anbaric.ai",

package/src/api/jobs/Job.ts

@@ -9,10 +9,11 @@ class Job {
     readonly startedAt : Date;
     readonly startedBy : string;
     readonly lastUpdated : Date;
+    readonly killed : boolean;
 
     constructor(id : string, properties : Map<string, any> = new Map(), state: string, workflowId? : string,
                 startedBy : string = "system", startedAt : Date = new Date(),
-                lastUpdated : Date = startedAt) {
+                lastUpdated : Date = startedAt, killed : boolean = false) {
 
         this.id = id;
         this.properties = properties;
@@ -21,6 +22,7 @@ class Job {
         this.startedBy = startedBy;
         this.startedAt = startedAt;
         this.lastUpdated = lastUpdated;
+        this.killed = killed;
     }
 
 }

package/src/api/jobs/JobPersistence.ts

@@ -42,12 +42,29 @@ abstract class JobPersistence {
             job.workflowId,
             job.startedBy,
             job.startedAt,
-            new Date()
+            new Date(),
+            job.killed
         )
 
         this.saveInternal(updatedJob);
     }
 
+    async kill(id : string, actor : Actor) : Promise<void> {
+        await this.auditor.audit("job", id, actor, [JobPersistence.Interaction.KILL], "Job killed", null);
+        await this.killInternal(id);
+    }
+
+    async killOlderThan(lastUpdatedBefore : Date, actor : Actor) : Promise<number> {
+        await this.auditor.audit("job", "*", actor, [JobPersistence.Interaction.KILL],
+            `Jobs not updated since ${lastUpdatedBefore.toISOString()} killed`, null);
+        return this.killOlderThanInternal(lastUpdatedBefore);
+    }
+
+    async countByState(actor : Actor) : Promise<Array<JobPersistence.StateCount>> {
+        await this.auditor.audit("job", "*", actor, [JobPersistence.Interaction.LIST], "", null);
+        return this.countByStateInternal();
+    }
+
     private generatePropertiesDiff(oldVersion : Map<string, any>, newVersion : Map<string, any>) : Map<string, {from: any, to: any}> {
         const diff: Map<string, { from: any; to: any; }> = new Map();
 
@@ -84,6 +101,9 @@ abstract class JobPersistence {
     protected abstract retrieveInternal(id : string) : Promise<Job>;
     protected abstract deleteInternal(id : string) : Promise<void>;
     protected abstract listInternal(pageSize? : number, page? : number) : Promise<Array<Job>>;
+    protected abstract killInternal(id : string) : Promise<void>;
+    protected abstract killOlderThanInternal(lastUpdatedBefore : Date) : Promise<number>;
+    protected abstract countByStateInternal() : Promise<Array<JobPersistence.StateCount>>;
 
 }
 
@@ -96,8 +116,15 @@ namespace JobPersistence {
         DELETE = "DELETE",
         READ = "READ",
         LIST = "LIST",
+        KILL = "KILL",
     }
 
+    export type StateCount = {
+        state : string,
+        killed : boolean,
+        count : number,
+    };
+
 }
 
 export { JobPersistence }

package/src/api/jobs/JobSerialization.ts

@@ -8,6 +8,7 @@ type SerializedJob = {
     startedAt? : string,
     startedBy? : string,
     lastUpdated? : string,
+    killed? : boolean,
 };
 
 const serializeJob = (job : Job) : SerializedJob => ({
@@ -18,13 +19,14 @@ const serializeJob = (job : Job) : SerializedJob => ({
     startedAt: job.startedAt.toISOString(),
     startedBy: job.startedBy,
     lastUpdated: job.lastUpdated.toISOString(),
+    killed: job.killed,
 });
 
 const deserializeJob = (serialized : SerializedJob) : Job => {
     const startedAt = serialized.startedAt ? new Date(serialized.startedAt) : new Date();
     return new Job(serialized.id, new Map(Object.entries(serialized.properties)), serialized.state,
         serialized.workflowId, serialized.startedBy ?? "system", startedAt,
-        serialized.lastUpdated ? new Date(serialized.lastUpdated) : startedAt);
+        serialized.lastUpdated ? new Date(serialized.lastUpdated) : startedAt, serialized.killed ?? false);
 };
 
 export { serializeJob, deserializeJob };