@dudousxd/nestjs-durable-store-drizzle 0.22.0 → 0.23.0

package/dist/pg/index.d.cts

@@ -1,6 +1,6 @@
 import * as drizzle_orm_pg_core from 'drizzle-orm/pg-core';
 import { PgDatabase } from 'drizzle-orm/pg-core';
-import { StateStore, WorkflowRun, RunStatus, RetentionPolicy, StepCheckpoint, StoreTransaction, RunQuery, RunFacetQuery, RunFacetRow, RunValueAxis, RunValueFacetOptions, RunValueFacetRow, ScheduleRecord, ScheduleQuery, CheckpointStat, CheckpointQuery, SignalWaiter, ChildWait } from '@dudousxd/nestjs-durable-core';
+import { StateStore, WorkflowRun, RunStatus, RetentionPolicy, StepCheckpoint, StoreTransaction, OwnedLeaseReclaim, RunQuery, RunFacetQuery, RunFacetRow, RunValueAxis, RunValueFacetOptions, RunValueFacetRow, ScheduleRecord, ScheduleQuery, CheckpointStat, CheckpointQuery, SignalWaiter, ChildWait } from '@dudousxd/nestjs-durable-core';
 import { SQL } from 'drizzle-orm';
 
 /**
@@ -91,7 +91,7 @@ declare class DrizzlePgStateStore implements StateStore {
     transaction<T>(work: (tx: StoreTransaction) => Promise<T>): Promise<T>;
     /** Crash recovery. Namespace-scoped: a worker re-drives only its own tenant's runs. */
     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[]>;
     /** FIFO pick-up, served by `durable_workflow_runs_namespace_status_idx`. The engine then leases
      *  each run with {@link tryLockRun}; the listing itself takes no locks (it runs outside a tx). */
     listPendingRuns(limit: number, namespace?: string): Promise<WorkflowRun[]>;

package/dist/pg/index.d.ts

@@ -1,6 +1,6 @@
 import * as drizzle_orm_pg_core from 'drizzle-orm/pg-core';
 import { PgDatabase } from 'drizzle-orm/pg-core';
-import { StateStore, WorkflowRun, RunStatus, RetentionPolicy, StepCheckpoint, StoreTransaction, RunQuery, RunFacetQuery, RunFacetRow, RunValueAxis, RunValueFacetOptions, RunValueFacetRow, ScheduleRecord, ScheduleQuery, CheckpointStat, CheckpointQuery, SignalWaiter, ChildWait } from '@dudousxd/nestjs-durable-core';
+import { StateStore, WorkflowRun, RunStatus, RetentionPolicy, StepCheckpoint, StoreTransaction, OwnedLeaseReclaim, RunQuery, RunFacetQuery, RunFacetRow, RunValueAxis, RunValueFacetOptions, RunValueFacetRow, ScheduleRecord, ScheduleQuery, CheckpointStat, CheckpointQuery, SignalWaiter, ChildWait } from '@dudousxd/nestjs-durable-core';
 import { SQL } from 'drizzle-orm';
 
 /**
@@ -91,7 +91,7 @@ declare class DrizzlePgStateStore implements StateStore {
     transaction<T>(work: (tx: StoreTransaction) => Promise<T>): Promise<T>;
     /** Crash recovery. Namespace-scoped: a worker re-drives only its own tenant's runs. */
     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[]>;
     /** FIFO pick-up, served by `durable_workflow_runs_namespace_status_idx`. The engine then leases
      *  each run with {@link tryLockRun}; the listing itself takes no locks (it runs outside a tx). */
     listPendingRuns(limit: number, namespace?: string): Promise<WorkflowRun[]>;

package/dist/pg/index.js

@@ -310,7 +310,14 @@ function anyOf(conditions) {
 }
 __name(anyOf, "anyOf");
 function namespaceFilter(namespace) {
-  return namespace === void 0 ? void 0 : eq(durableWorkflowRuns.namespace, namespace);
+  if (namespace === void 0) return void 0;
+  if (namespace === DEFAULT_NAMESPACE || namespace === "") {
+    return inArray(durableWorkflowRuns.namespace, [
+      DEFAULT_NAMESPACE,
+      ""
+    ]);
+  }
+  return eq(durableWorkflowRuns.namespace, namespace);
 }
 __name(namespaceFilter, "namespaceFilter");
 function hasTag(tag) {
@@ -509,12 +516,17 @@ var DrizzlePgStateStore = class _DrizzlePgStateStore {
     ]), namespaceFilter(namespace), this.scope()));
     return rows.map(fromRunRow);
   }
-  async listOrphanedRuns(nowMs, limit, namespace) {
+  async listOrphanedRuns(nowMs, limit, namespace, ownedBy) {
     if (limit <= 0) return [];
     const rows = await this.db.select().from(durableWorkflowRuns).where(and(inArray(durableWorkflowRuns.status, [
       "running",
       "cancelling"
-    ]), or(isNull(durableWorkflowRuns.lockedUntil), lte(durableWorkflowRuns.lockedUntil, new Date(nowMs))), namespaceFilter(namespace), this.scope())).orderBy(asc(durableWorkflowRuns.createdAt)).limit(limit);
+    ]), or(
+      isNull(durableWorkflowRuns.lockedUntil),
+      lte(durableWorkflowRuns.lockedUntil, new Date(nowMs)),
+      // A live lease left by a previous process with the caller's own instance id.
+      ownedBy ? and(eq(durableWorkflowRuns.lockedBy, ownedBy.owner), lt(durableWorkflowRuns.lockedUntil, new Date(ownedBy.lockedBefore))) : void 0
+    ), namespaceFilter(namespace), this.scope())).orderBy(asc(durableWorkflowRuns.createdAt)).limit(limit);
     return rows.map(fromRunRow);
   }
   /** FIFO pick-up, served by `durable_workflow_runs_namespace_status_idx`. The engine then leases
@@ -932,7 +944,7 @@ function toRunRow(run) {
     tags: run.tags ?? null,
     searchAttributes: run.searchAttributes ?? null,
     priority: run.priority ?? null,
-    namespace: run.namespace ?? DEFAULT_NAMESPACE,
+    namespace: run.namespace || DEFAULT_NAMESPACE,
     origin: run.origin ?? null,
     createdAt: run.createdAt,
     updatedAt: run.updatedAt
@@ -955,7 +967,7 @@ function toRunPatch(patch) {
   if ("tags" in patch) row.tags = patch.tags ?? null;
   if ("searchAttributes" in patch) row.searchAttributes = patch.searchAttributes ?? null;
   if ("priority" in patch) row.priority = patch.priority ?? null;
-  if ("namespace" in patch) row.namespace = patch.namespace ?? DEFAULT_NAMESPACE;
+  if ("namespace" in patch) row.namespace = patch.namespace || DEFAULT_NAMESPACE;
   if ("origin" in patch) row.origin = patch.origin ?? null;
   if (patch.createdAt != null) row.createdAt = patch.createdAt;
   if (patch.updatedAt != null) row.updatedAt = patch.updatedAt;
@@ -979,7 +991,7 @@ function fromRunRow(row) {
     tags: row.tags ?? void 0,
     searchAttributes: row.searchAttributes ?? void 0,
     priority: row.priority ?? void 0,
-    namespace: row.namespace,
+    namespace: row.namespace || DEFAULT_NAMESPACE,
     origin: row.origin ?? void 0,
     createdAt: row.createdAt,
     updatedAt: row.updatedAt