pipework 0.128.0 → 0.130.0
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/CHANGELOG.md +8 -0
- package/dist/data/write/audit/infra-audit.d.ts.map +1 -1
- package/dist/data/write/audit/infra-audit.js +10 -12
- package/dist/data/write/audit/infra-audit.js.map +1 -1
- package/dist/test/auto-setup.js +3 -2
- package/dist/test/auto-setup.js.map +1 -1
- package/dist/test/plugin.d.ts.map +1 -1
- package/dist/test/plugin.js +1 -13
- package/dist/test/plugin.js.map +1 -1
- package/dist/test/vitest.d.ts.map +1 -1
- package/dist/test/vitest.js +4 -2
- package/dist/test/vitest.js.map +1 -1
- package/dist/trace/runtime/pending-writes.d.ts +10 -0
- package/dist/trace/runtime/pending-writes.d.ts.map +1 -1
- package/dist/trace/runtime/pending-writes.js +26 -0
- package/dist/trace/runtime/pending-writes.js.map +1 -1
- package/dist/trace/schema/trace-fields.d.ts +1 -1
- package/dist/trace/schema/trace-retained.d.ts +1 -1
- package/dist/trace/schema/trace.d.ts +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.130.0
|
|
4
|
+
|
|
5
|
+
- **Fixed: test teardown ended a test's transaction, or a file's connection and database, while trace closes were still being written** (#628), so a suite run logged hundreds of "Failed to persist trace close — the trace row is stuck open" lines. The per-test wait for in-flight trace writes gave up silently after 5 s, and the end-of-file teardown didn't wait at all before closing the pool and dropping the test databases. Both now wait up to 30 s. If writes are still in flight after that, one warning names how many, and teardown goes ahead. The harness's own `afterEach`/`afterAll` hooks take a 60 s timeout so the wait fits under a plain Vitest config's 10 s default.
|
|
6
|
+
|
|
7
|
+
## 0.129.0
|
|
8
|
+
|
|
9
|
+
- **Fixed: a failed infra audit write was logged and swallowed, so its credits ledger or access-link row committed unaudited** (#629). `writeInfraAudit` ran the `audit_record` insert in a savepoint and logged any error (a deadlock, a lost connection, a constraint), and the operation carried on. A failed audit insert now fails the operation it audits: it throws `Failed to write the <entity> <verb> audit record`, the caller's transaction rolls back, and the ledger row goes with it. The driver's error is on `cause`, and the Postgres error (with its `code`, e.g. `40P01` for a deadlock) on `cause.cause`. Upgrading: a credits `reserve`/`release`/`settle` or an access-link write that used to succeed with a missing audit record now rejects.
|
|
10
|
+
|
|
3
11
|
## 0.128.0
|
|
4
12
|
|
|
5
13
|
- **Fixed: `pipe.insert(T).values()` and `pipe.upsert(T).values()` weren't typed against the table** (#626). On a `pipe.define` table they took `Record<string, any>`, so a renamed or misspelled column, or a value of the wrong type, compiled and was dropped or failed only at run time. `values()` now takes the table's insert shape: a NOT NULL column without a default is required, a nullable or defaulted one optional, and any other key is a compile error, in a single row or an array. Columns pipework normally fills (traits' `effectiveFrom`, `createdAt`, …) can still be given. The tenant column is optional, because a write in a tenant context fills it from the flow. Upgrading may turn wrong inserts that used to compile into type errors. Drizzle's `$inferInsert` on a defined table now gives the same shape.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"infra-audit.d.ts","sourceRoot":"","sources":["../../../../src/data/write/audit/infra-audit.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"infra-audit.d.ts","sourceRoot":"","sources":["../../../../src/data/write/audit/infra-audit.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,mCAAmC,CAAA;AAG7D,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CACxC;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAc3F"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
// Writes one audit_record for an infrastructure operation (access links,
|
|
2
2
|
// credits) into the open trace step, in the operation's own transaction.
|
|
3
|
-
// No trace or no open step: nothing is written. A failed write
|
|
4
|
-
//
|
|
3
|
+
// No trace or no open step: nothing is written. A failed write fails the
|
|
4
|
+
// operation: the error reaches the caller and its transaction rolls back, so
|
|
5
|
+
// no row commits without its audit record. The database error stays on `cause`.
|
|
5
6
|
import { sql } from '../../db/sql.js';
|
|
6
|
-
import { getBaseLogger } from '../../../core/logging/index.js';
|
|
7
7
|
import { resolveActorId } from './actor.js';
|
|
8
8
|
export async function writeInfraAudit(flow, tx, record) {
|
|
9
9
|
const trace = flow.trace;
|
|
@@ -11,17 +11,15 @@ export async function writeInfraAudit(flow, tx, record) {
|
|
|
11
11
|
if (trace === null || stepId === null)
|
|
12
12
|
return;
|
|
13
13
|
try {
|
|
14
|
-
await tx.
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
`);
|
|
21
|
-
});
|
|
14
|
+
await tx.execute(sql `
|
|
15
|
+
INSERT INTO audit_record
|
|
16
|
+
(trace_day, trace_id, trace_step_id, tenant_id, actor_id, entity, verb, entity_id, after, occurred_at)
|
|
17
|
+
VALUES (${trace.openedDay}, ${trace.id}, ${stepId}, ${record.tenantId}, ${resolveActorId(flow)},
|
|
18
|
+
${record.entity}, ${record.verb}, ${record.entityId}, ${JSON.stringify(record.after)}::jsonb, now())
|
|
19
|
+
`);
|
|
22
20
|
}
|
|
23
21
|
catch (err) {
|
|
24
|
-
|
|
22
|
+
throw new Error(`Failed to write the ${record.entity} ${record.verb} audit record`, { cause: err });
|
|
25
23
|
}
|
|
26
24
|
}
|
|
27
25
|
//# sourceMappingURL=infra-audit.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"infra-audit.js","sourceRoot":"","sources":["../../../../src/data/write/audit/infra-audit.ts"],"names":[],"mappings":"AAAA,yEAAyE;AACzE,yEAAyE;AACzE,6EAA6E;AAC7E,
|
|
1
|
+
{"version":3,"file":"infra-audit.js","sourceRoot":"","sources":["../../../../src/data/write/audit/infra-audit.ts"],"names":[],"mappings":"AAAA,yEAAyE;AACzE,yEAAyE;AACzE,yEAAyE;AACzE,6EAA6E;AAC7E,gFAAgF;AAEhF,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAA;AAGrC,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAU3C,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,IAAU,EAAE,EAAM,EAAE,MAAkB;IAC1E,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;IACxB,MAAM,MAAM,GAAG,KAAK,EAAE,MAAM,CAAC,UAAU,IAAI,IAAI,CAAA;IAC/C,IAAI,KAAK,KAAK,IAAI,IAAI,MAAM,KAAK,IAAI;QAAE,OAAM;IAC7C,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CAAA;;;gBAGR,KAAK,CAAC,SAAS,KAAK,KAAK,CAAC,EAAE,KAAK,MAAM,KAAK,MAAM,CAAC,QAAQ,KAAK,cAAc,CAAC,IAAI,CAAC;UAC1F,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,QAAQ,KAAK,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;KACvF,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,uBAAuB,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,eAAe,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAA;IACrG,CAAC;AACH,CAAC"}
|
package/dist/test/auto-setup.js
CHANGED
|
@@ -5,6 +5,7 @@ import { setupTestDatabases } from './setup.js';
|
|
|
5
5
|
import { beginTestIsolation, endTestIsolation } from './plugin.js';
|
|
6
6
|
import { _setTestState, teardownAfterAll, useTestDb } from './vitest.js';
|
|
7
7
|
import { logSlowPhases } from './progress.js';
|
|
8
|
+
import { TEARDOWN_HOOK_TIMEOUT_MS } from '../trace/runtime/pending-writes.js';
|
|
8
9
|
loadEnvFiles();
|
|
9
10
|
let _testContext = null;
|
|
10
11
|
const instance = await discoverForTestFork();
|
|
@@ -22,7 +23,7 @@ beforeAll(async () => {
|
|
|
22
23
|
});
|
|
23
24
|
afterAll(async () => {
|
|
24
25
|
await teardownAfterAll(instance);
|
|
25
|
-
});
|
|
26
|
+
}, TEARDOWN_HOOK_TIMEOUT_MS);
|
|
26
27
|
beforeEach(async () => {
|
|
27
28
|
_testContext = await beginTestIsolation(instance);
|
|
28
29
|
_setTestState(instance, _testContext);
|
|
@@ -33,5 +34,5 @@ afterEach(async () => {
|
|
|
33
34
|
_testContext = null;
|
|
34
35
|
_setTestState(instance, null);
|
|
35
36
|
}
|
|
36
|
-
});
|
|
37
|
+
}, TEARDOWN_HOOK_TIMEOUT_MS);
|
|
37
38
|
//# sourceMappingURL=auto-setup.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-setup.js","sourceRoot":"","sources":["../../src/test/auto-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAC/C,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAoB,MAAM,aAAa,CAAA;AACpF,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"auto-setup.js","sourceRoot":"","sources":["../../src/test/auto-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAC/C,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAoB,MAAM,aAAa,CAAA;AACpF,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,oCAAoC,CAAA;AAE7E,YAAY,EAAE,CAAA;AAEd,IAAI,YAAY,GAAuB,IAAI,CAAA;AAE3C,MAAM,QAAQ,GAAG,MAAM,mBAAmB,EAAE,CAAA;AAE5C,aAAa,CAAC,QAAQ,CAAC,CAAA;AAEvB,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,aAAa,EAAE,CAAA;AAC/C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;IACzB,CAAC;IAAC,UAAsC,CAAC,IAAI,CAAC,GAAG,SAAS,EAAE,CAAA;AAC9D,CAAC;AAED,+EAA+E;AAC/E,8EAA8E;AAC9E,+EAA+E;AAC/E,SAAS,CAAC,KAAK,IAAI,EAAE;IACnB,MAAM,kBAAkB,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,aAAa,EAAE,EAAE,CAAC,CAAA;AACrE,CAAC,CAAC,CAAA;AAEF,QAAQ,CAAC,KAAK,IAAI,EAAE;IAClB,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAA;AAClC,CAAC,EAAE,wBAAwB,CAAC,CAAA;AAE5B,UAAU,CAAC,KAAK,IAAI,EAAE;IACpB,YAAY,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAA;IACjD,aAAa,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;AACvC,CAAC,CAAC,CAAA;AAEF,SAAS,CAAC,KAAK,IAAI,EAAE;IACnB,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,gBAAgB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;QAC9C,YAAY,GAAG,IAAI,CAAA;QACnB,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IAC/B,CAAC;AACH,CAAC,EAAE,wBAAwB,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/test/plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,KAAK,kBAAkB,EAAE,MAAM,oCAAoC,CAAA;AAErF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAmB,KAAK,YAAY,EAAE,MAAM,YAAY,CAAA;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAC1D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AAIvD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAKnE,MAAM,WAAW,uBAAuB;IACtC,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,CAAA;CACnC;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAA;IACV,EAAE,EAAE,uBAAuB,CAAA;CAC5B;AAWD,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,CA4BjF;
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/test/plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,KAAK,kBAAkB,EAAE,MAAM,oCAAoC,CAAA;AAErF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAmB,KAAK,YAAY,EAAE,MAAM,YAAY,CAAA;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAC1D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AAIvD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAKnE,MAAM,WAAW,uBAAuB;IACtC,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,CAAA;CACnC;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAA;IACV,EAAE,EAAE,uBAAuB,CAAA;CAC5B;AAWD,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,CA4BjF;AAED,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAyB1F;AA0BD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAMhI;AAED,wBAAsB,wBAAwB,CAC5C,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,WAAW,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAOf;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,EACpB,aAAa,CAAC,EAAE,qBAAqB,GACpC;IAAE,OAAO,EAAE,kBAAkB,CAAC;IAAC,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAM7D;AAED,OAAO,EAAE,YAAY,EAAE,CAAA"}
|
package/dist/test/plugin.js
CHANGED
|
@@ -8,7 +8,7 @@ import { randomUUID } from 'node:crypto';
|
|
|
8
8
|
import { createDebugFn, isObserverOnly } from '../data/db/instrumentation.js';
|
|
9
9
|
import { markObservedConnection } from '../data/query/postgres-js/driver-error-boundary.js';
|
|
10
10
|
import { collapseTransactionsToSavepoints } from './savepoints.js';
|
|
11
|
-
import {
|
|
11
|
+
import { settleTraceWritesBounded } from '../trace/runtime/pending-writes.js';
|
|
12
12
|
import { createSystemHandle } from './system-channel.js';
|
|
13
13
|
const contextConnections = new Map();
|
|
14
14
|
export async function beginTestIsolation(instance) {
|
|
@@ -34,18 +34,6 @@ export async function beginTestIsolation(instance) {
|
|
|
34
34
|
instance.isolation.markBegin();
|
|
35
35
|
return { id: contextId, db: dbConnections };
|
|
36
36
|
}
|
|
37
|
-
const TRACE_SETTLE_TIMEOUT_MS = 5000;
|
|
38
|
-
/** Waits for in-flight trace writes, which go through the test connection, for at most the timeout. */
|
|
39
|
-
async function settleTraceWritesBounded() {
|
|
40
|
-
let timer;
|
|
41
|
-
const timeout = new Promise(resolve => { timer = setTimeout(resolve, TRACE_SETTLE_TIMEOUT_MS); });
|
|
42
|
-
try {
|
|
43
|
-
await Promise.race([settleTraceWrites(), timeout]);
|
|
44
|
-
}
|
|
45
|
-
finally {
|
|
46
|
-
clearTimeout(timer);
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
37
|
export async function endTestIsolation(instance, ctx) {
|
|
50
38
|
await settleTraceWritesBounded();
|
|
51
39
|
instance.pool.clearOverrides();
|
package/dist/test/plugin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/test/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAC/B,OAAO,EAAE,OAAO,EAA2B,MAAM,oCAAoC,CAAA;AACrF,OAAO,EAAE,GAAG,EAAE,MAAM,wBAAwB,CAAA;AAE5C,OAAO,EAAE,eAAe,EAAqB,MAAM,YAAY,CAAA;AAC/D,OAAO,EAAE,iBAAiB,IAAI,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAE1D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,oDAAoD,CAAA;AAE3F,OAAO,EAAE,gCAAgC,EAAE,MAAM,iBAAiB,CAAA;AAClE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/test/plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vitest.d.ts","sourceRoot":"","sources":["../../src/test/vitest.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,qBAAqB,CAAA;AAC7C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"vitest.d.ts","sourceRoot":"","sources":["../../src/test/vitest.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,qBAAqB,CAAA;AAC7C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAInD,OAAO,EAA0H,KAAK,WAAW,EAAE,MAAM,aAAa,CAAA;AAEtK,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,uBAAuB,EAAE,MAAM,aAAa,CAAA;AAO5E,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI,GAAG,IAAI,CAKxF;AAED,wBAAgB,kBAAkB,CAAC,gBAAgB,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,CAwBnF;AAED,wBAAgB,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,EAAE,CAiC3C;AAED,wBAAgB,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,EAAE,CAyC5C;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE;IAAE,OAAO,EAAE,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,GAAG,IAAI,CAElH;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC,CAiB3D;AAED;;;;;;GAMG;AACH,qBAAa,yBAA0B,SAAQ,KAAK;IAClD,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC,CAAA;gBAE1D,QAAQ,EAAE,aAAa,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC;CAa1E;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAaxE;AAMD,wBAAgB,kBAAkB,IAAI,OAAO,CAE5C;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,IAAI,QAAQ,CAS1C;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CACvB;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;AAC7D,wBAAgB,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA"}
|
package/dist/test/vitest.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { beforeAll, afterAll, beforeEach, afterEach } from 'vitest';
|
|
2
2
|
import { createManifold } from '../core/pipework.js';
|
|
3
3
|
import { setupTestDatabases, teardownTestDatabases, getTestDatabase } from './setup.js';
|
|
4
|
+
import { settleTraceWritesBounded, TEARDOWN_HOOK_TIMEOUT_MS } from '../trace/runtime/pending-writes.js';
|
|
4
5
|
import { beginTestIsolation, endTestIsolation, createTestContext, createSetupConnection, propagateTestSessionVars, runInContext } from './plugin.js';
|
|
5
6
|
export {} from './plugin.js';
|
|
6
7
|
let _testContext = null;
|
|
@@ -20,7 +21,7 @@ export function setupPipeworkTests(configOrInstance) {
|
|
|
20
21
|
});
|
|
21
22
|
afterAll(async () => {
|
|
22
23
|
await teardownAfterAll(instance);
|
|
23
|
-
});
|
|
24
|
+
}, TEARDOWN_HOOK_TIMEOUT_MS);
|
|
24
25
|
beforeEach(async () => {
|
|
25
26
|
_testContext = await beginTestIsolation(instance);
|
|
26
27
|
});
|
|
@@ -29,7 +30,7 @@ export function setupPipeworkTests(configOrInstance) {
|
|
|
29
30
|
await endTestIsolation(instance, _testContext);
|
|
30
31
|
_testContext = null;
|
|
31
32
|
}
|
|
32
|
-
});
|
|
33
|
+
}, TEARDOWN_HOOK_TIMEOUT_MS);
|
|
33
34
|
return instance;
|
|
34
35
|
}
|
|
35
36
|
export function useTestDb(name) {
|
|
@@ -162,6 +163,7 @@ export class SetupConnectionCloseError extends Error {
|
|
|
162
163
|
* failure is raised at the end so the file fails by name (#395).
|
|
163
164
|
*/
|
|
164
165
|
export async function teardownAfterAll(instance) {
|
|
166
|
+
await settleTraceWritesBounded();
|
|
165
167
|
let closeFailure;
|
|
166
168
|
try {
|
|
167
169
|
await closeSetupConnections();
|
package/dist/test/vitest.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vitest.js","sourceRoot":"","sources":["../../src/test/vitest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAInE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AACvF,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,YAAY,EAAoB,MAAM,aAAa,CAAA;AAEtK,OAAO,EAAkD,MAAM,aAAa,CAAA;AAE5E,IAAI,YAAY,GAAuB,IAAI,CAAA;AAC3C,IAAI,SAAS,GAAoB,IAAI,CAAA;AAErC,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAuD,CAAA;AAExF,MAAM,UAAU,aAAa,CAAC,QAAkB,EAAE,WAAgC;IAChF,SAAS,GAAG,QAAQ,CAAA;IACpB,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC9B,YAAY,GAAG,WAAW,CAAA;IAC5B,CAAC;AACH,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,gBAAsC;IACvE,MAAM,QAAQ,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAA;IACnG,SAAS,GAAG,QAAQ,CAAA;IAEpB,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAA;IACpC,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,KAAK,IAAI,EAAE;QAClB,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAA;IAClC,CAAC,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"vitest.js","sourceRoot":"","sources":["../../src/test/vitest.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,4 +2,14 @@
|
|
|
2
2
|
export declare function trackTraceWrite(write: Promise<void>): Promise<void>;
|
|
3
3
|
/** Resolves once no trace write is in flight, including writes started by earlier ones. */
|
|
4
4
|
export declare function settleTraceWrites(): Promise<void>;
|
|
5
|
+
/** How many trace writes are in flight now. */
|
|
6
|
+
export declare function pendingTraceWriteCount(): number;
|
|
7
|
+
export declare const TRACE_SETTLE_TIMEOUT_MS = 30000;
|
|
8
|
+
/** The harness's teardown hooks' own timeout: room for a full settle plus the teardown itself. */
|
|
9
|
+
export declare const TEARDOWN_HOOK_TIMEOUT_MS: number;
|
|
10
|
+
/**
|
|
11
|
+
* Waits for in-flight trace writes for at most `timeoutMs`. On expiry it warns once with
|
|
12
|
+
* the number still in flight and returns, so teardown proceeds anyway.
|
|
13
|
+
*/
|
|
14
|
+
export declare function settleTraceWritesBounded(timeoutMs?: number): Promise<void>;
|
|
5
15
|
//# sourceMappingURL=pending-writes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pending-writes.d.ts","sourceRoot":"","sources":["../../../src/trace/runtime/pending-writes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pending-writes.d.ts","sourceRoot":"","sources":["../../../src/trace/runtime/pending-writes.ts"],"names":[],"mappings":"AAOA,2EAA2E;AAC3E,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAKnE;AAED,2FAA2F;AAC3F,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAEvD;AAED,+CAA+C;AAC/C,wBAAgB,sBAAsB,IAAI,MAAM,CAE/C;AAED,eAAO,MAAM,uBAAuB,QAAS,CAAA;AAE7C,kGAAkG;AAClG,eAAO,MAAM,wBAAwB,QAAmC,CAAA;AAExE;;;GAGG;AACH,wBAAsB,wBAAwB,CAAC,SAAS,GAAE,MAAgC,GAAG,OAAO,CAAC,IAAI,CAAC,CAezG"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// Trace writes are fire-and-forget; this tracks the ones in flight so the test
|
|
2
2
|
// harness can wait for them before it ends the connection they write through.
|
|
3
|
+
import { getBaseLogger } from '../../core/logging/index.js';
|
|
3
4
|
const pending = new Set();
|
|
4
5
|
/** Records `write` as in flight until it settles; returns it unchanged. */
|
|
5
6
|
export function trackTraceWrite(write) {
|
|
@@ -13,4 +14,29 @@ export async function settleTraceWrites() {
|
|
|
13
14
|
while (pending.size > 0)
|
|
14
15
|
await Promise.allSettled([...pending]);
|
|
15
16
|
}
|
|
17
|
+
/** How many trace writes are in flight now. */
|
|
18
|
+
export function pendingTraceWriteCount() {
|
|
19
|
+
return pending.size;
|
|
20
|
+
}
|
|
21
|
+
export const TRACE_SETTLE_TIMEOUT_MS = 30_000;
|
|
22
|
+
/** The harness's teardown hooks' own timeout: room for a full settle plus the teardown itself. */
|
|
23
|
+
export const TEARDOWN_HOOK_TIMEOUT_MS = TRACE_SETTLE_TIMEOUT_MS + 30_000;
|
|
24
|
+
/**
|
|
25
|
+
* Waits for in-flight trace writes for at most `timeoutMs`. On expiry it warns once with
|
|
26
|
+
* the number still in flight and returns, so teardown proceeds anyway.
|
|
27
|
+
*/
|
|
28
|
+
export async function settleTraceWritesBounded(timeoutMs = TRACE_SETTLE_TIMEOUT_MS) {
|
|
29
|
+
let timer;
|
|
30
|
+
const expired = Symbol('expired');
|
|
31
|
+
const timeout = new Promise(resolve => { timer = setTimeout(() => resolve(expired), timeoutMs); });
|
|
32
|
+
try {
|
|
33
|
+
const outcome = await Promise.race([settleTraceWrites(), timeout]);
|
|
34
|
+
if (outcome === expired) {
|
|
35
|
+
getBaseLogger().warn({ inFlight: pendingTraceWriteCount(), timeoutMs }, `${pendingTraceWriteCount()} trace write(s) still in flight after ${timeoutMs} ms; test teardown proceeds anyway`);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
finally {
|
|
39
|
+
clearTimeout(timer);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
16
42
|
//# sourceMappingURL=pending-writes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pending-writes.js","sourceRoot":"","sources":["../../../src/trace/runtime/pending-writes.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,8EAA8E;AAE9E,MAAM,OAAO,GAAG,IAAI,GAAG,EAAiB,CAAA;AAExC,2EAA2E;AAC3E,MAAM,UAAU,eAAe,CAAC,KAAoB;IAClD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IAClB,MAAM,MAAM,GAAG,GAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA,CAAC,CAAC,CAAA;IACpD,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC1B,OAAO,KAAK,CAAA;AACd,CAAC;AAED,2FAA2F;AAC3F,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACrC,OAAO,OAAO,CAAC,IAAI,GAAG,CAAC;QAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAA;AACjE,CAAC"}
|
|
1
|
+
{"version":3,"file":"pending-writes.js","sourceRoot":"","sources":["../../../src/trace/runtime/pending-writes.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,8EAA8E;AAE9E,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAE3D,MAAM,OAAO,GAAG,IAAI,GAAG,EAAiB,CAAA;AAExC,2EAA2E;AAC3E,MAAM,UAAU,eAAe,CAAC,KAAoB;IAClD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IAClB,MAAM,MAAM,GAAG,GAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA,CAAC,CAAC,CAAA;IACpD,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC1B,OAAO,KAAK,CAAA;AACd,CAAC;AAED,2FAA2F;AAC3F,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACrC,OAAO,OAAO,CAAC,IAAI,GAAG,CAAC;QAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAA;AACjE,CAAC;AAED,+CAA+C;AAC/C,MAAM,UAAU,sBAAsB;IACpC,OAAO,OAAO,CAAC,IAAI,CAAA;AACrB,CAAC;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAA;AAE7C,kGAAkG;AAClG,MAAM,CAAC,MAAM,wBAAwB,GAAG,uBAAuB,GAAG,MAAM,CAAA;AAExE;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,YAAoB,uBAAuB;IACxF,IAAI,KAAiC,CAAA;IACrC,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,CAAA;IACjC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAiB,OAAO,CAAC,EAAE,GAAG,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAA,CAAC,CAAC,CAAC,CAAA;IACjH,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,iBAAiB,EAAE,EAAE,OAAO,CAAC,CAAC,CAAA;QAClE,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;YACxB,aAAa,EAAE,CAAC,IAAI,CAClB,EAAE,QAAQ,EAAE,sBAAsB,EAAE,EAAE,SAAS,EAAE,EACjD,GAAG,sBAAsB,EAAE,yCAAyC,SAAS,oCAAoC,CAClH,CAAA;QACH,CAAC;IACH,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,KAAK,CAAC,CAAA;IACrB,CAAC;AACH,CAAC"}
|
|
@@ -19,7 +19,7 @@ export declare const traceFields: {
|
|
|
19
19
|
nullable: true;
|
|
20
20
|
}>;
|
|
21
21
|
entryKind: import("../../data/domain/types.js").FieldDescriptor<"test" | "http" | "job" | "cron", {}> & import("../../data/domain/field.js").FieldModifiers<"test" | "http" | "job" | "cron", {}>;
|
|
22
|
-
status: import("../../data/domain/types.js").FieldDescriptor<"error" | "
|
|
22
|
+
status: import("../../data/domain/types.js").FieldDescriptor<"error" | "expired" | "open" | "closed" | "truncated", {}> & import("../../data/domain/field.js").FieldModifiers<"error" | "expired" | "open" | "closed" | "truncated", {}>;
|
|
23
23
|
tenantId: import("../../data/domain/types.js").FieldDescriptor<string | null, {
|
|
24
24
|
tenant: true;
|
|
25
25
|
} & {
|
|
@@ -19,7 +19,7 @@ export declare const traceRetained: import("../../data/domain/types.js").Defined
|
|
|
19
19
|
nullable: true;
|
|
20
20
|
}>;
|
|
21
21
|
entryKind: import("../../data/domain/types.js").FieldDescriptor<"test" | "http" | "job" | "cron", {}> & import("../../data/domain/field.js").FieldModifiers<"test" | "http" | "job" | "cron", {}>;
|
|
22
|
-
status: import("../../data/domain/types.js").FieldDescriptor<"error" | "
|
|
22
|
+
status: import("../../data/domain/types.js").FieldDescriptor<"error" | "expired" | "open" | "closed" | "truncated", {}> & import("../../data/domain/field.js").FieldModifiers<"error" | "expired" | "open" | "closed" | "truncated", {}>;
|
|
23
23
|
tenantId: import("../../data/domain/types.js").FieldDescriptor<string | null, {
|
|
24
24
|
tenant: true;
|
|
25
25
|
} & {
|
|
@@ -19,7 +19,7 @@ export declare const trace: import("../../data/domain/types.js").DefinedTable<{
|
|
|
19
19
|
nullable: true;
|
|
20
20
|
}>;
|
|
21
21
|
entryKind: import("../../data/domain/types.js").FieldDescriptor<"test" | "http" | "job" | "cron", {}> & import("../../data/domain/field.js").FieldModifiers<"test" | "http" | "job" | "cron", {}>;
|
|
22
|
-
status: import("../../data/domain/types.js").FieldDescriptor<"error" | "
|
|
22
|
+
status: import("../../data/domain/types.js").FieldDescriptor<"error" | "expired" | "open" | "closed" | "truncated", {}> & import("../../data/domain/field.js").FieldModifiers<"error" | "expired" | "open" | "closed" | "truncated", {}>;
|
|
23
23
|
tenantId: import("../../data/domain/types.js").FieldDescriptor<string | null, {
|
|
24
24
|
tenant: true;
|
|
25
25
|
} & {
|