@dudousxd/nestjs-durable-store-typeorm 0.30.0 → 0.31.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs +47 -9
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.cts +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +47 -9
- package/dist/index.js.map +1 -1
- package/package.json +3 -3
package/dist/index.cjs
CHANGED
|
@@ -674,6 +674,26 @@ function durableEntities(options = {}) {
|
|
|
674
674
|
__name(durableEntities, "durableEntities");
|
|
675
675
|
var ENTITIES = durableEntities();
|
|
676
676
|
|
|
677
|
+
// src/lifecycle-index.ts
|
|
678
|
+
var LIFECYCLE_PENDING_TAG = "durable:lifecycle:pending";
|
|
679
|
+
var LIFECYCLE_PENDING_LIKE = `%"${LIFECYCLE_PENDING_TAG}"%`;
|
|
680
|
+
var LIFECYCLE_PENDING_INDEX = "durable_runs_lifecycle_pending_idx";
|
|
681
|
+
async function ensurePgLifecyclePendingIndex(query, opts) {
|
|
682
|
+
const literal = /* @__PURE__ */ __name((value) => `'${value.replace(/'/g, "''")}'`, "literal");
|
|
683
|
+
const scope = opts.schema === void 0 ? "current_schema()" : literal(opts.schema);
|
|
684
|
+
const [state] = await query(`SELECT i.indisvalid AS valid, EXISTS (SELECT 1 FROM pg_stat_progress_create_index p WHERE p.index_relid = c.oid) AS building
|
|
685
|
+
FROM pg_class c JOIN pg_namespace n ON n.oid = c.relnamespace JOIN pg_index i ON i.indexrelid = c.oid
|
|
686
|
+
WHERE c.relname = ${literal(LIFECYCLE_PENDING_INDEX)} AND n.nspname = ${scope}`) ?? [];
|
|
687
|
+
if (state?.valid || state?.building) return false;
|
|
688
|
+
const [tx] = await query("SELECT now() = statement_timestamp() AS autocommit") ?? [];
|
|
689
|
+
const concurrently = tx?.autocommit === false ? "" : "CONCURRENTLY ";
|
|
690
|
+
const qualified = opts.schema === void 0 ? `"${LIFECYCLE_PENDING_INDEX}"` : `"${opts.schema.replace(/"/g, '""')}"."${LIFECYCLE_PENDING_INDEX}"`;
|
|
691
|
+
if (state) await query(`DROP INDEX ${concurrently}IF EXISTS ${qualified}`);
|
|
692
|
+
await query(`CREATE INDEX ${concurrently}IF NOT EXISTS "${LIFECYCLE_PENDING_INDEX}" ON ${opts.table} (${opts.createdAt}) WHERE ${opts.predicate}`);
|
|
693
|
+
return true;
|
|
694
|
+
}
|
|
695
|
+
__name(ensurePgLifecyclePendingIndex, "ensurePgLifecyclePendingIndex");
|
|
696
|
+
|
|
677
697
|
// src/schema.ts
|
|
678
698
|
var JSON_BLOB_COLUMNS = {
|
|
679
699
|
durable_workflow_runs: [
|
|
@@ -1184,6 +1204,19 @@ async function ensureTypeOrmDurableSchema(dataSource, options = {}) {
|
|
|
1184
1204
|
} catch {
|
|
1185
1205
|
}
|
|
1186
1206
|
}
|
|
1207
|
+
if (isPg) {
|
|
1208
|
+
try {
|
|
1209
|
+
const built = await ensurePgLifecyclePendingIndex((sql) => runner.query(sql), {
|
|
1210
|
+
schema,
|
|
1211
|
+
table: runs,
|
|
1212
|
+
createdAt: runsCol("createdAt"),
|
|
1213
|
+
predicate: `${runsCol("tags")} LIKE '${LIFECYCLE_PENDING_LIKE}'`
|
|
1214
|
+
});
|
|
1215
|
+
if (built && !created.has("durable_workflow_runs")) repairs.push(`created index ${LIFECYCLE_PENDING_INDEX} on durable_workflow_runs`);
|
|
1216
|
+
} catch (error) {
|
|
1217
|
+
logger.warn(`[nestjs-durable] store-typeorm could not create the partial index ${LIFECYCLE_PENDING_INDEX} (the owed-lifecycle listing scans the runs table until it exists); retrying on the next boot: ${error.message}`);
|
|
1218
|
+
}
|
|
1219
|
+
}
|
|
1187
1220
|
} finally {
|
|
1188
1221
|
await runner.release();
|
|
1189
1222
|
}
|
|
@@ -1639,7 +1672,9 @@ var TypeOrmStateStore = class {
|
|
|
1639
1672
|
error: s.error ?? null,
|
|
1640
1673
|
events: s.events ?? null,
|
|
1641
1674
|
startedAt: s.startedAt,
|
|
1642
|
-
finishedAt: s.finishedAt
|
|
1675
|
+
finishedAt: s.finishedAt,
|
|
1676
|
+
// A settled step has no dispatch lease left.
|
|
1677
|
+
wakeAt: /* @__PURE__ */ __name(() => "NULL", "wakeAt")
|
|
1643
1678
|
}).where({
|
|
1644
1679
|
runId: s.runId,
|
|
1645
1680
|
seq: s.seq,
|
|
@@ -1677,7 +1712,8 @@ var TypeOrmStateStore = class {
|
|
|
1677
1712
|
error: s.error ?? null,
|
|
1678
1713
|
events: s.events ?? null,
|
|
1679
1714
|
startedAt: s.startedAt,
|
|
1680
|
-
finishedAt: s.finishedAt
|
|
1715
|
+
finishedAt: s.finishedAt,
|
|
1716
|
+
wakeAt: null
|
|
1681
1717
|
});
|
|
1682
1718
|
}
|
|
1683
1719
|
const column = /* @__PURE__ */ __name((property) => repo.metadata.findColumnWithPropertyName(property)?.databaseName ?? property, "column");
|
|
@@ -1908,7 +1944,8 @@ var TypeOrmStateStore = class {
|
|
|
1908
1944
|
if (query.statuses) qb.andWhere(query.statuses.length ? "r.status IN (:...statuses)" : "1 = 0", query.statuses.length ? {
|
|
1909
1945
|
statuses: query.statuses
|
|
1910
1946
|
} : {});
|
|
1911
|
-
if (query.tag) qb.andWhere(
|
|
1947
|
+
if (query.tag === LIFECYCLE_PENDING_TAG) qb.andWhere(`r.tags LIKE '${LIFECYCLE_PENDING_LIKE}'`);
|
|
1948
|
+
else if (query.tag) qb.andWhere("r.tags LIKE :tagPattern", {
|
|
1912
1949
|
tagPattern: `%"${query.tag}"%`
|
|
1913
1950
|
});
|
|
1914
1951
|
if (query.tags) {
|
|
@@ -2567,9 +2604,9 @@ function toCheckpointEntity(cp) {
|
|
|
2567
2604
|
attempts: cp.attempts,
|
|
2568
2605
|
workerGroup: cp.workerGroup ?? null,
|
|
2569
2606
|
parallelGroup: cp.parallelGroup ?? null,
|
|
2570
|
-
|
|
2571
|
-
|
|
2572
|
-
|
|
2607
|
+
// Always present, null when unset: an upsert leaves a column it is not given as stored, so a
|
|
2608
|
+
// checkpoint saved without its `wakeAt` (a lease cleared, a timeout settled) must write NULL.
|
|
2609
|
+
wakeAt: cp.wakeAt == null ? null : new Date(cp.wakeAt),
|
|
2573
2610
|
enqueuedAt: cp.enqueuedAt,
|
|
2574
2611
|
startedAt: cp.startedAt,
|
|
2575
2612
|
finishedAt: cp.finishedAt
|
|
@@ -2687,7 +2724,8 @@ var SETTLED_FIELDS = [
|
|
|
2687
2724
|
"error",
|
|
2688
2725
|
"events",
|
|
2689
2726
|
"startedAt",
|
|
2690
|
-
"finishedAt"
|
|
2727
|
+
"finishedAt",
|
|
2728
|
+
"wakeAt"
|
|
2691
2729
|
];
|
|
2692
2730
|
function seqsByRun(checkpoints) {
|
|
2693
2731
|
const byRun = /* @__PURE__ */ new Map();
|
|
@@ -2912,7 +2950,7 @@ var TypeOrmRoundTrips = class TypeOrmRoundTrips2 {
|
|
|
2912
2950
|
});
|
|
2913
2951
|
const c = /* @__PURE__ */ __name((prop) => this.c(k, prop), "c");
|
|
2914
2952
|
const returning = this.cpColumns(false).map((col) => `c.${this.q(col.databaseName)}`).join(", ");
|
|
2915
|
-
const settled = this.rows(await this.ds.query(`UPDATE ${this.table(k)} AS c SET ${c("status")} = v.status, ${c("output")} = CASE WHEN v.status = 'completed' THEN v.output ELSE c.${c("output")} END, ${c("error")} = v.error, ${c("events")} = COALESCE(v.events, c.${c("events")}), ${c("startedAt")} = COALESCE(v.started_at, c.${c("startedAt")}), ${c("finishedAt")} = v.finished_at FROM (VALUES ${rows.join(", ")}) AS v(run_id, seq, status, output, error, events, started_at, finished_at) WHERE c.${c("runId")} = v.run_id AND c.${c("seq")} = v.seq AND c.${c("status")} = 'pending' AND NOT EXISTS (SELECT 1 FROM ${this.table(r)} AS r WHERE r.${this.c(r, "id")} = c.${c("runId")} AND r.${this.c(r, "status")} IN ('cancelled', 'completed')) RETURNING ${returning}`, values));
|
|
2953
|
+
const settled = this.rows(await this.ds.query(`UPDATE ${this.table(k)} AS c SET ${c("status")} = v.status, ${c("output")} = CASE WHEN v.status = 'completed' THEN v.output ELSE c.${c("output")} END, ${c("error")} = v.error, ${c("events")} = COALESCE(v.events, c.${c("events")}), ${c("startedAt")} = COALESCE(v.started_at, c.${c("startedAt")}), ${c("finishedAt")} = v.finished_at, ${c("wakeAt")} = NULL FROM (VALUES ${rows.join(", ")}) AS v(run_id, seq, status, output, error, events, started_at, finished_at) WHERE c.${c("runId")} = v.run_id AND c.${c("seq")} = v.seq AND c.${c("status")} = 'pending' AND NOT EXISTS (SELECT 1 FROM ${this.table(r)} AS r WHERE r.${this.c(r, "id")} = c.${c("runId")} AND r.${this.c(r, "status")} IN ('cancelled', 'completed')) RETURNING ${returning}`, values));
|
|
2916
2954
|
const byKey = new Map(chunk.map((i) => {
|
|
2917
2955
|
const s = results[i];
|
|
2918
2956
|
return [
|
|
@@ -2933,7 +2971,7 @@ var TypeOrmRoundTrips = class TypeOrmRoundTrips2 {
|
|
|
2933
2971
|
const r = this.runs;
|
|
2934
2972
|
const c = /* @__PURE__ */ __name((prop) => `c.${this.c(k, prop)}`, "c");
|
|
2935
2973
|
const done = s.status === "completed";
|
|
2936
|
-
const result = await this.ds.query(`UPDATE ${this.table(k)} AS c SET ${c("status")} = ?, ${c("output")} = ${done ? "?" : c("output")}, ${c("error")} = ?, ${c("events")} = COALESCE(?, ${c("events")}), ${c("startedAt")} = COALESCE(?, ${c("startedAt")}), ${c("finishedAt")} =
|
|
2974
|
+
const result = await this.ds.query(`UPDATE ${this.table(k)} AS c SET ${c("status")} = ?, ${c("output")} = ${done ? "?" : c("output")}, ${c("error")} = ?, ${c("events")} = COALESCE(?, ${c("events")}), ${c("startedAt")} = COALESCE(?, ${c("startedAt")}), ${c("finishedAt")} = ?, ${c("wakeAt")} = NULL WHERE ${c("runId")} = ? AND ${c("seq")} = ? AND ${c("status")} = 'pending' AND NOT EXISTS (SELECT 1 FROM ${this.table(r)} AS r WHERE r.${this.c(r, "id")} = ${c("runId")} AND r.${this.c(r, "status")} IN ('cancelled', 'completed'))`, [
|
|
2937
2975
|
s.status,
|
|
2938
2976
|
...done ? [
|
|
2939
2977
|
this.bind(k, "output", s.output)
|