@aeolus-fleet/core 0.38.1 → 0.38.2
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/dist/adapters/prisma/exchange-rollups.d.ts +74 -0
- package/dist/adapters/prisma/exchange-rollups.js +121 -0
- package/dist/adapters/prisma/exchange-rollups.js.map +1 -0
- package/dist/adapters/prisma/generated/browser.d.ts +7 -0
- package/dist/adapters/prisma/generated/client.d.ts +7 -0
- 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 +88 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js +11 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.d.ts +12 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js +11 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js.map +1 -1
- package/dist/adapters/prisma/generated/models/Delivery.d.ts +208 -1
- package/dist/adapters/prisma/generated/models/Exchange.d.ts +1524 -0
- package/dist/adapters/prisma/generated/models/Exchange.js +2 -0
- package/dist/adapters/prisma/generated/models/Exchange.js.map +1 -0
- package/dist/adapters/prisma/generated/models/Fleet.d.ts +487 -0
- package/dist/adapters/prisma/generated/models/Message.d.ts +227 -4
- package/dist/adapters/prisma/generated/models/Ship.d.ts +806 -0
- package/dist/adapters/prisma/generated/models.d.ts +1 -0
- package/dist/adapters/prisma/history-pruner.js +29 -2
- package/dist/adapters/prisma/history-pruner.js.map +1 -1
- package/dist/adapters/prisma/messaging.d.ts +33 -1
- package/dist/adapters/prisma/messaging.js +112 -13
- package/dist/adapters/prisma/messaging.js.map +1 -1
- package/dist/adapters/prisma/registry.d.ts +2 -1
- package/dist/adapters/prisma/registry.js +25 -6
- package/dist/adapters/prisma/registry.js.map +1 -1
- package/dist/adapters/prisma/unit-of-work.d.ts +8 -3
- package/dist/adapters/prisma/unit-of-work.js +10 -4
- package/dist/adapters/prisma/unit-of-work.js.map +1 -1
- package/dist/adapters/trpc/context.d.ts +6 -0
- package/dist/adapters/trpc/fleet.d.ts +12 -12
- package/dist/adapters/trpc/router.d.ts +71 -12
- package/dist/adapters/trpc/ship-protocol.js +1 -0
- package/dist/adapters/trpc/ship-protocol.js.map +1 -1
- package/dist/adapters/trpc/ship.d.ts +74 -0
- package/dist/adapters/trpc/ship.js +69 -1
- package/dist/adapters/trpc/ship.js.map +1 -1
- package/dist/adapters/trpc/trpc.js +1 -0
- package/dist/adapters/trpc/trpc.js.map +1 -1
- package/dist/domain/messaging/acknowledge-up-to.d.ts +38 -0
- package/dist/domain/messaging/acknowledge-up-to.js +56 -0
- package/dist/domain/messaging/acknowledge-up-to.js.map +1 -0
- package/dist/domain/messaging/delivery.d.ts +16 -0
- package/dist/domain/messaging/delivery.js +41 -0
- package/dist/domain/messaging/delivery.js.map +1 -1
- package/dist/domain/messaging/exchange.d.ts +35 -0
- package/dist/domain/messaging/exchange.js +44 -0
- package/dist/domain/messaging/exchange.js.map +1 -0
- package/dist/domain/messaging/meeting-notice.js +1 -1
- package/dist/domain/messaging/meeting-notice.js.map +1 -1
- package/dist/domain/messaging/ports.d.ts +65 -2
- package/dist/domain/messaging/read-exchange.d.ts +53 -0
- package/dist/domain/messaging/read-exchange.js +105 -0
- package/dist/domain/messaging/read-exchange.js.map +1 -0
- package/dist/domain/messaging/read-exchanges.d.ts +46 -0
- package/dist/domain/messaging/read-exchanges.js +40 -0
- package/dist/domain/messaging/read-exchanges.js.map +1 -0
- package/dist/domain/messaging/resend-delivery.js +1 -1
- package/dist/domain/messaging/resend-delivery.js.map +1 -1
- package/dist/domain/messaging/send-message.js +3 -3
- package/dist/domain/messaging/send-message.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/history-pruning.d.ts +10 -3
- package/dist/domain/shared/history-pruning.js +9 -6
- package/dist/domain/shared/history-pruning.js.map +1 -1
- package/dist/wiring.d.ts +6 -0
- package/dist/wiring.js +6 -0
- package/dist/wiring.js.map +1 -1
- package/package.json +2 -2
- package/src/adapters/prisma/migrations/20261109090000_delivery_exchange/migration.sql +19 -0
- package/src/adapters/prisma/migrations/20261109100000_exchanges/migration.sql +35 -0
- package/src/adapters/prisma/migrations/20261109110000_delivery_in_flight_claimed_index/migration.sql +4 -0
- package/src/adapters/prisma/schema.prisma +36 -0
|
@@ -20,6 +20,7 @@ export type * from './models/ReachRefusal.js';
|
|
|
20
20
|
export type * from './models/Credential.js';
|
|
21
21
|
export type * from './models/FleetFeatureFlag.js';
|
|
22
22
|
export type * from './models/MessageDay.js';
|
|
23
|
+
export type * from './models/Exchange.js';
|
|
23
24
|
export type * from './models/Message.js';
|
|
24
25
|
export type * from './models/Meeting.js';
|
|
25
26
|
export type * from './models/Schedule.js';
|
|
@@ -32,6 +32,7 @@ const deliveryRows = z.array(z.object({
|
|
|
32
32
|
messageId: idSchema('message'),
|
|
33
33
|
state: deliveryStateSchema,
|
|
34
34
|
claimingLease: z.enum(['none', 'ended', 'open', 'openPushed']),
|
|
35
|
+
isAtPersonShip: z.boolean(),
|
|
35
36
|
}));
|
|
36
37
|
export function createPrismaHistoryPruner(db) {
|
|
37
38
|
return {
|
|
@@ -77,9 +78,11 @@ export function createPrismaHistoryPruner(db) {
|
|
|
77
78
|
const lockedIds = idRows.parse(await db.$queryRaw `SELECT id FROM messages WHERE fleet_id = ${fleetId} AND id = ANY(${ids}) FOR UPDATE SKIP LOCKED`).map((row) => row.id);
|
|
78
79
|
const deliveries = deliveryRows.parse(await db.$queryRaw `
|
|
79
80
|
SELECT d.message_id AS "messageId", d.state::text AS state,
|
|
80
|
-
CASE WHEN l.id IS NULL THEN 'none' WHEN l.ended_at IS NOT NULL THEN 'ended' WHEN l.pushed_at IS NOT NULL THEN 'openPushed' ELSE 'open' END AS "claimingLease"
|
|
81
|
+
CASE WHEN l.id IS NULL THEN 'none' WHEN l.ended_at IS NOT NULL THEN 'ended' WHEN l.pushed_at IS NOT NULL THEN 'openPushed' ELSE 'open' END AS "claimingLease",
|
|
82
|
+
COALESCE(s.kind = 'person', false) AS "isAtPersonShip"
|
|
81
83
|
FROM deliveries d
|
|
82
84
|
LEFT JOIN leases l ON l.fleet_id = d.fleet_id AND l.id = d.claimed_by_lease_id
|
|
85
|
+
LEFT JOIN ships s ON s.fleet_id = d.fleet_id AND s.id = d.reached_ship_id
|
|
83
86
|
WHERE d.fleet_id = ${fleetId} AND d.message_id = ANY(${ids})
|
|
84
87
|
FOR UPDATE OF d SKIP LOCKED`);
|
|
85
88
|
const messages = candidateRows.parse(await db.$queryRaw `
|
|
@@ -113,7 +116,7 @@ export function createPrismaHistoryPruner(db) {
|
|
|
113
116
|
WHERE m.fleet_id = ${fleetId} AND m.id = ANY(${ids})
|
|
114
117
|
ORDER BY m.created_at, m.id`);
|
|
115
118
|
return messages.map(({ deliveries: count, ...message }) => {
|
|
116
|
-
const own = deliveries.filter((delivery) => delivery.messageId === message.id).map(({ state, claimingLease }) => ({ state, claimingLease }));
|
|
119
|
+
const own = deliveries.filter((delivery) => delivery.messageId === message.id).map(({ state, claimingLease, isAtPersonShip }) => ({ state, claimingLease, isAtPersonShip }));
|
|
117
120
|
return { ...message, isLocked: !lockedIds.includes(message.id) || own.length < count, deliveries: own };
|
|
118
121
|
});
|
|
119
122
|
},
|
|
@@ -205,6 +208,30 @@ export function createPrismaHistoryPruner(db) {
|
|
|
205
208
|
.array(z.object({ id: z.string() }))
|
|
206
209
|
.parse(await db.$queryRaw `SELECT id FROM deliveries WHERE fleet_id = ${fleetId} AND message_id = ANY(${messageIds})`)
|
|
207
210
|
.map((row) => row.id);
|
|
211
|
+
// An exchange whose newest message goes points at its newest kept one,
|
|
212
|
+
// read along the exchange index both ways, or goes when none of it is
|
|
213
|
+
// kept (docs/design/exchange-read, E10). Its count stays: what goes is
|
|
214
|
+
// finished, so none of it was counted.
|
|
215
|
+
await db.$executeRaw `
|
|
216
|
+
UPDATE exchanges e SET newest_message_id = kept.message_id
|
|
217
|
+
FROM (
|
|
218
|
+
SELECT g.ship_id, g.other_ship_id,
|
|
219
|
+
(SELECT max(newest.message_id) FROM (
|
|
220
|
+
(SELECT d.message_id FROM deliveries d
|
|
221
|
+
WHERE d.fleet_id = ${fleetId} AND d.is_in_exchange AND d.reached_ship_id = g.ship_id AND d.sender_ship_id = g.other_ship_id
|
|
222
|
+
AND NOT (d.message_id = ANY(${messageIds}))
|
|
223
|
+
ORDER BY d.id DESC LIMIT 1)
|
|
224
|
+
UNION ALL
|
|
225
|
+
(SELECT d.message_id FROM deliveries d
|
|
226
|
+
WHERE d.fleet_id = ${fleetId} AND d.is_in_exchange AND d.reached_ship_id = g.other_ship_id AND d.sender_ship_id = g.ship_id
|
|
227
|
+
AND NOT (d.message_id = ANY(${messageIds}))
|
|
228
|
+
ORDER BY d.id DESC LIMIT 1)
|
|
229
|
+
) newest) AS message_id
|
|
230
|
+
FROM exchanges g
|
|
231
|
+
WHERE g.fleet_id = ${fleetId} AND g.newest_message_id = ANY(${messageIds})
|
|
232
|
+
) kept
|
|
233
|
+
WHERE e.fleet_id = ${fleetId} AND e.ship_id = kept.ship_id AND e.other_ship_id = kept.other_ship_id AND kept.message_id IS NOT NULL`;
|
|
234
|
+
await db.$executeRaw `DELETE FROM exchanges WHERE fleet_id = ${fleetId} AND newest_message_id = ANY(${messageIds})`;
|
|
208
235
|
// Children first: every foreign key restricts deletes.
|
|
209
236
|
const messageEvents = await db.$executeRaw `DELETE FROM events WHERE fleet_id = ${fleetId} AND message_id = ANY(${messageIds})`;
|
|
210
237
|
const deliveryEvents = await db.$executeRaw `DELETE FROM events WHERE fleet_id = ${fleetId} AND delivery_id = ANY(${deliveryIds})`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history-pruner.js","sourceRoot":"","sources":["../../../src/adapters/prisma/history-pruner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAC1F,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,gBAAgB,EAA2C,MAAM,wCAAwC,CAAC;AAEnH,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,6GAA6G;AAC7G,MAAM,oBAAoB,GAAG,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAEhG,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;AAE9D,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAC3B,CAAC,CAAC,MAAM,CAAC;IACP,EAAE,EAAE,QAAQ,CAAC,SAAS,CAAC;IACvB,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE;IACnB,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE;IACvB,UAAU,EAAE,CAAC,CAAC,OAAO,EAAE;IACvB,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,iBAAiB,EAAE,CAAC,CAAC,OAAO,EAAE;IAC9B,gBAAgB,EAAE,CAAC,CAAC,OAAO,EAAE;IAC7B,UAAU,EAAE,CAAC,CAAC,GAAG,EAAE;CACpB,CAAC,CACH,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAC1B,CAAC,CAAC,MAAM,CAAC;IACP,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC;IAC9B,KAAK,EAAE,mBAAmB;IAC1B,aAAa,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"history-pruner.js","sourceRoot":"","sources":["../../../src/adapters/prisma/history-pruner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
|
+
import { type DeliveryId, type FleetId, type ShipId } from '@aeolus-fleet/common';
|
|
1
2
|
import type { DeliveryRepository, MessageRepository } from '../../domain/messaging/ports.js';
|
|
2
3
|
import type { Db } from './client.js';
|
|
4
|
+
import { type ExchangeRollups } from './exchange-rollups.js';
|
|
5
|
+
import { Prisma } from './generated/client.js';
|
|
3
6
|
export interface BufferedMessageRepository extends MessageRepository {
|
|
4
7
|
/** Adds the stored messages to their fleets' days. The unit of work's last step before commit, after the events are numbered. */
|
|
5
8
|
flush(): Promise<void>;
|
|
@@ -12,4 +15,33 @@ export interface BufferedMessageRepository extends MessageRepository {
|
|
|
12
15
|
* numbers, so the two locks are taken in one order and never deadlock.
|
|
13
16
|
*/
|
|
14
17
|
export declare function createPrismaMessageRepository(db: Db): BufferedMessageRepository;
|
|
15
|
-
|
|
18
|
+
/**
|
|
19
|
+
* One page of an exchange: two halves, each read along the exchange index
|
|
20
|
+
* from the cursor and cut at the page: the other ship's deliveries that
|
|
21
|
+
* reached the ship, and the ship's that reached the other. A delivery is in
|
|
22
|
+
* one half only.
|
|
23
|
+
*/
|
|
24
|
+
export declare function exchangePageStatement({ fleetId, shipId, otherShipId, toward, from, isFromIncluded, limit, }: {
|
|
25
|
+
fleetId: FleetId;
|
|
26
|
+
shipId: ShipId;
|
|
27
|
+
otherShipId: ShipId;
|
|
28
|
+
toward: 'older' | 'newer';
|
|
29
|
+
from?: DeliveryId | undefined;
|
|
30
|
+
isFromIncluded?: boolean | undefined;
|
|
31
|
+
limit: number;
|
|
32
|
+
}): Prisma.Sql;
|
|
33
|
+
/**
|
|
34
|
+
* What the other ship sent the ship that is still open, up to a delivery,
|
|
35
|
+
* locked in id order. Found along the indexes of what is open: the ship's own
|
|
36
|
+
* on (fleet_id, recipient_ship_id, state), and those of a type it claimed, in
|
|
37
|
+
* flight, on deliveries_in_flight_claimed_idx. Waits for a row another unit of
|
|
38
|
+
* work holds; once it is free its state is read again, so one acknowledged
|
|
39
|
+
* meanwhile is left out.
|
|
40
|
+
*/
|
|
41
|
+
export declare function unacknowledgedUpToStatement({ fleetId, shipId, otherShipId, upTo }: {
|
|
42
|
+
fleetId: FleetId;
|
|
43
|
+
shipId: ShipId;
|
|
44
|
+
otherShipId: ShipId;
|
|
45
|
+
upTo: DeliveryId;
|
|
46
|
+
}): Prisma.Sql;
|
|
47
|
+
export declare function createPrismaDeliveryRepository(db: Db, rollups: ExchangeRollups): DeliveryRepository;
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { PING_CONTENT_TYPE } from '@aeolus-fleet/common';
|
|
2
|
+
import { isInExchange } from '../../domain/messaging/exchange.js';
|
|
3
|
+
import { addChangedDelivery } from './exchange-rollups.js';
|
|
2
4
|
import { Prisma } from './generated/client.js';
|
|
3
5
|
import { payloadColumnsOf, toDeliveryFromSql, toMessage } from './rows.js';
|
|
4
6
|
import { plainBytesOf } from '../../domain/messaging/sealed-payload.js';
|
|
@@ -85,15 +87,94 @@ function countedDays(counted) {
|
|
|
85
87
|
}
|
|
86
88
|
return [...days.entries()].toSorted(([a], [b]) => a.localeCompare(b)).map(([, sum]) => sum);
|
|
87
89
|
}
|
|
88
|
-
|
|
90
|
+
/** The columns a delivery is read back with. */
|
|
91
|
+
const DELIVERY_COLUMNS = Prisma.sql `id, fleet_id, message_id, recipient_ship_id, recipient_type, state::text AS state,
|
|
92
|
+
claimed_by_ship_id, claimed_by_lease_id, attempts, hand_over_number, handed_once_more_at, is_forced, created_at`;
|
|
93
|
+
/** Each delivery with its message, in the deliveries' order. */
|
|
94
|
+
async function withMessages(db, { fleetId, deliveries }) {
|
|
95
|
+
const messages = await db.message.findMany({ where: { fleetId, id: { in: deliveries.map((delivery) => delivery.messageId) } } });
|
|
96
|
+
const byId = new Map(messages.map((row) => [row.id, toMessage(row)]));
|
|
97
|
+
return deliveries.map((delivery) => {
|
|
98
|
+
const message = byId.get(delivery.messageId);
|
|
99
|
+
if (!message) {
|
|
100
|
+
// The foreign key keeps every delivery's message in its fleet.
|
|
101
|
+
throw new Error(`Delivery ${delivery.id} has no message ${delivery.messageId}`);
|
|
102
|
+
}
|
|
103
|
+
return { delivery, message };
|
|
104
|
+
});
|
|
105
|
+
}
|
|
106
|
+
/**
|
|
107
|
+
* One page of an exchange: two halves, each read along the exchange index
|
|
108
|
+
* from the cursor and cut at the page: the other ship's deliveries that
|
|
109
|
+
* reached the ship, and the ship's that reached the other. A delivery is in
|
|
110
|
+
* one half only.
|
|
111
|
+
*/
|
|
112
|
+
export function exchangePageStatement({ fleetId, shipId, otherShipId, toward, from, isFromIncluded, limit, }) {
|
|
113
|
+
const bound = from === undefined
|
|
114
|
+
? Prisma.empty
|
|
115
|
+
: toward === 'older'
|
|
116
|
+
? isFromIncluded === true
|
|
117
|
+
? Prisma.sql `AND id <= ${from}`
|
|
118
|
+
: Prisma.sql `AND id < ${from}`
|
|
119
|
+
: Prisma.sql `AND id > ${from}`;
|
|
120
|
+
const order = toward === 'older' ? Prisma.sql `DESC` : Prisma.sql `ASC`;
|
|
121
|
+
const half = (reachedShipId, senderShipId) => Prisma.sql `
|
|
122
|
+
(SELECT ${DELIVERY_COLUMNS}
|
|
123
|
+
FROM deliveries
|
|
124
|
+
WHERE fleet_id = ${fleetId} AND is_in_exchange AND reached_ship_id = ${reachedShipId} AND sender_ship_id = ${senderShipId} ${bound}
|
|
125
|
+
ORDER BY id ${order}
|
|
126
|
+
LIMIT ${limit})`;
|
|
127
|
+
return Prisma.sql `
|
|
128
|
+
SELECT * FROM (${half(shipId, otherShipId)} UNION ALL ${half(otherShipId, shipId)}) AS exchange
|
|
129
|
+
ORDER BY id ${order}
|
|
130
|
+
LIMIT ${limit}`;
|
|
131
|
+
}
|
|
132
|
+
/**
|
|
133
|
+
* What the other ship sent the ship that is still open, up to a delivery,
|
|
134
|
+
* locked in id order. Found along the indexes of what is open: the ship's own
|
|
135
|
+
* on (fleet_id, recipient_ship_id, state), and those of a type it claimed, in
|
|
136
|
+
* flight, on deliveries_in_flight_claimed_idx. Waits for a row another unit of
|
|
137
|
+
* work holds; once it is free its state is read again, so one acknowledged
|
|
138
|
+
* meanwhile is left out.
|
|
139
|
+
*/
|
|
140
|
+
export function unacknowledgedUpToStatement({ fleetId, shipId, otherShipId, upTo }) {
|
|
141
|
+
return Prisma.sql `
|
|
142
|
+
SELECT ${DELIVERY_COLUMNS}
|
|
143
|
+
FROM deliveries
|
|
144
|
+
WHERE fleet_id = ${fleetId} AND state IN ('pending', 'received', 'handed')
|
|
145
|
+
AND id IN (
|
|
146
|
+
SELECT id FROM deliveries
|
|
147
|
+
WHERE fleet_id = ${fleetId} AND recipient_ship_id = ${shipId} AND state IN ('pending', 'received', 'handed')
|
|
148
|
+
AND sender_ship_id = ${otherShipId} AND is_in_exchange AND id <= ${upTo}
|
|
149
|
+
UNION ALL
|
|
150
|
+
SELECT id FROM deliveries
|
|
151
|
+
WHERE fleet_id = ${fleetId} AND claimed_by_ship_id = ${shipId} AND recipient_type IS NOT NULL AND state IN ('received', 'handed')
|
|
152
|
+
AND sender_ship_id = ${otherShipId} AND is_in_exchange AND id <= ${upTo}
|
|
153
|
+
)
|
|
154
|
+
ORDER BY id
|
|
155
|
+
FOR UPDATE`;
|
|
156
|
+
}
|
|
157
|
+
export function createPrismaDeliveryRepository(db, rollups) {
|
|
89
158
|
return {
|
|
90
|
-
create: async (delivery) => {
|
|
159
|
+
create: async (delivery, message) => {
|
|
91
160
|
const { recipient } = delivery;
|
|
161
|
+
if (isInExchange(message)) {
|
|
162
|
+
rollups.add(delivery.fleetId, {
|
|
163
|
+
after: {
|
|
164
|
+
messageId: delivery.messageId,
|
|
165
|
+
senderShipId: message.senderShipId,
|
|
166
|
+
reachedShipId: recipient.kind === 'ship' ? recipient.shipId : delivery.claimedByShipId,
|
|
167
|
+
state: delivery.state,
|
|
168
|
+
},
|
|
169
|
+
});
|
|
170
|
+
}
|
|
92
171
|
await db.delivery.create({
|
|
93
172
|
data: {
|
|
94
173
|
id: delivery.id,
|
|
95
174
|
fleetId: delivery.fleetId,
|
|
96
175
|
messageId: delivery.messageId,
|
|
176
|
+
senderShipId: message.senderShipId,
|
|
177
|
+
isInExchange: isInExchange(message),
|
|
97
178
|
recipientShipId: recipient.kind === 'ship' ? recipient.shipId : null,
|
|
98
179
|
recipientType: recipient.kind === 'type' ? recipient.type : null,
|
|
99
180
|
state: delivery.state,
|
|
@@ -158,6 +239,16 @@ export function createPrismaDeliveryRepository(db) {
|
|
|
158
239
|
return { delivery, message };
|
|
159
240
|
});
|
|
160
241
|
},
|
|
242
|
+
findExchangePage: async (query) => {
|
|
243
|
+
const rows = await db.$queryRaw(exchangePageStatement(query));
|
|
244
|
+
const deliveries = rows.map(toDeliveryFromSql);
|
|
245
|
+
const newestFirst = query.toward === 'older' ? deliveries : deliveries.toReversed();
|
|
246
|
+
return withMessages(db, { fleetId: query.fleetId, deliveries: newestFirst });
|
|
247
|
+
},
|
|
248
|
+
findUnacknowledgedUpToForUpdate: async (query) => {
|
|
249
|
+
const rows = await db.$queryRaw(unacknowledgedUpToStatement(query));
|
|
250
|
+
return withMessages(db, { fleetId: query.fleetId, deliveries: rows.map(toDeliveryFromSql) });
|
|
251
|
+
},
|
|
161
252
|
findRecordPage: async ({ fleetId, shipId, cursor, limit }) => {
|
|
162
253
|
// Two halves, each read newest first along its own index and cut at one
|
|
163
254
|
// past the page: the deliveries to the ship (fleet_id, recipient_ship_id,
|
|
@@ -233,17 +324,25 @@ export function createPrismaDeliveryRepository(db) {
|
|
|
233
324
|
return row ? toMessage(row) : undefined;
|
|
234
325
|
},
|
|
235
326
|
update: async (delivery) => {
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
}
|
|
327
|
+
// The row as it was, locked, so the rollup learns what the change takes
|
|
328
|
+
// and adds: the reached ship follows the claim (exchange-rollups.ts).
|
|
329
|
+
const rows = await db.$queryRaw `
|
|
330
|
+
WITH before AS (
|
|
331
|
+
SELECT id, state::text AS state, reached_ship_id FROM deliveries
|
|
332
|
+
WHERE fleet_id = ${delivery.fleetId} AND id = ${delivery.id}
|
|
333
|
+
FOR UPDATE
|
|
334
|
+
)
|
|
335
|
+
UPDATE deliveries d
|
|
336
|
+
SET state = ${delivery.state}::delivery_state, claimed_by_ship_id = ${delivery.claimedByShipId}::text,
|
|
337
|
+
claimed_by_lease_id = ${delivery.claimedByLeaseId}::text, attempts = ${delivery.attempts}::int,
|
|
338
|
+
hand_over_number = ${delivery.handOverNumber}::int, handed_once_more_at = ${delivery.handedOnceMoreAt}::timestamptz
|
|
339
|
+
FROM before
|
|
340
|
+
WHERE d.fleet_id = ${delivery.fleetId} AND d.id = before.id
|
|
341
|
+
RETURNING d.fleet_id, d.message_id, d.sender_ship_id, d.is_in_exchange, before.state AS before_state,
|
|
342
|
+
before.reached_ship_id AS before_reached_ship_id, d.state::text AS after_state, d.reached_ship_id AS after_reached_ship_id`;
|
|
343
|
+
for (const row of rows) {
|
|
344
|
+
addChangedDelivery(rollups, row);
|
|
345
|
+
}
|
|
247
346
|
},
|
|
248
347
|
markRead: async ({ fleetId, deliveryId, at }) => {
|
|
249
348
|
await db.delivery.updateMany({ where: { fleetId, id: deliveryId, readAt: null }, data: { readAt: at } });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messaging.js","sourceRoot":"","sources":["../../../src/adapters/prisma/messaging.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"messaging.js","sourceRoot":"","sources":["../../../src/adapters/prisma/messaging.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import type { ShipFilter } from '@aeolus-fleet/common/rules';
|
|
|
4
4
|
import { type ShipSort } from '../../domain/registry/ship-order.js';
|
|
5
5
|
import type { ReadReach } from '../../domain/registry/read-reach.js';
|
|
6
6
|
import type { Db } from './client.js';
|
|
7
|
+
import { type ExchangeRollups } from './exchange-rollups.js';
|
|
7
8
|
import { Prisma } from './generated/client.js';
|
|
8
9
|
export declare function createPrismaFleetRepository(db: Db): FleetRepository;
|
|
9
10
|
export declare function createPrismaCrewRequestRepository(db: Db): CrewRequestRepository;
|
|
@@ -11,7 +12,7 @@ export declare function createPrismaClearRequestRepository(db: Db): ClearRequest
|
|
|
11
12
|
export declare function createPrismaLabelRepository(db: Db): LabelRepository;
|
|
12
13
|
export declare function createPrismaShipRepository(db: Db): ShipRepository;
|
|
13
14
|
export declare function createPrismaLeaseRepository(db: Db): LeaseRepository;
|
|
14
|
-
export declare function createPrismaInFlightDeliveries(db: Db): InFlightDeliveries;
|
|
15
|
+
export declare function createPrismaInFlightDeliveries(db: Db, rollups: ExchangeRollups): InFlightDeliveries;
|
|
15
16
|
/** Whether the caller reads the ship `s` of the outer query (decision 0034). */
|
|
16
17
|
export declare function isInReachOfShip(reach: ReadReach): Prisma.Sql;
|
|
17
18
|
/**
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { PING_CONTENT_TYPE, idSchema, scopeNameSchema } from '@aeolus-fleet/common';
|
|
2
2
|
import { z } from 'zod';
|
|
3
3
|
import { COLUMNS_SHOWN_OUTSIDE_READ_REACH, isValueDescending } from '../../domain/registry/ship-order.js';
|
|
4
|
+
import { addChangedDelivery } from './exchange-rollups.js';
|
|
4
5
|
import { readHarbourOf } from './harbour.js';
|
|
5
6
|
import { Prisma } from './generated/client.js';
|
|
6
7
|
import { commissionerColumns, toAbandonedDelivery, toClearRequest, toCrewRequest, toDeliveryFromSql, toFleet, toLastSeen, toLabelFromSql, toLease, toListedLabel, toLeaseShipId, toShip, toShipFacts, toShipFromSql, toShipLabel, toShipReport, toStatedStatement, toTurn, } from './rows.js';
|
|
@@ -75,6 +76,7 @@ export function createPrismaFleetRepository(db) {
|
|
|
75
76
|
await db.$executeRaw `DELETE FROM health_snapshots WHERE fleet_id = ${fleetId}`;
|
|
76
77
|
await db.$executeRaw `DELETE FROM events WHERE fleet_id = ${fleetId}`;
|
|
77
78
|
await db.$executeRaw `DELETE FROM overdue_deliveries WHERE fleet_id = ${fleetId}`;
|
|
79
|
+
await db.$executeRaw `DELETE FROM exchanges WHERE fleet_id = ${fleetId}`;
|
|
78
80
|
await db.$executeRaw `DELETE FROM deliveries WHERE fleet_id = ${fleetId}`;
|
|
79
81
|
// A schedule names the messages it replies to and sent, and a message the schedule it was sent for.
|
|
80
82
|
await db.$executeRaw `UPDATE messages SET in_reply_to_message_id = NULL, resend_of_message_id = NULL, schedule_id = NULL, send_time = NULL WHERE fleet_id = ${fleetId}`;
|
|
@@ -556,21 +558,34 @@ export function createPrismaLeaseRepository(db) {
|
|
|
556
558
|
},
|
|
557
559
|
};
|
|
558
560
|
}
|
|
559
|
-
export function createPrismaInFlightDeliveries(db) {
|
|
561
|
+
export function createPrismaInFlightDeliveries(db, rollups) {
|
|
560
562
|
return {
|
|
561
563
|
returnToPending: async (fleetId, leaseId) => {
|
|
562
564
|
// One statement, on the index of a lease's claims. The lease has just
|
|
563
565
|
// ended in this transaction, after any receive holding it FOR SHARE
|
|
564
566
|
// committed, so read committed sees every claim made under it. Only the
|
|
565
567
|
// claim and its hand-over number are cleared: recipient and attempts stay.
|
|
568
|
+
// Each row as it was goes to the rollup with it: one of a type no longer
|
|
569
|
+
// reaches the ship that claimed it (exchange-rollups.ts).
|
|
566
570
|
const rows = await db.$queryRaw `
|
|
567
|
-
WITH
|
|
568
|
-
|
|
571
|
+
WITH held AS (
|
|
572
|
+
SELECT id, state::text AS state, reached_ship_id FROM deliveries
|
|
569
573
|
WHERE fleet_id = ${fleetId} AND claimed_by_lease_id = ${leaseId} AND state IN ('received', 'handed')
|
|
570
|
-
|
|
571
|
-
|
|
574
|
+
FOR UPDATE
|
|
575
|
+
),
|
|
576
|
+
returned AS (
|
|
577
|
+
UPDATE deliveries d SET state = 'pending', claimed_by_ship_id = NULL, claimed_by_lease_id = NULL, hand_over_number = NULL
|
|
578
|
+
FROM held
|
|
579
|
+
WHERE d.fleet_id = ${fleetId} AND d.id = held.id
|
|
580
|
+
RETURNING d.id, d.fleet_id, d.message_id, d.recipient_ship_id, d.recipient_type, d.state::text AS state,
|
|
581
|
+
d.claimed_by_ship_id, d.claimed_by_lease_id, d.attempts, d.hand_over_number, d.handed_once_more_at, d.is_forced, d.created_at,
|
|
582
|
+
d.sender_ship_id, d.is_in_exchange, held.state AS before_state, held.reached_ship_id AS before_reached_ship_id,
|
|
583
|
+
d.state::text AS after_state, d.reached_ship_id AS after_reached_ship_id
|
|
572
584
|
)
|
|
573
585
|
SELECT * FROM returned ORDER BY created_at, id`;
|
|
586
|
+
for (const row of rows) {
|
|
587
|
+
addChangedDelivery(rollups, row);
|
|
588
|
+
}
|
|
574
589
|
return rows
|
|
575
590
|
.map(toDeliveryFromSql)
|
|
576
591
|
.map(({ id, messageId, recipient, attempts }) => ({ deliveryId: id, messageId, recipient, attempts }));
|
|
@@ -579,7 +594,11 @@ export function createPrismaInFlightDeliveries(db) {
|
|
|
579
594
|
const rows = await db.$queryRaw `
|
|
580
595
|
UPDATE deliveries SET state = 'abandoned'
|
|
581
596
|
WHERE fleet_id = ${fleetId} AND recipient_ship_id = ${shipId} AND state = 'pending'
|
|
582
|
-
RETURNING id, message_id, created_at
|
|
597
|
+
RETURNING id, message_id, created_at, fleet_id, sender_ship_id, is_in_exchange, 'pending' AS before_state,
|
|
598
|
+
reached_ship_id AS before_reached_ship_id, state::text AS after_state, reached_ship_id AS after_reached_ship_id`;
|
|
599
|
+
for (const row of rows) {
|
|
600
|
+
addChangedDelivery(rollups, row);
|
|
601
|
+
}
|
|
583
602
|
return rows
|
|
584
603
|
.map(toAbandonedDelivery)
|
|
585
604
|
.sort((first, second) => first.createdAt.getTime() - second.createdAt.getTime() || first.deliveryId.localeCompare(second.deliveryId))
|