@aeolus-fleet/core 0.29.1 → 0.30.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 +21 -0
- package/dist/adapters/http/server.js +5 -0
- package/dist/adapters/http/server.js.map +1 -1
- package/dist/adapters/prisma/generated/browser.d.ts +24 -0
- package/dist/adapters/prisma/generated/client.d.ts +24 -0
- package/dist/adapters/prisma/generated/commonInputTypes.d.ts +30 -0
- package/dist/adapters/prisma/generated/internal/class.d.ts +33 -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 +262 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js +33 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.d.ts +36 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js +33 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js.map +1 -1
- package/dist/adapters/prisma/generated/models/Fleet.d.ts +993 -0
- package/dist/adapters/prisma/generated/models/HealthSnapshot.d.ts +1282 -0
- package/dist/adapters/prisma/generated/models/HealthSnapshot.js +2 -0
- package/dist/adapters/prisma/generated/models/HealthSnapshot.js.map +1 -0
- package/dist/adapters/prisma/generated/models/HealthSnapshotDelivery.d.ts +1470 -0
- package/dist/adapters/prisma/generated/models/HealthSnapshotDelivery.js +2 -0
- package/dist/adapters/prisma/generated/models/HealthSnapshotDelivery.js.map +1 -0
- package/dist/adapters/prisma/generated/models/MessageDay.d.ts +1193 -0
- package/dist/adapters/prisma/generated/models/MessageDay.js +2 -0
- package/dist/adapters/prisma/generated/models/MessageDay.js.map +1 -0
- package/dist/adapters/prisma/generated/models.d.ts +3 -0
- package/dist/adapters/prisma/health-snapshots.d.ts +30 -0
- package/dist/adapters/prisma/health-snapshots.js +250 -0
- package/dist/adapters/prisma/health-snapshots.js.map +1 -0
- package/dist/adapters/prisma/health.d.ts +58 -1
- package/dist/adapters/prisma/health.js +157 -65
- package/dist/adapters/prisma/health.js.map +1 -1
- package/dist/adapters/prisma/history.d.ts +19 -0
- package/dist/adapters/prisma/history.js +167 -69
- package/dist/adapters/prisma/history.js.map +1 -1
- package/dist/adapters/prisma/installation.d.ts +5 -1
- package/dist/adapters/prisma/installation.js +27 -11
- package/dist/adapters/prisma/installation.js.map +1 -1
- package/dist/adapters/prisma/messaging.d.ts +12 -1
- package/dist/adapters/prisma/messaging.js +33 -1
- package/dist/adapters/prisma/messaging.js.map +1 -1
- package/dist/adapters/prisma/network.js +4 -3
- package/dist/adapters/prisma/network.js.map +1 -1
- package/dist/adapters/prisma/registry.d.ts +26 -7
- package/dist/adapters/prisma/registry.js +291 -12
- package/dist/adapters/prisma/registry.js.map +1 -1
- package/dist/adapters/prisma/ship-counts.d.ts +34 -0
- package/dist/adapters/prisma/ship-counts.js +116 -0
- package/dist/adapters/prisma/ship-counts.js.map +1 -0
- package/dist/adapters/prisma/telemetry.d.ts +5 -0
- package/dist/adapters/prisma/telemetry.js +40 -0
- package/dist/adapters/prisma/telemetry.js.map +1 -0
- package/dist/adapters/prisma/unit-of-work.d.ts +13 -3
- package/dist/adapters/prisma/unit-of-work.js +13 -1
- package/dist/adapters/prisma/unit-of-work.js.map +1 -1
- package/dist/adapters/telemetry/calls.d.ts +14 -0
- package/dist/adapters/telemetry/calls.js +48 -0
- package/dist/adapters/telemetry/calls.js.map +1 -0
- package/dist/adapters/telemetry/requests.d.ts +8 -0
- package/dist/adapters/telemetry/requests.js +28 -0
- package/dist/adapters/telemetry/requests.js.map +1 -0
- package/dist/adapters/telemetry/sdk.d.ts +2 -0
- package/dist/adapters/telemetry/sdk.js +40 -0
- package/dist/adapters/telemetry/sdk.js.map +1 -0
- package/dist/adapters/telemetry/telemetry.d.ts +21 -0
- package/dist/adapters/telemetry/telemetry.js +16 -0
- package/dist/adapters/telemetry/telemetry.js.map +1 -0
- package/dist/adapters/trpc/context.d.ts +28 -0
- package/dist/adapters/trpc/fleet.d.ts +721 -243
- package/dist/adapters/trpc/fleet.js +171 -44
- package/dist/adapters/trpc/fleet.js.map +1 -1
- package/dist/adapters/trpc/health.d.ts +42 -1
- package/dist/adapters/trpc/health.js +18 -10
- package/dist/adapters/trpc/health.js.map +1 -1
- package/dist/adapters/trpc/installation.d.ts +2 -2
- package/dist/adapters/trpc/router.d.ts +694 -233
- package/dist/adapters/trpc/ship-contract.js +3 -0
- package/dist/adapters/trpc/ship-contract.js.map +1 -1
- package/dist/adapters/trpc/ship.d.ts +6 -4
- package/dist/adapters/trpc/ship.js +5 -2
- package/dist/adapters/trpc/ship.js.map +1 -1
- package/dist/adapters/trpc/trpc.d.ts +8 -0
- package/dist/adapters/trpc/trpc.js +35 -1
- package/dist/adapters/trpc/trpc.js.map +1 -1
- package/dist/app.d.ts +2 -1
- package/dist/app.js +11 -3
- package/dist/app.js.map +1 -1
- package/dist/domain/messaging/check-inbox.d.ts +12 -4
- package/dist/domain/messaging/check-inbox.js +16 -7
- package/dist/domain/messaging/check-inbox.js.map +1 -1
- package/dist/domain/messaging/daily-message-limit.d.ts +1 -1
- package/dist/domain/messaging/daily-message-limit.js +1 -1
- package/dist/domain/messaging/daily-message-limit.js.map +1 -1
- package/dist/domain/messaging/ports.d.ts +2 -2
- package/dist/domain/registry/check-network-rules-file.d.ts +38 -0
- package/dist/domain/registry/check-network-rules-file.js +50 -0
- package/dist/domain/registry/check-network-rules-file.js.map +1 -0
- package/dist/domain/registry/count-ships.d.ts +18 -0
- package/dist/domain/registry/count-ships.js +10 -0
- package/dist/domain/registry/count-ships.js.map +1 -0
- package/dist/domain/registry/export-network-rules.d.ts +27 -0
- package/dist/domain/registry/export-network-rules.js +55 -0
- package/dist/domain/registry/export-network-rules.js.map +1 -0
- package/dist/domain/registry/found-fleet.d.ts +5 -1
- package/dist/domain/registry/found-fleet.js +5 -1
- package/dist/domain/registry/found-fleet.js.map +1 -1
- package/dist/domain/registry/get-installation-fleet.d.ts +3 -1
- package/dist/domain/registry/get-installation-fleet.js +2 -2
- package/dist/domain/registry/get-installation-fleet.js.map +1 -1
- package/dist/domain/registry/import-network-rules.d.ts +40 -0
- package/dist/domain/registry/import-network-rules.js +98 -0
- package/dist/domain/registry/import-network-rules.js.map +1 -0
- package/dist/domain/registry/label.d.ts +2 -6
- package/dist/domain/registry/label.js +1 -9
- package/dist/domain/registry/label.js.map +1 -1
- package/dist/domain/registry/list-fleet.d.ts +21 -10
- package/dist/domain/registry/list-fleet.js +20 -11
- package/dist/domain/registry/list-fleet.js.map +1 -1
- package/dist/domain/registry/list-installation-fleets.d.ts +3 -1
- package/dist/domain/registry/list-installation-fleets.js +2 -2
- package/dist/domain/registry/list-installation-fleets.js.map +1 -1
- package/dist/domain/registry/list-labels.d.ts +16 -5
- package/dist/domain/registry/list-labels.js +12 -3
- package/dist/domain/registry/list-labels.js.map +1 -1
- package/dist/domain/registry/list-ship-types.d.ts +18 -0
- package/dist/domain/registry/list-ship-types.js +12 -0
- package/dist/domain/registry/list-ship-types.js.map +1 -0
- package/dist/domain/registry/network-rules-file.d.ts +91 -0
- package/dist/domain/registry/network-rules-file.js +292 -0
- package/dist/domain/registry/network-rules-file.js.map +1 -0
- package/dist/domain/registry/network-settings.d.ts +15 -0
- package/dist/domain/registry/network-settings.js +18 -13
- package/dist/domain/registry/network-settings.js.map +1 -1
- package/dist/domain/registry/ports.d.ts +45 -4
- package/dist/domain/registry/read-listed-ship.d.ts +21 -0
- package/dist/domain/registry/read-listed-ship.js +22 -0
- package/dist/domain/registry/read-listed-ship.js.map +1 -0
- package/dist/domain/registry/read-reach-refusals.d.ts +8 -3
- package/dist/domain/registry/read-reach-refusals.js +6 -7
- package/dist/domain/registry/read-reach-refusals.js.map +1 -1
- package/dist/domain/registry/ship-counts.d.ts +28 -0
- package/dist/domain/registry/ship-counts.js +35 -0
- package/dist/domain/registry/ship-counts.js.map +1 -0
- package/dist/domain/registry/ship-order.d.ts +29 -0
- package/dist/domain/registry/ship-order.js +54 -0
- package/dist/domain/registry/ship-order.js.map +1 -0
- package/dist/domain/shared/close-health-snapshots.d.ts +24 -0
- package/dist/domain/shared/close-health-snapshots.js +67 -0
- package/dist/domain/shared/close-health-snapshots.js.map +1 -0
- package/dist/domain/shared/count-open-inbox.d.ts +20 -0
- package/dist/domain/shared/count-open-inbox.js +26 -0
- package/dist/domain/shared/count-open-inbox.js.map +1 -0
- package/dist/domain/shared/errors.d.ts +1 -1
- package/dist/domain/shared/errors.js.map +1 -1
- package/dist/domain/shared/health-fold.d.ts +51 -0
- package/dist/domain/shared/health-fold.js +105 -0
- package/dist/domain/shared/health-fold.js.map +1 -0
- package/dist/domain/shared/health-read.d.ts +35 -0
- package/dist/domain/shared/health-read.js +113 -0
- package/dist/domain/shared/health-read.js.map +1 -0
- package/dist/domain/shared/health-snapshot.d.ts +222 -0
- package/dist/domain/shared/health-snapshot.js +204 -0
- package/dist/domain/shared/health-snapshot.js.map +1 -0
- package/dist/domain/shared/health.d.ts +3 -13
- package/dist/domain/shared/health.js +6 -15
- package/dist/domain/shared/health.js.map +1 -1
- package/dist/domain/shared/history.d.ts +35 -10
- package/dist/domain/shared/history.js.map +1 -1
- package/dist/domain/shared/page.d.ts +24 -0
- package/dist/domain/shared/page.js +10 -0
- package/dist/domain/shared/page.js.map +1 -0
- package/dist/domain/shared/read-acknowledged.d.ts +19 -0
- package/dist/domain/shared/read-acknowledged.js +19 -0
- package/dist/domain/shared/read-acknowledged.js.map +1 -0
- package/dist/domain/shared/read-fleet-limits.d.ts +2 -2
- package/dist/domain/shared/read-fleet-limits.js +1 -1
- package/dist/domain/shared/read-fleet-limits.js.map +1 -1
- package/dist/domain/shared/read-health.d.ts +4 -2
- package/dist/domain/shared/read-health.js +3 -5
- package/dist/domain/shared/read-health.js.map +1 -1
- package/dist/domain/shared/read-inbox-message.d.ts +21 -0
- package/dist/domain/shared/read-inbox-message.js +21 -0
- package/dist/domain/shared/read-inbox-message.js.map +1 -0
- package/dist/domain/shared/read-inbox-withdrawals.d.ts +22 -0
- package/dist/domain/shared/read-inbox-withdrawals.js +20 -0
- package/dist/domain/shared/read-inbox-withdrawals.js.map +1 -0
- package/dist/domain/shared/read-inbox.d.ts +18 -3
- package/dist/domain/shared/read-inbox.js +24 -10
- package/dist/domain/shared/read-inbox.js.map +1 -1
- package/dist/domain/shared/read-needs-attention.d.ts +16 -7
- package/dist/domain/shared/read-needs-attention.js +14 -8
- package/dist/domain/shared/read-needs-attention.js.map +1 -1
- package/dist/domain/shared/read-ship-messages.d.ts +7 -6
- package/dist/domain/shared/read-ship-messages.js +18 -16
- package/dist/domain/shared/read-ship-messages.js.map +1 -1
- package/dist/domain/shared/read-ship-timeline.d.ts +6 -5
- package/dist/domain/shared/read-ship-timeline.js +6 -7
- package/dist/domain/shared/read-ship-timeline.js.map +1 -1
- package/dist/domain/shared/read-stuck-count.d.ts +23 -0
- package/dist/domain/shared/read-stuck-count.js +20 -0
- package/dist/domain/shared/read-stuck-count.js.map +1 -0
- package/dist/domain/shared/read-stuck-history.d.ts +21 -0
- package/dist/domain/shared/read-stuck-history.js +18 -0
- package/dist/domain/shared/read-stuck-history.js.map +1 -0
- package/dist/domain/shared/read-stuck-summary.d.ts +44 -0
- package/dist/domain/shared/read-stuck-summary.js +44 -0
- package/dist/domain/shared/read-stuck-summary.js.map +1 -0
- package/dist/domain/shared/read-stuck.d.ts +41 -0
- package/dist/domain/shared/read-stuck.js +43 -0
- package/dist/domain/shared/read-stuck.js.map +1 -0
- package/dist/domain/shared/stuck.d.ts +4 -1
- package/dist/domain/shared/stuck.js +4 -2
- package/dist/domain/shared/stuck.js.map +1 -1
- package/dist/domain/shared/wait-buckets.d.ts +15 -0
- package/dist/domain/shared/wait-buckets.js +54 -0
- package/dist/domain/shared/wait-buckets.js.map +1 -0
- package/dist/start.d.ts +2 -1
- package/dist/start.js +8 -2
- package/dist/start.js.map +1 -1
- package/dist/wiring.d.ts +31 -1
- package/dist/wiring.js +40 -5
- package/dist/wiring.js.map +1 -1
- package/package.json +10 -2
- package/src/adapters/prisma/migrations/20261022130000_message_days/migration.sql +20 -0
- package/src/adapters/prisma/migrations/20261022130100_messages_fleet_time_index/migration.sql +3 -0
- package/src/adapters/prisma/migrations/20261022140000_health_snapshots/migration.sql +41 -0
- package/src/adapters/prisma/migrations/20261023090000_timeline_page_indexes/migration.sql +7 -0
- package/src/adapters/prisma/migrations/20261023090100_messages_page_indexes/migration.sql +7 -0
- package/src/adapters/prisma/migrations/20261023090200_inbox_page_index/migration.sql +3 -0
- package/src/adapters/prisma/migrations/20261023090300_reach_refusals_page_index/migration.sql +4 -0
- package/src/adapters/prisma/migrations/20261023090400_messages_question_id_index/migration.sql +5 -0
- package/src/adapters/prisma/migrations/20261023210000_health_snapshot_acknowledged_waits/migration.sql +15 -0
- package/src/adapters/prisma/migrations/20261024090000_ship_listing_indexes/migration.sql +13 -0
- package/src/adapters/prisma/migrations/20261024120000_ship_listing_every_status_indexes/migration.sql +5 -0
- package/src/adapters/prisma/migrations/20261024150000_ship_kind_listing_index/migration.sql +2 -0
- package/src/adapters/prisma/schema.prisma +88 -5
|
@@ -1,12 +1,33 @@
|
|
|
1
1
|
import { PING_CONTENT_TYPE } from '@aeolus-fleet/common';
|
|
2
2
|
import { toDeliveryFromSql, toMessage } from './rows.js';
|
|
3
|
+
/**
|
|
4
|
+
* Messages on Postgres. Each message stored is counted on its fleet's row for
|
|
5
|
+
* the UTC day it was stored (performance design, decision 1), in the same
|
|
6
|
+
* transaction, as its last statements: the row lock on a busy day is then
|
|
7
|
+
* held only until commit, and always after the fleet's lock for its event
|
|
8
|
+
* numbers, so the two locks are taken in one order and never deadlock.
|
|
9
|
+
*/
|
|
3
10
|
export function createPrismaMessageRepository(db) {
|
|
11
|
+
const counted = [];
|
|
4
12
|
return {
|
|
5
13
|
lockDailyCount: async (fleetId) => {
|
|
6
14
|
// A transaction-level advisory lock on the fleet's daily message count, released at commit or rollback.
|
|
7
15
|
await db.$executeRaw `SELECT pg_advisory_xact_lock(hashtext('daily-messages'), hashtext(${fleetId}))`;
|
|
8
16
|
},
|
|
9
|
-
|
|
17
|
+
countStoredOn: async (fleetId, day) => {
|
|
18
|
+
const row = await db.messageDay.findUnique({ where: { fleetId_day: { fleetId, day } }, select: { messages: true } });
|
|
19
|
+
return row?.messages ?? 0;
|
|
20
|
+
},
|
|
21
|
+
flush: async () => {
|
|
22
|
+
for (const { fleetId, day, messages, payloadBytes } of countedDays(counted)) {
|
|
23
|
+
await db.$executeRaw `
|
|
24
|
+
INSERT INTO message_days (fleet_id, day, messages, payload_bytes)
|
|
25
|
+
VALUES (${fleetId}, ${day}::date, ${messages}, ${payloadBytes})
|
|
26
|
+
ON CONFLICT (fleet_id, day) DO UPDATE
|
|
27
|
+
SET messages = message_days.messages + EXCLUDED.messages, payload_bytes = message_days.payload_bytes + EXCLUDED.payload_bytes`;
|
|
28
|
+
}
|
|
29
|
+
counted.length = 0;
|
|
30
|
+
},
|
|
10
31
|
create: async (message) => {
|
|
11
32
|
const { selector } = message;
|
|
12
33
|
await db.message.create({
|
|
@@ -27,6 +48,7 @@ export function createPrismaMessageRepository(db) {
|
|
|
27
48
|
createdAt: message.createdAt,
|
|
28
49
|
},
|
|
29
50
|
});
|
|
51
|
+
counted.push({ fleetId: message.fleetId, day: message.createdAt.toISOString().slice(0, 10), payloadBytes: Buffer.byteLength(message.payload, 'utf8') });
|
|
30
52
|
},
|
|
31
53
|
lockIdempotencyKey: async ({ senderShipId, idempotencyKey }) => {
|
|
32
54
|
// A transaction-level advisory lock on the sender and its key, released at
|
|
@@ -45,6 +67,16 @@ export function createPrismaMessageRepository(db) {
|
|
|
45
67
|
},
|
|
46
68
|
};
|
|
47
69
|
}
|
|
70
|
+
/** The counted messages summed per fleet and day, in one order, so concurrent units of work lock the rows alike. */
|
|
71
|
+
function countedDays(counted) {
|
|
72
|
+
const days = new Map();
|
|
73
|
+
for (const { fleetId, day, payloadBytes } of counted) {
|
|
74
|
+
const key = `${fleetId} ${day}`;
|
|
75
|
+
const sum = days.get(key) ?? { fleetId, day, messages: 0, payloadBytes: 0 };
|
|
76
|
+
days.set(key, { ...sum, messages: sum.messages + 1, payloadBytes: sum.payloadBytes + payloadBytes });
|
|
77
|
+
}
|
|
78
|
+
return [...days.entries()].toSorted(([a], [b]) => a.localeCompare(b)).map(([, sum]) => sum);
|
|
79
|
+
}
|
|
48
80
|
export function createPrismaDeliveryRepository(db) {
|
|
49
81
|
return {
|
|
50
82
|
create: async (delivery) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messaging.js","sourceRoot":"","sources":["../../../src/adapters/prisma/messaging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"messaging.js","sourceRoot":"","sources":["../../../src/adapters/prisma/messaging.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
import { accountIdSchema, carriedLabelSchema, idSchema, NETWORK_VERBS, networkRuleSchema, networkRulesSchema } from '@aeolus-fleet/common';
|
|
12
12
|
import { z } from 'zod';
|
|
13
13
|
import { noNetworkSettings } from '../../domain/registry/network-settings.js';
|
|
14
|
+
import { pageOf } from '../../domain/shared/page.js';
|
|
14
15
|
import { Prisma } from './generated/client.js';
|
|
15
16
|
const settingsRowSchema = z.object({ rules: networkRulesSchema, version: z.number().int().min(0), builtInViewerRead: z.boolean() });
|
|
16
17
|
const draftRowSchema = z.object({ fleetId: idSchema('fleet'), rules: networkRulesSchema, savedAt: z.date(), savedAgainstVersion: z.number().int().min(0) });
|
|
@@ -144,9 +145,9 @@ export function createPrismaReachRefusalRepository(db) {
|
|
|
144
145
|
record: async ({ id, fleetId, at, sender, askedBy, recipient, verb, settingsVersion }) => {
|
|
145
146
|
await db.reachRefusal.create({ data: { id, fleetId, at, sender: actorJson(sender), askedBy: askedBy === null ? Prisma.DbNull : shipJson(askedBy), recipient: recipientJson(recipient), verb, settingsVersion } });
|
|
146
147
|
},
|
|
147
|
-
latest: async (fleetId, limit) => {
|
|
148
|
-
const rows = await db.reachRefusal.findMany({ where: { fleetId }
|
|
149
|
-
return rows.map((row) => refusalRowSchema.parse(row));
|
|
148
|
+
latest: async (fleetId, { cursor, limit }) => {
|
|
149
|
+
const rows = await db.reachRefusal.findMany({ where: { fleetId, ...(cursor === undefined ? {} : { id: { lt: cursor } }) }, orderBy: { id: 'desc' }, take: limit + 1 });
|
|
150
|
+
return pageOf(rows.map((row) => refusalRowSchema.parse(row)), { limit, cursorOf: (refusal) => refusal.id });
|
|
150
151
|
},
|
|
151
152
|
};
|
|
152
153
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../../src/adapters/prisma/network.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,QAAQ,EAAE,aAAa,EAAE,iBAAiB,EAAE,kBAAkB,EAAgB,MAAM,sBAAsB,CAAC;AACzJ,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,OAAO,EAAE,iBAAiB,EAA0C,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../../src/adapters/prisma/network.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
import { type FleetId } from '@aeolus-fleet/common';
|
|
2
|
-
import type { ClearRequestRepository, CrewRequestRepository, FleetListing, LabelRepository, FleetRepository, InFlightDeliveries, LeaseRepository, ShipRepository } from '../../domain/registry/ports.js';
|
|
1
|
+
import { type FleetId, type ShipStatus } from '@aeolus-fleet/common';
|
|
2
|
+
import type { ClearRequestRepository, CrewRequestRepository, FleetListing, ShipPage, LabelRepository, FleetRepository, InFlightDeliveries, LeaseRepository, ShipRepository } from '../../domain/registry/ports.js';
|
|
3
|
+
import type { ShipFilter } from '@aeolus-fleet/common/rules';
|
|
4
|
+
import type { ReadReach } from '../../domain/registry/read-reach.js';
|
|
3
5
|
import type { Db } from './client.js';
|
|
4
6
|
import { Prisma } from './generated/client.js';
|
|
5
7
|
export declare function createPrismaFleetRepository(db: Db): FleetRepository;
|
|
@@ -10,10 +12,27 @@ export declare function createPrismaShipRepository(db: Db): ShipRepository;
|
|
|
10
12
|
export declare function createPrismaLeaseRepository(db: Db): LeaseRepository;
|
|
11
13
|
export declare function createPrismaInFlightDeliveries(db: Db): InFlightDeliveries;
|
|
12
14
|
/**
|
|
13
|
-
* The
|
|
14
|
-
*
|
|
15
|
-
*
|
|
16
|
-
* join multiplies rows.
|
|
15
|
+
* The filter (common/src/rules/ship-filter.ts) as conditions on the ship `s`
|
|
16
|
+
* of the outer query, each starting with AND: one statement selects the page
|
|
17
|
+
* or counts the ships, and no ship is read only to be dropped.
|
|
17
18
|
*/
|
|
18
|
-
export declare function
|
|
19
|
+
export declare function shipFilterCondition({ query, name, status, type, shipKind, crewRequest, assignedTo, needsCrew, valueIds, shipIds, kind, pluginShipIds }: ShipFilter, reach: ReadReach): Prisma.Sql;
|
|
20
|
+
/**
|
|
21
|
+
* The listing's one statement: a page of the fleet's ships with what the
|
|
22
|
+
* snapshot shows of each (decision 4 of the performance design). The ships
|
|
23
|
+
* the filter selects are ordered by the sort's few terms alone, the page is
|
|
24
|
+
* cut after the position, and only the page's ships read who crewed them,
|
|
25
|
+
* their last ping and model, and their labels. One row per ship: at most one
|
|
26
|
+
* lease is open and at most one secret is valid per ship (partial unique
|
|
27
|
+
* indexes), so neither join multiplies rows.
|
|
28
|
+
*/
|
|
29
|
+
export declare function fleetListingStatement(fleetId: FleetId, { after, limit, filter, sort, reach }: ShipPage): Prisma.Sql;
|
|
30
|
+
/**
|
|
31
|
+
* The types of the fleet's ships in `reach` of any of the statuses, each
|
|
32
|
+
* once: for active ships alone, read from the type index without a ship row.
|
|
33
|
+
*/
|
|
34
|
+
export declare function shipTypesStatement(fleetId: FleetId, { reach, status }: {
|
|
35
|
+
reach: ReadReach;
|
|
36
|
+
status: readonly ShipStatus[];
|
|
37
|
+
}): Prisma.Sql;
|
|
19
38
|
export declare function createPrismaFleetListing(db: Db): FleetListing;
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { PING_CONTENT_TYPE, idSchema, scopeNameSchema } from '@aeolus-fleet/common';
|
|
2
|
+
import { z } from 'zod';
|
|
3
|
+
import { COLUMNS_SHOWN_OUTSIDE_READ_REACH, isValueDescending } from '../../domain/registry/ship-order.js';
|
|
2
4
|
import { Prisma } from './generated/client.js';
|
|
3
5
|
import { commissionerColumns, toAbandonedDelivery, toClearRequest, toCrewRequest, toDeliveryFromSql, toFleet, toLastSeen, toLabelFromSql, toLease, toListedLabel, toLeaseShipId, toShip, toShipFacts, toShipFromSql, toShipLabel, toShipReport, toStatedStatement, toTurn, } from './rows.js';
|
|
6
|
+
import { readShipCounts } from './ship-counts.js';
|
|
4
7
|
export function createPrismaFleetRepository(db) {
|
|
5
8
|
return {
|
|
6
9
|
lockInitialisation: async () => {
|
|
@@ -48,11 +51,14 @@ export function createPrismaFleetRepository(db) {
|
|
|
48
51
|
await db.$queryRaw `SELECT set_config('aeolus.deleting_fleet', ${fleetId}, true)`;
|
|
49
52
|
// Children first: every foreign key restricts deletes. A message may answer
|
|
50
53
|
// or resend another of the fleet, so those links go before the messages.
|
|
54
|
+
await db.$executeRaw `DELETE FROM health_snapshot_deliveries WHERE fleet_id = ${fleetId}`;
|
|
55
|
+
await db.$executeRaw `DELETE FROM health_snapshots WHERE fleet_id = ${fleetId}`;
|
|
51
56
|
await db.$executeRaw `DELETE FROM events WHERE fleet_id = ${fleetId}`;
|
|
52
57
|
await db.$executeRaw `DELETE FROM overdue_deliveries WHERE fleet_id = ${fleetId}`;
|
|
53
58
|
await db.$executeRaw `DELETE FROM deliveries WHERE fleet_id = ${fleetId}`;
|
|
54
59
|
await db.$executeRaw `UPDATE messages SET in_reply_to_message_id = NULL, resend_of_message_id = NULL WHERE fleet_id = ${fleetId}`;
|
|
55
60
|
await db.$executeRaw `DELETE FROM messages WHERE fleet_id = ${fleetId}`;
|
|
61
|
+
await db.$executeRaw `DELETE FROM message_days WHERE fleet_id = ${fleetId}`;
|
|
56
62
|
await db.$executeRaw `DELETE FROM notice_dismissals WHERE fleet_id = ${fleetId}`;
|
|
57
63
|
await db.$executeRaw `DELETE FROM guide_progress WHERE fleet_id = ${fleetId}`;
|
|
58
64
|
await db.$executeRaw `DELETE FROM account_notice_dismissals WHERE fleet_id = ${fleetId}`;
|
|
@@ -155,6 +161,15 @@ export function createPrismaLabelRepository(db) {
|
|
|
155
161
|
return row === undefined ? undefined : toLabelFromSql(row);
|
|
156
162
|
},
|
|
157
163
|
find: (fleetId, labelId) => findLabel({ fleetId, labelId }, Prisma.empty),
|
|
164
|
+
listNamedBy: async (fleetId, { labelIds, valueIds }) => {
|
|
165
|
+
const rows = await db.$queryRaw `
|
|
166
|
+
SELECT ${labelColumns} FROM labels l
|
|
167
|
+
WHERE l.fleet_id = ${fleetId}
|
|
168
|
+
AND (l.id = ANY(${[...labelIds]}::text[])
|
|
169
|
+
OR EXISTS (SELECT 1 FROM label_values v WHERE v.fleet_id = l.fleet_id AND v.label_id = l.id AND v.id = ANY(${[...valueIds]}::text[])))
|
|
170
|
+
ORDER BY l.key`;
|
|
171
|
+
return rows.map(toLabelFromSql);
|
|
172
|
+
},
|
|
158
173
|
// FOR NO KEY UPDATE: a change of values waits for the assignments holding
|
|
159
174
|
// the label, and they for it; the label itself stays.
|
|
160
175
|
findForUpdate: (fleetId, labelId) => findLabel({ fleetId, labelId }, Prisma.sql `FOR NO KEY UPDATE`),
|
|
@@ -576,13 +591,234 @@ const crewedByOfShip = Prisma.sql `
|
|
|
576
591
|
AND e.type = 'StartingPromptIssued' AND e.occurred_at <= l.started_at
|
|
577
592
|
ORDER BY e.seq DESC
|
|
578
593
|
LIMIT 1`;
|
|
594
|
+
/** A ship's crew request as one key (common/src/rules/ship-filter.ts, crewRequestKeyOf), for the ship `s` of the outer query. */
|
|
595
|
+
const crewRequestKeyOfShip = Prisma.sql `
|
|
596
|
+
(SELECT CASE
|
|
597
|
+
WHEN rq.assigned_to_ship_id IS NOT NULL THEN COALESCE(rq.status::text, 'crewing')
|
|
598
|
+
WHEN EXISTS (SELECT 1 FROM leases ol
|
|
599
|
+
WHERE ol.fleet_id = s.fleet_id AND ol.ship_id = s.id AND ol.ended_at IS NULL
|
|
600
|
+
AND EXISTS (SELECT 1 FROM events e
|
|
601
|
+
JOIN ships a ON a.fleet_id = e.fleet_id AND a.id = e.actor_ship_id
|
|
602
|
+
WHERE e.fleet_id = s.fleet_id AND e.ship_id = s.id
|
|
603
|
+
AND e.type = 'StartingPromptIssued' AND e.occurred_at <= ol.started_at)) THEN 'crewedByHand'
|
|
604
|
+
ELSE 'needsCrew'
|
|
605
|
+
END
|
|
606
|
+
FROM crew_requests rq WHERE rq.fleet_id = s.fleet_id AND rq.ship_id = s.id)`;
|
|
607
|
+
/** What sort of agent crews the ship `s` of the outer query (common/src/rules/ship-filter.ts, agentKindOf). */
|
|
608
|
+
function agentKindOfShip(pluginShipIds) {
|
|
609
|
+
return Prisma.sql `
|
|
610
|
+
CASE
|
|
611
|
+
WHEN s.kind IN ('operator', 'viewer') THEN 'console'
|
|
612
|
+
WHEN s.id = ANY(${[...pluginShipIds]}::text[]) THEN 'plugin'
|
|
613
|
+
WHEN s.type = 'trierarch' THEN 'trierarch'
|
|
614
|
+
ELSE COALESCE((SELECT CASE ol.harness WHEN 'claude-code' THEN 'claudeCode' WHEN 'codex' THEN 'codex' END
|
|
615
|
+
FROM leases ol WHERE ol.fleet_id = s.fleet_id AND ol.ship_id = s.id AND ol.ended_at IS NULL), 'other')
|
|
616
|
+
END`;
|
|
617
|
+
}
|
|
618
|
+
/** A ship's status (domain/registry/ship.ts, shipStatus), for the ship `s` of the outer query. */
|
|
619
|
+
const statusOfShip = Prisma.sql `
|
|
620
|
+
CASE
|
|
621
|
+
WHEN s.retired_at IS NOT NULL THEN 'retired'
|
|
622
|
+
WHEN s.kind IN ('operator', 'viewer')
|
|
623
|
+
OR EXISTS (SELECT 1 FROM leases ol WHERE ol.fleet_id = s.fleet_id AND ol.ship_id = s.id AND ol.ended_at IS NULL) THEN 'crewed'
|
|
624
|
+
ELSE 'awaitingCrew'
|
|
625
|
+
END`;
|
|
626
|
+
/** Whether the caller reads the ship `s` of the outer query (decision 0034). */
|
|
627
|
+
function isInReachOfShip(reach) {
|
|
628
|
+
return reach.kind === 'every' ? Prisma.sql `true` : Prisma.sql `s.id = ANY(${[...reach.shipIds]}::text[])`;
|
|
629
|
+
}
|
|
630
|
+
/**
|
|
631
|
+
* The filter (common/src/rules/ship-filter.ts) as conditions on the ship `s`
|
|
632
|
+
* of the outer query, each starting with AND: one statement selects the page
|
|
633
|
+
* or counts the ships, and no ship is read only to be dropped.
|
|
634
|
+
*/
|
|
635
|
+
export function shipFilterCondition({ query, name, status = [], type = [], shipKind = [], crewRequest = [], assignedTo = [], needsCrew, valueIds = [], shipIds = [], kind = [], pluginShipIds = [] }, reach) {
|
|
636
|
+
const needle = query?.trim().toLowerCase() ?? '';
|
|
637
|
+
const values = [...new Set(valueIds)];
|
|
638
|
+
// A ship outside read reach shows its name, type and status only: what it does not show never selects it.
|
|
639
|
+
const isHiddenFilterPicked = crewRequest.length > 0 || assignedTo.length > 0 || needsCrew !== undefined || kind.length > 0 || values.length > 0;
|
|
640
|
+
const conditions = [
|
|
641
|
+
isHiddenFilterPicked ? Prisma.sql `AND ${isInReachOfShip(reach)}` : undefined,
|
|
642
|
+
needle === '' ? undefined : Prisma.sql `AND (strpos(lower(s.name), ${needle}) > 0 OR strpos(lower(s.type), ${needle}) > 0)`,
|
|
643
|
+
// An active ship's name is unique: ships_fleet_id_name_active_key finds the one ship.
|
|
644
|
+
name === undefined ? undefined : Prisma.sql `AND s.name = ${name}`,
|
|
645
|
+
// With the retired ones asked, the name in lower case lets ships_name_listing_every_status_idx find them all.
|
|
646
|
+
name === undefined || !status.includes('retired') ? undefined : Prisma.sql `AND lower(s.name) COLLATE "C" = lower(${name}) COLLATE "C"`,
|
|
647
|
+
...statusConditions(status),
|
|
648
|
+
type.length === 0 ? undefined : Prisma.sql `AND s.type = ANY(${[...type]}::text[])`,
|
|
649
|
+
shipKind.length === 0 ? undefined : Prisma.sql `AND s.kind = ANY(${[...shipKind]}::ship_kind[])`,
|
|
650
|
+
crewRequest.length === 0 ? undefined : Prisma.sql `AND COALESCE(${crewRequestKeyOfShip}, 'none') = ANY(${[...crewRequest]}::text[])`,
|
|
651
|
+
values.length === 0
|
|
652
|
+
? undefined
|
|
653
|
+
: Prisma.sql `AND (SELECT count(*) FROM ship_labels sl
|
|
654
|
+
WHERE sl.fleet_id = s.fleet_id AND sl.ship_id = s.id AND sl.value_id = ANY(${values}::text[])) = ${values.length}`,
|
|
655
|
+
shipIds.length === 0 ? undefined : Prisma.sql `AND s.id = ANY(${[...shipIds]}::text[])`,
|
|
656
|
+
needsCrew === undefined ? undefined : needsCrewCondition(needsCrew),
|
|
657
|
+
assignedTo.length === 0
|
|
658
|
+
? undefined
|
|
659
|
+
: Prisma.sql `AND EXISTS (SELECT 1 FROM crew_requests acr
|
|
660
|
+
WHERE acr.fleet_id = s.fleet_id AND acr.ship_id = s.id AND acr.assigned_to_ship_id = ANY(${[...assignedTo]}::text[]))`,
|
|
661
|
+
kind.length === 0 ? undefined : Prisma.sql `AND ${agentKindOfShip(pluginShipIds)} = ANY(${[...kind]}::text[])`,
|
|
662
|
+
].filter((condition) => condition !== undefined);
|
|
663
|
+
return conditions.length === 0 ? Prisma.empty : Prisma.join(conditions, ' ');
|
|
664
|
+
}
|
|
665
|
+
/**
|
|
666
|
+
* The ships of any status picked, written so the listing indexes serve the
|
|
667
|
+
* common picks: every status needs no condition, retired alone is its
|
|
668
|
+
* retirement, and a pick without retired reads only active ships, which the
|
|
669
|
+
* active listing indexes hold, every active status needing nothing more.
|
|
670
|
+
*/
|
|
671
|
+
function statusConditions(status) {
|
|
672
|
+
const isEveryActivePicked = status.includes('awaitingCrew') && status.includes('crewed');
|
|
673
|
+
if (status.length === 0 || (status.includes('retired') && isEveryActivePicked)) {
|
|
674
|
+
return [];
|
|
675
|
+
}
|
|
676
|
+
if (status.length === 1 && status[0] === 'retired') {
|
|
677
|
+
return [Prisma.sql `AND s.retired_at IS NOT NULL`];
|
|
678
|
+
}
|
|
679
|
+
if (status.includes('retired')) {
|
|
680
|
+
return [Prisma.sql `AND ${statusOfShip} = ANY(${[...status]}::text[])`];
|
|
681
|
+
}
|
|
682
|
+
const active = Prisma.sql `AND s.retired_at IS NULL`;
|
|
683
|
+
return isEveryActivePicked ? [active] : [active, Prisma.sql `AND ${statusOfShip} = ANY(${[...status]}::text[])`];
|
|
684
|
+
}
|
|
579
685
|
/**
|
|
580
|
-
* The
|
|
581
|
-
*
|
|
582
|
-
*
|
|
583
|
-
*
|
|
686
|
+
* The ships on Needs crew (common/src/rules/ship-filter.ts, isNeedingCrew):
|
|
687
|
+
* an unassigned request no crew by hand took, while the ship awaits crew
|
|
688
|
+
* without trierarchs and while it is active with them, where also a request
|
|
689
|
+
* a trierarch holds that is not running or being released.
|
|
584
690
|
*/
|
|
585
|
-
|
|
691
|
+
function needsCrewCondition(needsCrew) {
|
|
692
|
+
if (needsCrew === 'withoutTrierarchs') {
|
|
693
|
+
return Prisma.sql `AND ${statusOfShip} = 'awaitingCrew' AND ${crewRequestKeyOfShip} = 'needsCrew'`;
|
|
694
|
+
}
|
|
695
|
+
return Prisma.sql `AND s.retired_at IS NULL AND ${crewRequestKeyOfShip} NOT IN ('crewedByHand', 'running', 'releasing')`;
|
|
696
|
+
}
|
|
697
|
+
/** A ship's status as its sort shows it (ship-order's STATUS_WORDS), for the ship `s` of the outer query. */
|
|
698
|
+
const statusWordOfShip = Prisma.sql `
|
|
699
|
+
CASE ${statusOfShip} WHEN 'awaitingCrew' THEN 'awaiting crew' WHEN 'crewed' THEN 'crewed' ELSE 'retired' END`;
|
|
700
|
+
/**
|
|
701
|
+
* What the sort's column shows for the ship `s` with its open lease `l`, as
|
|
702
|
+
* lower-case text, empty when the cell is (domain/registry/ship-order.ts,
|
|
703
|
+
* positionOf); without a sort, nothing, as argo first and then the names
|
|
704
|
+
* order the ships.
|
|
705
|
+
*/
|
|
706
|
+
function sortValueOfShip(sort, reach) {
|
|
707
|
+
if (sort === undefined || COLUMNS_SHOWN_OUTSIDE_READ_REACH.includes(sort.column)) {
|
|
708
|
+
return shownSortValueOfShip(sort);
|
|
709
|
+
}
|
|
710
|
+
// A ship outside read reach has no value in a column it does not show (decision 0034).
|
|
711
|
+
return Prisma.sql `CASE WHEN ${isInReachOfShip(reach)} THEN ${shownSortValueOfShip(sort)} ELSE '' END`;
|
|
712
|
+
}
|
|
713
|
+
function shownSortValueOfShip(sort) {
|
|
714
|
+
switch (sort?.column) {
|
|
715
|
+
case undefined:
|
|
716
|
+
return Prisma.sql `''::text`;
|
|
717
|
+
case 'ship':
|
|
718
|
+
return Prisma.sql `lower(s.name)`;
|
|
719
|
+
case 'status':
|
|
720
|
+
return statusWordOfShip;
|
|
721
|
+
case 'report':
|
|
722
|
+
return Prisma.sql `CASE WHEN s.kind IN ('agent', 'plugin') AND ${statusOfShip} = 'crewed' THEN lower(COALESCE(l.report_note, '')) ELSE '' END`;
|
|
723
|
+
case 'runsOn':
|
|
724
|
+
return Prisma.sql `CASE WHEN ${statusOfShip} = 'crewed' AND s.kind <> 'viewer'
|
|
725
|
+
THEN CASE WHEN s.kind = 'operator' THEN 'console' ELSE lower(COALESCE(l.harness, '')) END
|
|
726
|
+
ELSE '' END`;
|
|
727
|
+
case 'requested':
|
|
728
|
+
return Prisma.sql `COALESCE((SELECT to_char(rq.requested_at AT TIME ZONE 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.US')
|
|
729
|
+
FROM crew_requests rq WHERE rq.fleet_id = s.fleet_id AND rq.ship_id = s.id), '')`;
|
|
730
|
+
case 'seen':
|
|
731
|
+
return Prisma.sql `COALESCE(to_char(COALESCE(l.last_seen_at, (SELECT max(cs.last_used_at) FROM console_sessions cs
|
|
732
|
+
WHERE cs.fleet_id = s.fleet_id AND cs.ship_id = s.id AND cs.lease_id IS NULL))
|
|
733
|
+
AT TIME ZONE 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.US'), '')`;
|
|
734
|
+
}
|
|
735
|
+
}
|
|
736
|
+
/** Whether the ship goes after the ones with a value: an empty cell, or, without a sort, any ship but argo. */
|
|
737
|
+
function sortIsEmptyOfShip(sort, value) {
|
|
738
|
+
return sort === undefined ? Prisma.sql `s.kind <> 'operator'` : Prisma.sql `${value} = ''`;
|
|
739
|
+
}
|
|
740
|
+
/**
|
|
741
|
+
* The terms the page orders by, those of ship-order's comparePositions that
|
|
742
|
+
* can differ: without a sort the value is always empty, and by ship it is the
|
|
743
|
+
* name and never empty. So the default order and the ship sort are the keys
|
|
744
|
+
* of their listing indexes.
|
|
745
|
+
*/
|
|
746
|
+
function orderTermsOf(sort) {
|
|
747
|
+
const isDescending = isValueDescending(sort);
|
|
748
|
+
if (sort === undefined) {
|
|
749
|
+
return [{ column: 'sort_is_empty', isDescending: false }, { column: 'sort_name', isDescending: false }, { column: 'id', isDescending: false }];
|
|
750
|
+
}
|
|
751
|
+
if (sort.column === 'ship') {
|
|
752
|
+
return [{ column: 'sort_value', isDescending }, { column: 'id', isDescending: false }];
|
|
753
|
+
}
|
|
754
|
+
return [
|
|
755
|
+
{ column: 'sort_is_empty', isDescending: false },
|
|
756
|
+
{ column: 'sort_value', isDescending },
|
|
757
|
+
{ column: 'sort_name', isDescending: false },
|
|
758
|
+
{ column: 'id', isDescending: false },
|
|
759
|
+
];
|
|
760
|
+
}
|
|
761
|
+
function termOf(alias, { column }) {
|
|
762
|
+
const term = Prisma.raw(`${alias}.${column}`);
|
|
763
|
+
return column === 'sort_is_empty' ? term : Prisma.sql `${term} COLLATE "C"`;
|
|
764
|
+
}
|
|
765
|
+
function positionValueOf(position, { column }) {
|
|
766
|
+
switch (column) {
|
|
767
|
+
case 'sort_is_empty':
|
|
768
|
+
return Prisma.sql `${position.isEmpty}`;
|
|
769
|
+
case 'sort_value':
|
|
770
|
+
return Prisma.sql `${position.value}`;
|
|
771
|
+
case 'sort_name':
|
|
772
|
+
return Prisma.sql `${position.name}`;
|
|
773
|
+
case 'id':
|
|
774
|
+
return Prisma.sql `${position.id}`;
|
|
775
|
+
}
|
|
776
|
+
}
|
|
777
|
+
/**
|
|
778
|
+
* The ships after the position, in the order of the terms. Terms all
|
|
779
|
+
* ascending compare as one row, which a listing index seeks to; with a
|
|
780
|
+
* descending first term, its bound comes first, so the index seeks to it.
|
|
781
|
+
*/
|
|
782
|
+
function afterPosition(position, sort) {
|
|
783
|
+
if (position === undefined) {
|
|
784
|
+
return Prisma.empty;
|
|
785
|
+
}
|
|
786
|
+
const terms = orderTermsOf(sort);
|
|
787
|
+
if (terms.every((term) => !term.isDescending)) {
|
|
788
|
+
const ranked = Prisma.join(terms.map((term) => termOf('ranked', term)));
|
|
789
|
+
const values = Prisma.join(terms.map((term) => positionValueOf(position, term)));
|
|
790
|
+
return Prisma.sql `WHERE (${ranked}) > (${values})`;
|
|
791
|
+
}
|
|
792
|
+
const [first] = terms;
|
|
793
|
+
const bound = first?.isDescending === true ? Prisma.sql `${termOf('ranked', first)} <= ${positionValueOf(position, first)} AND ` : Prisma.empty;
|
|
794
|
+
return Prisma.sql `WHERE ${bound}(${beyond(terms, position)})`;
|
|
795
|
+
}
|
|
796
|
+
/** Whether a ship comes after the position by the first term that differs. */
|
|
797
|
+
function beyond(terms, position) {
|
|
798
|
+
const [term, ...rest] = terms;
|
|
799
|
+
if (term === undefined) {
|
|
800
|
+
return Prisma.sql `false`;
|
|
801
|
+
}
|
|
802
|
+
const ranked = termOf('ranked', term);
|
|
803
|
+
const value = positionValueOf(position, term);
|
|
804
|
+
const after = term.isDescending ? Prisma.sql `${ranked} < ${value}` : Prisma.sql `${ranked} > ${value}`;
|
|
805
|
+
return rest.length === 0 ? after : Prisma.sql `${after} OR (${ranked} = ${value} AND (${beyond(rest, position)}))`;
|
|
806
|
+
}
|
|
807
|
+
function orderOfPage(alias, sort) {
|
|
808
|
+
const terms = orderTermsOf(sort).map((term) => Prisma.sql `${termOf(alias, term)} ${term.isDescending ? Prisma.sql `DESC` : Prisma.sql `ASC`}`);
|
|
809
|
+
return Prisma.sql `ORDER BY ${Prisma.join(terms)}`;
|
|
810
|
+
}
|
|
811
|
+
/**
|
|
812
|
+
* The listing's one statement: a page of the fleet's ships with what the
|
|
813
|
+
* snapshot shows of each (decision 4 of the performance design). The ships
|
|
814
|
+
* the filter selects are ordered by the sort's few terms alone, the page is
|
|
815
|
+
* cut after the position, and only the page's ships read who crewed them,
|
|
816
|
+
* their last ping and model, and their labels. One row per ship: at most one
|
|
817
|
+
* lease is open and at most one secret is valid per ship (partial unique
|
|
818
|
+
* indexes), so neither join multiplies rows.
|
|
819
|
+
*/
|
|
820
|
+
export function fleetListingStatement(fleetId, { after, limit, filter, sort, reach }) {
|
|
821
|
+
const value = sortValueOfShip(sort, reach);
|
|
586
822
|
return Prisma.sql `
|
|
587
823
|
SELECT s.id, s.fleet_id, s.name, s.type, s.kind::text AS kind, s.scopes, s.note, s.created_at, s.retired_at,
|
|
588
824
|
s.commissioned_by_kind::text AS commissioned_by_kind, s.commissioned_by, s.commission_key, s.commission_request_hash, s.owner_ship_id,
|
|
@@ -600,8 +836,20 @@ export function fleetListingStatement(fleetId) {
|
|
|
600
836
|
WHERE cs.fleet_id = s.fleet_id AND cs.ship_id = s.id AND cs.lease_id IS NULL) AS last_viewed_at,
|
|
601
837
|
(SELECT max(el.ended_at) FROM leases el
|
|
602
838
|
WHERE el.fleet_id = s.fleet_id AND el.ship_id = s.id AND el.ended_at IS NOT NULL) AS last_lease_ended_at,
|
|
603
|
-
${labelsOfShip} AS labels, ${givenBackOfShip} AS crew_request_given_back
|
|
604
|
-
|
|
839
|
+
${labelsOfShip} AS labels, ${givenBackOfShip} AS crew_request_given_back,
|
|
840
|
+
pg.sort_is_empty, pg.sort_value, pg.sort_name
|
|
841
|
+
FROM (
|
|
842
|
+
SELECT ranked.* FROM (
|
|
843
|
+
SELECT s.id, ${sortIsEmptyOfShip(sort, value)} AS sort_is_empty, ${value} AS sort_value, lower(s.name) AS sort_name
|
|
844
|
+
FROM ships s
|
|
845
|
+
LEFT JOIN leases l ON l.fleet_id = s.fleet_id AND l.ship_id = s.id AND l.ended_at IS NULL
|
|
846
|
+
WHERE s.fleet_id = ${fleetId} ${shipFilterCondition(filter, reach)}
|
|
847
|
+
) ranked
|
|
848
|
+
${afterPosition(after, sort)}
|
|
849
|
+
${orderOfPage('ranked', sort)}
|
|
850
|
+
LIMIT ${limit}
|
|
851
|
+
) pg
|
|
852
|
+
JOIN ships s ON s.fleet_id = ${fleetId} AND s.id = pg.id
|
|
605
853
|
LEFT JOIN leases l ON l.fleet_id = s.fleet_id AND l.ship_id = s.id AND l.ended_at IS NULL
|
|
606
854
|
LEFT JOIN credentials c ON c.fleet_id = s.fleet_id AND c.ship_id = s.id AND c.invalidated_at IS NULL
|
|
607
855
|
LEFT JOIN crew_requests cr ON cr.fleet_id = s.fleet_id AND cr.ship_id = s.id
|
|
@@ -610,14 +858,28 @@ export function fleetListingStatement(fleetId) {
|
|
|
610
858
|
LEFT JOIN LATERAL (${crewedByOfShip}) cb ON true
|
|
611
859
|
LEFT JOIN LATERAL (${lastPingOfShip}) p ON true
|
|
612
860
|
LEFT JOIN LATERAL (${lastModelOfShip}) lm ON true
|
|
613
|
-
|
|
614
|
-
|
|
861
|
+
${orderOfPage('pg', sort)}`;
|
|
862
|
+
}
|
|
863
|
+
const shipPositionRowSchema = z.object({ id: idSchema('ship'), sort_is_empty: z.boolean(), sort_value: z.string(), sort_name: z.string() });
|
|
864
|
+
/** The ship's place in the page's order, as the listing statement read it. */
|
|
865
|
+
function shipPositionOfRow(row) {
|
|
866
|
+
const { id, sort_is_empty, sort_value, sort_name } = shipPositionRowSchema.parse(row);
|
|
867
|
+
return { isEmpty: sort_is_empty, value: sort_value, name: sort_name, id };
|
|
868
|
+
}
|
|
869
|
+
/**
|
|
870
|
+
* The types of the fleet's ships in `reach` of any of the statuses, each
|
|
871
|
+
* once: for active ships alone, read from the type index without a ship row.
|
|
872
|
+
*/
|
|
873
|
+
export function shipTypesStatement(fleetId, { reach, status }) {
|
|
874
|
+
return Prisma.sql `
|
|
875
|
+
SELECT DISTINCT s.type FROM ships s
|
|
876
|
+
WHERE s.fleet_id = ${fleetId} AND ${isInReachOfShip(reach)} ${shipFilterCondition({ status }, reach)}`;
|
|
615
877
|
}
|
|
616
878
|
export function createPrismaFleetListing(db) {
|
|
617
879
|
return {
|
|
618
|
-
ships: async (fleetId) => {
|
|
619
|
-
const rows = await db.$queryRaw(fleetListingStatement(fleetId));
|
|
620
|
-
return rows.map(toShipFacts);
|
|
880
|
+
ships: async (fleetId, page) => {
|
|
881
|
+
const rows = await db.$queryRaw(fleetListingStatement(fleetId, page));
|
|
882
|
+
return rows.map((row) => ({ facts: toShipFacts(row), position: shipPositionOfRow(row) }));
|
|
621
883
|
},
|
|
622
884
|
labels: async (fleetId) => {
|
|
623
885
|
const rows = await db.$queryRaw `
|
|
@@ -635,6 +897,23 @@ export function createPrismaFleetListing(db) {
|
|
|
635
897
|
]);
|
|
636
898
|
return { inFlight, open };
|
|
637
899
|
},
|
|
900
|
+
labelShipCounts: async (fleetId, reach) => {
|
|
901
|
+
// One pass over the fleet's carried values: per value its carriers, per label its distinct carriers.
|
|
902
|
+
const rows = z.array(z.object({ value_id: idSchema('labelValue').nullable(), label_id: idSchema('label'), ship_count: z.number() })).parse(await db.$queryRaw `
|
|
903
|
+
SELECT sl.value_id, sl.label_id, count(DISTINCT sl.ship_id)::int AS ship_count
|
|
904
|
+
FROM ship_labels sl
|
|
905
|
+
JOIN ships s ON s.fleet_id = sl.fleet_id AND s.id = sl.ship_id
|
|
906
|
+
WHERE sl.fleet_id = ${fleetId} AND s.retired_at IS NULL AND ${isInReachOfShip(reach)}
|
|
907
|
+
GROUP BY GROUPING SETS ((sl.label_id, sl.value_id), (sl.label_id))`);
|
|
908
|
+
return {
|
|
909
|
+
values: new Map(rows.flatMap((row) => (row.value_id === null ? [] : [[row.value_id, row.ship_count]]))),
|
|
910
|
+
labels: new Map(rows.flatMap((row) => (row.value_id === null ? [[row.label_id, row.ship_count]] : []))),
|
|
911
|
+
};
|
|
912
|
+
},
|
|
913
|
+
counts: (fleetId, { reach, filter }) => readShipCounts(db, { fleetId, reach, selected: shipFilterCondition(filter, reach) }),
|
|
914
|
+
types: async (fleetId, read) => z.array(z.object({ type: z.string() })).parse(await db.$queryRaw(shipTypesStatement(fleetId, read)))
|
|
915
|
+
.map(({ type }) => type)
|
|
916
|
+
.toSorted(),
|
|
638
917
|
statement: async (fleetId, shipId) => {
|
|
639
918
|
const [row] = await db.$queryRaw `
|
|
640
919
|
SELECT statement, statement_version
|