@aeolus-fleet/core 0.38.10 → 0.39.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -0
- 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/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/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.js +12 -14
- package/dist/adapters/prisma/exchange-rollups.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/class.js +1 -1
- package/dist/adapters/prisma/generated/internal/class.js.map +1 -1
- package/dist/adapters/prisma/messaging.d.ts +12 -1
- package/dist/adapters/prisma/messaging.js +38 -39
- 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 +40 -0
- package/dist/adapters/prisma/page-with-messages.js.map +1 -0
- package/dist/adapters/prisma/registry.js +16 -0
- package/dist/adapters/prisma/registry.js.map +1 -1
- package/dist/adapters/trpc/context.d.ts +2 -0
- package/dist/adapters/trpc/fleet.d.ts +12 -1
- package/dist/adapters/trpc/fleet.js +7 -2
- package/dist/adapters/trpc/fleet.js.map +1 -1
- package/dist/adapters/trpc/router.d.ts +11 -1
- package/dist/adapters/trpc/trpc.js +1 -0
- package/dist/adapters/trpc/trpc.js.map +1 -1
- package/dist/bin/aeolus-core.js +5 -1
- package/dist/bin/aeolus-core.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/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/lease.d.ts +3 -2
- package/dist/domain/registry/lease.js.map +1 -1
- package/dist/domain/registry/ports.d.ts +7 -0
- 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/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/testing/container-sweeper.d.ts +18 -0
- package/dist/testing/container-sweeper.js +54 -0
- package/dist/testing/container-sweeper.js.map +1 -0
- package/dist/testing/postgres-container.d.ts +3 -2
- package/dist/testing/postgres-container.js +5 -2
- package/dist/testing/postgres-container.js.map +1 -1
- package/dist/testing/postgres-global-setup.d.ts +5 -1
- package/dist/testing/postgres-global-setup.js +11 -3
- 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 +4 -0
- package/dist/wiring.js +4 -0
- package/dist/wiring.js.map +1 -1
- package/package.json +3 -2
- package/src/adapters/prisma/migrations/20261112100000_crew_request_repositories/migration.sql +11 -0
- package/src/adapters/prisma/migrations/20261113120000_events_owner_set_index/migration.sql +4 -0
- package/src/adapters/prisma/schema.prisma +2 -0
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.
|
|
@@ -95,6 +96,7 @@ Run on the server, against the configured database, once it is migrated:
|
|
|
95
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 |
|
|
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
|
|
|
@@ -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"}
|
|
@@ -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"}
|
|
@@ -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"}
|
|
@@ -15,7 +15,7 @@ import { z } from 'zod';
|
|
|
15
15
|
import { exchangeCountsOf } from '../../domain/messaging/exchange.js';
|
|
16
16
|
import { pageOf } from '../../domain/shared/page.js';
|
|
17
17
|
import { Prisma } from './generated/client.js';
|
|
18
|
-
import {
|
|
18
|
+
import { pageWithMessages } from './page-with-messages.js';
|
|
19
19
|
/**
|
|
20
20
|
* A delivery row a statement changed, as it returns it for the rollup: its
|
|
21
21
|
* message, sender and whether it is in an exchange, and its state and
|
|
@@ -80,19 +80,19 @@ export function createPrismaExchangeRollups(db) {
|
|
|
80
80
|
},
|
|
81
81
|
};
|
|
82
82
|
}
|
|
83
|
-
const
|
|
83
|
+
const listedRow = z.object({
|
|
84
84
|
other_ship_id: idSchema('ship'),
|
|
85
85
|
name: z.string(),
|
|
86
86
|
type: z.string(),
|
|
87
87
|
kind: shipKindSchema,
|
|
88
88
|
newest_message_id: idSchema('message'),
|
|
89
89
|
unacknowledged: z.int(),
|
|
90
|
-
})
|
|
90
|
+
});
|
|
91
91
|
/** A page of a ship's rows, newest first, with the other ship of each. */
|
|
92
92
|
export function exchangeListStatement({ fleetId, shipId, cursor, limit }) {
|
|
93
93
|
const after = cursor === undefined ? Prisma.empty : Prisma.sql `AND e.newest_message_id < ${cursor}`;
|
|
94
94
|
return Prisma.sql `
|
|
95
|
-
SELECT e.other_ship_id, s.name, s.type, s.kind::text AS kind, e.newest_message_id, e.unacknowledged
|
|
95
|
+
SELECT e.fleet_id, e.other_ship_id, s.name, s.type, s.kind::text AS kind, e.newest_message_id, e.unacknowledged
|
|
96
96
|
FROM exchanges e
|
|
97
97
|
JOIN ships s ON s.fleet_id = e.fleet_id AND s.id = e.other_ship_id
|
|
98
98
|
WHERE e.fleet_id = ${fleetId} AND e.ship_id = ${shipId} AND s.retired_at IS NULL ${after}
|
|
@@ -103,16 +103,14 @@ export function exchangeListStatement({ fleetId, shipId, cursor, limit }) {
|
|
|
103
103
|
export function createPrismaExchangeList(db) {
|
|
104
104
|
return {
|
|
105
105
|
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 };
|
|
106
|
+
const rows = await pageWithMessages(db, {
|
|
107
|
+
statement: exchangeListStatement({ fleetId, shipId, cursor, limit }),
|
|
108
|
+
messageId: Prisma.sql `page.newest_message_id`,
|
|
109
|
+
order: Prisma.sql `page.newest_message_id DESC`,
|
|
110
|
+
});
|
|
111
|
+
const listed = rows.map(({ row, message: newestMessage }) => {
|
|
112
|
+
const other = listedRow.parse(row);
|
|
113
|
+
return { otherShip: { id: other.other_ship_id, name: other.name, type: other.type, kind: other.kind }, newestMessage, unacknowledged: other.unacknowledged };
|
|
116
114
|
});
|
|
117
115
|
return pageOf(listed, { limit, cursorOf: (row) => row.newestMessage.id });
|
|
118
116
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exchange-rollups.js","sourceRoot":"","sources":["../../../src/adapters/prisma/exchange-rollups.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,cAAc,EAA6C,MAAM,sBAAsB,CAAC;AAChI,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,gBAAgB,EAAqB,MAAM,oCAAoC,CAAC;AAEzF,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"exchange-rollups.js","sourceRoot":"","sources":["../../../src/adapters/prisma/exchange-rollups.ts"],"names":[],"mappings":"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"}
|