@aeolus-fleet/core 0.39.1 → 0.40.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.
Files changed (157) hide show
  1. package/README.md +2 -2
  2. package/dist/adapters/cli/fleet-init.d.ts +1 -1
  3. package/dist/adapters/cli/fleet-init.js +5 -3
  4. package/dist/adapters/cli/fleet-init.js.map +1 -1
  5. package/dist/adapters/cli/io.d.ts +5 -2
  6. package/dist/adapters/cli/io.js.map +1 -1
  7. package/dist/adapters/prisma/client.d.ts +8 -2
  8. package/dist/adapters/prisma/client.js +3 -3
  9. package/dist/adapters/prisma/client.js.map +1 -1
  10. package/dist/adapters/prisma/content-type-sql.d.ts +11 -0
  11. package/dist/adapters/prisma/content-type-sql.js +41 -0
  12. package/dist/adapters/prisma/content-type-sql.js.map +1 -0
  13. package/dist/adapters/prisma/exchange-rollups.d.ts +3 -1
  14. package/dist/adapters/prisma/exchange-rollups.js +15 -9
  15. package/dist/adapters/prisma/exchange-rollups.js.map +1 -1
  16. package/dist/adapters/prisma/fill-message-question-ids.d.ts +7 -0
  17. package/dist/adapters/prisma/fill-message-question-ids.js +12 -0
  18. package/dist/adapters/prisma/fill-message-question-ids.js.map +1 -0
  19. package/dist/adapters/prisma/fleet-counter.js +1 -1
  20. package/dist/adapters/prisma/fleet-counter.js.map +1 -1
  21. package/dist/adapters/prisma/fleet-removal.d.ts +17 -0
  22. package/dist/adapters/prisma/fleet-removal.js +109 -0
  23. package/dist/adapters/prisma/fleet-removal.js.map +1 -0
  24. package/dist/adapters/prisma/generated/browser.d.ts +6 -0
  25. package/dist/adapters/prisma/generated/client.d.ts +6 -0
  26. package/dist/adapters/prisma/generated/commonInputTypes.d.ts +0 -30
  27. package/dist/adapters/prisma/generated/enums.d.ts +0 -6
  28. package/dist/adapters/prisma/generated/enums.js +0 -5
  29. package/dist/adapters/prisma/generated/enums.js.map +1 -1
  30. package/dist/adapters/prisma/generated/internal/class.d.ts +11 -0
  31. package/dist/adapters/prisma/generated/internal/class.js +4 -4
  32. package/dist/adapters/prisma/generated/internal/class.js.map +1 -1
  33. package/dist/adapters/prisma/generated/internal/prismaNamespace.d.ts +89 -10
  34. package/dist/adapters/prisma/generated/internal/prismaNamespace.js +13 -2
  35. package/dist/adapters/prisma/generated/internal/prismaNamespace.js.map +1 -1
  36. package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.d.ts +13 -1
  37. package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js +13 -2
  38. package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js.map +1 -1
  39. package/dist/adapters/prisma/generated/models/Exchange.d.ts +60 -1
  40. package/dist/adapters/prisma/generated/models/Fleet.d.ts +700 -1
  41. package/dist/adapters/prisma/generated/models/Message.d.ts +174 -1
  42. package/dist/adapters/prisma/generated/models/MessageMetadataBackfill.d.ts +1132 -0
  43. package/dist/adapters/prisma/generated/models/MessageMetadataBackfill.js +2 -0
  44. package/dist/adapters/prisma/generated/models/MessageMetadataBackfill.js.map +1 -0
  45. package/dist/adapters/prisma/generated/models/Operator.d.ts +1 -40
  46. package/dist/adapters/prisma/generated/models.d.ts +1 -0
  47. package/dist/adapters/prisma/health-bootstrap-index.d.ts +2 -0
  48. package/dist/adapters/prisma/health-bootstrap-index.js +15 -0
  49. package/dist/adapters/prisma/health-bootstrap-index.js.map +1 -0
  50. package/dist/adapters/prisma/health-snapshots.js +6 -3
  51. package/dist/adapters/prisma/health-snapshots.js.map +1 -1
  52. package/dist/adapters/prisma/history.d.ts +3 -1
  53. package/dist/adapters/prisma/history.js +22 -4
  54. package/dist/adapters/prisma/history.js.map +1 -1
  55. package/dist/adapters/prisma/identity.js +6 -9
  56. package/dist/adapters/prisma/identity.js.map +1 -1
  57. package/dist/adapters/prisma/index-after-start.d.ts +16 -0
  58. package/dist/adapters/prisma/index-after-start.js +78 -0
  59. package/dist/adapters/prisma/index-after-start.js.map +1 -0
  60. package/dist/adapters/prisma/installation.js +1 -1
  61. package/dist/adapters/prisma/installation.js.map +1 -1
  62. package/dist/adapters/prisma/message-metadata-fill.d.ts +40 -0
  63. package/dist/adapters/prisma/message-metadata-fill.js +122 -0
  64. package/dist/adapters/prisma/message-metadata-fill.js.map +1 -0
  65. package/dist/adapters/prisma/messaging.d.ts +17 -1
  66. package/dist/adapters/prisma/messaging.js +60 -2
  67. package/dist/adapters/prisma/messaging.js.map +1 -1
  68. package/dist/adapters/prisma/page-with-messages.js +2 -0
  69. package/dist/adapters/prisma/page-with-messages.js.map +1 -1
  70. package/dist/adapters/prisma/registry.js +16 -51
  71. package/dist/adapters/prisma/registry.js.map +1 -1
  72. package/dist/adapters/prisma/rows.js +3 -3
  73. package/dist/adapters/prisma/rows.js.map +1 -1
  74. package/dist/adapters/prisma/sealings.js +23 -7
  75. package/dist/adapters/prisma/sealings.js.map +1 -1
  76. package/dist/adapters/prisma/unit-of-work.d.ts +4 -2
  77. package/dist/adapters/prisma/unit-of-work.js +4 -0
  78. package/dist/adapters/prisma/unit-of-work.js.map +1 -1
  79. package/dist/adapters/prisma/unseen-plain-messages.d.ts +3 -0
  80. package/dist/adapters/prisma/unseen-plain-messages.js +20 -0
  81. package/dist/adapters/prisma/unseen-plain-messages.js.map +1 -0
  82. package/dist/adapters/trpc/console.d.ts +1 -10
  83. package/dist/adapters/trpc/console.js +2 -10
  84. package/dist/adapters/trpc/console.js.map +1 -1
  85. package/dist/adapters/trpc/context.d.ts +0 -2
  86. package/dist/adapters/trpc/fleet.js +2 -1
  87. package/dist/adapters/trpc/fleet.js.map +1 -1
  88. package/dist/adapters/trpc/router.d.ts +6 -10
  89. package/dist/adapters/trpc/ship.d.ts +6 -2
  90. package/dist/adapters/trpc/ship.js +4 -2
  91. package/dist/adapters/trpc/ship.js.map +1 -1
  92. package/dist/app.d.ts +4 -0
  93. package/dist/app.js +71 -2
  94. package/dist/app.js.map +1 -1
  95. package/dist/domain/identity/operator-account.d.ts +1 -3
  96. package/dist/domain/identity/operator-account.js.map +1 -1
  97. package/dist/domain/identity/ports.d.ts +1 -6
  98. package/dist/domain/identity/read-account.d.ts +2 -3
  99. package/dist/domain/identity/read-account.js +1 -2
  100. package/dist/domain/identity/read-account.js.map +1 -1
  101. package/dist/domain/messaging/exchange.d.ts +3 -1
  102. package/dist/domain/messaging/exchange.js +10 -6
  103. package/dist/domain/messaging/exchange.js.map +1 -1
  104. package/dist/domain/messaging/fill-message-metadata.d.ts +29 -0
  105. package/dist/domain/messaging/fill-message-metadata.js +54 -0
  106. package/dist/domain/messaging/fill-message-metadata.js.map +1 -0
  107. package/dist/domain/messaging/message.d.ts +4 -0
  108. package/dist/domain/messaging/message.js +7 -1
  109. package/dist/domain/messaging/message.js.map +1 -1
  110. package/dist/domain/messaging/ports.d.ts +62 -2
  111. package/dist/domain/messaging/public.d.ts +1 -0
  112. package/dist/domain/messaging/public.js +1 -0
  113. package/dist/domain/messaging/public.js.map +1 -1
  114. package/dist/domain/messaging/read-exchanges.d.ts +1 -0
  115. package/dist/domain/messaging/read-exchanges.js +2 -1
  116. package/dist/domain/messaging/read-exchanges.js.map +1 -1
  117. package/dist/domain/messaging/retired-asker.d.ts +33 -0
  118. package/dist/domain/messaging/retired-asker.js +81 -0
  119. package/dist/domain/messaging/retired-asker.js.map +1 -0
  120. package/dist/domain/messaging/turn-on-sealing.js +1 -1
  121. package/dist/domain/messaging/turn-on-sealing.js.map +1 -1
  122. package/dist/domain/registry/delete-fleet.d.ts +5 -3
  123. package/dist/domain/registry/delete-fleet.js +6 -4
  124. package/dist/domain/registry/delete-fleet.js.map +1 -1
  125. package/dist/domain/registry/found-fleet.js +1 -1
  126. package/dist/domain/registry/found-fleet.js.map +1 -1
  127. package/dist/domain/registry/ports.d.ts +23 -6
  128. package/dist/domain/registry/public.d.ts +1 -1
  129. package/dist/domain/registry/remove-deleted-fleets.d.ts +30 -0
  130. package/dist/domain/registry/remove-deleted-fleets.js +54 -0
  131. package/dist/domain/registry/remove-deleted-fleets.js.map +1 -0
  132. package/dist/domain/registry/retire-ship.d.ts +6 -2
  133. package/dist/domain/registry/retire-ship.js +9 -1
  134. package/dist/domain/registry/retire-ship.js.map +1 -1
  135. package/dist/domain/shared/health-snapshot.js +7 -2
  136. package/dist/domain/shared/health-snapshot.js.map +1 -1
  137. package/dist/domain/shared/read-sent-message.d.ts +7 -4
  138. package/dist/domain/shared/read-sent-message.js +6 -15
  139. package/dist/domain/shared/read-sent-message.js.map +1 -1
  140. package/dist/maintenance-pass.d.ts +1 -1
  141. package/dist/maintenance-pass.js +4 -1
  142. package/dist/maintenance-pass.js.map +1 -1
  143. package/dist/testing/container-sweeper.d.ts +20 -0
  144. package/dist/testing/container-sweeper.js +47 -14
  145. package/dist/testing/container-sweeper.js.map +1 -1
  146. package/dist/wiring.d.ts +4 -2
  147. package/dist/wiring.js +3 -3
  148. package/dist/wiring.js.map +1 -1
  149. package/package.json +2 -2
  150. package/src/adapters/prisma/migrations/20261115090000_messages_asked_answered_question_id/migration.sql +20 -0
  151. package/src/adapters/prisma/migrations/20261115100000_unseen_plain_messages/migration.sql +3 -0
  152. package/src/adapters/prisma/migrations/20261115110000_theme_per_browser/migration.sql +4 -0
  153. package/src/adapters/prisma/migrations/20261115120000_fleet_deleted_at/migration.sql +2 -0
  154. package/src/adapters/prisma/schema.prisma +27 -14
  155. package/dist/domain/identity/set-theme.d.ts +0 -21
  156. package/dist/domain/identity/set-theme.js +0 -19
  157. package/dist/domain/identity/set-theme.js.map +0 -1
