@dudousxd/nestjs-durable-store-mikro-orm 0.31.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
@@ -205,7 +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): 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
@@ -205,7 +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): 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;
@@ -1157,7 +1158,7 @@ var MikroOrmStateStore = class _MikroOrmStateStore {
     });
     return rows.map(fromRunEntity);
   }
-  async listOrphanedRuns(nowMs, limit, namespace) {
+  async listOrphanedRuns(nowMs, limit, namespace, ownedBy) {
     if (limit <= 0) return [];
     const em = this.fork();
     const rows = await em.find(WorkflowRunEntity, {
@@ -1175,7 +1176,16 @@ var MikroOrmStateStore = class _MikroOrmStateStore {
           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
@@ -1579,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;
@@ -1965,7 +1975,7 @@ function runUpdateData(patch) {
   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 ("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;
@@ -1989,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;