@aeolus-fleet/core 0.34.0 → 0.36.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 +5 -4
- package/dist/adapters/prisma/alerts.d.ts +21 -0
- package/dist/adapters/prisma/alerts.js +61 -0
- package/dist/adapters/prisma/alerts.js.map +1 -0
- package/dist/adapters/prisma/expectations.d.ts +19 -0
- package/dist/adapters/prisma/expectations.js +46 -0
- package/dist/adapters/prisma/expectations.js.map +1 -0
- package/dist/adapters/prisma/generated/browser.d.ts +18 -1
- package/dist/adapters/prisma/generated/client.d.ts +18 -1
- package/dist/adapters/prisma/generated/commonInputTypes.d.ts +30 -0
- package/dist/adapters/prisma/generated/enums.d.ts +7 -0
- package/dist/adapters/prisma/generated/enums.js +6 -0
- package/dist/adapters/prisma/generated/enums.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/class.d.ts +22 -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 +197 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js +36 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.d.ts +38 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js +36 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js.map +1 -1
- package/dist/adapters/prisma/generated/models/Alert.d.ts +1527 -0
- package/dist/adapters/prisma/generated/models/Alert.js +2 -0
- package/dist/adapters/prisma/generated/models/Alert.js.map +1 -0
- package/dist/adapters/prisma/generated/models/Fleet.d.ts +1068 -118
- package/dist/adapters/prisma/generated/models/Lease.d.ts +509 -2
- package/dist/adapters/prisma/generated/models/Message.d.ts +1 -1
- package/dist/adapters/prisma/generated/models/Ship.d.ts +939 -1
- package/dist/adapters/prisma/generated/models/ShipExpectations.d.ts +1468 -0
- package/dist/adapters/prisma/generated/models/ShipExpectations.js +2 -0
- package/dist/adapters/prisma/generated/models/ShipExpectations.js.map +1 -0
- package/dist/adapters/prisma/generated/models.d.ts +2 -0
- package/dist/adapters/prisma/history-pruner.js +24 -2
- package/dist/adapters/prisma/history-pruner.js.map +1 -1
- package/dist/adapters/prisma/history.js +9 -2
- package/dist/adapters/prisma/history.js.map +1 -1
- package/dist/adapters/prisma/messaging.js +39 -0
- package/dist/adapters/prisma/messaging.js.map +1 -1
- package/dist/adapters/prisma/overdue.js +1 -1
- package/dist/adapters/prisma/registry.d.ts +2 -1
- package/dist/adapters/prisma/registry.js +66 -14
- package/dist/adapters/prisma/registry.js.map +1 -1
- package/dist/adapters/prisma/rows.d.ts +3 -0
- package/dist/adapters/prisma/rows.js +40 -4
- package/dist/adapters/prisma/rows.js.map +1 -1
- package/dist/adapters/prisma/unit-of-work.d.ts +3 -1
- package/dist/adapters/prisma/unit-of-work.js +4 -0
- package/dist/adapters/prisma/unit-of-work.js.map +1 -1
- package/dist/adapters/trpc/alert-output.d.ts +4 -0
- package/dist/adapters/trpc/alert-output.js +15 -0
- package/dist/adapters/trpc/alert-output.js.map +1 -0
- package/dist/adapters/trpc/context.d.ts +14 -0
- package/dist/adapters/trpc/fleet.d.ts +479 -5
- package/dist/adapters/trpc/fleet.js +123 -10
- package/dist/adapters/trpc/fleet.js.map +1 -1
- package/dist/adapters/trpc/router.d.ts +542 -4
- package/dist/adapters/trpc/ship-contract.js +5 -0
- package/dist/adapters/trpc/ship-contract.js.map +1 -1
- package/dist/adapters/trpc/ship-protocol.js +4 -2
- package/dist/adapters/trpc/ship-protocol.js.map +1 -1
- package/dist/adapters/trpc/ship.d.ts +80 -3
- package/dist/adapters/trpc/ship.js +42 -8
- package/dist/adapters/trpc/ship.js.map +1 -1
- package/dist/adapters/trpc/trpc.js +4 -0
- package/dist/adapters/trpc/trpc.js.map +1 -1
- package/dist/domain/messaging/delivery.d.ts +8 -3
- package/dist/domain/messaging/delivery.js +15 -2
- package/dist/domain/messaging/delivery.js.map +1 -1
- package/dist/domain/messaging/message.d.ts +5 -1
- package/dist/domain/messaging/message.js.map +1 -1
- package/dist/domain/messaging/overdue.d.ts +4 -1
- package/dist/domain/messaging/overdue.js +3 -3
- package/dist/domain/messaging/overdue.js.map +1 -1
- package/dist/domain/messaging/payload.d.ts +1 -1
- package/dist/domain/messaging/payload.js +2 -2
- package/dist/domain/messaging/payload.js.map +1 -1
- package/dist/domain/messaging/ports.d.ts +15 -0
- package/dist/domain/messaging/read-record.d.ts +38 -0
- package/dist/domain/messaging/read-record.js +59 -0
- package/dist/domain/messaging/read-record.js.map +1 -0
- package/dist/domain/messaging/sealed-payload.js +1 -1
- package/dist/domain/messaging/send-message.d.ts +1 -1
- package/dist/domain/messaging/send-message.js +1 -1
- package/dist/domain/registry/alert.d.ts +75 -0
- package/dist/domain/registry/alert.js +71 -0
- package/dist/domain/registry/alert.js.map +1 -0
- package/dist/domain/registry/claim-ship.d.ts +2 -1
- package/dist/domain/registry/claim-ship.js +1 -1
- package/dist/domain/registry/claim-ship.js.map +1 -1
- package/dist/domain/registry/clear-alert.d.ts +32 -0
- package/dist/domain/registry/clear-alert.js +40 -0
- package/dist/domain/registry/clear-alert.js.map +1 -0
- package/dist/domain/registry/crew-request.d.ts +9 -0
- package/dist/domain/registry/crew-request.js +7 -0
- package/dist/domain/registry/crew-request.js.map +1 -1
- package/dist/domain/registry/expectations.d.ts +68 -0
- package/dist/domain/registry/expectations.js +84 -0
- package/dist/domain/registry/expectations.js.map +1 -0
- package/dist/domain/registry/get-ship.d.ts +9 -1
- package/dist/domain/registry/get-ship.js +10 -2
- package/dist/domain/registry/get-ship.js.map +1 -1
- package/dist/domain/registry/lease-activity.d.ts +15 -0
- package/dist/domain/registry/lease-activity.js +2 -0
- package/dist/domain/registry/lease-activity.js.map +1 -0
- package/dist/domain/registry/lease.d.ts +1 -1
- package/dist/domain/registry/list-fleet.d.ts +6 -1
- package/dist/domain/registry/list-fleet.js +5 -3
- package/dist/domain/registry/list-fleet.js.map +1 -1
- package/dist/domain/registry/ports.d.ts +61 -1
- package/dist/domain/registry/public.d.ts +2 -0
- package/dist/domain/registry/public.js +1 -0
- package/dist/domain/registry/public.js.map +1 -1
- package/dist/domain/registry/raise-alert.d.ts +31 -0
- package/dist/domain/registry/raise-alert.js +43 -0
- package/dist/domain/registry/raise-alert.js.map +1 -0
- package/dist/domain/registry/read-open-alerts.d.ts +23 -0
- package/dist/domain/registry/read-open-alerts.js +21 -0
- package/dist/domain/registry/read-open-alerts.js.map +1 -0
- package/dist/domain/registry/report-activity.d.ts +41 -0
- package/dist/domain/registry/report-activity.js +43 -0
- package/dist/domain/registry/report-activity.js.map +1 -0
- package/dist/domain/registry/report-step.d.ts +8 -0
- package/dist/domain/registry/report-step.js +16 -0
- package/dist/domain/registry/report-step.js.map +1 -0
- package/dist/domain/registry/report-task.d.ts +14 -0
- package/dist/domain/registry/report-task.js +39 -0
- package/dist/domain/registry/report-task.js.map +1 -0
- package/dist/domain/registry/report.d.ts +2 -2
- package/dist/domain/registry/report.js.map +1 -1
- package/dist/domain/registry/retire-ship.d.ts +6 -2
- package/dist/domain/registry/retire-ship.js +12 -1
- package/dist/domain/registry/retire-ship.js.map +1 -1
- package/dist/domain/registry/set-expectations.d.ts +33 -0
- package/dist/domain/registry/set-expectations.js +47 -0
- package/dist/domain/registry/set-expectations.js.map +1 -0
- package/dist/domain/registry/ship-report.d.ts +24 -7
- package/dist/domain/registry/ship-report.js +41 -5
- package/dist/domain/registry/ship-report.js.map +1 -1
- package/dist/domain/registry/ship.d.ts +7 -1
- package/dist/domain/registry/ship.js +3 -0
- package/dist/domain/registry/ship.js.map +1 -1
- package/dist/domain/shared/errors.d.ts +1 -1
- package/dist/domain/shared/errors.js.map +1 -1
- package/dist/domain/shared/history-pruning.d.ts +19 -2
- package/dist/domain/shared/history-pruning.js +1 -1
- package/dist/domain/shared/history-pruning.js.map +1 -1
- package/dist/domain/shared/history.d.ts +2 -1
- package/dist/domain/shared/history.js.map +1 -1
- package/dist/domain/shared/prune-history.d.ts +2 -1
- package/dist/domain/shared/prune-history.js +8 -6
- package/dist/domain/shared/prune-history.js.map +1 -1
- package/dist/domain/shared/read-message-deliveries.d.ts +2 -1
- package/dist/domain/shared/read-message-deliveries.js +4 -3
- package/dist/domain/shared/read-message-deliveries.js.map +1 -1
- package/dist/domain/shared/read-message.d.ts +2 -1
- package/dist/domain/shared/read-message.js +6 -3
- package/dist/domain/shared/read-message.js.map +1 -1
- package/dist/domain/shared/read-report-tasks.d.ts +10 -0
- package/dist/domain/shared/read-report-tasks.js +24 -0
- package/dist/domain/shared/read-report-tasks.js.map +1 -0
- package/dist/wiring.d.ts +14 -0
- package/dist/wiring.js +14 -0
- package/dist/wiring.js.map +1 -1
- package/package.json +2 -2
- package/src/adapters/prisma/migrations/20261103090000_removed_ships/migration.sql +21 -0
- package/src/adapters/prisma/migrations/20261104090000_report_task_step/migration.sql +10 -0
- package/src/adapters/prisma/migrations/20261105090000_payload_limit_256kb/migration.sql +15 -0
- package/src/adapters/prisma/migrations/20261106090000_lease_activity/migration.sql +11 -0
- package/src/adapters/prisma/migrations/20261107090000_alert_scope/migration.sql +64 -0
- package/src/adapters/prisma/migrations/20261107100000_alerts/migration.sql +33 -0
- package/src/adapters/prisma/migrations/20261108090000_ship_expectations/migration.sql +22 -0
- package/src/adapters/prisma/migrations/20261108100000_delivery_record_index/migration.sql +4 -0
- package/src/adapters/prisma/schema.prisma +108 -23
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import type { AlertId, IdGenerator } from '@aeolus-fleet/common';
|
|
2
|
+
import { type Caller } from '../shared/caller.js';
|
|
3
|
+
import type { Clock } from '../shared/clock.js';
|
|
4
|
+
import { type DomainError } from '../shared/errors.js';
|
|
5
|
+
import { type EventLog } from '../shared/events.js';
|
|
6
|
+
import { type Result } from '../shared/result.js';
|
|
7
|
+
import type { UnitOfWork } from '../shared/unit-of-work.js';
|
|
8
|
+
import { type ShownAlert } from './alert.js';
|
|
9
|
+
import { type CheckReadTx, type NotReachable } from './check-reach.js';
|
|
10
|
+
import type { AlertRepository, ShipRepository } from './ports.js';
|
|
11
|
+
export interface ClearAlertTx extends Omit<CheckReadTx, 'ships'> {
|
|
12
|
+
ships: Pick<ShipRepository, 'find' | 'findForUpdate'>;
|
|
13
|
+
alerts: Pick<AlertRepository, 'find' | 'findForUpdate' | 'saveCleared'>;
|
|
14
|
+
events: EventLog;
|
|
15
|
+
}
|
|
16
|
+
export type ClearAlertRefusal = DomainError<'ALERT_NOT_FOUND'> | NotReachable;
|
|
17
|
+
export type ClearAlert = (caller: Caller, input: {
|
|
18
|
+
alertId: AlertId;
|
|
19
|
+
}) => Promise<Result<ShownAlert, ClearAlertRefusal>>;
|
|
20
|
+
/**
|
|
21
|
+
* Use case: an actor holding fleet:alert, the watch, clears an open alert on
|
|
22
|
+
* a ship it reads once its fact moved back (decision 0071), with
|
|
23
|
+
* AlertCleared in the same unit of work; a cleared alert is answered as it
|
|
24
|
+
* is. It locks the ship, then the alert, as a retire does, so a clear and a
|
|
25
|
+
* retire take turns. The scope is checked before this runs; a refused read
|
|
26
|
+
* keeps its record.
|
|
27
|
+
*/
|
|
28
|
+
export declare function createClearAlert(deps: {
|
|
29
|
+
uow: UnitOfWork<ClearAlertTx>;
|
|
30
|
+
clock: Clock;
|
|
31
|
+
ids: IdGenerator;
|
|
32
|
+
}): ClearAlert;
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import { actorOf } from '../shared/caller.js';
|
|
2
|
+
import { refuse } from '../shared/errors.js';
|
|
3
|
+
import { recordEvent } from '../shared/events.js';
|
|
4
|
+
import { ok } from '../shared/result.js';
|
|
5
|
+
import { clearAlert, shownAlertOf } from './alert.js';
|
|
6
|
+
import { checkRead, keepingReachRefusal } from './check-reach.js';
|
|
7
|
+
/**
|
|
8
|
+
* Use case: an actor holding fleet:alert, the watch, clears an open alert on
|
|
9
|
+
* a ship it reads once its fact moved back (decision 0071), with
|
|
10
|
+
* AlertCleared in the same unit of work; a cleared alert is answered as it
|
|
11
|
+
* is. It locks the ship, then the alert, as a retire does, so a clear and a
|
|
12
|
+
* retire take turns. The scope is checked before this runs; a refused read
|
|
13
|
+
* keeps its record.
|
|
14
|
+
*/
|
|
15
|
+
export function createClearAlert(deps) {
|
|
16
|
+
return (caller, { alertId }) => keepingReachRefusal(deps.uow, async (tx) => {
|
|
17
|
+
const { fleetId } = caller;
|
|
18
|
+
const notFound = refuse('ALERT_NOT_FOUND', `Alert ${alertId} does not exist`);
|
|
19
|
+
const found = await tx.alerts.find(fleetId, alertId);
|
|
20
|
+
const ship = found && (await tx.ships.findForUpdate(fleetId, found.shipId));
|
|
21
|
+
const alert = ship && (await tx.alerts.findForUpdate(fleetId, alertId));
|
|
22
|
+
if (!ship || !alert) {
|
|
23
|
+
return notFound;
|
|
24
|
+
}
|
|
25
|
+
const at = deps.clock.now();
|
|
26
|
+
const read = await checkRead({ tx, ids: deps.ids }, { reader: caller, askedBy: null, shipId: ship.id, at });
|
|
27
|
+
if (!read.isOk) {
|
|
28
|
+
return read;
|
|
29
|
+
}
|
|
30
|
+
const cleared = clearAlert(alert, { why: 'cleared', at, actor: actorOf(caller) });
|
|
31
|
+
if (cleared.events.length > 0) {
|
|
32
|
+
await tx.alerts.saveCleared(cleared.alert);
|
|
33
|
+
}
|
|
34
|
+
for (const event of cleared.events) {
|
|
35
|
+
await recordEvent({ events: tx.events, ids: deps.ids }, event);
|
|
36
|
+
}
|
|
37
|
+
return ok(shownAlertOf(cleared.alert, ship));
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
//# sourceMappingURL=clear-alert.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"clear-alert.js","sourceRoot":"","sources":["../../../src/domain/registry/clear-alert.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAe,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAiB,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAmB,MAAM,YAAY,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAuC,MAAM,kBAAkB,CAAC;AAavG;;;;;;;GAOG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAuE;IACtG,OAAO,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAC7B,mBAAmB,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,EAAkD,EAAE;QACzF,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;QAC3B,MAAM,QAAQ,GAAG,MAAM,CAAC,iBAAiB,EAAE,SAAS,OAAO,iBAAiB,CAAC,CAAC;QAC9E,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5E,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACxE,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACpB,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC5G,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAClF,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,MAAM,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC7C,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnC,MAAM,WAAW,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -185,6 +185,15 @@ export declare function giveBackCrewRequest({ ship, current, trierarchShipId }:
|
|
|
185
185
|
request: CrewRequest;
|
|
186
186
|
events: NewEvent[];
|
|
187
187
|
}, GiveBackCrewRequestRefusal>;
|
|
188
|
+
/**
|
|
189
|
+
* The trierarch that runs a ship: the one its crew request is assigned to,
|
|
190
|
+
* which alone writes the activity of its session (docs/design/monitoring, 4.3).
|
|
191
|
+
*/
|
|
192
|
+
export declare function checkRunsShip({ ship, current, trierarchShipId }: {
|
|
193
|
+
ship: Ship;
|
|
194
|
+
current: CrewRequest | undefined;
|
|
195
|
+
trierarchShipId: ShipId;
|
|
196
|
+
}): Result<void, NotFound | NotTheCallers>;
|
|
188
197
|
/**
|
|
189
198
|
* Whether the caller reaches the ship for a fleet action it may take with one
|
|
190
199
|
* of the broad scopes, or with crew:run: crew:run reaches only the ships
|
|
@@ -245,6 +245,13 @@ export function giveBackCrewRequest({ ship, current, trierarchShipId }, input) {
|
|
|
245
245
|
],
|
|
246
246
|
});
|
|
247
247
|
}
|
|
248
|
+
/**
|
|
249
|
+
* The trierarch that runs a ship: the one its crew request is assigned to,
|
|
250
|
+
* which alone writes the activity of its session (docs/design/monitoring, 4.3).
|
|
251
|
+
*/
|
|
252
|
+
export function checkRunsShip({ ship, current, trierarchShipId }) {
|
|
253
|
+
return current ? checkAssignedTo({ ship, current, trierarchShipId }) : notFound(ship);
|
|
254
|
+
}
|
|
248
255
|
/**
|
|
249
256
|
* Whether the caller reaches the ship for a fleet action it may take with one
|
|
250
257
|
* of the broad scopes, or with crew:run: crew:run reaches only the ships
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crew-request.js","sourceRoot":"","sources":["../../../src/domain/registry/crew-request.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"crew-request.js","sourceRoot":"","sources":["../../../src/domain/registry/crew-request.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Expectations on a ship (decision 0071, docs/design/monitoring 4.7): what
|
|
3
|
+
* its owner, or a ship the fleet's rules let manage it, expects of it,
|
|
4
|
+
* standing, at most one of each: its report changes within some minutes,
|
|
5
|
+
* and a task done by a time. Each keeps who set it and when. Core holds
|
|
6
|
+
* them and compares nothing; the watch compares them and tells. They stay
|
|
7
|
+
* through a release and a recrew; a retire removes them.
|
|
8
|
+
*/
|
|
9
|
+
import { type ExpectationSetter, type FleetId, type ReportTask, type ShipId } from '@aeolus-fleet/common';
|
|
10
|
+
import type { Caller } from '../shared/caller.js';
|
|
11
|
+
import { type DomainError } from '../shared/errors.js';
|
|
12
|
+
import type { Actor, NewEvent } from '../shared/events.js';
|
|
13
|
+
import { type Result } from '../shared/result.js';
|
|
14
|
+
import { type ReportTaskRefusal } from './report-task.js';
|
|
15
|
+
import type { Ship } from './ship.js';
|
|
16
|
+
/** The report is expected to change within `minutes`, while it says working or blocked. */
|
|
17
|
+
export interface ReportChangesWithin {
|
|
18
|
+
minutes: number;
|
|
19
|
+
setBy: ExpectationSetter;
|
|
20
|
+
setAt: Date;
|
|
21
|
+
}
|
|
22
|
+
/** The task is expected done by `doneBy`, while the report names that task. */
|
|
23
|
+
export interface TaskDoneBy {
|
|
24
|
+
task: ReportTask;
|
|
25
|
+
doneBy: Date;
|
|
26
|
+
setBy: ExpectationSetter;
|
|
27
|
+
setAt: Date;
|
|
28
|
+
}
|
|
29
|
+
/** What holds on a ship now; each null while not set. */
|
|
30
|
+
export interface ShipExpectations {
|
|
31
|
+
reportChangesWithin: ReportChangesWithin | null;
|
|
32
|
+
taskDoneBy: TaskDoneBy | null;
|
|
33
|
+
}
|
|
34
|
+
/** A ship's expectations as they are kept. */
|
|
35
|
+
export interface Expectations extends ShipExpectations {
|
|
36
|
+
fleetId: FleetId;
|
|
37
|
+
shipId: ShipId;
|
|
38
|
+
}
|
|
39
|
+
export declare const NO_EXPECTATIONS: ShipExpectations;
|
|
40
|
+
/** Left out, an expectation stays as it is; null clears it. */
|
|
41
|
+
export interface ExpectationsChange {
|
|
42
|
+
reportChangesWithin?: number | null;
|
|
43
|
+
taskDoneBy?: {
|
|
44
|
+
task: ReportTask;
|
|
45
|
+
doneBy: Date;
|
|
46
|
+
} | null;
|
|
47
|
+
}
|
|
48
|
+
export type SetExpectationsRefusal = DomainError<'SHIP_ALREADY_RETIRED' | 'INVALID_EXPECTATIONS'> | ReportTaskRefusal;
|
|
49
|
+
/** Who sets an expectation, as decision 0057 names an actor: an account by its id only. */
|
|
50
|
+
export declare function setterOf(caller: Caller): ExpectationSetter;
|
|
51
|
+
/**
|
|
52
|
+
* Sets a ship's expectations: refused on a retired ship, a bad minutes or a
|
|
53
|
+
* task that does not check out, with nothing changed. An expectation that
|
|
54
|
+
* changes is the setter's from now; one left out or set the same keeps who
|
|
55
|
+
* set it and when. A change writes ExpectationsSet on the ship, caused by the
|
|
56
|
+
* setter, with what holds after; nothing changed writes nothing. `kept` is
|
|
57
|
+
* null once none holds.
|
|
58
|
+
*/
|
|
59
|
+
export declare function setExpectations(ship: Ship, input: {
|
|
60
|
+
current: Expectations | undefined;
|
|
61
|
+
change: ExpectationsChange;
|
|
62
|
+
setter: ExpectationSetter;
|
|
63
|
+
at: Date;
|
|
64
|
+
actor: Actor;
|
|
65
|
+
}): Result<{
|
|
66
|
+
kept: Expectations | null;
|
|
67
|
+
events: NewEvent[];
|
|
68
|
+
}, SetExpectationsRefusal>;
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Expectations on a ship (decision 0071, docs/design/monitoring 4.7): what
|
|
3
|
+
* its owner, or a ship the fleet's rules let manage it, expects of it,
|
|
4
|
+
* standing, at most one of each: its report changes within some minutes,
|
|
5
|
+
* and a task done by a time. Each keeps who set it and when. Core holds
|
|
6
|
+
* them and compares nothing; the watch compares them and tells. They stay
|
|
7
|
+
* through a release and a recrew; a retire removes them.
|
|
8
|
+
*/
|
|
9
|
+
import { REPORT_CHANGES_WITHIN_MAX_MINUTES, REPORT_CHANGES_WITHIN_MIN_MINUTES } from '@aeolus-fleet/common';
|
|
10
|
+
import { refuse } from '../shared/errors.js';
|
|
11
|
+
import { ok } from '../shared/result.js';
|
|
12
|
+
import { isSameTask, reportTask } from './report-task.js';
|
|
13
|
+
export const NO_EXPECTATIONS = { reportChangesWithin: null, taskDoneBy: null };
|
|
14
|
+
/** Who sets an expectation, as decision 0057 names an actor: an account by its id only. */
|
|
15
|
+
export function setterOf(caller) {
|
|
16
|
+
switch (caller.kind) {
|
|
17
|
+
case 'account':
|
|
18
|
+
return { kind: 'account', accountId: caller.accountId };
|
|
19
|
+
case 'installation':
|
|
20
|
+
return { kind: 'installation' };
|
|
21
|
+
case 'operator':
|
|
22
|
+
case 'viewer':
|
|
23
|
+
case 'agent':
|
|
24
|
+
case 'person':
|
|
25
|
+
case 'app':
|
|
26
|
+
case 'plugin':
|
|
27
|
+
return { kind: 'ship', shipId: caller.shipId };
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Sets a ship's expectations: refused on a retired ship, a bad minutes or a
|
|
32
|
+
* task that does not check out, with nothing changed. An expectation that
|
|
33
|
+
* changes is the setter's from now; one left out or set the same keeps who
|
|
34
|
+
* set it and when. A change writes ExpectationsSet on the ship, caused by the
|
|
35
|
+
* setter, with what holds after; nothing changed writes nothing. `kept` is
|
|
36
|
+
* null once none holds.
|
|
37
|
+
*/
|
|
38
|
+
export function setExpectations(ship, input) {
|
|
39
|
+
const { current, change, setter, at, actor } = input;
|
|
40
|
+
if (ship.retiredAt !== null) {
|
|
41
|
+
return refuse('SHIP_ALREADY_RETIRED', `${ship.name} is retired: it holds no expectations`);
|
|
42
|
+
}
|
|
43
|
+
const minutes = change.reportChangesWithin;
|
|
44
|
+
if (minutes !== undefined && minutes !== null && !isReportChangesWithin(minutes)) {
|
|
45
|
+
return refuse('INVALID_EXPECTATIONS', `Report changes within is a whole number of minutes from ${String(REPORT_CHANGES_WITHIN_MIN_MINUTES)} to ${String(REPORT_CHANGES_WITHIN_MAX_MINUTES)}`);
|
|
46
|
+
}
|
|
47
|
+
if (change.taskDoneBy) {
|
|
48
|
+
const checked = reportTask(change.taskDoneBy.task);
|
|
49
|
+
if (!checked.isOk) {
|
|
50
|
+
return checked;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
const before = current ?? NO_EXPECTATIONS;
|
|
54
|
+
const reportChangesWithin = minutes === undefined || minutes === (before.reportChangesWithin?.minutes ?? null)
|
|
55
|
+
? before.reportChangesWithin
|
|
56
|
+
: minutes === null
|
|
57
|
+
? null
|
|
58
|
+
: { minutes, setBy: setter, setAt: at };
|
|
59
|
+
const doneBy = change.taskDoneBy;
|
|
60
|
+
const taskDoneBy = doneBy === undefined || isSameTaskDoneBy(before.taskDoneBy, doneBy) ? before.taskDoneBy : doneBy === null ? null : { ...doneBy, setBy: setter, setAt: at };
|
|
61
|
+
if (reportChangesWithin === before.reportChangesWithin && taskDoneBy === before.taskDoneBy) {
|
|
62
|
+
return ok({ kept: current ?? null, events: [] });
|
|
63
|
+
}
|
|
64
|
+
return ok({
|
|
65
|
+
kept: reportChangesWithin === null && taskDoneBy === null ? null : { fleetId: ship.fleetId, shipId: ship.id, reportChangesWithin, taskDoneBy },
|
|
66
|
+
events: [
|
|
67
|
+
{
|
|
68
|
+
fleetId: ship.fleetId,
|
|
69
|
+
type: 'ExpectationsSet',
|
|
70
|
+
occurredAt: at,
|
|
71
|
+
actor,
|
|
72
|
+
shipId: ship.id,
|
|
73
|
+
details: { reportChangesWithin: reportChangesWithin?.minutes ?? null, taskDoneBy: taskDoneBy?.doneBy.toISOString() ?? null, taskKind: taskDoneBy?.task.kind ?? null },
|
|
74
|
+
},
|
|
75
|
+
],
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
function isReportChangesWithin(minutes) {
|
|
79
|
+
return Number.isInteger(minutes) && minutes >= REPORT_CHANGES_WITHIN_MIN_MINUTES && minutes <= REPORT_CHANGES_WITHIN_MAX_MINUTES;
|
|
80
|
+
}
|
|
81
|
+
function isSameTaskDoneBy(held, change) {
|
|
82
|
+
return held === null || change === null ? held === change : isSameTask(held.task, change.task) && held.doneBy.getTime() === change.doneBy.getTime();
|
|
83
|
+
}
|
|
84
|
+
//# sourceMappingURL=expectations.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"expectations.js","sourceRoot":"","sources":["../../../src/domain/registry/expectations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import type { DiscoveredStatement, ShipId } from '@aeolus-fleet/common';
|
|
2
2
|
import { type Caller } from '../shared/caller.js';
|
|
3
3
|
import { type DomainError } from '../shared/errors.js';
|
|
4
|
+
import type { ShownAlert } from './alert.js';
|
|
5
|
+
import type { ShipExpectations } from './expectations.js';
|
|
4
6
|
import { type Result } from '../shared/result.js';
|
|
5
7
|
import { type ListedShip, type ShipOutsideReadReach } from './list-fleet.js';
|
|
6
8
|
import { type ReadReachOf } from './read-reach.js';
|
|
@@ -16,6 +18,8 @@ export interface ShipDetail extends Omit<ListedShip, 'report' | 'crewRequest'> {
|
|
|
16
18
|
commissionedAt: Date;
|
|
17
19
|
/** Since when the session crewing it has held it; null while no session does. */
|
|
18
20
|
crewedSince: Date | null;
|
|
21
|
+
/** When the pruning pass removed it: its page is its remnant (decision 0070, D8). Null until then. */
|
|
22
|
+
removedAt: Date | null;
|
|
19
23
|
/** What its crew holds in flight: what a release or a re-crew returns to pending. */
|
|
20
24
|
inFlightDeliveries: number;
|
|
21
25
|
/** Its direct deliveries pending or in flight: what a retire abandons. */
|
|
@@ -29,13 +33,17 @@ export interface ShipDetail extends Omit<ListedShip, 'report' | 'crewRequest'> {
|
|
|
29
33
|
commissionedByShipId: ShipId | null;
|
|
30
34
|
/** What it is and offers: its crew's statement while one is stated, else its commission note, else none (decision 0047). */
|
|
31
35
|
statement: DiscoveredStatement;
|
|
36
|
+
/** Its open alerts, newest first (decision 0071): shown above the meta strip until they clear. */
|
|
37
|
+
openAlerts: ShownAlert[];
|
|
38
|
+
/** What its owner, or a ship that manages it, expects of it (decision 0071); each null while not set. */
|
|
39
|
+
expectations: ShipExpectations;
|
|
32
40
|
}
|
|
33
41
|
export type GetShip = (caller: Caller, input: {
|
|
34
42
|
shipId: ShipId;
|
|
35
43
|
}) => Promise<Result<ShipDetail | ShipOutsideReadReach, DomainError<'SHIP_NOT_FOUND' | 'CREW_REQUEST_NOT_ASSIGNED_TO_CALLER'>>>;
|
|
36
44
|
/**
|
|
37
45
|
* Use case: one ship of the caller's fleet, retired ships included: they keep
|
|
38
|
-
* their page. The caller's scope (fleet:read or crew:run) is
|
|
46
|
+
* their page, a removed one its remnant (decision 0070). The caller's scope (fleet:read or crew:run) is
|
|
39
47
|
* checked before this runs; crew:run reads only the ships whose crew requests
|
|
40
48
|
* are assigned to the caller's ship, whole. Any other ship outside the
|
|
41
49
|
* caller's read reach shows its name, type and status only (decision 0034).
|
|
@@ -10,7 +10,7 @@ import { discoveredStatementOf } from './statement.js';
|
|
|
10
10
|
const READ_SCOPES = ['fleet:read'];
|
|
11
11
|
/**
|
|
12
12
|
* Use case: one ship of the caller's fleet, retired ships included: they keep
|
|
13
|
-
* their page. The caller's scope (fleet:read or crew:run) is
|
|
13
|
+
* their page, a removed one its remnant (decision 0070). The caller's scope (fleet:read or crew:run) is
|
|
14
14
|
* checked before this runs; crew:run reads only the ships whose crew requests
|
|
15
15
|
* are assigned to the caller's ship, whole. Any other ship outside the
|
|
16
16
|
* caller's read reach shows its name, type and status only (decision 0034).
|
|
@@ -30,7 +30,12 @@ export function createGetShip(deps) {
|
|
|
30
30
|
if (!isAssignedToCaller && !readsShip(await deps.readReach(caller), shipId)) {
|
|
31
31
|
return ok(outsideReadReach(listed));
|
|
32
32
|
}
|
|
33
|
-
const [counts, stated] = await Promise.all([
|
|
33
|
+
const [counts, stated, openAlerts, expectations] = await Promise.all([
|
|
34
|
+
deps.listing.deliveryCounts(caller.fleetId, shipId),
|
|
35
|
+
deps.listing.statement(caller.fleetId, shipId),
|
|
36
|
+
deps.listing.openAlertsOn(caller.fleetId, shipId),
|
|
37
|
+
deps.listing.expectationsOn(caller.fleetId, shipId),
|
|
38
|
+
]);
|
|
34
39
|
return ok({
|
|
35
40
|
...listed,
|
|
36
41
|
report: facts.openLease?.report ? shownReportOf(facts.openLease.report) : null,
|
|
@@ -39,9 +44,12 @@ export function createGetShip(deps) {
|
|
|
39
44
|
openDeliveries: counts.open,
|
|
40
45
|
commissionedAt: facts.ship.createdAt,
|
|
41
46
|
crewedSince: facts.openLease?.startedAt ?? null,
|
|
47
|
+
removedAt: facts.ship.removedAt,
|
|
42
48
|
owner: facts.owner,
|
|
43
49
|
commissionedByShipId: facts.ship.commission?.by.kind === 'ship' ? facts.ship.commission.by.shipId : null,
|
|
44
50
|
statement: discoveredStatementOf(facts.ship, stated),
|
|
51
|
+
openAlerts,
|
|
52
|
+
expectations,
|
|
45
53
|
});
|
|
46
54
|
};
|
|
47
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-ship.js","sourceRoot":"","sources":["../../../src/domain/registry/get-ship.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAe,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"get-ship.js","sourceRoot":"","sources":["../../../src/domain/registry/get-ship.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { ActivityKind } from '@aeolus-fleet/common';
|
|
2
|
+
/**
|
|
3
|
+
* What the assigned trierarch last observed of the session crewing a ship
|
|
4
|
+
* (docs/design/monitoring, 4.3): its latest event's time and kind, the tool
|
|
5
|
+
* of a tool call, never content; when the trierarch wrote it, and the report
|
|
6
|
+
* interval it stated, so a reader tells when it reads unknown. It belongs to
|
|
7
|
+
* the lease: the ship's next crew starts with none.
|
|
8
|
+
*/
|
|
9
|
+
export interface LeaseActivity {
|
|
10
|
+
at: Date;
|
|
11
|
+
kind: ActivityKind;
|
|
12
|
+
tool: string | null;
|
|
13
|
+
reportedAt: Date;
|
|
14
|
+
intervalSeconds: number;
|
|
15
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lease-activity.js","sourceRoot":"","sources":["../../../src/domain/registry/lease-activity.ts"],"names":[],"mappings":""}
|
|
@@ -26,7 +26,7 @@ export interface Lease {
|
|
|
26
26
|
fleetId: FleetId;
|
|
27
27
|
shipId: ShipId;
|
|
28
28
|
location: Location;
|
|
29
|
-
/** The harness the session stated; none for argo's console lease and for leases from before harnesses were stated. */
|
|
29
|
+
/** The harness the session stated; none when it stated none (aeolus-fleet#1408), for argo's console lease and for leases from before harnesses were stated. */
|
|
30
30
|
harness: string | null;
|
|
31
31
|
/**
|
|
32
32
|
* The hash of the crew token `register` gave the session: every later ship
|
|
@@ -9,6 +9,7 @@ import { type ShipFilter } from '@aeolus-fleet/common/rules';
|
|
|
9
9
|
import type { ShipSort } from './ship-order.js';
|
|
10
10
|
import type { FleetListing, ShipFacts } from './ports.js';
|
|
11
11
|
import type { ShipReport } from './ship-report.js';
|
|
12
|
+
import type { LeaseActivity } from './lease-activity.js';
|
|
12
13
|
/** A ship as the fleet snapshot shows it. */
|
|
13
14
|
export interface ListedShip {
|
|
14
15
|
id: ShipId;
|
|
@@ -36,6 +37,8 @@ export interface ListedShip {
|
|
|
36
37
|
scopes: readonly ScopeName[];
|
|
37
38
|
/** The crew's last report with the version of its details, never the details; null until it reports, and while no session crews the ship. */
|
|
38
39
|
report: Omit<ShipReport, 'details'> | null;
|
|
40
|
+
/** What its trierarch last observed of the crewing session (docs/design/monitoring, 4.3); null for a ship crewed by hand, before any write, and while no session crews it. */
|
|
41
|
+
activity: LeaseActivity | null;
|
|
39
42
|
/** The ship's crew request by its settings version and when it was requested, never its settings; null when it holds none. */
|
|
40
43
|
crewRequest: (Pick<CrewRequest, 'settingsVersion' | 'requestedAt' | 'status' | 'reason' | 'attempt' | 'sessionStartedAt'> & {
|
|
41
44
|
/** The trierarch ship it is assigned to, by id and name; null while unassigned. */
|
|
@@ -66,6 +69,8 @@ export interface ListedShip {
|
|
|
66
69
|
retiredAt: Date | null;
|
|
67
70
|
/** The ship that owns it (decision 0045); null for argo and the viewer, which no ship owns. */
|
|
68
71
|
ownerShipId: ShipId | null;
|
|
72
|
+
/** How many open alerts the ship has (decision 0071): the overview's alert badge. */
|
|
73
|
+
openAlertCount: number;
|
|
69
74
|
}
|
|
70
75
|
/** A ship outside the caller's read reach: its name, type and status only (decision 0034). */
|
|
71
76
|
export interface ShipOutsideReadReach {
|
|
@@ -101,4 +106,4 @@ export declare function createListFleet(deps: {
|
|
|
101
106
|
readReach: ReadReachOf;
|
|
102
107
|
}): ListFleet;
|
|
103
108
|
/** A ship as the fleet snapshot shows it, from what the listing read about it. */
|
|
104
|
-
export declare function listedShipOf({ ship, openLease, validSecret, crewRequest, crewRequestAssignee, crewRequestGivenBack, labels, crewedBy, lastPing, lastModel, lastViewedAt, lastLeaseEndedAt, }: ShipFacts): ListedShip;
|
|
109
|
+
export declare function listedShipOf({ ship, openLease, validSecret, crewRequest, crewRequestAssignee, crewRequestGivenBack, labels, crewedBy, lastPing, lastModel, lastViewedAt, lastLeaseEndedAt, openAlertCount, }: ShipFacts): ListedShip;
|
|
@@ -35,7 +35,7 @@ export function createListFleet(deps) {
|
|
|
35
35
|
};
|
|
36
36
|
}
|
|
37
37
|
/** A ship as the fleet snapshot shows it, from what the listing read about it. */
|
|
38
|
-
export function listedShipOf({ ship, openLease, validSecret, crewRequest, crewRequestAssignee, crewRequestGivenBack, labels, crewedBy, lastPing, lastModel, lastViewedAt, lastLeaseEndedAt, }) {
|
|
38
|
+
export function listedShipOf({ ship, openLease, validSecret, crewRequest, crewRequestAssignee, crewRequestGivenBack, labels, crewedBy, lastPing, lastModel, lastViewedAt, lastLeaseEndedAt, openAlertCount, }) {
|
|
39
39
|
const status = shipStatus(ship, { isCrewed: openLease !== null });
|
|
40
40
|
return {
|
|
41
41
|
id: ship.id,
|
|
@@ -50,6 +50,7 @@ export function listedShipOf({ ship, openLease, validSecret, crewRequest, crewRe
|
|
|
50
50
|
ping: pingStatusOf(lastPing),
|
|
51
51
|
scopes: ship.scopes,
|
|
52
52
|
report: openLease?.report ? listedReportOf(openLease.report) : null,
|
|
53
|
+
activity: openLease?.activity ?? null,
|
|
53
54
|
crewRequest: crewRequest && {
|
|
54
55
|
settingsVersion: crewRequest.settingsVersion,
|
|
55
56
|
requestedAt: crewRequest.requestedAt,
|
|
@@ -67,10 +68,11 @@ export function listedShipOf({ ship, openLease, validSecret, crewRequest, crewRe
|
|
|
67
68
|
awaitingCrewSince: status === 'awaitingCrew' ? latestOf(ship.createdAt, lastLeaseEndedAt) : null,
|
|
68
69
|
retiredAt: ship.retiredAt,
|
|
69
70
|
ownerShipId: ship.owner,
|
|
71
|
+
openAlertCount,
|
|
70
72
|
};
|
|
71
73
|
}
|
|
72
|
-
function listedReportOf({ state, note, reportedAt, detailsVersion }) {
|
|
73
|
-
return { state, note, reportedAt, detailsVersion };
|
|
74
|
+
function listedReportOf({ state, note, task, step, reportedAt, reportChangedAt, detailsVersion }) {
|
|
75
|
+
return { state, note, task, step, reportedAt, reportChangedAt, detailsVersion };
|
|
74
76
|
}
|
|
75
77
|
function latestOf(first, second) {
|
|
76
78
|
return second !== null && second > first ? second : first;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-fleet.js","sourceRoot":"","sources":["../../../src/domain/registry/list-fleet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAkF,MAAM,sBAAsB,CAAC;AAGzI,OAAO,EAAE,SAAS,EAAoB,MAAM,iBAAiB,CAAC;AAE9D,OAAO,EAAE,YAAY,EAAmB,MAAM,kBAAkB,CAAC;AAGjE,OAAO,EAAE,aAAa,EAAmB,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"list-fleet.js","sourceRoot":"","sources":["../../../src/domain/registry/list-fleet.ts"],"names":[],"mappings":"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"}
|