@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,98 @@
|
|
|
1
|
+
import { appliedLimits } from '../registry/public.js';
|
|
2
|
+
import { recordEvent, SYSTEM } from './events.js';
|
|
3
|
+
import { isFinished, pruningCutoff } from './history-pruning.js';
|
|
4
|
+
import { ok } from './result.js';
|
|
5
|
+
const HOUR_MS = 60 * 60 * 1000;
|
|
6
|
+
/** How many messages, and how many rows of each other kind, one batch reads at most: each batch stays one short transaction. */
|
|
7
|
+
export const PRUNE_BATCH = 500;
|
|
8
|
+
/** How long one fleet's pass prunes before it leaves the rest to the next hour (R8). */
|
|
9
|
+
export const PRUNE_BUDGET_MS = 10_000;
|
|
10
|
+
/**
|
|
11
|
+
* Use case: the pruning pass (docs/design/retention/retention.md, R2 to R4,
|
|
12
|
+
* R6 to R9, R12, R13 and R16), run by core in the 30 second pass after the
|
|
13
|
+
* snapshot close, never through the API. A fleet with a retention whose last pass is an
|
|
14
|
+
* hour old or more is claimed for this hour, then pruned in batches, each one
|
|
15
|
+
* unit of work under the fleet's prune lock taken with try: a batch picks the
|
|
16
|
+
* finished messages older than the cutoff, the mic and participant events of
|
|
17
|
+
* meetings ended before it, and the rows that go by age past it (a crew's
|
|
18
|
+
* session and secret events, ended leases, invalidated secrets, ended or
|
|
19
|
+
* expired console sessions, used or expired sign-in tickets and reach refusals), makes that
|
|
20
|
+
* one set go and writes HistoryPruned. A batch that fails rolls back whole; a fleet another server
|
|
21
|
+
* is pruning is skipped. Once nothing older than the cutoff is left, the
|
|
22
|
+
* fleet's kept from moves to the cutoff; a pass whose time budget is spent
|
|
23
|
+
* leaves the rest to the next hour.
|
|
24
|
+
*/
|
|
25
|
+
export function createPruneHistory(deps) {
|
|
26
|
+
const batchSize = deps.batch ?? PRUNE_BATCH;
|
|
27
|
+
const budgetMs = deps.budgetMs ?? PRUNE_BUDGET_MS;
|
|
28
|
+
const claim = (fleetId) => deps.uow.run(async (tx) => {
|
|
29
|
+
const retentionDays = (await appliedLimits(tx, fleetId)).retention;
|
|
30
|
+
const newestSnapshotHour = await tx.historyPruner.newestSnapshotHour(fleetId);
|
|
31
|
+
if (retentionDays === null || newestSnapshotHour === undefined) {
|
|
32
|
+
return ok(null);
|
|
33
|
+
}
|
|
34
|
+
const now = deps.clock.now();
|
|
35
|
+
if (!(await tx.historyPruner.claimPass(fleetId, { at: now, dueBefore: new Date(now.getTime() - HOUR_MS) }))) {
|
|
36
|
+
return ok(null);
|
|
37
|
+
}
|
|
38
|
+
return ok(pruningCutoff({ now, retentionDays, newestSnapshotHour }));
|
|
39
|
+
});
|
|
40
|
+
const pruneBatch = (fleetId, input) => deps.uow.run(async (tx) => {
|
|
41
|
+
const pruner = tx.historyPruner;
|
|
42
|
+
if (!(await pruner.tryLock(fleetId))) {
|
|
43
|
+
return ok({ kind: 'skipped' });
|
|
44
|
+
}
|
|
45
|
+
const [candidates, meetingEventIds] = await Promise.all([
|
|
46
|
+
pruner.candidates(fleetId, { cutoff: input.cutoff, after: input.after, limit: batchSize }),
|
|
47
|
+
pruner.meetingEvents(fleetId, { cutoff: input.cutoff, limit: batchSize }),
|
|
48
|
+
]);
|
|
49
|
+
const messageIds = candidates.filter(isFinished).map((candidate) => candidate.id);
|
|
50
|
+
const aged = await pruner.agedRows(fleetId, { cutoff: input.cutoff, messageIds, limit: batchSize });
|
|
51
|
+
const agedKinds = [aged.eventIds, aged.leaseIds, aged.credentialIds, aged.consoleSessionIds, aged.signInTicketHashes, aged.reachRefusalIds];
|
|
52
|
+
if (messageIds.length > 0 || meetingEventIds.length > 0 || agedKinds.some((rows) => rows.length > 0)) {
|
|
53
|
+
const counts = await pruner.go(fleetId, { messageIds, meetingEventIds, ...aged });
|
|
54
|
+
await recordEvent({ events: tx.events, ids: deps.ids }, { fleetId, type: 'HistoryPruned', occurredAt: deps.clock.now(), actor: SYSTEM, details: { cutoff: input.cutoff.toISOString(), ...counts } });
|
|
55
|
+
}
|
|
56
|
+
const last = candidates.at(-1);
|
|
57
|
+
const isMoreLeft = candidates.length === batchSize || meetingEventIds.length === batchSize || agedKinds.some((rows) => rows.length === batchSize);
|
|
58
|
+
return ok(isMoreLeft ? { kind: 'more', after: last === undefined ? input.after : { createdAt: last.createdAt, id: last.id } } : { kind: 'done' });
|
|
59
|
+
});
|
|
60
|
+
const pruneFleet = async (fleetId) => {
|
|
61
|
+
const claimed = await claim(fleetId);
|
|
62
|
+
const cutoff = claimed.isOk ? claimed.value : null;
|
|
63
|
+
if (cutoff === null) {
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
const startedAt = deps.clock.now().getTime();
|
|
67
|
+
let after = null;
|
|
68
|
+
for (;;) {
|
|
69
|
+
const result = await pruneBatch(fleetId, { cutoff, after });
|
|
70
|
+
const batch = result.isOk ? result.value : { kind: 'skipped' };
|
|
71
|
+
if (batch.kind === 'skipped') {
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
if (batch.kind === 'done') {
|
|
75
|
+
await deps.uow.run(async (tx) => {
|
|
76
|
+
await tx.historyPruner.keepFrom(fleetId, cutoff);
|
|
77
|
+
return ok(undefined);
|
|
78
|
+
});
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
if (deps.clock.now().getTime() - startedAt >= budgetMs) {
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
after = batch.after;
|
|
85
|
+
}
|
|
86
|
+
};
|
|
87
|
+
return async (onFleetError) => {
|
|
88
|
+
for (const fleet of await deps.fleets.list()) {
|
|
89
|
+
try {
|
|
90
|
+
await pruneFleet(fleet.id);
|
|
91
|
+
}
|
|
92
|
+
catch (error) {
|
|
93
|
+
onFleetError?.(fleet.id, error);
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
};
|
|
97
|
+
}
|
|
98
|
+
//# sourceMappingURL=prune-history.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prune-history.js","sourceRoot":"","sources":["../../../src/domain/shared/prune-history.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,15 +3,18 @@ import type { Caller } from './caller.js';
|
|
|
3
3
|
import type { Clock } from './clock.js';
|
|
4
4
|
/** Outbound port: what a fleet's limits apply to, read outside a unit of work. */
|
|
5
5
|
export interface FleetLimitReads {
|
|
6
|
-
/** The ship and daily message limits that apply to the fleet now; null where none does. */
|
|
6
|
+
/** The ship and daily message limits and the retention in days that apply to the fleet now; null where none does. */
|
|
7
7
|
applied(fleetId: FleetId): Promise<{
|
|
8
8
|
ships: number | null;
|
|
9
9
|
dailyMessages: number | null;
|
|
10
|
+
retention: number | null;
|
|
10
11
|
}>;
|
|
11
12
|
/** Its ships that are not retired, argo included. */
|
|
12
13
|
activeShips(fleetId: FleetId): Promise<number>;
|
|
13
14
|
/** The messages it stored on the UTC day that starts at `day`, of any kind and from any sender. */
|
|
14
15
|
messagesOn(fleetId: FleetId, day: Date): Promise<number>;
|
|
16
|
+
/** Where its finished history begins: the cutoff its last finished pruning pass reached; null while no pass finished. */
|
|
17
|
+
keptFrom(fleetId: FleetId): Promise<Date | null>;
|
|
15
18
|
}
|
|
16
19
|
export interface FleetLimitsRead {
|
|
17
20
|
ships: {
|
|
@@ -23,15 +26,22 @@ export interface FleetLimitsRead {
|
|
|
23
26
|
count: number;
|
|
24
27
|
resetsAt: Date;
|
|
25
28
|
};
|
|
29
|
+
/** The days the fleet keeps its finished history, null: kept for good; and where its kept history begins, null while nothing was pruned. */
|
|
30
|
+
retention: {
|
|
31
|
+
days: number | null;
|
|
32
|
+
keptFrom: Date | null;
|
|
33
|
+
};
|
|
26
34
|
}
|
|
27
35
|
export type ReadFleetLimits = (caller: Caller) => Promise<FleetLimitsRead>;
|
|
28
36
|
/**
|
|
29
37
|
* Use case: the caller's fleet's ship and daily message limits, with what
|
|
30
38
|
* each counts by the same measures the limits are enforced by: its ships that
|
|
31
39
|
* are not retired, argo included, and the messages it stored since 00:00 UTC,
|
|
32
|
-
* which count again from the next 00:00 UTC
|
|
33
|
-
*
|
|
34
|
-
*
|
|
40
|
+
* which count again from the next 00:00 UTC; and its retention, so every
|
|
41
|
+
* fleet manager sees how long the fleet keeps its finished history and where
|
|
42
|
+
* it begins (the timeline, the thread and Health say so). The
|
|
43
|
+
* console shows from it when the fleet is at a limit. The caller's scope
|
|
44
|
+
* (fleet:read) is checked before this runs.
|
|
35
45
|
*/
|
|
36
46
|
export declare function createReadFleetLimits(deps: {
|
|
37
47
|
limits: FleetLimitReads;
|
|
@@ -3,21 +3,25 @@ import { nextUtcDayStart, utcDayStart } from './utc-day.js';
|
|
|
3
3
|
* Use case: the caller's fleet's ship and daily message limits, with what
|
|
4
4
|
* each counts by the same measures the limits are enforced by: its ships that
|
|
5
5
|
* are not retired, argo included, and the messages it stored since 00:00 UTC,
|
|
6
|
-
* which count again from the next 00:00 UTC
|
|
7
|
-
*
|
|
8
|
-
*
|
|
6
|
+
* which count again from the next 00:00 UTC; and its retention, so every
|
|
7
|
+
* fleet manager sees how long the fleet keeps its finished history and where
|
|
8
|
+
* it begins (the timeline, the thread and Health say so). The
|
|
9
|
+
* console shows from it when the fleet is at a limit. The caller's scope
|
|
10
|
+
* (fleet:read) is checked before this runs.
|
|
9
11
|
*/
|
|
10
12
|
export function createReadFleetLimits(deps) {
|
|
11
13
|
return async ({ fleetId }) => {
|
|
12
14
|
const now = deps.clock.now();
|
|
13
|
-
const [applied, ships, messages] = await Promise.all([
|
|
15
|
+
const [applied, ships, messages, keptFrom] = await Promise.all([
|
|
14
16
|
deps.limits.applied(fleetId),
|
|
15
17
|
deps.limits.activeShips(fleetId),
|
|
16
18
|
deps.limits.messagesOn(fleetId, utcDayStart(now)),
|
|
19
|
+
deps.limits.keptFrom(fleetId),
|
|
17
20
|
]);
|
|
18
21
|
return {
|
|
19
22
|
ships: { limit: applied.ships, count: ships },
|
|
20
23
|
dailyMessages: { limit: applied.dailyMessages, count: messages, resetsAt: nextUtcDayStart(now) },
|
|
24
|
+
retention: { days: applied.retention, keptFrom },
|
|
21
25
|
};
|
|
22
26
|
};
|
|
23
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-fleet-limits.js","sourceRoot":"","sources":["../../../src/domain/shared/read-fleet-limits.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"read-fleet-limits.js","sourceRoot":"","sources":["../../../src/domain/shared/read-fleet-limits.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAuB5D;;;;;;;;;GASG;AACH,MAAM,UAAU,qBAAqB,CAAC,IAA+C;IACnF,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC7D,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;YAC5B,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC;YAChC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;YACjD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;SAC9B,CAAC,CAAC;QACH,OAAO;YACL,KAAK,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE;YAC7C,aAAa,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,CAAC,GAAG,CAAC,EAAE;YAChG,SAAS,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE;SACjD,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { type DeliveryId, type DeliveryState, type MessageId } from '@aeolus-fleet/common';
|
|
2
|
+
import type { Caller } from './caller.js';
|
|
3
|
+
import { type DomainError } from './errors.js';
|
|
4
|
+
import { type ReadReachOf } from '../registry/public.js';
|
|
5
|
+
import { type HistoryParty, type ShipHistory } from './history.js';
|
|
6
|
+
import type { Page } from './page.js';
|
|
7
|
+
import { type Result } from './result.js';
|
|
8
|
+
/** One delivery of a message: the ship it went to or that claimed it (null while none has), its state and since when. */
|
|
9
|
+
export interface ListedDelivery {
|
|
10
|
+
id: DeliveryId;
|
|
11
|
+
ship: HistoryParty | null;
|
|
12
|
+
state: DeliveryState;
|
|
13
|
+
since: Date;
|
|
14
|
+
}
|
|
15
|
+
export type ReadMessageDeliveries = (caller: Caller, input: {
|
|
16
|
+
messageId: MessageId;
|
|
17
|
+
cursor?: DeliveryId;
|
|
18
|
+
limit?: number;
|
|
19
|
+
}) => Promise<Result<Page<ListedDelivery, DeliveryId>, DomainError<'MESSAGE_NOT_FOUND'>>>;
|
|
20
|
+
/**
|
|
21
|
+
* Use case: a page of the deliveries of one message of the caller's fleet, by
|
|
22
|
+
* id, each with its ship and where it stands: one for a ship or a type, one
|
|
23
|
+
* per ship for a label (decision 0065). A message outside the caller's read
|
|
24
|
+
* reach is answered as none, as reading the message is (decision 0034). The
|
|
25
|
+
* caller's scope (fleet:read) is checked before this runs.
|
|
26
|
+
*/
|
|
27
|
+
export declare function createReadMessageDeliveries(deps: {
|
|
28
|
+
history: ShipHistory;
|
|
29
|
+
readReach: ReadReachOf;
|
|
30
|
+
}): ReadMessageDeliveries;
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { PAGE_SIZE_DEFAULT } from '@aeolus-fleet/common';
|
|
2
|
+
import { deliverySinceOf } from './delivery-way.js';
|
|
3
|
+
import { refuse } from './errors.js';
|
|
4
|
+
import { readsMessage } from '../registry/public.js';
|
|
5
|
+
import { partiesOf } from './history.js';
|
|
6
|
+
import { ok } from './result.js';
|
|
7
|
+
/**
|
|
8
|
+
* Use case: a page of the deliveries of one message of the caller's fleet, by
|
|
9
|
+
* id, each with its ship and where it stands: one for a ship or a type, one
|
|
10
|
+
* per ship for a label (decision 0065). A message outside the caller's read
|
|
11
|
+
* reach is answered as none, as reading the message is (decision 0034). The
|
|
12
|
+
* caller's scope (fleet:read) is checked before this runs.
|
|
13
|
+
*/
|
|
14
|
+
export function createReadMessageDeliveries(deps) {
|
|
15
|
+
return async (caller, { messageId, cursor, limit = PAGE_SIZE_DEFAULT }) => {
|
|
16
|
+
const found = await deps.history.message(caller.fleetId, messageId);
|
|
17
|
+
if (!found || !readsMessage(await deps.readReach(caller), partiesOf(found, found.delivery.claimedBy))) {
|
|
18
|
+
return refuse('MESSAGE_NOT_FOUND', `No message ${messageId} in this fleet`);
|
|
19
|
+
}
|
|
20
|
+
const page = await deps.history.messageDeliveries(caller.fleetId, { messageId, cursor, limit });
|
|
21
|
+
return ok({ items: page.items.map(({ id, ship, state, steps }) => ({ id, ship, state, since: deliverySinceOf(steps) })), nextCursor: page.nextCursor });
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=read-message-deliveries.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"read-message-deliveries.js","sourceRoot":"","sources":["../../../src/domain/shared/read-message-deliveries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAuD,MAAM,sBAAsB,CAAC;AAG9G,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAoB,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,YAAY,EAAoB,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,SAAS,EAAuC,MAAM,cAAc,CAAC;AAE9E,OAAO,EAAE,EAAE,EAAe,MAAM,aAAa,CAAC;AAe9C;;;;;;GAMG;AACH,MAAM,UAAU,2BAA2B,CAAC,IAAsD;IAChG,OAAO,KAAK,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,GAAG,iBAAiB,EAAE,EAAE,EAAE;QACxE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACpE,IAAI,CAAC,KAAK,IAAI,CAAC,YAAY,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;YACtG,OAAO,MAAM,CAAC,mBAAmB,EAAE,cAAc,SAAS,gBAAgB,CAAC,CAAC;QAC9E,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAChG,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IAC1J,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -11,6 +11,8 @@ export type MessageDetail = HistoryMessage & {
|
|
|
11
11
|
way: DeliveryWay;
|
|
12
12
|
history: DeliveryChange[];
|
|
13
13
|
};
|
|
14
|
+
/** How many deliveries it has: one per ship for a label (decision 0065). */
|
|
15
|
+
deliveryCount: number;
|
|
14
16
|
};
|
|
15
17
|
export type ReadMessage = (caller: Caller, input: {
|
|
16
18
|
messageId: MessageId;
|
|
@@ -19,7 +21,8 @@ export type ReadMessage = (caller: Caller, input: {
|
|
|
19
21
|
* Use case: one message of the caller's fleet: its envelope, its whole
|
|
20
22
|
* payload, its replies, and its delivery's way through: who holds it, since
|
|
21
23
|
* when, the clocks that speak for it and every step newest first, from the
|
|
22
|
-
* event log
|
|
24
|
+
* event log; and how many deliveries it has, one per ship for a label
|
|
25
|
+
* (decision 0065). A message outside the caller's read reach is answered as none,
|
|
23
26
|
* so its existence does not show (decision 0034). The caller's scope
|
|
24
27
|
* (fleet:read) is checked before this runs.
|
|
25
28
|
*/
|
|
@@ -7,7 +7,8 @@ import { ok } from './result.js';
|
|
|
7
7
|
* Use case: one message of the caller's fleet: its envelope, its whole
|
|
8
8
|
* payload, its replies, and its delivery's way through: who holds it, since
|
|
9
9
|
* when, the clocks that speak for it and every step newest first, from the
|
|
10
|
-
* event log
|
|
10
|
+
* event log; and how many deliveries it has, one per ship for a label
|
|
11
|
+
* (decision 0065). A message outside the caller's read reach is answered as none,
|
|
11
12
|
* so its existence does not show (decision 0034). The caller's scope
|
|
12
13
|
* (fleet:read) is checked before this runs.
|
|
13
14
|
*/
|
|
@@ -15,7 +16,7 @@ export function createReadMessage(deps) {
|
|
|
15
16
|
return async (caller, { messageId }) => {
|
|
16
17
|
const found = await deps.history.message(caller.fleetId, messageId);
|
|
17
18
|
if (!found || !readsMessage(await deps.readReach(caller), partiesOf(found, found.delivery.claimedBy))) {
|
|
18
|
-
return refuse('MESSAGE_NOT_FOUND', `No message ${messageId} in this fleet`);
|
|
19
|
+
return refuse('MESSAGE_NOT_FOUND', `No message ${messageId} in this fleet, or it is no longer kept`);
|
|
19
20
|
}
|
|
20
21
|
const { history, replies, lease, overdue, crew, ...message } = found;
|
|
21
22
|
const way = deliveryWayOf({ state: message.delivery.state, history, lease, overdue, crew });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-message.js","sourceRoot":"","sources":["../../../src/domain/shared/read-message.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAoB,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,aAAa,EAAoB,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAoB,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,SAAS,EAAiF,MAAM,cAAc,CAAC;AACxH,OAAO,EAAE,EAAE,EAAe,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"read-message.js","sourceRoot":"","sources":["../../../src/domain/shared/read-message.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAoB,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,aAAa,EAAoB,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAoB,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,SAAS,EAAiF,MAAM,cAAc,CAAC;AACxH,OAAO,EAAE,EAAE,EAAe,MAAM,aAAa,CAAC;AAc9C;;;;;;;;GAQG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAsD;IACtF,OAAO,KAAK,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE;QACrC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACpE,IAAI,CAAC,KAAK,IAAI,CAAC,YAAY,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;YACtG,OAAO,MAAM,CAAC,mBAAmB,EAAE,cAAc,SAAS,yCAAyC,CAAC,CAAC;QACvG,CAAC;QACD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,OAAO,EAAE,GAAG,KAAK,CAAC;QACrE,MAAM,GAAG,GAAG,aAAa,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5F,OAAO,EAAE,CAAC,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;IACtF,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,19 +1,31 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type DeliveryId, type DeliveryState, type LabelValueId, type MessageId } from '@aeolus-fleet/common';
|
|
2
2
|
import type { ShipCaller } from './caller.js';
|
|
3
3
|
import { type DomainError } from './errors.js';
|
|
4
|
-
import type { HistoryRecipient, ShipHistory } from './history.js';
|
|
4
|
+
import type { HistoryParty, HistoryRecipient, ShipHistory } from './history.js';
|
|
5
5
|
import { type Result } from './result.js';
|
|
6
|
-
/**
|
|
6
|
+
/**
|
|
7
|
+
* A message its sender sent, with where each delivery stands and since when,
|
|
8
|
+
* and its ship: one delivery for a ship or a type, one per ship for a label
|
|
9
|
+
* (decision 0065). No payload.
|
|
10
|
+
*/
|
|
7
11
|
export interface SentMessage {
|
|
8
12
|
messageId: MessageId;
|
|
9
13
|
sentAt: Date;
|
|
10
|
-
recipient:
|
|
11
|
-
|
|
14
|
+
recipient: SentRecipient;
|
|
15
|
+
deliveries: {
|
|
12
16
|
deliveryId: DeliveryId;
|
|
17
|
+
ship: HistoryParty | null;
|
|
13
18
|
state: DeliveryState;
|
|
14
19
|
since: Date;
|
|
15
|
-
};
|
|
20
|
+
}[];
|
|
16
21
|
}
|
|
22
|
+
/** Who the message was addressed to, a label selection by its value ids as sent. */
|
|
23
|
+
export type SentRecipient = Exclude<HistoryRecipient, {
|
|
24
|
+
kind: 'label';
|
|
25
|
+
}> | {
|
|
26
|
+
kind: 'label';
|
|
27
|
+
valueIds: readonly LabelValueId[];
|
|
28
|
+
};
|
|
17
29
|
export type ReadSentMessage = (caller: ShipCaller, input: {
|
|
18
30
|
messageId: MessageId;
|
|
19
31
|
}) => Promise<Result<SentMessage, DomainError<'MESSAGE_NOT_FOUND'>>>;
|
|
@@ -23,7 +35,9 @@ export type ReadSentMessage = (caller: ShipCaller, input: {
|
|
|
23
35
|
* and failed without fleet:read, which reads every payload. Its own message
|
|
24
36
|
* only: one another ship sent is answered as none, argo's reads included, so
|
|
25
37
|
* its existence does not show. Its recipient comes by name or type, which any
|
|
26
|
-
* reader may see (decision 0034)
|
|
38
|
+
* reader may see (decision 0034), and a label selection by its value ids as
|
|
39
|
+
* sent, never their texts, which only fleet:read reads; each delivery names
|
|
40
|
+
* its ship (R9 of decision 0065). No payload comes, not even its own. The
|
|
27
41
|
* caller's scope (messages:send) is checked before this runs.
|
|
28
42
|
*/
|
|
29
43
|
export declare function createReadSentMessage(deps: {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { PAGE_SIZE_MAX } from '@aeolus-fleet/common';
|
|
2
|
+
import { deliverySinceOf } from './delivery-way.js';
|
|
2
3
|
import { refuse } from './errors.js';
|
|
3
4
|
import { ok } from './result.js';
|
|
4
5
|
/**
|
|
@@ -7,21 +8,33 @@ import { ok } from './result.js';
|
|
|
7
8
|
* and failed without fleet:read, which reads every payload. Its own message
|
|
8
9
|
* only: one another ship sent is answered as none, argo's reads included, so
|
|
9
10
|
* its existence does not show. Its recipient comes by name or type, which any
|
|
10
|
-
* reader may see (decision 0034)
|
|
11
|
+
* reader may see (decision 0034), and a label selection by its value ids as
|
|
12
|
+
* sent, never their texts, which only fleet:read reads; each delivery names
|
|
13
|
+
* its ship (R9 of decision 0065). No payload comes, not even its own. The
|
|
11
14
|
* caller's scope (messages:send) is checked before this runs.
|
|
12
15
|
*/
|
|
13
16
|
export function createReadSentMessage(deps) {
|
|
17
|
+
/** Every delivery of the message, read a page at a time in the database: its answer holds them all. */
|
|
18
|
+
const deliveriesOf = async (fleetId, messageId) => {
|
|
19
|
+
const deliveries = [];
|
|
20
|
+
let cursor;
|
|
21
|
+
do {
|
|
22
|
+
const page = await deps.history.messageDeliveries(fleetId, { messageId, cursor, limit: PAGE_SIZE_MAX });
|
|
23
|
+
deliveries.push(...page.items);
|
|
24
|
+
cursor = page.nextCursor ?? undefined;
|
|
25
|
+
} while (cursor !== undefined);
|
|
26
|
+
return deliveries;
|
|
27
|
+
};
|
|
14
28
|
return async (caller, { messageId }) => {
|
|
15
29
|
const found = await deps.history.message(caller.fleetId, messageId);
|
|
16
30
|
if (found?.sender.id !== caller.shipId) {
|
|
17
|
-
return refuse('MESSAGE_NOT_FOUND', `No message ${messageId} in this fleet`);
|
|
31
|
+
return refuse('MESSAGE_NOT_FOUND', `No message ${messageId} in this fleet, or it is no longer kept`);
|
|
18
32
|
}
|
|
19
|
-
const { since } = deliveryWayOf({ state: found.delivery.state, history: found.history, lease: found.lease, overdue: found.overdue, crew: found.crew });
|
|
20
33
|
return ok({
|
|
21
34
|
messageId: found.id,
|
|
22
35
|
sentAt: found.sentAt,
|
|
23
|
-
recipient: found.recipient,
|
|
24
|
-
|
|
36
|
+
recipient: found.recipient.kind === 'label' ? { kind: 'label', valueIds: found.recipient.values.map(({ valueId }) => valueId) } : found.recipient,
|
|
37
|
+
deliveries: (await deliveriesOf(caller.fleetId, messageId)).map(({ id, ship, state, steps }) => ({ deliveryId: id, ship, state, since: deliverySinceOf(steps) })),
|
|
25
38
|
});
|
|
26
39
|
};
|
|
27
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-sent-message.js","sourceRoot":"","sources":["../../../src/domain/shared/read-sent-message.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"read-sent-message.js","sourceRoot":"","sources":["../../../src/domain/shared/read-sent-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA0E,MAAM,sBAAsB,CAAC;AAG7H,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAoB,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAE,EAAE,EAAe,MAAM,aAAa,CAAC;AAsB9C;;;;;;;;;;GAUG;AACH,MAAM,UAAU,qBAAqB,CAAC,IAA8B;IAClE,uGAAuG;IACvG,MAAM,YAAY,GAAG,KAAK,EAAE,OAA8B,EAAE,SAAoB,EAA8B,EAAE;QAC9G,MAAM,UAAU,GAAsB,EAAE,CAAC;QACzC,IAAI,MAA8B,CAAC;QACnC,GAAG,CAAC;YACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAC;YACxG,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;YAC/B,MAAM,GAAG,IAAI,CAAC,UAAU,IAAI,SAAS,CAAC;QACxC,CAAC,QAAQ,MAAM,KAAK,SAAS,EAAE;QAC/B,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;IAEF,OAAO,KAAK,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE;QACrC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACpE,IAAI,KAAK,EAAE,MAAM,CAAC,EAAE,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC;YACvC,OAAO,MAAM,CAAC,mBAAmB,EAAE,cAAc,SAAS,yCAAyC,CAAC,CAAC;QACvG,CAAC;QACD,OAAO,EAAE,CAAC;YACR,SAAS,EAAE,KAAK,CAAC,EAAE;YACnB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS;YACjJ,UAAU,EAAE,CAAC,MAAM,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;SAClK,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,10 +1,6 @@
|
|
|
1
|
-
import type { ShipId } from '@aeolus-fleet/common';
|
|
2
|
-
/**
|
|
3
|
-
|
|
4
|
-
* "Selector"): one ship, by id or by name, or any ship of a type. Group and
|
|
5
|
-
* fleet come later.
|
|
6
|
-
*/
|
|
7
|
-
export type Selector = {
|
|
1
|
+
import type { LabelValueId, MeetingId, ShipId } from '@aeolus-fleet/common';
|
|
2
|
+
/** A selector of one recipient: one ship, by id or by name, or any ship of a type. */
|
|
3
|
+
export type RecipientSelector = {
|
|
8
4
|
kind: 'ship';
|
|
9
5
|
shipId: ShipId;
|
|
10
6
|
} | {
|
|
@@ -14,11 +10,29 @@ export type Selector = {
|
|
|
14
10
|
kind: 'type';
|
|
15
11
|
type: string;
|
|
16
12
|
};
|
|
13
|
+
/** Every other participant of a meeting (decision 0061). */
|
|
14
|
+
export interface MeetingSelector {
|
|
15
|
+
kind: 'meeting';
|
|
16
|
+
meetingId: MeetingId;
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Every ship carrying each of these label values but the sender (decision
|
|
20
|
+
* 0065): a selection by value ids, kept as sent, each ship of it getting a
|
|
21
|
+
* delivery of its own.
|
|
22
|
+
*/
|
|
23
|
+
export interface LabelSelector {
|
|
24
|
+
kind: 'label';
|
|
25
|
+
valueIds: readonly LabelValueId[];
|
|
26
|
+
}
|
|
27
|
+
/** What a schedule sends to (decision 0062): a recipient, or a label selection resolved at each send time (decision 0065). */
|
|
28
|
+
export type ScheduleSelector = RecipientSelector | LabelSelector;
|
|
29
|
+
/** Who a message is for, as its sender addressed it (docs/blueprint.md, "Selector"). */
|
|
30
|
+
export type Selector = RecipientSelector | MeetingSelector | LabelSelector;
|
|
17
31
|
/**
|
|
18
|
-
* Who a selector resolves to at send time: one ship by its id, never
|
|
19
|
-
* name, so a rename or a reused name never redirects a sent message; or
|
|
20
|
-
* queue of a type, which the first ship of that type to receive the
|
|
21
|
-
* claims. A
|
|
32
|
+
* Who a recipient selector resolves to at send time: one ship by its id, never
|
|
33
|
+
* its name, so a rename or a reused name never redirects a sent message; or
|
|
34
|
+
* the queue of a type, which the first ship of that type to receive the
|
|
35
|
+
* delivery claims. A delivery goes to it.
|
|
22
36
|
*/
|
|
23
37
|
export type Recipient = {
|
|
24
38
|
kind: 'ship';
|
|
@@ -27,3 +41,10 @@ export type Recipient = {
|
|
|
27
41
|
kind: 'type';
|
|
28
42
|
type: string;
|
|
29
43
|
};
|
|
44
|
+
/**
|
|
45
|
+
* Who a message went to, as its selector resolved: a recipient; a meeting,
|
|
46
|
+
* whose every other participant got a delivery of its own; or a label
|
|
47
|
+
* selection as sent, each ship of it at send time getting a delivery of its
|
|
48
|
+
* own.
|
|
49
|
+
*/
|
|
50
|
+
export type Addressee = Recipient | MeetingSelector | LabelSelector;
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/** A server's timer to the earliest next schedule attempt it knows of (decision 0062, S14). */
|
|
2
|
+
export interface ScheduleTimer {
|
|
3
|
+
/** A schedule's next attempt is due at `at`: the timer goes off then, unless it goes off earlier already. */
|
|
4
|
+
told(at: Date): void;
|
|
5
|
+
/** Stops the timer; settles once a send that runs has ended. */
|
|
6
|
+
stop(): Promise<void>;
|
|
7
|
+
}
|
|
8
|
+
/**
|
|
9
|
+
* Starts the timer, unarmed: it sends whenever the earliest attempt it was
|
|
10
|
+
* told of, or that a send answered, is due. What came due while no server
|
|
11
|
+
* ran, or while the listener was away, the 30 second pass sends, so a
|
|
12
|
+
* server's start queries nothing outside a call. One send at a time, at least a second apart. A send that
|
|
13
|
+
* fails goes to `onError`; the next schedule it is told of, or the 30 second
|
|
14
|
+
* pass, sends what it missed, since a send reads its work from the database.
|
|
15
|
+
*/
|
|
16
|
+
export declare function startScheduleTimer(options: {
|
|
17
|
+
send: () => Promise<{
|
|
18
|
+
nextAttemptAt: Date | undefined;
|
|
19
|
+
}>;
|
|
20
|
+
now: () => number;
|
|
21
|
+
onError: (error: unknown) => void;
|
|
22
|
+
}): ScheduleTimer;
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The shortest wait between two sends: a server whose clock runs ahead of the
|
|
3
|
+
* database's finds nothing due yet and is told the same attempt again, so
|
|
4
|
+
* without it the timer would go off over and over until the database's clock
|
|
5
|
+
* caught up.
|
|
6
|
+
*/
|
|
7
|
+
const MIN_GAP_MS = 1_000;
|
|
8
|
+
/** setTimeout's longest wait; a later attempt is waited for in steps. */
|
|
9
|
+
const MAX_WAIT_MS = 2 ** 31 - 1;
|
|
10
|
+
/**
|
|
11
|
+
* Starts the timer, unarmed: it sends whenever the earliest attempt it was
|
|
12
|
+
* told of, or that a send answered, is due. What came due while no server
|
|
13
|
+
* ran, or while the listener was away, the 30 second pass sends, so a
|
|
14
|
+
* server's start queries nothing outside a call. One send at a time, at least a second apart. A send that
|
|
15
|
+
* fails goes to `onError`; the next schedule it is told of, or the 30 second
|
|
16
|
+
* pass, sends what it missed, since a send reads its work from the database.
|
|
17
|
+
*/
|
|
18
|
+
export function startScheduleTimer(options) {
|
|
19
|
+
let timer;
|
|
20
|
+
let armedFor;
|
|
21
|
+
let lastSendAt = Number.NEGATIVE_INFINITY;
|
|
22
|
+
let running;
|
|
23
|
+
/** An attempt that came due while a send ran: armed again once it ends. */
|
|
24
|
+
let dueWhileRunning;
|
|
25
|
+
let isStopped = false;
|
|
26
|
+
const arm = (at) => {
|
|
27
|
+
if (isStopped || (armedFor !== undefined && armedFor <= at)) {
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
30
|
+
clearTimeout(timer);
|
|
31
|
+
armedFor = at;
|
|
32
|
+
const wait = Math.max(at - options.now(), lastSendAt + MIN_GAP_MS - options.now(), 0);
|
|
33
|
+
timer = setTimeout(goOff, Math.min(wait, MAX_WAIT_MS));
|
|
34
|
+
};
|
|
35
|
+
const goOff = () => {
|
|
36
|
+
timer = undefined;
|
|
37
|
+
const at = armedFor;
|
|
38
|
+
armedFor = undefined;
|
|
39
|
+
if (at !== undefined && at > options.now()) {
|
|
40
|
+
// A wait longer than setTimeout takes: wait the rest.
|
|
41
|
+
arm(at);
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
if (running) {
|
|
45
|
+
dueWhileRunning = Math.min(dueWhileRunning ?? Number.POSITIVE_INFINITY, at ?? options.now());
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
lastSendAt = options.now();
|
|
49
|
+
running = options
|
|
50
|
+
.send()
|
|
51
|
+
.then(({ nextAttemptAt }) => {
|
|
52
|
+
if (nextAttemptAt) {
|
|
53
|
+
arm(nextAttemptAt.getTime());
|
|
54
|
+
}
|
|
55
|
+
}, (error) => {
|
|
56
|
+
options.onError(error);
|
|
57
|
+
})
|
|
58
|
+
.finally(() => {
|
|
59
|
+
running = undefined;
|
|
60
|
+
if (dueWhileRunning !== undefined) {
|
|
61
|
+
const due = dueWhileRunning;
|
|
62
|
+
dueWhileRunning = undefined;
|
|
63
|
+
arm(due);
|
|
64
|
+
}
|
|
65
|
+
});
|
|
66
|
+
};
|
|
67
|
+
return {
|
|
68
|
+
told: (at) => {
|
|
69
|
+
arm(at.getTime());
|
|
70
|
+
},
|
|
71
|
+
stop: async () => {
|
|
72
|
+
isStopped = true;
|
|
73
|
+
clearTimeout(timer);
|
|
74
|
+
await running;
|
|
75
|
+
},
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
//# sourceMappingURL=schedule-timer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schedule-timer.js","sourceRoot":"","sources":["../src/schedule-timer.ts"],"names":[],"mappings":"AAQA;;;;;GAKG;AACH,MAAM,UAAU,GAAG,KAAK,CAAC;AAEzB,yEAAyE;AACzE,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAEhC;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAIlC;IACC,IAAI,KAAiC,CAAC;IACtC,IAAI,QAA4B,CAAC;IACjC,IAAI,UAAU,GAAG,MAAM,CAAC,iBAAiB,CAAC;IAC1C,IAAI,OAAkC,CAAC;IACvC,2EAA2E;IAC3E,IAAI,eAAmC,CAAC;IACxC,IAAI,SAAS,GAAG,KAAK,CAAC;IAEtB,MAAM,GAAG,GAAG,CAAC,EAAU,EAAE,EAAE;QACzB,IAAI,SAAS,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAC;YAC5D,OAAO;QACT,CAAC;QACD,YAAY,CAAC,KAAK,CAAC,CAAC;QACpB,QAAQ,GAAG,EAAE,CAAC;QACd,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,GAAG,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;QACtF,KAAK,GAAG,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;IACzD,CAAC,CAAC;IAEF,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,KAAK,GAAG,SAAS,CAAC;QAClB,MAAM,EAAE,GAAG,QAAQ,CAAC;QACpB,QAAQ,GAAG,SAAS,CAAC;QACrB,IAAI,EAAE,KAAK,SAAS,IAAI,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;YAC3C,sDAAsD;YACtD,GAAG,CAAC,EAAE,CAAC,CAAC;YACR,OAAO;QACT,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACZ,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,eAAe,IAAI,MAAM,CAAC,iBAAiB,EAAE,EAAE,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;YAC7F,OAAO;QACT,CAAC;QACD,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC3B,OAAO,GAAG,OAAO;aACd,IAAI,EAAE;aACN,IAAI,CACH,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE;YACpB,IAAI,aAAa,EAAE,CAAC;gBAClB,GAAG,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC,EACD,CAAC,KAAc,EAAE,EAAE;YACjB,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC,CACF;aACA,OAAO,CAAC,GAAG,EAAE;YACZ,OAAO,GAAG,SAAS,CAAC;YACpB,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;gBAClC,MAAM,GAAG,GAAG,eAAe,CAAC;gBAC5B,eAAe,GAAG,SAAS,CAAC;gBAC5B,GAAG,CAAC,GAAG,CAAC,CAAC;YACX,CAAC;QACH,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,OAAO;QACL,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE;YACX,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;QACpB,CAAC;QACD,IAAI,EAAE,KAAK,IAAI,EAAE;YACf,SAAS,GAAG,IAAI,CAAC;YACjB,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,MAAM,OAAO,CAAC;QAChB,CAAC;KACF,CAAC;AACJ,CAAC"}
|