@aeolus-fleet/core 0.31.0 → 0.32.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/adapters/prisma/defined-scopes.d.ts +4 -0
- package/dist/adapters/prisma/defined-scopes.js +23 -0
- package/dist/adapters/prisma/defined-scopes.js.map +1 -0
- package/dist/adapters/prisma/delivery-notices.d.ts +3 -0
- package/dist/adapters/prisma/delivery-notices.js +7 -2
- package/dist/adapters/prisma/delivery-notices.js.map +1 -1
- package/dist/adapters/prisma/fleet-limit-settings.d.ts +6 -0
- package/dist/adapters/prisma/fleet-limit-settings.js +17 -0
- package/dist/adapters/prisma/fleet-limit-settings.js.map +1 -0
- package/dist/adapters/prisma/generated/browser.d.ts +17 -3
- package/dist/adapters/prisma/generated/client.d.ts +17 -3
- package/dist/adapters/prisma/generated/commonInputTypes.d.ts +196 -46
- package/dist/adapters/prisma/generated/enums.d.ts +32 -0
- package/dist/adapters/prisma/generated/enums.js +28 -1
- package/dist/adapters/prisma/generated/enums.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/class.d.ts +22 -0
- package/dist/adapters/prisma/generated/internal/class.js +4 -4
- package/dist/adapters/prisma/generated/internal/class.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.d.ts +254 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js +62 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.d.ts +63 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js +62 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js.map +1 -1
- package/dist/adapters/prisma/generated/models/DefinedScope.d.ts +1110 -0
- package/dist/adapters/prisma/generated/models/DefinedScope.js +2 -0
- package/dist/adapters/prisma/generated/models/DefinedScope.js.map +1 -0
- package/dist/adapters/prisma/generated/models/Fleet.d.ts +2128 -2
- package/dist/adapters/prisma/generated/models/InstallationSettings.d.ts +108 -4
- package/dist/adapters/prisma/generated/models/Message.d.ts +557 -516
- package/dist/adapters/prisma/generated/models/Schedule.d.ts +3925 -0
- package/dist/adapters/prisma/generated/models/Schedule.js +2 -0
- package/dist/adapters/prisma/generated/models/Schedule.js.map +1 -0
- package/dist/adapters/prisma/generated/models/Ship.d.ts +736 -3
- package/dist/adapters/prisma/generated/models.d.ts +2 -0
- package/dist/adapters/prisma/history-pruner.d.ts +3 -0
- package/dist/adapters/prisma/history-pruner.js +232 -0
- package/dist/adapters/prisma/history-pruner.js.map +1 -0
- package/dist/adapters/prisma/history.js +67 -14
- package/dist/adapters/prisma/history.js.map +1 -1
- package/dist/adapters/prisma/installation.js +27 -8
- package/dist/adapters/prisma/installation.js.map +1 -1
- package/dist/adapters/prisma/messaging.js +7 -3
- package/dist/adapters/prisma/messaging.js.map +1 -1
- package/dist/adapters/prisma/registry.js +28 -9
- package/dist/adapters/prisma/registry.js.map +1 -1
- package/dist/adapters/prisma/rows.js +10 -1
- package/dist/adapters/prisma/rows.js.map +1 -1
- package/dist/adapters/prisma/schedules.d.ts +12 -0
- package/dist/adapters/prisma/schedules.js +255 -0
- package/dist/adapters/prisma/schedules.js.map +1 -0
- package/dist/adapters/prisma/unit-of-work.d.ts +7 -2
- package/dist/adapters/prisma/unit-of-work.js +7 -0
- package/dist/adapters/prisma/unit-of-work.js.map +1 -1
- package/dist/adapters/trpc/console.d.ts +1 -1
- package/dist/adapters/trpc/console.js +3 -6
- package/dist/adapters/trpc/console.js.map +1 -1
- package/dist/adapters/trpc/context.d.ts +20 -0
- package/dist/adapters/trpc/fleet.d.ts +210 -8
- package/dist/adapters/trpc/fleet.js +111 -11
- package/dist/adapters/trpc/fleet.js.map +1 -1
- package/dist/adapters/trpc/installation.d.ts +139 -4
- package/dist/adapters/trpc/installation.js +4 -4
- package/dist/adapters/trpc/installation.js.map +1 -1
- package/dist/adapters/trpc/router.d.ts +508 -8
- package/dist/adapters/trpc/schedule-output.d.ts +74 -0
- package/dist/adapters/trpc/schedule-output.js +71 -0
- package/dist/adapters/trpc/schedule-output.js.map +1 -0
- package/dist/adapters/trpc/ship-contract.js +7 -0
- package/dist/adapters/trpc/ship-contract.js.map +1 -1
- package/dist/adapters/trpc/ship.d.ts +188 -3
- package/dist/adapters/trpc/ship.js +105 -11
- package/dist/adapters/trpc/ship.js.map +1 -1
- package/dist/adapters/trpc/starting-prompt-text.js +5 -5
- package/dist/adapters/trpc/starting-prompt-text.js.map +1 -1
- package/dist/adapters/trpc/trpc.d.ts +8 -0
- package/dist/adapters/trpc/trpc.js +19 -2
- package/dist/adapters/trpc/trpc.js.map +1 -1
- package/dist/app.d.ts +5 -3
- package/dist/app.js +30 -4
- package/dist/app.js.map +1 -1
- package/dist/domain/messaging/add-to-meeting.js +1 -1
- package/dist/domain/messaging/add-to-meeting.js.map +1 -1
- package/dist/domain/messaging/cancel-schedule.d.ts +35 -0
- package/dist/domain/messaging/cancel-schedule.js +45 -0
- package/dist/domain/messaging/cancel-schedule.js.map +1 -0
- package/dist/domain/messaging/check-reach-to-each.d.ts +25 -0
- package/dist/domain/messaging/check-reach-to-each.js +21 -0
- package/dist/domain/messaging/check-reach-to-each.js.map +1 -0
- package/dist/domain/messaging/cron.d.ts +46 -0
- package/dist/domain/messaging/cron.js +164 -0
- package/dist/domain/messaging/cron.js.map +1 -0
- package/dist/domain/messaging/daily-message-limit.d.ts +7 -5
- package/dist/domain/messaging/daily-message-limit.js +8 -7
- package/dist/domain/messaging/daily-message-limit.js.map +1 -1
- package/dist/domain/messaging/list-schedules.d.ts +38 -0
- package/dist/domain/messaging/list-schedules.js +33 -0
- package/dist/domain/messaging/list-schedules.js.map +1 -0
- package/dist/domain/messaging/message.d.ts +43 -4
- package/dist/domain/messaging/message.js +82 -4
- package/dist/domain/messaging/message.js.map +1 -1
- package/dist/domain/messaging/open-meeting.js +1 -1
- package/dist/domain/messaging/open-meeting.js.map +1 -1
- package/dist/domain/messaging/pause-schedule.d.ts +34 -0
- package/dist/domain/messaging/pause-schedule.js +44 -0
- package/dist/domain/messaging/pause-schedule.js.map +1 -0
- package/dist/domain/messaging/ports.d.ts +77 -3
- package/dist/domain/messaging/public.d.ts +1 -0
- package/dist/domain/messaging/public.js +1 -0
- package/dist/domain/messaging/public.js.map +1 -1
- package/dist/domain/messaging/push-receive-deliveries.d.ts +4 -1
- package/dist/domain/messaging/push-receive-deliveries.js +5 -2
- package/dist/domain/messaging/push-receive-deliveries.js.map +1 -1
- package/dist/domain/messaging/receive-deliveries.d.ts +4 -1
- package/dist/domain/messaging/receive-deliveries.js +2 -0
- package/dist/domain/messaging/receive-deliveries.js.map +1 -1
- package/dist/domain/messaging/resend-delivery.js +2 -2
- package/dist/domain/messaging/resend-delivery.js.map +1 -1
- package/dist/domain/messaging/resume-schedule.d.ts +34 -0
- package/dist/domain/messaging/resume-schedule.js +37 -0
- package/dist/domain/messaging/resume-schedule.js.map +1 -0
- package/dist/domain/messaging/retired-scheduler.d.ts +31 -0
- package/dist/domain/messaging/retired-scheduler.js +30 -0
- package/dist/domain/messaging/retired-scheduler.js.map +1 -0
- package/dist/domain/messaging/schedule-access.d.ts +20 -0
- package/dist/domain/messaging/schedule-access.js +21 -0
- package/dist/domain/messaging/schedule-access.js.map +1 -0
- package/dist/domain/messaging/schedule-limits.d.ts +25 -0
- package/dist/domain/messaging/schedule-limits.js +51 -0
- package/dist/domain/messaging/schedule-limits.js.map +1 -0
- package/dist/domain/messaging/schedule-message.d.ts +65 -0
- package/dist/domain/messaging/schedule-message.js +151 -0
- package/dist/domain/messaging/schedule-message.js.map +1 -0
- package/dist/domain/messaging/schedule.d.ts +238 -0
- package/dist/domain/messaging/schedule.js +316 -0
- package/dist/domain/messaging/schedule.js.map +1 -0
- package/dist/domain/messaging/send-due-schedules.d.ts +40 -0
- package/dist/domain/messaging/send-due-schedules.js +141 -0
- package/dist/domain/messaging/send-due-schedules.js.map +1 -0
- package/dist/domain/messaging/send-message.d.ts +10 -3
- package/dist/domain/messaging/send-message.js +78 -4
- package/dist/domain/messaging/send-message.js.map +1 -1
- package/dist/domain/messaging/send-request.d.ts +3 -2
- package/dist/domain/messaging/send-request.js +5 -2
- package/dist/domain/messaging/send-request.js.map +1 -1
- package/dist/domain/registry/applied-limits.d.ts +5 -7
- package/dist/domain/registry/applied-limits.js +5 -9
- package/dist/domain/registry/applied-limits.js.map +1 -1
- package/dist/domain/registry/check-manage.d.ts +23 -0
- package/dist/domain/registry/check-manage.js +19 -0
- package/dist/domain/registry/check-manage.js.map +1 -0
- package/dist/domain/registry/commission-ship.js +3 -3
- package/dist/domain/registry/commission-ship.js.map +1 -1
- package/dist/domain/registry/declare-scopes.d.ts +5 -3
- package/dist/domain/registry/declare-scopes.js +4 -2
- package/dist/domain/registry/declare-scopes.js.map +1 -1
- package/dist/domain/registry/define-scope.d.ts +33 -0
- package/dist/domain/registry/define-scope.js +30 -0
- package/dist/domain/registry/define-scope.js.map +1 -0
- package/dist/domain/registry/defined-scope.d.ts +68 -0
- package/dist/domain/registry/defined-scope.js +83 -0
- package/dist/domain/registry/defined-scope.js.map +1 -0
- package/dist/domain/registry/describe-scope.d.ts +31 -0
- package/dist/domain/registry/describe-scope.js +28 -0
- package/dist/domain/registry/describe-scope.js.map +1 -0
- package/dist/domain/registry/get-fleet-limits.d.ts +1 -1
- package/dist/domain/registry/get-fleet-limits.js +1 -1
- package/dist/domain/registry/get-fleet-limits.js.map +1 -1
- package/dist/domain/registry/grant-scopes.d.ts +4 -3
- package/dist/domain/registry/grant-scopes.js +4 -4
- package/dist/domain/registry/grant-scopes.js.map +1 -1
- package/dist/domain/registry/installation-fleet.d.ts +4 -1
- package/dist/domain/registry/installation-fleet.js +9 -2
- package/dist/domain/registry/installation-fleet.js.map +1 -1
- package/dist/domain/registry/label-value-texts.d.ts +16 -0
- package/dist/domain/registry/label-value-texts.js +15 -0
- package/dist/domain/registry/label-value-texts.js.map +1 -0
- package/dist/domain/registry/limits.d.ts +42 -7
- package/dist/domain/registry/limits.js +41 -6
- package/dist/domain/registry/limits.js.map +1 -1
- package/dist/domain/registry/list-scopes.d.ts +13 -6
- package/dist/domain/registry/list-scopes.js +15 -6
- package/dist/domain/registry/list-scopes.js.map +1 -1
- package/dist/domain/registry/named-namespaces.d.ts +18 -8
- package/dist/domain/registry/named-namespaces.js +11 -3
- package/dist/domain/registry/named-namespaces.js.map +1 -1
- package/dist/domain/registry/ports.d.ts +20 -0
- package/dist/domain/registry/public.d.ts +2 -0
- package/dist/domain/registry/public.js +2 -0
- package/dist/domain/registry/public.js.map +1 -1
- package/dist/domain/registry/remove-scope.d.ts +29 -0
- package/dist/domain/registry/remove-scope.js +32 -0
- package/dist/domain/registry/remove-scope.js.map +1 -0
- package/dist/domain/registry/resolve-label-selection.d.ts +20 -0
- package/dist/domain/registry/resolve-label-selection.js +26 -0
- package/dist/domain/registry/resolve-label-selection.js.map +1 -0
- package/dist/domain/registry/retire-ship.d.ts +5 -2
- package/dist/domain/registry/retire-ship.js +6 -1
- package/dist/domain/registry/retire-ship.js.map +1 -1
- package/dist/domain/registry/scope-grant.d.ts +6 -2
- package/dist/domain/registry/scope-grant.js +9 -5
- package/dist/domain/registry/scope-grant.js.map +1 -1
- package/dist/domain/registry/scope-namespace.d.ts +5 -1
- package/dist/domain/registry/scope-namespace.js +9 -2
- package/dist/domain/registry/scope-namespace.js.map +1 -1
- package/dist/domain/registry/set-fleet-limits.d.ts +8 -5
- package/dist/domain/registry/set-fleet-limits.js +38 -6
- package/dist/domain/registry/set-fleet-limits.js.map +1 -1
- package/dist/domain/registry/set-installation-settings.d.ts +4 -4
- package/dist/domain/registry/set-installation-settings.js +21 -15
- package/dist/domain/registry/set-installation-settings.js.map +1 -1
- package/dist/domain/registry/ship.d.ts +2 -0
- package/dist/domain/registry/ship.js +1 -1
- package/dist/domain/registry/ship.js.map +1 -1
- package/dist/domain/shared/delivery-way.d.ts +4 -0
- package/dist/domain/shared/delivery-way.js +5 -2
- package/dist/domain/shared/delivery-way.js.map +1 -1
- package/dist/domain/shared/errors.d.ts +1 -1
- package/dist/domain/shared/errors.js.map +1 -1
- package/dist/domain/shared/history-pruning.d.ts +130 -0
- package/dist/domain/shared/history-pruning.js +74 -0
- package/dist/domain/shared/history-pruning.js.map +1 -0
- package/dist/domain/shared/history.d.ts +33 -5
- package/dist/domain/shared/history.js +3 -1
- package/dist/domain/shared/history.js.map +1 -1
- package/dist/domain/shared/prune-history.d.ts +39 -0
- package/dist/domain/shared/prune-history.js +98 -0
- package/dist/domain/shared/prune-history.js.map +1 -0
- package/dist/domain/shared/read-fleet-limits.d.ts +14 -4
- package/dist/domain/shared/read-fleet-limits.js +8 -4
- package/dist/domain/shared/read-fleet-limits.js.map +1 -1
- package/dist/domain/shared/read-message-deliveries.d.ts +30 -0
- package/dist/domain/shared/read-message-deliveries.js +24 -0
- package/dist/domain/shared/read-message-deliveries.js.map +1 -0
- package/dist/domain/shared/read-message.d.ts +4 -1
- package/dist/domain/shared/read-message.js +3 -2
- package/dist/domain/shared/read-message.js.map +1 -1
- package/dist/domain/shared/read-sent-message.d.ts +21 -7
- package/dist/domain/shared/read-sent-message.js +19 -6
- package/dist/domain/shared/read-sent-message.js.map +1 -1
- package/dist/domain/shared/selector.d.ts +21 -8
- package/dist/schedule-timer.d.ts +22 -0
- package/dist/schedule-timer.js +78 -0
- package/dist/schedule-timer.js.map +1 -0
- package/dist/wiring.d.ts +26 -0
- package/dist/wiring.js +27 -1
- package/dist/wiring.js.map +1 -1
- package/package.json +2 -2
- package/src/adapters/prisma/migrations/20261025090000_scheduled_messages_envelope/migration.sql +5 -0
- package/src/adapters/prisma/migrations/20261025090100_schedules/migration.sql +109 -0
- package/src/adapters/prisma/migrations/20261025120000_repeating_schedules/migration.sql +40 -0
- package/src/adapters/prisma/migrations/20261025130000_schedule_limits/migration.sql +11 -0
- package/src/adapters/prisma/migrations/20261025140000_send_to_a_label/migration.sql +16 -0
- package/src/adapters/prisma/migrations/20261025150000_define_scope/migration.sql +64 -0
- package/src/adapters/prisma/migrations/20261025150100_defined_scopes/migration.sql +15 -0
- package/src/adapters/prisma/migrations/20261025160000_retention/migration.sql +7 -0
- package/src/adapters/prisma/migrations/20261025170000_message_deliveries_page/migration.sql +7 -0
- package/src/adapters/prisma/migrations/20261025180000_history_pruning/migration.sql +25 -0
- package/src/adapters/prisma/migrations/20261025190000_history_pruning_crew_events/migration.sql +2 -0
- package/src/adapters/prisma/migrations/20261025200000_schedule_to_a_label/migration.sql +12 -0
- package/src/adapters/prisma/schema.prisma +179 -26
|
@@ -1,13 +1,44 @@
|
|
|
1
1
|
import { refuse } from '../shared/errors.js';
|
|
2
2
|
import { ok } from '../shared/result.js';
|
|
3
|
-
/** An installation that has set nothing: no limit anywhere, as a self-hosted server runs. */
|
|
4
|
-
export const NO_INSTALLATION_SETTINGS = {
|
|
5
|
-
|
|
6
|
-
|
|
3
|
+
/** An installation that has set nothing: no limit anywhere and everything kept, as a self-hosted server runs. */
|
|
4
|
+
export const NO_INSTALLATION_SETTINGS = {
|
|
5
|
+
defaultShipLimit: null,
|
|
6
|
+
defaultDailyMessageLimit: null,
|
|
7
|
+
defaultSchedulesPerShipLimit: null,
|
|
8
|
+
defaultMinimumScheduleInterval: null,
|
|
9
|
+
defaultRetentionDays: null,
|
|
10
|
+
fleetCap: null,
|
|
11
|
+
};
|
|
12
|
+
/** A fleet that has set nothing for itself: every limit and the retention follow the installation default. */
|
|
13
|
+
export const FOLLOWING_DEFAULTS = {
|
|
14
|
+
ships: { kind: 'default' },
|
|
15
|
+
dailyMessages: { kind: 'default' },
|
|
16
|
+
schedulesPerShip: { kind: 'default' },
|
|
17
|
+
minimumScheduleInterval: { kind: 'default' },
|
|
18
|
+
retention: { kind: 'default' },
|
|
19
|
+
};
|
|
20
|
+
/** The limits a fleet applies from how it set them and the installation's defaults. */
|
|
21
|
+
export function appliedLimitsOf(settings, installation) {
|
|
22
|
+
return {
|
|
23
|
+
ships: appliedLimit(settings.ships, installation.defaultShipLimit),
|
|
24
|
+
dailyMessages: appliedLimit(settings.dailyMessages, installation.defaultDailyMessageLimit),
|
|
25
|
+
schedulesPerShip: appliedLimit(settings.schedulesPerShip, installation.defaultSchedulesPerShipLimit),
|
|
26
|
+
minimumScheduleInterval: appliedLimit(settings.minimumScheduleInterval, installation.defaultMinimumScheduleInterval),
|
|
27
|
+
retention: appliedRetention(settings.retention, installation.defaultRetentionDays),
|
|
28
|
+
};
|
|
29
|
+
}
|
|
7
30
|
/** A limit as configured: a whole number of at least 0, or null for no limit. */
|
|
8
31
|
export function limit(raw) {
|
|
9
32
|
return raw === null || (Number.isInteger(raw) && raw >= 0) ? ok(raw) : refuse('INVALID_LIMIT', 'A limit is a whole number of at least 0, or none');
|
|
10
33
|
}
|
|
34
|
+
/** A retention as configured: a whole number of days of at least 1, or null for kept for good; no other minimum or maximum (decision 0066). */
|
|
35
|
+
export function retentionDays(raw) {
|
|
36
|
+
return raw === null || (Number.isInteger(raw) && raw >= 1) ? ok(raw) : refuse('INVALID_RETENTION', 'A retention is a whole number of days of at least 1, or none');
|
|
37
|
+
}
|
|
38
|
+
/** The days a retention setting gives: its own when set for the fleet, else the installation default. */
|
|
39
|
+
export function appliedRetention(setting, defaultDays) {
|
|
40
|
+
return setting.kind === 'fleet' ? setting.days : defaultDays;
|
|
41
|
+
}
|
|
11
42
|
/** The limit a setting gives: its own when set for the fleet, else the installation default. */
|
|
12
43
|
export function appliedLimit(setting, defaultLimit) {
|
|
13
44
|
return setting.kind === 'fleet' ? setting.limit : defaultLimit;
|
|
@@ -15,10 +46,14 @@ export function appliedLimit(setting, defaultLimit) {
|
|
|
15
46
|
/** A fleet's limits from how it set them and the installation's defaults. */
|
|
16
47
|
export function fleetLimitsOf(of) {
|
|
17
48
|
const { fleetId, settings, installation } = of;
|
|
49
|
+
const applies = appliedLimitsOf(settings, installation);
|
|
18
50
|
return {
|
|
19
51
|
fleetId,
|
|
20
|
-
ships: { setting: settings.ships, applies:
|
|
21
|
-
dailyMessages: { setting: settings.dailyMessages, applies:
|
|
52
|
+
ships: { setting: settings.ships, applies: applies.ships },
|
|
53
|
+
dailyMessages: { setting: settings.dailyMessages, applies: applies.dailyMessages },
|
|
54
|
+
schedulesPerShip: { setting: settings.schedulesPerShip, applies: applies.schedulesPerShip },
|
|
55
|
+
minimumScheduleInterval: { setting: settings.minimumScheduleInterval, applies: applies.minimumScheduleInterval },
|
|
56
|
+
retention: { setting: settings.retention, applies: applies.retention },
|
|
22
57
|
};
|
|
23
58
|
}
|
|
24
59
|
//# sourceMappingURL=limits.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"limits.js","sourceRoot":"","sources":["../../../src/domain/registry/limits.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"limits.js","sourceRoot":"","sources":["../../../src/domain/registry/limits.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,15 @@
|
|
|
1
1
|
import { type ShipId } from '@aeolus-fleet/common';
|
|
2
2
|
import type { Caller } from '../shared/caller.js';
|
|
3
|
-
import type { ScopeNamespaceRepository, ShipRepository } from './ports.js';
|
|
3
|
+
import type { DefinedScopeRepository, ScopeNamespaceRepository, ShipRepository } from './ports.js';
|
|
4
4
|
import type { DeclaredScope } from './scope-namespace.js';
|
|
5
|
-
/**
|
|
5
|
+
/**
|
|
6
|
+
* A namespace as the fleet lists it, saying whose it is: core's, declared by
|
|
7
|
+
* no ship; a plugin's, with its declarer by id and name; or the fleet's own
|
|
8
|
+
* scopes, declared by no ship (design gateway-scopes, 4.1).
|
|
9
|
+
*/
|
|
6
10
|
export interface ListedNamespace {
|
|
7
11
|
namespace: string;
|
|
12
|
+
kind: 'core' | 'plugin' | 'fleet';
|
|
8
13
|
declaredBy: {
|
|
9
14
|
id: ShipId;
|
|
10
15
|
name: string;
|
|
@@ -14,12 +19,14 @@ export interface ListedNamespace {
|
|
|
14
19
|
export type ListScopes = (caller: Caller) => Promise<ListedNamespace[]>;
|
|
15
20
|
/**
|
|
16
21
|
* Use case: every namespace of the caller's fleet (decision 0046), for any
|
|
17
|
-
* actor, so pagasae offers each plugin's scopes
|
|
18
|
-
* namespaces first, each with its scopes in catalogue
|
|
19
|
-
*
|
|
20
|
-
* (fleet:read) is
|
|
22
|
+
* actor, so pagasae offers each plugin's scopes and the fleet's own to its
|
|
23
|
+
* groups (0053): the core namespaces first, each with its scopes in catalogue
|
|
24
|
+
* order, then the plugins' and the fleet's by namespace, a plugin's scopes as
|
|
25
|
+
* declared and the fleet's by name. The caller's scope (fleet:read) is
|
|
26
|
+
* checked before this runs.
|
|
21
27
|
*/
|
|
22
28
|
export declare function createListScopes(deps: {
|
|
23
29
|
scopeNamespaces: Pick<ScopeNamespaceRepository, 'list'>;
|
|
30
|
+
definedScopes: Pick<DefinedScopeRepository, 'list'>;
|
|
24
31
|
ships: Pick<ShipRepository, 'find'>;
|
|
25
32
|
}): ListScopes;
|
|
@@ -1,23 +1,32 @@
|
|
|
1
1
|
import { CORE_NAMESPACES, CORE_SCOPE_DESCRIPTIONS, SCOPES } from '@aeolus-fleet/common';
|
|
2
|
+
import { namespaceOf } from './defined-scope.js';
|
|
2
3
|
/**
|
|
3
4
|
* Use case: every namespace of the caller's fleet (decision 0046), for any
|
|
4
|
-
* actor, so pagasae offers each plugin's scopes
|
|
5
|
-
* namespaces first, each with its scopes in catalogue
|
|
6
|
-
*
|
|
7
|
-
* (fleet:read) is
|
|
5
|
+
* actor, so pagasae offers each plugin's scopes and the fleet's own to its
|
|
6
|
+
* groups (0053): the core namespaces first, each with its scopes in catalogue
|
|
7
|
+
* order, then the plugins' and the fleet's by namespace, a plugin's scopes as
|
|
8
|
+
* declared and the fleet's by name. The caller's scope (fleet:read) is
|
|
9
|
+
* checked before this runs.
|
|
8
10
|
*/
|
|
9
11
|
export function createListScopes(deps) {
|
|
10
12
|
return async (caller) => {
|
|
11
13
|
const core = CORE_NAMESPACES.map((namespace) => ({
|
|
12
14
|
namespace,
|
|
15
|
+
kind: 'core',
|
|
13
16
|
declaredBy: null,
|
|
14
17
|
scopes: SCOPES.filter((scope) => scope.startsWith(`${namespace}:`)).map((scope) => ({ scope, description: CORE_SCOPE_DESCRIPTIONS[scope] })),
|
|
15
18
|
}));
|
|
16
19
|
const plugins = await Promise.all((await deps.scopeNamespaces.list(caller.fleetId)).map(async ({ namespace, declaredBy, scopes }) => {
|
|
17
20
|
const declarer = await deps.ships.find(caller.fleetId, declaredBy);
|
|
18
|
-
return { namespace, declaredBy: { id: declaredBy, name: declarer?.name ?? declaredBy }, scopes };
|
|
21
|
+
return { namespace, kind: 'plugin', declaredBy: { id: declaredBy, name: declarer?.name ?? declaredBy }, scopes };
|
|
19
22
|
}));
|
|
20
|
-
|
|
23
|
+
const fleet = new Map();
|
|
24
|
+
for (const { scope, description } of await deps.definedScopes.list(caller.fleetId)) {
|
|
25
|
+
const namespace = namespaceOf(scope);
|
|
26
|
+
fleet.set(namespace, [...(fleet.get(namespace) ?? []), { scope, description }]);
|
|
27
|
+
}
|
|
28
|
+
const others = [...plugins, ...[...fleet].map(([namespace, scopes]) => ({ namespace, kind: 'fleet', declaredBy: null, scopes }))];
|
|
29
|
+
return [...core, ...others.toSorted((first, second) => (first.namespace < second.namespace ? -1 : 1))];
|
|
21
30
|
};
|
|
22
31
|
}
|
|
23
32
|
//# sourceMappingURL=list-scopes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-scopes.js","sourceRoot":"","sources":["../../../src/domain/registry/list-scopes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,EAAe,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"list-scopes.js","sourceRoot":"","sources":["../../../src/domain/registry/list-scopes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,EAAe,MAAM,sBAAsB,CAAC;AAGrG,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAkBjD;;;;;;;GAOG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAIhC;IACC,OAAO,KAAK,EAAE,MAAM,EAAE,EAAE;QACtB,MAAM,IAAI,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;YAC/C,SAAS;YACT,IAAI,EAAE,MAAe;YACrB,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,SAAS,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,uBAAuB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;SAC7I,CAAC,CAAC,CAAC;QACJ,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE;YAChG,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YACnE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,QAAiB,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,IAAI,UAAU,EAAE,EAAE,MAAM,EAAE,CAAC;QAC5H,CAAC,CAAC,CACH,CAAC;QACF,MAAM,KAAK,GAAG,IAAI,GAAG,EAA2B,CAAC;QACjD,KAAK,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YACnF,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;YACrC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;QAClF,CAAC;QACD,MAAM,MAAM,GAAsB,CAAC,GAAG,OAAO,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,OAAgB,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9J,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACzG,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,19 +1,29 @@
|
|
|
1
|
-
import type { FleetId } from '@aeolus-fleet/common';
|
|
2
|
-
import type { ScopeNamespaceRepository, ShipRepository } from './ports.js';
|
|
1
|
+
import type { FleetId, ScopeName } from '@aeolus-fleet/common';
|
|
2
|
+
import type { DefinedScopeRepository, ScopeNamespaceRepository, ShipRepository } from './ports.js';
|
|
3
3
|
import type { ScopeNamespace } from './scope-namespace.js';
|
|
4
4
|
export interface NamedNamespacesTx {
|
|
5
5
|
ships: Pick<ShipRepository, 'find'>;
|
|
6
6
|
scopeNamespaces: Pick<ScopeNamespaceRepository, 'lockNamespace' | 'find'>;
|
|
7
|
+
definedScopes: Pick<DefinedScopeRepository, 'find'>;
|
|
8
|
+
}
|
|
9
|
+
/** What the fleet holds of the namespaces some scopes name: the plugins' namespaces, and which of the scopes are the fleet's own. */
|
|
10
|
+
export interface NamedNamespaces {
|
|
11
|
+
/** The plugin namespaces the scopes name, with their declarers' names, by namespace. */
|
|
12
|
+
namespaces: Map<string, {
|
|
13
|
+
namespace: ScopeNamespace;
|
|
14
|
+
declarerName: string;
|
|
15
|
+
}>;
|
|
16
|
+
/** The scopes the fleet defined as its own (design gateway-scopes, 4.1). */
|
|
17
|
+
defined: Set<ScopeName>;
|
|
7
18
|
}
|
|
8
19
|
/**
|
|
9
20
|
* The plugin namespaces the scopes name, with their declarers' names, by
|
|
10
|
-
* namespace,
|
|
11
|
-
*
|
|
21
|
+
* namespace, and which of the scopes the fleet defined, each namespace
|
|
22
|
+
* locked in name order: a declaration that removes one of the scopes, or a
|
|
23
|
+
* removal of one of the fleet's, waits until the unit of work ends
|
|
24
|
+
* (decision 0046).
|
|
12
25
|
*/
|
|
13
26
|
export declare function lockNamedNamespaces(tx: NamedNamespacesTx, at: {
|
|
14
27
|
fleetId: FleetId;
|
|
15
28
|
scopes: readonly string[];
|
|
16
|
-
}): Promise<
|
|
17
|
-
namespace: ScopeNamespace;
|
|
18
|
-
declarerName: string;
|
|
19
|
-
}>>;
|
|
29
|
+
}): Promise<NamedNamespaces>;
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* The plugin namespaces the scopes name, with their declarers' names, by
|
|
3
|
-
* namespace,
|
|
4
|
-
*
|
|
3
|
+
* namespace, and which of the scopes the fleet defined, each namespace
|
|
4
|
+
* locked in name order: a declaration that removes one of the scopes, or a
|
|
5
|
+
* removal of one of the fleet's, waits until the unit of work ends
|
|
6
|
+
* (decision 0046).
|
|
5
7
|
*/
|
|
6
8
|
export async function lockNamedNamespaces(tx, at) {
|
|
7
9
|
const namespaces = new Map();
|
|
10
|
+
const defined = new Set();
|
|
8
11
|
const named = [...new Set(at.scopes.filter((scope) => scope.includes(':')).map((scope) => scope.slice(0, scope.indexOf(':'))))].toSorted();
|
|
9
12
|
for (const name of named) {
|
|
10
13
|
await tx.scopeNamespaces.lockNamespace(at.fleetId, name);
|
|
@@ -14,6 +17,11 @@ export async function lockNamedNamespaces(tx, at) {
|
|
|
14
17
|
namespaces.set(name, { namespace, declarerName: declarer?.name ?? namespace.declaredBy });
|
|
15
18
|
}
|
|
16
19
|
}
|
|
17
|
-
|
|
20
|
+
for (const scope of new Set(at.scopes.filter((each) => named.some((name) => each.startsWith(`${name}:`))))) {
|
|
21
|
+
if ((await tx.definedScopes.find(at.fleetId, scope)) !== undefined) {
|
|
22
|
+
defined.add(scope);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
return { namespaces, defined };
|
|
18
26
|
}
|
|
19
27
|
//# sourceMappingURL=named-namespaces.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"named-namespaces.js","sourceRoot":"","sources":["../../../src/domain/registry/named-namespaces.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"named-namespaces.js","sourceRoot":"","sources":["../../../src/domain/registry/named-namespaces.ts"],"names":[],"mappings":"AAmBA;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,EAAqB,EAAE,EAAmD;IAClH,MAAM,UAAU,GAAG,IAAI,GAAG,EAA+D,CAAC;IAC1F,MAAM,OAAO,GAAG,IAAI,GAAG,EAAa,CAAC;IACrC,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC3I,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,EAAE,CAAC,eAAe,CAAC,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACzD,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAClE,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;YACvE,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,IAAI,SAAS,CAAC,UAAU,EAAE,CAAC,CAAC;QAC5F,CAAC;IACH,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3G,IAAI,CAAC,MAAM,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;YACnE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC;IACH,CAAC;IACD,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;AACjC,CAAC"}
|
|
@@ -15,6 +15,7 @@ import type { DeclaredNetworkRules } from './declared-network-rules.js';
|
|
|
15
15
|
import type { NetworkSettings } from './network-settings.js';
|
|
16
16
|
import type { NetworkRulesDraft } from './network-rules-draft.js';
|
|
17
17
|
import type { ReachRefusal } from './reach-refusal.js';
|
|
18
|
+
import type { DefinedScope } from './defined-scope.js';
|
|
18
19
|
import type { ScopeNamespace } from './scope-namespace.js';
|
|
19
20
|
import type { Commissioner, Ship } from './ship.js';
|
|
20
21
|
import type { ShipCounts } from './ship-counts.js';
|
|
@@ -161,6 +162,8 @@ export interface ShipRepository {
|
|
|
161
162
|
listActiveHoldingInForUpdate(fleetId: FleetId, namespace: string): Promise<Ship[]>;
|
|
162
163
|
/** The scopes of this plugin namespace that a ship not retired holds, each once, by name (decision 0046). */
|
|
163
164
|
scopesHeldIn(fleetId: FleetId, namespace: string): Promise<ScopeName[]>;
|
|
165
|
+
/** How many active ships hold the scope. */
|
|
166
|
+
countHolding(fleetId: FleetId, scope: ScopeName): Promise<number>;
|
|
164
167
|
}
|
|
165
168
|
/**
|
|
166
169
|
* Outbound port: the plugin namespaces of a fleet (decision 0046), one per
|
|
@@ -181,6 +184,23 @@ export interface ScopeNamespaceRepository {
|
|
|
181
184
|
/** The namespace goes, freed for another ship. */
|
|
182
185
|
remove(fleetId: FleetId, namespace: string): Promise<void>;
|
|
183
186
|
}
|
|
187
|
+
/**
|
|
188
|
+
* The fleet's own scopes (design gateway-scopes, 4.1). A change holds the
|
|
189
|
+
* lock on the scope's namespace (ScopeNamespaceRepository.lockNamespace), so
|
|
190
|
+
* a definition and a plugin's declaration of one namespace wait for each other.
|
|
191
|
+
*/
|
|
192
|
+
export interface DefinedScopeRepository {
|
|
193
|
+
/** The scope, if the fleet has it. */
|
|
194
|
+
find(fleetId: FleetId, scope: ScopeName): Promise<DefinedScope | undefined>;
|
|
195
|
+
/** Stores the scope, or its new description. */
|
|
196
|
+
save(defined: DefinedScope): Promise<void>;
|
|
197
|
+
/** The scope goes. */
|
|
198
|
+
remove(fleetId: FleetId, scope: ScopeName): Promise<void>;
|
|
199
|
+
/** Every scope of the fleet's own, by name. */
|
|
200
|
+
list(fleetId: FleetId): Promise<DefinedScope[]>;
|
|
201
|
+
/** Whether the fleet has a scope of its own in this namespace. */
|
|
202
|
+
usesNamespace(fleetId: FleetId, namespace: string): Promise<boolean>;
|
|
203
|
+
}
|
|
184
204
|
/** Outbound port: leases, always within one fleet. */
|
|
185
205
|
export interface LeaseRepository {
|
|
186
206
|
/** The ship's open lease, locked until the unit of work ends. */
|
|
@@ -5,6 +5,8 @@ export { findPingableShip, type PingableShipTx, type UnpingableShip } from './pi
|
|
|
5
5
|
export { checkManage, checkRead, checkReach, keepingReachRefusal, type CheckManageTx, type CheckReachTx, type CheckReadTx, type NotReachable } from './check-reach.js';
|
|
6
6
|
export { resolveSelector, type ResolveSelectorTx, type UnresolvableSelector } from './resolve-selector.js';
|
|
7
7
|
export { resolveInvitees, type Invitee, type ResolveInviteesTx } from './resolve-invitees.js';
|
|
8
|
+
export { resolveLabelSelection, type ResolveLabelSelectionTx } from './resolve-label-selection.js';
|
|
9
|
+
export { labelValueTexts, type LabelValueTextsTx } from './label-value-texts.js';
|
|
8
10
|
export { findOperatorShip, findShip, findViewerShip, type FindShipTx, type ShipTx } from './ships.js';
|
|
9
11
|
export { isConsoleShip, OPERATOR_SHIP_NAME, shipStatus, type Ship } from './ship.js';
|
|
10
12
|
export { appliedLimits, type AppliedLimitsTx } from './applied-limits.js';
|
|
@@ -6,6 +6,8 @@ export { findPingableShip } from './pingable-ship.js';
|
|
|
6
6
|
export { checkManage, checkRead, checkReach, keepingReachRefusal } from './check-reach.js';
|
|
7
7
|
export { resolveSelector } from './resolve-selector.js';
|
|
8
8
|
export { resolveInvitees } from './resolve-invitees.js';
|
|
9
|
+
export { resolveLabelSelection } from './resolve-label-selection.js';
|
|
10
|
+
export { labelValueTexts } from './label-value-texts.js';
|
|
9
11
|
export { findOperatorShip, findShip, findViewerShip } from './ships.js';
|
|
10
12
|
export { isConsoleShip, OPERATOR_SHIP_NAME, shipStatus } from './ship.js';
|
|
11
13
|
export { appliedLimits } from './applied-limits.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public.js","sourceRoot":"","sources":["../../../src/domain/registry/public.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,2DAA2D;AAC3D,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAmE,MAAM,YAAY,CAAC;AACzH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,eAAe,EAAE,qBAAqB,EAAkC,MAAM,aAAa,CAAC;AAEzI,OAAO,EAAE,gBAAgB,EAA4C,MAAM,oBAAoB,CAAC;AAChG,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,mBAAmB,EAA8E,MAAM,kBAAkB,CAAC;AACvK,OAAO,EAAE,eAAe,EAAqD,MAAM,uBAAuB,CAAC;AAC3G,OAAO,EAAE,eAAe,EAAwC,MAAM,uBAAuB,CAAC;AAC9F,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,cAAc,EAAgC,MAAM,YAAY,CAAC;AACtG,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,UAAU,EAAa,MAAM,WAAW,CAAC;AACrF,OAAO,EAAE,aAAa,EAAwB,MAAM,qBAAqB,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,SAAS,EAAyD,MAAM,iBAAiB,CAAC"}
|
|
1
|
+
{"version":3,"file":"public.js","sourceRoot":"","sources":["../../../src/domain/registry/public.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,2DAA2D;AAC3D,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAmE,MAAM,YAAY,CAAC;AACzH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,eAAe,EAAE,qBAAqB,EAAkC,MAAM,aAAa,CAAC;AAEzI,OAAO,EAAE,gBAAgB,EAA4C,MAAM,oBAAoB,CAAC;AAChG,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,mBAAmB,EAA8E,MAAM,kBAAkB,CAAC;AACvK,OAAO,EAAE,eAAe,EAAqD,MAAM,uBAAuB,CAAC;AAC3G,OAAO,EAAE,eAAe,EAAwC,MAAM,uBAAuB,CAAC;AAC9F,OAAO,EAAE,qBAAqB,EAAgC,MAAM,8BAA8B,CAAC;AACnG,OAAO,EAAE,eAAe,EAA0B,MAAM,wBAAwB,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,cAAc,EAAgC,MAAM,YAAY,CAAC;AACtG,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,UAAU,EAAa,MAAM,WAAW,CAAC;AACrF,OAAO,EAAE,aAAa,EAAwB,MAAM,qBAAqB,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,SAAS,EAAyD,MAAM,iBAAiB,CAAC"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import type { IdGenerator } from '@aeolus-fleet/common';
|
|
2
|
+
import { type Caller } 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 { UnitOfWork } from '../shared/unit-of-work.js';
|
|
8
|
+
import type { DefinedScopeRepository, ScopeNamespaceRepository, ShipRepository } from './ports.js';
|
|
9
|
+
export interface RemoveScopeTx {
|
|
10
|
+
ships: Pick<ShipRepository, 'countHolding'>;
|
|
11
|
+
scopeNamespaces: Pick<ScopeNamespaceRepository, 'lockNamespace'>;
|
|
12
|
+
definedScopes: Pick<DefinedScopeRepository, 'find' | 'remove'>;
|
|
13
|
+
events: EventLog;
|
|
14
|
+
}
|
|
15
|
+
export type RemoveScope = (caller: Caller, input: {
|
|
16
|
+
scope: string;
|
|
17
|
+
}) => Promise<Result<null, DomainError<'SCOPE_NOT_DEFINED' | 'SCOPE_HELD'>>>;
|
|
18
|
+
/**
|
|
19
|
+
* Use case: any actor removes one of the fleet's scopes, refused while an
|
|
20
|
+
* active ship holds it (design gateway-scopes, 4.1). Its scope
|
|
21
|
+
* (scopes:define) is checked before this runs. In one unit of work, holding
|
|
22
|
+
* the scope's namespace, so a grant of it waits and then finds it gone: the
|
|
23
|
+
* removal and ScopeRemoved.
|
|
24
|
+
*/
|
|
25
|
+
export declare function createRemoveScope(deps: {
|
|
26
|
+
uow: UnitOfWork<RemoveScopeTx>;
|
|
27
|
+
clock: Clock;
|
|
28
|
+
ids: IdGenerator;
|
|
29
|
+
}): RemoveScope;
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { actorOf } from '../shared/caller.js';
|
|
2
|
+
import { recordEvent } from '../shared/events.js';
|
|
3
|
+
import { ok } from '../shared/result.js';
|
|
4
|
+
import { namespaceOf, removeScope } from './defined-scope.js';
|
|
5
|
+
/**
|
|
6
|
+
* Use case: any actor removes one of the fleet's scopes, refused while an
|
|
7
|
+
* active ship holds it (design gateway-scopes, 4.1). Its scope
|
|
8
|
+
* (scopes:define) is checked before this runs. In one unit of work, holding
|
|
9
|
+
* the scope's namespace, so a grant of it waits and then finds it gone: the
|
|
10
|
+
* removal and ScopeRemoved.
|
|
11
|
+
*/
|
|
12
|
+
export function createRemoveScope(deps) {
|
|
13
|
+
return (caller, input) => deps.uow.run(async (tx) => {
|
|
14
|
+
const { fleetId } = caller;
|
|
15
|
+
await tx.scopeNamespaces.lockNamespace(fleetId, namespaceOf(input.scope));
|
|
16
|
+
const removed = removeScope(await tx.definedScopes.find(fleetId, input.scope), {
|
|
17
|
+
scope: input.scope,
|
|
18
|
+
holders: await tx.ships.countHolding(fleetId, input.scope),
|
|
19
|
+
at: deps.clock.now(),
|
|
20
|
+
actor: actorOf(caller),
|
|
21
|
+
});
|
|
22
|
+
if (!removed.isOk) {
|
|
23
|
+
return removed;
|
|
24
|
+
}
|
|
25
|
+
await tx.definedScopes.remove(fleetId, input.scope);
|
|
26
|
+
for (const event of removed.value.events) {
|
|
27
|
+
await recordEvent({ events: tx.events, ids: deps.ids }, event);
|
|
28
|
+
}
|
|
29
|
+
return ok(null);
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=remove-scope.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remove-scope.js","sourceRoot":"","sources":["../../../src/domain/registry/remove-scope.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAe,MAAM,qBAAqB,CAAC;AAG3D,OAAO,EAAE,WAAW,EAAiB,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAY9D;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAwE;IACxG,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CACvB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAA0E,EAAE;QAChG,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;QAC3B,MAAM,EAAE,CAAC,eAAe,CAAC,aAAa,CAAC,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1E,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE;YAC7E,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,OAAO,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC;YAC1D,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE;YACpB,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC;SACvB,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAClB,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QACpD,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YACzC,MAAM,WAAW,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import type { FleetId, LabelValueId, ShipId } from '@aeolus-fleet/common';
|
|
2
|
+
import { type Result } from '../shared/result.js';
|
|
3
|
+
import type { ShipRepository } from './ports.js';
|
|
4
|
+
import type { UnresolvableSelector } from './resolve-selector.js';
|
|
5
|
+
/** The ports resolving a label selection reads, inside the caller's unit of work. */
|
|
6
|
+
export interface ResolveLabelSelectionTx {
|
|
7
|
+
ships: Pick<ShipRepository, 'listActiveCarryingEvery' | 'findForShare'>;
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* The ships a send to a label selection goes to, at send time (decision
|
|
11
|
+
* 0065): every ship carrying each value that is not retired, awaiting crew or
|
|
12
|
+
* crewed, never the viewer and never the sender. Each is held in id order as
|
|
13
|
+
* a send holds the ship it addresses, so a retire waits for the send and a
|
|
14
|
+
* ship retired before its hold is left out. No ship refuses the send.
|
|
15
|
+
*/
|
|
16
|
+
export declare function resolveLabelSelection(tx: ResolveLabelSelectionTx, input: {
|
|
17
|
+
fleetId: FleetId;
|
|
18
|
+
valueIds: readonly LabelValueId[];
|
|
19
|
+
senderShipId: ShipId;
|
|
20
|
+
}): Promise<Result<ShipId[], UnresolvableSelector>>;
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { refuse } from '../shared/errors.js';
|
|
2
|
+
import { ok } from '../shared/result.js';
|
|
3
|
+
import { addressShip } from './ship.js';
|
|
4
|
+
/**
|
|
5
|
+
* The ships a send to a label selection goes to, at send time (decision
|
|
6
|
+
* 0065): every ship carrying each value that is not retired, awaiting crew or
|
|
7
|
+
* crewed, never the viewer and never the sender. Each is held in id order as
|
|
8
|
+
* a send holds the ship it addresses, so a retire waits for the send and a
|
|
9
|
+
* ship retired before its hold is left out. No ship refuses the send.
|
|
10
|
+
*/
|
|
11
|
+
export async function resolveLabelSelection(tx, input) {
|
|
12
|
+
const { fleetId, senderShipId } = input;
|
|
13
|
+
const selected = (await tx.ships.listActiveCarryingEvery(fleetId, input.valueIds))
|
|
14
|
+
.map((ship) => ship.id)
|
|
15
|
+
.filter((shipId) => shipId !== senderShipId)
|
|
16
|
+
.sort();
|
|
17
|
+
const resolved = [];
|
|
18
|
+
for (const shipId of selected) {
|
|
19
|
+
const ship = await tx.ships.findForShare(fleetId, shipId);
|
|
20
|
+
if (ship && addressShip(ship).isOk) {
|
|
21
|
+
resolved.push(shipId);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
return resolved.length === 0 ? refuse('UNRESOLVABLE_SELECTOR', 'No ship but the sender carries every value of the label selection') : ok(resolved);
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=resolve-label-selection.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolve-label-selection.js","sourceRoot":"","sources":["../../../src/domain/registry/resolve-label-selection.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAOxC;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,EAA2B,EAC3B,KAAoF;IAEpF,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;IACxC,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,uBAAuB,CAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;SAC/E,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;SACtB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,YAAY,CAAC;SAC3C,IAAI,EAAE,CAAC;IACV,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC1D,IAAI,IAAI,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;YACnC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,uBAAuB,EAAE,mEAAmE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;AACrJ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { IdGenerator, ShipId } from '@aeolus-fleet/common';
|
|
2
2
|
import { type CredentialTx } from '../identity/public.js';
|
|
3
|
-
import { type AcceptRefusal, type RequestHasher, type RetiredParticipantTx } from '../messaging/public.js';
|
|
3
|
+
import { type AcceptRefusal, type RequestHasher, type RetiredParticipantTx, type RetiredSchedulerTx } from '../messaging/public.js';
|
|
4
4
|
import { type Caller } from '../shared/caller.js';
|
|
5
5
|
import type { Clock } from '../shared/clock.js';
|
|
6
6
|
import { type DomainError } from '../shared/errors.js';
|
|
@@ -10,7 +10,7 @@ import { type CheckManageTx, type NotReachable } from './check-reach.js';
|
|
|
10
10
|
import { type LeaseTx } from './leases.js';
|
|
11
11
|
import type { ClearRequestRepository, CrewRequestRepository, DeclaredNetworkRulesRepository, LabelRepository, NetworkSettingsRepository, ScopeNamespaceRepository, ShipRepository, VerifiedFactsRepository } from './ports.js';
|
|
12
12
|
import { type RetireRefusal } from './ship.js';
|
|
13
|
-
export interface RetireShipTx extends LeaseTx, CredentialTx, RetiredParticipantTx, Omit<CheckManageTx, 'ships' | 'labels' | 'networkSettings' | 'declaredNetworkRules' | 'events'> {
|
|
13
|
+
export interface RetireShipTx extends LeaseTx, CredentialTx, RetiredParticipantTx, RetiredSchedulerTx, Omit<CheckManageTx, 'ships' | 'labels' | 'networkSettings' | 'declaredNetworkRules' | 'events'> {
|
|
14
14
|
ships: ShipRepository;
|
|
15
15
|
crewRequests: CrewRequestRepository;
|
|
16
16
|
clearRequests: ClearRequestRepository;
|
|
@@ -52,6 +52,9 @@ export type RetireShip = (caller: Caller, input: {
|
|
|
52
52
|
* mic, its moderatorship going to the owner, and a meeting it owns ends, the
|
|
53
53
|
* others told (decision 0061, M15, M17): those meetings it locks before the
|
|
54
54
|
* ship, as a contribution locks its meeting before its recipients.
|
|
55
|
+
* Its active and paused schedules are cancelled, one ScheduleCancelled each
|
|
56
|
+
* (decision 0062, S11), locked before the ship too, as a send time locks its
|
|
57
|
+
* schedule before the ship it sends to.
|
|
55
58
|
* The caller, any actor (decision 0057), needs fleet:manage, checked before
|
|
56
59
|
* this runs, and manage reach on the ship here (decision 0034), a refusal
|
|
57
60
|
* storing only its record. That check reads the network
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { revokeShipSecret } from '../identity/public.js';
|
|
2
|
-
import { leaveMeetingsOnRetire, lockMeetingsOf } from '../messaging/public.js';
|
|
2
|
+
import { cancelSchedulesOnRetire, leaveMeetingsOnRetire, lockMeetingsOf, lockSchedulesOf } from '../messaging/public.js';
|
|
3
3
|
import { actorOf } from '../shared/caller.js';
|
|
4
4
|
import { refuse } from '../shared/errors.js';
|
|
5
5
|
import { recordEvent } from '../shared/events.js';
|
|
@@ -39,6 +39,9 @@ import { removeWithRetiredShip } from './verified-facts.js';
|
|
|
39
39
|
* mic, its moderatorship going to the owner, and a meeting it owns ends, the
|
|
40
40
|
* others told (decision 0061, M15, M17): those meetings it locks before the
|
|
41
41
|
* ship, as a contribution locks its meeting before its recipients.
|
|
42
|
+
* Its active and paused schedules are cancelled, one ScheduleCancelled each
|
|
43
|
+
* (decision 0062, S11), locked before the ship too, as a send time locks its
|
|
44
|
+
* schedule before the ship it sends to.
|
|
42
45
|
* The caller, any actor (decision 0057), needs fleet:manage, checked before
|
|
43
46
|
* this runs, and manage reach on the ship here (decision 0034), a refusal
|
|
44
47
|
* storing only its record. That check reads the network
|
|
@@ -55,6 +58,7 @@ export function createRetireShip(deps) {
|
|
|
55
58
|
return (caller, { shipId }) => keepingReachRefusal(deps.uow, async (tx) => {
|
|
56
59
|
const { fleetId } = caller;
|
|
57
60
|
const meetings = await lockMeetingsOf(tx, { fleetId, shipId });
|
|
61
|
+
const schedules = await lockSchedulesOf(tx, { fleetId, shipId });
|
|
58
62
|
const ship = await tx.ships.findForUpdate(fleetId, shipId);
|
|
59
63
|
if (!ship) {
|
|
60
64
|
return refuse('SHIP_NOT_FOUND', `Ship ${shipId} does not exist`);
|
|
@@ -161,6 +165,7 @@ export function createRetireShip(deps) {
|
|
|
161
165
|
if (!left.isOk) {
|
|
162
166
|
return left;
|
|
163
167
|
}
|
|
168
|
+
await cancelSchedulesOnRetire({ tx, ids: deps.ids }, { schedules, actor, at });
|
|
164
169
|
await tx.verifiedFacts.lockWriter(fleetId, shipId);
|
|
165
170
|
const facts = removeWithRetiredShip({ about: await tx.verifiedFacts.listAbout(fleetId, shipId), by: await tx.verifiedFacts.listBy(fleetId, shipId) }, { at, actor });
|
|
166
171
|
for (const written of facts.removed) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retire-ship.js","sourceRoot":"","sources":["../../../src/domain/registry/retire-ship.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAqB,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"retire-ship.js","sourceRoot":"","sources":["../../../src/domain/registry/retire-ship.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,14 +35,17 @@ export declare function grantScopes(input: {
|
|
|
35
35
|
namespace: ScopeNamespace;
|
|
36
36
|
declarerName: string;
|
|
37
37
|
}>;
|
|
38
|
+
/** Which of the granted and revoked scopes the fleet defined as its own (design gateway-scopes, 4.1). */
|
|
39
|
+
defined: ReadonlySet<ScopeName>;
|
|
38
40
|
}): Result<{
|
|
39
41
|
ship: Ship;
|
|
40
42
|
events: NewEvent[];
|
|
41
43
|
}, GrantScopesRefusal>;
|
|
42
44
|
/**
|
|
43
45
|
* Whether the granter may grant or revoke the scope, at commission or on a
|
|
44
|
-
* live ship: a core scope it holds,
|
|
45
|
-
* declared (decision 0053)
|
|
46
|
+
* live ship: a core scope it holds, a declared plugin scope it holds or
|
|
47
|
+
* declared (decision 0053), or one of the fleet's own scopes it holds
|
|
48
|
+
* (design gateway-scopes, 4.1): defining a scope never lets an actor grant it.
|
|
46
49
|
*/
|
|
47
50
|
export declare function mayGrant(scope: string, at: {
|
|
48
51
|
granter: Granter;
|
|
@@ -50,4 +53,5 @@ export declare function mayGrant(scope: string, at: {
|
|
|
50
53
|
namespace: ScopeNamespace;
|
|
51
54
|
declarerName: string;
|
|
52
55
|
}>;
|
|
56
|
+
defined: ReadonlySet<ScopeName>;
|
|
53
57
|
}): Result<null, DomainError<'INVALID_SCOPE' | 'SCOPE_NOT_DECLARED' | 'SCOPE_NOT_HELD'>>;
|
|
@@ -23,7 +23,7 @@ export function grantScopes(input, fleet) {
|
|
|
23
23
|
return refuse('SHIP_ALREADY_RETIRED', `${ship.name} is retired: its scopes stay as they were`);
|
|
24
24
|
}
|
|
25
25
|
for (const scope of [...input.grant, ...input.revoke]) {
|
|
26
|
-
const allowed = mayGrant(scope, { granter, namespaces: fleet.namespaces });
|
|
26
|
+
const allowed = mayGrant(scope, { granter, namespaces: fleet.namespaces, defined: fleet.defined });
|
|
27
27
|
if (!allowed.isOk) {
|
|
28
28
|
return allowed;
|
|
29
29
|
}
|
|
@@ -49,21 +49,25 @@ export function grantScopes(input, fleet) {
|
|
|
49
49
|
}
|
|
50
50
|
/**
|
|
51
51
|
* Whether the granter may grant or revoke the scope, at commission or on a
|
|
52
|
-
* live ship: a core scope it holds,
|
|
53
|
-
* declared (decision 0053)
|
|
52
|
+
* live ship: a core scope it holds, a declared plugin scope it holds or
|
|
53
|
+
* declared (decision 0053), or one of the fleet's own scopes it holds
|
|
54
|
+
* (design gateway-scopes, 4.1): defining a scope never lets an actor grant it.
|
|
54
55
|
*/
|
|
55
56
|
export function mayGrant(scope, at) {
|
|
56
|
-
const { granter, namespaces } = at;
|
|
57
|
+
const { granter, namespaces, defined } = at;
|
|
57
58
|
if (!scopeNameSchema.safeParse(scope).success) {
|
|
58
59
|
return refuse('INVALID_SCOPE', `${scope} is no scope: a core scope, or a plugin's <namespace>:<action>`);
|
|
59
60
|
}
|
|
60
61
|
if (scopeSchema.safeParse(scope).success) {
|
|
61
62
|
return granter.isOperator || granter.scopes.includes(scope) ? ok(null) : refuse('SCOPE_NOT_HELD', `You do not hold ${scope}, so you cannot grant it`);
|
|
62
63
|
}
|
|
64
|
+
if (defined.has(scope)) {
|
|
65
|
+
return granter.isOperator || granter.scopes.includes(scope) ? ok(null) : refuse('SCOPE_NOT_HELD', `You do not hold ${scope}, so you cannot grant it`);
|
|
66
|
+
}
|
|
63
67
|
const namespace = scope.slice(0, scope.indexOf(':'));
|
|
64
68
|
const declared = namespaces.get(namespace);
|
|
65
69
|
if (declared?.namespace.scopes.some((each) => each.scope === scope) !== true) {
|
|
66
|
-
return refuse('SCOPE_NOT_DECLARED', `
|
|
70
|
+
return refuse('SCOPE_NOT_DECLARED', `Neither a plugin declared ${scope} nor the fleet defined it`);
|
|
67
71
|
}
|
|
68
72
|
if (!granter.isOperator && !granter.scopes.includes(scope) && declared.namespace.declaredBy !== granter.shipId) {
|
|
69
73
|
return refuse('SCOPE_NOT_HELD', `You do not hold ${scope}, so you cannot grant it`);
|