@dudousxd/nestjs-durable-store-typeorm 0.23.0 → 0.24.0

package/dist/index.cjs

@@ -998,6 +998,7 @@ var TypeOrmStateStore = class {
           }, {
             status: "suspended",
             wakeAt: new Date(patch.wakeAt),
+            tags: patch.tags,
             updatedAt: patch.updatedAt
           });
           return false;
@@ -1029,11 +1030,13 @@ var TypeOrmStateStore = class {
   async updateRunIf(runId, expectedStatuses, inputPatch) {
     if (expectedStatuses.length === 0) return false;
     const patch = inputPatch.status && import_nestjs_durable_core.TERMINAL_RUN_STATUSES.includes(inputPatch.status) ? await (0, import_nestjs_durable_core.clearTerminalSingletonAdmission)(runId, inputPatch, (id) => this.getRun(id)) : inputPatch;
-    const result = await this.runs().createQueryBuilder().update().set(runUpdateSet(patch)).where({
+    const set = runUpdateSet(patch);
+    const where = {
       id: runId,
       status: (0, import_typeorm2.In)(expectedStatuses)
-    }).execute();
-    if (!result.affected) return false;
+    };
+    const matched = Object.keys(set).length ? (await this.runs().createQueryBuilder().update().set(set).where(where).execute()).affected ?? 0 : await this.runs().countBy(where);
+    if (!matched) return false;
     if ("searchAttributes" in patch) await this.reindexAttributes(runId, patch.searchAttributes);
     return true;
   }
@@ -1156,7 +1159,7 @@ var TypeOrmStateStore = class {
     });
     return rows.map(fromRunEntity);
   }
-  async listOrphanedRuns(nowMs, limit, namespace) {
+  async listOrphanedRuns(nowMs, limit, namespace, ownedBy) {
     if (limit <= 0) return [];
     const now = new Date(nowMs);
     const rows = await this.runs().find({
@@ -1180,7 +1183,21 @@ var TypeOrmStateStore = class {
           ...namespace !== void 0 ? {
             namespace
           } : {}
-        }
+        },
+        // A live lease left by a previous process with the caller's own instance id.
+        ...ownedBy ? [
+          {
+            status: (0, import_typeorm2.In)([
+              "running",
+              "cancelling"
+            ]),
+            lockedBy: ownedBy.owner,
+            lockedUntil: (0, import_typeorm2.LessThan)(new Date(ownedBy.lockedBefore)),
+            ...namespace !== void 0 ? {
+              namespace
+            } : {}
+          }
+        ] : []
       ],
       order: {
         createdAt: "ASC"
@@ -1737,7 +1754,7 @@ function toRunEntity(run) {
     // An absent namespace is persisted as `'default'` (what the core `WorkflowRun.namespace` docblock
     // promises), so the column is always a value a worker can match on — the opposite of `origin`
     // below, where NULL is the only honest answer.
-    namespace: run.namespace ?? "default",
+    namespace: run.namespace || "default",
     // Absent origin stays SQL NULL — "unknown", never coerced into a real-looking library name.
     origin: run.origin ?? null,
     createdAt: run.createdAt,
@@ -1869,7 +1886,7 @@ function runUpdateSet(patch) {
   if ("tags" in patch) update.tags = patch.tags ?? null;
   if ("searchAttributes" in patch) update.searchAttributes = patch.searchAttributes ?? null;
   if ("priority" in patch) update.priority = patch.priority ?? null;
-  if ("namespace" in patch) update.namespace = patch.namespace ?? "default";
+  if ("namespace" in patch) update.namespace = patch.namespace || "default";
   if ("origin" in patch) update.origin = patch.origin ?? null;
   if ("createdAt" in patch) update.createdAt = patch.createdAt;
   if ("updatedAt" in patch) update.updatedAt = patch.updatedAt;