@entity-access/entity-access 1.0.161 → 1.0.163

package/dist/{eternity/EternityContext.js → workflows/WorkflowContext.js}

@@ -4,12 +4,13 @@ import { randomUUID } from "crypto";
 import EntityAccessError from "../common/EntityAccessError.js";
 import Inject, { ServiceProvider, injectServiceKeysSymbol } from "../di/di.js";
 import DateTime from "../types/DateTime.js";
-import EternityStorage from "./EternityStorage.js";
+import WorkflowStorage from "./WorkflowStorage.js";
 import { ActivitySuspendedError } from "./ActivitySuspendedError.js";
 import { WorkflowRegistry } from "./WorkflowRegistry.js";
 import crypto from "crypto";
 import TimeSpan from "../types/TimeSpan.js";
 import sleep from "../common/sleep.js";
+import Waiter from "./Waiter.js";
 async function hash(text) {
     const sha256 = crypto.createHash("sha256");
     return sha256.update(text).digest("base64");
@@ -108,7 +109,7 @@ function bindStep(context, store, name, old, unique = false) {
         return lastResult;
     };
 }
-let EternityContext = class EternityContext {
+let WorkflowContext = class WorkflowContext {
     constructor(storage) {
         this.storage = storage;
         this.registry = new Map();
@@ -116,21 +117,31 @@ let EternityContext = class EternityContext {
     register(type) {
         this.registry.set(type.name, WorkflowRegistry.register(type, void 0));
     }
-    async start(signal) {
+    async start({ workerGroup = "default", signal = void 0 }) {
         console.log(`Started executing workflow jobs`);
         while (!signal?.aborted) {
+            const env_1 = { stack: [], error: void 0, hasError: false };
             try {
-                const total = await this.processQueueOnce(signal);
-                if (total > 0) {
-                    // do not wait till we have zero messages to process
-                    continue;
+                try {
+                    const total = await this.processQueueOnce({ workerGroup, signal });
+                    if (total > 0) {
+                        // do not wait till we have zero messages to process
+                        continue;
+                    }
+                }
+                catch (error) {
+                    console.error(error);
                 }
+                const ws = __addDisposableResource(env_1, Waiter.create(), false);
+                await sleep(15000, ws.signal);
             }
-            catch (error) {
-                console.error(error);
+            catch (e_1) {
+                env_1.error = e_1;
+                env_1.hasError = true;
+            }
+            finally {
+                __disposeResources(env_1);
             }
-            const ws = (this.waiter = new AbortController()).signal;
-            await sleep(15000, ws);
         }
     }
     async get(c, id) {
@@ -183,7 +194,7 @@ let EternityContext = class EternityContext {
                     eta
                 });
                 if (eta < clock.utcNow) {
-                    this.waiter?.abort();
+                    Waiter.releaseAll();
                 }
             }
             catch (error) {
@@ -217,13 +228,13 @@ let EternityContext = class EternityContext {
         parent.eta = w.updated;
         parent.updated = w.updated;
         await this.storage.save(parent);
-        this.waiter?.abort();
+        Waiter.releaseAll();
     }
     log(...a) {
         // console.log(... a);
     }
-    async processQueueOnce(signal) {
-        const pending = await this.storage.dequeue(signal);
+    async processQueueOnce({ workerGroup = "default", signal = void 0 } = {}) {
+        const pending = await this.storage.dequeue(workerGroup, signal);
         // run...
         for (const iterator of pending) {
             try {
@@ -259,7 +270,7 @@ let EternityContext = class EternityContext {
         throw new ActivitySuspendedError();
     }
     async run(workflow) {
-        const env_1 = { stack: [], error: void 0, hasError: false };
+        const env_2 = { stack: [], error: void 0, hasError: false };
         try {
             const clock = this.storage.clock;
             if (workflow.state === "failed" || workflow.state === "done") {
@@ -269,7 +280,7 @@ let EternityContext = class EternityContext {
                 }
                 return;
             }
-            const scope = __addDisposableResource(env_1, ServiceProvider.from(this).createScope(), false);
+            const scope = __addDisposableResource(env_2, ServiceProvider.from(this).createScope(), false);
             this.log(`Run workflow ${workflow.id} -----------------------------------`);
             const schema = WorkflowRegistry.getByName(workflow.name);
             const { eta, id, queued } = workflow;
@@ -322,18 +333,18 @@ let EternityContext = class EternityContext {
                 }
             }
         }
-        catch (e_1) {
-            env_1.error = e_1;
-            env_1.hasError = true;
+        catch (e_2) {
+            env_2.error = e_2;
+            env_2.hasError = true;
         }
         finally {
-            __disposeResources(env_1);
+            __disposeResources(env_2);
         }
     }
 };
-EternityContext = __decorate([
+WorkflowContext = __decorate([
     __param(0, Inject),
-    __metadata("design:paramtypes", [EternityStorage])
-], EternityContext);
-export default EternityContext;
-//# sourceMappingURL=EternityContext.js.map
+    __metadata("design:paramtypes", [WorkflowStorage])
+], WorkflowContext);
+export default WorkflowContext;
+//# sourceMappingURL=WorkflowContext.js.map

package/dist/workflows/WorkflowContext.js.map

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"WorkflowRegistry.d.ts","sourceRoot":"","sources":["../../src/workflows/WorkflowRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAE1C,MAAM,WAAW,eAAe;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACzB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC9B;AAKD,eAAO,MAAM,gBAAgB;qBACR,SAAS,GAAG,CAAC;oBAgBd,MAAM;CAGzB,CAAC"}

package/dist/workflows/WorkflowRegistry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkflowRegistry.js","sourceRoot":"","sources":["../../src/workflows/WorkflowRegistry.ts"],"names":[],"mappings":"AAUA,sDAAsD;AACtD,MAAM,YAAY,GAAgC,IAAI,GAAG,EAAE,CAAC;AAE5D,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC5B,QAAQ,CAAC,MAAqB,EAAE,GAAG,EAAE,MAAM,GAAG,KAAK;QAC/C,IAAI,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,CAAC,OAAO,EAAE;YACV,OAAO,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,OAAO,EAAE,sBAAsB,CAAC,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC;YACnH,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC1C;QACD,IAAI,GAAG,EAAE;YACL,IAAI,MAAM,EAAE;gBACR,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACtC;iBAAM;gBACH,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAChC;SACJ;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,SAAS,CAAC,IAAY;QAClB,OAAO,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;CACJ,CAAC"}

package/dist/{eternity/EternityStorage.d.ts → workflows/WorkflowStorage.d.ts}

@@ -2,7 +2,7 @@
 import { BaseDriver } from "../drivers/base/BaseDriver.js";
 import DateTime from "../types/DateTime.js";
 import WorkflowClock from "./WorkflowClock.js";
-export declare class WorkflowStorage {
+export declare class WorkflowItem {
     id: string;
     isWorkflow: boolean;
     name: string;
@@ -12,6 +12,7 @@ export declare class WorkflowStorage {
     eta: DateTime;
     queued: DateTime;
     updated: DateTime;
+    workerGroup: string;
     priority: number;
     lockedTTL: DateTime;
     lockToken: string;
@@ -21,7 +22,7 @@ export declare class WorkflowStorage {
     parentID: string;
     lastID: string;
 }
-export default class EternityStorage {
+export default class WorkflowStorage {
     private driver;
     readonly clock: WorkflowClock;
     private lockQuery;
@@ -58,8 +59,8 @@ export default class EternityStorage {
      * @returns true if all items are deleted
      */
     delete(id: any): Promise<boolean>;
-    save(state: Partial<WorkflowStorage>): Promise<void>;
-    dequeue(signal?: AbortSignal): Promise<WorkflowStorage[]>;
+    save(state: Partial<WorkflowItem>): Promise<void>;
+    dequeue(workerGroup: string, signal?: AbortSignal): Promise<WorkflowItem[]>;
     seed(): Promise<void>;
 }
-//# sourceMappingURL=EternityStorage.d.ts.map
+//# sourceMappingURL=WorkflowStorage.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"WorkflowStorage.d.ts","sourceRoot":"","sources":["../../src/workflows/WorkflowStorage.ts"],"names":[],"mappings":";AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAG/C,qBAca,YAAY;IAGd,EAAE,EAAE,MAAM,CAAC;IAGX,UAAU,EAAE,OAAO,CAAC;IAGpB,IAAI,EAAE,MAAM,CAAC;IAGb,SAAS,EAAE,MAAM,CAAC;IAGlB,KAAK,EAAE,MAAM,CAAC;IAGd,MAAM,EAAE,MAAM,CAAC;IAGf,GAAG,EAAE,QAAQ,CAAC;IAGd,MAAM,EAAE,QAAQ,CAAC;IAGjB,OAAO,EAAE,QAAQ,CAAC;IAMlB,WAAW,EAAE,MAAM,CAAC;IAGpB,QAAQ,EAAE,MAAM,CAAC;IAGjB,SAAS,EAAE,QAAQ,CAAC;IAGpB,SAAS,EAAE,MAAM,CAAC;IAGlB,KAAK,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAC;IAGpC,KAAK,EAAE,MAAM,CAAC;IAGd,KAAK,EAAE,MAAM,CAAC;IAGd,QAAQ,EAAE,MAAM,CAAC;IAGjB,MAAM,EAAE,MAAM,CAAC;CACzB;AAcD,MAAM,CAAC,OAAO,OAAO,eAAe;IAM5B,OAAO,CAAC,MAAM;aAEE,KAAK,EAAE,aAAa;IANxC,OAAO,CAAC,SAAS,CAAW;gBAIhB,MAAM,EAAE,UAAU,EAEV,KAAK,EAAE,aAAa;IAKlC,WAAW,CAAC,EAAE,EAAE,MAAM;;;;;;;;;;;;;IAsBtB,MAAM,CAAC,EAAE,EAAE,MAAM;;;;;;;;;;;;;IAqBvB;;;;OAIG;IACG,MAAM,CAAC,EAAE,KAAA;IAwBT,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,YAAY,CAAC;IAuBjC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW;IAqEjD,IAAI;CAMb"}

package/dist/{eternity/EternityStorage.js → workflows/WorkflowStorage.js}

@@ -9,77 +9,84 @@ import EntityContext from "../model/EntityContext.js";
 import { CallExpression, Expression, NullExpression, NumberLiteral, UpdateStatement } from "../query/ast/Expressions.js";
 import DateTime from "../types/DateTime.js";
 import WorkflowClock from "./WorkflowClock.js";
-let WorkflowStorage = class WorkflowStorage {
+let WorkflowItem = class WorkflowItem {
 };
 __decorate([
     Column({ dataType: "Char", length: 400, key: true }),
     __metadata("design:type", String)
-], WorkflowStorage.prototype, "id", void 0);
+], WorkflowItem.prototype, "id", void 0);
 __decorate([
     Column({ dataType: "Boolean" }),
     __metadata("design:type", Boolean)
-], WorkflowStorage.prototype, "isWorkflow", void 0);
+], WorkflowItem.prototype, "isWorkflow", void 0);
 __decorate([
     Column({ dataType: "Char", nullable: true }),
     __metadata("design:type", String)
-], WorkflowStorage.prototype, "name", void 0);
+], WorkflowItem.prototype, "name", void 0);
 __decorate([
     Column({ dataType: "Char", length: 200, nullable: true }),
     __metadata("design:type", String)
-], WorkflowStorage.prototype, "groupName", void 0);
+], WorkflowItem.prototype, "groupName", void 0);
 __decorate([
     Column({ dataType: "Char" }),
     __metadata("design:type", String)
-], WorkflowStorage.prototype, "input", void 0);
+], WorkflowItem.prototype, "input", void 0);
 __decorate([
     Column({ dataType: "Char", nullable: true }),
     __metadata("design:type", String)
-], WorkflowStorage.prototype, "output", void 0);
+], WorkflowItem.prototype, "output", void 0);
 __decorate([
     Column({}),
     __metadata("design:type", DateTime)
-], WorkflowStorage.prototype, "eta", void 0);
+], WorkflowItem.prototype, "eta", void 0);
 __decorate([
     Column({}),
     __metadata("design:type", DateTime)
-], WorkflowStorage.prototype, "queued", void 0);
+], WorkflowItem.prototype, "queued", void 0);
 __decorate([
     Column({}),
     __metadata("design:type", DateTime)
-], WorkflowStorage.prototype, "updated", void 0);
+], WorkflowItem.prototype, "updated", void 0);
+__decorate([
+    Column({
+        dataType: "Char", length: 50,
+        default: () => `default`
+    }),
+    __metadata("design:type", String)
+], WorkflowItem.prototype, "workerGroup", void 0);
 __decorate([
     Column({ dataType: "Int", default: () => 0 }),
     __metadata("design:type", Number)
-], WorkflowStorage.prototype, "priority", void 0);
+], WorkflowItem.prototype, "priority", void 0);
 __decorate([
     Column({ nullable: true }),
     __metadata("design:type", DateTime)
-], WorkflowStorage.prototype, "lockedTTL", void 0);
+], WorkflowItem.prototype, "lockedTTL", void 0);
 __decorate([
     Column({ nullable: true }),
     __metadata("design:type", String)
-], WorkflowStorage.prototype, "lockToken", void 0);
+], WorkflowItem.prototype, "lockToken", void 0);
 __decorate([
     Column({ dataType: "AsciiChar", length: 10 }),
     __metadata("design:type", String)
-], WorkflowStorage.prototype, "state", void 0);
+], WorkflowItem.prototype, "state", void 0);
 __decorate([
     Column({ dataType: "Char", nullable: true }),
     __metadata("design:type", String)
-], WorkflowStorage.prototype, "error", void 0);
+], WorkflowItem.prototype, "error", void 0);
 __decorate([
     Column({ dataType: "Char", nullable: true }),
     __metadata("design:type", String)
-], WorkflowStorage.prototype, "extra", void 0);
+], WorkflowItem.prototype, "extra", void 0);
 __decorate([
     Column({ dataType: "Char", length: 200, nullable: true }),
     __metadata("design:type", String)
-], WorkflowStorage.prototype, "parentID", void 0);
+], WorkflowItem.prototype, "parentID", void 0);
 __decorate([
     Column({ dataType: "Char", length: 200, nullable: true }),
     __metadata("design:type", String)
-], WorkflowStorage.prototype, "lastID", void 0);
-WorkflowStorage = __decorate([
+], WorkflowItem.prototype, "lastID", void 0);
+WorkflowItem = __decorate([
     Table("Workflows"),
     Index({
         name: "IX_Workflows_Group",
@@ -87,16 +94,19 @@ WorkflowStorage = __decorate([
         filter: (x) => x.groupName !== null
     }),
     Index({
-        name: "IX_Workflows_ETA",
-        columns: [{ name: (x) => x.eta, descending: false }],
+        name: "IX_Workflows_WorkerGroup_ETA",
+        columns: [
+            { name: (x) => x.eta, descending: false },
+            { name: (x) => x.workerGroup, descending: false }
+        ],
         filter: (x) => x.isWorkflow === true
     })
-], WorkflowStorage);
-export { WorkflowStorage };
+], WorkflowItem);
+export { WorkflowItem };
 let WorkflowContext = class WorkflowContext extends EntityContext {
     constructor() {
         super(...arguments);
-        this.workflows = this.model.register(WorkflowStorage);
+        this.workflows = this.model.register(WorkflowItem);
         this.verifyFilters = false;
         this.raiseEvents = false;
     }
@@ -104,7 +114,7 @@ let WorkflowContext = class WorkflowContext extends EntityContext {
 WorkflowContext = __decorate([
     RegisterScoped
 ], WorkflowContext);
-let EternityStorage = class EternityStorage {
+let WorkflowStorage = class WorkflowStorage {
     constructor(driver, clock) {
         this.driver = driver;
         this.clock = clock;
@@ -191,15 +201,16 @@ let EternityStorage = class EternityStorage {
                 }
             }
             w.state ||= "queued";
+            w.workerGroup ||= "default";
             w.updated ??= DateTime.utcNow;
             await db.saveChanges();
         });
     }
-    async dequeue(signal) {
+    async dequeue(workerGroup, signal) {
         const db = new WorkflowContext(this.driver);
         const now = this.clock.utcNow;
         if (!this.lockQuery) {
-            const type = db.model.getEntityType(WorkflowStorage);
+            const type = db.model.getEntityType(WorkflowItem);
             const px = Expression.parameter("x");
             const lockTokenField = type.getProperty("lockToken").field.columnName;
             const lockTTLField = type.getProperty("lockedTTL").field.columnName;
@@ -222,10 +233,11 @@ let EternityStorage = class EternityStorage {
         }
         const q = this.lockQuery;
         const items = await db.workflows
-            .where({ now }, (p) => (x) => x.eta <= p.now
+            .where({ now, workerGroup }, (p) => (x) => x.eta <= p.now
             && (x.lockedTTL === null || x.lockedTTL <= p.now)
             && x.lockToken === null
-            && x.isWorkflow === true)
+            && x.isWorkflow === true
+            && x.workerGroup === p.workerGroup)
             .orderBy({}, (p) => (x) => x.eta)
             .thenBy({}, (p) => (x) => x.priority)
             .limit(20)
@@ -249,12 +261,12 @@ let EternityStorage = class EternityStorage {
         await db.connection.automaticMigrations().migrate(db);
     }
 };
-EternityStorage = __decorate([
+WorkflowStorage = __decorate([
     RegisterSingleton,
     __param(0, Inject),
     __param(1, Inject),
     __metadata("design:paramtypes", [BaseDriver,
         WorkflowClock])
-], EternityStorage);
-export default EternityStorage;
-//# sourceMappingURL=EternityStorage.js.map
+], WorkflowStorage);
+export default WorkflowStorage;
+//# sourceMappingURL=WorkflowStorage.js.map

package/dist/workflows/WorkflowStorage.js.map

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

package/package.json

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

package/src/index.ts

@@ -2,22 +2,22 @@ export { BaseDriver } from "./drivers/base/BaseDriver.js";
 export { default as SqlServerDriver } from "./drivers/sql-server/SqlServerDriver.js";
 export { default as PostgreSqlDriver } from "./drivers/postgres/PostgreSqlDriver.js";
 
-export { default as EternityStorage } from "./eternity/EternityStorage.js";
+export { default as EternityStorage } from "./workflows/WorkflowStorage.js";
 export { default as  EntityAccessError } from "./common/EntityAccessError.js";
 export { default as DateTime } from "./types/DateTime.js";
 export { default as ChangeSet } from "./model/changes/ChangeSet.js";
 export { default as ChangeEntry } from "./model/changes/ChangeEntry.js";
 export { default as  ContextEvents } from "./model/events/ContextEvents.js";
 export { default as TimedCache } from "./common/cache/TimedCache.js";
-export { Activity, UniqueActivity } from "./eternity/Workflow.js";
-export { default as Workflow } from "./eternity/Workflow.js";
+export { Activity, UniqueActivity } from "./workflows/Workflow.js";
+export { default as Workflow } from "./workflows/Workflow.js";
 export { default as Sql } from "./sql/Sql.js";
 export { default as Index } from "./decorators/Index.js";
 export { default as Table } from "./decorators/Table.js";
 export { RelateTo, RelateToOne } from "./decorators/Relate.js";
 export { default as Column } from "./decorators/Column.js";
 export { default as EntityContext } from "./model/EntityContext.js";
-export { default as EternityContext } from "./eternity/EternityContext.js";
+export { default as EternityContext } from "./workflows/WorkflowContext.js";
 
 export {
     default as Inject,

package/src/tests/eternity/child-tests.ts

@@ -1,12 +1,12 @@
 import assert from "assert";
 import Inject, { Register, RegisterSingleton, ServiceProvider } from "../../di/di.js";
-import EternityContext from "../../eternity/EternityContext.js";
-import Workflow, { Activity, UniqueActivity } from "../../eternity/Workflow.js";
-import WorkflowClock from "../../eternity/WorkflowClock.js";
+import WorkflowContext from "../../workflows/WorkflowContext.js";
+import Workflow, { Activity, UniqueActivity } from "../../workflows/Workflow.js";
+import WorkflowClock from "../../workflows/WorkflowClock.js";
 import DateTime from "../../types/DateTime.js";
 import { TestConfig } from "../TestConfig.js";
 import { BaseDriver } from "../../drivers/base/BaseDriver.js";
-import EternityStorage from "../../eternity/EternityStorage.js";
+import WorkflowStorage from "../../workflows/WorkflowStorage.js";
 import TimeSpan from "../../types/TimeSpan.js";
 import sleep from "../../common/sleep.js";
 
@@ -70,11 +70,11 @@ export default async function(this: TestConfig) {
     scope.add(WorkflowClock, mockClock);
     scope.add(BaseDriver, this.driver);
     scope.add(CallTracker, tracker);
-    const storage = new EternityStorage(this.driver, mockClock);
-    scope.add(EternityStorage, storage);
+    const storage = new WorkflowStorage(this.driver, mockClock);
+    scope.add(WorkflowStorage, storage);
 
-    const c = new EternityContext(storage);
-    scope.add(EternityContext, c);
+    const c = new WorkflowContext(storage);
+    scope.add(WorkflowContext, c);
 
     // this is an important step
     c.register(ChildWorkflow);

package/src/tests/eternity/eternity-tests.ts

@@ -1,12 +1,12 @@
 import assert from "assert";
 import Inject, { Register, RegisterSingleton, ServiceProvider } from "../../di/di.js";
-import EternityContext from "../../eternity/EternityContext.js";
-import Workflow, { Activity } from "../../eternity/Workflow.js";
-import WorkflowClock from "../../eternity/WorkflowClock.js";
+import WorkflowContext from "../../workflows/WorkflowContext.js";
+import Workflow, { Activity } from "../../workflows/Workflow.js";
+import WorkflowClock from "../../workflows/WorkflowClock.js";
 import DateTime from "../../types/DateTime.js";
 import { TestConfig } from "../TestConfig.js";
 import { BaseDriver } from "../../drivers/base/BaseDriver.js";
-import EternityStorage from "../../eternity/EternityStorage.js";
+import WorkflowStorage from "../../workflows/WorkflowStorage.js";
 import TimeSpan from "../../types/TimeSpan.js";
 import sleep from "../../common/sleep.js";
 
@@ -64,12 +64,12 @@ export default async function (this: TestConfig) {
     const scope = new ServiceProvider();
     scope.add(WorkflowClock, mockClock);
     scope.add(BaseDriver, this.driver);
-    const storage = new EternityStorage(this.driver, mockClock);
+    const storage = new WorkflowStorage(this.driver, mockClock);
     scope.add(Mailer, mailer);
-    scope.add(EternityStorage, storage);
+    scope.add(WorkflowStorage, storage);
 
-    const c = new EternityContext(storage);
-    scope.add(EternityContext, c);
+    const c = new WorkflowContext(storage);
+    scope.add(WorkflowContext, c);
 
     // this is an important step
     c.register(SendWorkflow);

package/src/tests/eternity/external-event-tests.ts

@@ -1,12 +1,12 @@
 import assert from "assert";
 import Inject, { Register, RegisterScoped, RegisterSingleton, ServiceProvider } from "../../di/di.js";
-import EternityContext from "../../eternity/EternityContext.js";
-import Workflow, { Activity } from "../../eternity/Workflow.js";
-import WorkflowClock from "../../eternity/WorkflowClock.js";
+import WorkflowContext from "../../workflows/WorkflowContext.js";
+import Workflow, { Activity } from "../../workflows/Workflow.js";
+import WorkflowClock from "../../workflows/WorkflowClock.js";
 import DateTime from "../../types/DateTime.js";
 import { TestConfig } from "../TestConfig.js";
 import { BaseDriver } from "../../drivers/base/BaseDriver.js";
-import EternityStorage from "../../eternity/EternityStorage.js";
+import WorkflowStorage from "../../workflows/WorkflowStorage.js";
 import TimeSpan from "../../types/TimeSpan.js";
 import sleep from "../../common/sleep.js";
 
@@ -78,11 +78,11 @@ export default async function (this: TestConfig) {
     scope.add(WorkflowClock, mockClock);
     scope.add(BaseDriver, this.driver);
     scope.add(StateLogger, stateLogger);
-    const storage = new EternityStorage(this.driver, mockClock);
-    scope.add(EternityStorage, storage);
+    const storage = new WorkflowStorage(this.driver, mockClock);
+    scope.add(WorkflowStorage, storage);
 
-    const c = new EternityContext(storage);
-    scope.add(EternityContext, c);
+    const c = new WorkflowContext(storage);
+    scope.add(WorkflowContext, c);
 
     // this is an important step
     c.register(VerifyWorkflow);

package/src/workflows/Waiter.ts

@@ -0,0 +1,24 @@
+export default class Waiter {
+
+    public static create() {
+        return new Waiter();
+    }
+
+    public static releaseAll() {
+        const copy = Array.from(this.set);
+        this.set.clear();
+        for (const iterator of copy) {
+            iterator.controller.abort();
+        }
+    }
+
+    private static set = new Set<Waiter>();
+
+    constructor(private controller = new AbortController(), public readonly signal = controller.signal) {
+    }
+
+    [Symbol.dispose]() {
+        Waiter.set.delete(this);
+    }
+
+}

package/src/{eternity → workflows}/Workflow.ts

@@ -3,7 +3,7 @@ import Inject from "../di/di.js";
 import DateTime from "../types/DateTime.js";
 import TimeSpan from "../types/TimeSpan.js";
 import { ActivitySuspendedError } from "./ActivitySuspendedError.js";
-import EternityContext from "./EternityContext.js";
+import WorkflowContext from "./WorkflowContext.js";
 import { WorkflowRegistry } from "./WorkflowRegistry.js";
 
 
@@ -50,7 +50,7 @@ export default abstract class Workflow<TIn = any, TOut = any> {
             eta: DateTime,
             currentTime: DateTime
         },
-        protected context: EternityContext
+        protected context: WorkflowContext
     ) {
         this.input = input;
         this.id = id;