@aeolus-fleet/core 0.30.1 → 0.32.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 +1 -1
- package/dist/adapters/prisma/defined-scopes.d.ts +4 -0
- package/dist/adapters/prisma/defined-scopes.js +23 -0
- package/dist/adapters/prisma/defined-scopes.js.map +1 -0
- package/dist/adapters/prisma/delivery-notices.d.ts +3 -0
- package/dist/adapters/prisma/delivery-notices.js +7 -2
- package/dist/adapters/prisma/delivery-notices.js.map +1 -1
- package/dist/adapters/prisma/fleet-limit-settings.d.ts +6 -0
- package/dist/adapters/prisma/fleet-limit-settings.js +17 -0
- package/dist/adapters/prisma/fleet-limit-settings.js.map +1 -0
- package/dist/adapters/prisma/generated/browser.d.ts +35 -4
- package/dist/adapters/prisma/generated/client.d.ts +35 -4
- package/dist/adapters/prisma/generated/commonInputTypes.d.ts +226 -46
- package/dist/adapters/prisma/generated/enums.d.ts +38 -0
- package/dist/adapters/prisma/generated/enums.js +33 -1
- package/dist/adapters/prisma/generated/enums.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/class.d.ts +55 -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 +524 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js +96 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.d.ts +100 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js +96 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js.map +1 -1
- package/dist/adapters/prisma/generated/models/DefinedScope.d.ts +1110 -0
- package/dist/adapters/prisma/generated/models/DefinedScope.js +2 -0
- package/dist/adapters/prisma/generated/models/DefinedScope.js.map +1 -0
- package/dist/adapters/prisma/generated/models/Delivery.d.ts +1 -10
- package/dist/adapters/prisma/generated/models/Fleet.d.ts +3291 -100
- package/dist/adapters/prisma/generated/models/InstallationSettings.d.ts +108 -4
- package/dist/adapters/prisma/generated/models/Meeting.d.ts +2520 -0
- package/dist/adapters/prisma/generated/models/Meeting.js +2 -0
- package/dist/adapters/prisma/generated/models/Meeting.js.map +1 -0
- package/dist/adapters/prisma/generated/models/MeetingMicRequest.d.ts +1398 -0
- package/dist/adapters/prisma/generated/models/MeetingMicRequest.js +2 -0
- package/dist/adapters/prisma/generated/models/MeetingMicRequest.js.map +1 -0
- package/dist/adapters/prisma/generated/models/MeetingParticipant.d.ts +1630 -0
- package/dist/adapters/prisma/generated/models/MeetingParticipant.js +2 -0
- package/dist/adapters/prisma/generated/models/MeetingParticipant.js.map +1 -0
- package/dist/adapters/prisma/generated/models/Message.d.ts +664 -350
- package/dist/adapters/prisma/generated/models/Schedule.d.ts +3925 -0
- package/dist/adapters/prisma/generated/models/Schedule.js +2 -0
- package/dist/adapters/prisma/generated/models/Schedule.js.map +1 -0
- package/dist/adapters/prisma/generated/models/Ship.d.ts +2497 -67
- package/dist/adapters/prisma/generated/models.d.ts +5 -0
- package/dist/adapters/prisma/history-pruner.d.ts +3 -0
- package/dist/adapters/prisma/history-pruner.js +232 -0
- package/dist/adapters/prisma/history-pruner.js.map +1 -0
- package/dist/adapters/prisma/history.js +72 -17
- package/dist/adapters/prisma/history.js.map +1 -1
- package/dist/adapters/prisma/installation.js +27 -8
- package/dist/adapters/prisma/installation.js.map +1 -1
- package/dist/adapters/prisma/meetings.d.ts +4 -0
- package/dist/adapters/prisma/meetings.js +103 -0
- package/dist/adapters/prisma/meetings.js.map +1 -0
- package/dist/adapters/prisma/messaging.js +8 -3
- package/dist/adapters/prisma/messaging.js.map +1 -1
- package/dist/adapters/prisma/registry.js +35 -9
- package/dist/adapters/prisma/registry.js.map +1 -1
- package/dist/adapters/prisma/rows.js +14 -1
- package/dist/adapters/prisma/rows.js.map +1 -1
- package/dist/adapters/prisma/schedules.d.ts +12 -0
- package/dist/adapters/prisma/schedules.js +255 -0
- package/dist/adapters/prisma/schedules.js.map +1 -0
- package/dist/adapters/prisma/unit-of-work.d.ts +8 -2
- package/dist/adapters/prisma/unit-of-work.js +9 -0
- package/dist/adapters/prisma/unit-of-work.js.map +1 -1
- package/dist/adapters/trpc/console.d.ts +1 -1
- package/dist/adapters/trpc/console.js +3 -6
- package/dist/adapters/trpc/console.js.map +1 -1
- package/dist/adapters/trpc/context.d.ts +30 -0
- package/dist/adapters/trpc/fleet.d.ts +233 -19
- package/dist/adapters/trpc/fleet.js +111 -11
- package/dist/adapters/trpc/fleet.js.map +1 -1
- package/dist/adapters/trpc/installation.d.ts +139 -4
- package/dist/adapters/trpc/installation.js +4 -4
- package/dist/adapters/trpc/installation.js.map +1 -1
- package/dist/adapters/trpc/router.d.ts +718 -19
- package/dist/adapters/trpc/schedule-output.d.ts +74 -0
- package/dist/adapters/trpc/schedule-output.js +71 -0
- package/dist/adapters/trpc/schedule-output.js.map +1 -0
- package/dist/adapters/trpc/ship-contract.js +7 -0
- package/dist/adapters/trpc/ship-contract.js.map +1 -1
- package/dist/adapters/trpc/ship-protocol.js +2 -1
- package/dist/adapters/trpc/ship-protocol.js.map +1 -1
- package/dist/adapters/trpc/ship.d.ts +397 -3
- package/dist/adapters/trpc/ship.js +323 -11
- package/dist/adapters/trpc/ship.js.map +1 -1
- package/dist/adapters/trpc/starting-prompt-text.js +5 -5
- package/dist/adapters/trpc/starting-prompt-text.js.map +1 -1
- package/dist/adapters/trpc/trpc.d.ts +8 -0
- package/dist/adapters/trpc/trpc.js +38 -2
- package/dist/adapters/trpc/trpc.js.map +1 -1
- package/dist/app.d.ts +5 -3
- package/dist/app.js +33 -5
- package/dist/app.js.map +1 -1
- package/dist/domain/messaging/add-to-meeting.d.ts +41 -0
- package/dist/domain/messaging/add-to-meeting.js +76 -0
- package/dist/domain/messaging/add-to-meeting.js.map +1 -0
- package/dist/domain/messaging/answer.d.ts +2 -1
- package/dist/domain/messaging/answer.js +3 -2
- package/dist/domain/messaging/answer.js.map +1 -1
- package/dist/domain/messaging/cancel-schedule.d.ts +35 -0
- package/dist/domain/messaging/cancel-schedule.js +45 -0
- package/dist/domain/messaging/cancel-schedule.js.map +1 -0
- package/dist/domain/messaging/change-meeting.d.ts +32 -0
- package/dist/domain/messaging/change-meeting.js +35 -0
- package/dist/domain/messaging/change-meeting.js.map +1 -0
- package/dist/domain/messaging/change-mic.d.ts +30 -0
- package/dist/domain/messaging/change-mic.js +27 -0
- package/dist/domain/messaging/change-mic.js.map +1 -0
- package/dist/domain/messaging/check-reach-to-each.d.ts +25 -0
- package/dist/domain/messaging/check-reach-to-each.js +21 -0
- package/dist/domain/messaging/check-reach-to-each.js.map +1 -0
- package/dist/domain/messaging/cron.d.ts +46 -0
- package/dist/domain/messaging/cron.js +164 -0
- package/dist/domain/messaging/cron.js.map +1 -0
- package/dist/domain/messaging/daily-message-limit.d.ts +7 -5
- package/dist/domain/messaging/daily-message-limit.js +8 -7
- package/dist/domain/messaging/daily-message-limit.js.map +1 -1
- package/dist/domain/messaging/dismiss-delivery.js +2 -1
- package/dist/domain/messaging/dismiss-delivery.js.map +1 -1
- package/dist/domain/messaging/list-schedules.d.ts +38 -0
- package/dist/domain/messaging/list-schedules.js +33 -0
- package/dist/domain/messaging/list-schedules.js.map +1 -0
- package/dist/domain/messaging/meeting-life.d.ts +76 -0
- package/dist/domain/messaging/meeting-life.js +136 -0
- package/dist/domain/messaging/meeting-life.js.map +1 -0
- package/dist/domain/messaging/meeting-notice.d.ts +58 -0
- package/dist/domain/messaging/meeting-notice.js +87 -0
- package/dist/domain/messaging/meeting-notice.js.map +1 -0
- package/dist/domain/messaging/meeting.d.ts +103 -0
- package/dist/domain/messaging/meeting.js +106 -0
- package/dist/domain/messaging/meeting.js.map +1 -0
- package/dist/domain/messaging/message.d.ts +68 -4
- package/dist/domain/messaging/message.js +163 -10
- package/dist/domain/messaging/message.js.map +1 -1
- package/dist/domain/messaging/mic.d.ts +64 -0
- package/dist/domain/messaging/mic.js +130 -0
- package/dist/domain/messaging/mic.js.map +1 -0
- package/dist/domain/messaging/open-meeting.d.ts +61 -0
- package/dist/domain/messaging/open-meeting.js +98 -0
- package/dist/domain/messaging/open-meeting.js.map +1 -0
- package/dist/domain/messaging/pause-schedule.d.ts +34 -0
- package/dist/domain/messaging/pause-schedule.js +44 -0
- package/dist/domain/messaging/pause-schedule.js.map +1 -0
- package/dist/domain/messaging/ports.d.ts +121 -3
- package/dist/domain/messaging/public.d.ts +4 -0
- package/dist/domain/messaging/public.js +2 -0
- package/dist/domain/messaging/public.js.map +1 -1
- package/dist/domain/messaging/push-receive-deliveries.d.ts +4 -1
- package/dist/domain/messaging/push-receive-deliveries.js +5 -2
- package/dist/domain/messaging/push-receive-deliveries.js.map +1 -1
- package/dist/domain/messaging/read-meeting.d.ts +67 -0
- package/dist/domain/messaging/read-meeting.js +61 -0
- package/dist/domain/messaging/read-meeting.js.map +1 -0
- package/dist/domain/messaging/receive-deliveries.d.ts +6 -1
- package/dist/domain/messaging/receive-deliveries.js +3 -0
- package/dist/domain/messaging/receive-deliveries.js.map +1 -1
- package/dist/domain/messaging/resend-delivery.js +5 -4
- package/dist/domain/messaging/resend-delivery.js.map +1 -1
- package/dist/domain/messaging/resume-schedule.d.ts +34 -0
- package/dist/domain/messaging/resume-schedule.js +37 -0
- package/dist/domain/messaging/resume-schedule.js.map +1 -0
- package/dist/domain/messaging/retired-participant.d.ts +36 -0
- package/dist/domain/messaging/retired-participant.js +38 -0
- package/dist/domain/messaging/retired-participant.js.map +1 -0
- package/dist/domain/messaging/retired-scheduler.d.ts +31 -0
- package/dist/domain/messaging/retired-scheduler.js +30 -0
- package/dist/domain/messaging/retired-scheduler.js.map +1 -0
- package/dist/domain/messaging/schedule-access.d.ts +20 -0
- package/dist/domain/messaging/schedule-access.js +21 -0
- package/dist/domain/messaging/schedule-access.js.map +1 -0
- package/dist/domain/messaging/schedule-limits.d.ts +25 -0
- package/dist/domain/messaging/schedule-limits.js +51 -0
- package/dist/domain/messaging/schedule-limits.js.map +1 -0
- package/dist/domain/messaging/schedule-message.d.ts +65 -0
- package/dist/domain/messaging/schedule-message.js +151 -0
- package/dist/domain/messaging/schedule-message.js.map +1 -0
- package/dist/domain/messaging/schedule.d.ts +238 -0
- package/dist/domain/messaging/schedule.js +316 -0
- package/dist/domain/messaging/schedule.js.map +1 -0
- package/dist/domain/messaging/send-due-schedules.d.ts +40 -0
- package/dist/domain/messaging/send-due-schedules.js +141 -0
- package/dist/domain/messaging/send-due-schedules.js.map +1 -0
- package/dist/domain/messaging/send-message.d.ts +18 -5
- package/dist/domain/messaging/send-message.js +149 -4
- package/dist/domain/messaging/send-message.js.map +1 -1
- package/dist/domain/messaging/send-request.d.ts +3 -2
- package/dist/domain/messaging/send-request.js +7 -2
- package/dist/domain/messaging/send-request.js.map +1 -1
- package/dist/domain/registry/applied-limits.d.ts +5 -7
- package/dist/domain/registry/applied-limits.js +5 -9
- package/dist/domain/registry/applied-limits.js.map +1 -1
- package/dist/domain/registry/check-manage.d.ts +23 -0
- package/dist/domain/registry/check-manage.js +19 -0
- package/dist/domain/registry/check-manage.js.map +1 -0
- package/dist/domain/registry/commission-ship.js +3 -3
- package/dist/domain/registry/commission-ship.js.map +1 -1
- package/dist/domain/registry/declare-scopes.d.ts +5 -3
- package/dist/domain/registry/declare-scopes.js +4 -2
- package/dist/domain/registry/declare-scopes.js.map +1 -1
- package/dist/domain/registry/define-scope.d.ts +33 -0
- package/dist/domain/registry/define-scope.js +30 -0
- package/dist/domain/registry/define-scope.js.map +1 -0
- package/dist/domain/registry/defined-scope.d.ts +68 -0
- package/dist/domain/registry/defined-scope.js +83 -0
- package/dist/domain/registry/defined-scope.js.map +1 -0
- package/dist/domain/registry/describe-scope.d.ts +31 -0
- package/dist/domain/registry/describe-scope.js +28 -0
- package/dist/domain/registry/describe-scope.js.map +1 -0
- package/dist/domain/registry/get-fleet-limits.d.ts +1 -1
- package/dist/domain/registry/get-fleet-limits.js +1 -1
- package/dist/domain/registry/get-fleet-limits.js.map +1 -1
- package/dist/domain/registry/grant-scopes.d.ts +4 -3
- package/dist/domain/registry/grant-scopes.js +4 -4
- package/dist/domain/registry/grant-scopes.js.map +1 -1
- package/dist/domain/registry/installation-fleet.d.ts +4 -1
- package/dist/domain/registry/installation-fleet.js +9 -2
- package/dist/domain/registry/installation-fleet.js.map +1 -1
- package/dist/domain/registry/label-value-texts.d.ts +16 -0
- package/dist/domain/registry/label-value-texts.js +15 -0
- package/dist/domain/registry/label-value-texts.js.map +1 -0
- package/dist/domain/registry/limits.d.ts +42 -7
- package/dist/domain/registry/limits.js +41 -6
- package/dist/domain/registry/limits.js.map +1 -1
- package/dist/domain/registry/list-scopes.d.ts +13 -6
- package/dist/domain/registry/list-scopes.js +15 -6
- package/dist/domain/registry/list-scopes.js.map +1 -1
- package/dist/domain/registry/named-namespaces.d.ts +18 -8
- package/dist/domain/registry/named-namespaces.js +11 -3
- package/dist/domain/registry/named-namespaces.js.map +1 -1
- package/dist/domain/registry/ports.d.ts +22 -0
- package/dist/domain/registry/public.d.ts +4 -1
- package/dist/domain/registry/public.js +4 -1
- package/dist/domain/registry/public.js.map +1 -1
- package/dist/domain/registry/read-built-in-rules.d.ts +2 -1
- package/dist/domain/registry/read-built-in-rules.js +3 -1
- package/dist/domain/registry/read-built-in-rules.js.map +1 -1
- package/dist/domain/registry/remove-scope.d.ts +29 -0
- package/dist/domain/registry/remove-scope.js +32 -0
- package/dist/domain/registry/remove-scope.js.map +1 -0
- package/dist/domain/registry/resolve-invitees.d.ts +27 -0
- package/dist/domain/registry/resolve-invitees.js +27 -0
- package/dist/domain/registry/resolve-invitees.js.map +1 -0
- package/dist/domain/registry/resolve-label-selection.d.ts +20 -0
- package/dist/domain/registry/resolve-label-selection.js +26 -0
- package/dist/domain/registry/resolve-label-selection.js.map +1 -0
- package/dist/domain/registry/resolve-selector.d.ts +2 -2
- package/dist/domain/registry/resolve-selector.js.map +1 -1
- package/dist/domain/registry/retire-ship.d.ts +11 -3
- package/dist/domain/registry/retire-ship.js +15 -1
- package/dist/domain/registry/retire-ship.js.map +1 -1
- package/dist/domain/registry/scope-grant.d.ts +6 -2
- package/dist/domain/registry/scope-grant.js +9 -5
- package/dist/domain/registry/scope-grant.js.map +1 -1
- package/dist/domain/registry/scope-namespace.d.ts +5 -1
- package/dist/domain/registry/scope-namespace.js +9 -2
- package/dist/domain/registry/scope-namespace.js.map +1 -1
- package/dist/domain/registry/set-fleet-limits.d.ts +8 -5
- package/dist/domain/registry/set-fleet-limits.js +38 -6
- package/dist/domain/registry/set-fleet-limits.js.map +1 -1
- package/dist/domain/registry/set-installation-settings.d.ts +4 -4
- package/dist/domain/registry/set-installation-settings.js +21 -15
- package/dist/domain/registry/set-installation-settings.js.map +1 -1
- package/dist/domain/registry/ship.d.ts +2 -0
- package/dist/domain/registry/ship.js +1 -1
- package/dist/domain/registry/ship.js.map +1 -1
- package/dist/domain/shared/close-health-snapshots.d.ts +5 -2
- package/dist/domain/shared/close-health-snapshots.js +12 -6
- package/dist/domain/shared/close-health-snapshots.js.map +1 -1
- package/dist/domain/shared/delivery-way.d.ts +4 -0
- package/dist/domain/shared/delivery-way.js +5 -2
- package/dist/domain/shared/delivery-way.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 +130 -0
- package/dist/domain/shared/history-pruning.js +74 -0
- package/dist/domain/shared/history-pruning.js.map +1 -0
- package/dist/domain/shared/history.d.ts +41 -5
- package/dist/domain/shared/history.js +19 -2
- package/dist/domain/shared/history.js.map +1 -1
- package/dist/domain/shared/prune-history.d.ts +39 -0
- package/dist/domain/shared/prune-history.js +98 -0
- package/dist/domain/shared/prune-history.js.map +1 -0
- package/dist/domain/shared/read-fleet-limits.d.ts +14 -4
- package/dist/domain/shared/read-fleet-limits.js +8 -4
- package/dist/domain/shared/read-fleet-limits.js.map +1 -1
- package/dist/domain/shared/read-message-deliveries.d.ts +30 -0
- package/dist/domain/shared/read-message-deliveries.js +24 -0
- package/dist/domain/shared/read-message-deliveries.js.map +1 -0
- package/dist/domain/shared/read-message.d.ts +4 -1
- package/dist/domain/shared/read-message.js +3 -2
- package/dist/domain/shared/read-message.js.map +1 -1
- package/dist/domain/shared/read-sent-message.d.ts +21 -7
- package/dist/domain/shared/read-sent-message.js +19 -6
- package/dist/domain/shared/read-sent-message.js.map +1 -1
- package/dist/domain/shared/selector.d.ts +32 -11
- package/dist/schedule-timer.d.ts +22 -0
- package/dist/schedule-timer.js +78 -0
- package/dist/schedule-timer.js.map +1 -0
- package/dist/wiring.d.ts +36 -0
- package/dist/wiring.js +38 -2
- package/dist/wiring.js.map +1 -1
- package/package.json +2 -2
- package/src/adapters/prisma/migrations/20261024160000_meetings/migration.sql +86 -0
- package/src/adapters/prisma/migrations/20261024160100_meetings_open_scope/migration.sql +64 -0
- package/src/adapters/prisma/migrations/20261024160200_meetings_mic/migration.sql +35 -0
- package/src/adapters/prisma/migrations/20261024160300_meetings_life/migration.sql +6 -0
- package/src/adapters/prisma/migrations/20261025090000_scheduled_messages_envelope/migration.sql +5 -0
- package/src/adapters/prisma/migrations/20261025090100_schedules/migration.sql +109 -0
- package/src/adapters/prisma/migrations/20261025120000_repeating_schedules/migration.sql +40 -0
- package/src/adapters/prisma/migrations/20261025130000_schedule_limits/migration.sql +11 -0
- package/src/adapters/prisma/migrations/20261025140000_send_to_a_label/migration.sql +16 -0
- package/src/adapters/prisma/migrations/20261025150000_define_scope/migration.sql +64 -0
- package/src/adapters/prisma/migrations/20261025150100_defined_scopes/migration.sql +15 -0
- package/src/adapters/prisma/migrations/20261025160000_retention/migration.sql +7 -0
- package/src/adapters/prisma/migrations/20261025170000_message_deliveries_page/migration.sql +7 -0
- package/src/adapters/prisma/migrations/20261025180000_history_pruning/migration.sql +25 -0
- package/src/adapters/prisma/migrations/20261025190000_history_pruning_crew_events/migration.sql +2 -0
- package/src/adapters/prisma/migrations/20261025200000_schedule_to_a_label/migration.sql +12 -0
- package/src/adapters/prisma/schema.prisma +383 -131
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { refuse } from '../shared/errors.js';
|
|
2
|
+
import { ok } from '../shared/result.js';
|
|
3
|
+
import { addressShip } from './ship.js';
|
|
4
|
+
/**
|
|
5
|
+
* The ships a send to a label selection goes to, at send time (decision
|
|
6
|
+
* 0065): every ship carrying each value that is not retired, awaiting crew or
|
|
7
|
+
* crewed, never the viewer and never the sender. Each is held in id order as
|
|
8
|
+
* a send holds the ship it addresses, so a retire waits for the send and a
|
|
9
|
+
* ship retired before its hold is left out. No ship refuses the send.
|
|
10
|
+
*/
|
|
11
|
+
export async function resolveLabelSelection(tx, input) {
|
|
12
|
+
const { fleetId, senderShipId } = input;
|
|
13
|
+
const selected = (await tx.ships.listActiveCarryingEvery(fleetId, input.valueIds))
|
|
14
|
+
.map((ship) => ship.id)
|
|
15
|
+
.filter((shipId) => shipId !== senderShipId)
|
|
16
|
+
.sort();
|
|
17
|
+
const resolved = [];
|
|
18
|
+
for (const shipId of selected) {
|
|
19
|
+
const ship = await tx.ships.findForShare(fleetId, shipId);
|
|
20
|
+
if (ship && addressShip(ship).isOk) {
|
|
21
|
+
resolved.push(shipId);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
return resolved.length === 0 ? refuse('UNRESOLVABLE_SELECTOR', 'No ship but the sender carries every value of the label selection') : ok(resolved);
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=resolve-label-selection.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolve-label-selection.js","sourceRoot":"","sources":["../../../src/domain/registry/resolve-label-selection.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAOxC;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,EAA2B,EAC3B,KAAoF;IAEpF,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;IACxC,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,uBAAuB,CAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;SAC/E,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;SACtB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,YAAY,CAAC;SAC3C,IAAI,EAAE,CAAC;IACV,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC1D,IAAI,IAAI,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;YACnC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,uBAAuB,EAAE,mEAAmE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;AACrJ,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { FleetId } from '@aeolus-fleet/common';
|
|
2
2
|
import { type DomainError } from '../shared/errors.js';
|
|
3
3
|
import { type Result } from '../shared/result.js';
|
|
4
|
-
import type { Recipient,
|
|
4
|
+
import type { Recipient, RecipientSelector } from '../shared/selector.js';
|
|
5
5
|
import type { ShipRepository } from './ports.js';
|
|
6
6
|
/** The ports resolving a selector reads, inside the caller's unit of work. */
|
|
7
7
|
export interface ResolveSelectorTx {
|
|
@@ -21,5 +21,5 @@ export type UnresolvableSelector = DomainError<'UNRESOLVABLE_SELECTOR'>;
|
|
|
21
21
|
*/
|
|
22
22
|
export declare function resolveSelector(tx: ResolveSelectorTx, input: {
|
|
23
23
|
fleetId: FleetId;
|
|
24
|
-
selector:
|
|
24
|
+
selector: RecipientSelector;
|
|
25
25
|
}): Promise<Result<Recipient, UnresolvableSelector>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-selector.js","sourceRoot":"","sources":["../../../src/domain/registry/resolve-selector.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AASxC;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,EAAqB,EACrB,
|
|
1
|
+
{"version":3,"file":"resolve-selector.js","sourceRoot":"","sources":["../../../src/domain/registry/resolve-selector.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AASxC;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,EAAqB,EACrB,KAAwD;IAExD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IACpC,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtB,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,IAAI,QAAQ,IAAI,QAAQ,EAAE,CAAC;gBACzB,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACnE,OAAO,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,uBAAuB,EAAE,QAAQ,QAAQ,CAAC,MAAM,iBAAiB,CAAC,CAAC;YAC9G,CAAC;YACD,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,wBAAwB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC7E,OAAO,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,uBAAuB,EAAE,2BAA2B,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;QAChH,CAAC;QACD,KAAK,MAAM;YACT,OAAO,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACjE,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAC3C,CAAC,CAAC,MAAM,CAAC,uBAAuB,EAAE,+BAA+B,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IACxF,CAAC;AACH,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { IdGenerator, ShipId } from '@aeolus-fleet/common';
|
|
2
2
|
import { type CredentialTx } from '../identity/public.js';
|
|
3
|
+
import { type AcceptRefusal, type RequestHasher, type RetiredParticipantTx, type RetiredSchedulerTx } from '../messaging/public.js';
|
|
3
4
|
import { type Caller } from '../shared/caller.js';
|
|
4
5
|
import type { Clock } from '../shared/clock.js';
|
|
5
6
|
import { type DomainError } from '../shared/errors.js';
|
|
@@ -9,7 +10,7 @@ import { type CheckManageTx, type NotReachable } from './check-reach.js';
|
|
|
9
10
|
import { type LeaseTx } from './leases.js';
|
|
10
11
|
import type { ClearRequestRepository, CrewRequestRepository, DeclaredNetworkRulesRepository, LabelRepository, NetworkSettingsRepository, ScopeNamespaceRepository, ShipRepository, VerifiedFactsRepository } from './ports.js';
|
|
11
12
|
import { type RetireRefusal } from './ship.js';
|
|
12
|
-
export interface RetireShipTx extends LeaseTx, CredentialTx, Omit<CheckManageTx, 'ships' | 'labels' | 'networkSettings' | 'declaredNetworkRules'> {
|
|
13
|
+
export interface RetireShipTx extends LeaseTx, CredentialTx, RetiredParticipantTx, RetiredSchedulerTx, Omit<CheckManageTx, 'ships' | 'labels' | 'networkSettings' | 'declaredNetworkRules' | 'events'> {
|
|
13
14
|
ships: ShipRepository;
|
|
14
15
|
crewRequests: CrewRequestRepository;
|
|
15
16
|
clearRequests: ClearRequestRepository;
|
|
@@ -19,7 +20,7 @@ export interface RetireShipTx extends LeaseTx, CredentialTx, Omit<CheckManageTx,
|
|
|
19
20
|
scopeNamespaces: Pick<ScopeNamespaceRepository, 'findByDeclarer' | 'lockNamespace' | 'remove'>;
|
|
20
21
|
verifiedFacts: Pick<VerifiedFactsRepository, 'listAbout' | 'listBy' | 'lockWriter' | 'remove'>;
|
|
21
22
|
}
|
|
22
|
-
export type RetireShipRefusal = DomainError<'SHIP_NOT_FOUND'> | NotReachable | RetireRefusal;
|
|
23
|
+
export type RetireShipRefusal = DomainError<'SHIP_NOT_FOUND'> | NotReachable | RetireRefusal | AcceptRefusal;
|
|
23
24
|
export type RetireShip = (caller: Caller, input: {
|
|
24
25
|
shipId: ShipId;
|
|
25
26
|
}) => Promise<Result<{
|
|
@@ -47,7 +48,13 @@ export type RetireShip = (caller: Caller, input: {
|
|
|
47
48
|
* Every writer's verified facts about it go, and its own about every ship,
|
|
48
49
|
* one VerifiedFactsRemoved each, under its writer lock, taken last, after
|
|
49
50
|
* every ship this locks, as a set takes it after the ship it writes about
|
|
50
|
-
* (decision 0059).
|
|
51
|
+
* (decision 0059). It leaves every open meeting it is present in, off the
|
|
52
|
+
* mic, its moderatorship going to the owner, and a meeting it owns ends, the
|
|
53
|
+
* others told (decision 0061, M15, M17): those meetings it locks before the
|
|
54
|
+
* ship, as a contribution locks its meeting before its recipients.
|
|
55
|
+
* Its active and paused schedules are cancelled, one ScheduleCancelled each
|
|
56
|
+
* (decision 0062, S11), locked before the ship too, as a send time locks its
|
|
57
|
+
* schedule before the ship it sends to.
|
|
51
58
|
* The caller, any actor (decision 0057), needs fleet:manage, checked before
|
|
52
59
|
* this runs, and manage reach on the ship here (decision 0034), a refusal
|
|
53
60
|
* storing only its record. That check reads the network
|
|
@@ -64,4 +71,5 @@ export declare function createRetireShip(deps: {
|
|
|
64
71
|
uow: UnitOfWork<RetireShipTx>;
|
|
65
72
|
clock: Clock;
|
|
66
73
|
ids: IdGenerator;
|
|
74
|
+
hasher: RequestHasher;
|
|
67
75
|
}): RetireShip;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { revokeShipSecret } from '../identity/public.js';
|
|
2
|
+
import { cancelSchedulesOnRetire, leaveMeetingsOnRetire, lockMeetingsOf, lockSchedulesOf } from '../messaging/public.js';
|
|
2
3
|
import { actorOf } from '../shared/caller.js';
|
|
3
4
|
import { refuse } from '../shared/errors.js';
|
|
4
5
|
import { recordEvent } from '../shared/events.js';
|
|
@@ -34,7 +35,13 @@ import { removeWithRetiredShip } from './verified-facts.js';
|
|
|
34
35
|
* Every writer's verified facts about it go, and its own about every ship,
|
|
35
36
|
* one VerifiedFactsRemoved each, under its writer lock, taken last, after
|
|
36
37
|
* every ship this locks, as a set takes it after the ship it writes about
|
|
37
|
-
* (decision 0059).
|
|
38
|
+
* (decision 0059). It leaves every open meeting it is present in, off the
|
|
39
|
+
* mic, its moderatorship going to the owner, and a meeting it owns ends, the
|
|
40
|
+
* others told (decision 0061, M15, M17): those meetings it locks before the
|
|
41
|
+
* ship, as a contribution locks its meeting before its recipients.
|
|
42
|
+
* Its active and paused schedules are cancelled, one ScheduleCancelled each
|
|
43
|
+
* (decision 0062, S11), locked before the ship too, as a send time locks its
|
|
44
|
+
* schedule before the ship it sends to.
|
|
38
45
|
* The caller, any actor (decision 0057), needs fleet:manage, checked before
|
|
39
46
|
* this runs, and manage reach on the ship here (decision 0034), a refusal
|
|
40
47
|
* storing only its record. That check reads the network
|
|
@@ -50,6 +57,8 @@ import { removeWithRetiredShip } from './verified-facts.js';
|
|
|
50
57
|
export function createRetireShip(deps) {
|
|
51
58
|
return (caller, { shipId }) => keepingReachRefusal(deps.uow, async (tx) => {
|
|
52
59
|
const { fleetId } = caller;
|
|
60
|
+
const meetings = await lockMeetingsOf(tx, { fleetId, shipId });
|
|
61
|
+
const schedules = await lockSchedulesOf(tx, { fleetId, shipId });
|
|
53
62
|
const ship = await tx.ships.findForUpdate(fleetId, shipId);
|
|
54
63
|
if (!ship) {
|
|
55
64
|
return refuse('SHIP_NOT_FOUND', `Ship ${shipId} does not exist`);
|
|
@@ -152,6 +161,11 @@ export function createRetireShip(deps) {
|
|
|
152
161
|
await recordEvent(recorded, event);
|
|
153
162
|
}
|
|
154
163
|
}
|
|
164
|
+
const left = await leaveMeetingsOnRetire({ tx, ids: deps.ids, hasher: deps.hasher }, { meetings, shipId, actor, at });
|
|
165
|
+
if (!left.isOk) {
|
|
166
|
+
return left;
|
|
167
|
+
}
|
|
168
|
+
await cancelSchedulesOnRetire({ tx, ids: deps.ids }, { schedules, actor, at });
|
|
155
169
|
await tx.verifiedFacts.lockWriter(fleetId, shipId);
|
|
156
170
|
const facts = removeWithRetiredShip({ about: await tx.verifiedFacts.listAbout(fleetId, shipId), by: await tx.verifiedFacts.listBy(fleetId, shipId) }, { at, actor });
|
|
157
171
|
for (const written of facts.removed) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retire-ship.js","sourceRoot":"","sources":["../../../src/domain/registry/retire-ship.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAqB,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,OAAO,EAAe,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAyC,MAAM,kBAAkB,CAAC;AAC3G,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAgB,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAEtE,OAAO,EAAE,WAAW,EAAE,cAAc,EAAsB,MAAM,WAAW,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAoB5D
|
|
1
|
+
{"version":3,"file":"retire-ship.js","sourceRoot":"","sources":["../../../src/domain/registry/retire-ship.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,14 +35,17 @@ export declare function grantScopes(input: {
|
|
|
35
35
|
namespace: ScopeNamespace;
|
|
36
36
|
declarerName: string;
|
|
37
37
|
}>;
|
|
38
|
+
/** Which of the granted and revoked scopes the fleet defined as its own (design gateway-scopes, 4.1). */
|
|
39
|
+
defined: ReadonlySet<ScopeName>;
|
|
38
40
|
}): Result<{
|
|
39
41
|
ship: Ship;
|
|
40
42
|
events: NewEvent[];
|
|
41
43
|
}, GrantScopesRefusal>;
|
|
42
44
|
/**
|
|
43
45
|
* Whether the granter may grant or revoke the scope, at commission or on a
|
|
44
|
-
* live ship: a core scope it holds,
|
|
45
|
-
* declared (decision 0053)
|
|
46
|
+
* live ship: a core scope it holds, a declared plugin scope it holds or
|
|
47
|
+
* declared (decision 0053), or one of the fleet's own scopes it holds
|
|
48
|
+
* (design gateway-scopes, 4.1): defining a scope never lets an actor grant it.
|
|
46
49
|
*/
|
|
47
50
|
export declare function mayGrant(scope: string, at: {
|
|
48
51
|
granter: Granter;
|
|
@@ -50,4 +53,5 @@ export declare function mayGrant(scope: string, at: {
|
|
|
50
53
|
namespace: ScopeNamespace;
|
|
51
54
|
declarerName: string;
|
|
52
55
|
}>;
|
|
56
|
+
defined: ReadonlySet<ScopeName>;
|
|
53
57
|
}): Result<null, DomainError<'INVALID_SCOPE' | 'SCOPE_NOT_DECLARED' | 'SCOPE_NOT_HELD'>>;
|
|
@@ -23,7 +23,7 @@ export function grantScopes(input, fleet) {
|
|
|
23
23
|
return refuse('SHIP_ALREADY_RETIRED', `${ship.name} is retired: its scopes stay as they were`);
|
|
24
24
|
}
|
|
25
25
|
for (const scope of [...input.grant, ...input.revoke]) {
|
|
26
|
-
const allowed = mayGrant(scope, { granter, namespaces: fleet.namespaces });
|
|
26
|
+
const allowed = mayGrant(scope, { granter, namespaces: fleet.namespaces, defined: fleet.defined });
|
|
27
27
|
if (!allowed.isOk) {
|
|
28
28
|
return allowed;
|
|
29
29
|
}
|
|
@@ -49,21 +49,25 @@ export function grantScopes(input, fleet) {
|
|
|
49
49
|
}
|
|
50
50
|
/**
|
|
51
51
|
* Whether the granter may grant or revoke the scope, at commission or on a
|
|
52
|
-
* live ship: a core scope it holds,
|
|
53
|
-
* declared (decision 0053)
|
|
52
|
+
* live ship: a core scope it holds, a declared plugin scope it holds or
|
|
53
|
+
* declared (decision 0053), or one of the fleet's own scopes it holds
|
|
54
|
+
* (design gateway-scopes, 4.1): defining a scope never lets an actor grant it.
|
|
54
55
|
*/
|
|
55
56
|
export function mayGrant(scope, at) {
|
|
56
|
-
const { granter, namespaces } = at;
|
|
57
|
+
const { granter, namespaces, defined } = at;
|
|
57
58
|
if (!scopeNameSchema.safeParse(scope).success) {
|
|
58
59
|
return refuse('INVALID_SCOPE', `${scope} is no scope: a core scope, or a plugin's <namespace>:<action>`);
|
|
59
60
|
}
|
|
60
61
|
if (scopeSchema.safeParse(scope).success) {
|
|
61
62
|
return granter.isOperator || granter.scopes.includes(scope) ? ok(null) : refuse('SCOPE_NOT_HELD', `You do not hold ${scope}, so you cannot grant it`);
|
|
62
63
|
}
|
|
64
|
+
if (defined.has(scope)) {
|
|
65
|
+
return granter.isOperator || granter.scopes.includes(scope) ? ok(null) : refuse('SCOPE_NOT_HELD', `You do not hold ${scope}, so you cannot grant it`);
|
|
66
|
+
}
|
|
63
67
|
const namespace = scope.slice(0, scope.indexOf(':'));
|
|
64
68
|
const declared = namespaces.get(namespace);
|
|
65
69
|
if (declared?.namespace.scopes.some((each) => each.scope === scope) !== true) {
|
|
66
|
-
return refuse('SCOPE_NOT_DECLARED', `
|
|
70
|
+
return refuse('SCOPE_NOT_DECLARED', `Neither a plugin declared ${scope} nor the fleet defined it`);
|
|
67
71
|
}
|
|
68
72
|
if (!granter.isOperator && !granter.scopes.includes(scope) && declared.namespace.declaredBy !== granter.shipId) {
|
|
69
73
|
return refuse('SCOPE_NOT_HELD', `You do not hold ${scope}, so you cannot grant it`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scope-grant.js","sourceRoot":"","sources":["../../../src/domain/registry/scope-grant.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAA+B,MAAM,sBAAsB,CAAC;AAEjG,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAItD,wFAAwF;AACxF,MAAM,WAAW,GAAyB,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC;AAgBhF;;;;;;;GAOG;AACH,MAAM,UAAU,WAAW,CACzB,KAOC,EACD,
|
|
1
|
+
{"version":3,"file":"scope-grant.js","sourceRoot":"","sources":["../../../src/domain/registry/scope-grant.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ export type DeclareScopesRefusal = DomainError<'INVALID_SCOPE' | 'INVALID_SCOPE_
|
|
|
26
26
|
* A ship declares its namespace with its whole list of scopes, the first
|
|
27
27
|
* time or again (decision 0046). Refused: a malformed namespace or scope, a
|
|
28
28
|
* scope of another namespace or twice, a description not on one line, a core
|
|
29
|
-
* namespace, a namespace another ship took, a second namespace, more than 20
|
|
29
|
+
* namespace, a namespace the fleet uses for its own scopes, a namespace another ship took, a second namespace, more than 20
|
|
30
30
|
* scopes, and removing a scope an active ship holds. Writes ScopesDeclared.
|
|
31
31
|
*/
|
|
32
32
|
export declare function declareScopes(input: {
|
|
@@ -49,10 +49,14 @@ export declare function declareScopes(input: {
|
|
|
49
49
|
ofDeclarer: ScopeNamespace | undefined;
|
|
50
50
|
/** The scopes of this namespace an active ship holds. */
|
|
51
51
|
held: readonly ScopeName[];
|
|
52
|
+
/** Whether the fleet has scopes of its own in this namespace (design gateway-scopes, 4.1). */
|
|
53
|
+
isUsedByFleet: boolean;
|
|
52
54
|
}): Result<{
|
|
53
55
|
namespace: ScopeNamespace;
|
|
54
56
|
events: NewEvent[];
|
|
55
57
|
}, DeclareScopesRefusal>;
|
|
58
|
+
/** Whether the description is one line of 1 to 200 characters, as every scope's is (decision 0046). */
|
|
59
|
+
export declare function isScopeDescription(description: string): boolean;
|
|
56
60
|
/**
|
|
57
61
|
* The namespace goes with its retiring declarer (decision 0046): each active
|
|
58
62
|
* ship that holds any of its scopes loses them, keeping its other scopes, one
|
|
@@ -5,7 +5,7 @@ import { ok } from '../shared/result.js';
|
|
|
5
5
|
* A ship declares its namespace with its whole list of scopes, the first
|
|
6
6
|
* time or again (decision 0046). Refused: a malformed namespace or scope, a
|
|
7
7
|
* scope of another namespace or twice, a description not on one line, a core
|
|
8
|
-
* namespace, a namespace another ship took, a second namespace, more than 20
|
|
8
|
+
* namespace, a namespace the fleet uses for its own scopes, a namespace another ship took, a second namespace, more than 20
|
|
9
9
|
* scopes, and removing a scope an active ship holds. Writes ScopesDeclared.
|
|
10
10
|
*/
|
|
11
11
|
export function declareScopes(input, fleet) {
|
|
@@ -23,6 +23,9 @@ export function declareScopes(input, fleet) {
|
|
|
23
23
|
if (!scopes.isOk) {
|
|
24
24
|
return scopes;
|
|
25
25
|
}
|
|
26
|
+
if (fleet.isUsedByFleet) {
|
|
27
|
+
return refuse('NAMESPACE_TAKEN', `The namespace ${namespace} is taken, by the fleet`);
|
|
28
|
+
}
|
|
26
29
|
if (fleet.taken !== undefined && fleet.taken.namespace.declaredBy !== declarer) {
|
|
27
30
|
return refuse('NAMESPACE_TAKEN', `The namespace ${namespace} is taken, by ${fleet.taken.declarerName}`);
|
|
28
31
|
}
|
|
@@ -51,7 +54,7 @@ function declaredScopes(namespace, scopes) {
|
|
|
51
54
|
if (seen.has(scope)) {
|
|
52
55
|
return refuse('INVALID_SCOPE', `${scope} is declared twice`);
|
|
53
56
|
}
|
|
54
|
-
if (
|
|
57
|
+
if (!isScopeDescription(description)) {
|
|
55
58
|
return refuse('INVALID_SCOPE_DESCRIPTION', `The description of ${scope} is one line of 1 to ${String(SCOPE_DESCRIPTION_MAX_LENGTH)} characters`);
|
|
56
59
|
}
|
|
57
60
|
seen.add(scope);
|
|
@@ -59,6 +62,10 @@ function declaredScopes(namespace, scopes) {
|
|
|
59
62
|
}
|
|
60
63
|
return ok(declared);
|
|
61
64
|
}
|
|
65
|
+
/** Whether the description is one line of 1 to 200 characters, as every scope's is (decision 0046). */
|
|
66
|
+
export function isScopeDescription(description) {
|
|
67
|
+
return description.trim() !== '' && !description.includes('\n') && description.length <= SCOPE_DESCRIPTION_MAX_LENGTH;
|
|
68
|
+
}
|
|
62
69
|
/**
|
|
63
70
|
* The namespace goes with its retiring declarer (decision 0046): each active
|
|
64
71
|
* ship that holds any of its scopes loses them, keeping its other scopes, one
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scope-namespace.js","sourceRoot":"","sources":["../../../src/domain/registry/scope-namespace.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,4BAA4B,EAC5B,kBAAkB,EAClB,uBAAuB,GAIxB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AA2BtD;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAC3B,KAAmJ,EACnJ,
|
|
1
|
+
{"version":3,"file":"scope-namespace.js","sourceRoot":"","sources":["../../../src/domain/registry/scope-namespace.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,4BAA4B,EAC5B,kBAAkB,EAClB,uBAAuB,GAIxB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AA2BtD;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAC3B,KAAmJ,EACnJ,KASC;IAED,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IAC1D,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;QAC7C,OAAO,MAAM,CAAC,eAAe,EAAE,GAAG,SAAS,wGAAwG,CAAC,CAAC;IACvJ,CAAC;IACD,IAAI,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC;QAC/B,OAAO,MAAM,CAAC,gBAAgB,EAAE,GAAG,SAAS,sDAAsD,CAAC,CAAC;IACtG,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,oBAAoB,EAAE,CAAC;QAC/C,OAAO,MAAM,CAAC,iBAAiB,EAAE,2BAA2B,MAAM,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACrG,CAAC;IACD,MAAM,MAAM,GAAG,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACvD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACjB,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;QACxB,OAAO,MAAM,CAAC,iBAAiB,EAAE,iBAAiB,SAAS,yBAAyB,CAAC,CAAC;IACxF,CAAC;IACD,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC/E,OAAO,MAAM,CAAC,iBAAiB,EAAE,iBAAiB,SAAS,iBAAiB,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;IAC1G,CAAC;IACD,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,IAAI,KAAK,CAAC,UAAU,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QAC/E,OAAO,MAAM,CAAC,kBAAkB,EAAE,oCAAoC,KAAK,CAAC,UAAU,CAAC,SAAS,iCAAiC,CAAC,CAAC;IACrI,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,GAAG,CAAS,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACrE,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;IACnE,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,OAAO,MAAM,CAAC,YAAY,EAAE,cAAc,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IACjG,CAAC;IACD,MAAM,QAAQ,GAAmB,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;IACpG,OAAO,EAAE,CAAC;QACR,SAAS,EAAE,QAAQ;QACnB,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;KAC/I,CAAC,CAAC;AACL,CAAC;AAED,2FAA2F;AAC3F,SAAS,cAAc,CACrB,SAAiB,EACjB,MAAyD;IAEzD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,QAAQ,GAAoB,EAAE,CAAC;IACrC,KAAK,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,MAAM,EAAE,CAAC;QAC5C,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,SAAS,GAAG,CAAC,EAAE,CAAC;YAC1E,OAAO,MAAM,CAAC,eAAe,EAAE,GAAG,KAAK,mBAAmB,SAAS,KAAK,SAAS,WAAW,CAAC,CAAC;QAChG,CAAC;QACD,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACpB,OAAO,MAAM,CAAC,eAAe,EAAE,GAAG,KAAK,oBAAoB,CAAC,CAAC;QAC/D,CAAC;QACD,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,CAAC;YACrC,OAAO,MAAM,CAAC,2BAA2B,EAAE,sBAAsB,KAAK,wBAAwB,MAAM,CAAC,4BAA4B,CAAC,aAAa,CAAC,CAAC;QACnJ,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAChB,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,EAAE,CAAC,QAAQ,CAAC,CAAC;AACtB,CAAC;AAED,uGAAuG;AACvG,MAAM,UAAU,kBAAkB,CAAC,WAAmB;IACpD,OAAO,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,MAAM,IAAI,4BAA4B,CAAC;AACxH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,SAAyB,EAAE,EAAwD;IACrH,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC,SAAS,GAAG,CAAC,CAAC;IACrF,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,SAAS,CAAC,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;IACjH,OAAO;QACL,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;QACzG,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,IAAI,EAAE,eAAe;YACrB,UAAU,EAAE,EAAE,CAAC,EAAE;YACjB,KAAK,EAAE,EAAE,CAAC,KAAK;YACf,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;SAC7E,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC"}
|
|
@@ -4,23 +4,26 @@ import { type DomainError } from '../shared/errors.js';
|
|
|
4
4
|
import { type EventLog } from '../shared/events.js';
|
|
5
5
|
import { type Result } from '../shared/result.js';
|
|
6
6
|
import type { UnitOfWork } from '../shared/unit-of-work.js';
|
|
7
|
-
import { type FleetLimits, type FleetLimitSetting } from './limits.js';
|
|
7
|
+
import { type FleetLimits, type FleetLimitSetting, type RetentionSetting } from './limits.js';
|
|
8
8
|
import type { FleetRepository, InstallationSettingsRepository } from './ports.js';
|
|
9
9
|
export interface SetFleetLimitsTx {
|
|
10
10
|
fleets: FleetRepository;
|
|
11
11
|
installationSettings: InstallationSettingsRepository;
|
|
12
12
|
events: EventLog;
|
|
13
13
|
}
|
|
14
|
-
export type SetFleetLimitsRefusal = DomainError<'FLEET_NOT_FOUND' | 'INVALID_LIMIT'>;
|
|
14
|
+
export type SetFleetLimitsRefusal = DomainError<'FLEET_NOT_FOUND' | 'INVALID_LIMIT' | 'INVALID_RETENTION'>;
|
|
15
15
|
export type SetFleetLimits = (input: {
|
|
16
16
|
fleetId: FleetId;
|
|
17
17
|
ships?: FleetLimitSetting;
|
|
18
18
|
dailyMessages?: FleetLimitSetting;
|
|
19
|
+
schedulesPerShip?: FleetLimitSetting;
|
|
20
|
+
minimumScheduleInterval?: FleetLimitSetting;
|
|
21
|
+
retention?: RetentionSetting;
|
|
19
22
|
}) => Promise<Result<FleetLimits, SetFleetLimitsRefusal>>;
|
|
20
23
|
/**
|
|
21
|
-
* Use case: the installation sets
|
|
22
|
-
* number or to
|
|
23
|
-
* A
|
|
24
|
+
* Use case: the installation sets some or all of a fleet's limits and its
|
|
25
|
+
* retention, each to a number or to none for that fleet, or back to the
|
|
26
|
+
* installation default. A setting left out keeps how it was set. Writes FleetLimitsChanged with the
|
|
24
27
|
* settings the fleet now has, and answers which limits now apply.
|
|
25
28
|
*/
|
|
26
29
|
export declare function createSetFleetLimits(deps: {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { refuse } from '../shared/errors.js';
|
|
2
2
|
import { recordEvent, SYSTEM } from '../shared/events.js';
|
|
3
3
|
import { ok } from '../shared/result.js';
|
|
4
|
-
import { fleetLimitsOf, limit } from './limits.js';
|
|
4
|
+
import { fleetLimitsOf, limit, retentionDays } from './limits.js';
|
|
5
5
|
/** A setting with its limit checked: the default, or a whole number of at least 0 or no limit. */
|
|
6
6
|
function validSetting(setting) {
|
|
7
7
|
if (setting?.kind !== 'fleet') {
|
|
@@ -10,10 +10,18 @@ function validSetting(setting) {
|
|
|
10
10
|
const checked = limit(setting.limit);
|
|
11
11
|
return checked.isOk ? ok({ kind: 'fleet', limit: checked.value }) : checked;
|
|
12
12
|
}
|
|
13
|
+
/** A retention setting with its days checked: the default, or a whole number of days of at least 1 or none. */
|
|
14
|
+
function validRetention(setting) {
|
|
15
|
+
if (setting?.kind !== 'fleet') {
|
|
16
|
+
return ok(setting);
|
|
17
|
+
}
|
|
18
|
+
const checked = retentionDays(setting.days);
|
|
19
|
+
return checked.isOk ? ok({ kind: 'fleet', days: checked.value }) : checked;
|
|
20
|
+
}
|
|
13
21
|
/**
|
|
14
|
-
* Use case: the installation sets
|
|
15
|
-
* number or to
|
|
16
|
-
* A
|
|
22
|
+
* Use case: the installation sets some or all of a fleet's limits and its
|
|
23
|
+
* retention, each to a number or to none for that fleet, or back to the
|
|
24
|
+
* installation default. A setting left out keeps how it was set. Writes FleetLimitsChanged with the
|
|
17
25
|
* settings the fleet now has, and answers which limits now apply.
|
|
18
26
|
*/
|
|
19
27
|
export function createSetFleetLimits(deps) {
|
|
@@ -26,25 +34,49 @@ export function createSetFleetLimits(deps) {
|
|
|
26
34
|
if (!dailyMessages.isOk) {
|
|
27
35
|
return dailyMessages;
|
|
28
36
|
}
|
|
37
|
+
const schedulesPerShip = validSetting(input.schedulesPerShip);
|
|
38
|
+
if (!schedulesPerShip.isOk) {
|
|
39
|
+
return schedulesPerShip;
|
|
40
|
+
}
|
|
41
|
+
const minimumScheduleInterval = validSetting(input.minimumScheduleInterval);
|
|
42
|
+
if (!minimumScheduleInterval.isOk) {
|
|
43
|
+
return minimumScheduleInterval;
|
|
44
|
+
}
|
|
45
|
+
const retention = validRetention(input.retention);
|
|
46
|
+
if (!retention.isOk) {
|
|
47
|
+
return retention;
|
|
48
|
+
}
|
|
29
49
|
return deps.uow.run(async (tx) => {
|
|
30
50
|
const { fleetId } = input;
|
|
31
51
|
const current = await tx.fleets.limitSettings(fleetId);
|
|
32
52
|
if (!current) {
|
|
33
53
|
return refuse('FLEET_NOT_FOUND', `The installation hosts no fleet ${fleetId}`);
|
|
34
54
|
}
|
|
35
|
-
const settings = {
|
|
55
|
+
const settings = {
|
|
56
|
+
ships: ships.value ?? current.ships,
|
|
57
|
+
dailyMessages: dailyMessages.value ?? current.dailyMessages,
|
|
58
|
+
schedulesPerShip: schedulesPerShip.value ?? current.schedulesPerShip,
|
|
59
|
+
minimumScheduleInterval: minimumScheduleInterval.value ?? current.minimumScheduleInterval,
|
|
60
|
+
retention: retention.value ?? current.retention,
|
|
61
|
+
};
|
|
36
62
|
await tx.fleets.setLimitSettings(fleetId, settings);
|
|
37
63
|
await recordEvent({ events: tx.events, ids: deps.ids }, {
|
|
38
64
|
fleetId,
|
|
39
65
|
type: 'FleetLimitsChanged',
|
|
40
66
|
occurredAt: deps.clock.now(),
|
|
41
67
|
actor: SYSTEM,
|
|
42
|
-
// Event details are flat: each
|
|
68
|
+
// Event details are flat: each setting, and its own limit or days when set for the fleet.
|
|
43
69
|
details: {
|
|
44
70
|
ships: settings.ships.kind,
|
|
45
71
|
shipLimit: settings.ships.kind === 'fleet' ? settings.ships.limit : null,
|
|
46
72
|
dailyMessages: settings.dailyMessages.kind,
|
|
47
73
|
dailyMessageLimit: settings.dailyMessages.kind === 'fleet' ? settings.dailyMessages.limit : null,
|
|
74
|
+
schedulesPerShip: settings.schedulesPerShip.kind,
|
|
75
|
+
schedulesPerShipLimit: settings.schedulesPerShip.kind === 'fleet' ? settings.schedulesPerShip.limit : null,
|
|
76
|
+
minimumScheduleInterval: settings.minimumScheduleInterval.kind,
|
|
77
|
+
minimumScheduleIntervalLimit: settings.minimumScheduleInterval.kind === 'fleet' ? settings.minimumScheduleInterval.limit : null,
|
|
78
|
+
retention: settings.retention.kind,
|
|
79
|
+
retentionDays: settings.retention.kind === 'fleet' ? settings.retention.days : null,
|
|
48
80
|
},
|
|
49
81
|
});
|
|
50
82
|
return ok(fleetLimitsOf({ fleetId, settings, installation: await tx.installationSettings.read() }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set-fleet-limits.js","sourceRoot":"","sources":["../../../src/domain/registry/set-fleet-limits.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,EAAiB,MAAM,qBAAqB,CAAC;AACzE,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,aAAa,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"set-fleet-limits.js","sourceRoot":"","sources":["../../../src/domain/registry/set-fleet-limits.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,11 +6,11 @@ import type { InstallationSettingsRepository } from './ports.js';
|
|
|
6
6
|
export interface SetInstallationSettingsTx {
|
|
7
7
|
installationSettings: InstallationSettingsRepository;
|
|
8
8
|
}
|
|
9
|
-
export type SetInstallationSettings = (input: InstallationSettings) => Promise<Result<InstallationSettings, DomainError<'INVALID_LIMIT'>>>;
|
|
9
|
+
export type SetInstallationSettings = (input: InstallationSettings) => Promise<Result<InstallationSettings, DomainError<'INVALID_LIMIT' | 'INVALID_RETENTION'>>>;
|
|
10
10
|
/**
|
|
11
|
-
* Use case: the installation sets its default ship
|
|
12
|
-
*
|
|
13
|
-
* default applies at once to every fleet that follows it. No fleet's event
|
|
11
|
+
* Use case: the installation sets its default ship, daily message and
|
|
12
|
+
* schedule limits and its default retention for fleets and its cap on
|
|
13
|
+
* fleets, each a number or none. A change to a default applies at once to every fleet that follows it. No fleet's event
|
|
14
14
|
* log holds it: the installation's settings belong to no fleet.
|
|
15
15
|
*/
|
|
16
16
|
export declare function createSetInstallationSettings(deps: {
|
|
@@ -1,26 +1,32 @@
|
|
|
1
1
|
import { ok } from '../shared/result.js';
|
|
2
|
-
import { limit } from './limits.js';
|
|
2
|
+
import { limit, retentionDays } from './limits.js';
|
|
3
3
|
/**
|
|
4
|
-
* Use case: the installation sets its default ship
|
|
5
|
-
*
|
|
6
|
-
* default applies at once to every fleet that follows it. No fleet's event
|
|
4
|
+
* Use case: the installation sets its default ship, daily message and
|
|
5
|
+
* schedule limits and its default retention for fleets and its cap on
|
|
6
|
+
* fleets, each a number or none. A change to a default applies at once to every fleet that follows it. No fleet's event
|
|
7
7
|
* log holds it: the installation's settings belong to no fleet.
|
|
8
8
|
*/
|
|
9
9
|
export function createSetInstallationSettings(deps) {
|
|
10
10
|
return async (input) => {
|
|
11
|
-
const defaultShipLimit =
|
|
12
|
-
const defaultDailyMessageLimit
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
11
|
+
const { defaultShipLimit, defaultDailyMessageLimit, defaultSchedulesPerShipLimit, defaultMinimumScheduleInterval, defaultRetentionDays, fleetCap } = input;
|
|
12
|
+
for (const value of [defaultShipLimit, defaultDailyMessageLimit, defaultSchedulesPerShipLimit, defaultMinimumScheduleInterval, fleetCap]) {
|
|
13
|
+
const checked = limit(value);
|
|
14
|
+
if (!checked.isOk) {
|
|
15
|
+
return checked;
|
|
16
|
+
}
|
|
16
17
|
}
|
|
17
|
-
|
|
18
|
-
|
|
18
|
+
const retention = retentionDays(defaultRetentionDays);
|
|
19
|
+
if (!retention.isOk) {
|
|
20
|
+
return retention;
|
|
19
21
|
}
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
const settings = {
|
|
23
|
+
defaultShipLimit,
|
|
24
|
+
defaultDailyMessageLimit,
|
|
25
|
+
defaultSchedulesPerShipLimit,
|
|
26
|
+
defaultMinimumScheduleInterval,
|
|
27
|
+
defaultRetentionDays,
|
|
28
|
+
fleetCap,
|
|
29
|
+
};
|
|
24
30
|
await deps.uow.run(async (tx) => {
|
|
25
31
|
await tx.installationSettings.write(settings);
|
|
26
32
|
return ok(undefined);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set-installation-settings.js","sourceRoot":"","sources":["../../../src/domain/registry/set-installation-settings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,KAAK,EAA6B,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"set-installation-settings.js","sourceRoot":"","sources":["../../../src/domain/registry/set-installation-settings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,KAAK,EAAE,aAAa,EAA6B,MAAM,aAAa,CAAC;AAS9E;;;;;GAKG;AACH,MAAM,UAAU,6BAA6B,CAAC,IAAoD;IAChG,OAAO,KAAK,EAAE,KAAK,EAAE,EAAE;QACrB,MAAM,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,4BAA4B,EAAE,8BAA8B,EAAE,oBAAoB,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;QAC3J,KAAK,MAAM,KAAK,IAAI,CAAC,gBAAgB,EAAE,wBAAwB,EAAE,4BAA4B,EAAE,8BAA8B,EAAE,QAAQ,CAAC,EAAE,CAAC;YACzI,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;YAC7B,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBAClB,OAAO,OAAO,CAAC;YACjB,CAAC;QACH,CAAC;QACD,MAAM,SAAS,GAAG,aAAa,CAAC,oBAAoB,CAAC,CAAC;QACtD,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;YACpB,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,QAAQ,GAAyB;YACrC,gBAAgB;YAChB,wBAAwB;YACxB,4BAA4B;YAC5B,8BAA8B;YAC9B,oBAAoB;YACpB,QAAQ;SACT,CAAC;QACF,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;YAC9B,MAAM,EAAE,CAAC,oBAAoB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC9C,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,CAAC,QAAQ,CAAC,CAAC;IACtB,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -157,6 +157,8 @@ export declare function commissionShip(input: {
|
|
|
157
157
|
namespace: ScopeNamespace;
|
|
158
158
|
declarerName: string;
|
|
159
159
|
}>;
|
|
160
|
+
/** Which of the scopes the fleet defined as its own (design gateway-scopes, 4.1). */
|
|
161
|
+
defined: ReadonlySet<ScopeName>;
|
|
160
162
|
}): Result<{
|
|
161
163
|
ship: Ship;
|
|
162
164
|
events: NewEvent[];
|
|
@@ -124,7 +124,7 @@ export function commissionShip(input, fleet) {
|
|
|
124
124
|
const granter = { shipId: commissioningShip?.id ?? null, isOperator: commissioningShip?.kind === 'operator', scopes: held };
|
|
125
125
|
// Every ship has the agent scopes, so naming one grants nothing.
|
|
126
126
|
for (const scope of asked.filter((each) => !AGENT_SCOPES.some((agentScope) => agentScope === each))) {
|
|
127
|
-
const allowed = mayGrant(scope, { granter, namespaces: fleet.namespaces });
|
|
127
|
+
const allowed = mayGrant(scope, { granter, namespaces: fleet.namespaces, defined: fleet.defined });
|
|
128
128
|
if (!allowed.isOk) {
|
|
129
129
|
return allowed;
|
|
130
130
|
}
|