@entity-access/entity-access 1.0.433 → 1.0.435

package/dist/workflows/WorkflowTask.d.ts

@@ -0,0 +1,12 @@
+import type { WorkflowDbContext, WorkflowItem } from "./WorkflowDbContext.js";
+export default class WorkflowTask implements Disposable {
+    readonly item: WorkflowItem;
+    readonly context: WorkflowDbContext;
+    timer: NodeJS.Timer;
+    readonly signal: any;
+    private ac;
+    constructor(item: WorkflowItem, context: WorkflowDbContext);
+    [Symbol.dispose](): void;
+    renewLock: () => void;
+}
+//# sourceMappingURL=WorkflowTask.d.ts.map

package/dist/workflows/WorkflowTask.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkflowTask.d.ts","sourceRoot":"","sources":["../../src/workflows/WorkflowTask.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE9E,MAAM,CAAC,OAAO,OAAO,YAAa,YAAW,UAAU;aAQ/B,IAAI,EAAE,YAAY;aAClB,OAAO,EAAE,iBAAiB;IAP9C,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;IAEpB,SAAgB,MAAM,MAAC;IACvB,OAAO,CAAC,EAAE,CAAkB;gBAGR,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,iBAAiB;IAO9C,CAAC,MAAM,CAAC,OAAO,CAAC;IAOhB,SAAS,aAUP;CACL"}

package/dist/workflows/WorkflowTask.js

@@ -0,0 +1,33 @@
+/* eslint-disable no-console */
+import DateTime from "../types/DateTime.js";
+export default class WorkflowTask {
+    item;
+    context;
+    timer;
+    signal;
+    ac;
+    constructor(item, context) {
+        this.item = item;
+        this.context = context;
+        this.timer = setInterval(this.renewLock, 1000);
+        this.ac = new AbortController();
+        this.signal = this.ac.signal;
+    }
+    [Symbol.dispose]() {
+        clearInterval(this.timer);
+        const { id, lockToken } = this.item;
+        this.context.workflows.statements.update({ lockedTTL: null, lockToken: null }, { id, lockToken })
+            .catch(console.error);
+    }
+    renewLock = () => {
+        const { id, lockToken, lockedTTL } = this.item;
+        const now = DateTime.now;
+        if (DateTime.from(lockedTTL).msSinceEpoch < now.msSinceEpoch) {
+            this.ac.abort(new Error("Timed out"));
+            return;
+        }
+        this.context.workflows.statements.update({ lockedTTL: now.addSeconds(15) }, { id, lockToken })
+            .catch(console.error);
+    };
+}
+//# sourceMappingURL=WorkflowTask.js.map

package/dist/workflows/WorkflowTask.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkflowTask.js","sourceRoot":"","sources":["../../src/workflows/WorkflowTask.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAG5C,MAAM,CAAC,OAAO,OAAO,YAAY;IAQT;IACA;IAPpB,KAAK,CAAe;IAEJ,MAAM,CAAC;IACf,EAAE,CAAkB;IAE5B,YACoB,IAAkB,EAClB,OAA0B;QAD1B,SAAI,GAAJ,IAAI,CAAc;QAClB,YAAO,GAAP,OAAO,CAAmB;QAE1C,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,EAAE,GAAG,IAAI,eAAe,EAAE,CAAC;QAChC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC;IACjC,CAAC;IAED,CAAC,MAAM,CAAC,OAAO,CAAC;QACZ,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACpC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAC,EAAE,EAAE,EAAE,EAAE,SAAS,EAAC,CAAC;aAC1F,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAED,SAAS,GAAG,GAAG,EAAE;QACb,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC/C,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC;QACzB,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,YAAY,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC;YAC3D,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;YACtC,OAAO;QACX,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,EAAC,EAAE,EAAE,SAAS,EAAC,CAAC;aACvF,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC,CAAC;CACL"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@entity-access/entity-access",
-  "version": "1.0.433",
+  "version": "1.0.435",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/query/ast/ExpressionToSql.ts

