@aeolus-fleet/core 0.39.0 → 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.
- package/README.md +4 -2
- package/dist/adapters/cli/fleet-init.d.ts +1 -1
- package/dist/adapters/cli/fleet-init.js +5 -3
- package/dist/adapters/cli/fleet-init.js.map +1 -1
- package/dist/adapters/cli/fleet-restored.d.ts +19 -0
- package/dist/adapters/cli/fleet-restored.js +37 -0
- package/dist/adapters/cli/fleet-restored.js.map +1 -0
- package/dist/adapters/cli/io.d.ts +5 -2
- package/dist/adapters/cli/io.js.map +1 -1
- package/dist/adapters/cli/run.d.ts +2 -0
- package/dist/adapters/cli/run.js +10 -2
- package/dist/adapters/cli/run.js.map +1 -1
- package/dist/adapters/prisma/client.d.ts +8 -2
- package/dist/adapters/prisma/client.js +3 -3
- package/dist/adapters/prisma/client.js.map +1 -1
- package/dist/adapters/prisma/content-type-sql.d.ts +11 -0
- package/dist/adapters/prisma/content-type-sql.js +41 -0
- package/dist/adapters/prisma/content-type-sql.js.map +1 -0
- package/dist/adapters/prisma/core-connections.d.ts +8 -0
- package/dist/adapters/prisma/core-connections.js +18 -0
- package/dist/adapters/prisma/core-connections.js.map +1 -0
- package/dist/adapters/prisma/exchange-rollups.d.ts +3 -1
- package/dist/adapters/prisma/exchange-rollups.js +25 -21
- package/dist/adapters/prisma/exchange-rollups.js.map +1 -1
- package/dist/adapters/prisma/fill-message-question-ids.d.ts +7 -0
- package/dist/adapters/prisma/fill-message-question-ids.js +12 -0
- package/dist/adapters/prisma/fill-message-question-ids.js.map +1 -0
- package/dist/adapters/prisma/fleet-counter.js +1 -1
- package/dist/adapters/prisma/fleet-counter.js.map +1 -1
- package/dist/adapters/prisma/fleet-removal.d.ts +17 -0
- package/dist/adapters/prisma/fleet-removal.js +109 -0
- package/dist/adapters/prisma/fleet-removal.js.map +1 -0
- package/dist/adapters/prisma/generated/browser.d.ts +6 -0
- package/dist/adapters/prisma/generated/client.d.ts +6 -0
- package/dist/adapters/prisma/generated/commonInputTypes.d.ts +0 -30
- package/dist/adapters/prisma/generated/enums.d.ts +0 -6
- package/dist/adapters/prisma/generated/enums.js +0 -5
- package/dist/adapters/prisma/generated/enums.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/class.d.ts +11 -0
- 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 +89 -10
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js +13 -2
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.d.ts +13 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js +13 -2
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js.map +1 -1
- package/dist/adapters/prisma/generated/models/Exchange.d.ts +60 -1
- package/dist/adapters/prisma/generated/models/Fleet.d.ts +700 -1
- package/dist/adapters/prisma/generated/models/Message.d.ts +174 -1
- package/dist/adapters/prisma/generated/models/MessageMetadataBackfill.d.ts +1132 -0
- package/dist/adapters/prisma/generated/models/MessageMetadataBackfill.js +2 -0
- package/dist/adapters/prisma/generated/models/MessageMetadataBackfill.js.map +1 -0
- package/dist/adapters/prisma/generated/models/Operator.d.ts +1 -40
- package/dist/adapters/prisma/generated/models.d.ts +1 -0
- package/dist/adapters/prisma/health-bootstrap-index.d.ts +2 -0
- package/dist/adapters/prisma/health-bootstrap-index.js +15 -0
- package/dist/adapters/prisma/health-bootstrap-index.js.map +1 -0
- package/dist/adapters/prisma/health-snapshots.js +6 -3
- package/dist/adapters/prisma/health-snapshots.js.map +1 -1
- package/dist/adapters/prisma/history.d.ts +3 -1
- package/dist/adapters/prisma/history.js +22 -4
- package/dist/adapters/prisma/history.js.map +1 -1
- package/dist/adapters/prisma/identity.js +6 -9
- package/dist/adapters/prisma/identity.js.map +1 -1
- package/dist/adapters/prisma/index-after-start.d.ts +16 -0
- package/dist/adapters/prisma/index-after-start.js +78 -0
- package/dist/adapters/prisma/index-after-start.js.map +1 -0
- package/dist/adapters/prisma/installation.js +1 -1
- package/dist/adapters/prisma/installation.js.map +1 -1
- package/dist/adapters/prisma/message-metadata-fill.d.ts +40 -0
- package/dist/adapters/prisma/message-metadata-fill.js +122 -0
- package/dist/adapters/prisma/message-metadata-fill.js.map +1 -0
- package/dist/adapters/prisma/messaging.d.ts +29 -2
- package/dist/adapters/prisma/messaging.js +98 -41
- package/dist/adapters/prisma/messaging.js.map +1 -1
- package/dist/adapters/prisma/page-with-messages.d.ts +11 -0
- package/dist/adapters/prisma/page-with-messages.js +42 -0
- package/dist/adapters/prisma/page-with-messages.js.map +1 -0
- package/dist/adapters/prisma/registry.js +32 -51
- package/dist/adapters/prisma/registry.js.map +1 -1
- package/dist/adapters/prisma/rows.js +3 -3
- package/dist/adapters/prisma/rows.js.map +1 -1
- package/dist/adapters/prisma/sealings.js +23 -7
- package/dist/adapters/prisma/sealings.js.map +1 -1
- package/dist/adapters/prisma/unit-of-work.d.ts +4 -2
- package/dist/adapters/prisma/unit-of-work.js +4 -0
- package/dist/adapters/prisma/unit-of-work.js.map +1 -1
- package/dist/adapters/prisma/unseen-plain-messages.d.ts +3 -0
- package/dist/adapters/prisma/unseen-plain-messages.js +20 -0
- package/dist/adapters/prisma/unseen-plain-messages.js.map +1 -0
- package/dist/adapters/trpc/console.d.ts +1 -10
- package/dist/adapters/trpc/console.js +2 -10
- package/dist/adapters/trpc/console.js.map +1 -1
- package/dist/adapters/trpc/context.d.ts +2 -2
- package/dist/adapters/trpc/fleet.d.ts +12 -1
- package/dist/adapters/trpc/fleet.js +9 -3
- package/dist/adapters/trpc/fleet.js.map +1 -1
- package/dist/adapters/trpc/router.d.ts +17 -11
- package/dist/adapters/trpc/ship.d.ts +6 -2
- package/dist/adapters/trpc/ship.js +4 -2
- package/dist/adapters/trpc/ship.js.map +1 -1
- package/dist/adapters/trpc/trpc.js +1 -0
- package/dist/adapters/trpc/trpc.js.map +1 -1
- package/dist/app.d.ts +4 -0
- package/dist/app.js +71 -2
- package/dist/app.js.map +1 -1
- package/dist/bin/aeolus-core.js +5 -1
- package/dist/bin/aeolus-core.js.map +1 -1
- package/dist/domain/identity/operator-account.d.ts +1 -3
- package/dist/domain/identity/operator-account.js.map +1 -1
- package/dist/domain/identity/ports.d.ts +1 -6
- package/dist/domain/identity/read-account.d.ts +2 -3
- package/dist/domain/identity/read-account.js +1 -2
- package/dist/domain/identity/read-account.js.map +1 -1
- package/dist/domain/messaging/exchange.d.ts +3 -1
- package/dist/domain/messaging/exchange.js +10 -6
- package/dist/domain/messaging/exchange.js.map +1 -1
- package/dist/domain/messaging/fill-message-metadata.d.ts +29 -0
- package/dist/domain/messaging/fill-message-metadata.js +54 -0
- package/dist/domain/messaging/fill-message-metadata.js.map +1 -0
- package/dist/domain/messaging/message.d.ts +4 -0
- package/dist/domain/messaging/message.js +7 -1
- package/dist/domain/messaging/message.js.map +1 -1
- package/dist/domain/messaging/ports.d.ts +62 -2
- 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/read-exchanges.d.ts +1 -0
- package/dist/domain/messaging/read-exchanges.js +2 -1
- package/dist/domain/messaging/read-exchanges.js.map +1 -1
- package/dist/domain/messaging/retired-asker.d.ts +33 -0
- package/dist/domain/messaging/retired-asker.js +81 -0
- package/dist/domain/messaging/retired-asker.js.map +1 -0
- package/dist/domain/messaging/turn-on-sealing.js +1 -1
- package/dist/domain/messaging/turn-on-sealing.js.map +1 -1
- package/dist/domain/registry/commission-ship.d.ts +2 -1
- package/dist/domain/registry/commission-ship.js +3 -2
- package/dist/domain/registry/commission-ship.js.map +1 -1
- package/dist/domain/registry/delete-fleet.d.ts +5 -3
- package/dist/domain/registry/delete-fleet.js +6 -4
- package/dist/domain/registry/delete-fleet.js.map +1 -1
- package/dist/domain/registry/end-leases-after-restore.d.ts +29 -0
- package/dist/domain/registry/end-leases-after-restore.js +31 -0
- package/dist/domain/registry/end-leases-after-restore.js.map +1 -0
- package/dist/domain/registry/found-fleet.js +1 -1
- package/dist/domain/registry/found-fleet.js.map +1 -1
- package/dist/domain/registry/lease.d.ts +3 -2
- package/dist/domain/registry/lease.js.map +1 -1
- package/dist/domain/registry/ports.d.ts +30 -6
- package/dist/domain/registry/public.d.ts +1 -1
- package/dist/domain/registry/read-last-named-owner.d.ts +15 -0
- package/dist/domain/registry/read-last-named-owner.js +15 -0
- package/dist/domain/registry/read-last-named-owner.js.map +1 -0
- package/dist/domain/registry/remove-deleted-fleets.d.ts +30 -0
- package/dist/domain/registry/remove-deleted-fleets.js +54 -0
- package/dist/domain/registry/remove-deleted-fleets.js.map +1 -0
- package/dist/domain/registry/retire-ship.d.ts +6 -2
- package/dist/domain/registry/retire-ship.js +9 -1
- package/dist/domain/registry/retire-ship.js.map +1 -1
- package/dist/domain/registry/ship.d.ts +9 -5
- package/dist/domain/registry/ship.js +33 -4
- package/dist/domain/registry/ship.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/follow-fleet.d.ts +5 -3
- package/dist/domain/shared/follow-fleet.js +11 -2
- package/dist/domain/shared/follow-fleet.js.map +1 -1
- package/dist/domain/shared/health-snapshot.js +7 -2
- package/dist/domain/shared/health-snapshot.js.map +1 -1
- package/dist/domain/shared/read-sent-message.d.ts +7 -4
- package/dist/domain/shared/read-sent-message.js +6 -15
- package/dist/domain/shared/read-sent-message.js.map +1 -1
- package/dist/maintenance-pass.d.ts +1 -1
- package/dist/maintenance-pass.js +4 -1
- package/dist/maintenance-pass.js.map +1 -1
- package/dist/testing/container-sweeper.d.ts +20 -0
- package/dist/testing/container-sweeper.js +47 -14
- package/dist/testing/container-sweeper.js.map +1 -1
- package/dist/testing/postgres-global-setup.js +2 -1
- package/dist/testing/postgres-global-setup.js.map +1 -1
- package/dist/testing/stop-container.d.ts +21 -0
- package/dist/testing/stop-container.js +31 -0
- package/dist/testing/stop-container.js.map +1 -0
- package/dist/wiring.d.ts +8 -2
- package/dist/wiring.js +7 -3
- package/dist/wiring.js.map +1 -1
- package/package.json +3 -2
- package/src/adapters/prisma/migrations/20261113120000_events_owner_set_index/migration.sql +4 -0
- package/src/adapters/prisma/migrations/20261115090000_messages_asked_answered_question_id/migration.sql +20 -0
- package/src/adapters/prisma/migrations/20261115100000_unseen_plain_messages/migration.sql +3 -0
- package/src/adapters/prisma/migrations/20261115110000_theme_per_browser/migration.sql +4 -0
- package/src/adapters/prisma/migrations/20261115120000_fleet_deleted_at/migration.sql +2 -0
- package/src/adapters/prisma/schema.prisma +29 -14
- package/dist/domain/identity/set-theme.d.ts +0 -21
- package/dist/domain/identity/set-theme.js +0 -19
- package/dist/domain/identity/set-theme.js.map +0 -1
package/README.md
CHANGED
|
@@ -21,6 +21,7 @@ npx aeolus-core start
|
|
|
21
21
|
| `aeolus-core fleet:init --name "<fleet name>"` | See Server commands below |
|
|
22
22
|
| `aeolus-core sign-in` | See Server commands below |
|
|
23
23
|
| `aeolus-core operator:reset-password` | See Server commands below |
|
|
24
|
+
| `aeolus-core fleet:restored` | See Server commands below |
|
|
24
25
|
| `aeolus-core fleet:recover-keys --identity <file> --company-key <ARN>` | See Recovering a sealed fleet's keys below: run on the company's own computer, not the server |
|
|
25
26
|
|
|
26
27
|
Prisma Migrate holds a Postgres advisory lock while it migrates, so two processes starting at once never migrate at once: the second waits, then finds nothing left to apply. It never asks Prisma's servers for a newer version.
|
|
@@ -92,9 +93,10 @@ Run on the server, against the configured database, once it is migrated:
|
|
|
92
93
|
|
|
93
94
|
| Command | Does |
|
|
94
95
|
| --- | --- |
|
|
95
|
-
| `aeolus-core fleet:init --name "<fleet name>"` | Creates the fleet, its operator ship `argo` and argo's own sign-in, with no email and no password, asking nothing. Prints a console link (`CONSOLE_ORIGIN/sign-in/ticket?ticket=...`) that signs in as argo: one use, valid 15 minutes. Refuses when a fleet already exists |
|
|
96
|
+
| `aeolus-core fleet:init --name "<fleet name>"` | Creates the fleet, its operator ship `argo` and argo's own sign-in, with no email and no password, asking nothing. Prints a console link (`CONSOLE_ORIGIN/sign-in/ticket?ticket=...`) that signs in as argo: one use, valid 15 minutes. Refuses when a fleet already exists, with exit code 3 (0 done, 1 any other failure, 2 wrong usage), so a script can tell "already set up" from an error |
|
|
96
97
|
| `aeolus-core sign-in` | Prints a fresh sign-in link as `fleet:init` does, for another browser or once the first one expired. Signing in with it ends any other sign-in as argo |
|
|
97
98
|
| `aeolus-core operator:reset-password` | Asks for a new operator password (twice, not shown, at least 12 characters) and sets it. The old one stops working and every console session ends. Refused while argo has no password yet (sign in with a link and set one in Settings), and for an operator a hosting installation created, who signs in only through the hosting service |
|
|
99
|
+
| `aeolus-core fleet:restored` | Run once after `pg_restore` and before `start`. It first applies the migrations a backup made by an older core lacks, as `start` does. Then, in every fleet, each in one transaction, it ends every open lease but argo's (`LeaseRevoked`, reason `restored`): their deliveries in flight go back to pending, and a session still holding a crew token from before the restore is answered `LEASE_ENDED`. It changes nothing else. Refused while a core process is connected to the database |
|
|
98
100
|
|
|
99
101
|
`operator:reset-password` reads its answers a line at a time from standard input, so a script can pipe them in. Like the API, the commands refuse any answer or name holding the character U+0000, naming what holds it, and change nothing. In this repository they run as `npm run fleet:init -w @aeolus-fleet/core -- --name "<fleet name>"`, `npm run sign-in -w @aeolus-fleet/core` and `npm run operator:reset-password -w @aeolus-fleet/core`, and `npm run db:migrate -w @aeolus-fleet/core` migrates.
|
|
100
102
|
|
|
@@ -156,7 +158,7 @@ A database error is logged by its codes only, under `database`: Prisma's code, P
|
|
|
156
158
|
|
|
157
159
|
A request Fastify refuses before any procedure runs answers in the same `{ "code", "message" }` shape: a body that is not JSON `400 BAD_REQUEST`, a body over 1 MiB `413 PAYLOAD_TOO_LARGE`, a body of another content type `415 UNSUPPORTED_MEDIA_TYPE`, and a path or method nothing serves `404 NOT_FOUND`.
|
|
158
160
|
|
|
159
|
-
The operator's account: `console.account` answers `kind: "operator"` with the signed-in operator's email
|
|
161
|
+
The operator's account: `console.account` answers `kind: "operator"` with the signed-in operator's email and this console session (`{ "device": "Mac · Chrome", "since": "..." }`; the device is worded from the sign-in's User-Agent and is also argo's lease location), or `kind: "viewer"` with the session alone for a viewer session (decision 0022). It answers only a console session (`FORBIDDEN` otherwise). The theme is the browser's, kept by the console in a cookie (docs/design/header-across-apps.md); core stores none.
|
|
160
162
|
|
|
161
163
|
Last seen: every call a crew token or the console session authenticates marks its lease seen (`leases.last_seen_at`), in the statement that looks the caller up. `fleet.list` and `fleet.ship` answer `lastSeenAt` for a crewed ship (its claim until it calls again), for the viewer ship the last use of its most recent viewer session, and null otherwise. Observation only (ADR 0016): no heartbeat, nothing ends a lease because a ship went quiet. With the Aeolus Fleet plugin, the watcher's inbox check keeps it fresh about every 25 s.
|
|
162
164
|
|
|
@@ -6,7 +6,7 @@ import { type CommandIo, type ExitCode } from './io.js';
|
|
|
6
6
|
* `fleet:init --name <name>`: creates the fleet, its operator ship argo and
|
|
7
7
|
* argo's own sign-in, asking nothing, and prints a one-use console link that
|
|
8
8
|
* signs in as argo (accounts design, A1). An email and password come later,
|
|
9
|
-
* from Settings. Refuses when a fleet already exists; the use case checks
|
|
9
|
+
* from Settings. Refuses with exit code 3 when a fleet already exists; the use case checks
|
|
10
10
|
* again under its lock, for two runs at once.
|
|
11
11
|
*/
|
|
12
12
|
export declare function fleetInit(args: string[], deps: {
|
|
@@ -2,12 +2,14 @@ import { parseArgs } from 'node:util';
|
|
|
2
2
|
import { nulRefusal } from './io.js';
|
|
3
3
|
import { SIGN_IN_LINK_NOTE, signInLinkOf } from './sign-in-link.js';
|
|
4
4
|
const NOTHING_CREATED = 'Nothing was created.';
|
|
5
|
+
/** Exit code when the fleet already exists, so a start script can tell "already set up" from a failure. */
|
|
6
|
+
const FLEET_EXISTS_EXIT_CODE = 3;
|
|
5
7
|
const USAGE = 'Usage: aeolus-core fleet:init --name "<fleet name>"';
|
|
6
8
|
/**
|
|
7
9
|
* `fleet:init --name <name>`: creates the fleet, its operator ship argo and
|
|
8
10
|
* argo's own sign-in, asking nothing, and prints a one-use console link that
|
|
9
11
|
* signs in as argo (accounts design, A1). An email and password come later,
|
|
10
|
-
* from Settings. Refuses when a fleet already exists; the use case checks
|
|
12
|
+
* from Settings. Refuses with exit code 3 when a fleet already exists; the use case checks
|
|
11
13
|
* again under its lock, for two runs at once.
|
|
12
14
|
*/
|
|
13
15
|
export async function fleetInit(args, deps) {
|
|
@@ -31,12 +33,12 @@ export async function fleetInit(args, deps) {
|
|
|
31
33
|
}
|
|
32
34
|
if ((await deps.listFleets()).length > 0) {
|
|
33
35
|
io.err(`A fleet already exists: a fleet is initialised only once. ${NOTHING_CREATED}`);
|
|
34
|
-
return
|
|
36
|
+
return FLEET_EXISTS_EXIT_CODE;
|
|
35
37
|
}
|
|
36
38
|
const initialised = await deps.initialiseFleet({ name });
|
|
37
39
|
if (!initialised.isOk) {
|
|
38
40
|
io.err(initialised.error.message);
|
|
39
|
-
return 1;
|
|
41
|
+
return initialised.error.kind === 'FLEET_ALREADY_EXISTS' ? FLEET_EXISTS_EXIT_CODE : 1;
|
|
40
42
|
}
|
|
41
43
|
const { fleetId, operatorShipId, operatorId } = initialised.value;
|
|
42
44
|
const created = [`Fleet initialised: ${fleetId}`, `Operator ship argo: ${operatorShipId}`, `Operator account: ${operatorId}`];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fleet-init.js","sourceRoot":"","sources":["../../../src/adapters/cli/fleet-init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAKtC,OAAO,EAAE,UAAU,EAAiC,MAAM,SAAS,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEpE,MAAM,eAAe,GAAG,sBAAsB,CAAC;AAE/C,MAAM,KAAK,GAAG,qDAAqD,CAAC;AAEpE;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,IAAc,EACd,IAA0I;IAE1I,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;IAEpB,IAAI,IAAwB,CAAC;IAC7B,IAAI,CAAC;QACH,CAAC,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;IAC/F,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;QAC9E,OAAO,CAAC,CAAC;IACX,CAAC;IACD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,EAAE,CAAC,GAAG,CAAC,uCAAuC,KAAK,EAAE,CAAC,CAAC;QACvD,OAAO,CAAC,CAAC;IACX,CAAC;IACD,MAAM,WAAW,GAAG,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC;IACtF,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC9B,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACpB,OAAO,CAAC,CAAC;IACX,CAAC;IAED,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzC,EAAE,CAAC,GAAG,CAAC,6DAA6D,eAAe,EAAE,CAAC,CAAC;QACvF,OAAO,
|
|
1
|
+
{"version":3,"file":"fleet-init.js","sourceRoot":"","sources":["../../../src/adapters/cli/fleet-init.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { EndLeasesAfterRestore } from '../../domain/registry/end-leases-after-restore.js';
|
|
2
|
+
import type { ListFleets } from '../../domain/registry/list-fleets.js';
|
|
3
|
+
import type { CommandIo, ExitCode } from './io.js';
|
|
4
|
+
/**
|
|
5
|
+
* `fleet:restored`: run once after `pg_restore` and before `aeolus-core
|
|
6
|
+
* start` (docs/design/self-hosting-operations.md, section 5). It first
|
|
7
|
+
* applies the migrations a backup made by an older core lacks, as `start`
|
|
8
|
+
* does. Then, in every fleet of the installation, each in its own unit of
|
|
9
|
+
* work, it ends every open lease but argo's with the reason `restored`.
|
|
10
|
+
* Refused while a core process is connected to the database, whose crews it
|
|
11
|
+
* would cut off mid-work.
|
|
12
|
+
*/
|
|
13
|
+
export declare function fleetRestored(args: string[], deps: {
|
|
14
|
+
isCoreConnected: () => Promise<boolean>;
|
|
15
|
+
migrateDatabase: () => Promise<void>;
|
|
16
|
+
listFleets: ListFleets;
|
|
17
|
+
endLeasesAfterRestore: EndLeasesAfterRestore;
|
|
18
|
+
io: CommandIo;
|
|
19
|
+
}): Promise<ExitCode>;
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { parseArgs } from 'node:util';
|
|
2
|
+
const USAGE = 'Usage: aeolus-core fleet:restored';
|
|
3
|
+
/**
|
|
4
|
+
* `fleet:restored`: run once after `pg_restore` and before `aeolus-core
|
|
5
|
+
* start` (docs/design/self-hosting-operations.md, section 5). It first
|
|
6
|
+
* applies the migrations a backup made by an older core lacks, as `start`
|
|
7
|
+
* does. Then, in every fleet of the installation, each in its own unit of
|
|
8
|
+
* work, it ends every open lease but argo's with the reason `restored`.
|
|
9
|
+
* Refused while a core process is connected to the database, whose crews it
|
|
10
|
+
* would cut off mid-work.
|
|
11
|
+
*/
|
|
12
|
+
export async function fleetRestored(args, deps) {
|
|
13
|
+
const { io } = deps;
|
|
14
|
+
try {
|
|
15
|
+
parseArgs({ args, options: {}, strict: true });
|
|
16
|
+
}
|
|
17
|
+
catch (error) {
|
|
18
|
+
io.err(`${error instanceof Error ? error.message : String(error)}\n${USAGE}`);
|
|
19
|
+
return 2;
|
|
20
|
+
}
|
|
21
|
+
if (await deps.isCoreConnected()) {
|
|
22
|
+
io.err('A core process is connected to this database: stop every core process first. Nothing changed.');
|
|
23
|
+
return 1;
|
|
24
|
+
}
|
|
25
|
+
await deps.migrateDatabase();
|
|
26
|
+
for (const fleet of await deps.listFleets()) {
|
|
27
|
+
const ended = await deps.endLeasesAfterRestore({ fleetId: fleet.id });
|
|
28
|
+
if (!ended.isOk) {
|
|
29
|
+
io.err(ended.error.message);
|
|
30
|
+
return 1;
|
|
31
|
+
}
|
|
32
|
+
const { endedLeases } = ended.value;
|
|
33
|
+
io.out(`Ended ${String(endedLeases)} ${endedLeases === 1 ? 'lease' : 'leases'} in fleet ${fleet.name}, reason restored.`);
|
|
34
|
+
}
|
|
35
|
+
return 0;
|
|
36
|
+
}
|
|
37
|
+
//# sourceMappingURL=fleet-restored.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fleet-restored.js","sourceRoot":"","sources":["../../../src/adapters/cli/fleet-restored.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAMtC,MAAM,KAAK,GAAG,mCAAmC,CAAC;AAElD;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,IAAc,EACd,IAMC;IAED,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;IAEpB,IAAI,CAAC;QACH,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IACjD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;QAC9E,OAAO,CAAC,CAAC;IACX,CAAC;IACD,IAAI,MAAM,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC;QACjC,EAAE,CAAC,GAAG,CAAC,+FAA+F,CAAC,CAAC;QACxG,OAAO,CAAC,CAAC;IACX,CAAC;IACD,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;IAE7B,KAAK,MAAM,KAAK,IAAI,MAAM,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC;QAC5C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACtE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAChB,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC5B,OAAO,CAAC,CAAC;QACX,CAAC;QACD,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC;QACpC,EAAE,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,WAAW,CAAC,IAAI,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,aAAa,KAAK,CAAC,IAAI,oBAAoB,CAAC,CAAC;IAC5H,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC"}
|
|
@@ -10,8 +10,11 @@ export interface CommandIo {
|
|
|
10
10
|
isHidden?: boolean;
|
|
11
11
|
}): Promise<string | undefined>;
|
|
12
12
|
}
|
|
13
|
-
/**
|
|
14
|
-
|
|
13
|
+
/**
|
|
14
|
+
* Exit codes: 0 done, 1 refused by the domain or the installation, 2 wrong usage,
|
|
15
|
+
* 3 `fleet:init` found the fleet already there (a script tells "already set up" from a failure).
|
|
16
|
+
*/
|
|
17
|
+
export type ExitCode = 0 | 1 | 2 | 3;
|
|
15
18
|
export type NewPassword = {
|
|
16
19
|
kind: 'given';
|
|
17
20
|
password: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"io.js","sourceRoot":"","sources":["../../../src/adapters/cli/io.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"io.js","sourceRoot":"","sources":["../../../src/adapters/cli/io.ts"],"names":[],"mappings":"AAmBA;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EAAa,EAAE,QAAgB;IAClE,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5D,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3E,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACrD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAC3B,CAAC;IACD,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;AAClF,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,UAAU,CAAC,KAAgD,EAAE,OAAe;IAC1F,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAClE,OAAO,OAAO,IAAI,OAAO,OAAO,CAAC,IAAI,4CAA4C,OAAO,EAAE,CAAC;AAC7F,CAAC"}
|
|
@@ -11,5 +11,7 @@ export declare function runCommand(args: string[], command: (run: {
|
|
|
11
11
|
args: string[];
|
|
12
12
|
useCases: UseCases;
|
|
13
13
|
consoleOrigin: string;
|
|
14
|
+
isCoreConnected: () => Promise<boolean>;
|
|
15
|
+
migrateDatabase: () => Promise<void>;
|
|
14
16
|
io: CommandIo;
|
|
15
17
|
}) => Promise<ExitCode>): Promise<never>;
|
package/dist/adapters/cli/run.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { ConfigError, loadConfig } from '../../config.js';
|
|
2
2
|
import { createUseCases } from '../../wiring.js';
|
|
3
3
|
import { createPrismaClient } from '../prisma/client.js';
|
|
4
|
+
import { isCoreConnected } from '../prisma/core-connections.js';
|
|
4
5
|
import { describeFailure } from '../prisma/failure-log.js';
|
|
5
|
-
import { MigrationError } from '../prisma/migrate.js';
|
|
6
|
+
import { migrateDatabase, MigrationError } from '../prisma/migrate.js';
|
|
6
7
|
import { terminalIo } from './terminal.js';
|
|
7
8
|
/**
|
|
8
9
|
* Runs a server command at the operator's terminal and exits with its code.
|
|
@@ -30,7 +31,14 @@ export function runCommand(args, command) {
|
|
|
30
31
|
const config = loadConfig(process.env);
|
|
31
32
|
const prisma = createPrismaClient(config.databaseUrl);
|
|
32
33
|
try {
|
|
33
|
-
return await command({
|
|
34
|
+
return await command({
|
|
35
|
+
args,
|
|
36
|
+
useCases: createUseCases({ prisma, hasInstallation: config.installationToken !== undefined }),
|
|
37
|
+
consoleOrigin: config.consoleOrigin,
|
|
38
|
+
isCoreConnected: () => isCoreConnected(prisma),
|
|
39
|
+
migrateDatabase: () => migrateDatabase(config.databaseUrl),
|
|
40
|
+
io,
|
|
41
|
+
});
|
|
34
42
|
}
|
|
35
43
|
finally {
|
|
36
44
|
await prisma.$disconnect();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/adapters/cli/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAiB,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/adapters/cli/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAiB,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEvE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAA6C;IAC/E,MAAM,EAAE,GAAG,UAAU,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAChG,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACH,IAAI,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,EAAE,CAAC,GAAG,CAAC,KAAK,YAAY,WAAW,IAAI,KAAK,YAAY,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QACjH,IAAI,GAAG,CAAC,CAAC;IACX,CAAC;YAAS,CAAC;QACT,EAAE,CAAC,KAAK,EAAE,CAAC;IACb,CAAC;IACD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACrB,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,UAAU,CACxB,IAAc,EACd,OAAgM;IAEhM,OAAO,aAAa,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QAChC,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACtD,IAAI,CAAC;YACH,OAAO,MAAM,OAAO,CAAC;gBACnB,IAAI;gBACJ,QAAQ,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;gBAC7F,aAAa,EAAE,MAAM,CAAC,aAAa;gBACnC,eAAe,EAAE,GAAG,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC;gBAC9C,eAAe,EAAE,GAAG,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,WAAW,CAAC;gBAC1D,EAAE;aACH,CAAC,CAAC;QACL,CAAC;gBAAS,CAAC;YACT,MAAM,MAAM,CAAC,WAAW,EAAE,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -2,6 +2,12 @@ import { PrismaClient, type Prisma } from './generated/client.js';
|
|
|
2
2
|
export type { PrismaClient } from './generated/client.js';
|
|
3
3
|
/** The client itself, or the client of one interactive transaction. Repositories take either. */
|
|
4
4
|
export type Db = PrismaClient | Prisma.TransactionClient;
|
|
5
|
+
/**
|
|
6
|
+
* How long a call waits for a connection from the pool, in a transaction or
|
|
7
|
+
* outside one (such as the crew-token lookup), before it is refused as busy
|
|
8
|
+
* (fleet-busy.ts). The pool keeps pg's default size.
|
|
9
|
+
*/
|
|
10
|
+
export declare const CONNECTION_WAIT_MS = 10000;
|
|
5
11
|
/**
|
|
6
12
|
* How long a bulk operation's transaction may run instead: one whose work
|
|
7
13
|
* grows with the fleet's history, such as a fleet delete, so it legitimately
|
|
@@ -12,10 +18,10 @@ export declare const BULK_TRANSACTION_TIME_MS = 30000;
|
|
|
12
18
|
export declare function createPrismaClient(databaseUrl: string): PrismaClient;
|
|
13
19
|
/**
|
|
14
20
|
* A client as createPrismaClient makes, that also hands each statement it
|
|
15
|
-
* runs to `onStatement`: for a scale test that counts the statements a read
|
|
21
|
+
* runs and its parameters to `onStatement`: for a scale test that counts the statements a read
|
|
16
22
|
* runs, which a time would not show without flaking.
|
|
17
23
|
*/
|
|
18
|
-
export declare function createPrismaClientTellingStatements(databaseUrl: string, onStatement: (statement: string) => void): PrismaClient;
|
|
24
|
+
export declare function createPrismaClientTellingStatements(databaseUrl: string, onStatement: (statement: string, params: string) => void): PrismaClient;
|
|
19
25
|
/** Throws when the database cannot answer a trivial query. */
|
|
20
26
|
export declare function checkDatabase(prisma: PrismaClient): Promise<void>;
|
|
21
27
|
/** The latest migration applied to the database, by name; null before the first. */
|
|
@@ -5,7 +5,7 @@ import { PrismaClient } from './generated/client.js';
|
|
|
5
5
|
* outside one (such as the crew-token lookup), before it is refused as busy
|
|
6
6
|
* (fleet-busy.ts). The pool keeps pg's default size.
|
|
7
7
|
*/
|
|
8
|
-
const CONNECTION_WAIT_MS = 10_000;
|
|
8
|
+
export const CONNECTION_WAIT_MS = 10_000;
|
|
9
9
|
/**
|
|
10
10
|
* How long a call's transaction may run before Prisma rolls it back; the
|
|
11
11
|
* call is then refused as busy too (fleet-busy.ts).
|
|
@@ -26,7 +26,7 @@ export function createPrismaClient(databaseUrl) {
|
|
|
26
26
|
}
|
|
27
27
|
/**
|
|
28
28
|
* A client as createPrismaClient makes, that also hands each statement it
|
|
29
|
-
* runs to `onStatement`: for a scale test that counts the statements a read
|
|
29
|
+
* runs and its parameters to `onStatement`: for a scale test that counts the statements a read
|
|
30
30
|
* runs, which a time would not show without flaking.
|
|
31
31
|
*/
|
|
32
32
|
export function createPrismaClientTellingStatements(databaseUrl, onStatement) {
|
|
@@ -36,7 +36,7 @@ export function createPrismaClientTellingStatements(databaseUrl, onStatement) {
|
|
|
36
36
|
log: [{ emit: 'event', level: 'query' }],
|
|
37
37
|
});
|
|
38
38
|
client.$on('query', (event) => {
|
|
39
|
-
onStatement(event.query);
|
|
39
|
+
onStatement(event.query, event.params);
|
|
40
40
|
});
|
|
41
41
|
return client;
|
|
42
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/adapters/prisma/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAe,MAAM,uBAAuB,CAAC;AAOlE;;;;GAIG;AACH,MAAM,kBAAkB,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/adapters/prisma/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAe,MAAM,uBAAuB,CAAC;AAOlE;;;;GAIG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAEzC;;;GAGG;AACH,MAAM,mBAAmB,GAAG,KAAK,CAAC;AAElC;;;;GAIG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC;AAE/C,8EAA8E;AAC9E,MAAM,UAAU,kBAAkB,CAAC,WAAmB;IACpD,OAAO,IAAI,YAAY,CAAC;QACtB,OAAO,EAAE,IAAI,QAAQ,CAAC,EAAE,gBAAgB,EAAE,WAAW,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,CAAC;QACrG,kBAAkB,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAE,mBAAmB,EAAE;KAClF,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mCAAmC,CAAC,WAAmB,EAAE,WAAwD;IAC/H,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC;QAC9B,OAAO,EAAE,IAAI,QAAQ,CAAC,EAAE,gBAAgB,EAAE,WAAW,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,CAAC;QACrG,kBAAkB,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAE,mBAAmB,EAAE;QACjF,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;KACzC,CAAC,CAAC;IACH,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QAC5B,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,8DAA8D;AAC9D,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAAoB;IACtD,MAAM,MAAM,CAAC,SAAS,CAAA,UAAU,CAAC;AACnC,CAAC;AAED,oFAAoF;AACpF,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,EAAgB;IACpD,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,EAAE,CAAC,SAAS,CAA8B;;;;YAIpD,CAAC;IACX,OAAO,GAAG,EAAE,cAAc,IAAI,IAAI,CAAC;AACrC,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { Prisma } from './generated/client.js';
|
|
2
|
+
/** Whether the content type is a question's or a replacement's. */
|
|
3
|
+
export declare function askingContentTypeText(column: string): string;
|
|
4
|
+
export declare function isAskingContentType(column: string): Prisma.Sql;
|
|
5
|
+
export declare function isAnswerContentType(column: string): Prisma.Sql;
|
|
6
|
+
/** Whether the content type is none of the conventions'. */
|
|
7
|
+
export declare function isNoConventionContentType(column: string): Prisma.Sql;
|
|
8
|
+
/** The uuid a question's or a replacement's plain payload names as its own. */
|
|
9
|
+
export declare function askedQuestionIdIn(payload: string): Prisma.Sql;
|
|
10
|
+
/** The uuid an answer's plain payload names. */
|
|
11
|
+
export declare function answeredQuestionIdIn(payload: string): Prisma.Sql;
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The SQL that tells content types apart and reads a question's uuid from a
|
|
3
|
+
* plain payload, built from the content types common owns. The types go in
|
|
4
|
+
* as literals, not parameters, so a partial index's predicate built here
|
|
5
|
+
* matches the query built here under a generic plan too. Columns are internal
|
|
6
|
+
* SQL names, never request input.
|
|
7
|
+
*/
|
|
8
|
+
import { ANSWER_CONTENT_TYPE, CONVENTION_CONTENT_TYPES, QUESTION_CONTENT_TYPE, REPLACEMENT_CONTENT_TYPE } from '@aeolus-fleet/common';
|
|
9
|
+
import { Prisma } from './generated/client.js';
|
|
10
|
+
/** The content types whose payload names its own question uuid: a question and a replacement's new question. */
|
|
11
|
+
const ASKING_CONTENT_TYPES = [QUESTION_CONTENT_TYPE, REPLACEMENT_CONTENT_TYPE];
|
|
12
|
+
function literalOf(value) {
|
|
13
|
+
return `'${value.replaceAll("'", "''")}'`;
|
|
14
|
+
}
|
|
15
|
+
/** A content type's essence in SQL, as essenceOf in common takes it. */
|
|
16
|
+
function essenceOf(column) {
|
|
17
|
+
return `lower(btrim(split_part(${column}, ';', 1)))`;
|
|
18
|
+
}
|
|
19
|
+
/** Whether the content type is a question's or a replacement's. */
|
|
20
|
+
export function askingContentTypeText(column) {
|
|
21
|
+
return `${essenceOf(column)} IN (${ASKING_CONTENT_TYPES.map(literalOf).join(', ')})`;
|
|
22
|
+
}
|
|
23
|
+
export function isAskingContentType(column) {
|
|
24
|
+
return Prisma.raw(askingContentTypeText(column));
|
|
25
|
+
}
|
|
26
|
+
export function isAnswerContentType(column) {
|
|
27
|
+
return Prisma.raw(`${essenceOf(column)} = ${literalOf(ANSWER_CONTENT_TYPE)}`);
|
|
28
|
+
}
|
|
29
|
+
/** Whether the content type is none of the conventions'. */
|
|
30
|
+
export function isNoConventionContentType(column) {
|
|
31
|
+
return Prisma.raw(`${essenceOf(column)} NOT IN (${CONVENTION_CONTENT_TYPES.map(literalOf).join(', ')})`);
|
|
32
|
+
}
|
|
33
|
+
/** The uuid a question's or a replacement's plain payload names as its own. */
|
|
34
|
+
export function askedQuestionIdIn(payload) {
|
|
35
|
+
return Prisma.raw(`substring(${payload} from '"id"\\s*:\\s*"([^"]*)"')`);
|
|
36
|
+
}
|
|
37
|
+
/** The uuid an answer's plain payload names. */
|
|
38
|
+
export function answeredQuestionIdIn(payload) {
|
|
39
|
+
return Prisma.raw(`substring(${payload} from '"questionId"\\s*:\\s*"([^"]*)"')`);
|
|
40
|
+
}
|
|
41
|
+
//# sourceMappingURL=content-type-sql.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"content-type-sql.js","sourceRoot":"","sources":["../../../src/adapters/prisma/content-type-sql.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAEtI,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,gHAAgH;AAChH,MAAM,oBAAoB,GAAsB,CAAC,qBAAqB,EAAE,wBAAwB,CAAC,CAAC;AAElG,SAAS,SAAS,CAAC,KAAa;IAC9B,OAAO,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC;AAC5C,CAAC;AAED,wEAAwE;AACxE,SAAS,SAAS,CAAC,MAAc;IAC/B,OAAO,0BAA0B,MAAM,aAAa,CAAC;AACvD,CAAC;AAED,mEAAmE;AACnE,MAAM,UAAU,qBAAqB,CAAC,MAAc;IAClD,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,oBAAoB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;AACvF,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,MAAc;IAChD,OAAO,MAAM,CAAC,GAAG,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,MAAc;IAChD,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,SAAS,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;AAChF,CAAC;AAED,4DAA4D;AAC5D,MAAM,UAAU,yBAAyB,CAAC,MAAc;IACtD,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,YAAY,wBAAwB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC3G,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,OAAO,MAAM,CAAC,GAAG,CAAC,aAAa,OAAO,iCAAiC,CAAC,CAAC;AAC3E,CAAC;AAED,gDAAgD;AAChD,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAClD,OAAO,MAAM,CAAC,GAAG,CAAC,aAAa,OAAO,yCAAyC,CAAC,CAAC;AACnF,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { Db } from './client.js';
|
|
2
|
+
/**
|
|
3
|
+
* Whether a core process is connected to this database now: every running
|
|
4
|
+
* core holds its delivery listener's connection, named by its
|
|
5
|
+
* `application_name`. A command that must run with core stopped, such as
|
|
6
|
+
* `fleet:restored`, asks first.
|
|
7
|
+
*/
|
|
8
|
+
export declare function isCoreConnected(db: Db): Promise<boolean>;
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import { LISTENER_APPLICATION_NAME } from './delivery-notices.js';
|
|
3
|
+
const connectedRowSchema = z.object({ connected: z.boolean() });
|
|
4
|
+
/**
|
|
5
|
+
* Whether a core process is connected to this database now: every running
|
|
6
|
+
* core holds its delivery listener's connection, named by its
|
|
7
|
+
* `application_name`. A command that must run with core stopped, such as
|
|
8
|
+
* `fleet:restored`, asks first.
|
|
9
|
+
*/
|
|
10
|
+
export async function isCoreConnected(db) {
|
|
11
|
+
const [row] = await db.$queryRaw `
|
|
12
|
+
SELECT EXISTS (
|
|
13
|
+
SELECT 1 FROM pg_stat_activity
|
|
14
|
+
WHERE datname = current_database() AND application_name = ${LISTENER_APPLICATION_NAME}
|
|
15
|
+
) AS connected`;
|
|
16
|
+
return connectedRowSchema.parse(row).connected;
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=core-connections.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"core-connections.js","sourceRoot":"","sources":["../../../src/adapters/prisma/core-connections.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAElE,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;AAEhE;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,EAAM;IAC1C,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,EAAE,CAAC,SAAS,CAAW;;;kEAGqB,yBAAyB;mBACxE,CAAC;IAClB,OAAO,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC;AACjD,CAAC"}
|
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
* The rollup of the list of exchanges on Postgres (docs/design/exchange-read,
|
|
3
3
|
* E4, E5): one row per person ship and each ship it exchanged with, holding
|
|
4
4
|
* the newest message between them and how many of the other ship's
|
|
5
|
-
* deliveries to it are still open
|
|
5
|
+
* deliveries to it are still open, separately counting plain messages as
|
|
6
|
+
* ackUpTo does. A unit of work collects what each
|
|
6
7
|
* delivery it makes or changes adds (exchange.ts says what), and writes the
|
|
7
8
|
* sums as its last statement before commit, in ship id order: a row's lock
|
|
8
9
|
* is then held only until commit, two label sends to the same person ships
|
|
@@ -26,6 +27,7 @@ export declare const changedDeliveryRowSchema: z.ZodObject<{
|
|
|
26
27
|
message_id: z.ZodType<`msg_${string}`, unknown, z.core.$ZodTypeInternals<`msg_${string}`, unknown>>;
|
|
27
28
|
sender_ship_id: z.ZodType<`shp_${string}`, unknown, z.core.$ZodTypeInternals<`shp_${string}`, unknown>>;
|
|
28
29
|
is_in_exchange: z.ZodBoolean;
|
|
30
|
+
content_type: z.ZodString;
|
|
29
31
|
before_state: z.ZodEnum<{
|
|
30
32
|
pending: "pending";
|
|
31
33
|
received: "received";
|
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
* The rollup of the list of exchanges on Postgres (docs/design/exchange-read,
|
|
3
3
|
* E4, E5): one row per person ship and each ship it exchanged with, holding
|
|
4
4
|
* the newest message between them and how many of the other ship's
|
|
5
|
-
* deliveries to it are still open
|
|
5
|
+
* deliveries to it are still open, separately counting plain messages as
|
|
6
|
+
* ackUpTo does. A unit of work collects what each
|
|
6
7
|
* delivery it makes or changes adds (exchange.ts says what), and writes the
|
|
7
8
|
* sums as its last statement before commit, in ship id order: a row's lock
|
|
8
9
|
* is then held only until commit, two label sends to the same person ships
|
|
@@ -15,7 +16,8 @@ import { z } from 'zod';
|
|
|
15
16
|
import { exchangeCountsOf } from '../../domain/messaging/exchange.js';
|
|
16
17
|
import { pageOf } from '../../domain/shared/page.js';
|
|
17
18
|
import { Prisma } from './generated/client.js';
|
|
18
|
-
import {
|
|
19
|
+
import { unseenPlainMessagesStatement } from './unseen-plain-messages.js';
|
|
20
|
+
import { pageWithMessages } from './page-with-messages.js';
|
|
19
21
|
/**
|
|
20
22
|
* A delivery row a statement changed, as it returns it for the rollup: its
|
|
21
23
|
* message, sender and whether it is in an exchange, and its state and
|
|
@@ -26,6 +28,7 @@ export const changedDeliveryRowSchema = z.object({
|
|
|
26
28
|
message_id: idSchema('message'),
|
|
27
29
|
sender_ship_id: idSchema('ship'),
|
|
28
30
|
is_in_exchange: z.boolean(),
|
|
31
|
+
content_type: z.string(),
|
|
29
32
|
before_state: deliveryStateSchema,
|
|
30
33
|
before_reached_ship_id: idSchema('ship').nullable(),
|
|
31
34
|
after_state: deliveryStateSchema,
|
|
@@ -37,7 +40,7 @@ export function addChangedDelivery(rollups, row) {
|
|
|
37
40
|
if (!changed.is_in_exchange) {
|
|
38
41
|
return;
|
|
39
42
|
}
|
|
40
|
-
const side = { messageId: changed.message_id, senderShipId: changed.sender_ship_id };
|
|
43
|
+
const side = { messageId: changed.message_id, contentType: changed.content_type, senderShipId: changed.sender_ship_id };
|
|
41
44
|
rollups.add(changed.fleet_id, {
|
|
42
45
|
before: { ...side, reachedShipId: changed.before_reached_ship_id, state: changed.before_state },
|
|
43
46
|
after: { ...side, reachedShipId: changed.after_reached_ship_id, state: changed.after_state },
|
|
@@ -56,6 +59,7 @@ export function createPrismaExchangeRollups(db) {
|
|
|
56
59
|
otherShipId: count.otherShipId,
|
|
57
60
|
newestMessageId: sum && sum.newestMessageId > count.newestMessageId ? sum.newestMessageId : count.newestMessageId,
|
|
58
61
|
unacknowledged: (sum?.unacknowledged ?? 0) + count.unacknowledged,
|
|
62
|
+
unseenPlainMessages: (sum?.unseenPlainMessages ?? 0) + count.unseenPlainMessages,
|
|
59
63
|
});
|
|
60
64
|
}
|
|
61
65
|
},
|
|
@@ -66,33 +70,35 @@ export function createPrismaExchangeRollups(db) {
|
|
|
66
70
|
const rows = [...sums.entries()].toSorted(([first], [second]) => first.localeCompare(second)).map(([, sum]) => sum);
|
|
67
71
|
sums.clear();
|
|
68
72
|
await db.$executeRaw `
|
|
69
|
-
INSERT INTO exchanges (fleet_id, ship_id, other_ship_id, newest_message_id, unacknowledged)
|
|
70
|
-
SELECT sum.fleet_id, sum.ship_id, sum.other_ship_id, sum.newest_message_id, sum.unacknowledged
|
|
73
|
+
INSERT INTO exchanges (fleet_id, ship_id, other_ship_id, newest_message_id, unacknowledged, unseen_plain_messages)
|
|
74
|
+
SELECT sum.fleet_id, sum.ship_id, sum.other_ship_id, sum.newest_message_id, sum.unacknowledged, sum.unseen_plain_messages
|
|
71
75
|
FROM unnest(
|
|
72
76
|
${rows.map((row) => row.fleetId)}::text[], ${rows.map((row) => row.shipId)}::text[], ${rows.map((row) => row.otherShipId)}::text[],
|
|
73
|
-
${rows.map((row) => row.newestMessageId)}::text[], ${rows.map((row) => row.unacknowledged)}::int[]
|
|
74
|
-
) WITH ORDINALITY AS sum(fleet_id, ship_id, other_ship_id, newest_message_id, unacknowledged, place)
|
|
77
|
+
${rows.map((row) => row.newestMessageId)}::text[], ${rows.map((row) => row.unacknowledged)}::int[], ${rows.map((row) => row.unseenPlainMessages)}::int[]
|
|
78
|
+
) WITH ORDINALITY AS sum(fleet_id, ship_id, other_ship_id, newest_message_id, unacknowledged, unseen_plain_messages, place)
|
|
75
79
|
JOIN ships s ON s.fleet_id = sum.fleet_id AND s.id = sum.ship_id AND s.kind = 'person'
|
|
76
80
|
ORDER BY sum.place
|
|
77
81
|
ON CONFLICT (fleet_id, ship_id, other_ship_id) DO UPDATE
|
|
78
82
|
SET newest_message_id = GREATEST(exchanges.newest_message_id, EXCLUDED.newest_message_id),
|
|
79
|
-
unacknowledged = exchanges.unacknowledged + EXCLUDED.unacknowledged
|
|
83
|
+
unacknowledged = exchanges.unacknowledged + EXCLUDED.unacknowledged,
|
|
84
|
+
unseen_plain_messages = exchanges.unseen_plain_messages + EXCLUDED.unseen_plain_messages`;
|
|
80
85
|
},
|
|
81
86
|
};
|
|
82
87
|
}
|
|
83
|
-
const
|
|
88
|
+
const listedRow = z.object({
|
|
84
89
|
other_ship_id: idSchema('ship'),
|
|
85
90
|
name: z.string(),
|
|
86
91
|
type: z.string(),
|
|
87
92
|
kind: shipKindSchema,
|
|
88
93
|
newest_message_id: idSchema('message'),
|
|
89
94
|
unacknowledged: z.int(),
|
|
90
|
-
|
|
95
|
+
unseen_plain_messages: z.int(),
|
|
96
|
+
});
|
|
91
97
|
/** A page of a ship's rows, newest first, with the other ship of each. */
|
|
92
98
|
export function exchangeListStatement({ fleetId, shipId, cursor, limit }) {
|
|
93
99
|
const after = cursor === undefined ? Prisma.empty : Prisma.sql `AND e.newest_message_id < ${cursor}`;
|
|
94
100
|
return Prisma.sql `
|
|
95
|
-
SELECT e.other_ship_id, s.name, s.type, s.kind::text AS kind, e.newest_message_id, e.unacknowledged
|
|
101
|
+
SELECT e.fleet_id, e.other_ship_id, s.name, s.type, s.kind::text AS kind, e.newest_message_id, e.unacknowledged, COALESCE(e.unseen_plain_messages, ${unseenPlainMessagesStatement(Prisma.sql `e`)}) AS unseen_plain_messages
|
|
96
102
|
FROM exchanges e
|
|
97
103
|
JOIN ships s ON s.fleet_id = e.fleet_id AND s.id = e.other_ship_id
|
|
98
104
|
WHERE e.fleet_id = ${fleetId} AND e.ship_id = ${shipId} AND s.retired_at IS NULL ${after}
|
|
@@ -103,16 +109,14 @@ export function exchangeListStatement({ fleetId, shipId, cursor, limit }) {
|
|
|
103
109
|
export function createPrismaExchangeList(db) {
|
|
104
110
|
return {
|
|
105
111
|
page: async ({ fleetId, shipId, cursor, limit }) => {
|
|
106
|
-
const rows =
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
}
|
|
115
|
-
return { otherShip: { id: row.other_ship_id, name: row.name, type: row.type, kind: row.kind }, newestMessage, unacknowledged: row.unacknowledged };
|
|
112
|
+
const rows = await pageWithMessages(db, {
|
|
113
|
+
statement: exchangeListStatement({ fleetId, shipId, cursor, limit }),
|
|
114
|
+
messageId: Prisma.sql `page.newest_message_id`,
|
|
115
|
+
order: Prisma.sql `page.newest_message_id DESC`,
|
|
116
|
+
});
|
|
117
|
+
const listed = rows.map(({ row, message: newestMessage }) => {
|
|
118
|
+
const other = listedRow.parse(row);
|
|
119
|
+
return { otherShip: { id: other.other_ship_id, name: other.name, type: other.type, kind: other.kind }, newestMessage, unacknowledged: other.unacknowledged, unseenPlainMessages: other.unseen_plain_messages };
|
|
116
120
|
});
|
|
117
121
|
return pageOf(listed, { limit, cursorOf: (row) => row.newestMessage.id });
|
|
118
122
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exchange-rollups.js","sourceRoot":"","sources":["../../../src/adapters/prisma/exchange-rollups.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"exchange-rollups.js","sourceRoot":"","sources":["../../../src/adapters/prisma/exchange-rollups.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
/** Fills the question uuids of a bounded set of plain payloads, also before sealing removes them. */
|
|
2
|
+
import type { FleetId, MessageId } from '@aeolus-fleet/common';
|
|
3
|
+
import { Prisma } from './generated/client.js';
|
|
4
|
+
export declare function fillMessageQuestionIdsStatement({ fleetId, ids }: {
|
|
5
|
+
fleetId: FleetId;
|
|
6
|
+
ids: readonly MessageId[];
|
|
7
|
+
}): Prisma.Sql;
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { answeredQuestionIdIn, askedQuestionIdIn, isAnswerContentType, isAskingContentType } from './content-type-sql.js';
|
|
2
|
+
import { Prisma } from './generated/client.js';
|
|
3
|
+
export function fillMessageQuestionIdsStatement({ fleetId, ids }) {
|
|
4
|
+
return Prisma.sql `
|
|
5
|
+
UPDATE messages SET
|
|
6
|
+
asked_question_id = COALESCE(asked_question_id, CASE WHEN ${isAskingContentType('content_type')} THEN ${askedQuestionIdIn('payload')} END),
|
|
7
|
+
answered_question_id = COALESCE(answered_question_id, CASE WHEN ${isAnswerContentType('content_type')} THEN ${answeredQuestionIdIn('payload')} END)
|
|
8
|
+
WHERE fleet_id = ${fleetId} AND id = ANY(${ids}::text[]) AND payload IS NOT NULL
|
|
9
|
+
AND ((asked_question_id IS NULL AND ${isAskingContentType('content_type')})
|
|
10
|
+
OR (answered_question_id IS NULL AND ${isAnswerContentType('content_type')}))`;
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=fill-message-question-ids.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fill-message-question-ids.js","sourceRoot":"","sources":["../../../src/adapters/prisma/fill-message-question-ids.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC1H,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,MAAM,UAAU,+BAA+B,CAAC,EAAE,OAAO,EAAE,GAAG,EAAmD;IAC/G,OAAO,MAAM,CAAC,GAAG,CAAA;;kEAE+C,mBAAmB,CAAC,cAAc,CAAC,SAAS,iBAAiB,CAAC,SAAS,CAAC;wEAClE,mBAAmB,CAAC,cAAc,CAAC,SAAS,oBAAoB,CAAC,SAAS,CAAC;uBAC5H,OAAO,iBAAiB,GAAG;4CACN,mBAAmB,CAAC,cAAc,CAAC;+CAChC,mBAAmB,CAAC,cAAc,CAAC,IAAI,CAAC;AACvF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fleet-counter.js","sourceRoot":"","sources":["../../../src/adapters/prisma/fleet-counter.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,wBAAwB,CAAC,MAAoB;IAC3D,OAAO;QACL,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE;
|
|
1
|
+
{"version":3,"file":"fleet-counter.js","sourceRoot":"","sources":["../../../src/adapters/prisma/fleet-counter.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,wBAAwB,CAAC,MAAoB;IAC3D,OAAO;QACL,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC;KACtE,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { FleetRemoval } from '../../domain/registry/ports.js';
|
|
2
|
+
import type { Db } from './client.js';
|
|
3
|
+
/**
|
|
4
|
+
* The removal of a fleet marked deleted, on Postgres (decision 0020). A
|
|
5
|
+
* batch takes a transaction-level advisory lock on the fleet's removal with
|
|
6
|
+
* try, so a second server skips the fleet, and removes at most `limit` rows
|
|
7
|
+
* of the first kind of history that still has rows, children first, and a
|
|
8
|
+
* records batch then the same of its schedules, leases, ships and every other
|
|
9
|
+
* record, so no step grows with the fleet: every
|
|
10
|
+
* foreign key restricts, and a message may answer or resend another of the
|
|
11
|
+
* fleet, so messages go newest first, after the schedules stop naming them.
|
|
12
|
+
* The last step removes only the fleet row and the request that created it.
|
|
13
|
+
* Each statement reads its rows through an index in order, so a batch costs
|
|
14
|
+
* the batch, not the fleet's history. The fleet's events go under the
|
|
15
|
+
* transaction-local setting `aeolus.deleting_fleet`.
|
|
16
|
+
*/
|
|
17
|
+
export declare function createPrismaFleetRemoval(db: Db): FleetRemoval;
|