@aeolus-fleet/core 0.28.2 → 0.29.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 +8 -6
- package/dist/adapters/cli/fleet-init.d.ts +8 -4
- package/dist/adapters/cli/fleet-init.js +19 -35
- package/dist/adapters/cli/fleet-init.js.map +1 -1
- package/dist/adapters/cli/run.d.ts +1 -0
- package/dist/adapters/cli/run.js +1 -1
- package/dist/adapters/cli/run.js.map +1 -1
- package/dist/adapters/cli/sign-in-link.d.ts +4 -0
- package/dist/adapters/cli/sign-in-link.js +9 -0
- package/dist/adapters/cli/sign-in-link.js.map +1 -0
- package/dist/adapters/cli/sign-in.d.ts +14 -0
- package/dist/adapters/cli/sign-in.js +36 -0
- package/dist/adapters/cli/sign-in.js.map +1 -0
- package/dist/adapters/http/request-credentials.d.ts +18 -0
- package/dist/adapters/http/request-credentials.js +28 -3
- package/dist/adapters/http/request-credentials.js.map +1 -1
- package/dist/adapters/http/server.js +10 -3
- package/dist/adapters/http/server.js.map +1 -1
- package/dist/adapters/prisma/generated/browser.d.ts +16 -8
- package/dist/adapters/prisma/generated/client.d.ts +16 -8
- package/dist/adapters/prisma/generated/enums.d.ts +2 -0
- package/dist/adapters/prisma/generated/enums.js +4 -2
- package/dist/adapters/prisma/generated/enums.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/class.d.ts +22 -11
- 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 +168 -83
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js +15 -6
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.d.ts +17 -7
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js +15 -6
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js.map +1 -1
- package/dist/adapters/prisma/generated/models/AccountGuideProgress.d.ts +1220 -0
- package/dist/adapters/prisma/generated/models/AccountGuideProgress.js +2 -0
- package/dist/adapters/prisma/generated/models/AccountGuideProgress.js.map +1 -0
- package/dist/adapters/prisma/generated/models/AccountNoticeDismissal.d.ts +1148 -0
- package/dist/adapters/prisma/generated/models/AccountNoticeDismissal.js +2 -0
- package/dist/adapters/prisma/generated/models/AccountNoticeDismissal.js.map +1 -0
- package/dist/adapters/prisma/generated/models/Fleet.d.ts +622 -307
- package/dist/adapters/prisma/generated/models/Operator.d.ts +20 -19
- package/dist/adapters/prisma/generated/models/Ship.d.ts +0 -310
- package/dist/adapters/prisma/generated/models.d.ts +2 -1
- package/dist/adapters/prisma/identity.d.ts +1 -0
- package/dist/adapters/prisma/identity.js +48 -5
- package/dist/adapters/prisma/identity.js.map +1 -1
- package/dist/adapters/prisma/messaging.js +8 -0
- package/dist/adapters/prisma/messaging.js.map +1 -1
- package/dist/adapters/prisma/registry.d.ts +9 -0
- package/dist/adapters/prisma/registry.js +56 -34
- package/dist/adapters/prisma/registry.js.map +1 -1
- package/dist/adapters/prisma/rows.js +1 -1
- package/dist/adapters/prisma/rows.js.map +1 -1
- package/dist/adapters/prisma/unit-of-work.d.ts +1 -2
- package/dist/adapters/prisma/unit-of-work.js +0 -2
- package/dist/adapters/prisma/unit-of-work.js.map +1 -1
- package/dist/adapters/trpc/console.d.ts +54 -14
- package/dist/adapters/trpc/console.js +69 -17
- package/dist/adapters/trpc/console.js.map +1 -1
- package/dist/adapters/trpc/context.d.ts +15 -2
- package/dist/adapters/trpc/fleet.d.ts +35 -16
- package/dist/adapters/trpc/fleet.js +23 -31
- package/dist/adapters/trpc/fleet.js.map +1 -1
- package/dist/adapters/trpc/installation.d.ts +14 -6
- package/dist/adapters/trpc/installation.js +7 -1
- package/dist/adapters/trpc/installation.js.map +1 -1
- package/dist/adapters/trpc/router.d.ts +113 -26
- package/dist/adapters/trpc/ship-protocol.js +1 -0
- package/dist/adapters/trpc/ship-protocol.js.map +1 -1
- package/dist/adapters/trpc/ship.d.ts +35 -2
- package/dist/adapters/trpc/ship.js +21 -1
- package/dist/adapters/trpc/ship.js.map +1 -1
- package/dist/adapters/trpc/trpc.d.ts +19 -2
- package/dist/adapters/trpc/trpc.js +37 -5
- package/dist/adapters/trpc/trpc.js.map +1 -1
- package/dist/bin/aeolus-core.js +6 -2
- package/dist/bin/aeolus-core.js.map +1 -1
- package/dist/domain/identity/authenticate-account.js +2 -0
- package/dist/domain/identity/authenticate-account.js.map +1 -1
- package/dist/domain/identity/dismiss-notice.d.ts +2 -2
- package/dist/domain/identity/dismiss-notice.js +5 -5
- package/dist/domain/identity/dismiss-notice.js.map +1 -1
- package/dist/domain/identity/issue-sign-in-link.d.ts +35 -0
- package/dist/domain/identity/issue-sign-in-link.js +27 -0
- package/dist/domain/identity/issue-sign-in-link.js.map +1 -0
- package/dist/domain/identity/notice.d.ts +18 -3
- package/dist/domain/identity/notice.js +19 -1
- package/dist/domain/identity/notice.js.map +1 -1
- package/dist/domain/identity/operator-account.d.ts +5 -3
- package/dist/domain/identity/operator-account.js.map +1 -1
- package/dist/domain/identity/ports.d.ts +18 -8
- package/dist/domain/identity/read-account.d.ts +6 -4
- package/dist/domain/identity/read-account.js +4 -2
- package/dist/domain/identity/read-account.js.map +1 -1
- package/dist/domain/identity/read-argo-sign-in.d.ts +30 -0
- package/dist/domain/identity/read-argo-sign-in.js +22 -0
- package/dist/domain/identity/read-argo-sign-in.js.map +1 -0
- package/dist/domain/identity/read-guide.d.ts +2 -2
- package/dist/domain/identity/read-guide.js +4 -4
- package/dist/domain/identity/read-guide.js.map +1 -1
- package/dist/domain/identity/read-notices.d.ts +4 -3
- package/dist/domain/identity/read-notices.js +7 -6
- package/dist/domain/identity/read-notices.js.map +1 -1
- package/dist/domain/identity/record-guide-progress.d.ts +2 -2
- package/dist/domain/identity/record-guide-progress.js +4 -4
- package/dist/domain/identity/record-guide-progress.js.map +1 -1
- package/dist/domain/identity/reset-operator-password.js +4 -0
- package/dist/domain/identity/reset-operator-password.js.map +1 -1
- package/dist/domain/identity/set-operator-login.d.ts +44 -0
- package/dist/domain/identity/set-operator-login.js +70 -0
- package/dist/domain/identity/set-operator-login.js.map +1 -0
- package/dist/domain/identity/sign-in-ticket.d.ts +2 -0
- package/dist/domain/identity/sign-in-ticket.js +2 -0
- package/dist/domain/identity/sign-in-ticket.js.map +1 -1
- package/dist/domain/identity/sign-out-account.d.ts +24 -0
- package/dist/domain/identity/sign-out-account.js +25 -0
- package/dist/domain/identity/sign-out-account.js.map +1 -0
- package/dist/domain/messaging/delivery.d.ts +16 -4
- package/dist/domain/messaging/delivery.js +18 -1
- package/dist/domain/messaging/delivery.js.map +1 -1
- package/dist/domain/messaging/dismiss-delivery.d.ts +2 -2
- package/dist/domain/messaging/dismiss-delivery.js +2 -1
- package/dist/domain/messaging/dismiss-delivery.js.map +1 -1
- package/dist/domain/messaging/message.d.ts +7 -7
- package/dist/domain/messaging/message.js +4 -4
- package/dist/domain/messaging/message.js.map +1 -1
- package/dist/domain/messaging/ping-ship.d.ts +8 -6
- package/dist/domain/messaging/ping-ship.js +17 -3
- package/dist/domain/messaging/ping-ship.js.map +1 -1
- package/dist/domain/messaging/ports.d.ts +2 -0
- package/dist/domain/messaging/read-delivery.d.ts +33 -0
- package/dist/domain/messaging/read-delivery.js +38 -0
- package/dist/domain/messaging/read-delivery.js.map +1 -0
- package/dist/domain/messaging/resend-delivery.d.ts +2 -2
- package/dist/domain/messaging/resend-delivery.js +5 -3
- package/dist/domain/messaging/resend-delivery.js.map +1 -1
- package/dist/domain/messaging/send-message.d.ts +2 -1
- package/dist/domain/messaging/send-message.js +1 -0
- package/dist/domain/messaging/send-message.js.map +1 -1
- package/dist/domain/registry/assign-crew.d.ts +2 -2
- package/dist/domain/registry/assign-crew.js.map +1 -1
- package/dist/domain/registry/check-reach.d.ts +2 -7
- package/dist/domain/registry/check-reach.js +3 -4
- package/dist/domain/registry/check-reach.js.map +1 -1
- package/dist/domain/registry/crew-request.d.ts +2 -2
- package/dist/domain/registry/crew-request.js +2 -2
- package/dist/domain/registry/crew-request.js.map +1 -1
- package/dist/domain/registry/discover.d.ts +0 -1
- package/dist/domain/registry/discover.js.map +1 -1
- package/dist/domain/registry/explain-crew-request.d.ts +2 -2
- package/dist/domain/registry/explain-crew-request.js.map +1 -1
- package/dist/domain/registry/explain-reach.d.ts +0 -1
- package/dist/domain/registry/explain-reach.js.map +1 -1
- package/dist/domain/registry/found-fleet.d.ts +2 -2
- package/dist/domain/registry/found-fleet.js +1 -1
- package/dist/domain/registry/found-fleet.js.map +1 -1
- package/dist/domain/registry/get-ship.d.ts +5 -3
- package/dist/domain/registry/get-ship.js +6 -2
- package/dist/domain/registry/get-ship.js.map +1 -1
- package/dist/domain/registry/initialise-fleet.d.ts +7 -10
- package/dist/domain/registry/initialise-fleet.js +7 -17
- package/dist/domain/registry/initialise-fleet.js.map +1 -1
- package/dist/domain/registry/network-settings.d.ts +2 -4
- package/dist/domain/registry/network-settings.js +2 -2
- package/dist/domain/registry/network-settings.js.map +1 -1
- package/dist/domain/registry/ports.d.ts +4 -10
- package/dist/domain/registry/read-fleet-name.d.ts +15 -0
- package/dist/domain/registry/read-fleet-name.js +10 -0
- package/dist/domain/registry/read-fleet-name.js.map +1 -0
- package/dist/domain/registry/read-reach.d.ts +2 -3
- package/dist/domain/registry/read-reach.js +3 -4
- package/dist/domain/registry/read-reach.js.map +1 -1
- package/dist/domain/registry/recrew-ship.d.ts +2 -2
- package/dist/domain/registry/recrew-ship.js +0 -2
- package/dist/domain/registry/recrew-ship.js.map +1 -1
- package/dist/domain/registry/release-ship.d.ts +3 -4
- package/dist/domain/registry/release-ship.js +2 -4
- package/dist/domain/registry/release-ship.js.map +1 -1
- package/dist/domain/registry/remove-crew-request.d.ts +2 -2
- package/dist/domain/registry/remove-crew-request.js.map +1 -1
- package/dist/domain/registry/request-crew.d.ts +2 -2
- package/dist/domain/registry/request-crew.js.map +1 -1
- package/dist/domain/registry/request-worktree-clear.d.ts +6 -5
- package/dist/domain/registry/request-worktree-clear.js +13 -3
- package/dist/domain/registry/request-worktree-clear.js.map +1 -1
- package/dist/domain/registry/retire-ship.d.ts +2 -2
- package/dist/domain/registry/retire-ship.js +5 -2
- package/dist/domain/registry/retire-ship.js.map +1 -1
- package/dist/domain/registry/ship.d.ts +2 -1
- package/dist/domain/registry/ship.js +12 -4
- package/dist/domain/registry/ship.js.map +1 -1
- package/dist/domain/registry/verified-facts.js +1 -0
- package/dist/domain/registry/verified-facts.js.map +1 -1
- package/dist/domain/shared/caller.d.ts +4 -0
- package/dist/domain/shared/caller.js +1 -0
- package/dist/domain/shared/caller.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/read-fleet-limits.d.ts +2 -2
- package/dist/domain/shared/read-health.d.ts +2 -2
- package/dist/domain/shared/read-inbox.d.ts +5 -4
- package/dist/domain/shared/read-inbox.js +5 -3
- package/dist/domain/shared/read-inbox.js.map +1 -1
- package/dist/domain/shared/read-message.d.ts +2 -2
- package/dist/domain/shared/read-needs-attention.d.ts +2 -2
- package/dist/domain/shared/read-ship-messages.d.ts +2 -2
- package/dist/domain/shared/read-ship-timeline.d.ts +2 -2
- package/dist/domain/shared/read-ship-way.d.ts +2 -2
- package/dist/domain/shared/read-ship-way.js +2 -1
- package/dist/domain/shared/read-ship-way.js.map +1 -1
- package/dist/wiring.d.ts +12 -2
- package/dist/wiring.js +14 -3
- package/dist/wiring.js.map +1 -1
- package/package.json +3 -2
- package/src/adapters/prisma/migrations/20261021090000_fleet_listing_indexes/migration.sql +9 -0
- package/src/adapters/prisma/migrations/20261021120000_operator_email_optional/migration.sql +4 -0
- package/src/adapters/prisma/migrations/20261021160000_ship_kind_plugin/migration.sql +2 -0
- package/src/adapters/prisma/migrations/20261021160100_plugin_ships/migration.sql +46 -0
- package/src/adapters/prisma/migrations/20261021180000_account_notices_and_guide/migration.sql +28 -0
- package/src/adapters/prisma/schema.prisma +40 -19
- package/dist/adapters/prisma/generated/models/PluginConnection.d.ts +0 -1180
- package/dist/adapters/prisma/generated/models/PluginConnection.js +0 -2
- package/dist/adapters/prisma/generated/models/PluginConnection.js.map +0 -1
- package/dist/adapters/prisma/plugin-connections.d.ts +0 -4
- package/dist/adapters/prisma/plugin-connections.js +0 -20
- package/dist/adapters/prisma/plugin-connections.js.map +0 -1
- package/dist/domain/registry/connect-plugin.d.ts +0 -31
- package/dist/domain/registry/connect-plugin.js +0 -34
- package/dist/domain/registry/connect-plugin.js.map +0 -1
- package/dist/domain/registry/plugin-connection.d.ts +0 -48
- package/dist/domain/registry/plugin-connection.js +0 -35
- package/dist/domain/registry/plugin-connection.js.map +0 -1
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { Caller } from '../shared/caller.js';
|
|
2
2
|
import { type Notice } from './notice.js';
|
|
3
3
|
import type { NoticeDismissals, NoticeRepository } from './ports.js';
|
|
4
|
-
export type ReadNotices = (caller:
|
|
4
|
+
export type ReadNotices = (caller: Caller) => Promise<Notice[]>;
|
|
5
5
|
/**
|
|
6
6
|
* Use case: the notices a console session shows above every page (decision
|
|
7
7
|
* 0023): those of its audience, in the installation's order, less the
|
|
8
|
-
* dismissible ones it dismissed.
|
|
8
|
+
* dismissible ones it dismissed. An account signed in as itself reads those for
|
|
9
|
+
* accounts (accounts design, A9). A caller without a console session reads none.
|
|
9
10
|
*/
|
|
10
11
|
export declare function createReadNotices(deps: {
|
|
11
12
|
notices: NoticeRepository;
|
|
@@ -1,17 +1,18 @@
|
|
|
1
|
-
import { isForSessionOf } from './notice.js';
|
|
1
|
+
import { consoleSignInOf, isForSessionOf } from './notice.js';
|
|
2
2
|
/**
|
|
3
3
|
* Use case: the notices a console session shows above every page (decision
|
|
4
4
|
* 0023): those of its audience, in the installation's order, less the
|
|
5
|
-
* dismissible ones it dismissed.
|
|
5
|
+
* dismissible ones it dismissed. An account signed in as itself reads those for
|
|
6
|
+
* accounts (accounts design, A9). A caller without a console session reads none.
|
|
6
7
|
*/
|
|
7
8
|
export function createReadNotices(deps) {
|
|
8
9
|
return async (caller) => {
|
|
9
|
-
const
|
|
10
|
-
if (
|
|
10
|
+
const signIn = consoleSignInOf(caller);
|
|
11
|
+
if (signIn === undefined) {
|
|
11
12
|
return [];
|
|
12
13
|
}
|
|
13
|
-
const [notices, dismissed] = await Promise.all([deps.notices.read(), deps.dismissals.dismissed({ fleetId: caller.fleetId,
|
|
14
|
-
return notices.filter((notice) => isForSessionOf(notice,
|
|
14
|
+
const [notices, dismissed] = await Promise.all([deps.notices.read(), deps.dismissals.dismissed({ fleetId: caller.fleetId, signIn })]);
|
|
15
|
+
return notices.filter((notice) => isForSessionOf(notice, signIn.kind) && !(notice.isDismissible && dismissed.includes(notice.id)));
|
|
15
16
|
};
|
|
16
17
|
}
|
|
17
18
|
//# sourceMappingURL=read-notices.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-notices.js","sourceRoot":"","sources":["../../../src/domain/identity/read-notices.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAe,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"read-notices.js","sourceRoot":"","sources":["../../../src/domain/identity/read-notices.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAe,MAAM,aAAa,CAAC;AAK3E;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAiE;IACjG,OAAO,KAAK,EAAE,MAAM,EAAE,EAAE;QACtB,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;QACtI,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,aAAa,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACrI,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { Caller } from '../shared/caller.js';
|
|
2
2
|
import type { Clock } from '../shared/clock.js';
|
|
3
3
|
import { type DomainError } from '../shared/errors.js';
|
|
4
4
|
import { type Result } from '../shared/result.js';
|
|
5
5
|
import type { GuideProgress } from './guide.js';
|
|
6
6
|
import type { GuideProgressRepository, GuideRepository } from './ports.js';
|
|
7
7
|
export type RecordGuideProgressRefusal = DomainError<'GUIDE_NOT_FOUND' | 'GUIDE_STEP_NOT_FOUND'>;
|
|
8
|
-
export type RecordGuideProgress = (caller:
|
|
8
|
+
export type RecordGuideProgress = (caller: Caller, progress: GuideProgress) => Promise<Result<undefined, RecordGuideProgressRefusal>>;
|
|
9
9
|
/**
|
|
10
10
|
* Use case: a console session records where it is in the guide, for itself
|
|
11
11
|
* only (decision 0024): open at a step, skipped or finished; open at the
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { refuse } from '../shared/errors.js';
|
|
2
2
|
import { ok } from '../shared/result.js';
|
|
3
|
-
import { isForSessionOf } from './notice.js';
|
|
3
|
+
import { consoleSignInOf, isForSessionOf } from './notice.js';
|
|
4
4
|
/**
|
|
5
5
|
* Use case: a console session records where it is in the guide, for itself
|
|
6
6
|
* only (decision 0024): open at a step, skipped or finished; open at the
|
|
@@ -9,15 +9,15 @@ import { isForSessionOf } from './notice.js';
|
|
|
9
9
|
*/
|
|
10
10
|
export function createRecordGuideProgress(deps) {
|
|
11
11
|
return async (caller, { step, state }) => {
|
|
12
|
-
const
|
|
12
|
+
const signIn = consoleSignInOf(caller);
|
|
13
13
|
const guide = await deps.guide.read();
|
|
14
|
-
if (
|
|
14
|
+
if (signIn === undefined || guide === null || !isForSessionOf(guide, signIn.kind)) {
|
|
15
15
|
return refuse('GUIDE_NOT_FOUND', 'No guide shows in this console session');
|
|
16
16
|
}
|
|
17
17
|
if (step >= guide.steps.length) {
|
|
18
18
|
return refuse('GUIDE_STEP_NOT_FOUND', `The guide has ${String(guide.steps.length)} steps, so no step ${String(step + 1)}`);
|
|
19
19
|
}
|
|
20
|
-
await deps.progress.record({ fleetId: caller.fleetId,
|
|
20
|
+
await deps.progress.record({ fleetId: caller.fleetId, signIn, step, state, at: deps.clock.now() });
|
|
21
21
|
return ok(undefined);
|
|
22
22
|
};
|
|
23
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"record-guide-progress.js","sourceRoot":"","sources":["../../../src/domain/identity/record-guide-progress.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"record-guide-progress.js","sourceRoot":"","sources":["../../../src/domain/identity/record-guide-progress.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAO9D;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CAAC,IAAiF;IACzH,OAAO,KAAK,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;QACvC,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QACtC,IAAI,MAAM,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAClF,OAAO,MAAM,CAAC,iBAAiB,EAAE,wCAAwC,CAAC,CAAC;QAC7E,CAAC;QACD,IAAI,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAC/B,OAAO,MAAM,CAAC,sBAAsB,EAAE,iBAAiB,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,sBAAsB,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;QAC7H,CAAC;QACD,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACnG,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -26,6 +26,10 @@ export function createResetOperatorPassword(deps) {
|
|
|
26
26
|
if (!account) {
|
|
27
27
|
return refuse('FLEET_NOT_FOUND', `Fleet ${fleetId} does not exist`);
|
|
28
28
|
}
|
|
29
|
+
if (account.email === null) {
|
|
30
|
+
// As fleet:init leaves it (accounts design, A1).
|
|
31
|
+
return refuse('OPERATOR_HAS_NO_PASSWORD', 'argo has no password yet: sign in with a link from npx aeolus-core sign-in, then set an email and password in Settings');
|
|
32
|
+
}
|
|
29
33
|
if (account.passwordHash === null) {
|
|
30
34
|
return refuse('OPERATOR_HAS_NO_PASSWORD', 'This operator has no password: they sign in only through the hosting service');
|
|
31
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reset-operator-password.js","sourceRoot":"","sources":["../../../src/domain/identity/reset-operator-password.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"reset-operator-password.js","sourceRoot":"","sources":["../../../src/domain/identity/reset-operator-password.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import type { IdGenerator, OperatorId } from '@aeolus-fleet/common';
|
|
2
|
+
import { type ShipCaller } from '../shared/caller.js';
|
|
3
|
+
import type { Clock } from '../shared/clock.js';
|
|
4
|
+
import { type DomainError } from '../shared/errors.js';
|
|
5
|
+
import { type EventLog } from '../shared/events.js';
|
|
6
|
+
import { type Result } from '../shared/result.js';
|
|
7
|
+
import type { PasswordHasher } from '../shared/secrets.js';
|
|
8
|
+
import type { UnitOfWork } from '../shared/unit-of-work.js';
|
|
9
|
+
import type { OperatorAccountLookup, OperatorAccountRepository } from './ports.js';
|
|
10
|
+
export interface SetOperatorLoginTx {
|
|
11
|
+
operatorAccounts: OperatorAccountRepository;
|
|
12
|
+
events: EventLog;
|
|
13
|
+
}
|
|
14
|
+
export type SetOperatorLoginRefusal = DomainError<'INVALID_EMAIL' | 'INVALID_PASSWORD' | 'WRONG_PASSWORD' | 'OPERATOR_EMAIL_TAKEN' | 'NO_OWN_SIGN_IN' | 'NOT_THE_OPERATOR_SHIP'>;
|
|
15
|
+
export type SetOperatorLogin = (caller: ShipCaller, input: {
|
|
16
|
+
email: string;
|
|
17
|
+
password: string;
|
|
18
|
+
currentPassword?: string;
|
|
19
|
+
}) => Promise<Result<{
|
|
20
|
+
operatorId: OperatorId;
|
|
21
|
+
}, SetOperatorLoginRefusal>>;
|
|
22
|
+
/**
|
|
23
|
+
* Use case: argo, signed in to the console, sets the email and password of
|
|
24
|
+
* its own sign-in (decision 0012, accounts design A1). Only where core trusts
|
|
25
|
+
* no pagasae: a hosted fleet has no own sign-in for argo (decision 0054). The
|
|
26
|
+
* email is the user name, unique across the installation, as at fleet:init.
|
|
27
|
+
* The old email and password stop working; the console session that set
|
|
28
|
+
* them stays, since it is the one argo sign-in.
|
|
29
|
+
*
|
|
30
|
+
* While argo has a password, the change takes it first (Thomas, #1044), so a
|
|
31
|
+
* console left open is not enough to take argo's sign-in over. argo without
|
|
32
|
+
* one, signed in by a link, is asked nothing. The current password is
|
|
33
|
+
* checked before the unit of work, as at sign-in: Argon2 takes its time on
|
|
34
|
+
* purpose. The unit of work then finds the same password hash, or refuses.
|
|
35
|
+
*/
|
|
36
|
+
export declare function createSetOperatorLogin(deps: {
|
|
37
|
+
uow: UnitOfWork<SetOperatorLoginTx>;
|
|
38
|
+
clock: Clock;
|
|
39
|
+
ids: IdGenerator;
|
|
40
|
+
accounts: OperatorAccountLookup;
|
|
41
|
+
passwords: PasswordHasher;
|
|
42
|
+
/** Whether core trusts no pagasae: argo's own sign-in is then the way in. */
|
|
43
|
+
isSelfHosted: boolean;
|
|
44
|
+
}): SetOperatorLogin;
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import { actorOf } from '../shared/caller.js';
|
|
2
|
+
import { refuse } from '../shared/errors.js';
|
|
3
|
+
import { recordEvent } from '../shared/events.js';
|
|
4
|
+
import { ok } from '../shared/result.js';
|
|
5
|
+
import { operatorEmail, operatorPassword } from './operator-account.js';
|
|
6
|
+
const WRONG_PASSWORD = 'That is not your current password';
|
|
7
|
+
/**
|
|
8
|
+
* Use case: argo, signed in to the console, sets the email and password of
|
|
9
|
+
* its own sign-in (decision 0012, accounts design A1). Only where core trusts
|
|
10
|
+
* no pagasae: a hosted fleet has no own sign-in for argo (decision 0054). The
|
|
11
|
+
* email is the user name, unique across the installation, as at fleet:init.
|
|
12
|
+
* The old email and password stop working; the console session that set
|
|
13
|
+
* them stays, since it is the one argo sign-in.
|
|
14
|
+
*
|
|
15
|
+
* While argo has a password, the change takes it first (Thomas, #1044), so a
|
|
16
|
+
* console left open is not enough to take argo's sign-in over. argo without
|
|
17
|
+
* one, signed in by a link, is asked nothing. The current password is
|
|
18
|
+
* checked before the unit of work, as at sign-in: Argon2 takes its time on
|
|
19
|
+
* purpose. The unit of work then finds the same password hash, or refuses.
|
|
20
|
+
*/
|
|
21
|
+
export function createSetOperatorLogin(deps) {
|
|
22
|
+
return async (caller, input) => {
|
|
23
|
+
if (!deps.isSelfHosted) {
|
|
24
|
+
return refuse('NO_OWN_SIGN_IN', 'A hosted fleet has no own sign-in for argo: sign in with your account');
|
|
25
|
+
}
|
|
26
|
+
if (caller.consoleSessionId === undefined || caller.kind !== 'operator') {
|
|
27
|
+
return refuse('NOT_THE_OPERATOR_SHIP', 'Only argo, signed in to the console, sets its email and password');
|
|
28
|
+
}
|
|
29
|
+
const email = operatorEmail(input.email);
|
|
30
|
+
if (!email.isOk) {
|
|
31
|
+
return email;
|
|
32
|
+
}
|
|
33
|
+
const password = operatorPassword(input.password);
|
|
34
|
+
if (!password.isOk) {
|
|
35
|
+
return password;
|
|
36
|
+
}
|
|
37
|
+
const current = await deps.accounts.byFleet(caller.fleetId);
|
|
38
|
+
if (current?.passwordHash != null && !(await deps.passwords.verify(input.currentPassword ?? '', current.passwordHash))) {
|
|
39
|
+
return refuse('WRONG_PASSWORD', WRONG_PASSWORD);
|
|
40
|
+
}
|
|
41
|
+
// Hashed before the transaction: Argon2 takes its time on purpose.
|
|
42
|
+
const passwordHash = await deps.passwords.hash(password.value);
|
|
43
|
+
return deps.uow.run(async (tx) => {
|
|
44
|
+
const { fleetId } = caller;
|
|
45
|
+
await tx.operatorAccounts.lockEmail(email.value);
|
|
46
|
+
const account = await tx.operatorAccounts.findForFleetForUpdate(fleetId);
|
|
47
|
+
if (!account) {
|
|
48
|
+
return refuse('NOT_THE_OPERATOR_SHIP', 'Only argo, signed in to the console, sets its email and password');
|
|
49
|
+
}
|
|
50
|
+
if (account.passwordHash !== (current?.passwordHash ?? null)) {
|
|
51
|
+
return refuse('WRONG_PASSWORD', WRONG_PASSWORD);
|
|
52
|
+
}
|
|
53
|
+
const holder = await tx.operatorAccounts.findByEmailForUpdate(email.value);
|
|
54
|
+
if (holder !== undefined && holder.id !== account.id) {
|
|
55
|
+
return refuse('OPERATOR_EMAIL_TAKEN', `An operator already signs in with ${email.value}`);
|
|
56
|
+
}
|
|
57
|
+
await tx.operatorAccounts.changeLogin({ fleetId, operatorId: account.id, email: email.value, passwordHash });
|
|
58
|
+
await recordEvent({ events: tx.events, ids: deps.ids }, {
|
|
59
|
+
fleetId,
|
|
60
|
+
type: 'OperatorLoginSet',
|
|
61
|
+
occurredAt: deps.clock.now(),
|
|
62
|
+
actor: actorOf(caller),
|
|
63
|
+
shipId: caller.shipId,
|
|
64
|
+
details: { operatorId: account.id },
|
|
65
|
+
});
|
|
66
|
+
return ok({ operatorId: account.id });
|
|
67
|
+
});
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
//# sourceMappingURL=set-operator-login.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"set-operator-login.js","sourceRoot":"","sources":["../../../src/domain/identity/set-operator-login.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,8 @@ import type { AccountId, FleetId } from '@aeolus-fleet/common';
|
|
|
3
3
|
export declare const SIGN_IN_TICKET_PREFIX = "aeolus_st_v1_";
|
|
4
4
|
/** How long a sign-in ticket stays valid after it is issued. */
|
|
5
5
|
export declare const SIGN_IN_TICKET_VALID_MS: number;
|
|
6
|
+
/** How long a sign-in link from the terminal stays valid: long enough to copy it into a browser (accounts design, A1). */
|
|
7
|
+
export declare const SIGN_IN_LINK_VALID_MS: number;
|
|
6
8
|
/** Whom a ticket signs in as: the operator, crewing argo, or a viewer, through the viewer ship (decision 0022). */
|
|
7
9
|
export type SignInAs = 'operator' | 'viewer';
|
|
8
10
|
/**
|
|
@@ -2,4 +2,6 @@
|
|
|
2
2
|
export const SIGN_IN_TICKET_PREFIX = 'aeolus_st_v1_';
|
|
3
3
|
/** How long a sign-in ticket stays valid after it is issued. */
|
|
4
4
|
export const SIGN_IN_TICKET_VALID_MS = 2 * 60 * 1000;
|
|
5
|
+
/** How long a sign-in link from the terminal stays valid: long enough to copy it into a browser (accounts design, A1). */
|
|
6
|
+
export const SIGN_IN_LINK_VALID_MS = 15 * 60 * 1000;
|
|
5
7
|
//# sourceMappingURL=sign-in-ticket.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sign-in-ticket.js","sourceRoot":"","sources":["../../../src/domain/identity/sign-in-ticket.ts"],"names":[],"mappings":"AAEA,gGAAgG;AAChG,MAAM,CAAC,MAAM,qBAAqB,GAAG,eAAe,CAAC;AAErD,gEAAgE;AAChE,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC"}
|
|
1
|
+
{"version":3,"file":"sign-in-ticket.js","sourceRoot":"","sources":["../../../src/domain/identity/sign-in-ticket.ts"],"names":[],"mappings":"AAEA,gGAAgG;AAChG,MAAM,CAAC,MAAM,qBAAqB,GAAG,eAAe,CAAC;AAErD,gEAAgE;AAChE,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAErD,0HAA0H;AAC1H,MAAM,CAAC,MAAM,qBAAqB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import type { AccountId, IdGenerator } from '@aeolus-fleet/common';
|
|
2
|
+
import { type LeaseTx } from '../registry/public.js';
|
|
3
|
+
import type { Clock } from '../shared/clock.js';
|
|
4
|
+
import type { UnitOfWork } from '../shared/unit-of-work.js';
|
|
5
|
+
import type { ConsoleSessionRepository } from './ports.js';
|
|
6
|
+
export interface SignOutAccountTx extends LeaseTx {
|
|
7
|
+
consoleSessions: ConsoleSessionRepository;
|
|
8
|
+
}
|
|
9
|
+
export type SignOutAccount = (input: {
|
|
10
|
+
accountId: AccountId;
|
|
11
|
+
}) => Promise<void>;
|
|
12
|
+
/**
|
|
13
|
+
* Use case: pagasae, as the installation, says an account signed out in the
|
|
14
|
+
* account app, and sign-out anywhere is sign-out everywhere. Every console
|
|
15
|
+
* sign-in as argo the account opened ends, in every fleet, and with it the
|
|
16
|
+
* lease on argo it held, the installation the actor. argo's own sign-in and
|
|
17
|
+
* one another account holds stay. Its tokens stay good: it is no cut-off.
|
|
18
|
+
* Safe to repeat.
|
|
19
|
+
*/
|
|
20
|
+
export declare function createSignOutAccount(deps: {
|
|
21
|
+
uow: UnitOfWork<SignOutAccountTx>;
|
|
22
|
+
clock: Clock;
|
|
23
|
+
ids: IdGenerator;
|
|
24
|
+
}): SignOutAccount;
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { endLease } from '../registry/public.js';
|
|
2
|
+
import { ok } from '../shared/result.js';
|
|
3
|
+
const INSTALLATION = { kind: 'installation' };
|
|
4
|
+
/**
|
|
5
|
+
* Use case: pagasae, as the installation, says an account signed out in the
|
|
6
|
+
* account app, and sign-out anywhere is sign-out everywhere. Every console
|
|
7
|
+
* sign-in as argo the account opened ends, in every fleet, and with it the
|
|
8
|
+
* lease on argo it held, the installation the actor. argo's own sign-in and
|
|
9
|
+
* one another account holds stay. Its tokens stay good: it is no cut-off.
|
|
10
|
+
* Safe to repeat.
|
|
11
|
+
*/
|
|
12
|
+
export function createSignOutAccount(deps) {
|
|
13
|
+
return async ({ accountId }) => {
|
|
14
|
+
const now = deps.clock.now();
|
|
15
|
+
await deps.uow.run(async (tx) => {
|
|
16
|
+
for (const session of await tx.consoleSessions.endAllOfAccount(accountId, { at: now, reason: 'signedOut' })) {
|
|
17
|
+
if (session.leaseId !== null) {
|
|
18
|
+
await endLease({ tx, ids: deps.ids }, { fleetId: session.fleetId, leaseId: session.leaseId, actor: INSTALLATION, at: now, reason: 'signedOut' });
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
return ok(undefined);
|
|
22
|
+
});
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=sign-out-account.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sign-out-account.js","sourceRoot":"","sources":["../../../src/domain/identity/sign-out-account.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAgB,MAAM,uBAAuB,CAAC;AAG/D,OAAO,EAAE,EAAE,EAAE,MAAM,qBAAqB,CAAC;AAIzC,MAAM,YAAY,GAAU,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;AAQrD;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAA2E;IAC9G,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE;QAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;YAC9B,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE,CAAC,eAAe,CAAC,eAAe,CAAC,SAAS,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;gBAC5G,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;oBAC7B,MAAM,QAAQ,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;gBACnJ,CAAC;YACH,CAAC;YACD,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { type AccountId, type LeaseId, type MessageId, type ShipId } from '@aeolus-fleet/common';
|
|
1
|
+
import { type AccountId, type DeliveryId, type LeaseId, type MessageId, type ShipId } from '@aeolus-fleet/common';
|
|
2
2
|
import { type DomainError } from '../shared/errors.js';
|
|
3
|
-
import { type NewEvent } from '../shared/events.js';
|
|
3
|
+
import { type Actor, type NewEvent } from '../shared/events.js';
|
|
4
4
|
import { type Result } from '../shared/result.js';
|
|
5
5
|
import type { Delivery, Message } from './message.js';
|
|
6
6
|
/**
|
|
@@ -121,6 +121,18 @@ export declare function acknowledgeDelivery(delivery: Delivery, ack: {
|
|
|
121
121
|
delivery: Delivery;
|
|
122
122
|
events: NewEvent[];
|
|
123
123
|
}, AcknowledgeRefusal>;
|
|
124
|
+
export type RereadRefusal = DomainError<'DELIVERY_NOT_FOUND' | 'DELIVERY_NOT_ACKNOWLEDGED'>;
|
|
125
|
+
/**
|
|
126
|
+
* A crew reads one of its deliveries again, whole: only one its own lease
|
|
127
|
+
* holds acknowledged and not yet handled, so it can go on to answer it or
|
|
128
|
+
* finish it. One of its lease in another state is refused with that state;
|
|
129
|
+
* any other, another ship's, another lease's or one no lease holds, is
|
|
130
|
+
* answered as none, so its existence does not show. The read changes nothing.
|
|
131
|
+
*/
|
|
132
|
+
export declare function rereadDelivery(found: {
|
|
133
|
+
deliveryId: DeliveryId;
|
|
134
|
+
delivery: Delivery | undefined;
|
|
135
|
+
}, crew: CrewOfShip): Result<Delivery, RereadRefusal>;
|
|
124
136
|
export type AnswerPingRefusal = DomainError<'DELIVERY_NOT_A_PING'> | AcknowledgeRefusal;
|
|
125
137
|
/**
|
|
126
138
|
* The ship answers a ping with pong: the ping's delivery is acknowledged as
|
|
@@ -146,7 +158,7 @@ export type DismissRefusal = DomainError<'DELIVERY_NOT_UNDELIVERABLE'>;
|
|
|
146
158
|
* those two wait for the operator.
|
|
147
159
|
*/
|
|
148
160
|
export declare function dismissDelivery(delivery: Delivery, dismiss: {
|
|
149
|
-
by:
|
|
161
|
+
by: Actor;
|
|
150
162
|
at: Date;
|
|
151
163
|
}): Result<{
|
|
152
164
|
delivery: Delivery;
|
|
@@ -157,7 +169,7 @@ export declare function dismissDelivery(delivery: Delivery, dismiss: {
|
|
|
157
169
|
* not handled: one already dismissed has nothing left to resend.
|
|
158
170
|
*/
|
|
159
171
|
export declare function dismissForResend(delivery: Delivery, dismiss: {
|
|
160
|
-
by:
|
|
172
|
+
by: Actor;
|
|
161
173
|
at: Date;
|
|
162
174
|
}): Result<{
|
|
163
175
|
delivery: Delivery;
|
|
@@ -262,6 +262,23 @@ export function acknowledgeDelivery(delivery, ack) {
|
|
|
262
262
|
return refuse('DELIVERY_NOT_IN_FLIGHT', `Delivery ${delivery.id} is ${delivery.state}, not in flight: acknowledge a delivery once a receive hands it over`);
|
|
263
263
|
}
|
|
264
264
|
}
|
|
265
|
+
/**
|
|
266
|
+
* A crew reads one of its deliveries again, whole: only one its own lease
|
|
267
|
+
* holds acknowledged and not yet handled, so it can go on to answer it or
|
|
268
|
+
* finish it. One of its lease in another state is refused with that state;
|
|
269
|
+
* any other, another ship's, another lease's or one no lease holds, is
|
|
270
|
+
* answered as none, so its existence does not show. The read changes nothing.
|
|
271
|
+
*/
|
|
272
|
+
export function rereadDelivery(found, crew) {
|
|
273
|
+
const { deliveryId, delivery } = found;
|
|
274
|
+
if (delivery?.claimedByShipId !== crew.shipId || delivery.claimedByLeaseId !== crew.leaseId) {
|
|
275
|
+
return refuse('DELIVERY_NOT_FOUND', `Delivery ${deliveryId} does not exist`);
|
|
276
|
+
}
|
|
277
|
+
if (delivery.state !== 'acknowledged') {
|
|
278
|
+
return refuse('DELIVERY_NOT_ACKNOWLEDGED', `Delivery ${delivery.id} is ${delivery.state}, not acknowledged: only an acknowledged delivery not yet handled is read again`);
|
|
279
|
+
}
|
|
280
|
+
return ok(delivery);
|
|
281
|
+
}
|
|
265
282
|
/**
|
|
266
283
|
* The ship answers a ping with pong: the ping's delivery is acknowledged as
|
|
267
284
|
* an ack would, and DeliveryAcknowledged says pong answered it. Pong answers
|
|
@@ -300,7 +317,7 @@ export function dismissDelivery(delivery, dismiss) {
|
|
|
300
317
|
fleetId: delivery.fleetId,
|
|
301
318
|
type: 'DeliveryDismissed',
|
|
302
319
|
occurredAt: dismiss.at,
|
|
303
|
-
actor:
|
|
320
|
+
actor: dismiss.by,
|
|
304
321
|
shipId: delivery.recipient.kind === 'ship' ? delivery.recipient.shipId : undefined,
|
|
305
322
|
messageId: delivery.messageId,
|
|
306
323
|
deliveryId: delivery.id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery.js","sourceRoot":"","sources":["../../../src/domain/messaging/delivery.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"delivery.js","sourceRoot":"","sources":["../../../src/domain/messaging/delivery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { DeliveryId, IdGenerator } from '@aeolus-fleet/common';
|
|
2
2
|
import { type ReadReachOf } from '../registry/public.js';
|
|
3
|
-
import type
|
|
3
|
+
import { type Caller } from '../shared/caller.js';
|
|
4
4
|
import type { Clock } from '../shared/clock.js';
|
|
5
5
|
import { type DomainError } from '../shared/errors.js';
|
|
6
6
|
import { type EventLog } from '../shared/events.js';
|
|
@@ -14,7 +14,7 @@ export interface DismissDeliveryTx {
|
|
|
14
14
|
events: EventLog;
|
|
15
15
|
}
|
|
16
16
|
export type DismissDeliveryRefusal = DomainError<'DELIVERY_NOT_FOUND'> | DismissRefusal;
|
|
17
|
-
export type DismissDelivery = (caller:
|
|
17
|
+
export type DismissDelivery = (caller: Caller, input: {
|
|
18
18
|
deliveryId: DeliveryId;
|
|
19
19
|
}) => Promise<Result<undefined, DismissDeliveryRefusal>>;
|
|
20
20
|
/**
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { readsMessage } from '../registry/public.js';
|
|
2
|
+
import { actorOf } from '../shared/caller.js';
|
|
2
3
|
import { refuse } from '../shared/errors.js';
|
|
3
4
|
import { recordEvent } from '../shared/events.js';
|
|
4
5
|
import { ok } from '../shared/result.js';
|
|
@@ -20,7 +21,7 @@ export function createDismissDelivery(deps) {
|
|
|
20
21
|
if (!delivery || !message || !readsMessage(reach, { senderId: message.senderShipId, recipient: message.selector, claimedBy: delivery.claimedByShipId })) {
|
|
21
22
|
return refuse('DELIVERY_NOT_FOUND', `Delivery ${input.deliveryId} does not exist`);
|
|
22
23
|
}
|
|
23
|
-
const dismissed = dismissDelivery(delivery, { by: caller
|
|
24
|
+
const dismissed = dismissDelivery(delivery, { by: actorOf(caller), at: deps.clock.now() });
|
|
24
25
|
if (!dismissed.isOk) {
|
|
25
26
|
return dismissed;
|
|
26
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dismiss-delivery.js","sourceRoot":"","sources":["../../../src/domain/messaging/dismiss-delivery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAoB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"dismiss-delivery.js","sourceRoot":"","sources":["../../../src/domain/messaging/dismiss-delivery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAoB,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,OAAO,EAAe,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAiB,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAuB,MAAM,eAAe,CAAC;AAgBrE;;;;;;;GAOG;AACH,MAAM,UAAU,qBAAqB,CAAC,IAKrC;IACC,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;QAC7B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC3C,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAsD,EAAE;YACnF,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;YACrF,MAAM,OAAO,GAAG,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;YACzF,IAAI,CAAC,QAAQ,IAAI,CAAC,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,YAAY,EAAE,SAAS,EAAE,OAAO,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,eAAe,EAAE,CAAC,EAAE,CAAC;gBACxJ,OAAO,MAAM,CAAC,oBAAoB,EAAE,YAAY,KAAK,CAAC,UAAU,iBAAiB,CAAC,CAAC;YACrF,CAAC;YACD,MAAM,SAAS,GAAG,eAAe,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC3F,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;gBACpB,OAAO,SAAS,CAAC;YACnB,CAAC;YAED,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC;YACtD,MAAM,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACpC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,MAAM,WAAW,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,CAAC;YACjE,CAAC;YACD,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type AccountId, type DeliveryId, type DeliveryState, type FleetId, type LeaseId, type MessageId, type ShipId, type ShipKind } from '@aeolus-fleet/common';
|
|
2
2
|
import { type DomainError } from '../shared/errors.js';
|
|
3
|
-
import { type NewEvent } from '../shared/events.js';
|
|
3
|
+
import { type Actor, type NewEvent } from '../shared/events.js';
|
|
4
4
|
import { type Result } from '../shared/result.js';
|
|
5
5
|
import type { Recipient } from '../shared/selector.js';
|
|
6
6
|
/**
|
|
@@ -89,14 +89,14 @@ export interface MessageToAccept {
|
|
|
89
89
|
/** A forced send (decision 0040): its delivery comes first. */
|
|
90
90
|
isForced: boolean;
|
|
91
91
|
/**
|
|
92
|
-
* For a resend: the message it resends
|
|
93
|
-
*
|
|
94
|
-
* whoever asked; the operator is the actor of MessageAccepted.
|
|
92
|
+
* For a resend: the message it resends. The sender stays the original one,
|
|
93
|
+
* so an answer goes back to whoever asked.
|
|
95
94
|
*/
|
|
96
95
|
resendOf?: {
|
|
97
96
|
messageId: MessageId;
|
|
98
|
-
by: ShipId;
|
|
99
97
|
};
|
|
98
|
+
/** Who caused MessageAccepted when it is not the sender: the actor resending it, or an account pinging as argo. */
|
|
99
|
+
actor?: Actor;
|
|
100
100
|
/** The account signed in to the console as argo when argo sends or resends it (decision 0054). */
|
|
101
101
|
signedInAccountId?: AccountId;
|
|
102
102
|
at: Date;
|
|
@@ -108,13 +108,13 @@ export type RepeatRefusal = DomainError<'IDEMPOTENCY_KEY_REUSED'>;
|
|
|
108
108
|
* refused, so one key never stands for two messages.
|
|
109
109
|
*/
|
|
110
110
|
export declare function repeatOf(original: Message, requestHash: string): Result<MessageId, RepeatRefusal>;
|
|
111
|
-
export type AcceptRefusal = DomainError<'IN_REPLY_TO_NOT_FOUND' | 'MODEL_REQUIRED' | 'MODEL_FROM_ARGO' | '
|
|
111
|
+
export type AcceptRefusal = DomainError<'IN_REPLY_TO_NOT_FOUND' | 'MODEL_REQUIRED' | 'MODEL_FROM_ARGO' | 'MODEL_FROM_PERSON_APP_OR_PLUGIN'>;
|
|
112
112
|
/**
|
|
113
113
|
* Accepts a message: the message, its one pending delivery to the recipient
|
|
114
114
|
* its selector resolved to, and MessageAccepted, caused by the sender. A reply
|
|
115
115
|
* names a message of the same fleet: `repliedTo` is that message as the fleet
|
|
116
116
|
* holds it, if it does. Only an agent ship states the model its session
|
|
117
|
-
* runs (decisions 0018 and 0044); argo, a person
|
|
117
|
+
* runs (decisions 0018 and 0044); argo, a person, an app and a plugin state none (decision 0050). A resend carries the
|
|
118
118
|
* original message's model as it was, so it is not asked again; a ping is the
|
|
119
119
|
* fleet's question, not a session's message, so it carries none. A type
|
|
120
120
|
* delivery the network rules limit to some ships of the type keeps them. A
|
|
@@ -17,7 +17,7 @@ export function repeatOf(original, requestHash) {
|
|
|
17
17
|
* its selector resolved to, and MessageAccepted, caused by the sender. A reply
|
|
18
18
|
* names a message of the same fleet: `repliedTo` is that message as the fleet
|
|
19
19
|
* holds it, if it does. Only an agent ship states the model its session
|
|
20
|
-
* runs (decisions 0018 and 0044); argo, a person
|
|
20
|
+
* runs (decisions 0018 and 0044); argo, a person, an app and a plugin state none (decision 0050). A resend carries the
|
|
21
21
|
* original message's model as it was, so it is not asked again; a ping is the
|
|
22
22
|
* fleet's question, not a session's message, so it carries none. A type
|
|
23
23
|
* delivery the network rules limit to some ships of the type keeps them. A
|
|
@@ -34,8 +34,8 @@ export function acceptMessage(fleet, send) {
|
|
|
34
34
|
if (isStated && send.senderKind === 'operator' && send.model !== undefined) {
|
|
35
35
|
return refuse('MODEL_FROM_ARGO', 'argo states no model: send without one');
|
|
36
36
|
}
|
|
37
|
-
if (isStated && (send.senderKind === 'person' || send.senderKind === 'app') && send.model !== undefined) {
|
|
38
|
-
return refuse('
|
|
37
|
+
if (isStated && (send.senderKind === 'person' || send.senderKind === 'app' || send.senderKind === 'plugin') && send.model !== undefined) {
|
|
38
|
+
return refuse('MODEL_FROM_PERSON_APP_OR_PLUGIN', `A ${send.senderKind} ship states no model: send without one`);
|
|
39
39
|
}
|
|
40
40
|
if (isStated && send.senderKind === 'agent' && send.model === undefined) {
|
|
41
41
|
return refuse('MODEL_REQUIRED', 'send needs model: the exact model id this session runs, such as claude-opus-5-5');
|
|
@@ -77,7 +77,7 @@ export function acceptMessage(fleet, send) {
|
|
|
77
77
|
fleetId,
|
|
78
78
|
type: 'MessageAccepted',
|
|
79
79
|
occurredAt: at,
|
|
80
|
-
actor: send.signedInAccountId === undefined ? shipActor(
|
|
80
|
+
actor: send.actor ?? (send.signedInAccountId === undefined ? shipActor(senderShipId) : { kind: 'ship', shipId: senderShipId, signedInAccountId: send.signedInAccountId }),
|
|
81
81
|
shipId: recipient.kind === 'ship' ? recipient.shipId : undefined,
|
|
82
82
|
messageId,
|
|
83
83
|
deliveryId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../src/domain/messaging/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAA+H,MAAM,sBAAsB,CAAC;AAEtL,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../src/domain/messaging/message.ts"],"names":[],"mappings":"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"}
|