@@ -779,7 +779,7 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
             } else {
                 first = false;
             }
-            all.push(this.visit(iterator));
+            all.push("(", this.visit(iterator), ")");
         }
         all.push(")");
         return all;

package/src/workflows/WorkflowContext.ts

@@ -4,7 +4,6 @@ import EntityAccessError from "../common/EntityAccessError.js";
 import { IClassOf } from "../decorators/IClassOf.js";
 import Inject, { RegisterSingleton, ServiceProvider, injectServiceKeysSymbol } from "../di/di.js";
 import DateTime from "../types/DateTime.js";
-import WorkflowStorage, { WorkflowItem } from "./WorkflowStorage.js";
 import type Workflow from "./Workflow.js";
 import { ActivitySuspendedError } from "./ActivitySuspendedError.js";
 import { IWorkflowSchema, WorkflowRegistry } from "./WorkflowRegistry.js";
@@ -12,6 +11,8 @@ import crypto from "crypto";
 import TimeSpan from "../types/TimeSpan.js";
 import sleep from "../common/sleep.js";
 import Waiter from "./Waiter.js";
+import { WorkflowItem } from "./WorkflowDbContext.js";
+import WorkflowStorage from "./WorkflowStorage.js";
 
 export const runChildSymbol = Symbol("runChild");
 
