@dudousxd/nestjs-durable-store-mikro-orm 0.30.0 → 0.32.0

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import * as _mikro_orm_core from '@mikro-orm/core';
 import { EntityRepository, EntityRepositoryType, EntitySchema, MikroORM } from '@mikro-orm/core';
-import { StepKind, RunStatus, StateStore, WorkflowRun, RetentionPolicy, StepCheckpoint, RunQuery, RunFacetQuery, RunFacetRow, RunValueAxis, RunValueFacetOptions, RunValueFacetRow, ScheduleRecord, ScheduleQuery, CheckpointStat, CheckpointQuery, SignalWaiter, ChildWait } from '@dudousxd/nestjs-durable-core';
+import { StepKind, RunStatus, StateStore, WorkflowRun, RetentionPolicy, StepCheckpoint, OwnedLeaseReclaim, RunQuery, RunFacetQuery, RunFacetRow, RunValueAxis, RunValueFacetOptions, RunValueFacetRow, ScheduleRecord, ScheduleQuery, CheckpointStat, CheckpointQuery, SignalWaiter, ChildWait } from '@dudousxd/nestjs-durable-core';
 
 /**
  * Custom repositories for the durable entities, so a host app can `@InjectRepository`/inject a
@@ -188,6 +188,7 @@ declare class MikroOrmStateStore implements StateStore {
     tryAdmitSingleton(runId: string, tag: string, workflow: string, limit: number, retryWakeAt?: number): Promise<boolean>;
     createRun(run: WorkflowRun): Promise<void>;
     updateRun(runId: string, inputPatch: Partial<WorkflowRun>): Promise<void>;
+    updateRunIf(runId: string, expectedStatuses: RunStatus[], inputPatch: Partial<WorkflowRun>): Promise<boolean>;
     /** Rewrite a run's normalized attribute rows: delete the old set, insert the current one. Mirrors
      *  the in-memory store's reindex so the side-table always reflects the run's live searchAttributes. */
     private reindexAttributes;
@@ -204,6 +205,7 @@ declare class MikroOrmStateStore implements StateStore {
         saveCheckpoint: (cp: StepCheckpoint) => Promise<void>;
     }) => Promise<T>): Promise<T>;
     listIncompleteRuns(namespace?: string): Promise<WorkflowRun[]>;
+    listOrphanedRuns(nowMs: number, limit: number, namespace?: string, ownedBy?: OwnedLeaseReclaim): Promise<WorkflowRun[]>;
     listPendingRuns(limit: number, namespace?: string): Promise<WorkflowRun[]>;
     listDueTimers(nowMs: number, namespace?: string, limit?: number): Promise<WorkflowRun[]>;
     tryLockRun(runId: string, owner: string, leaseUntilMs: number, nowMs: number): Promise<boolean>;

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as _mikro_orm_core from '@mikro-orm/core';
 import { EntityRepository, EntityRepositoryType, EntitySchema, MikroORM } from '@mikro-orm/core';
-import { StepKind, RunStatus, StateStore, WorkflowRun, RetentionPolicy, StepCheckpoint, RunQuery, RunFacetQuery, RunFacetRow, RunValueAxis, RunValueFacetOptions, RunValueFacetRow, ScheduleRecord, ScheduleQuery, CheckpointStat, CheckpointQuery, SignalWaiter, ChildWait } from '@dudousxd/nestjs-durable-core';
+import { StepKind, RunStatus, StateStore, WorkflowRun, RetentionPolicy, StepCheckpoint, OwnedLeaseReclaim, RunQuery, RunFacetQuery, RunFacetRow, RunValueAxis, RunValueFacetOptions, RunValueFacetRow, ScheduleRecord, ScheduleQuery, CheckpointStat, CheckpointQuery, SignalWaiter, ChildWait } from '@dudousxd/nestjs-durable-core';
 
 /**
  * Custom repositories for the durable entities, so a host app can `@InjectRepository`/inject a
@@ -188,6 +188,7 @@ declare class MikroOrmStateStore implements StateStore {
     tryAdmitSingleton(runId: string, tag: string, workflow: string, limit: number, retryWakeAt?: number): Promise<boolean>;
     createRun(run: WorkflowRun): Promise<void>;
     updateRun(runId: string, inputPatch: Partial<WorkflowRun>): Promise<void>;
+    updateRunIf(runId: string, expectedStatuses: RunStatus[], inputPatch: Partial<WorkflowRun>): Promise<boolean>;
     /** Rewrite a run's normalized attribute rows: delete the old set, insert the current one. Mirrors
      *  the in-memory store's reindex so the side-table always reflects the run's live searchAttributes. */
     private reindexAttributes;
@@ -204,6 +205,7 @@ declare class MikroOrmStateStore implements StateStore {
         saveCheckpoint: (cp: StepCheckpoint) => Promise<void>;
     }) => Promise<T>): Promise<T>;
     listIncompleteRuns(namespace?: string): Promise<WorkflowRun[]>;
+    listOrphanedRuns(nowMs: number, limit: number, namespace?: string, ownedBy?: OwnedLeaseReclaim): Promise<WorkflowRun[]>;
     listPendingRuns(limit: number, namespace?: string): Promise<WorkflowRun[]>;
     listDueTimers(nowMs: number, namespace?: string, limit?: number): Promise<WorkflowRun[]>;
     tryLockRun(runId: string, owner: string, leaseUntilMs: number, nowMs: number): Promise<boolean>;

package/dist/index.js

@@ -938,6 +938,7 @@ var MikroOrmStateStore = class _MikroOrmStateStore {
         }, {
           status: "suspended",
           wakeAt: new Date(patch.wakeAt),
+          tags: patch.tags,
           updatedAt: patch.updatedAt
         });
         return false;
