@aeolus-fleet/core 0.40.0 → 0.42.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/README.md +5 -5
- package/dist/adapters/crypto/account-token-signatures.js +1 -1
- package/dist/adapters/crypto/account-token-signatures.js.map +1 -1
- package/dist/adapters/http/plugin-calls.d.ts +14 -0
- package/dist/adapters/http/plugin-calls.js +46 -0
- package/dist/adapters/http/plugin-calls.js.map +1 -0
- package/dist/adapters/http/plugin-targets.d.ts +8 -0
- package/dist/adapters/http/plugin-targets.js +27 -0
- package/dist/adapters/http/plugin-targets.js.map +1 -0
- package/dist/adapters/prisma/delivery-notices.d.ts +2 -2
- package/dist/adapters/prisma/delivery-notices.js +2 -2
- package/dist/adapters/prisma/event-log.d.ts +2 -1
- package/dist/adapters/prisma/event-log.js +7 -2
- package/dist/adapters/prisma/event-log.js.map +1 -1
- package/dist/adapters/prisma/fleet-event-wakeups.d.ts +1 -7
- package/dist/adapters/prisma/fleet-event-wakeups.js +0 -19
- package/dist/adapters/prisma/fleet-event-wakeups.js.map +1 -1
- package/dist/adapters/prisma/fleet-journeys.d.ts +49 -0
- package/dist/adapters/prisma/fleet-journeys.js +112 -0
- package/dist/adapters/prisma/fleet-journeys.js.map +1 -0
- package/dist/adapters/prisma/generated/browser.d.ts +17 -1
- package/dist/adapters/prisma/generated/client.d.ts +19 -3
- package/dist/adapters/prisma/generated/client.js +2 -2
- package/dist/adapters/prisma/generated/commonInputTypes.d.ts +236 -214
- package/dist/adapters/prisma/generated/enums.d.ts +1 -0
- package/dist/adapters/prisma/generated/enums.js +2 -1
- package/dist/adapters/prisma/generated/enums.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/class.d.ts +40 -7
- package/dist/adapters/prisma/generated/internal/class.js +4 -4
- package/dist/adapters/prisma/generated/internal/class.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.d.ts +266 -16
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js +26 -4
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.d.ts +30 -5
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js +26 -4
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js.map +1 -1
- package/dist/adapters/prisma/generated/models/Delivery.d.ts +146 -9
- package/dist/adapters/prisma/generated/models/Fleet.d.ts +513 -29
- package/dist/adapters/prisma/generated/models/FleetJourney.d.ts +1212 -0
- package/dist/adapters/prisma/generated/models/FleetJourney.js +2 -0
- package/dist/adapters/prisma/generated/models/FleetJourney.js.map +1 -0
- package/dist/adapters/prisma/generated/models/InstallationJourneyChange.d.ts +982 -0
- package/dist/adapters/prisma/generated/models/InstallationJourneyChange.js +2 -0
- package/dist/adapters/prisma/generated/models/InstallationJourneyChange.js.map +1 -0
- package/dist/adapters/prisma/generated/models/InstallationJourneyClock.d.ts +964 -0
- package/dist/adapters/prisma/generated/models/InstallationJourneyClock.js +2 -0
- package/dist/adapters/prisma/generated/models/InstallationJourneyClock.js.map +1 -0
- package/dist/adapters/prisma/generated/models.d.ts +3 -0
- package/dist/adapters/prisma/installation.js +10 -3
- package/dist/adapters/prisma/installation.js.map +1 -1
- package/dist/adapters/prisma/journey-source-facts.d.ts +7 -0
- package/dist/adapters/prisma/journey-source-facts.js +76 -0
- package/dist/adapters/prisma/journey-source-facts.js.map +1 -0
- package/dist/adapters/prisma/receiver-wakeups.d.ts +11 -17
- package/dist/adapters/prisma/receiver-wakeups.js +0 -60
- package/dist/adapters/prisma/receiver-wakeups.js.map +1 -1
- package/dist/adapters/prisma/registry.js +5 -3
- package/dist/adapters/prisma/registry.js.map +1 -1
- package/dist/adapters/prisma/unit-of-work.d.ts +7 -4
- package/dist/adapters/prisma/unit-of-work.js +13 -10
- package/dist/adapters/prisma/unit-of-work.js.map +1 -1
- package/dist/adapters/telemetry/calls.d.ts +0 -8
- package/dist/adapters/telemetry/calls.js +3 -39
- package/dist/adapters/telemetry/calls.js.map +1 -1
- package/dist/adapters/trpc/console.d.ts +5 -1
- package/dist/adapters/trpc/context.d.ts +4 -0
- package/dist/adapters/trpc/fleet.d.ts +41 -33
- package/dist/adapters/trpc/fleet.js +20 -5
- package/dist/adapters/trpc/fleet.js.map +1 -1
- package/dist/adapters/trpc/installation.d.ts +132 -0
- package/dist/adapters/trpc/installation.js +34 -1
- package/dist/adapters/trpc/installation.js.map +1 -1
- package/dist/adapters/trpc/router.d.ts +185 -46
- package/dist/adapters/trpc/ship-contract.js +1 -0
- package/dist/adapters/trpc/ship-contract.js.map +1 -1
- package/dist/adapters/trpc/ship-protocol.js +1 -1
- package/dist/adapters/trpc/ship-protocol.js.map +1 -1
- package/dist/adapters/trpc/ship.d.ts +16 -20
- package/dist/adapters/trpc/ship.js +11 -14
- package/dist/adapters/trpc/ship.js.map +1 -1
- package/dist/adapters/trpc/trpc.d.ts +9 -0
- package/dist/adapters/trpc/trpc.js +13 -3
- package/dist/adapters/trpc/trpc.js.map +1 -1
- package/dist/app.d.ts +3 -3
- package/dist/app.js +10 -12
- package/dist/app.js.map +1 -1
- package/dist/config.d.ts +2 -0
- package/dist/config.js +11 -0
- package/dist/config.js.map +1 -1
- package/dist/domain/identity/authenticate-installation.d.ts +1 -1
- package/dist/domain/identity/authenticate-installation.js +2 -2
- package/dist/domain/identity/authenticate-installation.js.map +1 -1
- package/dist/domain/identity/notice.js +1 -0
- package/dist/domain/identity/notice.js.map +1 -1
- package/dist/domain/messaging/check-inbox.d.ts +6 -23
- package/dist/domain/messaging/check-inbox.js +14 -59
- package/dist/domain/messaging/check-inbox.js.map +1 -1
- package/dist/domain/messaging/journey-message.d.ts +18 -0
- package/dist/domain/messaging/journey-message.js +10 -0
- package/dist/domain/messaging/journey-message.js.map +1 -0
- package/dist/domain/messaging/message.d.ts +1 -1
- package/dist/domain/messaging/message.js +2 -2
- package/dist/domain/messaging/message.js.map +1 -1
- package/dist/domain/messaging/ports.d.ts +1 -16
- package/dist/domain/messaging/public.d.ts +1 -0
- package/dist/domain/messaging/public.js +1 -0
- package/dist/domain/messaging/public.js.map +1 -1
- package/dist/domain/messaging/push-receive-deliveries.d.ts +4 -6
- package/dist/domain/messaging/push-receive-deliveries.js +5 -7
- package/dist/domain/messaging/push-receive-deliveries.js.map +1 -1
- package/dist/domain/messaging/receive-deliveries.d.ts +4 -34
- package/dist/domain/messaging/receive-deliveries.js +4 -46
- package/dist/domain/messaging/receive-deliveries.js.map +1 -1
- package/dist/domain/messaging/receive-reply.d.ts +5 -8
- package/dist/domain/messaging/receive-reply.js +10 -9
- package/dist/domain/messaging/receive-reply.js.map +1 -1
- package/dist/domain/registry/call-plugin.d.ts +26 -0
- package/dist/domain/registry/call-plugin.js +46 -0
- package/dist/domain/registry/call-plugin.js.map +1 -0
- package/dist/domain/registry/check-reach.d.ts +1 -1
- package/dist/domain/registry/check-reach.js +2 -2
- package/dist/domain/registry/check-reach.js.map +1 -1
- package/dist/domain/registry/expectations.js +1 -0
- package/dist/domain/registry/expectations.js.map +1 -1
- package/dist/domain/registry/installation-fleet.d.ts +2 -1
- package/dist/domain/registry/installation-fleet.js.map +1 -1
- package/dist/domain/registry/network-settings.d.ts +5 -2
- package/dist/domain/registry/network-settings.js +2 -2
- package/dist/domain/registry/network-settings.js.map +1 -1
- package/dist/domain/registry/plugin-calls.d.ts +11 -0
- package/dist/domain/registry/plugin-calls.js +2 -0
- package/dist/domain/registry/plugin-calls.js.map +1 -0
- package/dist/domain/registry/ports.d.ts +4 -3
- package/dist/domain/registry/read-installation-journeys.d.ts +90 -0
- package/dist/domain/registry/read-installation-journeys.js +20 -0
- package/dist/domain/registry/read-installation-journeys.js.map +1 -0
- package/dist/domain/registry/read-reach.js +1 -1
- package/dist/domain/registry/read-reach.js.map +1 -1
- package/dist/domain/registry/ship-order.js +1 -1
- package/dist/domain/registry/ship-order.js.map +1 -1
- package/dist/domain/registry/verified-facts.js +1 -0
- package/dist/domain/registry/verified-facts.js.map +1 -1
- package/dist/domain/shared/caller.d.ts +4 -0
- package/dist/domain/shared/caller.js +5 -0
- package/dist/domain/shared/caller.js.map +1 -1
- package/dist/domain/shared/errors.d.ts +1 -1
- package/dist/domain/shared/errors.js.map +1 -1
- package/dist/domain/shared/events.d.ts +0 -13
- package/dist/domain/shared/expire-journey-activity.d.ts +18 -0
- package/dist/domain/shared/expire-journey-activity.js +17 -0
- package/dist/domain/shared/expire-journey-activity.js.map +1 -0
- package/dist/domain/shared/fleet-journey.d.ts +35 -0
- package/dist/domain/shared/fleet-journey.js +83 -0
- package/dist/domain/shared/fleet-journey.js.map +1 -0
- package/dist/domain/shared/follow-fleet.d.ts +9 -15
- package/dist/domain/shared/follow-fleet.js +16 -55
- package/dist/domain/shared/follow-fleet.js.map +1 -1
- package/dist/domain/shared/read-fleet-limits.d.ts +2 -2
- package/dist/domain/shared/read-fleet-limits.js +1 -1
- package/dist/domain/shared/record-fleet-journey.d.ts +17 -0
- package/dist/domain/shared/record-fleet-journey.js +8 -0
- package/dist/domain/shared/record-fleet-journey.js.map +1 -0
- package/dist/maintenance-pass.d.ts +1 -1
- package/dist/maintenance-pass.js +1 -0
- package/dist/maintenance-pass.js.map +1 -1
- package/dist/start.d.ts +1 -1
- package/dist/start.js +2 -1
- package/dist/start.js.map +1 -1
- package/dist/testing/container-sweeper.d.ts +47 -0
- package/dist/testing/container-sweeper.js +101 -1
- package/dist/testing/container-sweeper.js.map +1 -1
- package/dist/testing/postgres-container.js +2 -2
- package/dist/testing/postgres-container.js.map +1 -1
- package/dist/testing/postgres-global-setup.d.ts +1 -1
- package/dist/testing/postgres-global-setup.js +3 -2
- package/dist/testing/postgres-global-setup.js.map +1 -1
- package/dist/wiring.d.ts +12 -10
- package/dist/wiring.js +19 -18
- package/dist/wiring.js.map +1 -1
- package/package.json +2 -2
- package/src/adapters/prisma/migrations/20261115180000_trierarch_kind/migration.sql +2 -0
- package/src/adapters/prisma/migrations/20261115180100_trierarch_kind_backfill/migration.sql +38 -0
- package/src/adapters/prisma/migrations/20261117010000_fleet_journeys/migration.sql +37 -0
- package/src/adapters/prisma/schema.prisma +55 -19
- package/dist/domain/messaging/inbox-wait.d.ts +0 -8
- package/dist/domain/messaging/inbox-wait.js +0 -19
- package/dist/domain/messaging/inbox-wait.js.map +0 -1
|
@@ -1,33 +1,24 @@
|
|
|
1
|
-
import { FOLLOW_MAX_DEFAULT, FOLLOW_MAX_LIMIT
|
|
1
|
+
import { FOLLOW_MAX_DEFAULT, FOLLOW_MAX_LIMIT } from '@aeolus-fleet/common';
|
|
2
2
|
import { refuse } from './errors.js';
|
|
3
3
|
import { eventsRead } from './events-read.js';
|
|
4
4
|
import { ok } from './result.js';
|
|
5
|
-
const SECOND_MS = 1_000;
|
|
6
5
|
function checkedMax(max) {
|
|
7
6
|
const value = max ?? FOLLOW_MAX_DEFAULT;
|
|
8
7
|
return Number.isInteger(value) && value >= 1 && value <= FOLLOW_MAX_LIMIT
|
|
9
8
|
? ok(value)
|
|
10
9
|
: refuse('INVALID_FOLLOW_MAX', `max is 1 to ${String(FOLLOW_MAX_LIMIT)} events`);
|
|
11
10
|
}
|
|
12
|
-
function checkedWaitMs(waitSeconds) {
|
|
13
|
-
const value = waitSeconds ?? 0;
|
|
14
|
-
return Number.isInteger(value) && value >= 0 && value <= FOLLOW_WAIT_MAX_SECONDS
|
|
15
|
-
? ok(value * SECOND_MS)
|
|
16
|
-
: refuse('INVALID_FOLLOW_WAIT', `waitSeconds is 0 to ${String(FOLLOW_WAIT_MAX_SECONDS)}`);
|
|
17
|
-
}
|
|
18
11
|
/**
|
|
19
12
|
* Use case: a client with fleet:read follows the fleet's committed events
|
|
20
13
|
* (`fleet.follow`) by the same commit-ordered numbers the console follows by,
|
|
21
14
|
* so it misses none across reconnects: it passes the `lastSeq` it was answered
|
|
22
|
-
* as `afterSeq` next. Without a position it learns where to start from.
|
|
23
|
-
*
|
|
24
|
-
*
|
|
25
|
-
*
|
|
26
|
-
*
|
|
27
|
-
*
|
|
28
|
-
*
|
|
29
|
-
* 0034); one it does not read moves the position on and does not end a wait. The
|
|
30
|
-
* caller's scope is checked before this runs.
|
|
15
|
+
* as `afterSeq` next. Without a position it learns where to start from. It
|
|
16
|
+
* answers at once, with none when nothing came: no call waits (decision 0072);
|
|
17
|
+
* the live stream `fleet.events` pushes. A position past the fleet's last
|
|
18
|
+
* event, as after a restore, is answered the fleet's last position, with no
|
|
19
|
+
* events, so the follower goes on from there. It answers only the events the
|
|
20
|
+
* caller reads (decision 0034); one it does not read moves the position on.
|
|
21
|
+
* The caller's scope is checked before this runs.
|
|
31
22
|
*/
|
|
32
23
|
export function createFollowFleet(deps) {
|
|
33
24
|
return async (caller, input) => {
|
|
@@ -35,50 +26,20 @@ export function createFollowFleet(deps) {
|
|
|
35
26
|
if (!max.isOk) {
|
|
36
27
|
return max;
|
|
37
28
|
}
|
|
38
|
-
const waitMs = checkedWaitMs(input.waitSeconds);
|
|
39
|
-
if (!waitMs.isOk) {
|
|
40
|
-
return waitMs;
|
|
41
|
-
}
|
|
42
29
|
const { fleetId } = caller;
|
|
43
30
|
const { afterSeq } = input;
|
|
44
31
|
if (afterSeq === undefined) {
|
|
45
32
|
return ok({ events: [], lastSeq: await deps.feed.lastSeq(fleetId) });
|
|
46
33
|
}
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
for (;;) {
|
|
53
|
-
const gone = await deps.feed.after(fleetId, { seq: position, limit: max.value });
|
|
54
|
-
if (gone.length === 0 && watch === undefined) {
|
|
55
|
-
// A position past the fleet's last event, as a follower holds after a restore set the fleet back, would wait for numbers already passed.
|
|
56
|
-
const last = await deps.feed.lastSeq(fleetId);
|
|
57
|
-
if (position > last) {
|
|
58
|
-
return ok({ events: [], lastSeq: last });
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
position = gone.at(-1)?.seq ?? position;
|
|
62
|
-
const events = await eventsRead(deps, { fleetId, reach, events: gone });
|
|
63
|
-
const remainingMs = until - deps.clock.now().getTime();
|
|
64
|
-
if (events.length > 0 || remainingMs <= 0) {
|
|
65
|
-
return ok({ events, lastSeq: position });
|
|
66
|
-
}
|
|
67
|
-
if (gone.length > 0) {
|
|
68
|
-
continue;
|
|
69
|
-
}
|
|
70
|
-
if (watch === undefined) {
|
|
71
|
-
watch = deps.wakeups.watch(fleetId);
|
|
72
|
-
continue;
|
|
73
|
-
}
|
|
74
|
-
if ((await watch.next(remainingMs)) === 'timedOut') {
|
|
75
|
-
return ok({ events: [], lastSeq: position });
|
|
76
|
-
}
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
finally {
|
|
80
|
-
watch?.stop();
|
|
34
|
+
const gone = await deps.feed.after(fleetId, { seq: afterSeq, limit: max.value });
|
|
35
|
+
if (gone.length === 0) {
|
|
36
|
+
// A position past the fleet's last event, as a follower holds after a restore set the fleet back, goes on from the fleet's last.
|
|
37
|
+
const last = await deps.feed.lastSeq(fleetId);
|
|
38
|
+
return ok({ events: [], lastSeq: Math.min(afterSeq, last) });
|
|
81
39
|
}
|
|
40
|
+
const reach = await deps.readReach(caller);
|
|
41
|
+
const events = await eventsRead(deps, { fleetId, reach, events: gone });
|
|
42
|
+
return ok({ events, lastSeq: gone.at(-1)?.seq ?? afterSeq });
|
|
82
43
|
};
|
|
83
44
|
}
|
|
84
45
|
//# sourceMappingURL=follow-fleet.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"follow-fleet.js","sourceRoot":"","sources":["../../../src/domain/shared/follow-fleet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"follow-fleet.js","sourceRoot":"","sources":["../../../src/domain/shared/follow-fleet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAI5E,OAAO,EAAE,MAAM,EAAoB,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,OAAO,EAAE,EAAE,EAAe,MAAM,aAAa,CAAC;AAgB9C,SAAS,UAAU,CAAC,GAAuB;IACzC,MAAM,KAAK,GAAG,GAAG,IAAI,kBAAkB,CAAC;IACxC,OAAO,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,IAAI,gBAAgB;QACvE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC;QACX,CAAC,CAAC,MAAM,CAAC,oBAAoB,EAAE,eAAe,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;AACrF,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAIjC;IACC,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;QAC7B,MAAM,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YACd,OAAO,GAAG,CAAC;QACb,CAAC;QACD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;QAC3B,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;QAC3B,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACvE,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;QACjF,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,iIAAiI;YACjI,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC9C,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/D,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QACxE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,QAAQ,EAAE,CAAC,CAAC;IAC/D,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -9,7 +9,7 @@ export interface FleetLimitReads {
|
|
|
9
9
|
dailyMessages: number | null;
|
|
10
10
|
retention: number | null;
|
|
11
11
|
}>;
|
|
12
|
-
/** Its ships that are not retired, argo included. */
|
|
12
|
+
/** Its ships that are not retired, argo included and the viewer excluded. */
|
|
13
13
|
activeShips(fleetId: FleetId): Promise<number>;
|
|
14
14
|
/** The messages it stored on the UTC day that starts at `day`, of any kind and from any sender. */
|
|
15
15
|
messagesOn(fleetId: FleetId, day: Date): Promise<number>;
|
|
@@ -36,7 +36,7 @@ export type ReadFleetLimits = (caller: Caller) => Promise<FleetLimitsRead>;
|
|
|
36
36
|
/**
|
|
37
37
|
* Use case: the caller's fleet's ship and daily message limits, with what
|
|
38
38
|
* each counts by the same measures the limits are enforced by: its ships that
|
|
39
|
-
* are not retired, argo included, and the messages it stored since 00:00 UTC,
|
|
39
|
+
* are not retired, argo included and the viewer excluded, and the messages it stored since 00:00 UTC,
|
|
40
40
|
* which count again from the next 00:00 UTC; and its retention, so every
|
|
41
41
|
* fleet manager sees how long the fleet keeps its finished history and where
|
|
42
42
|
* it begins (the timeline, the thread and Health say so). The
|
|
@@ -2,7 +2,7 @@ import { nextUtcDayStart, utcDayStart } from './utc-day.js';
|
|
|
2
2
|
/**
|
|
3
3
|
* Use case: the caller's fleet's ship and daily message limits, with what
|
|
4
4
|
* each counts by the same measures the limits are enforced by: its ships that
|
|
5
|
-
* are not retired, argo included, and the messages it stored since 00:00 UTC,
|
|
5
|
+
* are not retired, argo included and the viewer excluded, and the messages it stored since 00:00 UTC,
|
|
6
6
|
* which count again from the next 00:00 UTC; and its retention, so every
|
|
7
7
|
* fleet manager sees how long the fleet keeps its finished history and where
|
|
8
8
|
* it begins (the timeline, the thread and Health say so). The
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/** Folds a committed source batch and its watermark atomically with the source transaction. */
|
|
2
|
+
import type { FleetId } from '@aeolus-fleet/common';
|
|
3
|
+
import { type FleetJourney, type JourneyFact } from './fleet-journey.js';
|
|
4
|
+
export interface JourneyRecords {
|
|
5
|
+
read(fleetId: FleetId): Promise<FleetJourney | undefined>;
|
|
6
|
+
save(fleetId: FleetId, journey: FleetJourney): Promise<void>;
|
|
7
|
+
}
|
|
8
|
+
export declare function createRecordFleetJourney(deps: {
|
|
9
|
+
records: JourneyRecords;
|
|
10
|
+
}): (input: {
|
|
11
|
+
fleetId: FleetId;
|
|
12
|
+
createdAt: string;
|
|
13
|
+
coverageFrom: string;
|
|
14
|
+
computedAt: string;
|
|
15
|
+
processedThrough: number;
|
|
16
|
+
facts: readonly JourneyFact[];
|
|
17
|
+
}) => Promise<void>;
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { newFleetJourney, projectFleetJourney } from './fleet-journey.js';
|
|
2
|
+
export function createRecordFleetJourney(deps) {
|
|
3
|
+
return async (input) => {
|
|
4
|
+
const state = await deps.records.read(input.fleetId) ?? newFleetJourney(input);
|
|
5
|
+
await deps.records.save(input.fleetId, projectFleetJourney(state, input));
|
|
6
|
+
};
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=record-fleet-journey.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"record-fleet-journey.js","sourceRoot":"","sources":["../../../src/domain/shared/record-fleet-journey.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAuC,MAAM,oBAAoB,CAAC;AAO/G,MAAM,UAAU,wBAAwB,CAAC,IAAiC;IACxE,OAAO,KAAK,EAAE,KAAiJ,EAAiB,EAAE;QAChL,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,eAAe,CAAC,KAAK,CAAC,CAAC;QAC/E,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,mBAAmB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAC5E,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { type LoggedFailure } from './adapters/prisma/failure-log.js';
|
|
|
3
3
|
import { type RepeatingPass } from './repeating-pass.js';
|
|
4
4
|
import type { ScheduleTimer } from './schedule-timer.js';
|
|
5
5
|
import type { UseCases } from './wiring.js';
|
|
6
|
-
type MaintenanceUseCases = Pick<UseCases, 'tellOverdueDeliveries' | 'closeHealthSnapshots' | 'removeDeletedFleets' | 'pruneHistory' | 'sealStoredPayloads' | 'rotateDataKeys' | 'sendDueSchedules'>;
|
|
6
|
+
type MaintenanceUseCases = Pick<UseCases, 'tellOverdueDeliveries' | 'closeHealthSnapshots' | 'removeDeletedFleets' | 'pruneHistory' | 'expireJourneyActivity' | 'sealStoredPayloads' | 'rotateDataKeys' | 'sendDueSchedules'>;
|
|
7
7
|
/** The app's periodic maintenance, with the same task boundaries in memory and in production. */
|
|
8
8
|
export declare function startMaintenancePass(options: {
|
|
9
9
|
useCases: MaintenanceUseCases;
|
package/dist/maintenance-pass.js
CHANGED
|
@@ -22,6 +22,7 @@ export function startMaintenancePass(options) {
|
|
|
22
22
|
pruneHistory: () => useCases.pruneHistory((fleetId, error) => {
|
|
23
23
|
options.log.warn({ ...failureForLog(error), fleetId }, 'the pruning pass failed for a fleet: pruning it again next hour');
|
|
24
24
|
}),
|
|
25
|
+
expireJourneyActivity: () => useCases.expireJourneyActivity(),
|
|
25
26
|
sealStoredPayloads: () => useCases.sealStoredPayloads((fleetId, error) => {
|
|
26
27
|
options.log.warn({ ...failureForLog(error), fleetId }, 'the sealing pass failed for a fleet: sealing it again next pass');
|
|
27
28
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maintenance-pass.js","sourceRoot":"","sources":["../src/maintenance-pass.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"maintenance-pass.js","sourceRoot":"","sources":["../src/maintenance-pass.ts"],"names":[],"mappings":"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"}
|
package/dist/start.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* `aeolus-core start`: migrates the database, then serves the fleet until
|
|
3
|
-
* SIGINT or SIGTERM. A stop ends
|
|
3
|
+
* SIGINT or SIGTERM. A stop ends the wake streams and closes idle
|
|
4
4
|
* connections at once (see app.ts), then sends the telemetry still buffered.
|
|
5
5
|
* Telemetry starts first, so the server's database client is traced too.
|
|
6
6
|
*/
|
package/dist/start.js
CHANGED
|
@@ -5,7 +5,7 @@ import { createApp } from './app.js';
|
|
|
5
5
|
import { loadConfig, startupWarnings } from './config.js';
|
|
6
6
|
/**
|
|
7
7
|
* `aeolus-core start`: migrates the database, then serves the fleet until
|
|
8
|
-
* SIGINT or SIGTERM. A stop ends
|
|
8
|
+
* SIGINT or SIGTERM. A stop ends the wake streams and closes idle
|
|
9
9
|
* connections at once (see app.ts), then sends the telemetry still buffered.
|
|
10
10
|
* Telemetry starts first, so the server's database client is traced too.
|
|
11
11
|
*/
|
|
@@ -15,6 +15,7 @@ export async function start() {
|
|
|
15
15
|
const telemetry = await startTelemetry(process.env);
|
|
16
16
|
const server = createApp({
|
|
17
17
|
databaseUrl: config.databaseUrl,
|
|
18
|
+
pluginTargets: config.pluginTargets,
|
|
18
19
|
publicUrl: config.publicUrl,
|
|
19
20
|
logger: { level: config.logLevel },
|
|
20
21
|
shouldTrustProxy: config.shouldTrustProxy,
|
package/dist/start.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE1D;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK;IACzB,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACvC,MAAM,eAAe,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,SAAS,CAAC;QACvB,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,QAAQ,EAAE;QAClC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;QAC3C,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;QAC7C,GAAG,CAAC,MAAM,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,oBAAoB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;KACpF,CAAC,CAAC;IACH,KAAK,MAAM,OAAO,IAAI,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;QAC9C,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;IAED,KAAK,MAAM,MAAM,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAU,EAAE,CAAC;QACpD,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;YACxB,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,eAAe,CAAC,CAAC;YAC7C,KAAK,MAAM;iBACR,KAAK,EAAE;iBACP,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC;iBACjC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;AAChE,CAAC"}
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE1D;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK;IACzB,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACvC,MAAM,eAAe,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,SAAS,CAAC;QACvB,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,QAAQ,EAAE;QAClC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;QAC3C,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;QAC7C,GAAG,CAAC,MAAM,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,oBAAoB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;KACpF,CAAC,CAAC;IACH,KAAK,MAAM,OAAO,IAAI,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;QAC9C,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;IAED,KAAK,MAAM,MAAM,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAU,EAAE,CAAC;QACpD,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;YACxB,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,eAAe,CAAC,CAAC;YAC7C,KAAK,MAAM;iBACR,KAAK,EAAE;iBACP,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC;iBACjC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;AAChE,CAAC"}
|
|
@@ -4,6 +4,53 @@
|
|
|
4
4
|
* none behind.
|
|
5
5
|
*/
|
|
6
6
|
export declare const TEST_RUN_LABEL = "aeolus-fleet.test-run";
|
|
7
|
+
/** The label of the pid of the run's process, so the sweep can tell a run that lives from one that ended. */
|
|
8
|
+
export declare const RUN_PID_LABEL = "aeolus-fleet.test-run-pid";
|
|
9
|
+
/** The label of the start of the run's process as the platform tells it: a pid alone can be reused by another process. */
|
|
10
|
+
export declare const RUN_STARTED_LABEL = "aeolus-fleet.test-run-started";
|
|
11
|
+
/** The label every test container carries, its value the repository, so a container of this repository is found whatever run started it. */
|
|
12
|
+
export declare const REPOSITORY_LABEL = "aeolus-fleet.repository";
|
|
13
|
+
/** The process of the run that started a container. */
|
|
14
|
+
export interface RunOwner {
|
|
15
|
+
readonly pid: number;
|
|
16
|
+
readonly startedAt: string;
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* The start of a process as the platform tells it, undefined when the process
|
|
20
|
+
* does not exist or the platform cannot tell (no ps, as on Windows).
|
|
21
|
+
*/
|
|
22
|
+
export declare function processStart(pid: number): string | undefined;
|
|
23
|
+
/**
|
|
24
|
+
* Whether the process of a run lives: true when it exists and started when the
|
|
25
|
+
* label says, false when it is gone or another process has its pid, undefined
|
|
26
|
+
* when that cannot be checked.
|
|
27
|
+
*/
|
|
28
|
+
export declare function isRunAlive(owner: RunOwner): Promise<boolean | undefined>;
|
|
29
|
+
/** The labels of a container the run starts: its repository, the run, and the pid and start of the run's process. */
|
|
30
|
+
export declare function testContainerLabels(run: string): Record<string, string>;
|
|
31
|
+
/** The part of the container runtime the removal of stale containers uses. */
|
|
32
|
+
export interface StaleSweepRuntime {
|
|
33
|
+
listRepositoryContainers(): Promise<{
|
|
34
|
+
id: string;
|
|
35
|
+
createdAt: Date;
|
|
36
|
+
owner?: RunOwner;
|
|
37
|
+
}[]>;
|
|
38
|
+
removeContainer(id: string): Promise<void>;
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* Removes this repository's test containers whose run ended, whichever run
|
|
42
|
+
* started them: a run that was killed or timed out never reached its teardown,
|
|
43
|
+
* and its sweeper may have died too. A container whose run's process lives is
|
|
44
|
+
* kept however old, and one whose run's process is gone is removed. Where
|
|
45
|
+
* liveness cannot be checked (no owner labels, no way to read a process start)
|
|
46
|
+
* the age decides: older than 24 hours is a leak.
|
|
47
|
+
*/
|
|
48
|
+
export declare function removeStaleContainers(runtime: StaleSweepRuntime, { now, isRunAlive: isAlive, }?: {
|
|
49
|
+
now?: Date;
|
|
50
|
+
isRunAlive?: (owner: RunOwner) => Promise<boolean | undefined>;
|
|
51
|
+
}): Promise<void>;
|
|
52
|
+
/** Removes this repository's stale test containers from the container runtime of this machine. */
|
|
53
|
+
export declare function removeStaleTestContainers(): Promise<void>;
|
|
7
54
|
/**
|
|
8
55
|
* Starts the sweeper of a test run: a process of its own that removes the
|
|
9
56
|
* run's containers with their volumes once the run's process ends, however it
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { spawn } from "node:child_process";
|
|
1
|
+
import { execFileSync, spawn } from "node:child_process";
|
|
2
2
|
import { Socket } from "node:net";
|
|
3
3
|
import { fileURLToPath } from "node:url";
|
|
4
4
|
import { getContainerRuntimeClient } from "testcontainers";
|
|
@@ -8,6 +8,106 @@ import { getContainerRuntimeClient } from "testcontainers";
|
|
|
8
8
|
* none behind.
|
|
9
9
|
*/
|
|
10
10
|
export const TEST_RUN_LABEL = "aeolus-fleet.test-run";
|
|
11
|
+
/** The label of the pid of the run's process, so the sweep can tell a run that lives from one that ended. */
|
|
12
|
+
export const RUN_PID_LABEL = "aeolus-fleet.test-run-pid";
|
|
13
|
+
/** The label of the start of the run's process as the platform tells it: a pid alone can be reused by another process. */
|
|
14
|
+
export const RUN_STARTED_LABEL = "aeolus-fleet.test-run-started";
|
|
15
|
+
/** The label every test container carries, its value the repository, so a container of this repository is found whatever run started it. */
|
|
16
|
+
export const REPOSITORY_LABEL = "aeolus-fleet.repository";
|
|
17
|
+
const REPOSITORY = "aeolus-fleet";
|
|
18
|
+
/**
|
|
19
|
+
* The start of a process as the platform tells it, undefined when the process
|
|
20
|
+
* does not exist or the platform cannot tell (no ps, as on Windows).
|
|
21
|
+
*/
|
|
22
|
+
export function processStart(pid) {
|
|
23
|
+
try {
|
|
24
|
+
const started = execFileSync("ps", ["-o", "lstart=", "-p", String(pid)], {
|
|
25
|
+
encoding: "utf8",
|
|
26
|
+
stdio: ["ignore", "pipe", "ignore"],
|
|
27
|
+
}).trim();
|
|
28
|
+
return started === "" ? undefined : started;
|
|
29
|
+
}
|
|
30
|
+
catch {
|
|
31
|
+
return undefined;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
/**
|
|
35
|
+
* Whether the process of a run lives: true when it exists and started when the
|
|
36
|
+
* label says, false when it is gone or another process has its pid, undefined
|
|
37
|
+
* when that cannot be checked.
|
|
38
|
+
*/
|
|
39
|
+
export function isRunAlive(owner) {
|
|
40
|
+
try {
|
|
41
|
+
process.kill(owner.pid, 0);
|
|
42
|
+
}
|
|
43
|
+
catch (error) {
|
|
44
|
+
// EPERM: the process exists, owned by another user.
|
|
45
|
+
if (!(error instanceof Error && "code" in error && error.code === "EPERM")) {
|
|
46
|
+
return Promise.resolve(false);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
const started = processStart(owner.pid);
|
|
50
|
+
return Promise.resolve(started === undefined ? undefined : started === owner.startedAt);
|
|
51
|
+
}
|
|
52
|
+
/** The labels of a container the run starts: its repository, the run, and the pid and start of the run's process. */
|
|
53
|
+
export function testContainerLabels(run) {
|
|
54
|
+
const labels = { [REPOSITORY_LABEL]: REPOSITORY, [TEST_RUN_LABEL]: run };
|
|
55
|
+
const startedAt = processStart(process.pid);
|
|
56
|
+
return startedAt === undefined
|
|
57
|
+
? labels
|
|
58
|
+
: { ...labels, [RUN_PID_LABEL]: String(process.pid), [RUN_STARTED_LABEL]: startedAt };
|
|
59
|
+
}
|
|
60
|
+
/** A test container older than this is a leak where liveness cannot be checked: no run lasts that long. */
|
|
61
|
+
const STALE_AFTER_MS = 24 * 3_600_000;
|
|
62
|
+
/**
|
|
63
|
+
* Removes this repository's test containers whose run ended, whichever run
|
|
64
|
+
* started them: a run that was killed or timed out never reached its teardown,
|
|
65
|
+
* and its sweeper may have died too. A container whose run's process lives is
|
|
66
|
+
* kept however old, and one whose run's process is gone is removed. Where
|
|
67
|
+
* liveness cannot be checked (no owner labels, no way to read a process start)
|
|
68
|
+
* the age decides: older than 24 hours is a leak.
|
|
69
|
+
*/
|
|
70
|
+
export async function removeStaleContainers(runtime, { now = new Date(), isRunAlive: isAlive = isRunAlive, } = {}) {
|
|
71
|
+
const containers = await runtime.listRepositoryContainers();
|
|
72
|
+
const removable = [];
|
|
73
|
+
for (const { id, createdAt, owner } of containers) {
|
|
74
|
+
const isLive = owner === undefined ? undefined : await isAlive(owner);
|
|
75
|
+
const isStale = now.getTime() - createdAt.getTime() > STALE_AFTER_MS;
|
|
76
|
+
if (isLive === false || (isLive === undefined && isStale)) {
|
|
77
|
+
removable.push(id);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
// A container removed meanwhile answers not found: it is gone either way.
|
|
81
|
+
await Promise.allSettled(removable.map((id) => runtime.removeContainer(id)));
|
|
82
|
+
}
|
|
83
|
+
/** Removes this repository's stale test containers from the container runtime of this machine. */
|
|
84
|
+
export async function removeStaleTestContainers() {
|
|
85
|
+
const { dockerode } = (await getContainerRuntimeClient()).container;
|
|
86
|
+
await removeStaleContainers({
|
|
87
|
+
async listRepositoryContainers() {
|
|
88
|
+
const containers = await dockerode.listContainers({
|
|
89
|
+
all: true,
|
|
90
|
+
filters: { label: [`${REPOSITORY_LABEL}=${REPOSITORY}`] },
|
|
91
|
+
});
|
|
92
|
+
// Created is in seconds.
|
|
93
|
+
return containers.map((container) => {
|
|
94
|
+
const labels = container.Labels;
|
|
95
|
+
const pid = Number(labels[RUN_PID_LABEL]);
|
|
96
|
+
const startedAt = labels[RUN_STARTED_LABEL];
|
|
97
|
+
return {
|
|
98
|
+
id: container.Id,
|
|
99
|
+
createdAt: new Date(container.Created * 1000),
|
|
100
|
+
owner: Number.isInteger(pid) && startedAt !== undefined
|
|
101
|
+
? { pid, startedAt }
|
|
102
|
+
: undefined,
|
|
103
|
+
};
|
|
104
|
+
});
|
|
105
|
+
},
|
|
106
|
+
async removeContainer(id) {
|
|
107
|
+
await dockerode.getContainer(id).remove({ force: true, v: true });
|
|
108
|
+
},
|
|
109
|
+
});
|
|
110
|
+
}
|
|
11
111
|
/**
|
|
12
112
|
* Starts the sweeper of a test run: a process of its own that removes the
|
|
13
113
|
* run's containers with their volumes once the run's process ends, however it
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container-sweeper.js","sourceRoot":"","sources":["../../src/testing/container-sweeper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"container-sweeper.js","sourceRoot":"","sources":["../../src/testing/container-sweeper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { PostgreSqlContainer } from '@testcontainers/postgresql';
|
|
2
2
|
import { Wait } from 'testcontainers';
|
|
3
|
-
import {
|
|
3
|
+
import { testContainerLabels } from './container-sweeper.js';
|
|
4
4
|
/**
|
|
5
5
|
* Postgres says it is ready twice: once for the server the image's entrypoint
|
|
6
6
|
* starts to initialise the database, once for the server that stays.
|
|
@@ -20,7 +20,7 @@ const READY_LOG = /database system is ready to accept connections/;
|
|
|
20
20
|
export class TestPostgres extends PostgreSqlContainer {
|
|
21
21
|
constructor(image, run) {
|
|
22
22
|
super(image);
|
|
23
|
-
this.withLabels(
|
|
23
|
+
this.withLabels(testContainerLabels(run));
|
|
24
24
|
this.withCommand(['postgres', '-c', 'fsync=off']);
|
|
25
25
|
this.withWaitStrategy(Wait.forAll([Wait.forLogMessage(READY_LOG, 2), Wait.forListeningPorts()]));
|
|
26
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgres-container.js","sourceRoot":"","sources":["../../src/testing/postgres-container.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAEtC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"postgres-container.js","sourceRoot":"","sources":["../../src/testing/postgres-container.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAEtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D;;;GAGG;AACH,MAAM,SAAS,GAAG,gDAAgD,CAAC;AAEnE;;;;;;;;;;GAUG;AACH,MAAM,OAAO,YAAa,SAAQ,mBAAmB;IACnD,YAAY,KAAa,EAAE,GAAW;QACpC,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1C,IAAI,CAAC,WAAW,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;QAClD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC;IACnG,CAAC;IAED,mFAAmF;IAChE,KAAK,CAAC,sBAAsB;QAC7C,OAAO,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;QACnC,MAAM,KAAK,CAAC,sBAAsB,EAAE,EAAE,CAAC;IACzC,CAAC;CACF"}
|
|
@@ -13,7 +13,7 @@ declare module 'vitest' {
|
|
|
13
13
|
* migrated one is a copy of the template migrated here, before any test runs.
|
|
14
14
|
* Testcontainers reads the reaper image from the environment when it starts
|
|
15
15
|
* the first container; a reaper image set from outside wins. The run's sweeper
|
|
16
|
-
* starts before any container, so a run that never reaches its teardown still
|
|
16
|
+
* starts before any container, and this repository's test containers older than 24 hours, leaks of runs that were killed, are removed first; so a run that never reaches its teardown still
|
|
17
17
|
* leaves none behind.
|
|
18
18
|
*/
|
|
19
19
|
export declare function setup(project: TestProject): Promise<() => Promise<void>>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { randomUUID } from 'node:crypto';
|
|
2
2
|
import { POSTGRES_IMAGE, REAPER_IMAGE } from './container-images.js';
|
|
3
|
-
import { startContainerSweeper } from './container-sweeper.js';
|
|
3
|
+
import { removeStaleTestContainers, startContainerSweeper } from './container-sweeper.js';
|
|
4
4
|
import { TestPostgres } from './postgres-container.js';
|
|
5
5
|
import { createMigratedTemplate } from './migrated-template.js';
|
|
6
6
|
import { stopContainer } from './stop-container.js';
|
|
@@ -10,11 +10,12 @@ import { stopContainer } from './stop-container.js';
|
|
|
10
10
|
* migrated one is a copy of the template migrated here, before any test runs.
|
|
11
11
|
* Testcontainers reads the reaper image from the environment when it starts
|
|
12
12
|
* the first container; a reaper image set from outside wins. The run's sweeper
|
|
13
|
-
* starts before any container, so a run that never reaches its teardown still
|
|
13
|
+
* starts before any container, and this repository's test containers older than 24 hours, leaks of runs that were killed, are removed first; so a run that never reaches its teardown still
|
|
14
14
|
* leaves none behind.
|
|
15
15
|
*/
|
|
16
16
|
export async function setup(project) {
|
|
17
17
|
process.env.RYUK_CONTAINER_IMAGE ??= REAPER_IMAGE;
|
|
18
|
+
await removeStaleTestContainers();
|
|
18
19
|
const run = randomUUID();
|
|
19
20
|
startContainerSweeper(run);
|
|
20
21
|
project.provide('testRun', run);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgres-global-setup.js","sourceRoot":"","sources":["../../src/testing/postgres-global-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAIzC,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"postgres-global-setup.js","sourceRoot":"","sources":["../../src/testing/postgres-global-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAIzC,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAWpD;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,OAAoB;IAC9C,OAAO,CAAC,GAAG,CAAC,oBAAoB,KAAK,YAAY,CAAC;IAClD,MAAM,yBAAyB,EAAE,CAAC;IAClC,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;IACzB,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAC3B,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IAChC,MAAM,SAAS,GAAG,MAAM,IAAI,YAAY,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;IACtE,MAAM,sBAAsB,CAAC,SAAS,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAC3D,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,SAAS,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAE7D,OAAO,KAAK,IAAI,EAAE;QAChB,MAAM,aAAa,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC1E,CAAC,CAAC;AACJ,CAAC"}
|
package/dist/wiring.d.ts
CHANGED
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
import { createReadInstallationJourneys } from './domain/registry/read-installation-journeys.js';
|
|
2
|
+
import { type CallPlugin } from './domain/registry/call-plugin.js';
|
|
3
|
+
import { type PluginDispatchLog } from './adapters/http/plugin-calls.js';
|
|
4
|
+
import type { PluginTarget } from './adapters/http/plugin-targets.js';
|
|
1
5
|
import { type ApproveCommission } from './domain/registry/approve-commission.js';
|
|
2
6
|
import { type WithdrawCommissionApproval } from './domain/registry/withdraw-commission-approval.js';
|
|
3
7
|
import { type IdGenerator } from '@aeolus-fleet/common';
|
|
@@ -48,7 +52,7 @@ import { type WatchWakeups } from './domain/messaging/watch-wakeups.js';
|
|
|
48
52
|
import { type DismissDelivery } from './domain/messaging/dismiss-delivery.js';
|
|
49
53
|
import { type MarkDone } from './domain/messaging/mark-done.js';
|
|
50
54
|
import { type MarkRead } from './domain/messaging/mark-read.js';
|
|
51
|
-
import type {
|
|
55
|
+
import type { WakeStreams } from './domain/messaging/ports.js';
|
|
52
56
|
import { type PushReceiveDeliveries } from './domain/messaging/push-receive-deliveries.js';
|
|
53
57
|
import { type ReceiveDeliveries } from './domain/messaging/receive-deliveries.js';
|
|
54
58
|
import { type ReceiveReply } from './domain/messaging/receive-reply.js';
|
|
@@ -145,7 +149,6 @@ import type { Clock } from './domain/shared/clock.js';
|
|
|
145
149
|
import { type Ping } from './domain/shared/ping.js';
|
|
146
150
|
import { type ReadFleetEvents } from './domain/shared/read-fleet-events.js';
|
|
147
151
|
import { type FollowFleet } from './domain/shared/follow-fleet.js';
|
|
148
|
-
import type { FleetEventWakeups } from './domain/shared/events.js';
|
|
149
152
|
import { type CreateFleet } from './domain/registry/create-fleet.js';
|
|
150
153
|
import { type GetFleetLimits } from './domain/registry/get-fleet-limits.js';
|
|
151
154
|
import { type ReadFleetName } from './domain/registry/read-fleet-name.js';
|
|
@@ -180,6 +183,8 @@ import { type PruneHistory } from './domain/shared/prune-history.js';
|
|
|
180
183
|
import { type ReadShipMessages } from './domain/shared/read-ship-messages.js';
|
|
181
184
|
import { type ReadShipTimeline } from './domain/shared/read-ship-timeline.js';
|
|
182
185
|
export interface UseCases {
|
|
186
|
+
expireJourneyActivity: () => Promise<void>;
|
|
187
|
+
installationJourneys: ReturnType<typeof createReadInstallationJourneys>;
|
|
183
188
|
ping: Ping;
|
|
184
189
|
initialiseFleet: InitialiseFleet;
|
|
185
190
|
listFleets: ListFleets;
|
|
@@ -192,6 +197,7 @@ export interface UseCases {
|
|
|
192
197
|
renameShip: RenameShip;
|
|
193
198
|
setOwner: SetOwner;
|
|
194
199
|
checkManage: CheckManage;
|
|
200
|
+
callPlugin: CallPlugin;
|
|
195
201
|
setVerifiedFacts: SetVerifiedFacts;
|
|
196
202
|
setExpectations: SetExpectations;
|
|
197
203
|
raiseAlert: RaiseAlert;
|
|
@@ -364,21 +370,17 @@ export declare const systemClock: Clock;
|
|
|
364
370
|
* Wires every use case to Postgres through Prisma. The HTTP app and the server
|
|
365
371
|
* commands share it.
|
|
366
372
|
*
|
|
367
|
-
* `
|
|
368
|
-
* listener.
|
|
369
|
-
* wait: enough for the server commands, which never receive.
|
|
373
|
+
* `wakeStreams` feed the wake streams; the HTTP app feeds them from the
|
|
374
|
+
* delivery listener. No call waits (decision 0072), so nothing else is woken.
|
|
370
375
|
*/
|
|
371
376
|
export declare function createUseCases(options: {
|
|
372
377
|
prisma: PrismaClient;
|
|
378
|
+
pluginTargets?: readonly PluginTarget[];
|
|
379
|
+
pluginLog?: (facts: PluginDispatchLog) => void;
|
|
373
380
|
clock?: Clock;
|
|
374
381
|
ids?: IdGenerator;
|
|
375
|
-
wakeups?: ReceiverWakeups;
|
|
376
382
|
/** Feed the wake streams (long-poll design, W1); without them a stream wakes only at open and sends keep-alives. */
|
|
377
383
|
wakeStreams?: WakeStreams;
|
|
378
|
-
/** Wake a waiting follow and an inbox check with a known count; without them both end only at their wait. */
|
|
379
|
-
fleetEventWakeups?: FleetEventWakeups;
|
|
380
|
-
/** How long a receive waits on an empty inbox; about 25 seconds unless a test says otherwise. */
|
|
381
|
-
receiveWaitMs?: number;
|
|
382
384
|
/** pagasae's signatures on account tokens (decision 0058); without them, no account token is trusted. */
|
|
383
385
|
accountTokenSignatures?: AccountTokenSignatures;
|
|
384
386
|
/** The installation's KMS for sealed fleets (decision 0068); without it, no fleet can be sealed. */
|