@@ -310,7 +311,8 @@ export default class WorkflowContext {
         // run...
         for (const iterator of pending) {
             try {
-                await this.run(iterator);
+                using l = iterator;
+                await this.run(iterator.item, iterator.signal);
             } catch (error) {
                 console.error(error);
             }
@@ -366,7 +368,7 @@ export default class WorkflowContext {
         }
     }
 
-    private async run(workflow: WorkflowItem) {
+    private async run(workflow: WorkflowItem, signal: AbortSignal) {
 
         const clock = this.storage.clock;
 

package/src/workflows/WorkflowDbContext.ts

@@ -0,0 +1,123 @@
+import Column from "../decorators/Column.js";
+import Index from "../decorators/Index.js";
+import { RelateTo } from "../decorators/Relate.js";
+import Table from "../decorators/Table.js";
+import { RegisterScoped } from "../di/di.js";
+import EntityContext from "../model/EntityContext.js";
+import DateTime from "../types/DateTime.js";
+
+@Table("Workflows")
+@Index({
+    name: "IX_Workflows_Group",
+    columns: [{ name: (x) => x.groupName, descending: false }],
+    filter: (x) => x.groupName !== null
+})
+@Index({
+    name: "IX_Workflows_taskGroup_ETA",
+    columns: [
+        { name: (x) => x.eta, descending: false },
+        { name: (x) => x.taskGroup, descending: false }
+    ],
+    filter: (x) => x.isWorkflow === true
+})
+@Index({
+    name: "IX_Workflows_Throttle_Group",
+    columns: [
+        { name: (x) => x.throttleGroup, descending: false },
+        { name: (x) => x.queued, descending: false }
+    ],
+    filter: (x) => x.isWorkflow === true && x.throttleGroup !== null
+})
+@Index({
+    name: "IX_Workflows_Parent_ID",
+    columns: [
+        { name: (x) => x.parentID, descending: true }
+    ],
+    filter: (x) => x.parentID !== null
+})
+export class WorkflowItem {
+
+    @Column({ dataType: "Char", length: 400, key: true })
+    public id: string;
+
+    @Column({ dataType: "Boolean" })
+    public isWorkflow: boolean;
+
+    @Column({ dataType: "Char", nullable: true })
+    public name: string;
+
+    @Column({ dataType: "Char", length: 200, nullable: true })
+    public groupName: string;
+
+    @Column({ dataType: "Char"})
+    public input: string;
+
+    @Column({ dataType: "Char", nullable: true})
+    public output: string;
+
+    @Column({ })
+    public eta: DateTime;
+
+    @Column({ })
+    public queued: DateTime;
+
+    @Column({ })
+    public updated: DateTime;
+
+    @Column({
+        dataType: "Char", length: 50,
+        default: () => `default`
+    })
+    public taskGroup: string;
+
+    @Column({
+        dataType: "Char", length: 200, nullable: true
+    })
+    public throttleGroup: string;
+
+    @Column({ dataType: "Int", default: () => 0})
+    public priority: number;
+
+    @Column({ nullable: true })
+    public lockedTTL: DateTime;
+
+    @Column({ nullable: true })
+    public lockToken: string;
+
+    @Column({ dataType: "AsciiChar", length: 10})
+    public state: "queued" | "failed" | "done";
+
+    @Column({ dataType: "Char", nullable: true})
+    public error: string;
+
+    @Column({ dataType: "Char", nullable: true})
+    public extra: string;
+
+    @Column({ dataType: "Char", length: 400 , nullable: true})
+    @RelateTo(WorkflowItem, {
+        property: (x) => x.parent,
+        inverseProperty: (x) => x.children,
+        foreignKeyConstraint: {
+            name: "FC_Workflows_Parent_ID",
+            cascade: "delete"
+        }
+    })
+    public parentID: string;
+
+    @Column({ dataType: "Char", length: 400 , nullable: true})
+    public lastID: string;
+
+    parent: WorkflowItem;
+    children: WorkflowItem[];
+}
+
+@RegisterScoped
+export class WorkflowDbContext extends EntityContext {
+
+    public workflows = this.model.register(WorkflowItem);
+
+    verifyFilters: boolean = false;
+
+    raiseEvents: boolean = false;
+
+}

package/src/workflows/WorkflowStorage.ts

@@ -1,134 +1,18 @@
 /* eslint-disable no-console */
 import { randomUUID } from "crypto";
-import Column from "../decorators/Column.js";
-import Index from "../decorators/Index.js";
-import Table from "../decorators/Table.js";
-import Inject, { RegisterScoped, RegisterSingleton, ServiceProvider } from "../di/di.js";
+import Inject, { RegisterSingleton } from "../di/di.js";
 import { BaseDriver } from "../drivers/base/BaseDriver.js";
-import EntityContext from "../model/EntityContext.js";
-import { BinaryExpression, CallExpression, Expression, NullExpression, NumberLiteral, UpdateStatement } from "../query/ast/Expressions.js";
+import { CallExpression, Expression, NullExpression, NumberLiteral, UpdateStatement } from "../query/ast/Expressions.js";
 import DateTime from "../types/DateTime.js";
 import WorkflowClock from "./WorkflowClock.js";
 import RawQuery from "../compiler/RawQuery.js";
-import { RelateTo } from "../decorators/Relate.js";
+import { WorkflowDbContext, WorkflowItem } from "./WorkflowDbContext.js";
+import WorkflowTask from "./WorkflowTask.js";
+import Sql from "../sql/Sql.js";
 
 const loadedFromDb = Symbol("loadedFromDB");
 
-@Table("Workflows")
-@Index({
-    name: "IX_Workflows_Group",
-    columns: [{ name: (x) => x.groupName, descending: false }],
-    filter: (x) => x.groupName !== null
-})
-@Index({
-    name: "IX_Workflows_taskGroup_ETA",
-    columns: [
-        { name: (x) => x.eta, descending: false },
-        { name: (x) => x.taskGroup, descending: false }
-    ],
-    filter: (x) => x.isWorkflow === true
-})
-@Index({
-    name: "IX_Workflows_Throttle_Group",
-    columns: [
-        { name: (x) => x.throttleGroup, descending: false },
-        { name: (x) => x.queued, descending: false }
-    ],
-    filter: (x) => x.isWorkflow === true && x.throttleGroup !== null
-})
-@Index({
-    name: "IX_Workflows_Parent_ID",
-    columns: [
-        { name: (x) => x.parentID, descending: true }
-    ],
-    filter: (x) => x.parentID !== null
-})
-export class WorkflowItem {
 
-    @Column({ dataType: "Char", length: 400, key: true })
-    public id: string;
-
-    @Column({ dataType: "Boolean" })
-    public isWorkflow: boolean;
-
-    @Column({ dataType: "Char", nullable: true })
-    public name: string;
-
-    @Column({ dataType: "Char", length: 200, nullable: true })
-    public groupName: string;
-
-    @Column({ dataType: "Char"})
-    public input: string;
-
-    @Column({ dataType: "Char", nullable: true})
-    public output: string;
-
-    @Column({ })
-    public eta: DateTime;
-
-    @Column({ })
-    public queued: DateTime;
-
-    @Column({ })
-    public updated: DateTime;
-
-    @Column({
-        dataType: "Char", length: 50,
-        default: () => `default`
-    })
-    public taskGroup: string;
-
-    @Column({
-        dataType: "Char", length: 200, nullable: true
-    })
-    public throttleGroup: string;
-
-    @Column({ dataType: "Int", default: () => 0})
-    public priority: number;
-
-    @Column({ nullable: true })
-    public lockedTTL: DateTime;
-
-    @Column({ nullable: true })
-    public lockToken: string;
-
-    @Column({ dataType: "AsciiChar", length: 10})
-    public state: "queued" | "failed" | "done";
-
-    @Column({ dataType: "Char", nullable: true})
-    public error: string;
-
-    @Column({ dataType: "Char", nullable: true})
-    public extra: string;
-
-    @Column({ dataType: "Char", length: 400 , nullable: true})
-    @RelateTo(WorkflowItem, {
-        property: (x) => x.parent,
-        inverseProperty: (x) => x.children,
-        foreignKeyConstraint: {
-            name: "FC_Workflows_Parent_ID",
-            cascade: "delete"
-        }
-    })
-    public parentID: string;
-
-    @Column({ dataType: "Char", length: 400 , nullable: true})
-    public lastID: string;
-
-    parent: WorkflowItem;
-    children: WorkflowItem[];
-}
-
-@RegisterScoped
-class WorkflowContext extends EntityContext {
-
-    public workflows = this.model.register(WorkflowItem);
-
-    verifyFilters: boolean = false;
-
-    raiseEvents: boolean = false;
-
-}
 
 @RegisterSingleton
 export default class WorkflowStorage {
@@ -146,7 +30,7 @@ export default class WorkflowStorage {
 
     async getNextEta(throttle: { group: string, maxPerSecond: number }) {
 
-        const db = new WorkflowContext(this.driver);
+        const db = new WorkflowDbContext(this.driver);
         const last = await db.workflows.where(throttle, (p) => (x) => x.throttleGroup === p.group
             && x.isWorkflow === true)
             .orderByDescending(void 0, (p) => (x) => x.queued)
@@ -163,7 +47,7 @@ export default class WorkflowStorage {
     }
 
     async getWorkflow(id: string) {
-        const db = new WorkflowContext(this.driver);
+        const db = new WorkflowDbContext(this.driver);
         const r = await db.workflows.statements.select({}, { id, isWorkflow: true });
         if (r) {
             return {
@@ -188,7 +72,7 @@ export default class WorkflowStorage {
 
 
     async getAny(id: string) {
-        const db = new WorkflowContext(this.driver);
+        const db = new WorkflowDbContext(this.driver);
         const r = await db.workflows.statements.select({}, { id });
         if (r) {
             return {
@@ -210,7 +94,7 @@ export default class WorkflowStorage {
     }
 
     async extra(id, text?) {
-        const db = new WorkflowContext(this.driver);
+        const db = new WorkflowDbContext(this.driver);
         if (text) {
             // save..
             await db.workflows.statements.update({ extra: text }, { id });
@@ -229,7 +113,7 @@ export default class WorkflowStorage {
      * @returns true if all items are deleted
      */
     async delete(id) {
-        const db = new WorkflowContext(this.driver);
+        const db = new WorkflowDbContext(this.driver);
         await db.workflows.where({ id}, (p) => (x) => x.parentID === p.id)
             .limit(100)
             .delete({ id }, (p) => (x) => x.parentID === p.id);
@@ -242,7 +126,7 @@ export default class WorkflowStorage {
     }
 
     async save(state: Partial<WorkflowItem>) {
-        const db = new WorkflowContext(this.driver);
+        const db = new WorkflowDbContext(this.driver);
         const connection = db.connection;
         await using tx = await connection.createTransaction();
         state.state ||= "queued";
@@ -260,7 +144,7 @@ export default class WorkflowStorage {
     }
 
     async dequeue(taskGroup: string, signal?: AbortSignal) {
-        const db = new WorkflowContext(this.driver);
+        const db = new WorkflowDbContext(this.driver);
         const now = this.clock.utcNow;
 
         if(!this.lockQuery) {
@@ -281,7 +165,7 @@ export default class WorkflowStorage {
                     Expression.assign(
                         Expression.identifier(lockTTLField),
                         CallExpression.create({
-                            callee: Expression.identifier("Sql.date.addMinutes"),
+                            callee: Expression.identifier("Sql.date.addSeconds"),
                             arguments: [CallExpression.create({
                                 callee: Expression.identifier("Sql.date.now")
                             }),
@@ -312,6 +196,8 @@ export default class WorkflowStorage {
 
         const q = this.lockQuery;
 
+        const uuid = randomUUID();
+
         const items = await db.workflows
             .where({now, taskGroup}, (p) => (x) => x.eta <= p.now
                 && ( x.lockedTTL === null
@@ -323,26 +209,15 @@ export default class WorkflowStorage {
             .thenBy({}, (p) => (x) => x.priority)
             .limit(20)
             .withSignal(signal)
-            .toArray();
-        const list: WorkflowItem[] = [];
-        const uuid = randomUUID();
-        for (const iterator of items) {
-            // try to acquire lock...
-            iterator.lockToken = uuid;
-            try {
-                const r = await q.invoke(db.connection, iterator);
-                if (r.updated > 0) {
-                    list.push(iterator);
-                }
-            } catch (error) {
-                console.error(error);
-            }
-        }
-        return list;
+            .updateSelect({ uuid}, (p) => (x) => ({
+                lockedTTL: Sql.date.addSeconds(Sql.date.now(), 15),
+                lockToken: p.uuid
+            }));
+        return items.map((x) => new WorkflowTask(x, db));
     }
 
     async seed(version?) {
-        const db = new WorkflowContext(this.driver);
+        const db = new WorkflowDbContext(this.driver);
         await db.connection.ensureDatabase();
         await db.connection.automaticMigrations().migrate(db, { version, name: "workflows" });
     }

package/src/workflows/WorkflowTask.ts

@@ -0,0 +1,39 @@
+/* eslint-disable no-console */
+import DateTime from "../types/DateTime.js";
+import type { WorkflowDbContext, WorkflowItem } from "./WorkflowDbContext.js";
+
+export default class WorkflowTask implements Disposable {
+
+    timer: NodeJS.Timer;
+
+    public readonly signal;
+    private ac: AbortController;
+
+    constructor(
+        public readonly item: WorkflowItem,
+        public readonly context: WorkflowDbContext,
+    ) {
+        this.timer = setInterval(this.renewLock, 1000);
+        this.ac = new AbortController();
+        this.signal = this.ac.signal;
+    }
+
+    [Symbol.dispose]() {
+        clearInterval(this.timer);
+        const { id, lockToken } = this.item;
+        this.context.workflows.statements.update({ lockedTTL: null, lockToken: null}, { id, lockToken})
+            .catch(console.error);
+    }
+
+    renewLock = () => {
+        const { id, lockToken, lockedTTL } = this.item;
+        const now = DateTime.now;
+        if (DateTime.from(lockedTTL).msSinceEpoch < now.msSinceEpoch) {
+            this.ac.abort(new Error("Timed out"));
+            return;
+        }
+
+        this.context.workflows.statements.update({ lockedTTL: now.addSeconds(15) }, {id, lockToken})
+            .catch(console.error);
+    };
+}