@@ -969,6 +970,30 @@ var MikroOrmStateStore = class _MikroOrmStateStore {
     await em.flush();
     if ("searchAttributes" in patch) await this.reindexAttributes(runId, patch.searchAttributes);
   }
+  async updateRunIf(runId, expectedStatuses, inputPatch) {
+    if (expectedStatuses.length === 0) return false;
+    const patch = inputPatch.status && TERMINAL_RUN_STATUSES.includes(inputPatch.status) ? await clearTerminalSingletonAdmission(runId, inputPatch, (id) => this.withScope({}).getRun(id)) : inputPatch;
+    const data = runUpdateData(patch);
+    const em = this.fork();
+    let applied;
+    if (Object.keys(data).length) {
+      applied = await em.nativeUpdate(WorkflowRunEntity, {
+        id: runId,
+        status: {
+          $in: expectedStatuses
+        }
+      }, data) > 0;
+    } else {
+      applied = await em.count(WorkflowRunEntity, {
+        id: runId,
+        status: {
+          $in: expectedStatuses
+        }
+      }) > 0;
+    }
+    if (applied && "searchAttributes" in patch) await this.reindexAttributes(runId, patch.searchAttributes);
+    return applied;
+  }
   /** Rewrite a run's normalized attribute rows: delete the old set, insert the current one. Mirrors
   *  the in-memory store's reindex so the side-table always reflects the run's live searchAttributes. */
   async reindexAttributes(runId, attributes, forked) {
@@ -1133,6 +1158,46 @@ var MikroOrmStateStore = class _MikroOrmStateStore {
     });
     return rows.map(fromRunEntity);
   }
+  async listOrphanedRuns(nowMs, limit, namespace, ownedBy) {
+    if (limit <= 0) return [];
+    const em = this.fork();
+    const rows = await em.find(WorkflowRunEntity, {
+      status: {
+        $in: [
+          "running",
+          "cancelling"
+        ]
+      },
+      $or: [
+        {
+          lockedUntil: null
+        },
+        {
+          lockedUntil: {
+            $lte: new Date(nowMs)
+          }
+        },
+        // A live lease left by a previous process with the caller's own instance id.
+        ...ownedBy ? [
+          {
+            lockedBy: ownedBy.owner,
+            lockedUntil: {
+              $lt: new Date(ownedBy.lockedBefore)
+            }
+          }
+        ] : []
+      ],
+      ...namespace !== void 0 ? {
+        namespace
+      } : {}
+    }, {
+      orderBy: {
+        createdAt: "ASC"
+      },
+      limit
+    });
+    return rows.map(fromRunEntity);
+  }
   async listPendingRuns(limit, namespace) {
     const em = this.fork();
     const rows = await em.find(WorkflowRunEntity, {
@@ -1524,7 +1589,7 @@ var MikroOrmStateStore = class _MikroOrmStateStore {
   *  single statement. */
   async updateSchedule(id, patch, expectedNextFireAt) {
     const data = {};
-    if (patch.namespace !== void 0) data.namespace = patch.namespace;
+    if (patch.namespace !== void 0) data.namespace = patch.namespace || "default";
     if (patch.workflow !== void 0) data.workflow = patch.workflow;
     if (patch.paused !== void 0) data.paused = patch.paused;
     if ("nextFireAt" in patch) data.nextFireAt = patch.nextFireAt ?? null;
@@ -1894,6 +1959,29 @@ var MikroOrmStateStore = class _MikroOrmStateStore {
     return affected > 0;
   }
 };
+function runUpdateData(patch) {
+  const data = {};
+  if ("workflow" in patch) data.workflow = patch.workflow;
+  if ("workflowVersion" in patch) data.workflowVersion = patch.workflowVersion;
+  if ("status" in patch) data.status = patch.status;
+  if ("input" in patch) data.input = patch.input ?? null;
+  if ("output" in patch) data.output = patch.output ?? null;
+  if ("error" in patch) data.error = patch.error ?? null;
+  if ("wakeAt" in patch) data.wakeAt = patch.wakeAt == null ? null : new Date(patch.wakeAt);
+  if ("lockedBy" in patch) data.lockedBy = patch.lockedBy ?? null;
+  if ("lockedUntil" in patch) data.lockedUntil = patch.lockedUntil == null ? null : new Date(patch.lockedUntil);
+  if ("awaitingDecisionTaskId" in patch) data.awaitingDecisionTaskId = patch.awaitingDecisionTaskId ?? null;
+  if ("recoveryAttempts" in patch) data.recoveryAttempts = patch.recoveryAttempts ?? null;
+  if ("tags" in patch) data.tags = patch.tags ?? null;
+  if ("searchAttributes" in patch) data.searchAttributes = patch.searchAttributes ?? null;
+  if ("priority" in patch) data.priority = patch.priority ?? null;
+  if ("namespace" in patch) data.namespace = patch.namespace || "default";
+  if ("origin" in patch) data.origin = patch.origin ?? null;
+  if (patch.createdAt != null) data.createdAt = patch.createdAt;
+  if (patch.updatedAt != null) data.updatedAt = patch.updatedAt;
+  return data;
+}
+__name(runUpdateData, "runUpdateData");
 function toRunEntity(run) {
   const e = new WorkflowRunEntity();
   e.id = run.id;
@@ -1911,7 +1999,7 @@ function toRunEntity(run) {
   e.tags = run.tags ?? null;
   e.searchAttributes = run.searchAttributes ?? null;
   e.priority = run.priority ?? null;
-  e.namespace = run.namespace ?? "default";
+  e.namespace = run.namespace || "default";
   e.origin = run.origin ?? null;
   e.createdAt = run.createdAt;
   e.updatedAt = run.updatedAt;