@@ -0,0 +1,30 @@
1
+ import type { FleetId } from '@aeolus-fleet/common';
2
+ import type { Clock } from '../shared/clock.js';
3
+ import type { UnitOfWork } from '../shared/unit-of-work.js';
4
+ import type { FleetRemoval, FleetRepository } from './ports.js';
5
+ /** How many rows of one kind a batch removes at most, as the pruning pass reads (500): each batch stays one short transaction. */
6
+ export declare const REMOVAL_BATCH = 500;
7
+ /** How long one fleet's removal runs in a pass before it leaves the rest to the next pass. */
8
+ export declare const REMOVAL_BUDGET_MS = 10000;
9
+ export interface RemoveDeletedFleetsTx {
10
+ fleetRemoval: FleetRemoval;
11
+ }
12
+ /** Removes every fleet marked deleted; `onFleetError` is told of a fleet whose removal threw, and the pass goes on with the next fleet. */
13
+ export type RemoveDeletedFleets = (onFleetError?: (fleetId: FleetId, error: unknown) => void) => Promise<void>;
14
+ /**
15
+ * Use case: the removal pass (decision 0020), run by core in the 30 second
16
+ * pass, never through the API. It starts from the rows a fleet marked deleted
17
+ * still has, so whatever stopped it, a failed batch, a failed last step or a
18
+ * restart, the next pass goes on until the fleet is gone. Each fleet's history,
19
+ * then its other records, go in batches, each one unit of work under the
20
+ * fleet's removal lock taken with try (a fleet another server is removing is
21
+ * skipped); then one unit of work removes the fleet itself. A pass whose time budget is spent
22
+ * leaves the rest to the next pass.
23
+ */
24
+ export declare function createRemoveDeletedFleets(deps: {
25
+ fleets: Pick<FleetRepository, 'listDeleted'>;
26
+ uow: UnitOfWork<RemoveDeletedFleetsTx>;
27
+ clock: Clock;
28
+ batch?: number;
29
+ budgetMs?: number;
30
+ }): RemoveDeletedFleets;
@@ -0,0 +1,54 @@
1
+ import { ok } from '../shared/result.js';
2
+ /** How many rows of one kind a batch removes at most, as the pruning pass reads (500): each batch stays one short transaction. */
3
+ export const REMOVAL_BATCH = 500;
4
+ /** How long one fleet's removal runs in a pass before it leaves the rest to the next pass. */
5
+ export const REMOVAL_BUDGET_MS = 10_000;
6
+ /**
7
+ * Use case: the removal pass (decision 0020), run by core in the 30 second
8
+ * pass, never through the API. It starts from the rows a fleet marked deleted
9
+ * still has, so whatever stopped it, a failed batch, a failed last step or a
10
+ * restart, the next pass goes on until the fleet is gone. Each fleet's history,
11
+ * then its other records, go in batches, each one unit of work under the
12
+ * fleet's removal lock taken with try (a fleet another server is removing is
13
+ * skipped); then one unit of work removes the fleet itself. A pass whose time budget is spent
14
+ * leaves the rest to the next pass.
15
+ */
16
+ export function createRemoveDeletedFleets(deps) {
17
+ const batchSize = deps.batch ?? REMOVAL_BATCH;
18
+ const budgetMs = deps.budgetMs ?? REMOVAL_BUDGET_MS;
19
+ const removeOne = async (fleetId) => {
20
+ const startedAt = deps.clock.now().getTime();
21
+ for (const step of ['removeHistoryBatch', 'removeRecordsBatch']) {
22
+ for (;;) {
23
+ const result = await deps.uow.run(async (tx) => ok((await tx.fleetRemoval.tryLock(fleetId)) ? await tx.fleetRemoval[step](fleetId, batchSize) : 'locked'));
24
+ const batch = result.isOk ? result.value : 'locked';
25
+ if (batch === 'locked') {
26
+ return;
27
+ }
28
+ if (batch === 'empty') {
29
+ break;
30
+ }
31
+ if (deps.clock.now().getTime() - startedAt >= budgetMs) {
32
+ return;
33
+ }
34
+ }
35
+ }
36
+ await deps.uow.run(async (tx) => {
37
+ if (await tx.fleetRemoval.tryLock(fleetId)) {
38
+ await tx.fleetRemoval.removeRest(fleetId);
39
+ }
40
+ return ok(undefined);
41
+ });
42
+ };
43
+ return async (onFleetError) => {
44
+ for (const fleet of await deps.fleets.listDeleted()) {
45
+ try {
46
+ await removeOne(fleet.id);
47
+ }
48
+ catch (error) {
49
+ onFleetError?.(fleet.id, error);
50
+ }
51
+ }
52
+ };
53
+ }
54
+ //# sourceMappingURL=remove-deleted-fleets.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"remove-deleted-fleets.js","sourceRoot":"","sources":["../../../src/domain/registry/remove-deleted-fleets.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,EAAE,EAAE,MAAM,qBAAqB,CAAC;AAIzC,kIAAkI;AAClI,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAAC;AACjC,8FAA8F;AAC9F,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC;AASxC;;;;;;;;;GASG;AACH,MAAM,UAAU,yBAAyB,CAAC,IAMzC;IACC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,IAAI,aAAa,CAAC;IAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,iBAAiB,CAAC;IAEpD,MAAM,SAAS,GAAG,KAAK,EAAE,OAAgB,EAAiB,EAAE;QAC1D,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;QAC7C,KAAK,MAAM,IAAI,IAAI,CAAC,oBAAoB,EAAE,oBAAoB,CAAU,EAAE,CAAC;YACzE,SAAS,CAAC;gBACR,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC3J,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;gBACpD,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;oBACvB,OAAO;gBACT,CAAC;gBACD,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;oBACtB,MAAM;gBACR,CAAC;gBACD,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,SAAS,IAAI,QAAQ,EAAE,CAAC;oBACvD,OAAO;gBACT,CAAC;YACH,CAAC;QACH,CAAC;QACD,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;YAC9B,IAAI,MAAM,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC3C,MAAM,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC5C,CAAC;YACD,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,OAAO,KAAK,EAAE,YAAY,EAAE,EAAE;QAC5B,KAAK,MAAM,KAAK,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;YACpD,IAAI,CAAC;gBACH,MAAM,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC5B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,YAAY,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
@@ -1,6 +1,6 @@
1
1
  import type { IdGenerator, ShipId } from '@aeolus-fleet/common';
