@aeolus-fleet/core 0.39.1 → 0.41.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 +7 -7
- 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/io.d.ts +5 -2
- package/dist/adapters/cli/io.js.map +1 -1
- package/dist/adapters/crypto/account-token-signatures.js +1 -1
- package/dist/adapters/crypto/account-token-signatures.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/delivery-notices.d.ts +2 -2
- package/dist/adapters/prisma/delivery-notices.js +2 -2
- package/dist/adapters/prisma/exchange-rollups.d.ts +3 -1
- package/dist/adapters/prisma/exchange-rollups.js +15 -9
- 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-event-wakeups.d.ts +1 -7
- package/dist/adapters/prisma/fleet-event-wakeups.js +0 -19
- package/dist/adapters/prisma/fleet-event-wakeups.js.map +1 -1
- package/dist/adapters/prisma/fleet-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 +1 -6
- package/dist/adapters/prisma/generated/enums.js +2 -6
- 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 +3 -3
- 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 +17 -1
- package/dist/adapters/prisma/messaging.js +60 -2
- package/dist/adapters/prisma/messaging.js.map +1 -1
- package/dist/adapters/prisma/page-with-messages.js +2 -0
- package/dist/adapters/prisma/page-with-messages.js.map +1 -1
- package/dist/adapters/prisma/receiver-wakeups.d.ts +11 -17
- package/dist/adapters/prisma/receiver-wakeups.js +0 -60
- package/dist/adapters/prisma/receiver-wakeups.js.map +1 -1
- package/dist/adapters/prisma/registry.js +19 -54
- 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/telemetry/calls.d.ts +0 -8
- package/dist/adapters/telemetry/calls.js +3 -39
- package/dist/adapters/telemetry/calls.js.map +1 -1
- package/dist/adapters/trpc/console.d.ts +5 -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 +0 -2
- package/dist/adapters/trpc/fleet.d.ts +12 -13
- package/dist/adapters/trpc/fleet.js +6 -5
- package/dist/adapters/trpc/fleet.js.map +1 -1
- package/dist/adapters/trpc/installation.d.ts +12 -0
- package/dist/adapters/trpc/router.d.ts +36 -28
- package/dist/adapters/trpc/ship-protocol.js +1 -1
- package/dist/adapters/trpc/ship-protocol.js.map +1 -1
- package/dist/adapters/trpc/ship.d.ts +15 -15
- package/dist/adapters/trpc/ship.js +15 -16
- package/dist/adapters/trpc/ship.js.map +1 -1
- package/dist/adapters/trpc/trpc.js +0 -2
- package/dist/adapters/trpc/trpc.js.map +1 -1
- package/dist/app.d.ts +5 -3
- package/dist/app.js +79 -14
- package/dist/app.js.map +1 -1
- package/dist/domain/identity/authenticate-installation.d.ts +1 -1
- package/dist/domain/identity/authenticate-installation.js +2 -2
- package/dist/domain/identity/authenticate-installation.js.map +1 -1
- package/dist/domain/identity/notice.js +1 -0
- package/dist/domain/identity/notice.js.map +1 -1
- package/dist/domain/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/check-inbox.d.ts +6 -23
- package/dist/domain/messaging/check-inbox.js +14 -59
- package/dist/domain/messaging/check-inbox.js.map +1 -1
- package/dist/domain/messaging/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 +5 -1
- package/dist/domain/messaging/message.js +9 -3
- package/dist/domain/messaging/message.js.map +1 -1
- package/dist/domain/messaging/ports.d.ts +63 -18
- package/dist/domain/messaging/public.d.ts +1 -0
- package/dist/domain/messaging/public.js +1 -0
- package/dist/domain/messaging/public.js.map +1 -1
- package/dist/domain/messaging/push-receive-deliveries.d.ts +4 -6
- package/dist/domain/messaging/push-receive-deliveries.js +5 -7
- package/dist/domain/messaging/push-receive-deliveries.js.map +1 -1
- package/dist/domain/messaging/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/receive-deliveries.d.ts +4 -34
- package/dist/domain/messaging/receive-deliveries.js +4 -46
- package/dist/domain/messaging/receive-deliveries.js.map +1 -1
- package/dist/domain/messaging/receive-reply.d.ts +5 -8
- package/dist/domain/messaging/receive-reply.js +10 -9
- package/dist/domain/messaging/receive-reply.js.map +1 -1
- package/dist/domain/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/check-reach.d.ts +1 -1
- package/dist/domain/registry/check-reach.js +2 -2
- package/dist/domain/registry/check-reach.js.map +1 -1
- package/dist/domain/registry/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/expectations.js +1 -0
- package/dist/domain/registry/expectations.js.map +1 -1
- package/dist/domain/registry/found-fleet.js +1 -1
- package/dist/domain/registry/found-fleet.js.map +1 -1
- package/dist/domain/registry/network-settings.d.ts +5 -2
- package/dist/domain/registry/network-settings.js +2 -2
- package/dist/domain/registry/network-settings.js.map +1 -1
- package/dist/domain/registry/ports.d.ts +25 -8
- package/dist/domain/registry/public.d.ts +1 -1
- package/dist/domain/registry/read-reach.js +1 -1
- package/dist/domain/registry/read-reach.js.map +1 -1
- 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-order.js +1 -1
- package/dist/domain/registry/ship-order.js.map +1 -1
- package/dist/domain/registry/verified-facts.js +1 -0
- package/dist/domain/registry/verified-facts.js.map +1 -1
- package/dist/domain/shared/caller.js +1 -0
- package/dist/domain/shared/caller.js.map +1 -1
- package/dist/domain/shared/errors.d.ts +1 -1
- package/dist/domain/shared/errors.js.map +1 -1
- package/dist/domain/shared/events.d.ts +0 -13
- package/dist/domain/shared/follow-fleet.d.ts +9 -15
- package/dist/domain/shared/follow-fleet.js +16 -55
- package/dist/domain/shared/follow-fleet.js.map +1 -1
- package/dist/domain/shared/health-snapshot.js +7 -2
- package/dist/domain/shared/health-snapshot.js.map +1 -1
- package/dist/domain/shared/read-fleet-limits.d.ts +2 -2
- package/dist/domain/shared/read-fleet-limits.js +1 -1
- package/dist/domain/shared/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/start.d.ts +1 -1
- package/dist/start.js +1 -1
- package/dist/testing/container-sweeper.d.ts +67 -0
- package/dist/testing/container-sweeper.js +147 -14
- package/dist/testing/container-sweeper.js.map +1 -1
- package/dist/testing/postgres-container.js +2 -2
- package/dist/testing/postgres-container.js.map +1 -1
- package/dist/testing/postgres-global-setup.d.ts +1 -1
- package/dist/testing/postgres-global-setup.js +3 -2
- package/dist/testing/postgres-global-setup.js.map +1 -1
- package/dist/wiring.d.ts +7 -12
- package/dist/wiring.js +6 -18
- package/dist/wiring.js.map +1 -1
- package/package.json +2 -2
- 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/migrations/20261115180000_trierarch_kind/migration.sql +2 -0
- package/src/adapters/prisma/migrations/20261115180100_trierarch_kind_backfill/migration.sql +38 -0
- package/src/adapters/prisma/schema.prisma +28 -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/dist/domain/messaging/inbox-wait.d.ts +0 -8
- package/dist/domain/messaging/inbox-wait.js +0 -19
- package/dist/domain/messaging/inbox-wait.js.map +0 -1
|
@@ -49,7 +49,7 @@ export function createPrismaOperatorAccountLookup(db) {
|
|
|
49
49
|
// Not scoped by fleet: signing in names no fleet (ADR 0007). No lock:
|
|
50
50
|
// a plain read never waits for a sign-in or a reset holding the row.
|
|
51
51
|
const rows = await db.$queryRaw `
|
|
52
|
-
SELECT id, fleet_id, email, password_hash,
|
|
52
|
+
SELECT id, fleet_id, email, password_hash, created_at FROM operators
|
|
53
53
|
WHERE email = ${email}
|
|
54
54
|
ORDER BY id`;
|
|
55
55
|
return rows.map(toOperatorAccount);
|
|
@@ -57,7 +57,7 @@ export function createPrismaOperatorAccountLookup(db) {
|
|
|
57
57
|
byFleet: async (fleetId) => {
|
|
58
58
|
// No lock, as allByEmail: the caller checks the row again under its lock.
|
|
59
59
|
const [row] = await db.$queryRaw `
|
|
60
|
-
SELECT id, fleet_id, email, password_hash,
|
|
60
|
+
SELECT id, fleet_id, email, password_hash, created_at FROM operators
|
|
61
61
|
WHERE fleet_id = ${fleetId}`;
|
|
62
62
|
return row ? toOperatorAccount(row) : undefined;
|
|
63
63
|
},
|
|
@@ -77,7 +77,7 @@ export function createPrismaOperatorAccountRepository(db) {
|
|
|
77
77
|
// Not scoped by fleet: signing in names no fleet (ADR 0007). Locked in
|
|
78
78
|
// id order, so two units of work never wait on each other's rows.
|
|
79
79
|
const rows = await db.$queryRaw `
|
|
80
|
-
SELECT id, fleet_id, email, password_hash,
|
|
80
|
+
SELECT id, fleet_id, email, password_hash, created_at FROM operators
|
|
81
81
|
WHERE email = ${email}
|
|
82
82
|
ORDER BY id
|
|
83
83
|
FOR UPDATE`;
|
|
@@ -85,7 +85,7 @@ export function createPrismaOperatorAccountRepository(db) {
|
|
|
85
85
|
},
|
|
86
86
|
findForFleetForUpdate: async (fleetId) => {
|
|
87
87
|
const [row] = await db.$queryRaw `
|
|
88
|
-
SELECT id, fleet_id, email, password_hash,
|
|
88
|
+
SELECT id, fleet_id, email, password_hash, created_at FROM operators
|
|
89
89
|
WHERE fleet_id = ${fleetId}
|
|
90
90
|
FOR UPDATE`;
|
|
91
91
|
return row ? toOperatorAccount(row) : undefined;
|
|
@@ -98,13 +98,10 @@ export function createPrismaOperatorAccountRepository(db) {
|
|
|
98
98
|
},
|
|
99
99
|
findForFleet: async (fleetId) => {
|
|
100
100
|
const [row] = await db.$queryRaw `
|
|
101
|
-
SELECT id, fleet_id, email, password_hash,
|
|
101
|
+
SELECT id, fleet_id, email, password_hash, created_at FROM operators
|
|
102
102
|
WHERE fleet_id = ${fleetId}`;
|
|
103
103
|
return row ? toOperatorAccount(row) : undefined;
|
|
104
104
|
},
|
|
105
|
-
setTheme: async ({ fleetId, operatorId, theme }) => {
|
|
106
|
-
await db.operator.updateMany({ where: { fleetId, id: operatorId }, data: { theme } });
|
|
107
|
-
},
|
|
108
105
|
};
|
|
109
106
|
}
|
|
110
107
|
export function createPrismaSignInTicketRepository(db) {
|
|
@@ -286,7 +283,7 @@ export function createPrismaAccountCutOffs(db) {
|
|
|
286
283
|
}
|
|
287
284
|
export function createPrismaHostedFleets(db) {
|
|
288
285
|
return {
|
|
289
|
-
isHosted: async (fleetId) => (await db.fleet.count({ where: { id: fleetId } })) > 0,
|
|
286
|
+
isHosted: async (fleetId) => (await db.fleet.count({ where: { id: fleetId, deletedAt: null } })) > 0,
|
|
290
287
|
};
|
|
291
288
|
}
|
|
292
289
|
//# sourceMappingURL=identity.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../../src/adapters/prisma/identity.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../../src/adapters/prisma/identity.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
export interface IndexAfterStart {
|
|
2
|
+
/** The index's name, also the key of the session advisory lock that keeps two cores' builds apart. */
|
|
3
|
+
name: string;
|
|
4
|
+
/** Its `CREATE INDEX CONCURRENTLY IF NOT EXISTS` statement. */
|
|
5
|
+
create: string;
|
|
6
|
+
}
|
|
7
|
+
/**
|
|
8
|
+
* Builds the index unless a valid one exists, removing an invalid one first:
|
|
9
|
+
* the one a build cut off by a stop or a failure leaves. Returns false while
|
|
10
|
+
* another core builds it, or when `signal` aborts: that cancels the statement
|
|
11
|
+
* running on its connection, so a stop never waits for a build.
|
|
12
|
+
*/
|
|
13
|
+
export declare function ensureIndexAfterStart(index: IndexAfterStart, { databaseUrl, signal }: {
|
|
14
|
+
databaseUrl: string;
|
|
15
|
+
signal: AbortSignal;
|
|
16
|
+
}): Promise<boolean>;
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
/** An index core builds while it serves, never in a startup migration. */
|
|
2
|
+
import pg from 'pg';
|
|
3
|
+
import { z } from 'zod';
|
|
4
|
+
import { CONNECTION_WAIT_MS } from './client.js';
|
|
5
|
+
/**
|
|
6
|
+
* Builds the index unless a valid one exists, removing an invalid one first:
|
|
7
|
+
* the one a build cut off by a stop or a failure leaves. Returns false while
|
|
8
|
+
* another core builds it, or when `signal` aborts: that cancels the statement
|
|
9
|
+
* running on its connection, so a stop never waits for a build.
|
|
10
|
+
*/
|
|
11
|
+
export async function ensureIndexAfterStart(index, { databaseUrl, signal }) {
|
|
12
|
+
// Concurrent DDL cannot run in a transaction. One connection holds the
|
|
13
|
+
// session lock through inspection and building; closing it releases the lock.
|
|
14
|
+
const client = new pg.Client({ connectionString: databaseUrl, connectionTimeoutMillis: CONNECTION_WAIT_MS });
|
|
15
|
+
let backendPid;
|
|
16
|
+
let cancelling = Promise.resolve();
|
|
17
|
+
const cancel = () => {
|
|
18
|
+
if (backendPid !== undefined) {
|
|
19
|
+
cancelling = cancelBackend(databaseUrl, backendPid);
|
|
20
|
+
}
|
|
21
|
+
};
|
|
22
|
+
signal.addEventListener('abort', cancel, { once: true });
|
|
23
|
+
try {
|
|
24
|
+
await client.connect();
|
|
25
|
+
const { rows: pids } = await client.query('SELECT pg_backend_pid() AS pid');
|
|
26
|
+
backendPid = z.array(z.object({ pid: z.number() })).parse(pids)[0]?.pid;
|
|
27
|
+
// A statement is sent in the same tick as this check, before any cancel
|
|
28
|
+
// can reach the server; an abort after it cancels that statement.
|
|
29
|
+
const run = async (sql, values = []) => {
|
|
30
|
+
if (signal.aborted) {
|
|
31
|
+
throw new IndexBuildStopped();
|
|
32
|
+
}
|
|
33
|
+
return client.query(sql, values);
|
|
34
|
+
};
|
|
35
|
+
const { rows: locks } = await run('SELECT pg_try_advisory_lock(hashtext($1)) AS is_locked', [index.name]);
|
|
36
|
+
if (!z.array(z.object({ is_locked: z.boolean() })).parse(locks)[0]?.is_locked) {
|
|
37
|
+
return false;
|
|
38
|
+
}
|
|
39
|
+
const { rows } = await run('SELECT indisvalid AS is_valid FROM pg_index WHERE indexrelid = to_regclass($1)', [index.name]);
|
|
40
|
+
const [existing] = z.array(z.object({ is_valid: z.boolean() })).parse(rows);
|
|
41
|
+
if (existing?.is_valid === true) {
|
|
42
|
+
return true;
|
|
43
|
+
}
|
|
44
|
+
if (existing !== undefined) {
|
|
45
|
+
await run(`DROP INDEX CONCURRENTLY IF EXISTS ${index.name}`);
|
|
46
|
+
}
|
|
47
|
+
await run(index.create);
|
|
48
|
+
return true;
|
|
49
|
+
}
|
|
50
|
+
catch (error) {
|
|
51
|
+
if (signal.aborted) {
|
|
52
|
+
return false;
|
|
53
|
+
}
|
|
54
|
+
throw error;
|
|
55
|
+
}
|
|
56
|
+
finally {
|
|
57
|
+
signal.removeEventListener('abort', cancel);
|
|
58
|
+
await cancelling;
|
|
59
|
+
await client.end();
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
class IndexBuildStopped extends Error {
|
|
63
|
+
}
|
|
64
|
+
/** Cancels the statement the backend runs, from a connection of its own. */
|
|
65
|
+
async function cancelBackend(databaseUrl, pid) {
|
|
66
|
+
const canceller = new pg.Client({ connectionString: databaseUrl, connectionTimeoutMillis: CONNECTION_WAIT_MS });
|
|
67
|
+
try {
|
|
68
|
+
await canceller.connect();
|
|
69
|
+
await canceller.query('SELECT pg_cancel_backend($1)', [pid]);
|
|
70
|
+
}
|
|
71
|
+
catch {
|
|
72
|
+
// Closing the build's connection ends the build too, only later.
|
|
73
|
+
}
|
|
74
|
+
finally {
|
|
75
|
+
await canceller.end();
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
//# sourceMappingURL=index-after-start.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index-after-start.js","sourceRoot":"","sources":["../../../src/adapters/prisma/index-after-start.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAC1E,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AASjD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,KAAsB,EAAE,EAAE,WAAW,EAAE,MAAM,EAAgD;IACvI,uEAAuE;IACvE,8EAA8E;IAC9E,MAAM,MAAM,GAAG,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,gBAAgB,EAAE,WAAW,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAC7G,IAAI,UAA8B,CAAC;IACnC,IAAI,UAAU,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;IAClD,MAAM,MAAM,GAAG,GAAG,EAAE;QAClB,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,UAAU,GAAG,aAAa,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QACtD,CAAC;IACH,CAAC,CAAC;IACF,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IACzD,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;QACvB,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;QAC5E,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;QACxE,wEAAwE;QACxE,kEAAkE;QAClE,MAAM,GAAG,GAAG,KAAK,EAAE,GAAW,EAAE,SAAoB,EAAE,EAAE,EAAE;YACxD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,MAAM,IAAI,iBAAiB,EAAE,CAAC;YAChC,CAAC;YACD,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACnC,CAAC,CAAC;QACF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,GAAG,CAAC,wDAAwD,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1G,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC;YAC9E,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,GAAG,CAAC,gFAAgF,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3H,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5E,IAAI,QAAQ,EAAE,QAAQ,KAAK,IAAI,EAAE,CAAC;YAChC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,MAAM,GAAG,CAAC,qCAAqC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QAC/D,CAAC;QACD,MAAM,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5C,MAAM,UAAU,CAAC;QACjB,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC;IACrB,CAAC;AACH,CAAC;AAED,MAAM,iBAAkB,SAAQ,KAAK;CAAG;AAExC,4EAA4E;AAC5E,KAAK,UAAU,aAAa,CAAC,WAAmB,EAAE,GAAW;IAC3D,MAAM,SAAS,GAAG,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,gBAAgB,EAAE,WAAW,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAChH,IAAI,CAAC;QACH,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;QAC1B,MAAM,SAAS,CAAC,KAAK,CAAC,8BAA8B,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/D,CAAC;IAAC,MAAM,CAAC;QACP,iEAAiE;IACnE,CAAC;YAAS,CAAC;QACT,MAAM,SAAS,CAAC,GAAG,EAAE,CAAC;IACxB,CAAC;AACH,CAAC"}
|
|
@@ -103,7 +103,7 @@ function toFacts(row) {
|
|
|
103
103
|
export function installationFleetsStatement(fleetId, window) {
|
|
104
104
|
return Prisma.sql `
|
|
105
105
|
SELECT f.id AS "fleetId", f.name, o.email AS "operatorEmail", f.created_at AS "createdAt",
|
|
106
|
-
(SELECT count(*) FROM ships s WHERE s.fleet_id = f.id AND s.retired_at IS NULL) AS "shipCount",
|
|
106
|
+
(SELECT count(*) FROM ships s WHERE s.fleet_id = f.id AND s.retired_at IS NULL AND s.kind <> 'viewer') AS "shipCount",
|
|
107
107
|
-- The last 7 times 24 hours: the whole UTC days from the first one's start from the days each send counted on,
|
|
108
108
|
-- and only the hours before it, the rest of the day the window starts in, from the messages.
|
|
109
109
|
(SELECT coalesce(sum(md.messages), 0) FROM message_days md WHERE md.fleet_id = f.id AND md.day >= (${window.firstDay} AT TIME ZONE 'UTC')::date)
|
|
@@ -148,7 +148,7 @@ export function installationFleetsStatement(fleetId, window) {
|
|
|
148
148
|
f.sealing_state IS NOT NULL AS "isSealing"
|
|
149
149
|
FROM fleets f
|
|
150
150
|
LEFT JOIN operators o ON o.fleet_id = f.id
|
|
151
|
-
WHERE ${fleetId}::text IS NULL OR f.id = ${fleetId}
|
|
151
|
+
WHERE f.deleted_at IS NULL AND (${fleetId}::text IS NULL OR f.id = ${fleetId})
|
|
152
152
|
ORDER BY f.created_at, f.id`;
|
|
153
153
|
}
|
|
154
154
|
export function createPrismaInstallationFleets(prisma) {
|
|
@@ -220,7 +220,7 @@ export function createPrismaFleetLimitReads(prisma) {
|
|
|
220
220
|
const limits = { fleets: createPrismaFleetRepository(prisma), installationSettings: createPrismaInstallationSettings(prisma) };
|
|
221
221
|
return {
|
|
222
222
|
applied: (fleetId) => appliedLimits(limits, fleetId),
|
|
223
|
-
activeShips: (fleetId) => prisma.ship.count({ where: { fleetId, retiredAt: null } }),
|
|
223
|
+
activeShips: (fleetId) => prisma.ship.count({ where: { fleetId, retiredAt: null, kind: { not: 'viewer' } } }),
|
|
224
224
|
messagesOn: async (fleetId, day) => {
|
|
225
225
|
const row = await prisma.messageDay.findUnique({ where: { fleetId_day: { fleetId, day } }, select: { messages: true } });
|
|
226
226
|
return row?.messages ?? 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installation.js","sourceRoot":"","sources":["../../../src/adapters/prisma/installation.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"installation.js","sourceRoot":"","sources":["../../../src/adapters/prisma/installation.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The metadata fill's ports on Postgres (docs/architecture.md, Backfills): a
|
|
3
|
+
* fleet's cursor in message_metadata_backfills, the next messages by id and
|
|
4
|
+
* the next exchanges by key, each batch one transaction with its cursor, and
|
|
5
|
+
* the two indexes the fill and the reads of its unfilled part use, built
|
|
6
|
+
* after start without holding writes. A count is written only while it is
|
|
7
|
+
* null, so a batch taken again adds nothing twice.
|
|
8
|
+
*/
|
|
9
|
+
import { type FleetId, type MessageId } from '@aeolus-fleet/common';
|
|
10
|
+
import type { ExchangeKey, MessageMetadataFill, MetadataFillIndexes } from '../../domain/messaging/ports.js';
|
|
11
|
+
import type { Db } from './client.js';
|
|
12
|
+
import { Prisma } from './generated/client.js';
|
|
13
|
+
/** Builds each index on its own cancellable connection while core serves. */
|
|
14
|
+
export declare function createPrismaMetadataFillIndexes(databaseUrl: string, signal?: AbortSignal): MetadataFillIndexes;
|
|
15
|
+
/** The fleet's cursor, by its key, held for update. */
|
|
16
|
+
export declare function metadataFillCursorStatement(fleetId: FleetId): Prisma.Sql;
|
|
17
|
+
/** The next messages by id after the cursor: a range of the messages' key. */
|
|
18
|
+
export declare function metadataFillMessagesStatement({ fleetId, after, limit }: {
|
|
19
|
+
fleetId: FleetId;
|
|
20
|
+
after: MessageId | null;
|
|
21
|
+
limit: number;
|
|
22
|
+
}): Prisma.Sql;
|
|
23
|
+
/**
|
|
24
|
+
* The next exchanges by key after the cursor, a range of the exchanges' key,
|
|
25
|
+
* locked in key order before their recount in a later statement: a delivery's
|
|
26
|
+
* delta that commits first is in the recount, one that commits after lands
|
|
27
|
+
* on the count, once either way.
|
|
28
|
+
*/
|
|
29
|
+
export declare function metadataFillExchangesStatement({ fleetId, after, limit }: {
|
|
30
|
+
fleetId: FleetId;
|
|
31
|
+
after: ExchangeKey | null;
|
|
32
|
+
limit: number;
|
|
33
|
+
}): Prisma.Sql;
|
|
34
|
+
/** Counts the exchanges of the batch, the key range after `after` up to `last`, that hold no count yet. */
|
|
35
|
+
export declare function fillUnseenPlainMessagesStatement({ fleetId, after, last }: {
|
|
36
|
+
fleetId: FleetId;
|
|
37
|
+
after: ExchangeKey | null;
|
|
38
|
+
last: ExchangeKey;
|
|
39
|
+
}): Prisma.Sql;
|
|
40
|
+
export declare function createPrismaMessageMetadataFill(db: Db): MessageMetadataFill;
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The metadata fill's ports on Postgres (docs/architecture.md, Backfills): a
|
|
3
|
+
* fleet's cursor in message_metadata_backfills, the next messages by id and
|
|
4
|
+
* the next exchanges by key, each batch one transaction with its cursor, and
|
|
5
|
+
* the two indexes the fill and the reads of its unfilled part use, built
|
|
6
|
+
* after start without holding writes. A count is written only while it is
|
|
7
|
+
* null, so a batch taken again adds nothing twice.
|
|
8
|
+
*/
|
|
9
|
+
import { idSchema } from '@aeolus-fleet/common';
|
|
10
|
+
import { z } from 'zod';
|
|
11
|
+
import { askingContentTypeText } from './content-type-sql.js';
|
|
12
|
+
import { fillMessageQuestionIdsStatement } from './fill-message-question-ids.js';
|
|
13
|
+
import { Prisma } from './generated/client.js';
|
|
14
|
+
import { ensureIndexAfterStart } from './index-after-start.js';
|
|
15
|
+
import { unseenPlainMessagesStatement } from './unseen-plain-messages.js';
|
|
16
|
+
/**
|
|
17
|
+
* Built after start, not by a migration, so a migration holds start for no
|
|
18
|
+
* full read of messages or deliveries. Each is left out of schema.prisma,
|
|
19
|
+
* which describes what the migrations build.
|
|
20
|
+
*/
|
|
21
|
+
const FILL_INDEXES = [
|
|
22
|
+
{
|
|
23
|
+
// The questions a ship asked that the fill has not reached, by message id, for its open questions.
|
|
24
|
+
name: 'messages_unfilled_questions_idx',
|
|
25
|
+
definition: `ON messages (fleet_id, sender_ship_id, id) WHERE asked_question_id IS NULL AND payload IS NOT NULL AND ${askingContentTypeText('content_type')}`,
|
|
26
|
+
},
|
|
27
|
+
{
|
|
28
|
+
// The open part of an exchange, which the fill and a read of an unfilled count recount.
|
|
29
|
+
name: 'deliveries_open_exchange_idx',
|
|
30
|
+
definition: `ON deliveries (fleet_id, reached_ship_id, sender_ship_id, id) WHERE is_in_exchange AND state IN ('pending', 'received', 'handed')`,
|
|
31
|
+
},
|
|
32
|
+
];
|
|
33
|
+
/** Builds each index on its own cancellable connection while core serves. */
|
|
34
|
+
export function createPrismaMetadataFillIndexes(databaseUrl, signal = new AbortController().signal) {
|
|
35
|
+
return {
|
|
36
|
+
build: async () => {
|
|
37
|
+
for (const { name, definition } of FILL_INDEXES) {
|
|
38
|
+
if (!await ensureIndexAfterStart({ name, create: `CREATE INDEX CONCURRENTLY IF NOT EXISTS ${name} ${definition}` }, { databaseUrl, signal })) {
|
|
39
|
+
return false;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
return true;
|
|
43
|
+
},
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
const cursorRow = z.object({
|
|
47
|
+
after_message_id: idSchema('message').nullable(),
|
|
48
|
+
after_ship_id: idSchema('ship').nullable(),
|
|
49
|
+
after_other_ship_id: idSchema('ship').nullable(),
|
|
50
|
+
is_complete: z.boolean(),
|
|
51
|
+
});
|
|
52
|
+
/** The fleet's cursor, by its key, held for update. */
|
|
53
|
+
export function metadataFillCursorStatement(fleetId) {
|
|
54
|
+
return Prisma.sql `SELECT after_message_id, after_ship_id, after_other_ship_id, is_complete
|
|
55
|
+
FROM message_metadata_backfills WHERE fleet_id = ${fleetId} FOR UPDATE`;
|
|
56
|
+
}
|
|
57
|
+
/** The next messages by id after the cursor: a range of the messages' key. */
|
|
58
|
+
export function metadataFillMessagesStatement({ fleetId, after, limit }) {
|
|
59
|
+
const from = after === null ? Prisma.empty : Prisma.sql `AND id > ${after}`;
|
|
60
|
+
return Prisma.sql `SELECT id FROM messages WHERE fleet_id = ${fleetId} ${from} ORDER BY id LIMIT ${limit}`;
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* The next exchanges by key after the cursor, a range of the exchanges' key,
|
|
64
|
+
* locked in key order before their recount in a later statement: a delivery's
|
|
65
|
+
* delta that commits first is in the recount, one that commits after lands
|
|
66
|
+
* on the count, once either way.
|
|
67
|
+
*/
|
|
68
|
+
export function metadataFillExchangesStatement({ fleetId, after, limit }) {
|
|
69
|
+
const from = after === null ? Prisma.empty : Prisma.sql `AND (fleet_id, ship_id, other_ship_id) > (${fleetId}, ${after.shipId}, ${after.otherShipId})`;
|
|
70
|
+
return Prisma.sql `SELECT ship_id, other_ship_id FROM exchanges
|
|
71
|
+
WHERE fleet_id = ${fleetId} ${from}
|
|
72
|
+
ORDER BY fleet_id, ship_id, other_ship_id LIMIT ${limit} FOR UPDATE`;
|
|
73
|
+
}
|
|
74
|
+
/** Counts the exchanges of the batch, the key range after `after` up to `last`, that hold no count yet. */
|
|
75
|
+
export function fillUnseenPlainMessagesStatement({ fleetId, after, last }) {
|
|
76
|
+
const from = after === null ? Prisma.empty : Prisma.sql `AND (e.fleet_id, e.ship_id, e.other_ship_id) > (${fleetId}, ${after.shipId}, ${after.otherShipId})`;
|
|
77
|
+
return Prisma.sql `UPDATE exchanges e SET unseen_plain_messages = ${unseenPlainMessagesStatement(Prisma.sql `e`)}
|
|
78
|
+
WHERE e.fleet_id = ${fleetId} ${from}
|
|
79
|
+
AND (e.fleet_id, e.ship_id, e.other_ship_id) <= (${fleetId}, ${last.shipId}, ${last.otherShipId})
|
|
80
|
+
AND e.unseen_plain_messages IS NULL`;
|
|
81
|
+
}
|
|
82
|
+
export function createPrismaMessageMetadataFill(db) {
|
|
83
|
+
return {
|
|
84
|
+
lockCursor: async (fleetId) => {
|
|
85
|
+
await db.$executeRaw `INSERT INTO message_metadata_backfills (fleet_id) VALUES (${fleetId}) ON CONFLICT DO NOTHING`;
|
|
86
|
+
const [row] = z.array(cursorRow).parse(await db.$queryRaw(metadataFillCursorStatement(fleetId)));
|
|
87
|
+
if (row === undefined) {
|
|
88
|
+
return { afterMessageId: null, afterExchange: null, isComplete: false };
|
|
89
|
+
}
|
|
90
|
+
return {
|
|
91
|
+
afterMessageId: row.after_message_id,
|
|
92
|
+
afterExchange: row.after_ship_id === null || row.after_other_ship_id === null ? null : { shipId: row.after_ship_id, otherShipId: row.after_other_ship_id },
|
|
93
|
+
isComplete: row.is_complete,
|
|
94
|
+
};
|
|
95
|
+
},
|
|
96
|
+
fillQuestionIds: async (fleetId, query) => {
|
|
97
|
+
const ids = z.array(z.object({ id: idSchema('message') })).parse(await db.$queryRaw(metadataFillMessagesStatement({ fleetId, ...query }))).map((row) => row.id);
|
|
98
|
+
if (ids.length > 0) {
|
|
99
|
+
await db.$executeRaw(fillMessageQuestionIdsStatement({ fleetId, ids }));
|
|
100
|
+
}
|
|
101
|
+
return ids;
|
|
102
|
+
},
|
|
103
|
+
fillUnseenPlainMessages: async (fleetId, query) => {
|
|
104
|
+
const keys = z
|
|
105
|
+
.array(z.object({ ship_id: idSchema('ship'), other_ship_id: idSchema('ship') }))
|
|
106
|
+
.parse(await db.$queryRaw(metadataFillExchangesStatement({ fleetId, ...query })))
|
|
107
|
+
.map((row) => ({ shipId: row.ship_id, otherShipId: row.other_ship_id }));
|
|
108
|
+
const last = keys.at(-1);
|
|
109
|
+
if (last !== undefined) {
|
|
110
|
+
await db.$executeRaw(fillUnseenPlainMessagesStatement({ fleetId, after: query.after, last }));
|
|
111
|
+
}
|
|
112
|
+
return keys;
|
|
113
|
+
},
|
|
114
|
+
saveCursor: async (fleetId, { afterMessageId, afterExchange, isComplete }) => {
|
|
115
|
+
await db.$executeRaw `UPDATE message_metadata_backfills
|
|
116
|
+
SET after_message_id = ${afterMessageId}, after_ship_id = ${afterExchange?.shipId ?? null},
|
|
117
|
+
after_other_ship_id = ${afterExchange?.otherShipId ?? null}, is_complete = ${isComplete}
|
|
118
|
+
WHERE fleet_id = ${fleetId}`;
|
|
119
|
+
},
|
|
120
|
+
};
|
|
121
|
+
}
|
|
122
|
+
//# sourceMappingURL=message-metadata-fill.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"message-metadata-fill.js","sourceRoot":"","sources":["../../../src/adapters/prisma/message-metadata-fill.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type DeliveryId, type FleetId, type ShipId } from '@aeolus-fleet/common';
|
|
1
|
+
import { type DeliveryId, type FleetId, type MessageId, type ShipId } from '@aeolus-fleet/common';
|
|
2
2
|
import type { ClaimableDeliveries, DeliveryRepository, MessageRepository } from '../../domain/messaging/ports.js';
|
|
3
3
|
import type { Db } from './client.js';
|
|
4
4
|
import { type ExchangeRollups } from './exchange-rollups.js';
|
|
@@ -14,6 +14,22 @@ export interface BufferedMessageRepository extends MessageRepository {
|
|
|
14
14
|
* held only until commit, and always after the fleet's lock for its event
|
|
15
15
|
* numbers, so the two locks are taken in one order and never deadlock.
|
|
16
16
|
*/
|
|
17
|
+
/**
|
|
18
|
+
* The ship's open questions (#1632, decision 0038), by message id from after
|
|
19
|
+
* the cursor, at most limit: along messages_fleet_id_sender_ship_id_id_asked_idx,
|
|
20
|
+
* each question's answer looked up by the replies index and its withdrawal or
|
|
21
|
+
* replacement by the question id index, by the uuids stored at send, so a
|
|
22
|
+
* sealed fleet's are found too. Until the after-start fill visits a plain
|
|
23
|
+
* question or answer, its payload supplies that uuid through an indexed
|
|
24
|
+
* sender range or a reply lookup. Only an answer from
|
|
25
|
+
* the asked ship, and a withdrawal or replacement from the ship itself to it,
|
|
26
|
+
* settles a question; a ship that is retired is never asked again.
|
|
27
|
+
*/
|
|
28
|
+
export declare function openQuestionsStatement(fleetId: FleetId, { shipId, after, limit }: {
|
|
29
|
+
shipId: ShipId;
|
|
30
|
+
after?: MessageId;
|
|
31
|
+
limit: number;
|
|
32
|
+
}): Prisma.Sql;
|
|
17
33
|
export declare function createPrismaMessageRepository(db: Db): BufferedMessageRepository;
|
|
18
34
|
/**
|
|
19
35
|
* SKIP LOCKED: a delivery another receive holds is passed over, never
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
import { PING_CONTENT_TYPE } from '@aeolus-fleet/common';
|
|
1
|
+
import { idSchema, PING_CONTENT_TYPE } from '@aeolus-fleet/common';
|
|
2
|
+
import { z } from 'zod';
|
|
2
3
|
import { isInExchange } from '../../domain/messaging/exchange.js';
|
|
4
|
+
import { answeredQuestionIdIn, askedQuestionIdIn, isAnswerContentType, isAskingContentType } from './content-type-sql.js';
|
|
3
5
|
import { addChangedDelivery } from './exchange-rollups.js';
|
|
4
6
|
import { Prisma } from './generated/client.js';
|
|
5
7
|
import { payloadColumnsOf, toDeliveryFromSql, toMessage } from './rows.js';
|
|
@@ -13,6 +15,55 @@ import { pageOf } from '../../domain/shared/page.js';
|
|
|
13
15
|
* held only until commit, and always after the fleet's lock for its event
|
|
14
16
|
* numbers, so the two locks are taken in one order and never deadlock.
|
|
15
17
|
*/
|
|
18
|
+
/**
|
|
19
|
+
* The ship's open questions (#1632, decision 0038), by message id from after
|
|
20
|
+
* the cursor, at most limit: along messages_fleet_id_sender_ship_id_id_asked_idx,
|
|
21
|
+
* each question's answer looked up by the replies index and its withdrawal or
|
|
22
|
+
* replacement by the question id index, by the uuids stored at send, so a
|
|
23
|
+
* sealed fleet's are found too. Until the after-start fill visits a plain
|
|
24
|
+
* question or answer, its payload supplies that uuid through an indexed
|
|
25
|
+
* sender range or a reply lookup. Only an answer from
|
|
26
|
+
* the asked ship, and a withdrawal or replacement from the ship itself to it,
|
|
27
|
+
* settles a question; a ship that is retired is never asked again.
|
|
28
|
+
*/
|
|
29
|
+
export function openQuestionsStatement(fleetId, { shipId, after, limit }) {
|
|
30
|
+
return Prisma.sql `
|
|
31
|
+
SELECT q.id AS "messageId", q.selector_ship_id AS "askedShipId", q.effective_question_id AS "questionId"
|
|
32
|
+
FROM (
|
|
33
|
+
SELECT m.*, m.asked_question_id AS effective_question_id FROM messages m
|
|
34
|
+
WHERE m.fleet_id = ${fleetId} AND m.sender_ship_id = ${shipId} AND m.asked_question_id IS NOT NULL
|
|
35
|
+
UNION ALL
|
|
36
|
+
SELECT m.*, ${askedQuestionIdIn('m.payload')} AS effective_question_id FROM messages m
|
|
37
|
+
WHERE m.fleet_id = ${fleetId} AND m.sender_ship_id = ${shipId}
|
|
38
|
+
AND m.asked_question_id IS NULL AND m.payload IS NOT NULL
|
|
39
|
+
AND ${isAskingContentType('m.content_type')}
|
|
40
|
+
) q
|
|
41
|
+
JOIN ships s ON s.fleet_id = q.fleet_id AND s.id = q.selector_ship_id
|
|
42
|
+
WHERE q.fleet_id = ${fleetId}
|
|
43
|
+
AND q.sender_ship_id = ${shipId}
|
|
44
|
+
AND q.effective_question_id IS NOT NULL
|
|
45
|
+
AND q.selector_kind = 'ship'
|
|
46
|
+
AND q.selector_ship_id <> ${shipId}
|
|
47
|
+
AND s.retired_at IS NULL
|
|
48
|
+
${after === undefined ? Prisma.empty : Prisma.sql `AND q.id > ${after}`}
|
|
49
|
+
AND NOT EXISTS (
|
|
50
|
+
SELECT 1 FROM messages a
|
|
51
|
+
WHERE a.fleet_id = q.fleet_id
|
|
52
|
+
AND a.in_reply_to_message_id = q.id
|
|
53
|
+
AND a.sender_ship_id = q.selector_ship_id
|
|
54
|
+
AND COALESCE(a.answered_question_id,
|
|
55
|
+
CASE WHEN ${isAnswerContentType('a.content_type')}
|
|
56
|
+
THEN ${answeredQuestionIdIn('a.payload')} END) = q.effective_question_id)
|
|
57
|
+
AND NOT EXISTS (
|
|
58
|
+
SELECT 1 FROM messages w
|
|
59
|
+
WHERE w.fleet_id = q.fleet_id
|
|
60
|
+
AND w.question_id = q.effective_question_id
|
|
61
|
+
AND w.sender_ship_id = q.sender_ship_id
|
|
62
|
+
AND w.selector_kind = 'ship'
|
|
63
|
+
AND w.selector_ship_id = q.selector_ship_id)
|
|
64
|
+
ORDER BY q.id ASC
|
|
65
|
+
LIMIT ${limit}`;
|
|
66
|
+
}
|
|
16
67
|
export function createPrismaMessageRepository(db) {
|
|
17
68
|
const counted = [];
|
|
18
69
|
return {
|
|
@@ -47,6 +98,8 @@ export function createPrismaMessageRepository(db) {
|
|
|
47
98
|
selectorValueIds: selector.kind === 'label' ? [...selector.valueIds] : [],
|
|
48
99
|
...payloadColumnsOf(message.payload),
|
|
49
100
|
questionId: message.questionId,
|
|
101
|
+
askedQuestionId: message.askedQuestionId,
|
|
102
|
+
answeredQuestionId: message.answeredQuestionId,
|
|
50
103
|
contentType: message.contentType,
|
|
51
104
|
model: message.model,
|
|
52
105
|
idempotencyKey: message.idempotencyKey,
|
|
@@ -76,6 +129,9 @@ export function createPrismaMessageRepository(db) {
|
|
|
76
129
|
const row = await db.message.findFirst({ where: { fleetId, id: messageId } });
|
|
77
130
|
return row ? toMessage(row) : undefined;
|
|
78
131
|
},
|
|
132
|
+
listOpenQuestionsOf: async (fleetId, query) => z
|
|
133
|
+
.array(z.object({ messageId: idSchema('message'), askedShipId: idSchema('ship'), questionId: z.string() }))
|
|
134
|
+
.parse(await db.$queryRaw(openQuestionsStatement(fleetId, query))),
|
|
79
135
|
};
|
|
80
136
|
}
|
|
81
137
|
/** The counted messages summed per fleet and day, in one order, so concurrent units of work lock the rows alike. */
|
|
@@ -190,6 +246,7 @@ export function createPrismaDeliveryRepository(db, rollups) {
|
|
|
190
246
|
rollups.add(delivery.fleetId, {
|
|
191
247
|
after: {
|
|
192
248
|
messageId: delivery.messageId,
|
|
249
|
+
contentType: message.contentType,
|
|
193
250
|
senderShipId: message.senderShipId,
|
|
194
251
|
reachedShipId: recipient.kind === 'ship' ? recipient.shipId : delivery.claimedByShipId,
|
|
195
252
|
state: delivery.state,
|
|
@@ -337,7 +394,8 @@ export function createPrismaDeliveryRepository(db, rollups) {
|
|
|
337
394
|
hand_over_number = ${delivery.handOverNumber}::int, handed_once_more_at = ${delivery.handedOnceMoreAt}::timestamptz
|
|
338
395
|
FROM before
|
|
339
396
|
WHERE d.fleet_id = ${delivery.fleetId} AND d.id = before.id
|
|
340
|
-
RETURNING d.fleet_id, d.message_id, d.sender_ship_id, d.is_in_exchange,
|
|
397
|
+
RETURNING d.fleet_id, d.message_id, d.sender_ship_id, d.is_in_exchange,
|
|
398
|
+
(SELECT m.content_type FROM messages m WHERE m.fleet_id = d.fleet_id AND m.id = d.message_id) AS content_type, before.state AS before_state,
|
|
341
399
|
before.reached_ship_id AS before_reached_ship_id, d.state::text AS after_state, d.reached_ship_id AS after_reached_ship_id`;
|
|
342
400
|
for (const row of rows) {
|
|
343
401
|
addChangedDelivery(rollups, row);
|