@aeolus-fleet/core 0.39.0 → 0.40.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 +4 -2
- package/dist/adapters/cli/fleet-init.d.ts +1 -1
- package/dist/adapters/cli/fleet-init.js +5 -3
- package/dist/adapters/cli/fleet-init.js.map +1 -1
- package/dist/adapters/cli/fleet-restored.d.ts +19 -0
- package/dist/adapters/cli/fleet-restored.js +37 -0
- package/dist/adapters/cli/fleet-restored.js.map +1 -0
- package/dist/adapters/cli/io.d.ts +5 -2
- package/dist/adapters/cli/io.js.map +1 -1
- package/dist/adapters/cli/run.d.ts +2 -0
- package/dist/adapters/cli/run.js +10 -2
- package/dist/adapters/cli/run.js.map +1 -1
- package/dist/adapters/prisma/client.d.ts +8 -2
- package/dist/adapters/prisma/client.js +3 -3
- package/dist/adapters/prisma/client.js.map +1 -1
- package/dist/adapters/prisma/content-type-sql.d.ts +11 -0
- package/dist/adapters/prisma/content-type-sql.js +41 -0
- package/dist/adapters/prisma/content-type-sql.js.map +1 -0
- package/dist/adapters/prisma/core-connections.d.ts +8 -0
- package/dist/adapters/prisma/core-connections.js +18 -0
- package/dist/adapters/prisma/core-connections.js.map +1 -0
- package/dist/adapters/prisma/exchange-rollups.d.ts +3 -1
- package/dist/adapters/prisma/exchange-rollups.js +25 -21
- package/dist/adapters/prisma/exchange-rollups.js.map +1 -1
- package/dist/adapters/prisma/fill-message-question-ids.d.ts +7 -0
- package/dist/adapters/prisma/fill-message-question-ids.js +12 -0
- package/dist/adapters/prisma/fill-message-question-ids.js.map +1 -0
- package/dist/adapters/prisma/fleet-counter.js +1 -1
- package/dist/adapters/prisma/fleet-counter.js.map +1 -1
- package/dist/adapters/prisma/fleet-removal.d.ts +17 -0
- package/dist/adapters/prisma/fleet-removal.js +109 -0
- package/dist/adapters/prisma/fleet-removal.js.map +1 -0
- package/dist/adapters/prisma/generated/browser.d.ts +6 -0
- package/dist/adapters/prisma/generated/client.d.ts +6 -0
- package/dist/adapters/prisma/generated/commonInputTypes.d.ts +0 -30
- package/dist/adapters/prisma/generated/enums.d.ts +0 -6
- package/dist/adapters/prisma/generated/enums.js +0 -5
- package/dist/adapters/prisma/generated/enums.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/class.d.ts +11 -0
- package/dist/adapters/prisma/generated/internal/class.js +4 -4
- package/dist/adapters/prisma/generated/internal/class.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.d.ts +89 -10
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js +13 -2
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.d.ts +13 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js +13 -2
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js.map +1 -1
- package/dist/adapters/prisma/generated/models/Exchange.d.ts +60 -1
- package/dist/adapters/prisma/generated/models/Fleet.d.ts +700 -1
- package/dist/adapters/prisma/generated/models/Message.d.ts +174 -1
- package/dist/adapters/prisma/generated/models/MessageMetadataBackfill.d.ts +1132 -0
- package/dist/adapters/prisma/generated/models/MessageMetadataBackfill.js +2 -0
- package/dist/adapters/prisma/generated/models/MessageMetadataBackfill.js.map +1 -0
- package/dist/adapters/prisma/generated/models/Operator.d.ts +1 -40
- package/dist/adapters/prisma/generated/models.d.ts +1 -0
- package/dist/adapters/prisma/health-bootstrap-index.d.ts +2 -0
- package/dist/adapters/prisma/health-bootstrap-index.js +15 -0
- package/dist/adapters/prisma/health-bootstrap-index.js.map +1 -0
- package/dist/adapters/prisma/health-snapshots.js +6 -3
- package/dist/adapters/prisma/health-snapshots.js.map +1 -1
- package/dist/adapters/prisma/history.d.ts +3 -1
- package/dist/adapters/prisma/history.js +22 -4
- package/dist/adapters/prisma/history.js.map +1 -1
- package/dist/adapters/prisma/identity.js +6 -9
- package/dist/adapters/prisma/identity.js.map +1 -1
- package/dist/adapters/prisma/index-after-start.d.ts +16 -0
- package/dist/adapters/prisma/index-after-start.js +78 -0
- package/dist/adapters/prisma/index-after-start.js.map +1 -0
- package/dist/adapters/prisma/installation.js +1 -1
- package/dist/adapters/prisma/installation.js.map +1 -1
- package/dist/adapters/prisma/message-metadata-fill.d.ts +40 -0
- package/dist/adapters/prisma/message-metadata-fill.js +122 -0
- package/dist/adapters/prisma/message-metadata-fill.js.map +1 -0
- package/dist/adapters/prisma/messaging.d.ts +29 -2
- package/dist/adapters/prisma/messaging.js +98 -41
- package/dist/adapters/prisma/messaging.js.map +1 -1
- package/dist/adapters/prisma/page-with-messages.d.ts +11 -0
- package/dist/adapters/prisma/page-with-messages.js +42 -0
- package/dist/adapters/prisma/page-with-messages.js.map +1 -0
- package/dist/adapters/prisma/registry.js +32 -51
- package/dist/adapters/prisma/registry.js.map +1 -1
- package/dist/adapters/prisma/rows.js +3 -3
- package/dist/adapters/prisma/rows.js.map +1 -1
- package/dist/adapters/prisma/sealings.js +23 -7
- package/dist/adapters/prisma/sealings.js.map +1 -1
- package/dist/adapters/prisma/unit-of-work.d.ts +4 -2
- package/dist/adapters/prisma/unit-of-work.js +4 -0
- package/dist/adapters/prisma/unit-of-work.js.map +1 -1
- package/dist/adapters/prisma/unseen-plain-messages.d.ts +3 -0
- package/dist/adapters/prisma/unseen-plain-messages.js +20 -0
- package/dist/adapters/prisma/unseen-plain-messages.js.map +1 -0
- package/dist/adapters/trpc/console.d.ts +1 -10
- package/dist/adapters/trpc/console.js +2 -10
- package/dist/adapters/trpc/console.js.map +1 -1
- package/dist/adapters/trpc/context.d.ts +2 -2
- package/dist/adapters/trpc/fleet.d.ts +12 -1
- package/dist/adapters/trpc/fleet.js +9 -3
- package/dist/adapters/trpc/fleet.js.map +1 -1
- package/dist/adapters/trpc/router.d.ts +17 -11
- package/dist/adapters/trpc/ship.d.ts +6 -2
- package/dist/adapters/trpc/ship.js +4 -2
- package/dist/adapters/trpc/ship.js.map +1 -1
- package/dist/adapters/trpc/trpc.js +1 -0
- package/dist/adapters/trpc/trpc.js.map +1 -1
- package/dist/app.d.ts +4 -0
- package/dist/app.js +71 -2
- package/dist/app.js.map +1 -1
- package/dist/bin/aeolus-core.js +5 -1
- package/dist/bin/aeolus-core.js.map +1 -1
- package/dist/domain/identity/operator-account.d.ts +1 -3
- package/dist/domain/identity/operator-account.js.map +1 -1
- package/dist/domain/identity/ports.d.ts +1 -6
- package/dist/domain/identity/read-account.d.ts +2 -3
- package/dist/domain/identity/read-account.js +1 -2
- package/dist/domain/identity/read-account.js.map +1 -1
- package/dist/domain/messaging/exchange.d.ts +3 -1
- package/dist/domain/messaging/exchange.js +10 -6
- package/dist/domain/messaging/exchange.js.map +1 -1
- package/dist/domain/messaging/fill-message-metadata.d.ts +29 -0
- package/dist/domain/messaging/fill-message-metadata.js +54 -0
- package/dist/domain/messaging/fill-message-metadata.js.map +1 -0
- package/dist/domain/messaging/message.d.ts +4 -0
- package/dist/domain/messaging/message.js +7 -1
- package/dist/domain/messaging/message.js.map +1 -1
- package/dist/domain/messaging/ports.d.ts +62 -2
- 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/read-exchanges.d.ts +1 -0
- package/dist/domain/messaging/read-exchanges.js +2 -1
- package/dist/domain/messaging/read-exchanges.js.map +1 -1
- package/dist/domain/messaging/retired-asker.d.ts +33 -0
- package/dist/domain/messaging/retired-asker.js +81 -0
- package/dist/domain/messaging/retired-asker.js.map +1 -0
- package/dist/domain/messaging/turn-on-sealing.js +1 -1
- package/dist/domain/messaging/turn-on-sealing.js.map +1 -1
- package/dist/domain/registry/commission-ship.d.ts +2 -1
- package/dist/domain/registry/commission-ship.js +3 -2
- package/dist/domain/registry/commission-ship.js.map +1 -1
- package/dist/domain/registry/delete-fleet.d.ts +5 -3
- package/dist/domain/registry/delete-fleet.js +6 -4
- package/dist/domain/registry/delete-fleet.js.map +1 -1
- package/dist/domain/registry/end-leases-after-restore.d.ts +29 -0
- package/dist/domain/registry/end-leases-after-restore.js +31 -0
- package/dist/domain/registry/end-leases-after-restore.js.map +1 -0
- package/dist/domain/registry/found-fleet.js +1 -1
- package/dist/domain/registry/found-fleet.js.map +1 -1
- package/dist/domain/registry/lease.d.ts +3 -2
- package/dist/domain/registry/lease.js.map +1 -1
- package/dist/domain/registry/ports.d.ts +30 -6
- package/dist/domain/registry/public.d.ts +1 -1
- package/dist/domain/registry/read-last-named-owner.d.ts +15 -0
- package/dist/domain/registry/read-last-named-owner.js +15 -0
- package/dist/domain/registry/read-last-named-owner.js.map +1 -0
- package/dist/domain/registry/remove-deleted-fleets.d.ts +30 -0
- package/dist/domain/registry/remove-deleted-fleets.js +54 -0
- package/dist/domain/registry/remove-deleted-fleets.js.map +1 -0
- package/dist/domain/registry/retire-ship.d.ts +6 -2
- package/dist/domain/registry/retire-ship.js +9 -1
- package/dist/domain/registry/retire-ship.js.map +1 -1
- package/dist/domain/registry/ship.d.ts +9 -5
- package/dist/domain/registry/ship.js +33 -4
- package/dist/domain/registry/ship.js.map +1 -1
- package/dist/domain/shared/errors.d.ts +1 -1
- package/dist/domain/shared/errors.js.map +1 -1
- package/dist/domain/shared/follow-fleet.d.ts +5 -3
- package/dist/domain/shared/follow-fleet.js +11 -2
- package/dist/domain/shared/follow-fleet.js.map +1 -1
- package/dist/domain/shared/health-snapshot.js +7 -2
- package/dist/domain/shared/health-snapshot.js.map +1 -1
- package/dist/domain/shared/read-sent-message.d.ts +7 -4
- package/dist/domain/shared/read-sent-message.js +6 -15
- package/dist/domain/shared/read-sent-message.js.map +1 -1
- package/dist/maintenance-pass.d.ts +1 -1
- package/dist/maintenance-pass.js +4 -1
- package/dist/maintenance-pass.js.map +1 -1
- package/dist/testing/container-sweeper.d.ts +20 -0
- package/dist/testing/container-sweeper.js +47 -14
- package/dist/testing/container-sweeper.js.map +1 -1
- package/dist/testing/postgres-global-setup.js +2 -1
- package/dist/testing/postgres-global-setup.js.map +1 -1
- package/dist/testing/stop-container.d.ts +21 -0
- package/dist/testing/stop-container.js +31 -0
- package/dist/testing/stop-container.js.map +1 -0
- package/dist/wiring.d.ts +8 -2
- package/dist/wiring.js +7 -3
- package/dist/wiring.js.map +1 -1
- package/package.json +3 -2
- package/src/adapters/prisma/migrations/20261113120000_events_owner_set_index/migration.sql +4 -0
- package/src/adapters/prisma/migrations/20261115090000_messages_asked_answered_question_id/migration.sql +20 -0
- package/src/adapters/prisma/migrations/20261115100000_unseen_plain_messages/migration.sql +3 -0
- package/src/adapters/prisma/migrations/20261115110000_theme_per_browser/migration.sql +4 -0
- package/src/adapters/prisma/migrations/20261115120000_fleet_deleted_at/migration.sql +2 -0
- package/src/adapters/prisma/schema.prisma +29 -14
- package/dist/domain/identity/set-theme.d.ts +0 -21
- package/dist/domain/identity/set-theme.js +0 -19
- package/dist/domain/identity/set-theme.js.map +0 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isPingContentType } from '@aeolus-fleet/common';
|
|
1
|
+
import { isConventionContentType, isPingContentType } from '@aeolus-fleet/common';
|
|
2
2
|
/**
|
|
3
3
|
* An exchange (docs/design/exchange-read, E1): what one ship and one other
|
|
4
4
|
* ship said to each other, every message one of them sent that reached the
|
|
@@ -26,19 +26,23 @@ export function exchangeCountsOf(change) {
|
|
|
26
26
|
const add = (count) => {
|
|
27
27
|
const key = `${count.shipId} ${count.otherShipId}`;
|
|
28
28
|
const sum = counts.get(key);
|
|
29
|
-
counts.set(key, {
|
|
29
|
+
counts.set(key, {
|
|
30
|
+
...count,
|
|
31
|
+
unacknowledged: (sum?.unacknowledged ?? 0) + count.unacknowledged,
|
|
32
|
+
unseenPlainMessages: (sum?.unseenPlainMessages ?? 0) + count.unseenPlainMessages,
|
|
33
|
+
});
|
|
30
34
|
};
|
|
31
35
|
const isNewReach = after?.reachedShipId != null && after.reachedShipId !== before?.reachedShipId;
|
|
32
36
|
if (before?.reachedShipId != null && isUnacknowledged(before.state)) {
|
|
33
|
-
add({ shipId: before.reachedShipId, otherShipId: before.senderShipId, newestMessageId: before.messageId, unacknowledged: -1 });
|
|
37
|
+
add({ shipId: before.reachedShipId, otherShipId: before.senderShipId, newestMessageId: before.messageId, unacknowledged: -1, unseenPlainMessages: isConventionContentType(before.contentType) ? 0 : -1 });
|
|
34
38
|
}
|
|
35
39
|
if (after?.reachedShipId != null) {
|
|
36
40
|
const reached = { shipId: after.reachedShipId, otherShipId: after.senderShipId, newestMessageId: after.messageId };
|
|
37
|
-
add({ ...reached, unacknowledged: isUnacknowledged(after.state) ? 1 : 0 });
|
|
41
|
+
add({ ...reached, unacknowledged: isUnacknowledged(after.state) ? 1 : 0, unseenPlainMessages: isUnacknowledged(after.state) && !isConventionContentType(after.contentType) ? 1 : 0 });
|
|
38
42
|
if (isNewReach) {
|
|
39
|
-
add({ shipId: after.senderShipId, otherShipId: after.reachedShipId, newestMessageId: after.messageId, unacknowledged: 0 });
|
|
43
|
+
add({ shipId: after.senderShipId, otherShipId: after.reachedShipId, newestMessageId: after.messageId, unacknowledged: 0, unseenPlainMessages: 0 });
|
|
40
44
|
}
|
|
41
45
|
}
|
|
42
|
-
return [...counts.values()].filter((count) => count.unacknowledged !== 0 || isNewReach);
|
|
46
|
+
return [...counts.values()].filter((count) => count.unacknowledged !== 0 || count.unseenPlainMessages !== 0 || isNewReach);
|
|
43
47
|
}
|
|
44
48
|
//# sourceMappingURL=exchange.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exchange.js","sourceRoot":"","sources":["../../../src/domain/messaging/exchange.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAmD,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"exchange.js","sourceRoot":"","sources":["../../../src/domain/messaging/exchange.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import type { FleetId } from '@aeolus-fleet/common';
|
|
2
|
+
import type { FleetRepository } from '../registry/public.js';
|
|
3
|
+
import type { UnitOfWork } from '../shared/unit-of-work.js';
|
|
4
|
+
import type { MessageMetadataFill, MetadataFillIndexes } from './ports.js';
|
|
5
|
+
/** How many messages, and how many exchanges, one batch visits at most: each batch stays one short transaction. */
|
|
6
|
+
export declare const METADATA_FILL_BATCH = 100;
|
|
7
|
+
export interface FillMessageMetadataTx {
|
|
8
|
+
messageMetadataFill: MessageMetadataFill;
|
|
9
|
+
}
|
|
10
|
+
/** One pass; `onFleetError` is told of a fleet whose batch threw, and the pass goes on with the next fleet. Resolves whether every fleet's fill is complete. */
|
|
11
|
+
export type FillMessageMetadata = (onFleetError?: (fleetId: FleetId, error: unknown) => void) => Promise<{
|
|
12
|
+
isComplete: boolean;
|
|
13
|
+
}>;
|
|
14
|
+
/**
|
|
15
|
+
* Use case: the fill after start of the question ids and unseen plain message
|
|
16
|
+
* counts the migrations only added (docs/architecture.md, Backfills), run by
|
|
17
|
+
* core while it serves, never through the API. The first pass builds the
|
|
18
|
+
* indexes the fill and the reads of its unfilled part use. Each pass then
|
|
19
|
+
* takes one batch of each fleet, one unit of work under the fleet's cursor:
|
|
20
|
+
* the next messages by id and the next exchanges by key, and the cursor with
|
|
21
|
+
* them, so a batch that fails rolls back whole and the next pass takes it
|
|
22
|
+
* again. A fleet is complete once both walks reached their end.
|
|
23
|
+
*/
|
|
24
|
+
export declare function createFillMessageMetadata(deps: {
|
|
25
|
+
fleets: Pick<FleetRepository, 'list'>;
|
|
26
|
+
indexes: MetadataFillIndexes;
|
|
27
|
+
uow: UnitOfWork<FillMessageMetadataTx>;
|
|
28
|
+
batch?: number;
|
|
29
|
+
}): FillMessageMetadata;
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import { ok } from '../shared/result.js';
|
|
2
|
+
/** How many messages, and how many exchanges, one batch visits at most: each batch stays one short transaction. */
|
|
3
|
+
export const METADATA_FILL_BATCH = 100;
|
|
4
|
+
/**
|
|
5
|
+
* Use case: the fill after start of the question ids and unseen plain message
|
|
6
|
+
* counts the migrations only added (docs/architecture.md, Backfills), run by
|
|
7
|
+
* core while it serves, never through the API. The first pass builds the
|
|
8
|
+
* indexes the fill and the reads of its unfilled part use. Each pass then
|
|
9
|
+
* takes one batch of each fleet, one unit of work under the fleet's cursor:
|
|
10
|
+
* the next messages by id and the next exchanges by key, and the cursor with
|
|
11
|
+
* them, so a batch that fails rolls back whole and the next pass takes it
|
|
12
|
+
* again. A fleet is complete once both walks reached their end.
|
|
13
|
+
*/
|
|
14
|
+
export function createFillMessageMetadata(deps) {
|
|
15
|
+
const limit = deps.batch ?? METADATA_FILL_BATCH;
|
|
16
|
+
let wasIndexBuildDone = false;
|
|
17
|
+
const fillBatch = (fleetId) => deps.uow.run(async (tx) => {
|
|
18
|
+
const fill = tx.messageMetadataFill;
|
|
19
|
+
const cursor = await fill.lockCursor(fleetId);
|
|
20
|
+
if (cursor.isComplete) {
|
|
21
|
+
return ok(true);
|
|
22
|
+
}
|
|
23
|
+
const messageIds = await fill.fillQuestionIds(fleetId, { after: cursor.afterMessageId, limit });
|
|
24
|
+
const exchanges = await fill.fillUnseenPlainMessages(fleetId, { after: cursor.afterExchange, limit });
|
|
25
|
+
const isComplete = messageIds.length < limit && exchanges.length < limit;
|
|
26
|
+
await fill.saveCursor(fleetId, {
|
|
27
|
+
afterMessageId: messageIds.at(-1) ?? cursor.afterMessageId,
|
|
28
|
+
afterExchange: exchanges.at(-1) ?? cursor.afterExchange,
|
|
29
|
+
isComplete,
|
|
30
|
+
});
|
|
31
|
+
return ok(isComplete);
|
|
32
|
+
});
|
|
33
|
+
return async (onFleetError) => {
|
|
34
|
+
if (!wasIndexBuildDone) {
|
|
35
|
+
if (!await deps.indexes.build()) {
|
|
36
|
+
return { isComplete: false };
|
|
37
|
+
}
|
|
38
|
+
wasIndexBuildDone = true;
|
|
39
|
+
}
|
|
40
|
+
let isComplete = true;
|
|
41
|
+
for (const fleet of await deps.fleets.list()) {
|
|
42
|
+
try {
|
|
43
|
+
const batch = await fillBatch(fleet.id);
|
|
44
|
+
isComplete = isComplete && batch.isOk && batch.value;
|
|
45
|
+
}
|
|
46
|
+
catch (error) {
|
|
47
|
+
isComplete = false;
|
|
48
|
+
onFleetError?.(fleet.id, error);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
return { isComplete };
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
//# sourceMappingURL=fill-message-metadata.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fill-message-metadata.js","sourceRoot":"","sources":["../../../src/domain/messaging/fill-message-metadata.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,EAAE,EAAE,MAAM,qBAAqB,CAAC;AAIzC,mHAAmH;AACnH,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,CAAC;AASvC;;;;;;;;;GASG;AACH,MAAM,UAAU,yBAAyB,CAAC,IAKzC;IACC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,mBAAmB,CAAC;IAChD,IAAI,iBAAiB,GAAG,KAAK,CAAC;IAE9B,MAAM,SAAS,GAAG,CAAC,OAAgB,EAAE,EAAE,CACrC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QACxB,MAAM,IAAI,GAAG,EAAE,CAAC,mBAAmB,CAAC;QACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACtB,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;QAChG,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;QACtG,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,GAAG,KAAK,IAAI,SAAS,CAAC,MAAM,GAAG,KAAK,CAAC;QACzE,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE;YAC7B,cAAc,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,cAAc;YAC1D,aAAa,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,aAAa;YACvD,UAAU;SACX,CAAC,CAAC;QACH,OAAO,EAAE,CAAC,UAAU,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IAEL,OAAO,KAAK,EAAE,YAAY,EAAE,EAAE;QAC5B,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;gBAChC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;YAC/B,CAAC;YACD,iBAAiB,GAAG,IAAI,CAAC;QAC3B,CAAC;QACD,IAAI,UAAU,GAAG,IAAI,CAAC;QACtB,KAAK,MAAM,KAAK,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;YAC7C,IAAI,CAAC;gBACH,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACxC,UAAU,GAAG,UAAU,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC;YACvD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,UAAU,GAAG,KAAK,CAAC;gBACnB,YAAY,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;QACD,OAAO,EAAE,UAAU,EAAE,CAAC;IACxB,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -28,6 +28,10 @@ export interface Message {
|
|
|
28
28
|
requestHash: string;
|
|
29
29
|
/** The uuid of the question a withdrawal or a replacement names, read at send (decision 0068, B18): metadata, so it is found in a sealed fleet too. */
|
|
30
30
|
questionId: string | null;
|
|
31
|
+
/** The uuid of the question a question or a replacement asks, read at send as {@link questionId} is: so its open questions are found in a sealed fleet too (#1632). */
|
|
32
|
+
askedQuestionId: string | null;
|
|
33
|
+
/** The uuid of the question an answer names, read at send as {@link questionId} is. */
|
|
34
|
+
answeredQuestionId: string | null;
|
|
31
35
|
/** The message of the same fleet this one replies to. */
|
|
32
36
|
inReplyToMessageId: MessageId | null;
|
|
33
37
|
/** The message this one resends: an undeliverable one the operator sent again. */
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isPingContentType, withdrawalOf } from '@aeolus-fleet/common';
|
|
1
|
+
import { answeredQuestionIdOf, askedQuestionIdOf, isPingContentType, withdrawalOf } 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';
|
|
@@ -60,6 +60,8 @@ export function acceptMessage(fleet, send) {
|
|
|
60
60
|
selector: recipient,
|
|
61
61
|
payload: send.payload,
|
|
62
62
|
questionId: questionIdOf(send),
|
|
63
|
+
askedQuestionId: askedQuestionIdOf(send),
|
|
64
|
+
answeredQuestionId: answeredQuestionIdOf(send),
|
|
63
65
|
contentType: send.contentType,
|
|
64
66
|
model: send.model ?? null,
|
|
65
67
|
idempotencyKey: send.idempotencyKey,
|
|
@@ -148,6 +150,8 @@ export function acceptContribution(send) {
|
|
|
148
150
|
selector: { kind: 'meeting', meetingId },
|
|
149
151
|
payload: send.payload,
|
|
150
152
|
questionId: questionIdOf(send),
|
|
153
|
+
askedQuestionId: askedQuestionIdOf(send),
|
|
154
|
+
answeredQuestionId: answeredQuestionIdOf(send),
|
|
151
155
|
contentType: send.contentType,
|
|
152
156
|
model: send.model ?? null,
|
|
153
157
|
idempotencyKey: send.idempotencyKey,
|
|
@@ -212,6 +216,8 @@ export function acceptLabelMessage(repliedTo, send) {
|
|
|
212
216
|
selector,
|
|
213
217
|
payload: send.payload,
|
|
214
218
|
questionId: questionIdOf(send),
|
|
219
|
+
askedQuestionId: askedQuestionIdOf(send),
|
|
220
|
+
answeredQuestionId: answeredQuestionIdOf(send),
|
|
215
221
|
contentType: send.contentType,
|
|
216
222
|
model: send.model ?? null,
|
|
217
223
|
idempotencyKey: send.idempotencyKey,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../src/domain/messaging/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAmL,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../src/domain/messaging/message.ts"],"names":[],"mappings":"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"}
|
|
@@ -121,6 +121,12 @@ export interface ScheduleNotifier {
|
|
|
121
121
|
scheduleDue(notice: ScheduleNotice): Promise<void>;
|
|
122
122
|
}
|
|
123
123
|
/** Outbound port: messages, always within one fleet. Never changed once stored. */
|
|
124
|
+
/** A question a ship asked another ship that is still open: its message, the ship it asked and its uuid. */
|
|
125
|
+
export interface OpenQuestion {
|
|
126
|
+
messageId: MessageId;
|
|
127
|
+
askedShipId: ShipId;
|
|
128
|
+
questionId: string;
|
|
129
|
+
}
|
|
124
130
|
export interface MessageRepository {
|
|
125
131
|
create(message: Message): Promise<void>;
|
|
126
132
|
/**
|
|
@@ -133,6 +139,18 @@ export interface MessageRepository {
|
|
|
133
139
|
/** The message the sender stored with this key, if any. */
|
|
134
140
|
findByIdempotencyKey(key: SenderKey): Promise<Message | undefined>;
|
|
135
141
|
find(fleetId: FleetId, messageId: MessageId): Promise<Message | undefined>;
|
|
142
|
+
/**
|
|
143
|
+
* The questions the ship asked another ship that is not retired and that
|
|
144
|
+
* are still open (decision 0038): a question or a replacement not answered
|
|
145
|
+
* by the ship it asked with an answer naming it, nor withdrawn or replaced
|
|
146
|
+
* by the ship itself. By message id, from after the cursor, at most limit:
|
|
147
|
+
* what it withdraws when it retires (#1632).
|
|
148
|
+
*/
|
|
149
|
+
listOpenQuestionsOf(fleetId: FleetId, query: {
|
|
150
|
+
shipId: ShipId;
|
|
151
|
+
after?: MessageId;
|
|
152
|
+
limit: number;
|
|
153
|
+
}): Promise<OpenQuestion[]>;
|
|
136
154
|
/**
|
|
137
155
|
* Holds the fleet's daily message-count lock until the unit of work ends, so
|
|
138
156
|
* two sends at the daily limit never both see room for one more.
|
|
@@ -210,6 +228,7 @@ export interface ListedExchange {
|
|
|
210
228
|
};
|
|
211
229
|
newestMessage: Message;
|
|
212
230
|
unacknowledged: number;
|
|
231
|
+
unseenPlainMessages: number;
|
|
213
232
|
}
|
|
214
233
|
/**
|
|
215
234
|
* Outbound port: the rollup of the person ships' lists of exchanges
|
|
@@ -418,8 +437,8 @@ export interface FleetSealingRepository {
|
|
|
418
437
|
findForUpdate(fleetId: FleetId): Promise<FleetSealing | undefined>;
|
|
419
438
|
/** Whether the fleet stores a payload plain: a message's or a schedule's. */
|
|
420
439
|
storesPlainPayload(fleetId: FleetId): Promise<boolean>;
|
|
421
|
-
/** How many payloads
|
|
422
|
-
|
|
440
|
+
/** How many payloads a fleet not yet sealing has to seal: the messages it stored, pruned ones too, and its plain schedules. */
|
|
441
|
+
payloadsToSeal(fleetId: FleetId): Promise<number>;
|
|
423
442
|
/** Marks the fleet sealing or sealed under its company key, with its first data key, current. */
|
|
424
443
|
turnOn(sealing: FleetSealing, firstKey: StoredDataKey): Promise<void>;
|
|
425
444
|
/** The fleet's data keys, oldest first, each with when it was made and whether it is current: never a wrap. */
|
|
@@ -476,3 +495,44 @@ export interface FleetSealingRepository {
|
|
|
476
495
|
}[];
|
|
477
496
|
}): Promise<void>;
|
|
478
497
|
}
|
|
498
|
+
/** An exchange's key in its fleet: the person ship and the ship it exchanged with. */
|
|
499
|
+
export interface ExchangeKey {
|
|
500
|
+
shipId: ShipId;
|
|
501
|
+
otherShipId: ShipId;
|
|
502
|
+
}
|
|
503
|
+
/**
|
|
504
|
+
* Where a fleet's metadata fill stands (docs/architecture.md, Backfills): the
|
|
505
|
+
* last message it visited by id, the last exchange it visited by key, and
|
|
506
|
+
* whether both walks reached the end.
|
|
507
|
+
*/
|
|
508
|
+
export interface MetadataFillCursor {
|
|
509
|
+
afterMessageId: MessageId | null;
|
|
510
|
+
afterExchange: ExchangeKey | null;
|
|
511
|
+
isComplete: boolean;
|
|
512
|
+
}
|
|
513
|
+
/**
|
|
514
|
+
* Outbound port: the fill after start of what the question id and unseen
|
|
515
|
+
* plain message migrations left empty, always within one fleet. A message
|
|
516
|
+
* stored since then holds its question ids and an exchange made since then
|
|
517
|
+
* its count, so each walk ends.
|
|
518
|
+
*/
|
|
519
|
+
export interface MessageMetadataFill {
|
|
520
|
+
/** The fleet's cursor, held for update until the unit of work ends; a fleet never visited starts at the beginning. */
|
|
521
|
+
lockCursor(fleetId: FleetId): Promise<MetadataFillCursor>;
|
|
522
|
+
/** Fills the question ids of the next messages by id after `after`, at most limit; the ids it visited, in order. */
|
|
523
|
+
fillQuestionIds(fleetId: FleetId, query: {
|
|
524
|
+
after: MessageId | null;
|
|
525
|
+
limit: number;
|
|
526
|
+
}): Promise<MessageId[]>;
|
|
527
|
+
/** Counts the unseen plain messages of each of the next exchanges by key after `after` that holds none, at most limit; the keys it visited, in order. */
|
|
528
|
+
fillUnseenPlainMessages(fleetId: FleetId, query: {
|
|
529
|
+
after: ExchangeKey | null;
|
|
530
|
+
limit: number;
|
|
531
|
+
}): Promise<ExchangeKey[]>;
|
|
532
|
+
saveCursor(fleetId: FleetId, cursor: MetadataFillCursor): Promise<void>;
|
|
533
|
+
}
|
|
534
|
+
/** Outbound port: the indexes the fill and the reads of what it has not filled yet use, built while core serves, without holding writes. */
|
|
535
|
+
export interface MetadataFillIndexes {
|
|
536
|
+
/** Builds each one that is not there or not valid; false means a build stopped or another core holds it. */
|
|
537
|
+
build(): Promise<boolean>;
|
|
538
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
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 { withdrawQuestionsOnRetire, type RetiredAskerTx } from './retired-asker.js';
|
|
3
4
|
export { cancelSchedulesOnRetire, lockSchedulesOf, type RetiredSchedulerTx } from './retired-scheduler.js';
|
|
4
5
|
export type { FleetSealingRepository, RequestHasher } from './ports.js';
|
|
5
6
|
export type { CompanyKeyUnavailableReason } from './fleet-sealing.js';
|
|
@@ -2,6 +2,7 @@
|
|
|
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 { withdrawQuestionsOnRetire } from './retired-asker.js';
|
|
5
6
|
export { cancelSchedulesOnRetire, lockSchedulesOf } from './retired-scheduler.js';
|
|
6
7
|
export { DATA_KEY_CACHE_MS, heldForList, heldForRead, listedUnsealed, plainForRead, withDataKeys, UNREADABLE_PAYLOAD, } from './data-keys.js';
|
|
7
8
|
export { isSealedPayload } from './sealed-payload.js';
|
|
@@ -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;AAC5G,OAAO,EAAE,uBAAuB,EAAE,eAAe,EAA2B,MAAM,wBAAwB,CAAC;AAI3G,OAAO,EACL,iBAAiB,EACjB,WAAW,EACX,WAAW,EACX,cAAc,EACd,YAAY,EACZ,YAAY,EAMZ,kBAAkB,GACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAsB,MAAM,qBAAqB,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,yBAAyB,EAAuB,MAAM,oBAAoB,CAAC;AACpF,OAAO,EAAE,uBAAuB,EAAE,eAAe,EAA2B,MAAM,wBAAwB,CAAC;AAI3G,OAAO,EACL,iBAAiB,EACjB,WAAW,EACX,WAAW,EACX,cAAc,EACd,YAAY,EACZ,YAAY,EAMZ,kBAAkB,GACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAsB,MAAM,qBAAqB,CAAC"}
|
|
@@ -20,7 +20,7 @@ export function createReadExchanges(deps) {
|
|
|
20
20
|
}
|
|
21
21
|
const page = await tx.exchanges.page({ fleetId: crew.fleetId, shipId: crew.shipId, cursor, limit });
|
|
22
22
|
const items = [];
|
|
23
|
-
for (const { otherShip, newestMessage: message, unacknowledged } of page.items) {
|
|
23
|
+
for (const { otherShip, newestMessage: message, unacknowledged, unseenPlainMessages } of page.items) {
|
|
24
24
|
const payload = listedUnsealed(keys, { row: { fleetId: message.fleetId, rowId: message.id }, payload: message.payload });
|
|
25
25
|
if (!payload.isOk) {
|
|
26
26
|
return payload;
|
|
@@ -31,6 +31,7 @@ export function createReadExchanges(deps) {
|
|
|
31
31
|
otherShipType: otherShip.type,
|
|
32
32
|
otherShipKind: otherShip.kind,
|
|
33
33
|
unacknowledged,
|
|
34
|
+
unseenPlainMessages,
|
|
34
35
|
newestMessage: { messageId: message.id, senderShipId: message.senderShipId, payload: payload.value, contentType: message.contentType, sentAt: message.createdAt },
|
|
35
36
|
});
|
|
36
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-exchanges.js","sourceRoot":"","sources":["../../../src/domain/messaging/read-exchanges.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAA8C,MAAM,sBAAsB,CAAC;AAE5G,OAAO,EAAE,SAAS,EAAqC,MAAM,uBAAuB,CAAC;AAIrF,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAgE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"read-exchanges.js","sourceRoot":"","sources":["../../../src/domain/messaging/read-exchanges.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAA8C,MAAM,sBAAsB,CAAC;AAE5G,OAAO,EAAE,SAAS,EAAqC,MAAM,uBAAuB,CAAC;AAIrF,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAgE,MAAM,gBAAgB,CAAC;AAsBnI;;;;;;;;;GASG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAAmE;IACrG,OAAO,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,GAAG,wBAAwB,EAAE,EAAE,EAAE,CAC5D,mBAAmB,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAC7E,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAA2F,EAAE;QACjH,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QACpG,MAAM,KAAK,GAAqB,EAAE,CAAC;QACnC,KAAK,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACpG,MAAM,OAAO,GAAG,cAAc,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YACzH,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBAClB,OAAO,OAAO,CAAC;YACjB,CAAC;YACD,KAAK,CAAC,IAAI,CAAC;gBACT,WAAW,EAAE,SAAS,CAAC,EAAE;gBACzB,aAAa,EAAE,SAAS,CAAC,IAAI;gBAC7B,aAAa,EAAE,SAAS,CAAC,IAAI;gBAC7B,aAAa,EAAE,SAAS,CAAC,IAAI;gBAC7B,cAAc;gBACd,mBAAmB;gBACnB,aAAa,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,SAAS,EAAE;aAClK,CAAC,CAAC;QACL,CAAC;QACD,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IACpD,CAAC,CAAC,CACH,CAAC;AACN,CAAC"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { type FleetId, type IdGenerator, type ShipId } from '@aeolus-fleet/common';
|
|
2
|
+
import { type Actor } from '../shared/events.js';
|
|
3
|
+
import { type Result } from '../shared/result.js';
|
|
4
|
+
import { type DataKeysNeeded, type HeldDataKeys } from './data-keys.js';
|
|
5
|
+
import type { MeetingNoticeTx } from './meeting-notice.js';
|
|
6
|
+
import { type AcceptRefusal } from './message.js';
|
|
7
|
+
import type { MessageRepository, RequestHasher } from './ports.js';
|
|
8
|
+
export interface RetiredAskerTx extends Omit<MeetingNoticeTx, 'messages'> {
|
|
9
|
+
messages: Pick<MessageRepository, 'create' | 'listOpenQuestionsOf'>;
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* Within the retire's unit of work, withdraws every question the retiring
|
|
13
|
+
* ship asked that is still open (#1632, decision 0038): one withdrawal from
|
|
14
|
+
* it to the ship it asked, naming the question's uuid, as its own `withdraw`
|
|
15
|
+
* sends it, with its pending delivery, MessageAccepted caused by the retire's
|
|
16
|
+
* actor, and the notice that wakes the asked ship. The asked ship then shows
|
|
17
|
+
* the question as a withdrawn one goes, and no answer is written to a ship
|
|
18
|
+
* that is never addressed again. No model: the retire is no session's
|
|
19
|
+
* message. Which questions are open is read from the question uuids stored
|
|
20
|
+
* at send, a page at a time, so no stored payload is opened: only the
|
|
21
|
+
* withdrawal is sealed, under the current data key.
|
|
22
|
+
*/
|
|
23
|
+
export declare function withdrawQuestionsOnRetire(deps: {
|
|
24
|
+
tx: RetiredAskerTx;
|
|
25
|
+
ids: IdGenerator;
|
|
26
|
+
hasher: RequestHasher;
|
|
27
|
+
held: HeldDataKeys;
|
|
28
|
+
}, retire: {
|
|
29
|
+
fleetId: FleetId;
|
|
30
|
+
shipId: ShipId;
|
|
31
|
+
actor: Actor;
|
|
32
|
+
at: Date;
|
|
33
|
+
}): Promise<Result<undefined, AcceptRefusal | DataKeysNeeded>>;
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
import { WITHDRAWAL_CONTENT_TYPE } from '@aeolus-fleet/common';
|
|
2
|
+
import { recordEvent } from '../shared/events.js';
|
|
3
|
+
import { ok } from '../shared/result.js';
|
|
4
|
+
import { sealedMessage } from './data-keys.js';
|
|
5
|
+
import { acceptMessage } from './message.js';
|
|
6
|
+
import { sendRequestText } from './send-request.js';
|
|
7
|
+
/** The open questions read at a time: each page is withdrawn before the next is read. */
|
|
8
|
+
const OPEN_QUESTIONS_PAGE = 100;
|
|
9
|
+
/**
|
|
10
|
+
* Within the retire's unit of work, withdraws every question the retiring
|
|
11
|
+
* ship asked that is still open (#1632, decision 0038): one withdrawal from
|
|
12
|
+
* it to the ship it asked, naming the question's uuid, as its own `withdraw`
|
|
13
|
+
* sends it, with its pending delivery, MessageAccepted caused by the retire's
|
|
14
|
+
* actor, and the notice that wakes the asked ship. The asked ship then shows
|
|
15
|
+
* the question as a withdrawn one goes, and no answer is written to a ship
|
|
16
|
+
* that is never addressed again. No model: the retire is no session's
|
|
17
|
+
* message. Which questions are open is read from the question uuids stored
|
|
18
|
+
* at send, a page at a time, so no stored payload is opened: only the
|
|
19
|
+
* withdrawal is sealed, under the current data key.
|
|
20
|
+
*/
|
|
21
|
+
export async function withdrawQuestionsOnRetire(deps, retire) {
|
|
22
|
+
let after;
|
|
23
|
+
for (;;) {
|
|
24
|
+
const page = await deps.tx.messages.listOpenQuestionsOf(retire.fleetId, { shipId: retire.shipId, ...(after === undefined ? {} : { after }), limit: OPEN_QUESTIONS_PAGE });
|
|
25
|
+
for (const open of page) {
|
|
26
|
+
const withdrawn = await sendWithdrawal(deps, { ...retire, ...open });
|
|
27
|
+
if (!withdrawn.isOk) {
|
|
28
|
+
return withdrawn;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
const last = page.at(-1);
|
|
32
|
+
if (page.length < OPEN_QUESTIONS_PAGE || last === undefined) {
|
|
33
|
+
return ok(undefined);
|
|
34
|
+
}
|
|
35
|
+
after = last.messageId;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
/** The withdrawal of one question, stored as a send stores it: sealed in a sealed fleet (decision 0068). */
|
|
39
|
+
async function sendWithdrawal(deps, withdrawal) {
|
|
40
|
+
const { tx, ids, hasher } = deps;
|
|
41
|
+
const { fleetId, at } = withdrawal;
|
|
42
|
+
const recipient = { kind: 'ship', shipId: withdrawal.askedShipId };
|
|
43
|
+
const payload = JSON.stringify({ questionId: withdrawal.questionId });
|
|
44
|
+
const contentType = WITHDRAWAL_CONTENT_TYPE;
|
|
45
|
+
const messageId = ids('message');
|
|
46
|
+
const accepted = acceptMessage({ recipient, repliedTo: undefined }, {
|
|
47
|
+
messageId,
|
|
48
|
+
deliveryId: ids('delivery'),
|
|
49
|
+
fleetId,
|
|
50
|
+
senderShipId: withdrawal.shipId,
|
|
51
|
+
payload,
|
|
52
|
+
contentType,
|
|
53
|
+
model: undefined,
|
|
54
|
+
// The fleet's own key for the withdrawal, as a meeting notice's is: one per message.
|
|
55
|
+
idempotencyKey: `retire-withdrawal-${messageId}`,
|
|
56
|
+
requestHash: hasher.hash(sendRequestText({ selector: recipient, payload, contentType, inReplyTo: undefined, isForced: false })),
|
|
57
|
+
inReplyTo: undefined,
|
|
58
|
+
isForced: false,
|
|
59
|
+
actor: withdrawal.actor,
|
|
60
|
+
at,
|
|
61
|
+
});
|
|
62
|
+
if (!accepted.isOk) {
|
|
63
|
+
return accepted;
|
|
64
|
+
}
|
|
65
|
+
const message = await sealedMessage(deps, {
|
|
66
|
+
message: accepted.value.message,
|
|
67
|
+
sealedRequestHash: hasher.hash(sendRequestText({ selector: recipient, payload: undefined, contentType, inReplyTo: undefined, isForced: false })),
|
|
68
|
+
});
|
|
69
|
+
if (!message.isOk) {
|
|
70
|
+
return message;
|
|
71
|
+
}
|
|
72
|
+
const { delivery, events } = accepted.value;
|
|
73
|
+
await tx.messages.create(message.value);
|
|
74
|
+
await tx.deliveries.create(delivery, message.value);
|
|
75
|
+
for (const event of events) {
|
|
76
|
+
await recordEvent({ events: tx.events, ids }, event);
|
|
77
|
+
}
|
|
78
|
+
await tx.notifier.deliveryPending({ fleetId, deliveryId: delivery.id, recipient: delivery.recipient });
|
|
79
|
+
return ok(undefined);
|
|
80
|
+
}
|
|
81
|
+
//# sourceMappingURL=retired-asker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"retired-asker.js","sourceRoot":"","sources":["../../../src/domain/messaging/retired-asker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAA+D,MAAM,sBAAsB,CAAC;AAE5H,OAAO,EAAE,WAAW,EAAc,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,aAAa,EAA0C,MAAM,gBAAgB,CAAC;AAEvF,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAMpD,yFAAyF;AACzF,MAAM,mBAAmB,GAAG,GAAG,CAAC;AAEhC;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,IAAyF,EACzF,MAAoE;IAEpE,IAAI,KAA4B,CAAC;IACjC,SAAS,CAAC;QACR,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC,CAAC;QAC1K,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;YACxB,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,EAAE,GAAG,MAAM,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;YACrE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;gBACpB,OAAO,SAAS,CAAC;YACnB,CAAC;QACH,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACzB,IAAI,IAAI,CAAC,MAAM,GAAG,mBAAmB,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YAC5D,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;QACvB,CAAC;QACD,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC;IACzB,CAAC;AACH,CAAC;AAED,4GAA4G;AAC5G,KAAK,UAAU,cAAc,CAC3B,IAAyF,EACzF,UAAuF;IAEvF,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,UAAU,CAAC;IACnC,MAAM,SAAS,GAAG,EAAE,IAAI,EAAE,MAAe,EAAE,MAAM,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC;IAC5E,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC;IACtE,MAAM,WAAW,GAAG,uBAAuB,CAAC;IAC5C,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC;IACjC,MAAM,QAAQ,GAAG,aAAa,CAC5B,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,EACnC;QACE,SAAS;QACT,UAAU,EAAE,GAAG,CAAC,UAAU,CAAC;QAC3B,OAAO;QACP,YAAY,EAAE,UAAU,CAAC,MAAM;QAC/B,OAAO;QACP,WAAW;QACX,KAAK,EAAE,SAAS;QAChB,qFAAqF;QACrF,cAAc,EAAE,qBAAqB,SAAS,EAAE;QAChD,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;QAC/H,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,KAAK;QACf,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,EAAE;KACH,CACF,CAAC;IACF,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnB,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE;QACxC,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,OAAO;QAC/B,iBAAiB,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;KACjJ,CAAC,CAAC;IACH,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC;IAC5C,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACxC,MAAM,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IACpD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,WAAW,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,KAAK,CAAC,CAAC;IACvD,CAAC;IACD,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;IACvG,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC"}
|
|
@@ -54,7 +54,7 @@ export function createTurnOnSealing(deps) {
|
|
|
54
54
|
const checkValue = deps.sealer.checkValue(made.value.unwrapped);
|
|
55
55
|
const wrappedByRecoveryKey = recoveryKey === null ? null : await deps.recoveryKeys.wrap(recoveryKey, made.value.unwrapped);
|
|
56
56
|
// Counted outside the unit of work, so a fleet with a long history keeps its sends going while it counts.
|
|
57
|
-
const toSeal = await deps.sealings.
|
|
57
|
+
const toSeal = await deps.sealings.payloadsToSeal(fleetId);
|
|
58
58
|
const turnedOn = recoveryKey === null ? { companyKey } : { companyKey, recoveryKeyFingerprint: recoveryKey.fingerprint };
|
|
59
59
|
return deps.uow.run(async (tx) => {
|
|
60
60
|
// Held until sealing is on, so the flag cannot go off while the fleet turns sealing on (decision 0069).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turn-on-sealing.js","sourceRoot":"","sources":["../../../src/domain/messaging/turn-on-sealing.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,kBAAkB,EAAqD,MAAM,uBAAuB,CAAC;AAC1J,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAe,MAAM,qBAAqB,CAAC;AAErE,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,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGzD,OAAO,EAAE,WAAW,IAAI,aAAa,EAAuC,MAAM,mBAAmB,CAAC;AAoBtG;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAWnC;IACC,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;QAC7B,MAAM,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;QAC7B,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;YACpC,OAAO,MAAM,CAAC,WAAW,EAAE,+CAA+C,CAAC,CAAC;QAC9E,CAAC;QACD,IAAI,WAAW,GAAuB,IAAI,CAAC;QAC3C,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACpC,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;YACnE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;gBACjB,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;QAC7B,CAAC;QACD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;QAC3B,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QACxF,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAClB,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;YACtD,OAAO,MAAM,CAAC,sBAAsB,EAAE,SAAS,OAAO,oBAAoB,CAAC,CAAC;QAC9E,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAChE,MAAM,oBAAoB,GAAG,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC3H,0GAA0G;QAC1G,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"turn-on-sealing.js","sourceRoot":"","sources":["../../../src/domain/messaging/turn-on-sealing.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,kBAAkB,EAAqD,MAAM,uBAAuB,CAAC;AAC1J,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAe,MAAM,qBAAqB,CAAC;AAErE,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,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGzD,OAAO,EAAE,WAAW,IAAI,aAAa,EAAuC,MAAM,mBAAmB,CAAC;AAoBtG;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAWnC;IACC,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;QAC7B,MAAM,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;QAC7B,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;YACpC,OAAO,MAAM,CAAC,WAAW,EAAE,+CAA+C,CAAC,CAAC;QAC9E,CAAC;QACD,IAAI,WAAW,GAAuB,IAAI,CAAC;QAC3C,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACpC,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;YACnE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;gBACjB,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;QAC7B,CAAC;QACD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;QAC3B,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QACxF,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAClB,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;YACtD,OAAO,MAAM,CAAC,sBAAsB,EAAE,SAAS,OAAO,oBAAoB,CAAC,CAAC;QAC9E,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAChE,MAAM,oBAAoB,GAAG,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC3H,0GAA0G;QAC1G,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAmE,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,sBAAsB,EAAE,WAAW,CAAC,WAAW,EAAE,CAAC;QAEzL,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAA0D,EAAE;YACvF,wGAAwG;YACxG,MAAM,YAAY,GAAG,kBAAkB,CAAC,SAAS,EAAE,MAAM,wBAAwB,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;YAC/K,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;gBACvB,OAAO,YAAY,CAAC;YACtB,CAAC;YACD,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;gBAC7D,OAAO,MAAM,CAAC,sBAAsB,EAAE,SAAS,OAAO,oBAAoB,CAAC,CAAC;YAC9E,CAAC;YACD,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;YAC5B,MAAM,KAAK,GAAiB,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;YACnG,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CACtB,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,eAAe,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAC5K,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,mBAAmB,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAChJ,CAAC;YACF,MAAM,WAAW,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,sBAAsB,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC9J,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -63,7 +63,8 @@ export declare function personShipKey(accountId: AccountId): string;
|
|
|
63
63
|
* name is locked after the name. It carries the label values given, each of
|
|
64
64
|
* a label the caller defined or one it carries (decision 0053). Its owner is the caller's owner, the caller
|
|
65
65
|
* when it is a person ship, or an account's person ship, commissioned first
|
|
66
|
-
* when the account has none (decisions 0052, 0057);
|
|
66
|
+
* when the account has none (decisions 0052, 0057); argo signed in to the
|
|
67
|
+
* console names an agent ship's owner, an active person ship; a caller
|
|
67
68
|
* holding fleet:on-behalf may name the ship that asked it instead, whose owner
|
|
68
69
|
* it gets, or for an app ship the owner argo picked (decision 0045). The
|
|
69
70
|
* caller's idempotency key, its own apart from every other actor's, makes
|
|
@@ -140,7 +140,7 @@ async function commissioningActorOf(tx, ref) {
|
|
|
140
140
|
const { caller } = ref;
|
|
141
141
|
if (isShipCaller(caller)) {
|
|
142
142
|
const ship = await (ref.isApproval ? findShipWithOwnerHeld : findWithOwnerHeld)(tx, { fleetId: caller.fleetId, shipId: caller.shipId });
|
|
143
|
-
return ship && { kind: 'ship', ship };
|
|
143
|
+
return ship && { kind: 'ship', ship, isConsoleSignIn: caller.consoleSessionId !== undefined };
|
|
144
144
|
}
|
|
145
145
|
if (caller.kind === 'account') {
|
|
146
146
|
const personShip = caller.personShipId === null ? undefined : await tx.ships.findForShare(caller.fleetId, caller.personShipId);
|
|
@@ -160,7 +160,8 @@ async function commissioningActorOf(tx, ref) {
|
|
|
160
160
|
* name is locked after the name. It carries the label values given, each of
|
|
161
161
|
* a label the caller defined or one it carries (decision 0053). Its owner is the caller's owner, the caller
|
|
162
162
|
* when it is a person ship, or an account's person ship, commissioned first
|
|
163
|
-
* when the account has none (decisions 0052, 0057);
|
|
163
|
+
* when the account has none (decisions 0052, 0057); argo signed in to the
|
|
164
|
+
* console names an agent ship's owner, an active person ship; a caller
|
|
164
165
|
* holding fleet:on-behalf may name the ship that asked it instead, whose owner
|
|
165
166
|
* it gets, or for an app ship the owner argo picked (decision 0045). The
|
|
166
167
|
* caller's idempotency key, its own apart from every other actor's, makes
|