2
2
  import { type CredentialTx } from '../identity/public.js';
3
- import { type AcceptRefusal, type PayloadSealing, type RequestHasher, type RetiredParticipantTx, type RetiredSchedulerTx } from '../messaging/public.js';
3
+ import { type AcceptRefusal, type PayloadSealing, type RequestHasher, type RetiredAskerTx, type RetiredParticipantTx, type RetiredSchedulerTx } from '../messaging/public.js';
4
4
  import { type Caller } from '../shared/caller.js';
5
5
  import type { Clock } from '../shared/clock.js';
6
6
  import { type DomainError } from '../shared/errors.js';
@@ -10,7 +10,7 @@ import { type CheckManageTx, type NotReachable } from './check-reach.js';
10
10
  import { type LeaseTx } from './leases.js';
11
11
  import type { AlertRepository, ClearRequestRepository, ExpectationsRepository, CrewRequestRepository, DeclaredNetworkRulesRepository, LabelRepository, NetworkSettingsRepository, ScopeNamespaceRepository, ShipRepository, VerifiedFactsRepository } from './ports.js';
12
12
  import { type RetireRefusal } from './ship.js';
13
- export interface RetireShipTx extends LeaseTx, CredentialTx, RetiredParticipantTx, RetiredSchedulerTx, Omit<CheckManageTx, 'ships' | 'labels' | 'networkSettings' | 'declaredNetworkRules' | 'events'> {
13
+ export interface RetireShipTx extends LeaseTx, CredentialTx, Omit<RetiredParticipantTx, 'messages'>, RetiredAskerTx, RetiredSchedulerTx, Omit<CheckManageTx, 'ships' | 'labels' | 'networkSettings' | 'declaredNetworkRules' | 'events'> {
14
14
  ships: ShipRepository;
15
15
  crewRequests: CrewRequestRepository;
16
16
  clearRequests: ClearRequestRepository;
@@ -54,6 +54,10 @@ export type RetireShip = (caller: Caller, input: {
54
54
  * mic, its moderatorship going to the owner, and a meeting it owns ends, the
55
55
  * others told (decision 0061, M15, M17): those meetings it locks before the
56
56
  * ship, as a contribution locks its meeting before its recipients.
57
+ * Every question it asked that is still open is withdrawn from the ship it
58
+ * asked, as its own withdraw would, so no answer is written to a ship never
59
+ * addressed again (decision 0038, #1632): an answer that holds the ship
60
+ * first lands and its question stays answered; one after is refused.
57
61
  * Its active and paused schedules are cancelled, one ScheduleCancelled each
58
62
  * (decision 0062, S11), locked before the ship too, as a send time locks its
59
63
  * schedule before the ship it sends to. Its open alerts clear, one
@@ -1,5 +1,5 @@
1
1
  import { revokeShipSecret } from '../identity/public.js';
2
- import { cancelSchedulesOnRetire, leaveMeetingsOnRetire, lockMeetingsOf, lockSchedulesOf, withDataKeys, } from '../messaging/public.js';
2
+ import { cancelSchedulesOnRetire, leaveMeetingsOnRetire, lockMeetingsOf, lockSchedulesOf, withDataKeys, withdrawQuestionsOnRetire, } from '../messaging/public.js';
3
3
  import { actorOf } from '../shared/caller.js';
4
4
  import { refuse } from '../shared/errors.js';
5
5
  import { recordEvent } from '../shared/events.js';
@@ -40,6 +40,10 @@ import { removeWithRetiredShip } from './verified-facts.js';
40
40
  * mic, its moderatorship going to the owner, and a meeting it owns ends, the
41
41
  * others told (decision 0061, M15, M17): those meetings it locks before the
42
42
  * ship, as a contribution locks its meeting before its recipients.
43
+ * Every question it asked that is still open is withdrawn from the ship it
44
+ * asked, as its own withdraw would, so no answer is written to a ship never
45
+ * addressed again (decision 0038, #1632): an answer that holds the ship
46
+ * first lands and its question stays answered; one after is refused.
43
47
  * Its active and paused schedules are cancelled, one ScheduleCancelled each
44
48
  * (decision 0062, S11), locked before the ship too, as a send time locks its
45
49
  * schedule before the ship it sends to. Its open alerts clear, one
@@ -171,6 +175,10 @@ export function createRetireShip(deps) {
171
175
  if (!left.isOk) {
172
176
  return left;
173
177
  }
178
+ const questions = await withdrawQuestionsOnRetire({ tx, ids: deps.ids, hasher: deps.hasher, held }, { fleetId, shipId, actor, at });
179
+ if (!questions.isOk) {
180
+ return questions;
181
+ }
174
182
  await cancelSchedulesOnRetire({ tx, ids: deps.ids }, { schedules, actor, at });
175
183
  for (const alert of await tx.alerts.listOpenOnShipForUpdate(fleetId, shipId)) {
176
184
  const cleared = clearAlert(alert, { why: 'retired', at, actor });
@@ -1 +1 @@
1
- {"version":3,"file":"retire-ship.js","sourceRoot":"","sources":["../../../src/domain/registry/retire-ship.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"retire-ship.js","sourceRoot":"","sources":["../../../src/domain/registry/retire-ship.ts"],"names":[],"mappings":"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"}
@@ -141,7 +141,8 @@ export function stuckCountOf(hour, reads) {
141
141
  */
142
142
  export function stuckPerHourOf(snapshot, read) {
143
143
  const { now, reads } = read;
144
- const lastMark = hourMarkOf(now);
144
+ // Now on an hour mark is that mark: the series ends at the hour before, so no hour shows twice.
145
+ const lastMark = hoursAfter(hourMarkOf(now), now.getTime() === hourMarkOf(now).getTime() ? -1 : 0);
145
146
  const hours = [...snapshot.hours, ...snapshot.folded.map(({ hour, fold }) => stuckCountOf(openingHourOf(fold, { hour, crews: snapshot.crews }), reads))];
146
147
  const perHour = Array.from({ length: STUCK_TREND_HOURS - 1 }, (_unused, index) => {
147
148
  const at = hoursAfter(lastMark, index - STUCK_TREND_HOURS + 2);
@@ -178,7 +179,11 @@ export function acknowledgedOfSnapshot(snapshot, read) {
178
179
  });
179
180
  const openWaits = waitsOfAcknowledged(snapshot.acknowledged.filter((delivery) => reads(delivery.message)));
180
181
  const closedPerHour = closedWaits.map(({ at, waits }) => ({ at, count: waits.reduce((sum, one) => sum + waitCount(one), 0) }));
181
- const perHour = [...closedPerHour.slice(1), { at: now, count: waitCount(openWaits) }];
182
+ // Now on an hour mark is the end of the last closed hour: that hour and the open one are one point, so no hour shows twice.
183
+ const isOnMark = now.getTime() === lastMark.getTime();
184
+ const perHour = isOnMark
185
+ ? [...closedPerHour.slice(0, -1), { at: now, count: (closedPerHour.at(-1)?.count ?? 0) + waitCount(openWaits) }]
186
+ : [...closedPerHour.slice(1), { at: now, count: waitCount(openWaits) }];
182
187
  return {
183
188
  count: [...closedPerHour, { count: waitCount(openWaits) }].reduce((sum, hour) => sum + hour.count, 0),
184
189
  medianMs: medianOfWaits([...closedWaits.flatMap(({ waits }) => waits), openWaits]),
@@ -1 +1 @@
1
- {"version":3,"file":"health-snapshot.js","sourceRoot":"","sources":["../../../src/domain/shared/health-snapshot.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"health-snapshot.js","sourceRoot":"","sources":["../../../src/domain/shared/health-snapshot.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,7 @@ import { type DomainError } from './errors.js';
4
4
  import type { HistoryParty, HistoryRecipient, ShipHistory } from './history.js';
5
5
  import { type Result } from './result.js';
6
6
  /**
7
- * A message its sender sent, with where each delivery stands and since when,
7
+ * A message its sender sent, with a page of where its deliveries stand and since when,
8
8
  * and its ship: one delivery for a ship or a type, one per ship for a label
9
9
  * (decision 0065). No payload.
10
10
  */
@@ -12,12 +12,13 @@ export interface SentMessage {
12
12
  messageId: MessageId;
13
13
  sentAt: Date;
14
14
  recipient: SentRecipient;
15
- deliveries: {
16
- deliveryId: DeliveryId;
15
+ items: {
16
+ id: DeliveryId;
17
17
  ship: HistoryParty | null;
18
18
  state: DeliveryState;
19
19
  since: Date;
20
20
  }[];
21
+ nextCursor: DeliveryId | null;
21
22
  }
22
23
  /** Who the message was addressed to, a label selection by its value ids as sent. */
23
24
  export type SentRecipient = Exclude<HistoryRecipient, {
@@ -28,6 +29,8 @@ export type SentRecipient = Exclude<HistoryRecipient, {
28
29
  };
29
30
  export type ReadSentMessage = (caller: ShipCaller, input: {
30
31
  messageId: MessageId;
32
+ cursor?: DeliveryId;
33
+ limit?: number;
31
34
  }) => Promise<Result<SentMessage, DomainError<'MESSAGE_NOT_FOUND'>>>;
32
35
  /**
33
36
  * Use case: a sender reads where the delivery of a message it sent stands
@@ -37,7 +40,7 @@ export type ReadSentMessage = (caller: ShipCaller, input: {
37
40
  * its existence does not show. Its recipient comes by name or type, which any
38
41
  * reader may see (decision 0034), and a label selection by its value ids as
39
42
  * sent, never their texts, which only fleet:read reads; each delivery names
40
- * its ship (R9 of decision 0065). No payload comes, not even its own. The
43
+ * its ship (R9 of decision 0065), a page at a time by delivery id. No payload comes, not even its own. The
41
44
  * caller's scope (messages:send) is checked before this runs.
42
45
  */
43
46
  export declare function createReadSentMessage(deps: {
@@ -1,4 +1,4 @@
1
- import { PAGE_SIZE_MAX } from '@aeolus-fleet/common';
1
+ import { PAGE_SIZE_DEFAULT } from '@aeolus-fleet/common';
2
2
  import { deliverySinceOf } from './delivery-way.js';
3
3
  import { refuse } from './errors.js';
4
4
  import { ok } from './result.js';
@@ -10,31 +10,22 @@ import { ok } from './result.js';
10
10
  * its existence does not show. Its recipient comes by name or type, which any
11
11
  * reader may see (decision 0034), and a label selection by its value ids as
12
12
  * sent, never their texts, which only fleet:read reads; each delivery names
13
- * its ship (R9 of decision 0065). No payload comes, not even its own. The
13
+ * its ship (R9 of decision 0065), a page at a time by delivery id. No payload comes, not even its own. The
14
14
  * caller's scope (messages:send) is checked before this runs.
15
15
  */
16
16
  export function createReadSentMessage(deps) {
17
- /** Every delivery of the message, read a page at a time in the database: its answer holds them all. */
18
- const deliveriesOf = async (fleetId, messageId) => {
19
- const deliveries = [];
20
- let cursor;
21
- do {
22
- const page = await deps.history.messageDeliveries(fleetId, { messageId, cursor, limit: PAGE_SIZE_MAX });
23
- deliveries.push(...page.items);
24
- cursor = page.nextCursor ?? undefined;
25
- } while (cursor !== undefined);
26
- return deliveries;
27
- };
28
- return async (caller, { messageId }) => {
17
+ return async (caller, { messageId, cursor, limit = PAGE_SIZE_DEFAULT }) => {
29
18
  const found = await deps.history.message(caller.fleetId, messageId);
30
19
  if (found?.sender.id !== caller.shipId) {
31
20
  return refuse('MESSAGE_NOT_FOUND', `No message ${messageId} in this fleet, or it is no longer kept`);
32
21
  }
22
+ const page = await deps.history.messageDeliveries(caller.fleetId, { messageId, cursor, limit });
33
23
  return ok({
34
24
  messageId: found.id,
35
25
  sentAt: found.sentAt,
36
26
  recipient: found.recipient.kind === 'label' ? { kind: 'label', valueIds: found.recipient.values.map(({ valueId }) => valueId) } : found.recipient,
37
- deliveries: (await deliveriesOf(caller.fleetId, messageId)).map(({ id, ship, state, steps }) => ({ deliveryId: id, ship, state, since: deliverySinceOf(steps) })),
27
+ items: page.items.map(({ id, ship, state, steps }) => ({ id, ship, state, since: deliverySinceOf(steps) })),
28
+ nextCursor: page.nextCursor,
38
29
  });
39
30
  };
40
31
  }
@@ -1 +1 @@
1
- {"version":3,"file":"read-sent-message.js","sourceRoot":"","sources":["../../../src/domain/shared/read-sent-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA0E,MAAM,sBAAsB,CAAC;AAG7H,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAoB,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAE,EAAE,EAAe,MAAM,aAAa,CAAC;AAsB9C;;;;;;;;;;GAUG;AACH,MAAM,UAAU,qBAAqB,CAAC,IAA8B;IAClE,uGAAuG;IACvG,MAAM,YAAY,GAAG,KAAK,EAAE,OAA8B,EAAE,SAAoB,EAA8B,EAAE;QAC9G,MAAM,UAAU,GAAsB,EAAE,CAAC;QACzC,IAAI,MAA8B,CAAC;QACnC,GAAG,CAAC;YACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAC;YACxG,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;YAC/B,MAAM,GAAG,IAAI,CAAC,UAAU,IAAI,SAAS,CAAC;QACxC,CAAC,QAAQ,MAAM,KAAK,SAAS,EAAE;QAC/B,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;IAEF,OAAO,KAAK,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE;QACrC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACpE,IAAI,KAAK,EAAE,MAAM,CAAC,EAAE,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC;YACvC,OAAO,MAAM,CAAC,mBAAmB,EAAE,cAAc,SAAS,yCAAyC,CAAC,CAAC;QACvG,CAAC;QACD,OAAO,EAAE,CAAC;YACR,SAAS,EAAE,KAAK,CAAC,EAAE;YACnB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS;YACjJ,UAAU,EAAE,CAAC,MAAM,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;SAClK,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"read-sent-message.js","sourceRoot":"","sources":["../../../src/domain/shared/read-sent-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAA0E,MAAM,sBAAsB,CAAC;AAGjI,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAoB,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAE,EAAE,EAAe,MAAM,aAAa,CAAC;AAuB9C;;;;;;;;;;GAUG;AACH,MAAM,UAAU,qBAAqB,CAAC,IAA8B;IAClE,OAAO,KAAK,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,GAAG,iBAAiB,EAAE,EAAE,EAAE;QACxE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACpE,IAAI,KAAK,EAAE,MAAM,CAAC,EAAE,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC;YACvC,OAAO,MAAM,CAAC,mBAAmB,EAAE,cAAc,SAAS,yCAAyC,CAAC,CAAC;QACvG,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAChG,OAAO,EAAE,CAAC;YACR,SAAS,EAAE,KAAK,CAAC,EAAE;YACnB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS;YACjJ,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC3G,UAAU,EAAE,IAAI,CAAC,UAAU;SAC5B,CAAC,CAAC;IACL,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' | 'pruneHistory' | 'sealStoredPayloads' | 'rotateDataKeys' | 'sendDueSchedules'>;
6
+ type MaintenanceUseCases = Pick<UseCases, 'tellOverdueDeliveries' | 'closeHealthSnapshots' | 'removeDeletedFleets' | 'pruneHistory' | '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;
@@ -4,7 +4,7 @@ import { repeatPass } from './repeating-pass.js';
4
4
  export function startMaintenancePass(options) {
5
5
  const { useCases, scheduleTimer, scheduleSendFailed } = options;
6
6
  // One pass, every 30 seconds: the clocks, then the stuck snapshot's close,
7
- // then the pruning of finished history (decision 0066), then the sealing of
7
+ // then the removal of deleted fleets (decision 0020), then the pruning of finished history (decision 0066), then the sealing of
8
8
  // what a sealing fleet stored plain and the data keys by age (decision
9
9
  // 0068), then whatever
10
10
  // schedule is due that a lost timer missed (decision 0062, S14).
@@ -16,6 +16,9 @@ export function startMaintenancePass(options) {
16
16
  closeHealthSnapshots: () => useCases.closeHealthSnapshots((fleetId, error) => {
17
17
  options.log.warn({ ...failureForLog(error), fleetId }, 'the stuck snapshot failed to close an hour for a fleet: closing it again next pass');
18
18
  }),
19
+ removeDeletedFleets: () => useCases.removeDeletedFleets((fleetId, error) => {
20
+ options.log.warn({ ...failureForLog(error), fleetId }, 'the removal of a deleted fleet failed: removing it again next pass');
21
+ }),
19
22
  pruneHistory: () => useCases.pruneHistory((fleetId, error) => {
20
23
  options.log.warn({ ...failureForLog(error), fleetId }, 'the pruning pass failed for a fleet: pruning it again next hour');
21
24
  }),
@@ -1 +1 @@
1
- {"version":3,"file":"maintenance-pass.js","sourceRoot":"","sources":["../src/maintenance-pass.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAsB,MAAM,kCAAkC,CAAC;AACrF,OAAO,EAAE,UAAU,EAAsB,MAAM,qBAAqB,CAAC;AAQrE,iGAAiG;AACjG,MAAM,UAAU,oBAAoB,CAAC,OAMpC;IACC,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC;IAChE,2EAA2E;IAC3E,4EAA4E;IAC5E,uEAAuE;IACvE,uBAAuB;IACvB,iEAAiE;IACjE,8EAA8E;IAC9E,OAAO,UAAU,CAAC;QAChB,IAAI,EAAE,KAAK,IAAI,EAAE;YACf,MAAM,KAAK,GAAG;gBACZ,qBAAqB,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,qBAAqB,EAAE;gBAC7D,oBAAoB,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;oBAC3E,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,EAAE,oFAAoF,CAAC,CAAC;gBAC/I,CAAC,CAAC;gBACF,YAAY,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;oBAC3D,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,EAAE,iEAAiE,CAAC,CAAC;gBAC5H,CAAC,CAAC;gBACF,kBAAkB,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;oBACvE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,EAAE,iEAAiE,CAAC,CAAC;gBAC5H,CAAC,CAAC;gBACF,cAAc,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;oBAC/D,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,EAAE,uEAAuE,CAAC,CAAC;gBAClI,CAAC,CAAC;gBACF,gBAAgB,EAAE,KAAK,IAAI,EAAE;oBAC3B,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,QAAQ,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;oBAC9E,IAAI,aAAa,EAAE,CAAC;wBAClB,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;oBACpC,CAAC;gBACH,CAAC;aACF,CAAC;YACF,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBAChD,IAAI,CAAC;oBACH,MAAM,GAAG,EAAE,CAAC;gBACd,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,EAAE,iDAAiD,CAAC,CAAC;gBACzG,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACjB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,gDAAgD,CAAC,CAAC;QAC3F,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"maintenance-pass.js","sourceRoot":"","sources":["../src/maintenance-pass.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAsB,MAAM,kCAAkC,CAAC;AACrF,OAAO,EAAE,UAAU,EAAsB,MAAM,qBAAqB,CAAC;AAQrE,iGAAiG;AACjG,MAAM,UAAU,oBAAoB,CAAC,OAMpC;IACC,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC;IAChE,2EAA2E;IAC3E,gIAAgI;IAChI,uEAAuE;IACvE,uBAAuB;IACvB,iEAAiE;IACjE,8EAA8E;IAC9E,OAAO,UAAU,CAAC;QAChB,IAAI,EAAE,KAAK,IAAI,EAAE;YACf,MAAM,KAAK,GAAG;gBACZ,qBAAqB,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,qBAAqB,EAAE;gBAC7D,oBAAoB,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;oBAC3E,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,EAAE,oFAAoF,CAAC,CAAC;gBAC/I,CAAC,CAAC;gBACF,mBAAmB,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;oBACzE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,EAAE,oEAAoE,CAAC,CAAC;gBAC/H,CAAC,CAAC;gBACF,YAAY,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;oBAC3D,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,EAAE,iEAAiE,CAAC,CAAC;gBAC5H,CAAC,CAAC;gBACF,kBAAkB,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;oBACvE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,EAAE,iEAAiE,CAAC,CAAC;gBAC5H,CAAC,CAAC;gBACF,cAAc,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;oBAC/D,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,EAAE,uEAAuE,CAAC,CAAC;gBAClI,CAAC,CAAC;gBACF,gBAAgB,EAAE,KAAK,IAAI,EAAE;oBAC3B,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,QAAQ,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;oBAC9E,IAAI,aAAa,EAAE,CAAC;wBAClB,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;oBACpC,CAAC;gBACH,CAAC;aACF,CAAC;YACF,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBAChD,IAAI,CAAC;oBACH,MAAM,GAAG,EAAE,CAAC;gBACd,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,EAAE,iDAAiD,CAAC,CAAC;gBACzG,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACjB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,gDAAgD,CAAC,CAAC;QAC3F,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
@@ -16,3 +16,23 @@ export declare const TEST_RUN_LABEL = "aeolus-fleet.test-run";
16
16
  * The file is the sweeper: this function starts it again as a program.
17
17
  */
18
18
  export declare function startContainerSweeper(run: string): void;
19
+ /** The part of the container runtime the sweep uses. */
20
+ export interface SweepRuntime {
21
+ listContainerIds(run: string): Promise<string[]>;
22
+ removeContainer(id: string): Promise<void>;
23
+ }
24
+ /** How long the sweep waits between two lists, and how many lists it takes at most. */
25
+ export interface SweepTiming {
26
+ readonly delayMs: number;
27
+ readonly maxLists: number;
28
+ }
29
+ /**
30
+ * Removes every container of the run, running or not, with its anonymous
31
+ * volumes. A container whose create request was still in flight when the run's
32
+ * process died can appear after a list, so the sweep removes what it lists and
33
+ * lists again after a short delay, until two lists in a row are empty. It stops after the most lists the timing allows.
34
+ */
35
+ export declare function sweep(runtime: SweepRuntime, { run, timing }: {
36
+ run: string;
37
+ timing?: SweepTiming;
38
+ }): Promise<void>;
@@ -1,13 +1,13 @@
1
- import { spawn } from 'node:child_process';
2
- import { Socket } from 'node:net';
3
- import { fileURLToPath } from 'node:url';
4
- import { getContainerRuntimeClient } from 'testcontainers';
1
+ import { spawn } from "node:child_process";
2
+ import { Socket } from "node:net";
3
+ import { fileURLToPath } from "node:url";
4
+ import { getContainerRuntimeClient } from "testcontainers";
5
5
  /**
6
6
  * The label every container a test run starts carries, its value the run. The
7
7
  * sweeper removes a run's containers by it, and CI checks by it that a run left
8
8
  * none behind.
9
9
  */
10
- export const TEST_RUN_LABEL = 'aeolus-fleet.test-run';
10
+ export const TEST_RUN_LABEL = "aeolus-fleet.test-run";
11
11
  /**
12
12
  * Starts the sweeper of a test run: a process of its own that removes the
13
13
  * run's containers with their volumes once the run's process ends, however it
@@ -22,7 +22,7 @@ export const TEST_RUN_LABEL = 'aeolus-fleet.test-run';
22
22
  export function startContainerSweeper(run) {
23
23
  const sweeper = spawn(process.execPath, [fileURLToPath(import.meta.url), run], {
24
24
  detached: true,
25
- stdio: ['pipe', 'ignore', 'inherit'],
25
+ stdio: ["pipe", "ignore", "inherit"],
26
26
  });
27
27
  sweeper.unref();
28
28
  // The pipe is a socket: unreferenced, it keeps the run's process from exiting by nothing either.
@@ -30,21 +30,54 @@ export function startContainerSweeper(run) {
30
30
  sweeper.stdin.unref();
31
31
  }
32
32
  }
33
- /** Removes every container of the run, running or not, with its anonymous volumes. */
34
- async function sweep(run) {
33
+ const DEFAULT_TIMING = { delayMs: 1_000, maxLists: 10 };
34
+ /**
35
+ * Removes every container of the run, running or not, with its anonymous
36
+ * volumes. A container whose create request was still in flight when the run's
37
+ * process died can appear after a list, so the sweep removes what it lists and
38
+ * lists again after a short delay, until two lists in a row are empty. It stops after the most lists the timing allows.
39
+ */
40
+ export async function sweep(runtime, { run, timing = DEFAULT_TIMING }) {
41
+ let previous;
42
+ for (let lists = 1; lists <= timing.maxLists; lists++) {
43
+ const ids = await runtime.listContainerIds(run);
44
+ if (previous?.length === 0 && ids.length === 0) {
45
+ return;
46
+ }
47
+ // A container the run's teardown removes meanwhile answers not found: it is gone either way.
48
+ await Promise.allSettled(ids.map((id) => runtime.removeContainer(id)));
49
+ previous = ids;
50
+ if (lists === timing.maxLists) {
51
+ return;
52
+ }
53
+ await new Promise((resolve) => setTimeout(resolve, timing.delayMs));
54
+ }
55
+ }
56
+ async function dockerRuntime() {
35
57
  const { dockerode } = (await getContainerRuntimeClient()).container;
36
- const containers = await dockerode.listContainers({ all: true, filters: { label: [`${TEST_RUN_LABEL}=${run}`] } });
37
- // A container the run's teardown removes meanwhile answers not found: it is gone either way.
38
- await Promise.allSettled(containers.map((container) => dockerode.getContainer(container.Id).remove({ force: true, v: true })));
58
+ return {
59
+ async listContainerIds(run) {
60
+ const containers = await dockerode.listContainers({
61
+ all: true,
62
+ filters: { label: [`${TEST_RUN_LABEL}=${run}`] },
63
+ });
64
+ return containers.map((container) => container.Id);
65
+ },
66
+ async removeContainer(id) {
67
+ await dockerode.getContainer(id).remove({ force: true, v: true });
68
+ },
69
+ };
39
70
  }
40
71
  if (import.meta.main) {
41
72
  const run = process.argv[2];
42
73
  if (!run) {
43
- console.error('Usage: node container-sweeper.ts <test run>');
74
+ console.error("Usage: node container-sweeper.ts <test run>");
44
75
  process.exit(2);
45
76
  }
46
- process.stdin.on('end', () => {
47
- sweep(run).catch((error) => {
77
+ process.stdin.on("end", () => {
78
+ dockerRuntime()
79
+ .then((runtime) => sweep(runtime, { run }))
80
+ .catch((error) => {
48
81
  console.error(`The sweeper of test run ${run} could not remove its containers:`, error);
49
82
  process.exitCode = 1;
50
83
  });
@@ -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;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAE3D;;;;GAIG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,uBAAuB,CAAC;AAEtD;;;;;;;;;;GAUG;AACH,MAAM,UAAU,qBAAqB,CAAC,GAAW;IAC/C,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,EAAE;QAC7E,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC;KACrC,CAAC,CAAC;IACH,OAAO,CAAC,KAAK,EAAE,CAAC;IAChB,iGAAiG;IACjG,IAAI,OAAO,CAAC,KAAK,YAAY,MAAM,EAAE,CAAC;QACpC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;AACH,CAAC;AAED,sFAAsF;AACtF,KAAK,UAAU,KAAK,CAAC,GAAW;IAC9B,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,yBAAyB,EAAE,CAAC,CAAC,SAAS,CAAC;IACpE,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,cAAc,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,GAAG,cAAc,IAAI,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACnH,6FAA6F;IAC7F,MAAM,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AACjI,CAAC;AAED,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5B,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;QAC7D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IACD,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;QAC3B,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;YAClC,OAAO,CAAC,KAAK,CAAC,2BAA2B,GAAG,mCAAmC,EAAE,KAAK,CAAC,CAAC;YACxF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;AACzB,CAAC"}
1
+ {"version":3,"file":"container-sweeper.js","sourceRoot":"","sources":["../../src/testing/container-sweeper.ts"],"names":[],"mappings":"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"}
package/dist/wiring.d.ts CHANGED
@@ -24,7 +24,6 @@ import { type ResetOperatorPassword } from './domain/identity/reset-operator-pas
24
24
  import { type EndLeasesAfterRestore } from './domain/registry/end-leases-after-restore.js';
25
25
  import { type SetNotices } from './domain/identity/set-notices.js';
26
26
  import { type SetOperatorLogin } from './domain/identity/set-operator-login.js';
27
- import { type SetTheme } from './domain/identity/set-theme.js';
28
27
  import { type SignIn } from './domain/identity/sign-in.js';
29
28
  import { type SignOut } from './domain/identity/sign-out.js';
30
29
  import { type AcknowledgeDelivery } from './domain/messaging/acknowledge-delivery.js';
@@ -176,6 +175,7 @@ import { type ReadStuckHistory } from './domain/shared/read-stuck-history.js';
176
175
  import { type ReadStuck } from './domain/shared/read-stuck.js';
177
176
  import { type ReadStuckSummary } from './domain/shared/read-stuck-summary.js';
178
177
  import { type CloseHealthSnapshots } from './domain/shared/close-health-snapshots.js';
178
+ import { type RemoveDeletedFleets } from './domain/registry/remove-deleted-fleets.js';
179
179
  import { type PruneHistory } from './domain/shared/prune-history.js';
180
180
  import { type ReadShipMessages } from './domain/shared/read-ship-messages.js';
181
181
  import { type ReadShipTimeline } from './domain/shared/read-ship-timeline.js';
@@ -288,6 +288,7 @@ export interface UseCases {
288
288
  closeHealthSnapshots: CloseHealthSnapshots;
289
289
  /** One pruning pass of every fleet with a retention (decision 0066); core runs it, never the API. */
290
290
  pruneHistory: PruneHistory;
291
+ removeDeletedFleets: RemoveDeletedFleets;
291
292
  sealStoredPayloads: SealStoredPayloads;
292
293
  /** Makes a new data key current in every sealed fleet whose current one is 30 days old (decision 0068); core runs it, never the API. */
293
294
  rotateDataKeys: RotateDataKeys;
@@ -326,7 +327,6 @@ export interface UseCases {
326
327
  signOut: SignOut;
327
328
  readAccount: ReadAccount;
328
329
  readArgoSignIn: ReadArgoSignIn;
329
- setTheme: SetTheme;
330
330
  setOperatorLogin: SetOperatorLogin;
331
331
  setNotices: SetNotices;
332
332
  getNotices: GetNotices;
@@ -385,4 +385,6 @@ export declare function createUseCases(options: {
385
385
  keyVault?: KeyVault;
386
386
  /** Whether the server has an installation token, so the installation sets each fleet's feature flags; without one each flag has its own value (decision 0069). */
387
387
  hasInstallation?: boolean;
388
+ /** How long one fleet's pruning pass runs before it leaves the rest to the next hour; 10 seconds unless a test says otherwise (0 ends it after its first batch). */
389
+ pruneBudgetMs?: number;
388
390
  }): UseCases;