@aeolus-fleet/core 0.31.0 → 0.32.1
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 +17 -3
- package/dist/adapters/prisma/generated/client.d.ts +17 -3
- package/dist/adapters/prisma/generated/commonInputTypes.d.ts +196 -46
- package/dist/adapters/prisma/generated/enums.d.ts +32 -0
- package/dist/adapters/prisma/generated/enums.js +28 -1
- package/dist/adapters/prisma/generated/enums.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/class.d.ts +22 -0
- package/dist/adapters/prisma/generated/internal/class.js +4 -4
- package/dist/adapters/prisma/generated/internal/class.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.d.ts +254 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js +62 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.d.ts +63 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js +62 -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/Fleet.d.ts +2128 -2
- package/dist/adapters/prisma/generated/models/InstallationSettings.d.ts +108 -4
- package/dist/adapters/prisma/generated/models/Message.d.ts +557 -516
- 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 +736 -3
- package/dist/adapters/prisma/generated/models.d.ts +2 -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 +67 -14
- 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/messaging.js +7 -3
- package/dist/adapters/prisma/messaging.js.map +1 -1
- package/dist/adapters/prisma/registry.js +28 -9
- package/dist/adapters/prisma/registry.js.map +1 -1
- package/dist/adapters/prisma/rows.js +10 -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 +7 -2
- package/dist/adapters/prisma/unit-of-work.js +7 -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 +20 -0
- package/dist/adapters/trpc/fleet.d.ts +210 -8
- 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 +508 -8
- 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.d.ts +188 -3
- package/dist/adapters/trpc/ship.js +105 -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 +19 -2
- package/dist/adapters/trpc/trpc.js.map +1 -1
- package/dist/app.d.ts +5 -3
- package/dist/app.js +30 -4
- package/dist/app.js.map +1 -1
- package/dist/domain/messaging/add-to-meeting.js +1 -1
- package/dist/domain/messaging/add-to-meeting.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/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/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/message.d.ts +43 -4
- package/dist/domain/messaging/message.js +82 -4
- package/dist/domain/messaging/message.js.map +1 -1
- package/dist/domain/messaging/open-meeting.js +1 -1
- package/dist/domain/messaging/open-meeting.js.map +1 -1
- 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 +77 -3
- package/dist/domain/messaging/public.d.ts +1 -0
- package/dist/domain/messaging/public.js +1 -0
- package/dist/domain/messaging/public.js.map +1 -1
- package/dist/domain/messaging/push-receive-deliveries.d.ts +4 -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/receive-deliveries.d.ts +4 -1
- package/dist/domain/messaging/receive-deliveries.js +2 -0
- package/dist/domain/messaging/receive-deliveries.js.map +1 -1
- package/dist/domain/messaging/resend-delivery.js +2 -2
- 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-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 +10 -3
- package/dist/domain/messaging/send-message.js +78 -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 +5 -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 +20 -0
- package/dist/domain/registry/public.d.ts +2 -0
- package/dist/domain/registry/public.js +2 -0
- package/dist/domain/registry/public.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-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/retire-ship.d.ts +5 -2
- package/dist/domain/registry/retire-ship.js +6 -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/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 +33 -5
- package/dist/domain/shared/history.js +3 -1
- 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 +21 -8
- package/dist/domain/shared/stuck.d.ts +3 -2
- package/dist/domain/shared/stuck.js +1 -1
- package/dist/domain/shared/stuck.js.map +1 -1
- 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/testing/temporal-setup.d.ts +1 -0
- package/dist/testing/temporal-setup.js +7 -0
- package/dist/testing/temporal-setup.js.map +1 -0
- package/dist/wiring.d.ts +26 -0
- package/dist/wiring.js +27 -1
- package/dist/wiring.js.map +1 -1
- package/package.json +3 -2
- 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 +179 -26
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type AccountId, type DeliveryId, type DeliveryState, type FleetId, type LeaseId, type MeetingId, type MessageId, type ShipId, type ShipKind } from '@aeolus-fleet/common';
|
|
1
|
+
import { type AccountId, type DeliveryId, type DeliveryState, type FleetId, type LabelValueId, type LeaseId, type MeetingId, type MessageId, type ScheduleId, type ShipId, type ShipKind } from '@aeolus-fleet/common';
|
|
2
2
|
import { type DomainError } from '../shared/errors.js';
|
|
3
3
|
import { type Actor, type NewEvent } from '../shared/events.js';
|
|
4
4
|
import { type Result } from '../shared/result.js';
|
|
@@ -13,7 +13,7 @@ export interface Message {
|
|
|
13
13
|
fleetId: FleetId;
|
|
14
14
|
/** The calling ship: every sender is a ship, `argo` included. */
|
|
15
15
|
senderShipId: ShipId;
|
|
16
|
-
/** The selector as resolved at send time: a ship's id, never its name, a type,
|
|
16
|
+
/** The selector as resolved at send time: a ship's id, never its name, a type, a meeting (decision 0061), or a label selection as sent (decision 0065). */
|
|
17
17
|
selector: Addressee;
|
|
18
18
|
payload: string;
|
|
19
19
|
/** A media type, exactly as the sender gave it. */
|
|
@@ -30,8 +30,16 @@ export interface Message {
|
|
|
30
30
|
resendOfMessageId: MessageId | null;
|
|
31
31
|
/** The meeting it was contributed to, or tells of as the notice that added its recipient (decision 0061). */
|
|
32
32
|
meetingId: MeetingId | null;
|
|
33
|
+
/** The schedule it was sent for, and that send time; none on a live send (decision 0062). */
|
|
34
|
+
scheduleId: ScheduleId | null;
|
|
35
|
+
sendTime: Date | null;
|
|
33
36
|
createdAt: Date;
|
|
34
37
|
}
|
|
38
|
+
/** The schedule a message is sent for, and the send time it is sent at (decision 0062). */
|
|
39
|
+
export interface ScheduledFor {
|
|
40
|
+
scheduleId: ScheduleId;
|
|
41
|
+
sendTime: Date;
|
|
42
|
+
}
|
|
35
43
|
/**
|
|
36
44
|
* One message to one resolved recipient, with its own state. Pending until a
|
|
37
45
|
* ship receives it; for a type, the first ship of that type to receive it
|
|
@@ -103,9 +111,15 @@ export interface MessageToAccept {
|
|
|
103
111
|
signedInAccountId?: AccountId;
|
|
104
112
|
/** The meeting it tells of, for the notice that adds its recipient to one (decision 0061). */
|
|
105
113
|
meetingId?: MeetingId;
|
|
114
|
+
/** The schedule it is sent for, and that send time (decision 0062). */
|
|
115
|
+
scheduledFor?: ScheduledFor;
|
|
106
116
|
at: Date;
|
|
107
117
|
}
|
|
108
|
-
/**
|
|
118
|
+
/**
|
|
119
|
+
* Who the delivery of the message went to: its message's recipient, or for a
|
|
120
|
+
* contribution to a meeting (decision 0061) or a send to a label (decision
|
|
121
|
+
* 0065) the ship it is for.
|
|
122
|
+
*/
|
|
109
123
|
export declare function deliveredTo(message: Pick<Message, 'selector'>, delivery: Pick<Delivery, 'recipient'>): Recipient;
|
|
110
124
|
export type RepeatRefusal = DomainError<'IDEMPOTENCY_KEY_REUSED'>;
|
|
111
125
|
/**
|
|
@@ -136,8 +150,14 @@ export declare function acceptMessage(fleet: {
|
|
|
136
150
|
delivery: Delivery;
|
|
137
151
|
events: NewEvent[];
|
|
138
152
|
}, AcceptRefusal>;
|
|
153
|
+
/**
|
|
154
|
+
* The model rule: only an agent ship states the model its session runs
|
|
155
|
+
* (decisions 0018, 0044 and 0050); a resend carries the original's and a
|
|
156
|
+
* ping none, so neither is asked.
|
|
157
|
+
*/
|
|
158
|
+
export declare function checkModel(send: Pick<MessageToAccept, 'resendOf' | 'contentType' | 'senderKind' | 'model'>): Result<undefined, AcceptRefusal>;
|
|
139
159
|
/** What a participant contributes to a meeting, its payload and key already checked, with one delivery id per participant it goes to. */
|
|
140
|
-
export type ContributionToAccept = Omit<MessageToAccept, 'deliveryId' | 'inReplyTo' | 'isForced' | 'resendOf' | 'meetingId'> & {
|
|
160
|
+
export type ContributionToAccept = Omit<MessageToAccept, 'deliveryId' | 'inReplyTo' | 'isForced' | 'resendOf' | 'meetingId' | 'scheduledFor'> & {
|
|
141
161
|
meetingId: MeetingId;
|
|
142
162
|
deliveries: readonly {
|
|
143
163
|
deliveryId: DeliveryId;
|
|
@@ -155,3 +175,22 @@ export declare function acceptContribution(send: ContributionToAccept): Result<{
|
|
|
155
175
|
deliveries: Delivery[];
|
|
156
176
|
events: NewEvent[];
|
|
157
177
|
}, AcceptRefusal>;
|
|
178
|
+
/** A send to a label selection, its payload and key already checked, with one delivery id per ship the selection resolved to (decision 0065). */
|
|
179
|
+
export type LabelMessageToAccept = Omit<MessageToAccept, 'deliveryId' | 'resendOf' | 'meetingId'> & {
|
|
180
|
+
valueIds: readonly LabelValueId[];
|
|
181
|
+
deliveries: readonly {
|
|
182
|
+
deliveryId: DeliveryId;
|
|
183
|
+
shipId: ShipId;
|
|
184
|
+
}[];
|
|
185
|
+
};
|
|
186
|
+
/**
|
|
187
|
+
* Accepts a send to a label selection (decision 0065): one message keeping
|
|
188
|
+
* the selection as sent, and one pending delivery per ship it resolved to,
|
|
189
|
+
* each with its own MessageAccepted naming that ship, caused by the sender.
|
|
190
|
+
* The reply, model and force rules are a send's.
|
|
191
|
+
*/
|
|
192
|
+
export declare function acceptLabelMessage(repliedTo: Message | undefined, send: LabelMessageToAccept): Result<{
|
|
193
|
+
message: Message;
|
|
194
|
+
deliveries: Delivery[];
|
|
195
|
+
events: NewEvent[];
|
|
196
|
+
}, AcceptRefusal>;
|
|
@@ -2,9 +2,13 @@ import { isPingContentType } from '@aeolus-fleet/common';
|
|
|
2
2
|
import { refuse } from '../shared/errors.js';
|
|
3
3
|
import { shipActor } from '../shared/events.js';
|
|
4
4
|
import { ok } from '../shared/result.js';
|
|
5
|
-
/**
|
|
5
|
+
/**
|
|
6
|
+
* Who the delivery of the message went to: its message's recipient, or for a
|
|
7
|
+
* contribution to a meeting (decision 0061) or a send to a label (decision
|
|
8
|
+
* 0065) the ship it is for.
|
|
9
|
+
*/
|
|
6
10
|
export function deliveredTo(message, delivery) {
|
|
7
|
-
return message.selector.kind === 'meeting' ? delivery.recipient : message.selector;
|
|
11
|
+
return message.selector.kind === 'meeting' || message.selector.kind === 'label' ? delivery.recipient : message.selector;
|
|
8
12
|
}
|
|
9
13
|
/**
|
|
10
14
|
* A send with a key its sender used before. The same request is a repeat, a
|
|
@@ -32,7 +36,7 @@ export function acceptMessage(fleet, send) {
|
|
|
32
36
|
const { recipient, repliedTo, reachableShipIds } = fleet;
|
|
33
37
|
const { messageId, deliveryId, fleetId, senderShipId, inReplyTo, resendOf, at } = send;
|
|
34
38
|
if (inReplyTo !== undefined && repliedTo?.id !== inReplyTo) {
|
|
35
|
-
return refuse('IN_REPLY_TO_NOT_FOUND', `Message ${inReplyTo}
|
|
39
|
+
return refuse('IN_REPLY_TO_NOT_FOUND', `Message ${inReplyTo} is not in the fleet: it was never sent, or it is no longer kept`);
|
|
36
40
|
}
|
|
37
41
|
const stated = checkModel(send);
|
|
38
42
|
if (!stated.isOk) {
|
|
@@ -51,6 +55,8 @@ export function acceptMessage(fleet, send) {
|
|
|
51
55
|
inReplyToMessageId: inReplyTo ?? null,
|
|
52
56
|
resendOfMessageId: resendOf?.messageId ?? null,
|
|
53
57
|
meetingId: send.meetingId ?? null,
|
|
58
|
+
scheduleId: send.scheduledFor?.scheduleId ?? null,
|
|
59
|
+
sendTime: send.scheduledFor?.sendTime ?? null,
|
|
54
60
|
createdAt: at,
|
|
55
61
|
};
|
|
56
62
|
const delivery = {
|
|
@@ -87,6 +93,7 @@ export function acceptMessage(fleet, send) {
|
|
|
87
93
|
...(resendOf && { resendOf: resendOf.messageId }),
|
|
88
94
|
...(send.isForced && { forced: true }),
|
|
89
95
|
...(send.meetingId && { meetingId: send.meetingId }),
|
|
96
|
+
...(send.scheduledFor && { scheduleId: send.scheduledFor.scheduleId, sendTime: send.scheduledFor.sendTime.toISOString() }),
|
|
90
97
|
},
|
|
91
98
|
},
|
|
92
99
|
],
|
|
@@ -97,7 +104,7 @@ export function acceptMessage(fleet, send) {
|
|
|
97
104
|
* (decisions 0018, 0044 and 0050); a resend carries the original's and a
|
|
98
105
|
* ping none, so neither is asked.
|
|
99
106
|
*/
|
|
100
|
-
function checkModel(send) {
|
|
107
|
+
export function checkModel(send) {
|
|
101
108
|
const isStated = send.resendOf === undefined && !isPingContentType(send.contentType);
|
|
102
109
|
if (isStated && send.senderKind === 'operator' && send.model !== undefined) {
|
|
103
110
|
return refuse('MODEL_FROM_ARGO', 'argo states no model: send without one');
|
|
@@ -135,6 +142,8 @@ export function acceptContribution(send) {
|
|
|
135
142
|
inReplyToMessageId: null,
|
|
136
143
|
resendOfMessageId: null,
|
|
137
144
|
meetingId,
|
|
145
|
+
scheduleId: null,
|
|
146
|
+
sendTime: null,
|
|
138
147
|
createdAt: at,
|
|
139
148
|
};
|
|
140
149
|
const deliveries = send.deliveries.map(({ deliveryId, shipId }) => ({
|
|
@@ -167,4 +176,73 @@ export function acceptContribution(send) {
|
|
|
167
176
|
})),
|
|
168
177
|
});
|
|
169
178
|
}
|
|
179
|
+
/**
|
|
180
|
+
* Accepts a send to a label selection (decision 0065): one message keeping
|
|
181
|
+
* the selection as sent, and one pending delivery per ship it resolved to,
|
|
182
|
+
* each with its own MessageAccepted naming that ship, caused by the sender.
|
|
183
|
+
* The reply, model and force rules are a send's.
|
|
184
|
+
*/
|
|
185
|
+
export function acceptLabelMessage(repliedTo, send) {
|
|
186
|
+
const { messageId, fleetId, senderShipId, inReplyTo, at } = send;
|
|
187
|
+
if (inReplyTo !== undefined && repliedTo?.id !== inReplyTo) {
|
|
188
|
+
return refuse('IN_REPLY_TO_NOT_FOUND', `Message ${inReplyTo} is not in the fleet: it was never sent, or it is no longer kept`);
|
|
189
|
+
}
|
|
190
|
+
const stated = checkModel(send);
|
|
191
|
+
if (!stated.isOk) {
|
|
192
|
+
return stated;
|
|
193
|
+
}
|
|
194
|
+
const selector = { kind: 'label', valueIds: [...send.valueIds] };
|
|
195
|
+
const message = {
|
|
196
|
+
id: messageId,
|
|
197
|
+
fleetId,
|
|
198
|
+
senderShipId,
|
|
199
|
+
selector,
|
|
200
|
+
payload: send.payload,
|
|
201
|
+
contentType: send.contentType,
|
|
202
|
+
model: send.model ?? null,
|
|
203
|
+
idempotencyKey: send.idempotencyKey,
|
|
204
|
+
requestHash: send.requestHash,
|
|
205
|
+
inReplyToMessageId: inReplyTo ?? null,
|
|
206
|
+
resendOfMessageId: null,
|
|
207
|
+
meetingId: null,
|
|
208
|
+
scheduleId: send.scheduledFor?.scheduleId ?? null,
|
|
209
|
+
sendTime: send.scheduledFor?.sendTime ?? null,
|
|
210
|
+
createdAt: at,
|
|
211
|
+
};
|
|
212
|
+
const deliveries = send.deliveries.map(({ deliveryId, shipId }) => ({
|
|
213
|
+
id: deliveryId,
|
|
214
|
+
fleetId,
|
|
215
|
+
messageId,
|
|
216
|
+
recipient: { kind: 'ship', shipId },
|
|
217
|
+
state: 'pending',
|
|
218
|
+
claimedByShipId: null,
|
|
219
|
+
claimedByLeaseId: null,
|
|
220
|
+
attempts: 0,
|
|
221
|
+
handOverNumber: null,
|
|
222
|
+
handedOnceMoreAt: null,
|
|
223
|
+
isForced: send.isForced,
|
|
224
|
+
createdAt: at,
|
|
225
|
+
}));
|
|
226
|
+
const actor = send.signedInAccountId === undefined ? shipActor(senderShipId) : { kind: 'ship', shipId: senderShipId, signedInAccountId: send.signedInAccountId };
|
|
227
|
+
return ok({
|
|
228
|
+
message,
|
|
229
|
+
deliveries,
|
|
230
|
+
events: send.deliveries.map(({ deliveryId, shipId }) => ({
|
|
231
|
+
fleetId,
|
|
232
|
+
type: 'MessageAccepted',
|
|
233
|
+
occurredAt: at,
|
|
234
|
+
actor: send.actor ?? actor,
|
|
235
|
+
shipId,
|
|
236
|
+
messageId,
|
|
237
|
+
deliveryId,
|
|
238
|
+
details: {
|
|
239
|
+
selector: 'label',
|
|
240
|
+
recipientType: null,
|
|
241
|
+
model: send.model ?? null,
|
|
242
|
+
...(send.isForced && { forced: true }),
|
|
243
|
+
...(send.scheduledFor && { scheduleId: send.scheduledFor.scheduleId, sendTime: send.scheduledFor.sendTime.toISOString() }),
|
|
244
|
+
},
|
|
245
|
+
})),
|
|
246
|
+
});
|
|
247
|
+
}
|
|
170
248
|
//# sourceMappingURL=message.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../src/domain/messaging/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../src/domain/messaging/message.ts"],"names":[],"mappings":"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"}
|
|
@@ -67,7 +67,7 @@ async function openWithin(deps, open) {
|
|
|
67
67
|
return reach;
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
|
-
const withinLimit = await withinDailyMessageLimit(tx, { fleetId, time: at });
|
|
70
|
+
const withinLimit = await withinDailyMessageLimit(tx, { fleetId, time: at, count: told.length });
|
|
71
71
|
if (!withinLimit.isOk) {
|
|
72
72
|
return withinLimit;
|
|
73
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open-meeting.js","sourceRoot":"","sources":["../../../src/domain/messaging/open-meeting.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"open-meeting.js","sourceRoot":"","sources":["../../../src/domain/messaging/open-meeting.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import type { IdGenerator, ScheduleId } from '@aeolus-fleet/common';
|
|
2
|
+
import { type CheckManageTx, type NotReachable } from '../registry/public.js';
|
|
3
|
+
import { type Caller } from '../shared/caller.js';
|
|
4
|
+
import type { Clock } from '../shared/clock.js';
|
|
5
|
+
import { type DomainError } from '../shared/errors.js';
|
|
6
|
+
import { type EventLog } from '../shared/events.js';
|
|
7
|
+
import { type Result } from '../shared/result.js';
|
|
8
|
+
import type { UnitOfWork } from '../shared/unit-of-work.js';
|
|
9
|
+
import type { ScheduleRepository } from './ports.js';
|
|
10
|
+
import { type PauseRefusal } from './schedule.js';
|
|
11
|
+
export interface PauseScheduleTx extends CheckManageTx {
|
|
12
|
+
schedules: Pick<ScheduleRepository, 'findForUpdate' | 'save'>;
|
|
13
|
+
events: EventLog;
|
|
14
|
+
}
|
|
15
|
+
export type PauseScheduleRefusal = DomainError<'SCHEDULE_NOT_FOUND'> | PauseRefusal | NotReachable;
|
|
16
|
+
export type PauseSchedule = (caller: Caller, input: {
|
|
17
|
+
scheduleId: ScheduleId;
|
|
18
|
+
}) => Promise<Result<{
|
|
19
|
+
scheduleId: ScheduleId;
|
|
20
|
+
state: 'paused';
|
|
21
|
+
}, PauseScheduleRefusal>>;
|
|
22
|
+
/**
|
|
23
|
+
* Use case: pauses a schedule (`pauseSchedule`, decision 0062, S10): it
|
|
24
|
+
* sends nothing until its ship resumes it, with SchedulePaused on its ship,
|
|
25
|
+
* caused by the caller. Its ship pauses its own, the reason ship; an actor
|
|
26
|
+
* with fleet:manage within manage reach of that ship pauses any, the reason
|
|
27
|
+
* manager. Anyone else is told there is no such schedule. A paused schedule
|
|
28
|
+
* is answered paused again, unchanged; an ended or cancelled one is refused.
|
|
29
|
+
*/
|
|
30
|
+
export declare function createPauseSchedule(deps: {
|
|
31
|
+
uow: UnitOfWork<PauseScheduleTx>;
|
|
32
|
+
clock: Clock;
|
|
33
|
+
ids: IdGenerator;
|
|
34
|
+
}): PauseSchedule;
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { keepingReachRefusal } from '../registry/public.js';
|
|
2
|
+
import { actorOf } from '../shared/caller.js';
|
|
3
|
+
import { refuse } from '../shared/errors.js';
|
|
4
|
+
import { recordEvent } from '../shared/events.js';
|
|
5
|
+
import { ok } from '../shared/result.js';
|
|
6
|
+
import { pauseSchedule } from './schedule.js';
|
|
7
|
+
import { scheduleAccess } from './schedule-access.js';
|
|
8
|
+
/**
|
|
9
|
+
* Use case: pauses a schedule (`pauseSchedule`, decision 0062, S10): it
|
|
10
|
+
* sends nothing until its ship resumes it, with SchedulePaused on its ship,
|
|
11
|
+
* caused by the caller. Its ship pauses its own, the reason ship; an actor
|
|
12
|
+
* with fleet:manage within manage reach of that ship pauses any, the reason
|
|
13
|
+
* manager. Anyone else is told there is no such schedule. A paused schedule
|
|
14
|
+
* is answered paused again, unchanged; an ended or cancelled one is refused.
|
|
15
|
+
*/
|
|
16
|
+
export function createPauseSchedule(deps) {
|
|
17
|
+
return (caller, { scheduleId }) => keepingReachRefusal(deps.uow, async (tx) => {
|
|
18
|
+
const notFound = refuse('SCHEDULE_NOT_FOUND', `Schedule ${scheduleId} does not exist`);
|
|
19
|
+
const schedule = await tx.schedules.findForUpdate(caller.fleetId, scheduleId);
|
|
20
|
+
if (!schedule) {
|
|
21
|
+
return notFound;
|
|
22
|
+
}
|
|
23
|
+
const at = deps.clock.now();
|
|
24
|
+
const access = await scheduleAccess({ tx, ids: deps.ids }, { caller, shipId: schedule.shipId, at });
|
|
25
|
+
if (!access.isOk) {
|
|
26
|
+
return access;
|
|
27
|
+
}
|
|
28
|
+
if (access.value === 'none') {
|
|
29
|
+
return notFound;
|
|
30
|
+
}
|
|
31
|
+
const paused = pauseSchedule(schedule, { reason: access.value, actor: actorOf(caller), at });
|
|
32
|
+
if (!paused.isOk) {
|
|
33
|
+
return paused;
|
|
34
|
+
}
|
|
35
|
+
if (paused.value.events.length > 0) {
|
|
36
|
+
await tx.schedules.save(paused.value.schedule);
|
|
37
|
+
}
|
|
38
|
+
for (const event of paused.value.events) {
|
|
39
|
+
await recordEvent({ events: tx.events, ids: deps.ids }, event);
|
|
40
|
+
}
|
|
41
|
+
return ok({ scheduleId, state: 'paused' });
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=pause-schedule.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pause-schedule.js","sourceRoot":"","sources":["../../../src/domain/messaging/pause-schedule.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAyC,MAAM,uBAAuB,CAAC;AACnG,OAAO,EAAE,OAAO,EAAe,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAiB,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,aAAa,EAAqB,MAAM,eAAe,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAWtD;;;;;;;GAOG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAA0E;IAC5G,OAAO,CAAC,MAAM,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,CAChC,mBAAmB,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,EAAsF,EAAE;QAC7H,MAAM,QAAQ,GAAG,MAAM,CAAC,oBAAoB,EAAE,YAAY,UAAU,iBAAiB,CAAC,CAAC;QACvF,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC9E,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;QACpG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACjB,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,IAAI,MAAM,CAAC,KAAK,KAAK,MAAM,EAAE,CAAC;YAC5B,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,MAAM,GAAG,aAAa,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC7F,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACjB,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACjD,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YACxC,MAAM,WAAW,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,QAAiB,EAAE,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import type { DeliveryId, FleetId, LeaseId, MeetingId, MessageId, ShipId } from '@aeolus-fleet/common';
|
|
1
|
+
import type { DeliveryId, FleetId, LeaseId, MeetingId, MessageId, ScheduleId, ScheduleState, ShipId } from '@aeolus-fleet/common';
|
|
2
2
|
import type { Page, PageQuery } from '../shared/page.js';
|
|
3
3
|
import type { Meeting } from './meeting.js';
|
|
4
4
|
import type { Delivery, Message } from './message.js';
|
|
5
5
|
import type { Overdue, PushedCrew } from './overdue.js';
|
|
6
|
+
import type { Schedule } from './schedule.js';
|
|
6
7
|
/** One sender's idempotency key, in its fleet. */
|
|
7
8
|
export interface SenderKey {
|
|
8
9
|
fleetId: FleetId;
|
|
@@ -51,6 +52,70 @@ export interface MeetingRepository {
|
|
|
51
52
|
meetingId: MeetingId;
|
|
52
53
|
} & PageQuery<MessageId>): Promise<Page<Message, MessageId>>;
|
|
53
54
|
}
|
|
55
|
+
/** One creator's idempotency key for a schedule, in its fleet. */
|
|
56
|
+
export interface CreatorKey {
|
|
57
|
+
fleetId: FleetId;
|
|
58
|
+
shipId: ShipId;
|
|
59
|
+
idempotencyKey: string;
|
|
60
|
+
}
|
|
61
|
+
/** Outbound port: the ships' schedules, always within one fleet (decision 0062). */
|
|
62
|
+
export interface ScheduleRepository {
|
|
63
|
+
create(schedule: Schedule): Promise<void>;
|
|
64
|
+
/**
|
|
65
|
+
* Holds the lock on the creator's key until the unit of work ends, so two
|
|
66
|
+
* creations with one key take turns and the second finds the first one's
|
|
67
|
+
* schedule.
|
|
68
|
+
*/
|
|
69
|
+
lockCreatorKey(key: CreatorKey): Promise<void>;
|
|
70
|
+
findByCreatorKey(key: CreatorKey): Promise<Schedule | undefined>;
|
|
71
|
+
/** The schedule, held for update until the unit of work ends. */
|
|
72
|
+
findForUpdate(fleetId: FleetId, scheduleId: ScheduleId): Promise<Schedule | undefined>;
|
|
73
|
+
/**
|
|
74
|
+
* One active schedule whose next attempt is due by the database's clock,
|
|
75
|
+
* earliest attempt first, held for update until the unit of work ends; one
|
|
76
|
+
* another unit of work holds is skipped, never waited for, so two servers
|
|
77
|
+
* never claim the same schedule (ADR 0003). Those excluded are left out:
|
|
78
|
+
* the ones this pass tried already.
|
|
79
|
+
*/
|
|
80
|
+
claimDue(fleetId: FleetId, excluding: readonly ScheduleId[]): Promise<Schedule | undefined>;
|
|
81
|
+
/** Stores the schedule's state, next send time and attempt, last outcome, end and cancel. */
|
|
82
|
+
save(schedule: Schedule): Promise<void>;
|
|
83
|
+
/** How many messages the schedule has sent: what a repeat's count counts. */
|
|
84
|
+
sentCount(fleetId: FleetId, scheduleId: ScheduleId): Promise<number>;
|
|
85
|
+
/**
|
|
86
|
+
* Holds the lock on the ship's schedule count until the unit of work ends,
|
|
87
|
+
* so creations at the schedules per ship limit take turns and never
|
|
88
|
+
* overshoot it.
|
|
89
|
+
*/
|
|
90
|
+
lockShipScheduleCount(fleetId: FleetId, shipId: ShipId): Promise<void>;
|
|
91
|
+
/** How many schedules the ship holds active or paused: what the schedules per ship limit counts. */
|
|
92
|
+
countOpenOfShip(fleetId: FleetId, shipId: ShipId): Promise<number>;
|
|
93
|
+
/** The ship's active and paused schedules, oldest first, each held for update, as a retire cancels them. */
|
|
94
|
+
listOpenOfShipForUpdate(fleetId: FleetId, shipId: ShipId): Promise<Schedule[]>;
|
|
95
|
+
/** A page of the ship's schedules in the given states, newest first by id, read without a lock. */
|
|
96
|
+
page(fleetId: FleetId, query: {
|
|
97
|
+
shipId: ShipId;
|
|
98
|
+
states: readonly ScheduleState[];
|
|
99
|
+
} & PageQuery<ScheduleId>): Promise<Page<Schedule, ScheduleId>>;
|
|
100
|
+
}
|
|
101
|
+
/** Outbound port: when a fleet's next schedule attempt is due, read without a lock, for the servers' timers. */
|
|
102
|
+
export interface ScheduleAttempts {
|
|
103
|
+
nextAttemptAt(fleetId: FleetId): Promise<Date | undefined>;
|
|
104
|
+
}
|
|
105
|
+
/** That a schedule's next attempt is due at a time: a hint for the servers' timers, never its content. */
|
|
106
|
+
export interface ScheduleNotice {
|
|
107
|
+
fleetId: FleetId;
|
|
108
|
+
scheduleId: ScheduleId;
|
|
109
|
+
attemptAt: Date;
|
|
110
|
+
}
|
|
111
|
+
/**
|
|
112
|
+
* Outbound port: tells every core server's timer of a new or advanced
|
|
113
|
+
* schedule. Sent as part of the caller's unit of work: it reaches the
|
|
114
|
+
* servers only once that commits, and never when it rolls back.
|
|
115
|
+
*/
|
|
116
|
+
export interface ScheduleNotifier {
|
|
117
|
+
scheduleDue(notice: ScheduleNotice): Promise<void>;
|
|
118
|
+
}
|
|
54
119
|
/** Outbound port: messages, always within one fleet. Never changed once stored. */
|
|
55
120
|
export interface MessageRepository {
|
|
56
121
|
create(message: Message): Promise<void>;
|
|
@@ -93,6 +158,8 @@ export interface ClaimableDeliveries {
|
|
|
93
158
|
excluding: readonly DeliveryId[];
|
|
94
159
|
/** Set to claim only deliveries of replies to this message, in flight or pending. */
|
|
95
160
|
inReplyTo?: MessageId;
|
|
161
|
+
/** Leave handed deliveries out while keeping received deliveries recoverable. */
|
|
162
|
+
shouldSkipHanded?: boolean;
|
|
96
163
|
}
|
|
97
164
|
/** How many deliveries wait for a crew, and how many of them are forced and not handed over yet. */
|
|
98
165
|
export interface ReceivableCount {
|
|
@@ -126,8 +193,15 @@ export interface DeliveryRepository {
|
|
|
126
193
|
findForUpdate(fleetId: FleetId, deliveryId: DeliveryId): Promise<Delivery | undefined>;
|
|
127
194
|
/** The delivery, read without a lock. */
|
|
128
195
|
find(fleetId: FleetId, deliveryId: DeliveryId): Promise<Delivery | undefined>;
|
|
129
|
-
/**
|
|
130
|
-
|
|
196
|
+
/**
|
|
197
|
+
* The delivery of a message that reached the ship, read without a lock:
|
|
198
|
+
* the one to it, or one of its type it claimed. A message to a label or a
|
|
199
|
+
* meeting has one per ship (decisions 0061, 0065), so the ship picks it.
|
|
200
|
+
*/
|
|
201
|
+
findOfMessageReaching(fleetId: FleetId, reached: {
|
|
202
|
+
messageId: MessageId;
|
|
203
|
+
shipId: ShipId;
|
|
204
|
+
}): Promise<Delivery | undefined>;
|
|
131
205
|
/**
|
|
132
206
|
* The ping to the ship whose delivery is still open, pending or in flight:
|
|
133
207
|
* at most one, since pings never stack. Locks nothing: a ping holds the ship.
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export { hasClockRunOut, NOT_CONFIRMED_MINUTES, type ClockedCrew, type OverdueClock, type WaitingState } from './overdue.js';
|
|
2
2
|
export { leaveMeetingsOnRetire, lockMeetingsOf, type RetiredParticipantTx } from './retired-participant.js';
|
|
3
|
+
export { cancelSchedulesOnRetire, lockSchedulesOf, type RetiredSchedulerTx } from './retired-scheduler.js';
|
|
3
4
|
export type { RequestHasher } from './ports.js';
|
|
4
5
|
export type { AcceptRefusal } from './message.js';
|
|
@@ -2,4 +2,5 @@
|
|
|
2
2
|
// part of it; adapters import them from their own modules.
|
|
3
3
|
export { hasClockRunOut, NOT_CONFIRMED_MINUTES } from './overdue.js';
|
|
4
4
|
export { leaveMeetingsOnRetire, lockMeetingsOf } from './retired-participant.js';
|
|
5
|
+
export { cancelSchedulesOnRetire, lockSchedulesOf } from './retired-scheduler.js';
|
|
5
6
|
//# sourceMappingURL=public.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public.js","sourceRoot":"","sources":["../../../src/domain/messaging/public.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,2DAA2D;AAC3D,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAA0D,MAAM,cAAc,CAAC;AAC7H,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAA6B,MAAM,0BAA0B,CAAC"}
|
|
1
|
+
{"version":3,"file":"public.js","sourceRoot":"","sources":["../../../src/domain/messaging/public.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,2DAA2D;AAC3D,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAA0D,MAAM,cAAc,CAAC;AAC7H,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAA6B,MAAM,0BAA0B,CAAC;AAC5G,OAAO,EAAE,uBAAuB,EAAE,eAAe,EAA2B,MAAM,wBAAwB,CAAC"}
|
|
@@ -26,6 +26,7 @@ export interface DeliveriesPushReceived {
|
|
|
26
26
|
export type PushReceiveDeliveries = (crew: Crew, input: {
|
|
27
27
|
max?: number;
|
|
28
28
|
waker?: LeaseWaker;
|
|
29
|
+
shouldSkipHanded?: boolean;
|
|
29
30
|
}) => Promise<Result<DeliveriesPushReceived, ReceiveRefusal>>;
|
|
30
31
|
/**
|
|
31
32
|
* Use case: the crew's computer side, the trierarch or the plugin watcher,
|
|
@@ -35,7 +36,9 @@ export type PushReceiveDeliveries = (crew: Crew, input: {
|
|
|
35
36
|
* delivery becomes received, in flight with the crew's ship and lease, and
|
|
36
37
|
* counts no attempt; the computer side reports handed once it hands it to
|
|
37
38
|
* the agent. Its own in flight comes again first, changing nothing, so a
|
|
38
|
-
* restart or a lost answer loses nothing.
|
|
39
|
+
* restart or a lost answer loses nothing. With shouldSkipHanded, handed
|
|
40
|
+
* deliveries are left out before the limit, while received ones still return.
|
|
41
|
+
* From its first push receive until
|
|
39
42
|
* it ends, the lease is pushed: the agent's plain receive answers nothing.
|
|
40
43
|
* Its first push receive may state what wakes the ship, kept with the lease
|
|
41
44
|
* (interop 5.1).
|
|
@@ -25,6 +25,7 @@ async function pushReceiptForCrew(deps, receipt) {
|
|
|
25
25
|
leaseId: crew.leaseId,
|
|
26
26
|
limit: max,
|
|
27
27
|
excluding: [],
|
|
28
|
+
shouldSkipHanded: receipt.shouldSkipHanded ?? false,
|
|
28
29
|
});
|
|
29
30
|
const received = [];
|
|
30
31
|
for (const { delivery, message } of taken) {
|
|
@@ -53,7 +54,9 @@ async function pushReceiptForCrew(deps, receipt) {
|
|
|
53
54
|
* delivery becomes received, in flight with the crew's ship and lease, and
|
|
54
55
|
* counts no attempt; the computer side reports handed once it hands it to
|
|
55
56
|
* the agent. Its own in flight comes again first, changing nothing, so a
|
|
56
|
-
* restart or a lost answer loses nothing.
|
|
57
|
+
* restart or a lost answer loses nothing. With shouldSkipHanded, handed
|
|
58
|
+
* deliveries are left out before the limit, while received ones still return.
|
|
59
|
+
* From its first push receive until
|
|
57
60
|
* it ends, the lease is pushed: the agent's plain receive answers nothing.
|
|
58
61
|
* Its first push receive may state what wakes the ship, kept with the lease
|
|
59
62
|
* (interop 5.1).
|
|
@@ -66,7 +69,7 @@ export function createPushReceiveDeliveries(deps) {
|
|
|
66
69
|
if (!max.isOk) {
|
|
67
70
|
return max;
|
|
68
71
|
}
|
|
69
|
-
return waitForDeliveries({ clock: deps.clock, wakeups: deps.wakeups, waitMs }, { crew, look: () => deps.uow.run((tx) => pushReceiptForCrew({ tx, ids: deps.ids, at: deps.clock.now() }, { crew, max: max.value, ...(input.waker === undefined ? {} : { waker: input.waker }) })) });
|
|
72
|
+
return waitForDeliveries({ clock: deps.clock, wakeups: deps.wakeups, waitMs }, { crew, look: () => deps.uow.run((tx) => pushReceiptForCrew({ tx, ids: deps.ids, at: deps.clock.now() }, { crew, max: max.value, shouldSkipHanded: input.shouldSkipHanded ?? false, ...(input.waker === undefined ? {} : { waker: input.waker }) })) });
|
|
70
73
|
};
|
|
71
74
|
}
|
|
72
75
|
//# sourceMappingURL=push-receive-deliveries.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push-receive-deliveries.js","sourceRoot":"","sources":["../../../src/domain/messaging/push-receive-deliveries.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAqD,MAAM,uBAAuB,CAAC;AAGtH,OAAO,EAAE,WAAW,EAAiB,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEpD,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,iBAAiB,GAGlB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAgC9C;;;;;GAKG;AACH,KAAK,UAAU,kBAAkB,CAC/B,IAAqB,EACrB,
|
|
1
|
+
{"version":3,"file":"push-receive-deliveries.js","sourceRoot":"","sources":["../../../src/domain/messaging/push-receive-deliveries.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { DeliveryId, IdGenerator, MeetingId, MessageId, ShipId } from '@aeolus-fleet/common';
|
|
1
|
+
import type { DeliveryId, IdGenerator, MeetingId, MessageId, ScheduleId, ShipId } from '@aeolus-fleet/common';
|
|
2
2
|
import { type FindShipTx, type HoldLeaseTx, type LeaseEnded, type LeaseRepository, type Ship } from '../registry/public.js';
|
|
3
3
|
import type { Crew } from '../shared/caller.js';
|
|
4
4
|
import type { Clock } from '../shared/clock.js';
|
|
@@ -36,6 +36,9 @@ export interface ReceivedDelivery {
|
|
|
36
36
|
isForced: boolean;
|
|
37
37
|
/** The meeting its message was contributed to or tells of; none outside a meeting (decision 0061). */
|
|
38
38
|
meetingId: MeetingId | null;
|
|
39
|
+
/** The schedule its message was sent for, and that send time; none on a live send (decision 0062). */
|
|
40
|
+
scheduleId: ScheduleId | null;
|
|
41
|
+
sendTime: Date | null;
|
|
39
42
|
}
|
|
40
43
|
export interface DeliveriesReceived {
|
|
41
44
|
/** None when the wait ended without a delivery. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"receive-deliveries.js","sourceRoot":"","sources":["../../../src/domain/messaging/receive-deliveries.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAuF,MAAM,uBAAuB,CAAC;AAIhK,OAAO,EAAE,WAAW,EAAiB,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAG7C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"receive-deliveries.js","sourceRoot":"","sources":["../../../src/domain/messaging/receive-deliveries.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,7 +54,7 @@ export function createResendDelivery(deps) {
|
|
|
54
54
|
if (isPingContentType(original.contentType)) {
|
|
55
55
|
return refuse('PING_NOT_RESENT', 'A ping is not resent: dismiss it, and ping the ship again');
|
|
56
56
|
}
|
|
57
|
-
// A contribution's undeliverable delivery is resent to its
|
|
57
|
+
// A contribution's or a label send's undeliverable delivery is resent to its ship alone, as a message of its own.
|
|
58
58
|
const selector = deliveredTo(original, delivery);
|
|
59
59
|
const inReplyTo = original.inReplyToMessageId ?? undefined;
|
|
60
60
|
const requestHash = deps.hasher.hash(sendRequestText({ selector, payload: original.payload, contentType: original.contentType, inReplyTo, isForced: false }));
|
|
@@ -75,7 +75,7 @@ export function createResendDelivery(deps) {
|
|
|
75
75
|
return recipient;
|
|
76
76
|
}
|
|
77
77
|
const repliedTo = inReplyTo === undefined ? undefined : await tx.messages.find(fleetId, inReplyTo);
|
|
78
|
-
const repliedDelivery = repliedTo && (await tx.deliveries.
|
|
78
|
+
const repliedDelivery = repliedTo && (await tx.deliveries.findOfMessageReaching(fleetId, { messageId: repliedTo.id, shipId: original.senderShipId }));
|
|
79
79
|
const reach = await checkReach({ tx, ids: deps.ids }, {
|
|
80
80
|
fleetId,
|
|
81
81
|
senderShipId: original.senderShipId,
|